Merge 2.57.2 into tizen

Change-Id: Id268f3b3a99b482c3023be25bc98cda4e1d41702

460 files changed, 19823 insertions, 26187 deletions

diff --git a/.gitignore b/.gitignore
index 4443f04d3..0caa0c05d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,13 +46,11 @@ mingw32-config.cache
 missing
 install-sh
 glib-gettextize
-glib-zip
 gtk-doc.make
 py-compile
 test-driver
 
 INSTALL
-README
 ChangeLog
 /glib-lcov.info
 /glib-lcov/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f63a7e1e..916f41e16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib/master:v1
+image: registry.gitlab.gnome.org/gnome/glib/master:v6
 
 stages:
   - build
@@ -9,28 +9,64 @@ cache:
   paths:
     - _ccache/
 
-fedora-meson-x86_64:
+variables:
+  MESON_TEST_TIMEOUT_MULTIPLIER: 2
+
+fedora-x86_64:
   stage: build
+  except:
+    - tags
   variables:
-   CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
+    CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
   script:
-    - meson --prefix /usr --libdir /usr/lib64 --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build .
-    - cd _build
-    - ninja
-    - meson test --timeout-multiplier 2
-    - cd ..
+    - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build .
+    - ninja -C _build
     - mkdir -p _coverage
-    - lcov --rc lcov_branch_coverage=1 --directory . --capture --no-external --output-file "_coverage/${CI_JOB_NAME}.lcov"
+    - lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
+    - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
+    - lcov --rc lcov_branch_coverage=1 --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
+  artifacts:
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
+    paths:
+      - "_build/meson-logs"
+      - "_coverage"
+
+.cross-template: &cross-template
+  stage: build
   except:
     - tags
   artifacts:
-    name: "glib-_${CI_COMMIT_REF_NAME}"
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
     paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_coverage"
+      - "_build/meson-logs"
+
+cross-android_api21_arm64:
+  <<: *cross-template
+  script:
+    # FIXME: add --werror
+    - meson --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build
+    - ninja -C _build
+
+cross-android_api28_arm64:
+  <<: *cross-template
+  script:
+    # FIXME: add --werror
+    - meson --cross-file=/opt/cross_file_android_arm64_28.txt -Dinternal_pcre=true --buildtype debug _build
+    - ninja -C _build
+
+cross-mingw64:
+  <<: *cross-template
+  script:
+    # FIXME: Add --werror
+    - meson --cross-file=/opt/cross_file_mingw64.txt --buildtype debug _build
+    - ninja -C _build
 
 msys2-mingw32:
   stage: build
+  except:
+    - tags
   tags:
     - win32
   variables:
@@ -40,36 +76,93 @@ msys2-mingw32:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   artifacts:
+    name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+    when: always
     paths:
+      - _build/meson-logs
       - _coverage/
 
+vs2017-x64:
+  stage: build
+  except:
+    - tags
+  tags:
+    - win32
+  script:
+    - .gitlab-ci/test-msvc.bat
+  artifacts:
+    name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+    when: always
+    paths:
+      - _build/meson-logs
+
+freebsd-11-x86_64:
+  when: manual
+  stage: build
+  tags:
+    # To run a FreeBSD builder, install gitlab-runner package and start both
+    # gitlab-runner and dbus service because we need /var/lib/dbus/machine-id.
+    # To compile GLib, you still have to install the following packages:
+    # desktop-file-utils gettext libiconv meson pkgconf python3 shared-mime-info
+    - freebsd-11
+  variables:
+    # CPPFLAGS is required because libintl doesn't use pkg-config.
+    CPPFLAGS: -I/usr/local/include
+    # FIXME: Workaround meson inability to set LD_LIBRARY_PATH.
+    # https://github.com/mesonbuild/meson/issues/1383
+    # https://github.com/mesonbuild/meson/issues/1635
+    # https://github.com/mesonbuild/meson/issues/2881
+    LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags
+    # FreeBSD doesn't have C.UTF-8 locale.
+    LANG: en_US.UTF-8
+  script:
+    # We cannot use -Wl,--no-undefined because GLib uses 'environ' variable.
+    # FreeBSD iconv doesn't handle transliteration, so we use GNU libiconv here.
+    # FreeBSD supports xattr, but its API is different from Linux xattr.
+    # FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
+    - meson -Db_lundef=false -Diconv=gnu -Dxattr=false --buildtype debug _build
+    - ninja -C _build
+    - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
+  # FIXME: Remove this when we have a stable FreeBSD runner
+  # https://gitlab.gnome.org/Infrastructure/GitLab/issues/286
+  allow_failure: true
+  except:
+    - tags
+  artifacts:
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
+    paths:
+      - "_build/meson-logs"
+
 coverage:
   stage: coverage
   artifacts:
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
       - _coverage/
   script:
     - bash -x ./.gitlab-ci/coverage-docker.sh
+  coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
 
 pages:
   stage: deploy
+  only:
+    - master
   script:
     - mv _coverage/ public/
   artifacts:
     paths:
       - public
-  only:
-    - master
 
 dist-job:
   stage: build
   only:
     - tags
   script:
-    - meson --prefix /usr --libdir /usr/lib64 --buildtype release -Dgtk_doc=true -Dman=true _build .
+    - meson --buildtype release -Dgtk_doc=true -Dman=true _build
     - cd _build
     - ninja dist
-    - ninja glib-doc
+    - ninja glib-doc gobject-doc gio-doc
     - tar -c -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html
     - tar -c -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html
     - tar -c -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index dab235166..06d3a4ae3 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -4,6 +4,7 @@ RUN dnf -y install \
     desktop-file-utils \
     elfutils-libelf-devel \
     findutils \
+    gamin-devel \
     gcc \
     gcc-c++ \
     gettext \
@@ -18,16 +19,36 @@ RUN dnf -y install \
     libmount-devel \
     libselinux-devel \
     libxslt \
+    make \
+    mingw64-gcc \
+    mingw64-gcc-c++ \
+    mingw64-gettext \
+    mingw64-libffi \
+    mingw64-zlib \
+    ncurses-compat-libs \
     ninja-build \
     pcre-devel \
     python3 \
     python3-pip \
     python3-wheel \
     systemtap-sdt-devel \
+    unzip \
+    wget \
     zlib-devel \
  && dnf clean all
 
-RUN pip3 install meson
+WORKDIR /opt
+ENV ANDROID_NDK_PATH /opt/android-ndk
+COPY android-download-ndk.sh .
+RUN ./android-download-ndk.sh
+COPY android-setup-env.sh .
+RUN ./android-setup-env.sh arm64 21
+RUN ./android-setup-env.sh arm64 28
+RUN rm -rf $ANDROID_NDK_PATH
+
+COPY cross_file_mingw64.txt /opt
+
+RUN pip3 install meson==0.47.0
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/android-download-ndk.sh b/.gitlab-ci/android-download-ndk.sh
new file mode 100755
index 000000000..785ee0189
--- /dev/null
+++ b/.gitlab-ci/android-download-ndk.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+#
+# Copyright 2018 Collabora ltd.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Xavier Claessens <xavier.claessens@collabora.com>
+#
+
+set -e
+
+# Download Android NDK
+ANDROID_NDK_VERSION="r17b"
+ANDROID_NDK_SHA512="062fac12f747730f5563995089a8b4abab683fbbc621aa8582fdf35fe327daee5d69ed2437af257c10ec4ef54ecd3805a8f134a1400eb8f34ee76f55c8dc9ae9"
+wget --quiet https://dl.google.com/android/repository/android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip
+echo "$ANDROID_NDK_SHA512  android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip" | sha512sum -c
+unzip android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip
+rm android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip
+mv android-ndk-$ANDROID_NDK_VERSION $ANDROID_NDK_PATH
diff --git a/.gitlab-ci/android-setup-env.sh b/.gitlab-ci/android-setup-env.sh
new file mode 100755
index 000000000..510056f66
--- /dev/null
+++ b/.gitlab-ci/android-setup-env.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+#
+# Copyright 2018 Collabora ltd.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Xavier Claessens <xavier.claessens@collabora.com>
+#
+
+set -e
+
+arch=$1
+api=$2
+toolchain_path=$(pwd)/android-toolchain-$arch-$api
+prefix_path=$(pwd)/android-$arch-$api
+
+# Create standalone toolchains
+$ANDROID_NDK_PATH/build/tools/make_standalone_toolchain.py --arch $arch --api $api --install-dir $toolchain_path
+
+target_host=aarch64-linux-android
+export AR=$target_host-ar
+export AS=$target_host-clang
+export CC=$target_host-clang
+export CXX=$target_host-clang++
+export LD=$target_host-ld
+export STRIP=$target_host-strip
+export PATH=$PATH:$toolchain_path/bin
+
+# Cross build libiconv when using API level <= 28.
+# Newer Android has it in its libc already.
+if [ "$api" -lt "28" ]; then
+  wget --quiet http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
+  echo "1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a  libiconv-1.15.tar.gz" | sha512sum -c
+  tar xzf libiconv-1.15.tar.gz
+  pushd libiconv-1.15
+  ./configure --host=$target_host --prefix=$prefix_path  --libdir=$prefix_path/lib64
+  make
+  make install
+  popd
+  rm libiconv-1.15.tar.gz
+  rm -r libiconv-1.15
+fi
+
+# Cross build libffi
+wget --quiet https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz
+echo "e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4  libffi-3.3-rc0.tar.gz" | sha512sum -c
+tar xzf libffi-3.3-rc0.tar.gz
+pushd libffi-3.3-rc0
+./configure --host=$target_host --prefix=$prefix_path --libdir=$prefix_path/lib64
+make
+make install
+popd
+rm libffi-3.3-rc0.tar.gz
+rm -r libffi-3.3-rc0
+
+# Create a pkg-config wrapper that won't pick fedora libraries
+mkdir -p $prefix_path/bin
+export PKG_CONFIG=$prefix_path/bin/pkg-config
+cat > $PKG_CONFIG <<- EOM
+#!/bin/sh
+SYSROOT=${prefix_path}
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_LIBDIR=\${SYSROOT}/lib64/pkgconfig
+export PKG_CONFIG_SYSROOT_DIR=\${SYSROOT}
+exec pkg-config "\$@"
+EOM
+chmod +x $PKG_CONFIG
+
+# Create a cross file that can be passed to meson
+cat > cross_file_android_${arch}_${api}.txt <<- EOM
+[host_machine]
+system = 'android'
+cpu_family = 'arm64'
+cpu = 'arm64'
+endian = 'little'
+
+[properties]
+c_args = ['-I${prefix_path}/include']
+c_link_args = ['-L${prefix_path}/lib64',
+               '-fuse-ld=gold']
+
+[binaries]
+c = '${toolchain_path}/bin/${CC}'
+cpp = '${toolchain_path}/bin/${CXX}'
+ar = '${toolchain_path}/bin/${AR}'
+strip = '${toolchain_path}/bin/${STRIP}'
+pkgconfig = '${PKG_CONFIG}'
+EOM
diff --git a/.gitlab-ci/coverage-docker.sh b/.gitlab-ci/coverage-docker.sh
index 49118d606..63e305147 100755
--- a/.gitlab-ci/coverage-docker.sh
+++ b/.gitlab-ci/coverage-docker.sh
@@ -5,9 +5,11 @@ set -e
 # Fixup Windows paths
 python3 ./.gitlab-ci/fixup-cov-paths.py _coverage/*.lcov
 
-# Remove coverage from generated code in the build directory
 for path in _coverage/*.lcov; do
+    # Remove coverage from generated code in the build directory
     lcov --rc lcov_branch_coverage=1 -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
+    # Remove any coverage from system files
+    lcov --rc lcov_branch_coverage=1 -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
 done
 
 genhtml \
diff --git a/.gitlab-ci/cross_file_mingw64.txt b/.gitlab-ci/cross_file_mingw64.txt
new file mode 100644
index 000000000..1897b686a
--- /dev/null
+++ b/.gitlab-ci/cross_file_mingw64.txt
@@ -0,0 +1,17 @@
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+
+[properties]
+c_args = []
+c_link_args = []
+
+[binaries]
+c = 'x86_64-w64-mingw32-gcc'
+cpp = 'x86_64-w64-mingw32-g++'
+ar = 'x86_64-w64-mingw32-ar'
+strip = 'x86_64-w64-mingw32-strip'
+pkgconfig = 'x86_64-w64-mingw32-pkg-config'
+windres = 'x86_64-w64-mingw32-windres'
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 4fc59a1d6..91d3042e7 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,10 +2,16 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/glib/master:v1"
+TAG="registry.gitlab.gnome.org/gnome/glib/master:v6"
 
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
+docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
-sudo docker run --rm \
-    --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
+
+if [ "$1" = "--push" ]; then
+  docker login registry.gitlab.gnome.org
+  docker push $TAG
+else
+  docker run --rm \
+      --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
+      --tty --interactive "${TAG}" bash
+fi
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
new file mode 100644
index 000000000..9b674f76e
--- /dev/null
+++ b/.gitlab-ci/test-msvc.bat
@@ -0,0 +1,19 @@
+@echo on
+:: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
+:: specified build architecture
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+@echo on
+
+:: FIXME: make warnings fatal
+pip3 install --upgrade --user meson==0.47.0  || goto :error
+meson _build || goto :error
+ninja -C _build || goto :error
+
+:: FIXME: dont ignore test errors
+meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER%
+
+:: FIXME: can we get code coverage support?
+
+goto :EOF
+:error
+exit /b 1
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index a3b0ef906..d8891e35b 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -23,29 +23,38 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-zlib
 
+curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz"
+echo "44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23  lcov-1.13.tar.gz" | sha256sum -c
+tar -xzf lcov-1.13.tar.gz
+LCOV="$(pwd)/lcov-1.13/bin/lcov"
+
+mkdir -p _coverage
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-pip3 install --upgrade --user meson
+pip3 install --upgrade --user meson==0.47.0
 export PATH="$HOME/.local/bin:$PATH"
 export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
+DIR="$(pwd)"
 
 meson --werror --buildtype debug _build
 cd _build
 ninja
 
-# FIXME: fix the test suite
-meson test || true
+"${LCOV}" \
+    --quiet \
+    --rc lcov_branch_coverage=1 \
+    --directory "${DIR}/_build" \
+    --capture \
+    --initial \
+    --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
 
-cd ..
-curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz"
-echo "44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23  lcov-1.13.tar.gz" | sha256sum -c
-tar -xvzf lcov-1.13.tar.gz
+# FIXME: fix the test suite
+meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} || true
 
-mkdir -p _coverage
-./lcov-1.13/bin/lcov \
+"${LCOV}" \
+    --quiet \
     --rc lcov_branch_coverage=1 \
-    --directory . \
+    --directory "${DIR}/_build" \
     --capture \
-    --no-external \
-    --output-file "_coverage/${CI_JOB_NAME}.lcov"
+    --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"
diff --git a/AUTHORS b/AUTHORS
index 17814caa1..16884db81 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
 Below are just a few of the people who have contributed
 to GLib. Please don't mail these people about problems you
-have with GTK+; see the README file for information about
-filing bugs and submitting patches.
+have with GLib; see the README.md file for information about
+filing bugs and submitting changes.
 
 GLib-2.0 Team
 -------------
diff --git a/README.commits b/CONTRIBUTING.md
index 5345964ee..5345964ee 100644
--- a/README.commits
+++ b/CONTRIBUTING.md
diff --git a/HACKING b/HACKING
index e04e0dcdd..7c130ab40 100644
--- a/HACKING
+++ b/HACKING
@@ -33,5 +33,5 @@ Note that autogen.sh runs configure for you.  If you wish to pass
 options like --prefix=/usr to configure you can give those options
 to autogen.sh and they will be passed on to configure.
 
-For information about submitting patches see the README.commits file. For
+For information about submitting patches see the CONTRIBUTING.md file. For
 information about major design decisions, see the README.rationale file.
diff --git a/Makefile.am b/Makefile.am
index 49b5e4e71..a888e6df3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ include $(top_srcdir)/glib.mk
 
 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-DIST_SUBDIRS = $(SUBDIRS) build win32
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests subprojects
+DIST_SUBDIRS = $(SUBDIRS) build
 
 bin_SCRIPTS = glib-gettextize
 
@@ -34,12 +34,11 @@ EXTRA_DIST += 			\
 	ChangeLog.pre-2-2	\
 	ChangeLog.pre-2-0	\
 	ChangeLog.pre-1-2	\
-	glib-zip.in		\
 	NEWS.pre-1-3		\
 	acglib.m4		\
 	sanity_check		\
-	README.commits		\
-	README.in		\
+	CONTRIBUTING.md		\
+	README.md		\
 	README.rationale	\
 	INSTALL.in		\
 	README.win32		\
@@ -50,7 +49,6 @@ EXTRA_DIST += 			\
 	tap-driver.sh		\
 	tap-test		\
 	msvc_recommended_pragmas.h \
-	config.h.win32.in	\
         po/po2tbl.sed.in        \
 	glib-2.0.pc.in 		\
 	gobject-2.0.pc.in 	\
@@ -66,7 +64,6 @@ EXTRA_DIST += 			\
 	$(NULL)
 
 meson_build_files = \
-	config.h.meson \
 	meson_options.txt \
 	meson.build \
 	docs/reference/gio/meson.build \
@@ -79,7 +76,10 @@ meson_build_files = \
 	docs/reference/gobject/xml/gtkdocentities.ent.in \
 	docs/reference/gobject/xml/meson.build \
 	gio/data-to-c.py \
+	gio/fam/gfamfilemonitor.map \
+	gio/fam/meson.build \
 	gio/gdbus-2.0/codegen/meson.build \
+	gio/gio-querymodules-wrapper.py \
 	gio/inotify/meson.build \
 	gio/kqueue/meson.build \
 	gio/meson.build \
@@ -110,10 +110,8 @@ EXTRA_DIST += $(meson_build_files)
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST += 		\
-	README			\
 	INSTALL			\
 	ChangeLog		\
-	config.h.win32		\
 	$(NULL)
 
 CONFIGURE_DEPENDENCIES = acglib.m4
diff --git a/NEWS b/NEWS
index 39b658c3b..f70f63245 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,32 @@
+Overview of changes in GLib 2.57.2
+==================================
+
+* Require pcre 8.31
+* Require meson 0.47.0
+
+* Bugs fixed:
+ 742456 Add g_steal_pointer() convenience function to mark ownership...
+ 795569 MinGW CI: fix tests
+ 796341 gmem.h: Use typeof() in g_steal_pointer() macro
+ #1013 Support for per-session overrides
+ #1360 glib-mkenums breaks if option specified but no nick
+ #1175 Add names and tags to various GSources and GTasks constructed in GLib
+ #903 g_main_context_wait() not deprecated in API, but emits a g_critical()...
+ #786 Fix memory leaks in libgio tests
+ #927 gio/gresource.c:do_lookup check for terminating "/"
+ #976 Document difference between g_assert() and g_assert_*()...
+ #1447 glib 2.57.1: test_month_names: assertion failed...
+ #1407 Update to Unicode Character Database 11
+ #1455 glib python tools have full python path in shebang, limits to 128 characters
+ #1459 Missing g_return_val_if_fail in g_async_queue_timeout_pop
+
+* Translation updates:
+ Friulian
+ German
+ Romanian
+ Spanish
+
+
 Overview of changes in GLib 2.57.1
 ==================================
 
diff --git a/README b/README
new file mode 100644
index 000000000..96dc92fbd
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+See README.md
diff --git a/README.in b/README.md
index 3e8b2e5fc..677f2dd86 100644
--- a/README.in
+++ b/README.md
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GLib version @GLIB_VERSION@. GLib is the low-level core
+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,
@@ -28,8 +28,8 @@ See the file 'INSTALL'
 How to report bugs
 ==================
 
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product glib.) You will need
+Bugs should be reported to the GNOME issue tracking system.
+(https://gitlab.gnome.org/GNOME/glib/issues/new). You will need
 to create an account for yourself.
 
 In the bug report please include:
@@ -58,14 +58,13 @@ In the bug report please include:
 Patches
 =======
 
-Patches should also be submitted to bugzilla.gnome.org. If the
-patch fixes an existing bug, add the patch as an attachment
-to that bug report.
+Patches should also be submitted as merge requests to gitlab.gnome.org. If the
+patch fixes an existing issue, please refer to the issue in your commit message
+with the following notation (for issue 123):
+Closes: #123
 
-Otherwise, enter a new bug report that describes the patch,
-and attach the patch to that bug report.
-
-Patches should be in unified diff form. (The -up option to GNU diff.)
+Otherwise, create a new merge request that introduces the change, filing a
+separate issue is not required.
 
 Notes about GLib 2.48
 =====================
diff --git a/README.win32 b/README.win32
index 4fda64ae0..1683d54b9 100644
--- a/README.win32
+++ b/README.win32
@@ -80,6 +80,11 @@ To overcome this problem, please set your system's locale setting for non-Unicod
 English (United States), reboot, and restart the build, and the code should build
 normally.  See also this GNOME Wiki page [1] that gives a bit further info on this.
 
+In Visual Studio 2015 and later, the /utf-8 option is provided, which is set by the
+latest Meson releases when building GLib, and can be used in other project files
+that uses GLib to avoid the need of setting your system's locale setting for
+non-Unicode and the subsequent requirement to restart the system.
+
 Building software that use GLib or GTK+
 =======================================
 
@@ -150,14 +155,11 @@ library.
 
 The DLL generated by either compiler is binary compatible with the
 other one. Thus one either has to manually edit glibconfig.h
-afterwards, or use the supplied glibconfig.h.win32 which has been
-produced by running configure twice, once using gcc and once using
-MSVC, and merging the resulting files with diff -D.
+afterwards.
 
 For MSVC7 and later (Visual C++ .NET 2003, Visual C++ 2005, Visual C++
 2008 etc) it is preferred to use specific builds of GLib DLLs that use
-the same C runtime as the code that uses GLib. Such DLLs should be
-named differently than the ones that use msvcrt.dll.
+the same C runtime as the code that uses GLib.
 
 For GLib, the DLL that uses msvcrt.dll is called libglib-2.0-0.dll,
 and the import libraries libglib-2.0.dll.a and glib-2.0.lib. Note that
@@ -172,32 +174,78 @@ and libtool documentation.
 Building with Visual Studio
 ===========================
 
-A more detailed outline of building GLib with its dependencies can
-now be found on the GNOME wiki:
+Meson is now the supported method of building GLib using Visual Studio.
+
+Note that you will need a libintl implementation, zlib, and libFFI, and
+optionally PCRE1, which should preferably be built with the same compiler
+that is now being used to build GLib.  Ensure that their headers, .lib's
+and DLLs can be found in the paths specified by the INCLUDE, LIB and PATH
+envvars.  The Meson build process will pull in a copy of the ZLib and the
+libFFI sources if they cannot be found, and will build an in-source copy
+of PCRE1 if PCRE1 cannt be found.
+
+One can also refer to the following page for building the dependencies:
 
 https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack
 
-Please do not build GLib in paths that contain spaces in them, as
-this may cause problems during compilation and during usage of the
-library.
+You will also need the following items:
+-Python 3.6.x, you need the 32-bit version if you are building GLib
+ as a 32-bit/x86 build, or the amd64/x64 version for building 64-bit/x86-64
+ builds.  You will then need to install or update Meson by using pip.
+-The Ninja build tool, required for Visual Studio 2008, 2012 and 2013 builds,
+ and optional for 2010, 2015 and 2017 builds, where Visual Studio projects
+ can be generated instead of the Ninja build files.
+-GIT for Windows is highly recommended, in the case where some required
+ dependencies are not found, and Meson makes use of GIT to download
+ the sources to build in the build process.
+
+To do a build using Meson, do the following:
+
+-Open a Visual Studio (or SDK) command prompt that matches the Visual Studio
+ version and build platform (Win32/x86, x64, etc.) that will be used in all
+ the following steps.
+
+-Create an empty directory/folder for the build.  It needs to be in the same
+ drive as where your GLib sources are located (i.e. $(GLIB_SRCDIR)).  cd into
+ that directory/folder.
+
+-Setup your PATH envvar:
+
+   set PATH=%PATH%;$(PYTHON_INSTALL_DIR);$(NINJA_DIR)
+
+ where PYTHON_INSTALL_DIR is where Python 3.6.x+ is installed to, and NINJA_DIR
+ is where your ninja executable can be found.  The NINJA_DIR can be omitted if one
+ passes --backend=vs to the Meson configuration line, for Visual Studio 2010, 2015
+ and 2017 builds.
+
+-Configure the build using Meson:
+
+    python $(PYTHON_INSTALL_DIR)\scripts\meson.py $(GLIB_SRCDIR) --buildtype=$(build_configuration) --prefix=$(INSTALL_PREFIX) [--backend=vs]
+
+ Please see the Meson docs for an explanation for --buildtype, the path passed for
+ --prefix need not to be on the same drive as where the build is carried out, but
+ it is recommended to use forward slashes for this path.  The --backend=vs can be
+ used if the Visual Studio project generator is preferred over using Ninja, for
+ Visual Studio 2010, 2015 and 2017 builds.
 
-In an unpacked tarball, you will find in build\win32\vs9 (VS 2008) and
-build\win32\vs10 (VS 2010) a solution file that can be used to build
-the GLib DLLs and some auxiliary programs under VS 2008 and VS 2010
-(Express Edition will suffice with the needed dependencies) respectively.
-Read the README.txt file in those folders for more
-information. Note that you will need a libintl implementation, zlib, and 
-libFFI.
+-Build, test and install the build:
+ Run ninja (and ninja test and ninja install) or open the generated Visual Studio
+ projects to compile, test and install the build.
 
-If you are building from a GIT checkout, you will first need to use some
-Unix-like environment or run win32/setup.py, 
-which will expand the VS 2008/2010 project files, the DLL resouce files and
-other miscellanious files required for the build.  Run win32/setup.py
-as follows:
+Note that if building the sources with Visual Studio 2008, note the following
+additional items:
 
-$python win32/setup.py --perl path_to_your_perl.exe
+-You need to run the following lines from your build directory, to embed the manifests
+ that are generated during the build, assuming the built binaries are installed
+ to $(PREFIX), after a successful build/installation:
 
-for more usage on this script, run
-$python win32/setup.py -h/--help
+for /r %f in (*.dll.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f $(PREFIX)\bin\%~nf;2
+for /r %f in (*.exe.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f $(PREFIX)\bin\%~nf;1
 
-[1]: https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack under "Preparations"
+-If building for amd64/x86_64/x64, sometimes the compilation of sources may seem to hang, which
+ is caused by an optimization issue in the 2008 x64 compiler.  You need to use Task Manager to
+ remove all running instances of cl.exe, which will cause the build process to terminate.  Update
+ the build flags of the sources that hang on compilation by changing its "/O2" flag to "/O1"
+ in build.ninja, and  retry the build, where things should continue to build normally.  At the
+ time of writing, this is needed for compiling glib/gtestutils.c,  gio/gsettings.c and
+ gio/gsettingsschema.c
diff --git a/autogen.sh b/autogen.sh
index 77e1f4bc9..084559fc6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,10 +25,10 @@ if test -z $AUTORECONF; then
         exit 1
 fi
 
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
+# INSTALL is required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch it here. It will be
+# regenerated from its corresponding *.in file by ./configure anyway.
+touch INSTALL
 
 test -n "$NOAUTORECONF" || autoreconf --force --install --verbose || exit $?
 
diff --git a/build/win32/vs8/Makefile.am b/build/win32/vs8/Makefile.am
deleted file mode 100644
index 69cd83f42..000000000
--- a/build/win32/vs8/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST = \
-	README \
-	gio.vcproj \
-	glib-genmarshal.vcproj \
-	glib.sln \
-	glib.vcproj \
-	gmodule.vcproj \
-	gobject.vcproj \
-	gspawn-win32-helper-console.vcproj \
-	gspawn-win32-helper.vcproj \
-	gthread.vcproj
diff --git a/build/win32/vs8/README b/build/win32/vs8/README
deleted file mode 100644
index 4576aaeb6..000000000
--- a/build/win32/vs8/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Note that this is mostly experimental and not really maintained. It
-seems that the OAH project at https://code.launchpad.net/oah might be
-a better choice if you want to start building GLib (and more of the
-GTK+ stack) with Visual Studio.
diff --git a/build/win32/vs8/gio.vcproj b/build/win32/vs8/gio.vcproj
deleted file mode 100644
index 13902acc4..000000000
--- a/build/win32/vs8/gio.vcproj
+++ /dev/null
@@ -1,486 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="gio"
-	ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
-	RootNamespace="gio"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\gio\gappinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gasynchelper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gasyncresult.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gbufferedinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gbufferedoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gcancellable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gcontenttype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdatainputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdataoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdrive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdummyfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gemblem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gemblemedicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileattribute.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileenumerator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilenamecompleter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilterinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilteroutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\ginputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gio-marshal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioaliasdef.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioenumtypes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\giomodule.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioscheduler.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gloadableicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocaldirectorymonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileenumerator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmemoryinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmemoryoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmount.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmountoperation.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gnativevolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\goutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gpollfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gseekable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gsimpleasyncresult.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gthemedicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gunionvolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvolume.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32appinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32mount.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32volumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gio\gio.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gio.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gio.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gio.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs8/glib-genmarshal.vcproj b/build/win32/vs8/glib-genmarshal.vcproj
deleted file mode 100644
index 06cb39866..000000000
--- a/build/win32/vs8/glib-genmarshal.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="glib-genmarshal"

-	ProjectGUID="{BD12E835-5C52-4E5D-8234-1C579F33E27A}"

-	RootNamespace="glibgenmarshal"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../..;../../../glib"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../..;../../../glib"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\gobject\glib-genmarshal.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/build/win32/vs8/glib.sln b/build/win32/vs8/glib.sln
deleted file mode 100644
index 544560e10..000000000
--- a/build/win32/vs8/glib.sln
+++ /dev/null
@@ -1,84 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-genmarshal", "glib-genmarshal.vcproj", "{BD12E835-5C52-4E5D-8234-1C579F33E27A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcproj", "{289240E7-E167-47CE-A20C-58D852E520BA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.Build.0 = Debug|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.ActiveCfg = Release|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.Build.0 = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/build/win32/vs8/glib.vcproj b/build/win32/vs8/glib.vcproj
deleted file mode 100644
index de358764f..000000000
--- a/build/win32/vs8/glib.vcproj
+++ /dev/null
@@ -1,605 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="glib"
-	ProjectGUID="{12BCA020-EABF-429E-876A-A476BC9C10C0}"
-	RootNamespace="glib"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:DONE_CONFIG_H&#x0D;&#x0A;if exist ..\..\..\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:DONE_GLIBCONFIG_H&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\config.h goto GLIB_CONFIG&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:GLIB_CONFIG&#x0D;&#x0A;if exist ..\..\..\glibconfig.h\ goto END&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\glib\garray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gasyncqueue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gatomic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbacktrace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbase64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbookmarkfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gcache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gchecksum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gcompletion.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gconvert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdataset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gfileutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\ghash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\ghook.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\giochannel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\giowin32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gkeyfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmappedfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmarkup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmessages.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gnode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\goption.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gpattern.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gprimes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gprintf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gqsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gqueue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\grand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gregex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\grel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gscanner.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gsequence.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gshell.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gslice.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gslist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gspawn-win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstdio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstrfuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstring.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtestutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gthread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gthreadpool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtimer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunibreak.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunicollate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunidecomp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\guniprop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gurifuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gutf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gwin32.c"
-				>
-			</File>
-			<Filter
-				Name="libcharset"
-				>
-				<File
-					RelativePath="..\..\..\glib\libcharset\localcharset.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="gnulib"
-				>
-				<File
-					RelativePath="..\..\..\glib\gnulib\asnprintf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf-args.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf-parse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="pcre"
-				>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_compile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_config.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_exec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_get.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_globals.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_info.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_newline.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_study.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_tables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_version.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\glib\glib.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glib.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glib.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs8/gmodule.vcproj b/build/win32/vs8/gmodule.vcproj
deleted file mode 100644
index bf519f70b..000000000
--- a/build/win32/vs8/gmodule.vcproj
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="gmodule"

-	ProjectGUID="{4214047C-F5C1-40B3-8369-5DCED8C32770}"

-	RootNamespace="gmodule"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="2"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="if exist ..\..\..\gmodule\gmoduleconf.h goto END&#x0D;&#x0A;copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;:END&#x0D;&#x0A;"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../glib;../../.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"

-				LinkIncremental="2"

-				ModuleDefinitionFile="../../../gmodule/gmodule.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="2"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="if exist ..\..\..\gmodule\gmoduleconf.h goto END&#x0D;&#x0A;copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;:END&#x0D;&#x0A;"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../glib;../../.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"

-				LinkIncremental="1"

-				ModuleDefinitionFile="../../../gmodule/gmodule.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\gmodule\gmodule.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\..\..\gmodule\gmodule.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gmodule\gmodule.rc"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/build/win32/vs8/gobject.vcproj b/build/win32/vs8/gobject.vcproj
deleted file mode 100644
index dc1d542da..000000000
--- a/build/win32/vs8/gobject.vcproj
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gobject"
-	ProjectGUID="{F172EFFC-E30F-4593-809E-DB2024B1E753}"
-	RootNamespace="gobject"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gobject/gobject.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gobject/gobject.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\gobject\gboxed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gclosure.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\genums.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gobject.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gparam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gparamspecs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gsignal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gsourceclosure.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gtype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gtypemodule.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gtypeplugin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gvalue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gvaluearray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gvaluetransform.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gvaluetypes.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gobject\gobject.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gobject.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gobject\gobject.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gobject.def&quot;"
-						Outputs="$(InputDir)/gobject.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gobject.def&quot;"
-						Outputs="$(InputDir)/gobject.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs8/gspawn-win32-helper-console.vcproj b/build/win32/vs8/gspawn-win32-helper-console.vcproj
deleted file mode 100644
index 5bf95af71..000000000
--- a/build/win32/vs8/gspawn-win32-helper-console.vcproj
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="gspawn-win32-helper-console"

-	ProjectGUID="{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}"

-	RootNamespace="gspawnwin32helperconsole"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\glib\gspawn-win32-helper-console.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/build/win32/vs8/gspawn-win32-helper.vcproj b/build/win32/vs8/gspawn-win32-helper.vcproj
deleted file mode 100644
index 6e34dbcd7..000000000
--- a/build/win32/vs8/gspawn-win32-helper.vcproj
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="gspawn-win32-helper"

-	ProjectGUID="{289240E7-E167-47CE-A20C-58D852E520BA}"

-	RootNamespace="gspawnwin32helper"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\glib\gspawn-win32-helper.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/build/win32/vs8/gthread.vcproj b/build/win32/vs8/gthread.vcproj
deleted file mode 100644
index 386838dbb..000000000
--- a/build/win32/vs8/gthread.vcproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="gthread"

-	ProjectGUID="{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"

-	RootNamespace="gthread"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="2"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../..,../../../glib"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"

-				LinkIncremental="2"

-				ModuleDefinitionFile="../../../gthread/gthread.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"

-			ConfigurationType="2"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../..,../../../glib"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				ForcedIncludeFiles="msvc_recommended_pragmas.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"

-				LinkIncremental="1"

-				ModuleDefinitionFile="../../../gthread/gthread.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\gthread\gthread-impl.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-			<File

-				RelativePath="..\..\..\gthread\gthread.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gthread\gthread.rc"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/config.h.meson b/config.h.meson
deleted file mode 100644
index fd0bfcaf9..000000000
--- a/config.h.meson
+++ /dev/null
@@ -1,840 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#mesondefine AC_APPLE_UNIVERSAL_BUILD
-
-/* The normal alignment of `guint32', in bytes. */
-#mesondefine ALIGNOF_GUINT32
-
-/* The normal alignment of `guint64', in bytes. */
-#mesondefine ALIGNOF_GUINT64
-
-/* The normal alignment of `unsigned long', in bytes. */
-#mesondefine ALIGNOF_UNSIGNED_LONG
-
-/* poll doesn't work on devices */
-#mesondefine BROKEN_POLL
-
-/* struct ip_mreq_source definition is broken on Android NDK <= r16 */
-#mesondefine BROKEN_IP_MREQ_SOURCE_STRUCT
-
-/* Whether we're building a DLL and hence need symbols exported for a DLL */
-#mesondefine DLL_EXPORT
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#mesondefine CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#mesondefine C_ALLOCA
-
-/* Whether to disable memory pools */
-#mesondefine DISABLE_MEM_POOLS
-
-/* Whether to enable GC friendliness by default */
-#mesondefine ENABLE_GC_FRIENDLY_DEFAULT
-
-/* always defined to indicate that i18n is enabled */
-#mesondefine ENABLE_NLS
-
-/* Define the gettext package to be used */
-#mesondefine GETTEXT_PACKAGE
-
-/* Define to the GLIB binary age */
-#mesondefine GLIB_BINARY_AGE
-
-/* Define to the GLIB interface age */
-#mesondefine GLIB_INTERFACE_AGE
-
-/* Define the location where the catalogs will be installed */
-#mesondefine GLIB_LOCALE_DIR
-
-/* Define to the GLIB major version */
-#mesondefine GLIB_MAJOR_VERSION
-
-/* Define to the GLIB micro version */
-#mesondefine GLIB_MICRO_VERSION
-
-/* Define to the GLIB minor version */
-#mesondefine GLIB_MINOR_VERSION
-
-/* A 'va_copy' style function */
-#mesondefine G_VA_COPY
-
-/* 'va_lists' cannot be copies as values */
-#mesondefine G_VA_COPY_AS_ARRAY
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#mesondefine HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#mesondefine HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <attr/xattr.h> header file. */
-#mesondefine HAVE_ATTR_XATTR_H
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Define if you have a version of the snprintf function with semantics as
-   specified by the ISO C99 standard. */
-#mesondefine HAVE_C99_SNPRINTF
-
-/* Define if you have a version of the vsnprintf function with semantics as
-   specified by the ISO C99 standard. */
-#mesondefine HAVE_C99_VSNPRINTF
-
-/* define to 1 if Carbon is available */
-#mesondefine HAVE_CARBON
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#mesondefine HAVE_CLOCK_GETTIME
-
-/* define to 1 if Cocoa is available */
-#mesondefine HAVE_COCOA
-
-/* Have nl_langinfo (CODESET) */
-#mesondefine HAVE_CODESET
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#mesondefine HAVE_CRT_EXTERNS_H
-
-/* Define if dbus-1 is available */
-#mesondefine HAVE_DBUS1
-
-/* Define to 1 if you have the `dcgettext' function. */
-#mesondefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#mesondefine HAVE_DIRENT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#mesondefine HAVE_DLFCN_H
-
-/* Define to 1 if using dtrace probes. */
-#mesondefine HAVE_DTRACE
-
-/* Define to 1 if you have the `endmntent' function. */
-#mesondefine HAVE_ENDMNTENT
-
-/* Define to 1 if you have the `endservent' function. */
-#mesondefine HAVE_ENDSERVENT
-
-/* we have the eventfd(2) system call */
-#mesondefine HAVE_EVENTFD
-
-/* Define to 1 if you have the `fallocate' function. */
-#mesondefine HAVE_FALLOCATE
-
-/* Define if we have FAM */
-#mesondefine HAVE_FAM
-
-/* Define to 1 if you have the <fam.h> header file. */
-#mesondefine HAVE_FAM_H
-
-/* Define if we have FAMNoExists in fam */
-#mesondefine HAVE_FAM_NO_EXISTS
-
-/* Define to 1 if you have the `fchmod' function. */
-#mesondefine HAVE_FCHMOD
-
-/* Define to 1 if you have the `fchown' function. */
-#mesondefine HAVE_FCHOWN
-
-/* Define to 1 if you have the `fdwalk' function. */
-#mesondefine HAVE_FDWALK
-
-/* Define to 1 if you have the <fstab.h> header file. */
-#mesondefine HAVE_FSTAB_H
-
-/* Define to 1 if you have the `fsync' function. */
-#mesondefine HAVE_FSYNC
-
-/* we have the futex(2) system call */
-#mesondefine HAVE_FUTEX
-
-/* Define to 1 if you have the `getc_unlocked' function. */
-#mesondefine HAVE_GETC_UNLOCKED
-
-/* Define to 1 if you have the `getfsstat' function. */
-#mesondefine HAVE_GETFSSTAT
-
-/* Define to 1 if you have the `getgrgid_r' function. */
-#mesondefine HAVE_GETGRGID_R
-
-/* Define to 1 if you have the `getmntent_r' function. */
-#mesondefine HAVE_GETMNTENT_R
-
-/* Define to 1 if you have the `getprotobyname_r' function. */
-#mesondefine HAVE_GETPROTOBYNAME_R
-
-/* Define to 1 if you have the `getpwuid_r' function. */
-#mesondefine HAVE_GETPWUID_R
-
-/* Define to 1 if you have the `getresuid' function. */
-#mesondefine HAVE_GETRESUID
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#mesondefine HAVE_GETTEXT
-
-/* Define to 1 if you have the `getvfsstat' function. */
-#mesondefine HAVE_GETVFSSTAT
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#mesondefine HAVE_GMTIME_R
-
-/* define to use system printf */
-#mesondefine HAVE_GOOD_PRINTF
-
-/* Define to 1 if you have the `hasmntopt' function. */
-#mesondefine HAVE_HASMNTOPT
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#mesondefine HAVE_IF_INDEXTONAME
-
-/* Define to 1 if you have the `if_nametoindex' function. */
-#mesondefine HAVE_IF_NAMETOINDEX
-
-/* Define to 1 if you have the `inotify_init1' function. */
-#mesondefine HAVE_INOTIFY_INIT1
-
-/* define to support printing 64-bit integers with format I64 */
-#mesondefine HAVE_INT64_AND_I64
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#mesondefine HAVE_INTMAX_T
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#mesondefine HAVE_INTTYPES_H
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#mesondefine HAVE_INTTYPES_H_WITH_UINTMAX
-
-/* Define if we have struct ip_mreqn */
-#mesondefine HAVE_IP_MREQN
-
-/* Define to 1 if you have the `issetugid' function. */
-#mesondefine HAVE_ISSETUGID
-
-/* Define to 1 if you have the `kevent' function. */
-#mesondefine HAVE_KEVENT
-
-/* Define to 1 if you have the `kqueue' function. */
-#mesondefine HAVE_KQUEUE
-
-/* Check for nl_langinfo and abbreviated alternative month names */
-#mesondefine HAVE_LANGINFO_ABALTMON
-
-/* Check for nl_langinfo and alternative month names */
-#mesondefine HAVE_LANGINFO_ALTMON
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#mesondefine HAVE_LANGINFO_CODESET
-
-/* Have nl_langinfo (_NL_CTYPE_OUTDIGITn_MB) */
-#mesondefine HAVE_LANGINFO_OUTDIGIT
-
-/* Have nl_langinfo (PM_STR) */
-#mesondefine HAVE_LANGINFO_TIME
-
-/* Define to 1 if you have the `lchmod' function. */
-#mesondefine HAVE_LCHMOD
-
-/* Define to 1 if you have the `lchown' function. */
-#mesondefine HAVE_LCHOWN
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#mesondefine HAVE_LC_MESSAGES
-
-/* Define if you have the __libc_enable_secure variable (GNU libc, eglibc) */
-#mesondefine HAVE_LIBC_ENABLE_SECURE
-
-/* Define if libelf is available */
-#mesondefine HAVE_LIBELF
-
-/* Define if libmount is available */
-#mesondefine HAVE_LIBMOUNT
-
-/* Define to 1 if you have the `link' function. */
-#mesondefine HAVE_LINK
-
-/* Define to 1 if you have the <linux/magic.h> header file. */
-#mesondefine HAVE_LINUX_MAGIC_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#mesondefine HAVE_LOCALE_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#mesondefine HAVE_LOCALTIME_R
-
-/* Define if you have the 'long double' type. */
-#mesondefine HAVE_LONG_DOUBLE
-
-/* Define if you have the 'long long' type. */
-#mesondefine HAVE_LONG_LONG
-
-/* define if system printf can print long long */
-#mesondefine HAVE_LONG_LONG_FORMAT
-
-/* Define to 1 if you have the `lstat' function. */
-#mesondefine HAVE_LSTAT
-
-/* Define to 1 if you have the <mach/mach_time.h> header file. */
-#mesondefine HAVE_MACH_MACH_TIME_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#mesondefine HAVE_MALLOC_H
-
-/* Define to 1 if you have the `mbrtowc' function. */
-#mesondefine HAVE_MBRTOWC
-
-/* Define to 1 if you have the `memalign' function. */
-#mesondefine HAVE_MEMALIGN
-
-/* Define to 1 if you have the `memmem' function. */
-#mesondefine HAVE_MEMMEM
-
-/* Define to 1 if you have the <memory.h> header file. */
-#mesondefine HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mmap' function. */
-#mesondefine HAVE_MMAP
-
-/* Define to 1 if you have the <mntent.h> header file. */
-#mesondefine HAVE_MNTENT_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#mesondefine HAVE_NDIR_H
-
-/* We have AF_NETLINK sockets */
-#mesondefine HAVE_NETLINK
-
-/* Define to 1 if you have the `newlocale' function. */
-#mesondefine HAVE_NEWLOCALE
-
-/* open option O_DIRECTORY */
-#mesondefine HAVE_OPEN_O_DIRECTORY
-
-/* Define to 1 if you have the `pipe2' function. */
-#mesondefine HAVE_PIPE2
-
-/* Define to 1 if you have the `poll' function. */
-#mesondefine HAVE_POLL
-
-/* Define to 1 if you have the `posix_memalign' function. */
-#mesondefine HAVE_POSIX_MEMALIGN
-
-/* Define to 1 if you have the `prlimit' function. */
-#mesondefine HAVE_PRLIMIT
-
-/* Have function pthread_attr_setstacksize */
-#mesondefine HAVE_PTHREAD_ATTR_SETSTACKSIZE
-
-/* Have function pthread_cond_timedwait_relative_np */
-#mesondefine HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP
-
-/* Have function pthread_condattr_setclock */
-#mesondefine HAVE_PTHREAD_CONDATTR_SETCLOCK
-
-/* Have function pthread_setname_np without TID as argument */
-#mesondefine HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID
-
-/* Have function pthread_setname_np with TID as argument */
-#mesondefine HAVE_PTHREAD_SETNAME_NP_WITH_TID
-
-/* Have function pthread_getname_np */
-#mesondefine HAVE_PTHREAD_GETNAME_NP
-
-/* Define to 1 if the system has the type `ptrdiff_t'. */
-#mesondefine HAVE_PTRDIFF_T
-
-/* Define to 1 if you have the `readlink' function. */
-#mesondefine HAVE_READLINK
-
-/* Define to 1 if you have the `recvmmsg' function. */
-#mesondefine HAVE_RECVMMSG
-
-/* Define to 1 if you have the 'res_init' function. */
-#mesondefine HAVE_RES_INIT
-
-/* Define to 1 if you have the 'res_nclose' function. */
-#mesondefine HAVE_RES_NCLOSE
-
-/* Define to 1 if you have the 'res_ndestroy' function. */
-#mesondefine HAVE_RES_NDESTROY
-
-/* Define to 1 if you have the 'res_ninit' function. */
-#mesondefine HAVE_RES_NINIT
-
-/* Define to 1 if you have the 'res_nquery' function. */
-#mesondefine HAVE_RES_NQUERY
-
-/* Define to 1 if you have the <sched.h> header file. */
-#mesondefine HAVE_SCHED_H
-
-/* Define to 1 if libselinux is available */
-#mesondefine HAVE_SELINUX
-
-/* Define to 1 if you have the `sendmmsg' function. */
-#mesondefine HAVE_SENDMMSG
-
-/* Define to 1 if you have the `setenv' function. */
-#mesondefine HAVE_SETENV
-
-/* Define to 1 if you have the `setmntent' function. */
-#mesondefine HAVE_SETMNTENT
-
-/* Define if you have the 'sig_atomic_t' type. */
-#mesondefine HAVE_SIG_ATOMIC_T
-
-/* Define if there is support for the ioctl request SIOCGIFADDR. */
-#mesondefine HAVE_SIOCGIFADDR
-
-/* Define to 1 if you have the `snprintf' function. */
-#mesondefine HAVE_SNPRINTF
-
-/* Define to 1 if you have the `splice' function. */
-#mesondefine HAVE_SPLICE
-
-/* Define to 1 if you have the `statfs' function. */
-#mesondefine HAVE_STATFS
-
-/* Define to 1 if you have the `statvfs' function. */
-#mesondefine HAVE_STATVFS
-
-/* Define to 1 if you have the `mkostemp' function. */
-#mesondefine HAVE_MKOSTEMP
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#mesondefine HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#mesondefine HAVE_STDINT_H
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#mesondefine HAVE_STDINT_H_WITH_UINTMAX
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#mesondefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the `stpcpy' function. */
-#mesondefine HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#mesondefine HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strerror_r' function. */
-#mesondefine HAVE_STRERROR_R
-
-/* Define if strerror_r returns char * */
-#mesondefine STRERROR_R_CHAR_P
-
-/* Define to 1 if you have the <strings.h> header file. */
-#mesondefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#mesondefine HAVE_STRING_H
-
-/* Have functions strlcpy and strlcat */
-#mesondefine HAVE_STRLCPY
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#mesondefine HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strnlen' function. */
-#mesondefine HAVE_STRNLEN
-
-/* Define to 1 if you have the `strsignal' function. */
-#mesondefine HAVE_STRSIGNAL
-
-/* Define to 1 if you have the `strtod_l' function. */
-#mesondefine HAVE_STRTOD_L
-
-/* Define to 1 if you have the `strtoll_l' function. */
-#mesondefine HAVE_STRTOLL_L
-
-/* Define to 1 if you have the `strtoull_l' function. */
-#mesondefine HAVE_STRTOULL_L
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-#mesondefine HAVE_STRUCT_DIRENT_D_TYPE
-
-/* Define to 1 if `f_bavail' is a member of `struct statfs'. */
-#mesondefine HAVE_STRUCT_STATFS_F_BAVAIL
-
-/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
-#mesondefine HAVE_STRUCT_STATFS_F_FSTYPENAME
-
-/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
-#mesondefine HAVE_STRUCT_STATVFS_F_BASETYPE
-
-/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
-#mesondefine HAVE_STRUCT_STATVFS_F_FSTYPENAME
-
-/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_ATIMENSEC
-
-/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
-
-/* Define to 1 if `st_birthtim' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_BIRTHTIM
-
-/* Define to 1 if `st_birthtime' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_BIRTHTIME
-
-/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
-
-/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC
-
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_BLKSIZE
-
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_BLOCKS
-
-/* Define to 1 if `st_ctimensec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_CTIMENSEC
-
-/* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC
-
-/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_MTIMENSEC
-
-/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
-#mesondefine HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
-
-/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
-#mesondefine HAVE_STRUCT_TM_TM_GMTOFF
-
-/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
-#mesondefine HAVE_STRUCT_TM___TM_GMTOFF
-
-/* Define to 1 if you have the `symlink' function. */
-#mesondefine HAVE_SYMLINK
-
-/* Define to 1 if you have the `sysctlbyname' function. */
-#mesondefine HAVE_SYSCTLBYNAME
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#mesondefine HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-#mesondefine HAVE_SYS_EVENT_H
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-#mesondefine HAVE_SYS_FILIO_H
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-#mesondefine HAVE_SYS_INOTIFY_H
-
-/* Define to 1 if you have the <sys/mkdev.h> header file. */
-#mesondefine HAVE_SYS_MKDEV_H
-
-/* Define to 1 if you have the <sys/mntctl.h> header file. */
-#mesondefine HAVE_SYS_MNTCTL_H
-
-/* Define to 1 if you have the <sys/mnttab.h> header file. */
-#mesondefine HAVE_SYS_MNTTAB_H
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-#mesondefine HAVE_SYS_MOUNT_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#mesondefine HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#mesondefine HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#mesondefine HAVE_SYS_POLL_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#mesondefine HAVE_SYS_RESOURCE_H
-
-/* found fd_set in sys/select.h */
-#mesondefine HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-#mesondefine HAVE_SYS_STATFS_H
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-#mesondefine HAVE_SYS_STATVFS_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-#mesondefine HAVE_SYS_SYSCTL_H
-
-/* Define to 1 if you have the <sys/times.h> header file. */
-#mesondefine HAVE_SYS_TIMES_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#mesondefine HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#mesondefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#mesondefine HAVE_SYS_UIO_H
-
-/* Define to 1 if you have the <sys/vfstab.h> header file. */
-#mesondefine HAVE_SYS_VFSTAB_H
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#mesondefine HAVE_SYS_VFS_H
-
-/* Define to 1 if you have the <sys/vmount.h> header file. */
-#mesondefine HAVE_SYS_VMOUNT_H
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#mesondefine HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <sys/xattr.h> header file. */
-#mesondefine HAVE_SYS_XATTR_H
-
-/* Define to 1 if you have the `timegm' function. */
-#mesondefine HAVE_TIMEGM
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#mesondefine HAVE_UNISTD_H
-
-/* Define if your printf function family supports positional parameters as
-   specified by Unix98. */
-#mesondefine HAVE_UNIX98_PRINTF
-
-/* Define to 1 if you have the `unsetenv' function. */
-#mesondefine HAVE_UNSETENV
-
-/* Define to 1 if you have the `uselocale' function. */
-#mesondefine HAVE_USELOCALE
-
-/* Define to 1 if you have the `utimes' function. */
-#mesondefine HAVE_UTIMES
-
-/* Define to 1 if you have the `valloc' function. */
-#mesondefine HAVE_VALLOC
-
-/* Define to 1 if you have the <values.h> header file. */
-#mesondefine HAVE_VALUES_H
-
-/* Define to 1 if you have the `vasprintf' function. */
-#mesondefine HAVE_VASPRINTF
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#mesondefine HAVE_VSNPRINTF
-
-/* Define if you have the 'wchar_t' type. */
-#mesondefine HAVE_WCHAR_T
-
-/* Define if you Have wcrtomb() */
-#mesondefine HAVE_WCRTOMB
-
-/* Define to 1 if you have the `wcslen' function. */
-#mesondefine HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#mesondefine HAVE_WINT_T
-
-/* Have a working bcopy */
-#mesondefine HAVE_WORKING_BCOPY
-
-/* Define to 1 if xattr is available */
-#mesondefine HAVE_XATTR
-
-/* Define to 1 if xattr API uses XATTR_NOFOLLOW */
-#mesondefine HAVE_XATTR_NOFOLLOW
-
-/* Define to 1 if you have the <xlocale.h> header file. */
-#mesondefine HAVE_XLOCALE_H
-
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-#mesondefine HAVE__NSGETENVIRON
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ""
-
-/* Do we cache iconv descriptors */
-#mesondefine NEED_ICONV_CACHE
-
-/* didn't find fd_set */
-#mesondefine NO_FD_SET
-
-/* Define to the address where bug reports for this package should be sent. */
-#mesondefine PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#mesondefine PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#mesondefine PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#mesondefine PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#mesondefine PACKAGE_URL
-
-/* Define to the version of this package. */
-#mesondefine PACKAGE_VERSION
-
-/* define if posix_memalign() can allocate any size */
-#mesondefine POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS
-
-/* The size of `char', as computed by sizeof. */
-#mesondefine SIZEOF_CHAR
-
-/* The size of `int', as computed by sizeof. */
-#mesondefine SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#mesondefine SIZEOF_LONG
-
-/* The size of `long long', as computed by sizeof. */
-#mesondefine SIZEOF_LONG_LONG
-
-/* The size of `short', as computed by sizeof. */
-#mesondefine SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#mesondefine SIZEOF_SIZE_T
-
-/* The size of `ssize_t', as computed by sizeof. */
-#mesondefine SIZEOF_SSIZE_T
-
-/* The size of `void *', as computed by sizeof. */
-#mesondefine SIZEOF_VOID_P
-
-/* The size of `__int64', as computed by sizeof. */
-#mesondefine SIZEOF___INT64
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#mesondefine STACK_DIRECTION
-
-/* Number of arguments to statfs() */
-#mesondefine STATFS_ARGS
-
-/* Define to 1 if you have the ANSI C header files. */
-#mesondefine STDC_HEADERS
-
-/* Use no threads */
-/* #undef THREADS_NONE */
-
-/* Use pthreads */
-#mesondefine THREADS_POSIX
-
-/* Use w32 threads */
-#mesondefine THREADS_WIN32
-
-/* Using GNU libiconv */
-#mesondefine USE_LIBICONV_GNU
-
-/* Using a native implementation of iconv in a separate library */
-#mesondefine USE_LIBICONV_NATIVE
-
-/* Define to use statfs() */
-#mesondefine USE_STATFS
-
-/* Define to use statvfs() */
-#mesondefine USE_STATVFS
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-#mesondefine _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-#mesondefine _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-#mesondefine _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-#mesondefine _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-#mesondefine __EXTENSIONS__
-#endif
-
-/* using the system-supplied PCRE library */
-#mesondefine USE_SYSTEM_PCRE
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#mesondefine _FILE_OFFSET_BITS
-
-/* defines how to decorate public symbols while building */
-#mesondefine _GLIB_EXTERN
-
-/* Define for large files, on AIX-style hosts. */
-#mesondefine _LARGE_FILES
-
-/* Target the Windows 7 API */
-#mesondefine _WIN32_WINNT
-
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-#mesondefine _XOPEN_SOURCE
-
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-#mesondefine _XOPEN_SOURCE_EXTENDED
-
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-#mesondefine __EXTENSIONS__
-
-/* compiler supports atomic operations */
-#mesondefine __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#mesondefine const
-
-/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
-#mesondefine intmax_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#mesondefine signed
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#mesondefine size_t
-
-#mesondefine EXEEXT
-
-#mesondefine MAJOR_IN_MKDEV
-#mesondefine MAJOR_IN_SYSMACROS
-#mesondefine HAVE_RTLD_LAZY
-#mesondefine HAVE_RTLD_NOW
-#mesondefine HAVE_RTLD_GLOBAL
diff --git a/config.h.win32.in b/config.h.win32.in
deleted file mode 100644
index 14ac11d39..000000000
--- a/config.h.win32.in
+++ /dev/null
@@ -1,872 +0,0 @@
-/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* The normal alignment of `guint32', in bytes. */
-#define ALIGNOF_GUINT32 4
-
-/* The normal alignment of `guint64', in bytes. */
-#define ALIGNOF_GUINT64 8
-
-/* The normal alignment of `unsigned long', in bytes. */
-#define ALIGNOF_UNSIGNED_LONG 4
-
-/* poll doesn't work on devices */
-#define BROKEN_POLL 1
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Whether to disable memory pools */
-/* #undef DISABLE_MEM_POOLS */
-
-/* Whether to enable GC friendliness by default */
-/* #undef ENABLE_GC_FRIENDLY_DEFAULT */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* Define the gettext package to be used */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* Define to the GLIB binary age */
-#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
-
-/* Define to the GLIB interface age */
-#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
-
-/* Define the location where the catalogs will be installed */
-#define GLIB_LOCALE_DIR "NONE/share/locale"
-
-/* Define to the GLIB major version */
-#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
-
-/* Define to the GLIB micro version */
-#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
-
-/* Define to the GLIB minor version */
-#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
-
-/* A 'va_copy' style function */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-# define G_VA_COPY va_copy
-#else /* _MSC_VER && _MSC_VER < 1800 */
-/* #undef G_VA_COPY */
-#endif
-
-/* 'va_lists' cannot be copies as values */
-/* #undef G_VA_COPY_AS_ARRAY */
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-/* #undef HAVE_ALLOCA */
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <attr/xattr.h> header file. */
-/* #undef HAVE_ATTR_XATTR_H */
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-
-/* Define if you have a version of the snprintf function with semantics as
-   specified by the ISO C99 standard. */
-#undef HAVE_C99_SNPRINTF
-
-/* Define if you have a version of the vsnprintf function with semantics as
-   specified by the ISO C99 standard. */
-#undef HAVE_C99_VSNPRINTF
-
-/* define to 1 if Carbon is available */
-/* #undef HAVE_CARBON */
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef HAVE_CLOCK_GETTIME */
-
-/* define to 1 if Cocoa is available */
-/* #undef HAVE_COCOA */
-
-/* Have nl_langinfo (CODESET) */
-/* #undef HAVE_CODESET */
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
-/* Define if dbus-1 is available */
-/* #undef HAVE_DBUS1 */
-
-/* Define to 1 if you have the `dcgettext' function. */
-#define HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#ifndef _MSC_VER
-# define HAVE_DIRENT_H 1
-#else
-/* # undef HAVE_DIRENT_H */
-#endif
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if using dtrace probes. */
-/* #undef HAVE_DTRACE */
-
-/* Define to 1 if you have the `endmntent' function. */
-/* #undef HAVE_ENDMNTENT */
-
-/* Define to 1 if you have the `endservent' function. */
-/* #undef HAVE_ENDSERVENT */
-
-/* we have the eventfd(2) system call */
-/* #undef HAVE_EVENTFD */
-
-/* Define to 1 if you have the `fallocate' function. */
-/* #undef HAVE_FALLOCATE */
-
-/* Define if we have FAM */
-/* #undef HAVE_FAM */
-
-/* Define to 1 if you have the <fam.h> header file. */
-/* #undef HAVE_FAM_H */
-
-/* Define if we have FAMNoExists in fam */
-/* #undef HAVE_FAM_NO_EXISTS */
-
-/* Define to 1 if you have the `fchmod' function. */
-/* #undef HAVE_FCHMOD */
-
-/* Define to 1 if you have the `fchown' function. */
-/* #undef HAVE_FCHOWN */
-
-/* Define to 1 if you have the `fdwalk' function. */
-/* #undef HAVE_FDWALK */
-
-/* Define to 1 if you have the <fstab.h> header file. */
-/* #undef HAVE_FSTAB_H */
-
-/* Define to 1 if you have the `fsync' function. */
-/* #undef HAVE_FSYNC */
-
-/* we have the futex(2) system call */
-/* #undef HAVE_FUTEX */
-
-/* Define to 1 if you have the `getc_unlocked' function. */
-/* #undef HAVE_GETC_UNLOCKED */
-
-/* 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 */
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define to 1 if you have the `getvfsstat' function. */
-/* #undef HAVE_GETVFSSTAT */
-
-/* Define to 1 if you have the `gmtime_r' function. */
-/* #undef HAVE_GMTIME_R */
-
-/* define to use system printf */
-/* #undef HAVE_GOOD_PRINTF */
-
-/* Define to 1 if you have the `hasmntopt' function. */
-/* #undef HAVE_HASMNTOPT */
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `if_nametoindex' function. */
-#define HAVE_IF_NAMETOINDEX 1
-
-/* Define to 1 if you have the `inotify_init1' function. */
-/* #undef HAVE_INOTIFY_INIT1 */
-
-/* define to support printing 64-bit integers with format I64 */
-/* #undef HAVE_INT64_AND_I64 */
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1600)
-# define HAVE_INTMAX_T 1
-#endif
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-# define HAVE_INTTYPES_H 1
-#endif
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-# define HAVE_INTTYPES_H_WITH_UINTMAX 1
-#endif
-
-/* Define if we have struct ip_mreqn */
-/* #undef HAVE_IP_MREQN */
-
-/* Define to 1 if you have the `issetugid' function. */
-/* #undef HAVE_ISSETUGID */
-
-/* Define to 1 if you have the `kevent' function. */
-/* #undef HAVE_KEVENT */
-
-/* Define to 1 if you have the `kqueue' function. */
-/* #undef HAVE_KQUEUE */
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-/* #undef HAVE_LANGINFO_CODESET */
-
-/* Have nl_langinfo (_NL_CTYPE_OUTDIGITn_MB) */
-/* #undef HAVE_LANGINFO_OUTDIGIT */
-
-/* Have nl_langinfo (PM_STR) */
-/* #undef HAVE_LANGINFO_TIME */
-
-/* Define to 1 if you have the `lchmod' function. */
-/* #undef HAVE_LCHMOD */
-
-/* Define to 1 if you have the `lchown' function. */
-/* #undef HAVE_LCHOWN */
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define if you have the __libc_enable_secure variable (GNU libc, eglibc) */
-/* #undef HAVE_LIBC_ENABLE_SECURE */
-
-/* Define if libelf is available */
-/* #undef HAVE_LIBELF */
-
-/* Define to 1 if you have the `link' function. */
-/* #undef HAVE_LINK */
-
-/* Define to 1 if you have the <linux/magic.h> header file. */
-/* #undef HAVE_LINUX_MAGIC_H */
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
-
-/* Define if you have the 'long double' type. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you have the 'long long' type. */
-#define HAVE_LONG_LONG 1
-
-/* define if system printf can print long long */
-/* #undef HAVE_LONG_LONG_FORMAT */
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the <mach/mach_time.h> header file. */
-/* #undef HAVE_MACH_MACH_TIME_H */
-
-/* Define to 1 if you have the <malloc.h> 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 */
-
-/* Define to 1 if you have the `memmem' function. */
-/* #undef HAVE_MEMMEM */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the <mntent.h> header file. */
-/* #undef HAVE_MNTENT_H */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* We have AF_NETLINK sockets */
-/* #undef HAVE_NETLINK */
-
-/* Define to 1 if you have the `newlocale' function. */
-/* #undef HAVE_NEWLOCALE */
-
-/* open option O_DIRECTORY */
-/* #undef HAVE_OPEN_O_DIRECTORY */
-
-/* Define to 1 if you have the `pipe2' function. */
-/* #undef HAVE_PIPE2 */
-
-/* Define to 1 if you have the `poll' function. */
-/* #undef HAVE_POLL */
-
-/* Define to 1 if you have the `posix_memalign' function. */
-/* #undef HAVE_POSIX_MEMALIGN */
-
-/* Define to 1 if you have the `prlimit' function. */
-/* #undef HAVE_PRLIMIT */
-
-/* Have function pthread_attr_setstacksize */
-/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-
-/* Have function pthread_cond_timedwait_relative_np */
-/* #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP */
-
-/* Have function pthread_condattr_setclock */
-/* #undef HAVE_PTHREAD_CONDATTR_SETCLOCK */
-
-/* Have function pthread_setname_np without TID as argument */
-/* #undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID */
-
-/* Have function pthread_setname_np with TID as argument */
-/* #undef HAVE_PTHREAD_SETNAME_NP_WITH_TID */
-
-/* Define to 1 if the system has the type `ptrdiff_t'. */
-#define HAVE_PTRDIFF_T 1
-
-/* Define to 1 if you have the `readlink' function. */
-/* #undef HAVE_READLINK */
-
-/* Define to 1 if you have the `recvmmsg' function. */
-/* #undef HAVE_RECVMMSG */
-
-/* Define to 1 if you have the 'res_init' function. */
-/* #undef HAVE_RES_INIT */
-
-/* Define to 1 if you have the 'res_nclose' function. */
-/* #undef HAVE_RES_NCLOSE */
-
-/* Define to 1 if you have the 'res_ndestroy' function. */
-/* #undef HAVE_RES_NDESTROY */
-
-/* Define to 1 if you have the 'res_ninit' function. */
-/* #undef HAVE_RES_NINIT */
-
-/* Define to 1 if you have the 'res_nquery' function. */
-/* #undef HAVE_RES_NQUERY */
-
-/* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Define to 1 if libselinux is available */
-/* #undef HAVE_SELINUX */
-
-/* Define to 1 if you have the <selinux/selinux.h> header file. */
-/* #undef HAVE_SELINUX_SELINUX_H */
-
-/* Define to 1 if you have the `sendmmsg' function. */
-/* #undef HAVE_SENDMMSG */
-
-/* Define to 1 if you have the `setenv' function. */
-/* #undef HAVE_SETENV */
-
-/* Define to 1 if you have the `setmntent' function. */
-/* #undef HAVE_SETMNTENT */
-
-/* Define if you have the 'sig_atomic_t' type. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-#if defined (_MSC_VER) && (_MSC_VER < 1900)
-# define snprintf _snprintf
-#endif
-
-/* Define to 1 if you have the `splice' function. */
-/* #undef HAVE_SPLICE */
-
-/* Define to 1 if you have the `statfs' function. */
-/* #undef HAVE_STATFS */
-
-/* Define to 1 if you have the `statvfs' function. */
-/* #undef HAVE_STATVFS */
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1600)
-# define HAVE_STDINT_H 1
-#endif
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1600)
-# define HAVE_STDINT_H_WITH_UINTMAX 1
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `stpcpy' function. */
-/* #undef HAVE_STPCPY */
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-#ifdef _MSC_VER
-# define strcasecmp _stricmp
-#endif
-
-/* Define to 1 if you have the `strerror_r' function. */
-/* #undef HAVE_STRERROR_R */
-
-/* Define if strerror_r returns char * */
-/* #undef STRERROR_R_CHAR_P */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef _MSC_VER
-# define HAVE_STRINGS_H 1
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Have functions strlcpy and strlcat */
-/* #undef HAVE_STRLCPY */
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-#ifdef _MSC_VER
-# define strncasecmp _strnicmp
-#endif
-
-/* Define to 1 if you have the `strnlen' function. */
-#define HAVE_STRNLEN 1
-
-/* Define to 1 if you have the `strsignal' function. */
-/* #undef HAVE_STRSIGNAL */
-
-/* Define to 1 if you have the `strtod_l' function. */
-/* #undef HAVE_STRTOD_L */
-
-/* Define to 1 if you have the `strtoll_l' function. */
-/* #undef HAVE_STRTOLL_L */
-
-/* Define to 1 if you have the `strtoull_l' function. */
-/* #undef HAVE_STRTOULL_L */
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
-
-/* Define to 1 if `f_bavail' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-
-/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
-
-/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
-
-/* 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 */
-
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */
-
-/* Define to 1 if `st_ctimensec' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */
-
-/* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */
-
-/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
-
-/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
-
-/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
-/* #undef HAVE_STRUCT_TM_TM_GMTOFF */
-
-/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
-/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
-
-/* Define to 1 if you have the `symlink' function. */
-/* #undef HAVE_SYMLINK */
-
-/* Define to 1 if you have the `sysctlbyname' function. */
-/* #undef HAVE_SYSCTLBYNAME */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-/* #undef HAVE_SYS_EVENT_H */
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-/* #undef HAVE_SYS_INOTIFY_H */
-
-/* Define to 1 if you have the <sys/mkdev.h> header file. */
-/* #undef HAVE_SYS_MKDEV_H */
-
-/* Define to 1 if you have the <sys/mntctl.h> header file. */
-/* #undef HAVE_SYS_MNTCTL_H */
-
-/* Define to 1 if you have the <sys/mnttab.h> header file. */
-/* #undef HAVE_SYS_MNTTAB_H */
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-/* #undef HAVE_SYS_MOUNT_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#ifndef _MSC_VER
-# define HAVE_SYS_PARAM_H 1
-#endif
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-/* #undef HAVE_SYS_POLL_H */
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-/* #undef HAVE_SYS_RESOURCE_H */
-
-/* found fd_set in sys/select.h */
-/* #undef HAVE_SYS_SELECT_H */
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-/* #undef HAVE_SYS_STATFS_H */
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-/* #undef HAVE_SYS_STATVFS_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-/* #undef HAVE_SYS_SYSCTL_H */
-
-/* Define to 1 if you have the <sys/times.h> header file. */
-/* #undef HAVE_SYS_TIMES_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#ifndef _MSC_VER
-# define HAVE_SYS_TIME_H 1
-#endif
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #undef HAVE_SYS_UIO_H */
-
-/* Define to 1 if you have the <sys/vfstab.h> header file. */
-/* #undef HAVE_SYS_VFSTAB_H */
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-/* #undef HAVE_SYS_VFS_H */
-
-/* Define to 1 if you have the <sys/vmount.h> header file. */
-/* #undef HAVE_SYS_VMOUNT_H */
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define to 1 if you have the <sys/xattr.h> 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 <unistd.h> 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 */
-
-/* Define to 1 if you have the `unsetenv' function. */
-/* #undef HAVE_UNSETENV */
-
-/* Define to 1 if you have the `uselocale' function. */
-/* #undef HAVE_USELOCALE */
-
-/* Define to 1 if you have the `utimes' function. */
-/* #undef HAVE_UTIMES */
-
-/* Define to 1 if you have the `valloc' function. */
-/* #undef HAVE_VALLOC */
-
-/* Define to 1 if you have the <values.h> header file. */
-#ifdef _MSC_VER
-# define HAVE_VALUES_H 1
-#endif
-
-/* Define to 1 if you have the `vasprintf' function. */
-#define HAVE_VASPRINTF 1
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define HAVE_WCSLEN 1
-
-/* 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 */
-
-/* Define to 1 if xattr API uses XATTR_NOFOLLOW */
-/* #undef HAVE_XATTR_NOFOLLOW */
-
-/* Define to 1 if you have the <xlocale.h> header file. */
-/* #undef HAVE_XLOCALE_H */
-
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ""
-
-/* Do we cache iconv descriptors */
-/* #undef NEED_ICONV_CACHE */
-
-/* didn't find fd_set */
-/* #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"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "glib"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glib @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "glib"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@"
-
-/* define if posix_memalign() can allocate any size */
-/* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */
-
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* The size of `size_t', as computed by sizeof. */
-#ifdef _WIN64
-# define SIZEOF_SIZE_T 8
-#else
-# define SIZEOF_SIZE_T 4
-#endif
-
-/* The size of `ssize_t', as computed by sizeof. */
-#ifdef _WIN64
-# define SIZEOF_SSIZE_T 8
-#else
-# define SIZEOF_SSIZE_T 4
-#endif
-
-/* The size of `void *', as computed by sizeof. */
-#ifdef _WIN64
-# define SIZEOF_VOID_P 8
-#else
-# define SIZEOF_VOID_P 4
-#endif
-
-/* The size of `__int64', as computed by sizeof. */
-#define SIZEOF___INT64 8
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Number of arguments to statfs() */
-/* #undef STATFS_ARGS */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Use no threads */
-/* #undef THREADS_NONE */
-
-/* Use pthreads */
-/* #undef THREADS_POSIX */
-
-/* Use w32 threads */
-#define THREADS_WIN32 1
-
-/* Using GNU libiconv */
-/* #undef USE_LIBICONV_GNU */
-
-/* Using a native implementation of iconv in a separate library */
-#define USE_LIBICONV_NATIVE 1
-
-/* Define to use statfs() */
-/* #undef USE_STATFS */
-
-/* Define to use statvfs() */
-/* #undef USE_STATVFS */
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-/* #undef _POSIX_PTHREAD_SEMANTICS */
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-/* #undef _TANDEM_SOURCE */
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-#define __EXTENSIONS__ 1
-#endif
-
-/* using the system-supplied PCRE library */
-/* This is determined in the MSVC projects */
-/* #undef USE_SYSTEM_PCRE */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* defines how to decorate public symbols while building */
-#ifdef _MSC_VER
-# define _GLIB_EXTERN __declspec (dllexport) extern
-#else
-# define _GLIB_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern
-#endif
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Target the Windows 7 API */
-#define _WIN32_WINNT 0x0601
-
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-/* #undef _XOPEN_SOURCE */
-
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-/* #undef _XOPEN_SOURCE_EXTENDED */
-
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-#define __EXTENSIONS__ 1
-
-/* compiler supports atomic operations */
-/* #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
-/* #undef intmax_t */
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-/* #undef signed */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-#define EXEEXT ".exe"
-
-/* #undef MAJOR_IN_MKDEV */
-/* #undef MAJOR_IN_SYSMACROS */
-/* #undef HAVE_RTLD_LAZY */
-/* #undef HAVE_RTLD_NOW */
-/* #undef HAVE_RTLD_GLOBAL */
diff --git a/configure.ac b/configure.ac
index a5c0eb848..c89032c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [57])
-m4_define([glib_micro_version], [1])
+m4_define([glib_micro_version], [2])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
@@ -54,7 +54,7 @@ m4_define([glib_debug_default],
 
 
 AC_INIT(glib, [glib_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=glib])
+        [https://gitlab.gnome.org/GNOME/glib/issues/new])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([glib/glib.h])
@@ -248,14 +248,6 @@ AC_ARG_ENABLE(debug,
                              [turn on debugging @<:@default=glib_debug_default@:>@]),,
               enable_debug=glib_debug_default)
 
-AC_ARG_ENABLE(gc_friendly,
-              [AS_HELP_STRING([--enable-gc-friendly],
-                              [turn on garbage collector friendliness [default=no]])],,
-              [enable_gc_friendly=no])
-AC_ARG_ENABLE(mem_pools,
-              [AS_HELP_STRING([--disable-mem-pools],
-			      [disable all glib memory pools])],,
-	      [disable_mem_pools=no])
 AC_ARG_ENABLE(libdbuspolicy,
               [AS_HELP_STRING([--enable-libdbuspolicy],
                               [enable libdbuspolicy for kdbus transport [default=no]])],,
@@ -263,20 +255,6 @@ AC_ARG_ENABLE(libdbuspolicy,
 
 GLIB_TESTS
 
-AC_MSG_CHECKING([whether to enable garbage collector friendliness])
-AS_IF([test "x$enable_gc_friendly" = "xyes"], [
-  AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default])
-  AC_MSG_RESULT([yes])
-], [ AC_MSG_RESULT([no]) ])
-
-AC_MSG_CHECKING([whether to disable memory pools])
-AS_IF([test "x$disable_mem_pools" = "xno"], [
-  AC_MSG_RESULT([no])
-], [
-  AC_DEFINE(DISABLE_MEM_POOLS, [1], [Whether to disable memory pools])
-  AC_MSG_RESULT([yes])
-])
-
 AC_MSG_CHECKING([whether to enable libdbuspolicy for kdbus transport])
 AM_CONDITIONAL(LIBDBUSPOLICY, [test "x$enable_libdbuspolicy" = "xyes"])
 AS_IF([test "x$enable_libdbuspolicy" = "xyes"], [
@@ -369,7 +347,6 @@ AC_SUBST(GLIB_EXTRA_CFLAGS)
 AC_EXEEXT
 
 AC_PROG_AWK
-AC_CHECK_PROGS(PERL, [perl5 perl])
 
 # option to specify python interpreter to use; this just sets $PYTHON, so that
 # we will fallback to reading $PYTHON if --with-python is not given, and
@@ -517,20 +494,9 @@ AM_CONDITIONAL(OS_WIN32_AND_DLL_COMPILATION, [test x$glib_native_win32 = xyes -a
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2 issetugid)
-AC_CHECK_FUNCS(timegm gmtime_r)
+AC_CHECK_FUNCS(timegm gmtime_r posix_spawn)
 AC_FUNC_STRERROR_R()
 
-AC_CACHE_CHECK([for __libc_enable_secure], glib_cv_have_libc_enable_secure,
-  [AC_TRY_LINK([#include <unistd.h>
-    extern int __libc_enable_secure;],
-    [return __libc_enable_secure;],
-   glib_cv_have_libc_enable_secure=yes,
-   glib_cv_have_libc_enable_secure=no)])
-AS_IF([test x$glib_cv_have_libc_enable_secure = xyes], [
-   AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1,
-     [Define if you have the __libc_enable_secure variable (GNU libc, eglibc)])
-])
-
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(long)
@@ -581,10 +547,6 @@ AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8],
 		done])
 	AS_IF([ test -n "$glib_cv_long_long_format"], [
 	  AC_MSG_RESULT(%${glib_cv_long_long_format}u)
-	  AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
-	  if test x"$glib_cv_long_long_format" = xI64; then
-	    AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64])
-          fi
 	], [AC_MSG_RESULT(none)])
 ],[ test x$ac_cv_sizeof___int64 = x8], [
 	# __int64 is a 64 bit integer.
@@ -592,8 +554,6 @@ AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8],
 	# We know this is MSVCRT.DLL, and what the formats are
 	glib_cv_long_long_format=I64
 	AC_MSG_RESULT(%${glib_cv_long_long_format}u)
-        AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
-	AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64])
 ])
 
 AC_C_CONST
@@ -699,7 +659,7 @@ fi
 # check for header files
 AC_CHECK_HEADERS([sys/param.h sys/resource.h mach/mach_time.h])
 AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h])
-AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
+AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h sys/auxv.h])
 AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
 AC_CHECK_HEADERS([linux/magic.h linux/memfd.h sys/prctl.h])
 AC_CHECK_HEADERS([termios.h])
@@ -719,6 +679,8 @@ AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [],
 AC_CHECK_FUNCS(sysctlbyname)
 
 AC_HEADER_MAJOR
+AS_IF([test "$ac_cv_header_sys_types_h_makedev" = "yes"],
+      [AC_DEFINE([MAJOR_IN_TYPES], [1], [Define to 1 if `major', `minor', and `makedev' are declared in <sys/types.h>.])])
 AC_CHECK_HEADERS([xlocale.h])
 
 # check for structure fields
@@ -1235,24 +1197,6 @@ jm_AC_TYPE_INTMAX_T
 AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
 AC_FUNC_SNPRINTF_C99
 
-# Check if <sys/select.h> needs to be included for fd_set
-AC_MSG_CHECKING([for fd_set])
-AC_TRY_COMPILE([#include <sys/types.h>],
-        [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
-AS_IF([test "$gtk_ok" = "yes"], [
-    AC_MSG_RESULT([yes, found in sys/types.h])
-], [
-    AC_EGREP_HEADER(fd_set, sys/select.h, gtk_ok=yes)
-    if test "$gtk_ok" = "yes"; then
-	# *** FIXME: give it a different name
-        AC_DEFINE(HAVE_SYS_SELECT_H,1,[found fd_set in sys/select.h])
-        AC_MSG_RESULT([yes, found in sys/select.h])
-    else
-	AC_DEFINE(NO_FD_SET,1,[didn't find fd_set])
-	AC_MSG_RESULT(no)
-    fi
-])
-
 dnl Check for nl_langinfo and CODESET
 AC_LANG_SAVE
 AC_LANG_C
@@ -1349,48 +1293,6 @@ if test x$glib_cv_langinfo_abaltmon = xyes; then
 fi
 AC_LANG_RESTORE
 
-dnl ****************************************
-dnl *** posix_memalign                   ***
-dnl ****************************************
-AC_MSG_CHECKING(for a compliant posix_memalign() implementation)
-AC_CACHE_VAL(glib_cv_compliant_posix_memalign,[
-    glib_cv_compliant_posix_memalign=0
-    if test "$ac_cv_func_posix_memalign" = "yes" ; then
-	AC_TRY_RUN([
-                #define _XOPEN_SOURCE 600
-                #include <stdlib.h> /* posix_memalign() should be defined here */
-                /* some systems break if #include <malloc.h> used */
-		static void test_memalign (size_t boundary, size_t size) {
-		    void *mem = 0;
-		    if (posix_memalign (&mem, boundary, size) != 0 || !mem)
-			exit (1);
-                    else
-                      free (mem);
-		}
-		int main() {
-		    test_memalign (  128,   128 - 2 * sizeof (void*));
-		    test_memalign (  256,   256 - 2 * sizeof (void*));
-		    test_memalign (  512,   512 - 2 * sizeof (void*));
-		    test_memalign ( 1024,  1024 - 2 * sizeof (void*));
-		    test_memalign ( 2048,  2048 - 2 * sizeof (void*));
-		    test_memalign ( 4096,  4096 - 2 * sizeof (void*));
-		    test_memalign ( 8192,  8192 - 2 * sizeof (void*));
-		    test_memalign (16384, 16384 - 2 * sizeof (void*));
-		    test_memalign (32768, 32768 - 2 * sizeof (void*));
-		    exit (0); /* success */
-		}
-		],
-	    [glib_cv_compliant_posix_memalign=1], [], [:])
-      :
-    fi
-    ])
-AS_IF([test "$glib_cv_compliant_posix_memalign" = "1"], [
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS, 1, [define if posix_memalign() can allocate any size])
-], [
-    AC_MSG_RESULT(no)
-])
-
 
 dnl ****************************************
 dnl *** strlcpy/strlcat                  ***
@@ -1665,14 +1567,14 @@ dnl **********************
 AC_MSG_CHECKING(for gspawn implementation)
 case "$host" in
   *-*-mingw*)
-    GSPAWN=gspawn-win32.lo
+    g_spawn_impl=win32
     ;;
   *)
-    GSPAWN=gspawn.lo
+    g_spawn_impl=unix
     ;;    
 esac
-AC_MSG_RESULT($GSPAWN)
-AC_SUBST(GSPAWN)
+AC_MSG_RESULT($g_spawn_impl)
+AM_CONDITIONAL(G_SPAWN_WIN32, [test "$g_spawn_impl" = "win32"])
 
 dnl *************************
 dnl *** GIOChannel checks ***
@@ -1681,14 +1583,14 @@ dnl *************************
 AC_MSG_CHECKING(for GIOChannel implementation)
 case "$host" in
   *-*-mingw*)
-    GIO=giowin32.lo
+    g_io_channel_impl=win32
     ;;
   *)
-    GIO=giounix.lo
+    g_io_channel_impl=unix
     ;;    
 esac
-AC_MSG_RESULT($GIO)
-AC_SUBST(GIO)
+AC_MSG_RESULT($g_io_channel_impl)
+AM_CONDITIONAL(G_IO_CHANNEL_WIN32, [test "$g_io_channel_impl" = "win32"])
 
 dnl *********************************
 dnl *** Directory for GIO modules ***
@@ -1765,8 +1667,7 @@ FAM_LIBS=
 if test "x$should_disable_fam" = "xno"; then
 AC_CHECK_LIB(fam, FAMOpen,
   [AC_CHECK_HEADERS(fam.h,
-    [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM])
-     AC_CHECK_LIB(fam, FAMNoExists,
+    [AC_CHECK_LIB(fam, FAMNoExists,
      		  AC_DEFINE(HAVE_FAM_NO_EXISTS, [], [Define if we have FAMNoExists in fam]))
      FAM_LIBS="-lfam"]
      fam_support=yes,
@@ -1886,18 +1787,6 @@ dnl ****************************************
 dnl *** platform dependent source checks ***
 dnl ****************************************
 
-AC_MSG_CHECKING(for platform-dependent source)
-case "$host" in
-  *-*-cygwin*|*-*-mingw*)
-    PLATFORMDEP=gwin32.lo
-    ;;
-  *)
-    PLATFORMDEP=
-    ;;    
-esac
-AC_MSG_RESULT($PLATFORMDEP)
-AC_SUBST(PLATFORMDEP)
-
 AC_MSG_CHECKING([whether to compile timeloop])
 case "$host" in
   *-*-cygwin*|*-*-mingw*|*-*-minix)
@@ -2182,13 +2071,11 @@ AS_IF([test x$have_threads = xposix], [
            AC_DEFINE([THREADS_WIN32], [1], [Use w32 threads])
 	   g_threads_impl="WIN32"
 ], [
-           AC_DEFINE([THREADS_NONE], [1], [Use no threads])
 	   g_threads_impl="NONE"
            G_THREAD_LIBS=error
 ])
 AM_CONDITIONAL(THREADS_POSIX, [test "$g_threads_impl" = "POSIX"])
 AM_CONDITIONAL(THREADS_WIN32, [test "$g_threads_impl" = "WIN32"])
-AM_CONDITIONAL(THREADS_NONE, [test "$g_threads_impl" = "NONE"])
 
 if test "x$G_THREAD_LIBS" = xerror; then
         AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
@@ -2478,7 +2365,7 @@ dnl *********************
 dnl *** GRegex checks ***
 dnl *********************
 
-PCRE_REQUIRED_VERSION=8.13
+PCRE_REQUIRED_VERSION=8.31
 
 # Check if we should use the internal or the system-supplied pcre
 AC_ARG_WITH(pcre,
@@ -3559,7 +3446,8 @@ AC_ARG_ENABLE(compile-warnings,
 			      enable_compile_warnings=yes)
 AS_IF([test "x$enable_compile_warnings" != xno], [
   CC_CHECK_FLAGS_APPEND([GLIB_WARN_CFLAGS], [CFLAGS], [\
-   -Wall -Wstrict-prototypes -Wduplicated-branches \
+   -Wall -Wstrict-prototypes -Wduplicated-branches -Wmisleading-indentation \
+   -Wno-bad-function-cast \
    -Werror=declaration-after-statement \
    -Werror=missing-prototypes -Werror=implicit-function-declaration \
    -Werror=pointer-arith -Werror=init-self -Werror=format-security \
@@ -3611,21 +3499,11 @@ gobject-2.0.pc
 gio-2.0.pc
 gio-unix-2.0.pc
 gio-windows-2.0.pc
-glib-zip
 glib-gettextize
 Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/dirent/Makefile
-win32/Makefile
-win32/vs9/Makefile
-win32/vs9/glib-version-paths.vsprops
-win32/vs10/Makefile
-win32/vs10/glib-version-paths.props
-win32/vs11/Makefile
-win32/vs12/Makefile
-win32/vs14/Makefile
-win32/vs15/Makefile
 glib/Makefile
 glib/libcharset/Makefile
 glib/gnulib/Makefile
@@ -3666,13 +3544,13 @@ tests/Makefile
 tests/gobject/Makefile
 tests/refcount/Makefile
 m4macros/Makefile
+subprojects/Makefile
 ])
 
 # We need this command because the configure script will not preserve
 # the same attributes of the template files
 AC_CONFIG_COMMANDS([chmod-scripts],
-[chmod 0755 glib-zip
-chmod 0755 glib-gettextize
+[chmod 0755 glib-gettextize
 chmod 0755 gobject/glib-genmarshal
 chmod 0755 gobject/glib-mkenums])
 
@@ -3682,9 +3560,6 @@ chmod 0755 gobject/glib-mkenums])
 if false; then
   AC_CONFIG_FILES([
     INSTALL
-    README
-    config.h.win32
-    glib/glibconfig.h.win32
     glib/glib.rc
     gmodule/gmodule.rc
     gobject/gobject.rc
diff --git a/docs/macros.txt b/docs/macros.txt
index 8b4202987..953616382 100644
--- a/docs/macros.txt
+++ b/docs/macros.txt
@@ -9,10 +9,6 @@ GLib's configure options and corresponding macros
 	none
 --enable-debug=yes	[default for development branches]
 	-DG_ENABLE_DEBUG -g
---enable-gc-friendly=yes
-	#define ENABLE_GC_FRIENDLY_DEFAULT 1
---disable-mem-pools=yes
-	#define DISABLE_MEM_POOLS 1
 
 Besides these, there are some local feature specific options, but my main
 focus here is to concentrate on macros that affect overall GLib behaviour
@@ -22,26 +18,6 @@ and/or third party code.
 Notes on GLib's internal and global macros
 ==========================================
 
-
-ENABLE_GC_FRIENDLY_DEFAULT
-	Newly allocated memory that isn't directly initialized, as well
-	as memory being freed should be reset to 0. The point here is to
-	allow memory checkers and similar programs that use bohem GC alike
-	algorithms to produce more accurate results.
-	This can also be accomplished by setting the environment variable
-	G_DEBUG=gc-friendly.
-DISABLE_MEM_POOLS
-	Many small chunks of memory are often allocated via collective pools
-	in GLib and are cached after release to speed up reallocations.
-	For sparse memory systems this behaviour is often inferior, so
-	memory pools can be disabled to avoid excessive caching and force
-	atomic maintenance of chunks through the g_malloc/g_free.
-	Code currently affected by this macro:
-	- GList, GSList, GNode allocations
-	- GMemChunks become basically non-effective
-	- GSignal disables all caching (potentially very slow)
-	- GType doesn't honour the GTypeInfo n_preallocs field anymore
-	- the GBSearchArray flag G_BSEARCH_ALIGN_POWER2 becomes non-functional
 G_DISABLE_ASSERT
 	The g_assert() and g_assert_not_reached() become non-functional
 	with this define. The motivation is to speed up end-user apps by
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index e04ab6843..08093e8a0 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -8,6 +8,7 @@ DOC_MAIN_SGML_FILE=gio-docs.xml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = \
+	--rebuild-types \
 	--deprecated-guards="G_DISABLE_DEPRECATED" \
 	--ignore-decorators="GLIB_VAR|G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT|GLIB_AVAILABLE_IN_ALL|GLIB_AVAILABLE_IN_2_26|GLIB_AVAILABLE_IN_2_28|GLIB_AVAILABLE_IN_2_30|GLIB_AVAILABLE_IN_2_32|GLIB_AVAILABLE_IN_2_34|GLIB_AVAILABLE_IN_2_36|GLIB_AVAILABLE_IN_2_38|GLIB_AVAILABLE_IN_2_40|GLIB_AVAILABLE_IN_2_42|GLIB_AVAILABLE_IN_2_44|GLIB_AVAILABLE_IN_2_46|GLIB_AVAILABLE_IN_2_48|GLIB_AVAILABLE_IN_2_50|GLIB_AVAILABLE_IN_2_52|GLIB_AVAILABLE_IN_2_54|GLIB_AVAILABLE_IN_2_56|GLIB_DEPRECATED_IN_2_26|GLIB_DEPRECATED_IN_2_26_FOR|GLIB_DEPRECATED_IN_2_28|GLIB_DEPRECATED_IN_2_28_FOR|GLIB_DEPRECATED_IN_2_30|GLIB_DEPRECATED_IN_2_30_FOR|GLIB_DEPRECATED_IN_2_32|GLIB_DEPRECATED_IN_2_32_FOR|GLIB_DEPRECATED_IN_2_34|GLIB_DEPRECATED_IN_2_34_FOR|GLIB_DEPRECATED_IN_2_36|GLIB_DEPRECATED_IN_2_36_FOR|GLIB_DEPRECATED_IN_2_38|GLIB_DEPRECATED_IN_2_38_FOR|GLIB_DEPRECATED_IN_2_40|GLIB_DEPRECATED_IN_2_40_FOR|GLIB_DEPRECATED_IN_2_42|GLIB_DEPRECATED_IN_2_42_FOR|GLIB_DEPRECATED_IN_2_44|GLIB_DEPRECATED_IN_2_44_FOR|GLIB_DEPRECATED_IN_2_46|GLIB_DEPRECATED_IN_2_46_FOR|GLIB_DEPRECATED_IN_2_48|GLIB_DEPRECATED_IN_2_48_FOR|GLIB_DEPRECATED_IN_2_50|GLIB_DEPRECATED_IN_2_50_FOR|GLIB_DEPRECATED_IN_2_52|GLIB_DEPRECATED_IN_2_52_FOR|GLIB_DEPRECATED_IN_2_54|GLIB_DEPRECATED_IN_2_54_FOR|GLIB_DEPRECATED_IN_2_56|GLIB_DEPRECATED_IN_2_56_FOR"
 
@@ -20,82 +21,115 @@ HFILE_GLOB= \
 CFILE_GLOB=$(top_srcdir)/gio/*.c
 
 IGNORE_HFILES = \
-	fam				\
-	fen				\
-	gdbus-2.0			\
-	gvdb				\
-	inotify				\
-	kqueue				\
-	libasyncns			\
-	tests				\
-	win32				\
-	xdgmime				\
-	gappinfoprivate.h		\
-	gapplicationimpl.h		\
-	gasynchelper.h			\
-	gcontenttypeprivate.h		\
-	gcontextspecificgroup.h		\
-	gcredentialsprivate.h		\
-	gdbus-daemon-generated.h	\
-	gdbusactiongroup-private.h	\
-	gdbusauth.h			\
-	gdbusauthmechanismanon.h	\
-	gdbusauthmechanismexternal.h	\
-	gdbusauthmechanism.h		\
-	gdbusauthmechanismsha1.h	\
-	gdbusdaemon.h			\
-	gdbusprivate.h			\
-	gdelayedsettingsbackend.h	\
-	gdummyfile.h			\
-	gdummyproxyresolver.h		\
-	gdummytlsbackend.h		\
-	gfileattribute-priv.h		\
-	gfileinfo-priv.h		\
-	ghttpproxy.h			\
-	gio_trace.h			\
-	giomodule-priv.h		\
-	gioprivate.h			\
-	giowin32-priv.h			\
-	glocaldirectorymonitor.h	\
-	glocalfileenumerator.h		\
-	glocalfile.h			\
-	glocalfileinfo.h		\
-	glocalfileinputstream.h		\
-	glocalfileiostream.h		\
-	glocalfilemonitor.h		\
-	glocalfileoutputstream.h	\
-	glocalvfs.h			\
-	gmountprivate.h			\
-	gnativevolumemonitor.h		\
-	gnetworkingprivate.h		\
-	gnetworkmonitorbase.h		\
-	gnetworkmonitornetlink.h	\
-	gnetworkmonitornm.h		\
-	gnotificationbackend.h		\
-	gnotification-private.h		\
-	gpollfilemonitor.h		\
-	gregistrysettingsbackend.h	\
-	gresourcefile.h			\
-	gsettingsbackendinternal.h	\
-	gsettings-mapping.h		\
-	gsettingsschema-internal.h	\
-	gsocketinputstream.h		\
-	gsocketoutputstream.h		\
-	gsocks4aproxy.h			\
-	gsocks4proxy.h			\
-	gsocks5proxy.h			\
-	gsubprocesslauncher-private.h	\
-	gthreadedresolver.h		\
-	gunionvolumemonitor.h		\
-	gunixmount.h			\
-	gunixresolver.h			\
-	gunixvolume.h			\
-	gunixvolumemonitor.h		\
-	gwin32appinfo.h			\
-	gwin32mount.h			\
-	gwin32resolver.h		\
-	gwin32volumemonitor.h		\
-	thumbnail-verify.h
+	fam \
+	fen \
+	gdbus-2.0 \
+	gvdb \
+	inotify \
+	kqueue \
+	libasyncns \
+	tests \
+	win32 \
+	xdgmime \
+	gappinfoprivate.h \
+	gapplicationimpl.h \
+	gasynchelper.h \
+	gcontenttypeprivate.h \
+	gcontextspecificgroup.h \
+	gcredentialsprivate.h \
+	gdbus-daemon-generated.h \
+	gdbusactiongroup-private.h \
+	gdbusauth.h \
+	gdbusauthmechanismanon.h \
+	gdbusauthmechanismexternal.h \
+	gdbusauthmechanism.h \
+	gdbusauthmechanismsha1.h \
+	gdbusdaemon.h \
+	gdbusprivate.h \
+	gdelayedsettingsbackend.h \
+	gdummyfile.h \
+	gdummyproxyresolver.h \
+	gdummytlsbackend.h \
+	gfileattribute-priv.h \
+	gfileinfo-priv.h \
+	ghttpproxy.h \
+	giomodule-priv.h \
+	gioprivate.h \
+	giowin32-priv.h \
+	glocaldirectorymonitor.h \
+	glocalfileenumerator.h \
+	glocalfile.h \
+	glocalfileinfo.h \
+	glocalfileinputstream.h \
+	glocalfileiostream.h \
+	glocalfilemonitor.h \
+	glocalfileoutputstream.h \
+	glocalvfs.h \
+	gmountprivate.h \
+	gnativevolumemonitor.h \
+	gnetworkingprivate.h \
+	gnetworkmonitorbase.h \
+	gnetworkmonitornetlink.h \
+	gnetworkmonitornm.h \
+	gnetworkmonitorportal.h \
+	gnotificationbackend.h \
+	gnotification-private.h \
+	gpollfilemonitor.h \
+	gproxyresolverportal.h \
+	gregistrysettingsbackend.h \
+	gresourcefile.h \
+	gsettingsbackendinternal.h \
+	gsettings-mapping.h \
+	gsettingsschema-internal.h \
+	gsocketinputstream.h \
+	gsocketoutputstream.h \
+	gsocks4aproxy.h \
+	gsocks4proxy.h \
+	gsocks5proxy.h \
+	gsubprocesslauncher-private.h \
+	gthreadedresolver.h \
+	gunionvolumemonitor.h \
+	gunixmount.h \
+	gunixresolver.h \
+	gunixvolume.h \
+	gunixvolumemonitor.h \
+	gwin32appinfo.h \
+	gwin32mount.h \
+	gwin32registrykey.h \
+	gwin32resolver.h \
+	gwin32volumemonitor.h \
+	thumbnail-verify.h \
+	xdp-dbus.h \
+	$(NULL)
+
+if OS_WIN32
+IGNORE_HFILES += \
+	gfiledescriptorbased.h \
+	gunixconnection.h \
+	gunixcredentialsmessage.h \
+	gunixmounts.h \
+	gunixfdlist.h \
+	gunixfdmessage.h \
+	gunixinputstream.h \
+	gunixoutputstream.h \
+	gunixsocketaddress.h \
+	gdesktopappinfo.h \
+	gosxappinfo.h \
+	$(NULL)
+else
+
+if OS_COCOA
+IGNORE_HFILES += gdesktopappinfo.h
+else
+IGNORE_HFILES += gosxappinfo.h
+endif
+
+IGNORE_HFILES += \
+	gwin32networkmonitor.h \
+	gwin32inputstream.h \
+	gwin32outputstream.h \
+	$(NULL)
+endif
 
 MKDB_IGNORE_FILES = \
 	gdbus-daemon-generated.c	\
@@ -198,8 +232,6 @@ endif
 CLEANFILES ?=
 CLEANFILES += $(man_MANS)
 
-EXTRA_DIST += $(man_MANS)
-
 dist-hook-local: all-local
 
 gio-docs-clean: clean
diff --git a/docs/reference/gio/gdbus-codegen.xml b/docs/reference/gio/gdbus-codegen.xml
index b1145e5ef..e4192084d 100644
--- a/docs/reference/gio/gdbus-codegen.xml
+++ b/docs/reference/gio/gdbus-codegen.xml
@@ -39,6 +39,8 @@
     <arg><option>--xml-files</option> <replaceable>FILE</replaceable></arg>
     <arg><option>--header</option></arg>
     <arg><option>--body</option></arg>
+    <arg><option>--interface-info-header</option></arg>
+    <arg><option>--interface-info-body</option></arg>
     <arg><option>--output</option> <replaceable>OUTFILE</replaceable></arg>
     <group choice="plain" rep="repeat">
       <arg>
@@ -69,7 +71,11 @@
     arguments on the command line and generates output files.
     It currently supports generating C source code (via
     <option>--body</option>) or header (via <option>--header</option>)
-    and Docbook XML (via <option>--generate-docbook</option>).
+    and Docbook XML (via <option>--generate-docbook</option>). Alternatively,
+    more restricted C source code and headers can be generated, which just
+    contain the interface information (as <type>GDBusInterfaceInfo</type>
+    structures) using <option>--interface-info-body</option> and
+    <option>--interface-info-header</option>.
   </para>
 </refsect1>
 
@@ -90,8 +96,11 @@
   </para>
   <para>
     For C code generation either <option>--body</option> that
-    generates source code, or <option>--header</option> that
-    generates headers, can be used. These options must be used along with
+    generates source code, <option>--header</option> that
+    generates headers, <option>--interface-info-body</option> that generates
+    interface information source code, or
+    <option>--interface-info-header</option> that generates interface information
+    headers, can be used. These options must be used along with
     <option>--output</option>, which is used to specify the file to output to.
   </para>
   <para>
@@ -282,8 +291,10 @@
           Directory to output generated source to. Equivalent to changing directory before generation.
         </para>
         <para>
-          This option cannot be used with neither <option>--body</option> nor
-          <option>--header</option>, and <option>--output</option> must be used.
+          This option cannot be used with <option>--body</option>,
+          <option>--header</option>, <option>--interface-info-body</option> or
+          <option>--interface-info-header</option>; and
+          <option>--output</option> must be used.
         </para>
 
       </listitem>
@@ -322,11 +333,51 @@
     </varlistentry>
 
     <varlistentry>
+      <term><option>--interface-info-header</option></term>
+      <listitem>
+        <para>
+          If this option is passed, it will generate the header code for the
+          <type>GDBusInterfaceInfo</type> structures only and will write it to
+          the disk by using the path and file name provided by
+          <option>--output</option>.
+        </para>
+        <para>
+          Using <option>--generate-c-code</option>, <option>--generate-docbook</option> or
+          <option>--output-directory</option> are not allowed to be used along with
+          the <option>--interface-info-header</option> and
+          <option>--interface-info-body</option> options, because these options
+          are used to generate only one file.
+        </para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--interface-info-body</option></term>
+      <listitem>
+        <para>
+          If this option is passed, it will generate the source code for the
+          <type>GDBusInterfaceInfo</type> structures only and will write it to
+          the disk by using the path and file name provided by
+          <option>--output</option>.
+        </para>
+        <para>
+          Using <option>--generate-c-code</option>, <option>--generate-docbook</option> or
+          <option>--output-directory</option> are not allowed to be used along with
+          the <option>--interface-info-header</option> and
+          <option>--interface-info-body</option> options, because these options
+          are used to generate only one file.
+        </para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><option>--output</option> <replaceable>OUTFILE</replaceable></term>
       <listitem>
         <para>
-          The full path where the header (<option>--header</option>) or the source code
-          (<option>--body</option>) will be written, using the path and filename provided by
+          The full path where the header (<option>--header</option>,
+          <option>--interface-info-header</option>) or the source code
+          (<option>--body</option>, <option>--interface-info-body</option>) will
+          be written, using the path and filename provided by
           <option>--output</option>. The full path could be something like
           <literal>$($OUTFILE).{c,h}</literal>.
         </para>
@@ -987,7 +1038,7 @@ on_handle_hello_world (MyAppFrobber           *interface,
   <para>
     Please send bug reports to either the distribution bug tracker
     or the upstream bug tracker at
-    <ulink url="https://bugzilla.gnome.org/enter_bug.cgi?product=glib">https://bugzilla.gnome.org/enter_bug.cgi?product=glib</ulink>.
+    <ulink url="https://gitlab.gnome.org/GNOME/glib/issues/new">https://gitlab.gnome.org/GNOME/glib/issues/new</ulink>.
   </para>
 </refsect1>
 
diff --git a/docs/reference/gio/gdbus.xml b/docs/reference/gio/gdbus.xml
index efcec33fe..0e6c14db1 100644
--- a/docs/reference/gio/gdbus.xml
+++ b/docs/reference/gio/gdbus.xml
@@ -399,7 +399,7 @@ $ gdbus wait --session --timeout 30 org.bar.SomeName
   <para>
     Please send bug reports to either the distribution bug tracker
     or the upstream bug tracker at
-    <ulink url="https://bugzilla.gnome.org/enter_bug.cgi?product=glib"/>.
+    <ulink url="https://gitlab.gnome.org/GNOME/glib/issues/new"/>.
   </para>
 </refsect1>
 
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 0a35f9541..0eb560716 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -1248,6 +1248,7 @@ g_drive_stop_finish
 g_drive_enumerate_identifiers
 g_drive_get_identifier
 g_drive_get_sort_key
+G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE
 <SUBSECTION Standard>
 G_DRIVE
 G_IS_DRIVE
@@ -1496,6 +1497,12 @@ g_mount_operation_get_password_save
 g_mount_operation_set_password_save
 g_mount_operation_get_choice
 g_mount_operation_set_choice
+g_mount_operation_get_is_tcrypt_hidden_volume
+g_mount_operation_set_is_tcrypt_hidden_volume
+g_mount_operation_get_is_tcrypt_system_volume
+g_mount_operation_set_is_tcrypt_system_volume
+g_mount_operation_get_pim
+g_mount_operation_set_pim
 g_mount_operation_reply
 <SUBSECTION Standard>
 GMountOperationClass
@@ -1571,6 +1578,7 @@ g_unix_mount_point_guess_can_eject
 g_unix_mount_points_get
 g_unix_mounts_get
 g_unix_mount_at
+g_unix_mount_for
 g_unix_mounts_changed_since
 g_unix_mount_points_changed_since
 g_unix_mount_monitor_get
@@ -1616,6 +1624,7 @@ g_desktop_app_info_get_boolean
 g_desktop_app_info_has_key
 GDesktopAppLaunchCallback
 g_desktop_app_info_launch_uris_as_manager
+g_desktop_app_info_launch_uris_as_manager_with_fds
 <SUBSECTION>
 g_desktop_app_info_list_actions
 g_desktop_app_info_get_action_name
diff --git a/docs/reference/gio/gio.types b/docs/reference/gio/gio.types
deleted file mode 100644
index 8ab7d918f..000000000
--- a/docs/reference/gio/gio.types
+++ /dev/null
@@ -1,156 +0,0 @@
-g_action_get_type
-g_action_group_get_type
-g_action_map_get_type
-g_app_info_get_type
-g_app_info_monitor_get_type
-g_app_launch_context_get_type
-g_application_command_line_get_type
-g_application_get_type
-g_async_initable_get_type
-g_async_result_get_type
-g_buffered_input_stream_get_type
-g_buffered_output_stream_get_type
-g_bytes_icon_get_type
-g_cancellable_get_type
-g_charset_converter_get_type
-g_converter_get_type
-g_converter_input_stream_get_type
-g_converter_output_stream_get_type
-g_credentials_get_type
-g_data_input_stream_get_type
-g_data_output_stream_get_type
-g_dbus_action_group_get_type
-g_dbus_annotation_info_get_type
-g_dbus_arg_info_get_type
-g_dbus_auth_observer_get_type
-g_dbus_connection_get_type
-g_dbus_interface_get_type
-g_dbus_interface_info_get_type
-g_dbus_interface_skeleton_get_type
-g_dbus_menu_model_get_type
-g_dbus_message_get_type
-g_dbus_method_info_get_type
-g_dbus_method_invocation_get_type
-g_dbus_node_info_get_type
-g_dbus_object_get_type
-g_dbus_object_manager_client_get_type
-g_dbus_object_manager_get_type
-g_dbus_object_manager_server_get_type
-g_dbus_object_proxy_get_type
-g_dbus_object_skeleton_get_type
-g_dbus_property_info_get_type
-g_dbus_proxy_get_type
-g_dbus_server_get_type
-g_dbus_signal_info_get_type
-g_desktop_app_info_get_type
-g_desktop_app_info_lookup_get_type
-g_drive_get_type
-g_dtls_client_connection_get_type
-g_dtls_connection_get_type
-g_dtls_server_connection_get_type
-g_emblem_get_type
-g_emblemed_icon_get_type
-g_file_attribute_info_list_get_type
-g_file_attribute_matcher_get_type
-g_file_descriptor_based_get_type
-g_file_enumerator_get_type
-g_file_get_type
-g_file_icon_get_type
-g_file_info_get_type
-g_file_input_stream_get_type
-g_file_io_stream_get_type
-g_file_monitor_get_type
-g_file_output_stream_get_type
-g_filename_completer_get_type
-g_filter_input_stream_get_type
-g_filter_output_stream_get_type
-g_icon_get_type
-g_inet_address_get_type
-g_inet_address_mask_get_type
-g_inet_socket_address_get_type
-g_initable_get_type
-g_input_stream_get_type
-g_io_module_get_type
-g_io_stream_get_type
-g_list_model_get_type
-g_list_store_get_type
-g_loadable_icon_get_type
-g_memory_input_stream_get_type
-g_memory_output_stream_get_type
-g_menu_attribute_iter_get_type
-g_menu_get_type
-g_menu_item_get_type
-g_menu_link_iter_get_type
-g_menu_model_get_type
-g_mount_get_type
-g_mount_operation_get_type
-g_network_address_get_type
-g_network_monitor_get_type
-g_network_service_get_type
-g_notification_get_type
-g_output_stream_get_type
-g_permission_get_type
-g_pollable_input_stream_get_type
-g_pollable_output_stream_get_type
-g_property_action_get_type
-g_proxy_address_enumerator_get_type
-g_proxy_address_get_type
-g_proxy_get_type
-g_proxy_resolver_get_type
-g_remote_action_group_get_type
-g_resolver_get_type
-g_resource_get_type
-g_seekable_get_type
-g_settings_backend_get_type
-g_settings_get_type
-g_settings_schema_get_type
-g_settings_schema_key_get_type
-g_settings_schema_source_get_type
-g_simple_action_get_type
-g_simple_action_group_get_type
-g_simple_async_result_get_type
-g_simple_io_stream_get_type
-g_simple_permission_get_type
-g_simple_proxy_resolver_get_type
-g_socket_address_enumerator_get_type
-g_socket_address_get_type
-g_socket_client_get_type
-g_socket_connectable_get_type
-g_socket_connection_get_type
-g_socket_control_message_get_type
-g_socket_get_type
-g_socket_listener_get_type
-g_socket_service_get_type
-g_srv_target_get_type
-g_subprocess_get_type
-g_subprocess_launcher_get_type
-g_task_get_type
-g_tcp_connection_get_type
-g_tcp_wrapper_connection_get_type
-g_test_dbus_get_type
-g_themed_icon_get_type
-g_threaded_socket_service_get_type
-g_tls_backend_get_type
-g_tls_certificate_get_type
-g_tls_client_connection_get_type
-g_tls_connection_get_type
-g_tls_database_get_type
-g_tls_file_database_get_type
-g_tls_interaction_get_type
-g_tls_password_get_type
-g_tls_server_connection_get_type
-g_unix_connection_get_type
-g_unix_credentials_message_get_type
-g_unix_fd_list_get_type
-g_unix_fd_message_get_type
-g_unix_input_stream_get_type
-g_unix_mount_entry_get_type
-g_unix_mount_monitor_get_type
-g_unix_mount_point_get_type
-g_unix_output_stream_get_type
-g_unix_socket_address_get_type
-g_vfs_get_type
-g_volume_get_type
-g_volume_monitor_get_type
-g_zlib_compressor_get_type
-g_zlib_decompressor_get_type
diff --git a/docs/reference/gio/gio.xml b/docs/reference/gio/gio.xml
index c3fd8f5b6..f2635d0b3 100644
--- a/docs/reference/gio/gio.xml
+++ b/docs/reference/gio/gio.xml
@@ -455,6 +455,21 @@
                 <listitem><para>Show extra information.</para>
                 </listitem>
               </varlistentry>
+              <varlistentry>
+                <term><option>--tcrypt-pim</option></term>
+                <listitem><para>The numeric PIM when unlocking a VeraCrypt volume.</para>
+                </listitem>
+              </varlistentry>
+              <varlistentry>
+                <term><option>--tcrypt-hidden</option></term>
+                <listitem><para>Mount a TCRYPT hidden volume.</para>
+                </listitem>
+              </varlistentry>
+              <varlistentry>
+                <term><option>--tcrypt-system</option></term>
+                <listitem><para>Mount a TCRYPT system volume.</para>
+                </listitem>
+              </varlistentry>
             </variablelist>
           </refsect3>
         </listitem>
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index 47046f250..c7ca62abb 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -182,7 +182,6 @@ if get_option('gtk_doc')
   gnome.gtkdoc('gio',
     main_xml : 'gio-docs.xml',
     namespace : 'g',
-    gobject_typesfile : 'gio.types',
     mode : 'none',
     dependencies : [libgio_dep, libgobject_dep, libglib_dep],
     src_dir : 'gio',
diff --git a/docs/reference/gio/migrating-gnome-vfs.xml b/docs/reference/gio/migrating-gnome-vfs.xml
index ba3987cad..27194aa9a 100644
--- a/docs/reference/gio/migrating-gnome-vfs.xml
+++ b/docs/reference/gio/migrating-gnome-vfs.xml
@@ -127,7 +127,7 @@ start_monitoring_trash (void)
         since we have not found a compelling use case where
         #GnomeVFSMIMEMonitor was used. If you think you have such a use
         case, please report it at
-        <ulink url="http://bugzilla.gnome.org">bugzilla.gnome.org</ulink>.
+        <ulink url="https://gitlab.gnome.org/GNOME/glib/issues/new">https://gitlab.gnome.org/GNOME/glib/issues/new</ulink>.
       </para>
     </section>
   </chapter>
diff --git a/docs/reference/gio/xml/meson.build b/docs/reference/gio/xml/meson.build
index 6d1e295b8..6aeb74514 100644
--- a/docs/reference/gio/xml/meson.build
+++ b/docs/reference/gio/xml/meson.build
@@ -1,6 +1,6 @@
 ent_conf = configuration_data()
 ent_conf.set('PACKAGE', 'glib')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
 ent_conf.set('PACKAGE_NAME', 'glib')
 ent_conf.set('PACKAGE_STRING', 'glib')
 ent_conf.set('PACKAGE_TARNAME', 'glib')
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 44536cf21..dfefa25ff 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -61,7 +61,9 @@ IGNORE_HFILES = \
 	gtranslit-data.h	\
 	glib-init.h		\
 	gconstructor.h		\
-	valgrind.h
+	valgrind.h		\
+	gvalgrind.h		\
+	$(NULL)
 
 # Images to copy into HTML directory
 HTML_IMAGES =  						\
@@ -138,8 +140,6 @@ endif
 CLEANFILES ?=
 CLEANFILES += $(man_MANS)
 
-EXTRA_DIST += $(man_MANS)
-
 dist-hook-local: all-local
 
 glib-docs-clean: clean
diff --git a/docs/reference/glib/building.xml b/docs/reference/glib/building.xml
index 57c3c8c7d..b131c7561 100644
--- a/docs/reference/glib/building.xml
+++ b/docs/reference/glib/building.xml
@@ -228,107 +228,6 @@
     </formalpara>
 
     <formalpara>
-      <title><option>--disable-gc-friendly</option> and
-        <option>--enable-gc-friendly</option></title>
-
-      <para>
-        By default, and with <option>--disable-gc-friendly</option>
-        as well, GLib does not clear the memory for certain objects before
-        they are freed. For example, GLib may decide to recycle GList nodes
-        by putting them in a free list. However, memory profiling and debugging
-        tools like <ulink url="http://www.valgrind.org">Valgrind</ulink> work
-        better if an application does not keep dangling pointers to freed
-        memory (even though these pointers are no longer dereferenced), or
-        invalid pointers inside uninitialized memory.
-        The <option>--enable-gc-friendly</option> option makes GLib
-        clear memory in these situations:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            When shrinking a GArray, GLib will clear the memory no longer
-            available in the array: shrink an array from 10 bytes to 7, and
-            the last 3 bytes will be cleared. This includes removals of single
-            and multiple elements.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            When growing a GArray, GLib will clear the new chunk of memory.
-            Grow an array from 7 bytes to 10 bytes, and the last 3 bytes will
-            be cleared.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The above applies to GPtrArray as well.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            When freeing a node from a GHashTable, GLib will first clear
-            the node, which used to have pointers to the key and the value
-            stored at that node.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            When destroying or removing a GTree node, GLib will clear the node,
-            which used to have pointers to the node's value, and the left and
-            right subnodes.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        Since clearing the memory has a cost,
-        <option>--disable-gc-friendly</option> is the default.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title><option>--disable-mem-pools</option> and
-        <option>--enable-mem-pools</option></title>
-
-      <para>
-        Many small chunks of memory are often allocated via collective pools
-        in GLib and are cached after release to speed up reallocations.
-        For sparse memory systems this behaviour is often inferior, so
-        memory pools can be disabled to avoid excessive caching and force
-        atomic maintenance of chunks through the <function>g_malloc()</function>
-        and <function>g_free()</function> functions. Code currently affected by
-        this:
-        <itemizedlist>
-          <listitem>
-            <para>
-              <structname>GMemChunk</structname>s become basically non-effective
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <structname>GSignal</structname> disables all caching
-              (potentially very slow)
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <structname>GType</structname> doesn't honour the
-              <structname>GTypeInfo</structname>
-              <structfield>n_preallocs</structfield> field anymore
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              the <structname>GBSearchArray</structname> flag
-              <literal>G_BSEARCH_ALIGN_POWER2</literal> becomes non-functional
-            </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-    </formalpara>
-
-    <formalpara>
       <title><option>--with-threads</option></title>
 
       <para>
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index a0716c172..afebbec8b 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -119,6 +119,10 @@
     <xi:include href="xml/gvariant.xml"/>
     <xi:include href="gvariant-varargs.xml"/>
     <xi:include href="gvariant-text.xml"/>
+    <xi:include href="xml/refcount.xml"/>
+    <xi:include href="xml/rcbox.xml"/>
+    <xi:include href="xml/arcbox.xml"/>
+    <xi:include href="xml/refstring.xml"/>
   </chapter>
 
   <chapter id="deprecated">
@@ -256,6 +260,10 @@
     <title>Index of new symbols in 2.56</title>
     <xi:include href="xml/api-index-2.56.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-58" role="2.58">
+    <title>Index of new symbols in 2.58</title>
+    <xi:include href="xml/api-index-2.58.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 7f90ac886..0c215ff0b 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -219,6 +219,7 @@ MAX
 <SUBSECTION>
 ABS
 CLAMP
+G_APPROX_VALUE
 
 <SUBSECTION>
 G_STRUCT_MEMBER
@@ -620,6 +621,7 @@ g_source_set_name_by_id
 g_source_get_context
 g_source_set_callback
 GSourceFunc
+G_SOURCE_FUNC
 g_source_set_callback_indirect
 g_source_set_ready_time
 g_source_get_ready_time
@@ -1233,6 +1235,7 @@ GSpawnError
 G_SPAWN_ERROR
 GSpawnFlags
 GSpawnChildSetupFunc
+g_spawn_async_with_fds
 g_spawn_async_with_pipes
 g_spawn_async
 g_spawn_sync
@@ -3152,6 +3155,7 @@ g_assert_cmpint
 g_assert_cmpuint
 g_assert_cmphex
 g_assert_cmpfloat
+g_assert_cmpfloat_with_epsilon
 g_assert_cmpmem
 g_assert_no_error
 g_assert_error
@@ -3453,3 +3457,54 @@ g_hostname_is_ip_address
 g_uuid_string_is_valid
 g_uuid_string_random
 </SECTION>
+
+<SECTION>
+<FILE>refcount</FILE>
+grefcount
+g_ref_count_init
+g_ref_count_inc
+g_ref_count_dec
+g_ref_count_compare
+<SUBSECTION>
+gatomicrefcount
+g_atomic_ref_count_init
+g_atomic_ref_count_inc
+g_atomic_ref_count_dec
+g_atomic_ref_count_compare
+</SECTION>
+
+<SECTION>
+<FILE>rcbox</FILE>
+g_rc_box_alloc
+g_rc_box_alloc0
+g_rc_box_new
+g_rc_box_new0
+g_rc_box_dup
+g_rc_box_acquire
+g_rc_box_release
+g_rc_box_release_full
+g_rc_box_get_size
+</SECTION>
+
+<SECTION>
+<FILE>arcbox</FILE>
+g_atomic_rc_box_alloc
+g_atomic_rc_box_alloc0
+g_atomic_rc_box_new
+g_atomic_rc_box_new0
+g_atomic_rc_box_dup
+g_atomic_rc_box_acquire
+g_atomic_rc_box_release
+g_atomic_rc_box_release_full
+g_atomic_rc_box_get_size
+</SECTION>
+
+<SECTION>
+<FILE>refstring</FILE>
+g_ref_string_new
+g_ref_string_new_intern
+g_ref_string_new_len
+g_ref_string_acquire
+g_ref_string_release
+g_ref_string_length
+</SECTION>
diff --git a/docs/reference/glib/glib.types b/docs/reference/glib/glib.types
deleted file mode 100644
index e69de29bb..000000000
--- a/docs/reference/glib/glib.types
+++ /dev/null
diff --git a/docs/reference/glib/gvariant-text.xml b/docs/reference/glib/gvariant-text.xml
index 852233452..3f521fbee 100644
--- a/docs/reference/glib/gvariant-text.xml
+++ b/docs/reference/glib/gvariant-text.xml
@@ -564,7 +564,10 @@
    <title>Bytestrings</title>
    <para>
     The bytestring syntax is a piece of syntactic sugar meant to complement the bytestring APIs in GVariant.  It
-    constructs arrays of non-nul bytes (type '<literal>ay</literal>') with a nul terminator at the end.
+    constructs arrays of non-nul bytes (type '<literal>ay</literal>') with a nul terminator at the end. These are
+    normal C strings with no particular encoding enforced, so the bytes may not be valid UTF-8.
+    Bytestrings are a special case of byte arrays; byte arrays (also type '<literal>ay</literal>'), in the general
+    case, can contain nul at any position, and need not end with nul.
    </para>
    <para>
     Bytestrings are specified with either <literal>b""</literal> or <literal>b''</literal>.  As with strings,
@@ -577,7 +580,7 @@
     forms <literal>\0nnn</literal> and <literal>\xnn</literal>.
    </para>
    <para>
-    <literal>b'abc'</literal> is equivalent to <literal>[byte 0x97, 0x98, 0x99, 0]</literal>.
+    <literal>b'abc'</literal> is equivalent to <literal>[byte 0x61, 0x62, 0x63, 0]</literal>.
    </para>
    <para>
     When formatting arrays of bytes, the printer will choose to display the array as a bytestring if it contains
diff --git a/docs/reference/glib/gvariant-varargs.xml b/docs/reference/glib/gvariant-varargs.xml
index fbbbfcbd3..b60ab2a34 100644
--- a/docs/reference/glib/gvariant-varargs.xml
+++ b/docs/reference/glib/gvariant-varargs.xml
@@ -984,7 +984,7 @@ data = g_variant_new_parsed ("(%o, {'brightness': {'value': <%i>, 'max': <%i>}})
 
    <para>
     The '<literal>^</literal>' character currently supports conversion to and from bytestrings or to and from arrays
-    of strings or bytestrings.  It has a number of forms.
+    of strings or bytestrings.  It does not support byte arrays.  It has a number of forms.
    </para>
 
    <para>
diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
index f0f915e96..fbe3422d0 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -34,6 +34,7 @@ if get_option('gtk_doc')
     'glib-init.h',
     'gconstructor.h',
     'valgrind.h',
+    'gvalgrind.h',
   ]
 
   ignore_decorators = [
@@ -107,7 +108,6 @@ if get_option('gtk_doc')
                src_dir : [ 'glib', 'gmodule' ],
                dependencies : libglib_dep,
                scan_args : [
-                 '--rebuild-types',
                  '--deprecated-guards=G_DISABLE_DEPRECATED',
                  '--ignore-decorators=' + '|'.join(ignore_decorators),
                  '--ignore-headers=' + ' '.join(ignore_headers),
diff --git a/docs/reference/glib/resources.xml b/docs/reference/glib/resources.xml
index 186bbf744..80e6f4cd2 100644
--- a/docs/reference/glib/resources.xml
+++ b/docs/reference/glib/resources.xml
@@ -21,11 +21,10 @@ Getting help with GLib
 
 <para>
 If you encounter a bug, misfeature, or missing feature in GLib, please
-file a bug report on 
-<ulink url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>. 
+file a bug report on the issue tracker at
+<ulink url="https://gitlab.gnome.org/GNOME/glib/issues/new">https://gitlab.gnome.org/GNOME/glib/issues/new</ulink>.
 We'd also appreciate reports of incomplete or misleading information in 
-the GLib documentation; file those against the "docs" component of the "glib"
-product in Bugzilla.
+the GLib documentation; file those with the ‘Documentation’ label.
 </para>
 
 <para>
@@ -36,30 +35,28 @@ discussed, we'll add a note to that effect in the report.
 </para>
 
 <para>
-The bug tracker should definitely be used for feature requests, it's
-not only for bugs. We track all GLib development in Bugzilla, so it's
+The issue tracker should definitely be used for feature requests, it's
+not only for bugs. We track all GLib development in GitLab, so it's
 the way to be sure the GLib developers won't forget about an issue.
 </para>
 
 </refsect1>
 
 <refsect1>
-<title>Submitting Patches</title>
+<title>Code Contributions</title>
 
 <para>
-If you develop a bugfix or enhancement for GLib, please file that in
-Bugzilla as well. Bugzilla allows you to attach files; please attach a
-patch generated by the <command>diff</command> utility, using the 
-<option>-u</option> option to make the patch more readable. All patches 
-must be offered under the terms of the GNU LGPL license, so be sure you 
-are authorized to give us the patch under those terms.
+If you develop a bugfix or enhancement for GLib, please open a merge request
+for that in GitLab as well. All branches must be offered under the terms of
+the GNU LGPL license, so be sure you  are authorized to give us the branch
+under those terms.
 </para>
 
 <para>
-If you want to discuss your patch before or after developing it, mail 
+If you want to discuss your branch before or after developing it, mail
 <ulink url="mailto:gtk-devel-list@gnome.org">gtk-devel-list@gnome.org</ulink>. 
-But be sure to file the Bugzilla report as well; if the patch is only on the 
-list and not in Bugzilla, it's likely to slip through the cracks.
+But be sure to create the GitLab merge request as well; if the branch is only
+on the list and not in GitLab, it's likely to slip through the cracks.
 </para>
 
 </refsect1>
@@ -92,7 +89,7 @@ questions.
 <listitem><para>
 gtk-devel-list is for discussion of work on GTK+ (and GLib) itself, it is 
 <emphasis>not</emphasis> for asking questions about how to use GTK+ (or GLib) 
-in applications. gtk-devel-list is appropriate for discussion of patches, 
+in applications. gtk-devel-list is appropriate for discussion of branches,
 bugs, proposed features, and so on.
 </para></listitem>
 </varlistentry>
diff --git a/docs/reference/glib/xml/meson.build b/docs/reference/glib/xml/meson.build
index 6d1e295b8..6aeb74514 100644
--- a/docs/reference/glib/xml/meson.build
+++ b/docs/reference/glib/xml/meson.build
@@ -1,6 +1,6 @@
 ent_conf = configuration_data()
 ent_conf.set('PACKAGE', 'glib')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
 ent_conf.set('PACKAGE_NAME', 'glib')
 ent_conf.set('PACKAGE_STRING', 'glib')
 ent_conf.set('PACKAGE_TARNAME', 'glib')
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index 430ab6d5f..6efe781e1 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -13,6 +13,7 @@ DOC_SOURCE_DIR =$(top_srcdir)/gobject $(top_builddir)/gobject
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = \
+	--rebuild-types \
 	--deprecated-guards="G_DISABLE_DEPRECATED" \
 	--ignore-decorators="GLIB_VAR|G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT|GLIB_AVAILABLE_IN_ALL|GLIB_AVAILABLE_IN_2_26|GLIB_AVAILABLE_IN_2_28|GLIB_AVAILABLE_IN_2_30|GLIB_AVAILABLE_IN_2_32|GLIB_AVAILABLE_IN_2_34|GLIB_AVAILABLE_IN_2_36|GLIB_AVAILABLE_IN_2_38|GLIB_AVAILABLE_IN_2_40|GLIB_AVAILABLE_IN_2_42|GLIB_AVAILABLE_IN_2_44|GLIB_AVAILABLE_IN_2_46|GLIB_AVAILABLE_IN_2_48|GLIB_AVAILABLE_IN_2_50|GLIB_AVAILABLE_IN_2_52|GLIB_AVAILABLE_IN_2_54|GLIB_AVAILABLE_IN_2_56|GLIB_DEPRECATED_IN_2_26|GLIB_DEPRECATED_IN_2_26_FOR|GLIB_DEPRECATED_IN_2_28|GLIB_DEPRECATED_IN_2_28_FOR|GLIB_DEPRECATED_IN_2_30|GLIB_DEPRECATED_IN_2_30_FOR|GLIB_DEPRECATED_IN_2_32|GLIB_DEPRECATED_IN_2_32_FOR|GLIB_DEPRECATED_IN_2_34|GLIB_DEPRECATED_IN_2_34_FOR|GLIB_DEPRECATED_IN_2_36|GLIB_DEPRECATED_IN_2_36_FOR|GLIB_DEPRECATED_IN_2_38|GLIB_DEPRECATED_IN_2_38_FOR|GLIB_DEPRECATED_IN_2_40|GLIB_DEPRECATED_IN_2_40_FOR|GLIB_DEPRECATED_IN_2_42|GLIB_DEPRECATED_IN_2_42_FOR|GLIB_DEPRECATED_IN_2_44|GLIB_DEPRECATED_IN_2_44_FOR|GLIB_DEPRECATED_IN_2_46|GLIB_DEPRECATED_IN_2_46_FOR|GLIB_DEPRECATED_IN_2_48|GLIB_DEPRECATED_IN_2_48_FOR|GLIB_DEPRECATED_IN_2_50|GLIB_DEPRECATED_IN_2_50_FOR|GLIB_DEPRECATED_IN_2_52|GLIB_DEPRECATED_IN_2_52_FOR|GLIB_DEPRECATED_IN_2_54|GLIB_DEPRECATED_IN_2_54_FOR|GLIB_DEPRECATED_IN_2_56|GLIB_DEPRECATED_IN_2_56_FOR"
 
@@ -64,7 +65,6 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 EXTRA_DIST += 		\
-	gobject.cI	\
 	version.xml.in
 
 ########################################################################
@@ -95,8 +95,6 @@ endif
 CLEANFILES ?=
 CLEANFILES += $(man_MANS)
 
-EXTRA_DIST += $(man_MANS)
-
 dist-hook-local: all-local
 
 gobject-docs-clean: clean
diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml
index 646d91a91..f045df5b3 100644
--- a/docs/reference/gobject/gobject-docs.xml
+++ b/docs/reference/gobject/gobject-docs.xml
@@ -188,6 +188,14 @@
     <title>Index of new symbols in 2.46</title>
     <xi:include href="xml/api-index-2.46.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-54" role="2.54">
+    <title>Index of new symbols in 2.54</title>
+    <xi:include href="xml/api-index-2.54.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-56" role="2.56">
+    <title>Index of new symbols in 2.56</title>
+    <xi:include href="xml/api-index-2.56.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/gobject/gobject.cI b/docs/reference/gobject/gobject.cI
deleted file mode 100644
index 2976940e3..000000000
--- a/docs/reference/gobject/gobject.cI
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This is a hack to work around a limitation of gtkdoc-scan: it insists
- * on putting () behind every symbol listed in gobject.types. Thus we
- * can't put G_TYPE_OBJECT there, but have to sneak a g_object_get_type()
- * function in the generated source via an #include.
- */
-GType 
-g_object_get_type (void)
-{
-  return G_TYPE_OBJECT;
-}
diff --git a/docs/reference/gobject/gobject.types b/docs/reference/gobject/gobject.types
deleted file mode 100644
index bb4e7b875..000000000
--- a/docs/reference/gobject/gobject.types
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <glib/glib-object.h>
-#include "gobject.cI"
-
-g_binding_get_type
-g_object_get_type
-g_type_module_get_type
-g_type_plugin_get_type
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index de46cf96d..ac2da57d9 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -77,12 +77,12 @@ if get_option('gtk_doc')
   gnome.gtkdoc('gobject',
     main_xml : 'gobject-docs.xml',
     namespace : 'g',
-    gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'),
     mode : 'none',
     dependencies : [libgobject_dep, libglib_dep],
     include_directories : [gtkdocincl],
     src_dir : 'gobject',
     scan_args : [
+      '--rebuild-types',
       '--deprecated-guards=G_DISABLE_DEPRECATED',
       '--ignore-decorators=' + '|'.join(ignore_decorators),
       '--ignore-headers=' + ' '.join(ignore_headers),
diff --git a/docs/reference/gobject/tut_howto.xml b/docs/reference/gobject/tut_howto.xml
index 0e119009b..daaad4697 100644
--- a/docs/reference/gobject/tut_howto.xml
+++ b/docs/reference/gobject/tut_howto.xml
@@ -1071,6 +1071,20 @@ viewer_file_init (ViewerFile *self)
 }
 </programlisting></informalexample>
     </para>
+    <para>
+      If the object is not of final type, e.g. was declared using
+      <function><link linkend="G-DECLARE-DERIVABLE-TYPE:CAPS">G_DECLARE_DERIVABLE_TYPE</link></function>
+      then
+      <function><link linkend="G-ADD-PRIVATE:CAPS">G_ADD_PRIVATE</link></function>
+      macro should be added. The private structure should be declared exactly
+      as for a normal derivable object, see <xref linkend="howto-gobject-code"/>.
+<informalexample><programlisting>
+G_DEFINE_TYPE_WITH_CODE (ViewerFile, viewer_file, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ViewerFile)
+                         G_IMPLEMENT_INTERFACE (VIEWER_TYPE_EDITABLE,
+                                                viewer_file_editable_interface_init))
+</programlisting></informalexample>
+    </para>
   </sect1>
   
   <sect1 id="howto-interface-prerequisite">
diff --git a/docs/reference/gobject/xml/meson.build b/docs/reference/gobject/xml/meson.build
index 6d1e295b8..6aeb74514 100644
--- a/docs/reference/gobject/xml/meson.build
+++ b/docs/reference/gobject/xml/meson.build
@@ -1,6 +1,6 @@
 ent_conf = configuration_data()
 ent_conf.set('PACKAGE', 'glib')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
 ent_conf.set('PACKAGE_NAME', 'glib')
 ent_conf.set('PACKAGE_STRING', 'glib')
 ent_conf.set('PACKAGE_TARNAME', 'glib')
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 7c291566a..682e3cc76 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -296,6 +296,9 @@ unix_sources = \
 	gportalsupport.h	\
 	$(portal_sources)	\
 	$(NULL)
+nodist_unix_sources = \
+	$(nodist_portal_sources) \
+	$(NULL)
 
 giounixincludedir=$(includedir)/gio-unix-2.0/gio
 giounixinclude_HEADERS = \
@@ -324,6 +327,8 @@ endif
 gdbus_daemon_sources = \
 	gdbusdaemon.c \
 	gdbusdaemon.h \
+	$(NULL)
+nodist_gdbus_daemon_sources = \
 	gdbus-daemon-generated.c \
 	gdbus-daemon-generated.h \
 	$(NULL)
@@ -344,6 +349,9 @@ win32_actual_sources = \
 	gwin32networkmonitor.h \
 	gwin32notificationbackend.c \
 	$(NULL)
+nodist_win32_actual_sources = \
+	$(nodist_gdbus_daemon_sources) \
+	$(NULL)
 
 win32_more_sources_for_vcproj = \
 	gwin32appinfo.c \
@@ -361,6 +369,7 @@ appinfo_sources += gwin32appinfo.c gwin32appinfo.h
 contenttype_sources += gcontenttype-win32.c
 platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
 win32_sources = $(win32_actual_sources)
+nodist_win32_sources = $(nodist_win32_actual_sources)
 
 giowin32includedir=$(includedir)/gio-win32-2.0/gio
 giowin32include_HEADERS = \
@@ -377,7 +386,6 @@ CLEANFILES += $(xdp_dbus_built_sources)
 portal_interfaces = \
 	org.freedesktop.portal.Documents.xml \
 	org.freedesktop.portal.OpenURI.xml \
-	org.freedesktop.portal.NetworkMonitor.xml \
 	org.freedesktop.portal.ProxyResolver.xml \
 	$(NULL)
 
@@ -401,7 +409,9 @@ portal_sources = \
 	gnetworkmonitorportal.h		\
 	gproxyresolverportal.c		\
 	gproxyresolverportal.h		\
-	$(xdp_dbus_built_sources)	\
+	$(NULL)
+nodist_portal_sources = \
+	$(xdp_dbus_built_sources) \
 	$(NULL)
 
 if OS_UNIX
@@ -555,14 +565,16 @@ gio_base_sources =		\
 	gzlibcompressor.c	\
 	gzlibdecompressor.c	\
 	gmountprivate.h 	\
-	gioenumtypes.h		\
-	gioenumtypes.c		\
 	glistmodel.c 		\
 	gliststore.c		\
 	$(application_sources) 	\
 	$(gdbus_sources) 	\
 	$(local_sources) 	\
 	$(NULL)
+nodist_gio_base_sources = \
+	gioenumtypes.h \
+	gioenumtypes.c \
+	$(NULL)
 
 libgio_2_0_la_SOURCES =		\
 	$(gio_base_sources)	\
@@ -572,6 +584,11 @@ libgio_2_0_la_SOURCES =		\
 	$(win32_sources) 	\
 	$(settings_sources) 	\
 	$(NULL)
+nodist_libgio_2_0_la_SOURCES = \
+	$(nodist_gio_base_sources) \
+	$(nodist_unix_sources) \
+	$(nodist_win32_sources) \
+	$(NULL)
 
 EXTRA_DIST += strinfo.c
 
@@ -609,11 +626,28 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined)
 
+# We cannot build .m files because it would require adding AC_PROG_OBJC in
+# configure.ac, and it cannot be added conditionally. That means we would always
+# depend on an objective-c compiler even when not needed. To work around that
+# limitation we rename .m files to .c and compile them separately with
+# -xobjective-c into an intermediary library. Note that we cannot rename those
+# files to .c directly in the source tree because Meson needs the .m extension.
+# This must be done outside of "if OS_COCOA" block otherwise distcheck fails.
+# See https://bugzilla.gnome.org/show_bug.cgi?id=672777.
+OBJC_FILES = \
+	gnextstepsettingsbackend.m \
+	gosxcontenttype.m \
+	gosxappinfo.m \
+	gcocoanotificationbackend.m \
+	$(NULL)
+OBJC_C_FILES = $(OBJC_FILES:.m=.c)
+BUILT_SOURCES += $(OBJC_C_FILES)
+CLEANFILES += $(OBJC_C_FILES)
+EXTRA_DIST += $(OBJC_FILES)
+$(OBJC_C_FILES): %.c: %.m Makefile
+	cp $< $@
+
 if OS_COCOA
-# Let's avoid polluting the CFLAGS of libgio with -xobjective-c
-# We cannot simply rename the ObjC files to .m because it plays
-# tricks with Automake. For further reference, see:
-# https://bugzilla.gnome.org/show_bug.cgi?id=672777
 libgio_objc_2_0_la_CFLAGS = $(libgio_2_0_la_CFLAGS) -xobjective-c
 libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
 libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
@@ -758,12 +792,12 @@ gio_headers =			\
 	$(NULL)
 
 gioincludedir=$(includedir)/glib-2.0/gio/
-gioinclude_HEADERS = 		\
-	$(gio_headers)		\
-	gioenumtypes.h
-
-nodist_gioinclude_HEADERS =	\
-	gnetworking.h		\
+gioinclude_HEADERS = \
+	$(gio_headers) \
+	$(NULL)
+nodist_gioinclude_HEADERS = \
+	gioenumtypes.h \
+	gnetworking.h \
 	$(NULL)
 
 # these sources (also mentioned above) are generated.
@@ -782,8 +816,6 @@ EXTRA_DIST += 			\
 	gioenumtypes.c.template	\
 	gio.rc.in		\
 	gschema.dtd		\
-	gconstructor_as_data.h	\
-	gnetworking.h.win32	\
 	$(NULL)
 
 BUILT_EXTRA_DIST += 		\
@@ -816,7 +848,7 @@ gio.def: libgio-2.0.la
 gio-2.0.lib: libgio-2.0.la gio.def
 	$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
 
-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
+bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop
 
 glib_compile_resources_LDADD = libgio-2.0.la 		\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
@@ -839,17 +871,21 @@ gio_querymodules_LDADD	 = libgio-2.0.la 		\
 	$(NULL)
 gio_querymodules_LDFLAGS	 = -pie
 
+gio_launch_desktop_SOURCES = gio-launch-desktop.c
+
 gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.py
-	$(AM_V_GEN) $(srcdir)/data-to-c.py $(top_srcdir)/glib/gconstructor.h gconstructor_code $@
+	$(AM_V_GEN) $(PYTHON) $(srcdir)/data-to-c.py $(top_srcdir)/glib/gconstructor.h gconstructor_code $@
 
 glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
 glib_compile_schemas_LDFLAGS = -pie
 glib_compile_schemas_SOURCES = \
-	gconstructor_as_data.h \
 	gvdb/gvdb-format.h		\
 	gvdb/gvdb-builder.h		\
 	gvdb/gvdb-builder.c		\
 	glib-compile-schemas.c
+nodist_glib_compile_schemas_SOURCES = \
+	gconstructor_as_data.h \
+	$(NULL)
 
 gsettings_LDADD = libgio-2.0.la 			\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
@@ -930,6 +966,7 @@ completiondir = $(datadir)/bash-completion/completions
 completion_DATA = \
 	completion/gapplication				\
 	completion/gdbus				\
+	completion/gio					\
 	completion/gsettings				\
 	completion/gresource
 EXTRA_DIST += $(completion_DATA)
@@ -977,43 +1014,7 @@ gio_LDADD = libgio-2.0.la 				\
 	$(NULL)
 gio_LDFLAGS = -pie
 
-# ------------------------------------------------------------------------
-# ------ MSVC Project File Generation ------
-# ------------------------------------------------------------------------
-#
-MSVCPROJS = gio glib-compile-resources glib-compile-schemas gio-tool
-
-gio_FILES =	\
-	$(gio_base_sources)			\
-	$(win32_actual_sources)			\
-	$(win32_more_sources_for_vcproj)	\
-	$(settings_base_sources)		\
-	$(win32_settings_sources)
-
-gio_EXCLUDES = dummy
-
-gio_HEADERS_DIR = $(includedir)/glib-2.0/gio
-gio_HEADERS_INST = $(gioinclude_HEADERS) $(nodist_gioinclude_HEADERS)
-gio_HEADERS_EXCLUDES = dummy
-
-glib_compile_resources_FILES = $(glib_compile_resources_SOURCES)
-glib_compile_resources_EXCLUDES = dummy
-
-glib_compile_schemas_FILES = $(glib_compile_schemas_SOURCES)
-glib_compile_schemas_EXCLUDES = dummy
-
-gio_tool_FILES = $(gio_SOURCES)
-gio_tool_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: \
-	$(BUILT_EXTRA_DIST)						\
-	$(top_builddir)/win32/vs9/gio.vcproj			\
-	$(top_builddir)/win32/vs9/gio.headers			\
-	$(top_builddir)/win32/vs9/glib-compile-schemas.vcproj	\
-	$(top_builddir)/win32/vs9/glib-compile-resources.vcproj	\
-	$(top_builddir)/win32/vs9/gio-tool.vcproj
+dist-hook: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)'; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/gio/completion/.gitignore b/gio/completion/.gitignore
new file mode 100644
index 000000000..6930af958
--- /dev/null
+++ b/gio/completion/.gitignore
@@ -0,0 +1 @@
+!gio
diff --git a/gio/completion/gio b/gio/completion/gio
new file mode 100755
index 000000000..c1db98561
--- /dev/null
+++ b/gio/completion/gio
@@ -0,0 +1,120 @@
+#
+# Copyright (C) 2018 Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# licence, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, see <http://www.gnu.org/licenses/>.
+#
+
+# Check for bash
+[ -z "$BASH_VERSION" ] && return
+
+####################################################################################################
+
+# Check whether the suggestions have common prefix (i.e. suggestions won't be
+# shown and prefix will be completed first)
+__has_common_prefix() {
+    for (( i = 1; i < ${#COMPREPLY[@]}; i++ )); do
+        if [[ "${COMPREPLY[i-1]:${#cur}:1}" != "${COMPREPLY[i]:${#cur}:1}" ]]; then
+            return 1 # False
+        fi
+    done
+
+    return 0 # True
+}
+
+# Complete file location
+__gio_location() {
+    # Prevent breaking on colons, we have to work with uris
+    local cur
+    _get_comp_words_by_ref -n : cur
+
+    # Resolve dirname for dir listing
+    local dir=""
+    if [[ $cur =~ "/"$ ]]; then
+        dir="$cur"
+    elif [[ $cur =~ "/" ]]; then
+        dir="$(dirname "$cur")/"
+    fi
+
+    # List daemon mounts, just if dir is not specified, or looks like scheme
+    local mounts=()
+    if [[ $dir == "" ]] || [[ $dir =~ ":"$ && ! $dir =~ "/" ]]; then
+        while IFS=$'\n' read mount; do
+            # Do not care about local mounts
+            [[ "$mount" =~ ^"file:" ]] && continue
+
+            # Use only matching mounts
+            [[ "$mount" =~ ^"$cur" && "$mount" != "$cur" ]] && mounts+=("$mount")
+        done < <(gio mount -l | sed -n -r 's/^ *Mount\([0-9]+\): .* -> (.*)$/\1/p')
+    fi
+
+    # Workaround to unescape dir name (e.g. "\ " -> " ")
+    declare -a tmp="( ${dir} )"
+    unescaped_dir="${tmp[0]}"
+
+    # List files
+    local files=()
+    local names=()
+    while IFS=$'\t' read name size type; do
+        # Escape name properly
+        local escaped_name="$(printf "%q" "$name")"
+
+        # Append slash for directories and space for files
+        if [[ "$type" == "(directory)" ]]; then
+            escaped_name="$escaped_name/"
+        else
+            escaped_name="$escaped_name "
+        fi
+
+        path="$dir$escaped_name"
+
+        # Use only matching paths
+        if [[ "$path" =~ ^"$cur" ]]; then
+            files+=("$path")
+            names+=("$escaped_name")
+        fi
+    done < <(gio list -hl "$unescaped_dir" 2> /dev/null)
+
+    COMPREPLY=("${files[@]}" "${mounts[@]}")
+
+    # Workaround to show suggestions as basenames only
+    if ! __has_common_prefix; then
+        COMPREPLY=("${mounts[@]} ${names[@]}")
+
+        # Workaround to prevent overwritting suggestions, it adds empty
+        # suggestion, otherwise names with colons will be corrupted
+        COMPREPLY+=(" ")
+
+        return 0
+    fi
+
+    # Workaround to complete names with colons, it removes colon prefix from
+    # COMPREPLY
+    __ltrim_colon_completions "$cur"
+}
+
+__gio() {
+    # Complete subcommands
+    if (( ${COMP_CWORD} == 1 )); then
+        COMPREPLY=($(compgen -W "help version cat copy info list mime mkdir monitor mount move open rename save set trash tree" -- "${COMP_WORDS[1]}"))
+        compopt +o nospace
+        return 0
+    fi
+
+    # Complete file locations
+    __gio_location
+}
+
+####################################################################################################
+
+complete -o nospace -F __gio gio
diff --git a/gio/fam/gfamfilemonitor.map b/gio/fam/gfamfilemonitor.map
new file mode 100644
index 000000000..43ed5a77c
--- /dev/null
+++ b/gio/fam/gfamfilemonitor.map
@@ -0,0 +1,8 @@
+{
+global:
+  g_io_module_load;
+  g_io_module_unload;
+  g_io_module_query;
+local:
+  *;
+};
diff --git a/gio/fam/meson.build b/gio/fam/meson.build
new file mode 100644
index 000000000..d24670a63
--- /dev/null
+++ b/gio/fam/meson.build
@@ -0,0 +1,36 @@
+if not get_option('fam')
+  subdir_done()
+endif
+
+fam_dep = cc.find_library('fam')
+fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args
+if cc.has_function('FAMNoExists', dependencies : fam_dep)
+  fam_c_args += '-DHAVE_FAM_NO_EXISTS=1'
+endif
+
+deps = [
+  fam_dep,
+  libglib_dep,
+  libgobject_dep,
+  libgio_dep,
+]
+
+symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map')
+fam_ldflags = cc.get_supported_link_arguments([
+  '-Wl,--version-script,' + symbol_map,
+  '-Wl,-no-undefined',
+])
+
+module = shared_module('giofam', 'gfamfilemonitor.c',
+  include_directories : [gmoduleinc],
+  dependencies : deps,
+  c_args : fam_c_args,
+  link_args : fam_ldflags,
+  link_depends : symbol_map,
+  install_dir : glib_giomodulesdir,
+  install : true,
+)
+
+if not meson.is_cross_build()
+  meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
+endif
diff --git a/gio/gbufferedoutputstream.c b/gio/gbufferedoutputstream.c
index 8b2bcdc04..98bda501d 100644
--- a/gio/gbufferedoutputstream.c
+++ b/gio/gbufferedoutputstream.c
@@ -699,7 +699,7 @@ g_buffered_output_stream_flush_async (GOutputStream        *stream,
   GTask *task;
   FlushData *fdata;
 
-  fdata = g_slice_new (FlushData);
+  fdata = g_slice_new0 (FlushData);
   fdata->flush_stream = TRUE;
   fdata->close_stream = FALSE;
 
@@ -732,7 +732,7 @@ g_buffered_output_stream_close_async (GOutputStream        *stream,
   GTask *task;
   FlushData *fdata;
 
-  fdata = g_slice_new (FlushData);
+  fdata = g_slice_new0 (FlushData);
   fdata->close_stream = TRUE;
 
   task = g_task_new (stream, cancellable, callback, data);
diff --git a/gio/gcocoanotificationbackend.c b/gio/gcocoanotificationbackend.m
index ae4ad8833..ae4ad8833 100644
--- a/gio/gcocoanotificationbackend.c
+++ b/gio/gcocoanotificationbackend.m
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index af8ef44c6..57249d94e 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -405,8 +405,8 @@ g_content_type_get_description (const gchar *type)
  *
  * Gets the mime type for the content type, if one is registered.
  *
- * Returns: (nullable): the registered mime type for the given @type,
- *     or %NULL if unknown.
+ * Returns: (nullable) (transfer full): the registered mime type for the
+ *     given @type, or %NULL if unknown; free with g_free().
  */
 char *
 g_content_type_get_mime_type (const char *type)
diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
index 8168273cf..c434d24ed 100644
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -613,6 +613,286 @@ class HeaderCodeGenerator:
 
 # ----------------------------------------------------------------------------------------------------
 
+class InterfaceInfoHeaderCodeGenerator:
+    def __init__(self, ifaces, namespace, header_name, use_pragma, outfile):
+        self.ifaces = ifaces
+        self.namespace, self.ns_upper, self.ns_lower = generate_namespace(namespace)
+        self.header_guard = header_name.upper().replace('.', '_').replace('-', '_').replace('/', '_').replace(':', '_')
+        self.use_pragma = use_pragma
+        self.outfile = outfile
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_header_preamble(self):
+        self.outfile.write(LICENSE_STR.format(config.VERSION))
+        self.outfile.write('\n')
+
+        if self.use_pragma:
+            self.outfile.write('#pragma once\n')
+        else:
+            self.outfile.write('#ifndef __{!s}__\n'.format(self.header_guard))
+            self.outfile.write('#define __{!s}__\n'.format(self.header_guard))
+
+        self.outfile.write('\n')
+        self.outfile.write('#include <gio/gio.h>\n')
+        self.outfile.write('\n')
+        self.outfile.write('G_BEGIN_DECLS\n')
+        self.outfile.write('\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def declare_infos(self):
+        for i in self.ifaces:
+            self.outfile.write('extern const GDBusInterfaceInfo %s_interface;\n' % i.name_lower)
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_header_postamble(self):
+        self.outfile.write('\n')
+        self.outfile.write('G_END_DECLS\n')
+
+        if not self.use_pragma:
+            self.outfile.write('\n')
+            self.outfile.write('#endif /* __{!s}__ */\n'.format(self.header_guard))
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate(self):
+        self.generate_header_preamble()
+        self.declare_infos()
+        self.generate_header_postamble()
+
+# ----------------------------------------------------------------------------------------------------
+
+class InterfaceInfoBodyCodeGenerator:
+    def __init__(self, ifaces, namespace, header_name, outfile):
+        self.ifaces = ifaces
+        self.namespace, self.ns_upper, self.ns_lower = generate_namespace(namespace)
+        self.header_name = header_name
+        self.outfile = outfile
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_body_preamble(self):
+        self.outfile.write(LICENSE_STR.format(config.VERSION))
+        self.outfile.write('\n')
+        self.outfile.write('#ifdef HAVE_CONFIG_H\n'
+                           '#  include "config.h"\n'
+                           '#endif\n'
+                           '\n'
+                           '#include "%s"\n'
+                           '\n'
+                           '#include <string.h>\n'
+                           % (self.header_name))
+        self.outfile.write('\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_array(self, array_name_lower, element_type, elements):
+        self.outfile.write('const %s * const %s[] =\n' % (element_type, array_name_lower))
+        self.outfile.write('{\n')
+        for (_, name) in sorted(elements, key=utils.version_cmp_key):
+            self.outfile.write('  &%s,\n' % name)
+        self.outfile.write('  NULL,\n')
+        self.outfile.write('};\n')
+        self.outfile.write('\n')
+
+    def define_annotations(self, array_name_lower, annotations):
+        if len(annotations) == 0:
+            return
+
+        annotation_pointers = []
+
+        for a in annotations:
+            # Skip internal annotations.
+            if a.key.startswith('org.gtk.GDBus'):
+                continue
+
+            self.define_annotations('%s__%s_annotations' % (array_name_lower, a.key_lower), a.annotations)
+
+            self.outfile.write('const GDBusAnnotationInfo %s__%s_annotation =\n' % (array_name_lower, a.key_lower))
+            self.outfile.write('{\n')
+            self.outfile.write('  -1,  /* ref count */\n')
+            self.outfile.write('  (gchar *) "%s",\n' % a.key)
+            self.outfile.write('  (gchar *) "%s",\n' % a.value)
+            if len(a.annotations) > 0:
+                self.outfile.write('  (GDBusAnnotationInfo **) %s__%s_annotations,\n' % (array_name_lower, a.key_lower))
+            else:
+                self.outfile.write('  NULL,  /* no annotations */\n')
+            self.outfile.write('};\n')
+            self.outfile.write('\n')
+
+            key = (a.since, '%s__%s_annotation' % (array_name_lower, a.key_lower))
+            annotation_pointers.append(key)
+
+        self.generate_array(array_name_lower, 'GDBusAnnotationInfo',
+                            annotation_pointers)
+
+    def define_args(self, array_name_lower, args):
+        if len(args) == 0:
+            return
+
+        arg_pointers = []
+
+        for a in args:
+            self.define_annotations('%s__%s_arg_annotations' % (array_name_lower, a.name), a.annotations)
+
+            self.outfile.write('const GDBusArgInfo %s__%s_arg =\n' % (array_name_lower, a.name))
+            self.outfile.write('{\n')
+            self.outfile.write('  -1,  /* ref count */\n')
+            self.outfile.write('  (gchar *) "%s",\n' % a.name)
+            self.outfile.write('  (gchar *) "%s",\n' % a.signature)
+            if len(a.annotations) > 0:
+                self.outfile.write('  (GDBusAnnotationInfo **) %s__%s_arg_annotations,\n' % (array_name_lower, a.name))
+            else:
+                self.outfile.write('  NULL,  /* no annotations */\n')
+            self.outfile.write('};\n')
+            self.outfile.write('\n')
+
+            key = (a.since, '%s__%s_arg' % (array_name_lower, a.name))
+            arg_pointers.append(key)
+
+        self.generate_array(array_name_lower, 'GDBusArgInfo', arg_pointers)
+
+    def define_infos(self):
+        for i in self.ifaces:
+            self.outfile.write('/* ------------------------------------------------------------------------ */\n')
+            self.outfile.write('/* Definitions for %s */\n' % i.name)
+            self.outfile.write('\n')
+
+            # GDBusMethodInfos.
+            if len(i.methods) > 0:
+                method_pointers = []
+
+                for m in i.methods:
+                    self.define_args('%s_interface__%s_method_in_args' % (i.name_lower, m.name_lower), m.in_args)
+                    self.define_args('%s_interface__%s_method_out_args' % (i.name_lower, m.name_lower), m.out_args)
+                    self.define_annotations('%s_interface__%s_method_annotations' % (i.name_lower, m.name_lower), m.annotations)
+
+                    self.outfile.write('const GDBusMethodInfo %s_interface__%s_method =\n' % (i.name_lower, m.name_lower))
+                    self.outfile.write('{\n')
+                    self.outfile.write('  -1,  /* ref count */\n')
+                    self.outfile.write('  (gchar *) "%s",\n' % m.name)
+                    if len(m.in_args) > 0:
+                        self.outfile.write('  (GDBusArgInfo **) %s_interface__%s_method_in_args,\n' % (i.name_lower, m.name_lower))
+                    else:
+                        self.outfile.write('  NULL,  /* no in args */\n')
+                    if len(m.out_args) > 0:
+                        self.outfile.write('  (GDBusArgInfo **) %s_interface__%s_method_out_args,\n' % (i.name_lower, m.name_lower))
+                    else:
+                        self.outfile.write('  NULL,  /* no out args */\n')
+                    if len(m.annotations) > 0:
+                        self.outfile.write('  (GDBusAnnotationInfo **) %s_interface__%s_method_annotations,\n' % (i.name_lower, m.name_lower))
+                    else:
+                        self.outfile.write('  NULL,  /* no annotations */\n')
+                    self.outfile.write('};\n')
+                    self.outfile.write('\n')
+
+                    key = (m.since, '%s_interface__%s_method' % (i.name_lower, m.name_lower))
+                    method_pointers.append(key)
+
+                self.generate_array('%s_interface_methods' % i.name_lower,
+                                    'GDBusMethodInfo', method_pointers)
+
+            # GDBusSignalInfos.
+            if len(i.signals) > 0:
+                signal_pointers = []
+
+                for s in i.signals:
+                    self.define_args('%s_interface__%s_signal_args' % (i.name_lower, s.name_lower), s.args)
+                    self.define_annotations('%s_interface__%s_signal_annotations' % (i.name_lower, s.name_lower), s.annotations)
+
+                    self.outfile.write('const GDBusSignalInfo %s_interface__%s_signal =\n' % (i.name_lower, s.name_lower))
+                    self.outfile.write('{\n')
+                    self.outfile.write('  -1,  /* ref count */\n')
+                    self.outfile.write('  (gchar *) "%s",\n' % s.name)
+                    if len(s.args) > 0:
+                        self.outfile.write('  (GDBusArgInfo **) %s_interface__%s_signal_args,\n' % (i.name_lower, s.name_lower))
+                    else:
+                        self.outfile.write('  NULL,  /* no args */\n')
+                    if len(s.annotations) > 0:
+                        self.outfile.write('  (GDBusAnnotationInfo **) %s_interface__%s_signal_annotations,\n' % (i.name_lower, s.name_lower))
+                    else:
+                        self.outfile.write('  NULL,  /* no annotations */\n')
+                    self.outfile.write('};\n')
+                    self.outfile.write('\n')
+
+                    key = (m.since, '%s_interface__%s_signal' % (i.name_lower, s.name_lower))
+                    signal_pointers.append(key)
+
+                self.generate_array('%s_interface_signals' % i.name_lower,
+                                    'GDBusSignalInfo', signal_pointers)
+
+            # GDBusPropertyInfos.
+            if len(i.properties) > 0:
+                property_pointers = []
+
+                for p in i.properties:
+                    if p.readable and p.writable:
+                        flags = 'G_DBUS_PROPERTY_INFO_FLAGS_READABLE | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE'
+                    elif p.readable:
+                        flags = 'G_DBUS_PROPERTY_INFO_FLAGS_READABLE'
+                    elif p.writable:
+                        flags = 'G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE'
+                    else:
+                        flags = 'G_DBUS_PROPERTY_INFO_FLAGS_NONE'
+
+                    self.define_annotations('%s_interface__%s_property_annotations' % (i.name_lower, p.name_lower), p.annotations)
+
+                    self.outfile.write('const GDBusPropertyInfo %s_interface__%s_property =\n' % (i.name_lower, p.name_lower))
+                    self.outfile.write('{\n')
+                    self.outfile.write('  -1,  /* ref count */\n')
+                    self.outfile.write('  (gchar *) "%s",\n' % p.name)
+                    self.outfile.write('  (gchar *) "%s",\n' % p.signature)
+                    self.outfile.write('  %s,\n' % flags)
+                    if len(p.annotations) > 0:
+                        self.outfile.write('  (GDBusAnnotationInfo **) %s_interface__%s_property_annotations,\n' % (i.name_lower, p.name_lower))
+                    else:
+                        self.outfile.write('  NULL,  /* no annotations */\n')
+                    self.outfile.write('};\n')
+                    self.outfile.write('\n')
+
+                    key = (m.since, '%s_interface__%s_property' % (i.name_lower, p.name_lower))
+                    property_pointers.append(key)
+
+                self.generate_array('%s_interface_properties' % i.name_lower,
+                                    'GDBusPropertyInfo', property_pointers)
+
+            # Finally the GDBusInterfaceInfo.
+            self.define_annotations('%s_interface_annotations' % i.name_lower,
+                                    i.annotations)
+
+            self.outfile.write('const GDBusInterfaceInfo %s_interface =\n' % i.name_lower)
+            self.outfile.write('{\n')
+            self.outfile.write('  -1,  /* ref count */\n')
+            self.outfile.write('  (gchar *) "%s",\n' % i.name)
+            if len(i.methods) > 0:
+                self.outfile.write('  (GDBusMethodInfo **) %s_interface_methods,\n' % i.name_lower)
+            else:
+                self.outfile.write('  NULL,  /* no methods */\n')
+            if len(i.signals) > 0:
+                self.outfile.write('  (GDBusSignalInfo **) %s_interface_signals,\n' % i.name_lower)
+            else:
+                self.outfile.write('  NULL,  /* no signals */\n')
+            if len(i.properties) > 0:
+                self.outfile.write('  (GDBusPropertyInfo **) %s_interface_properties,\n' % i.name_lower)
+            else:
+                self.outfile.write(  'NULL,  /* no properties */\n')
+            if len(i.annotations) > 0:
+                self.outfile.write('  (GDBusAnnotationInfo **) %s_interface_annotations,\n' % i.name_lower)
+            else:
+                self.outfile.write('  NULL,  /* no annotations */\n')
+            self.outfile.write('};\n')
+            self.outfile.write('\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate(self):
+        self.generate_body_preamble()
+        self.define_infos()
+
+# ----------------------------------------------------------------------------------------------------
+
 class CodeGenerator:
     def __init__(self, ifaces, namespace, generate_objmanager, header_name,
                  input_files_basenames, docbook_gen, outfile):
@@ -788,7 +1068,7 @@ class CodeGenerator:
                            '\n')
 
     def generate_annotations(self, prefix, annotations):
-        if annotations == None:
+        if annotations is None:
             return
 
         n = 0
diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
index 65876a2e8..03de1d107 100755
--- a/gio/gdbus-2.0/codegen/codegen_main.py
+++ b/gio/gdbus-2.0/codegen/codegen_main.py
@@ -63,38 +63,38 @@ def apply_annotation(iface_list, iface, method, signal, prop, arg, key, value):
             iface_obj = i
             break
 
-    if iface_obj == None:
+    if iface_obj is None:
         print_error('No interface "{}"'.format(iface))
 
     target_obj = None
 
     if method:
         method_obj = find_method(iface_obj, method)
-        if method_obj == None:
+        if method_obj is None:
             print_error('No method "{}" on interface "{}"'.format(method, iface))
         if arg:
             arg_obj = find_arg(method_obj.in_args, arg)
-            if (arg_obj == None):
+            if (arg_obj is None):
                 arg_obj = find_arg(method_obj.out_args, arg)
-                if (arg_obj == None):
+                if (arg_obj is None):
                     print_error('No arg "{}" on method "{}" on interface "{}"'.format(arg, method, iface))
             target_obj = arg_obj
         else:
             target_obj = method_obj
     elif signal:
         signal_obj = find_signal(iface_obj, signal)
-        if signal_obj == None:
+        if signal_obj is None:
             print_error('No signal "{}" on interface "{}"'.format(signal, iface))
         if arg:
             arg_obj = find_arg(signal_obj.args, arg)
-            if (arg_obj == None):
+            if (arg_obj is None):
                 print_error('No arg "{}" on signal "{}" on interface "{}"'.format(arg, signal, iface))
             target_obj = arg_obj
         else:
             target_obj = signal_obj
     elif prop:
         prop_obj = find_prop(iface_obj, prop)
-        if prop_obj == None:
+        if prop_obj is None:
             print_error('No property "{}" on interface "{}"'.format(prop, iface))
         target_obj = prop_obj
     else:
@@ -152,7 +152,7 @@ def codegen_main():
     arg_parser.add_argument('files', metavar='FILE', nargs='*',
                             help='D-Bus introspection XML file')
     arg_parser.add_argument('--xml-files', metavar='FILE', action='append', default=[],
-                            help='D-Bus introspection XML file')
+                            help=argparse.SUPPRESS)
     arg_parser.add_argument('--interface-prefix', metavar='PREFIX', default='',
                             help='String to strip from D-Bus interface names for code and docs')
     arg_parser.add_argument('--c-namespace', metavar='NAMESPACE', default='',
@@ -175,6 +175,10 @@ def codegen_main():
                        help='Generate C headers')
     group.add_argument('--body', action='store_true',
                        help='Generate C code')
+    group.add_argument('--interface-info-header', action='store_true',
+                       help='Generate GDBusInterfaceInfo C header')
+    group.add_argument('--interface-info-body', action='store_true',
+                       help='Generate GDBusInterfaceInfo C code')
 
     group = arg_parser.add_mutually_exclusive_group()
     group.add_argument('--output', metavar='FILE',
@@ -210,6 +214,24 @@ def codegen_main():
 
         c_file = args.output
         header_name = os.path.splitext(os.path.basename(c_file))[0] + '.h'
+    elif args.interface_info_header:
+        if args.output is None:
+            print_error('Using --interface-info-header requires --output')
+        if args.c_generate_object_manager:
+            print_error('--c-generate-object-manager is incompatible with '
+                        '--interface-info-header')
+
+        h_file = args.output
+        header_name = os.path.basename(h_file)
+    elif args.interface_info_body:
+        if args.output is None:
+            print_error('Using --interface-info-body requires --output')
+        if args.c_generate_object_manager:
+            print_error('--c-generate-object-manager is incompatible with '
+                        '--interface-info-body')
+
+        c_file = args.output
+        header_name = os.path.splitext(os.path.basename(c_file))[0] + '.h'
 
     all_ifaces = []
     input_files_basenames = []
@@ -220,7 +242,7 @@ def codegen_main():
         all_ifaces.extend(parsed_ifaces)
         input_files_basenames.append(os.path.basename(fname))
 
-    if args.annotate != None:
+    if args.annotate is not None:
         apply_annotations(all_ifaces, args.annotate)
 
     for i in all_ifaces:
@@ -254,6 +276,23 @@ def codegen_main():
                                         outfile)
             gen.generate()
 
+    if args.interface_info_header:
+        with open(h_file, 'w') as outfile:
+            gen = codegen.InterfaceInfoHeaderCodeGenerator(all_ifaces,
+                                                           args.c_namespace,
+                                                           header_name,
+                                                           args.pragma_once,
+                                                           outfile)
+            gen.generate()
+
+    if args.interface_info_body:
+        with open(c_file, 'w') as outfile:
+            gen = codegen.InterfaceInfoBodyCodeGenerator(all_ifaces,
+                                                         args.c_namespace,
+                                                         header_name,
+                                                         outfile)
+            gen.generate()
+
     sys.exit(0)
 
 if __name__ == "__main__":
diff --git a/gio/gdbus-2.0/codegen/dbustypes.py b/gio/gdbus-2.0/codegen/dbustypes.py
index bfc69f596..2ff736a5e 100644
--- a/gio/gdbus-2.0/codegen/dbustypes.py
+++ b/gio/gdbus-2.0/codegen/dbustypes.py
@@ -27,6 +27,25 @@ class Annotation:
         self.key = key
         self.value = value
         self.annotations = []
+        self.since = ''
+
+    def post_process(self, interface_prefix, cns, cns_upper, cns_lower, container):
+        key = self.key
+        overridden_key = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
+        if utils.is_ugly_case(overridden_key):
+            self.key_lower = overridden_key.lower()
+        else:
+            if overridden_key:
+                key = overridden_key
+            self.key_lower = utils.camel_case_to_uscore(key).lower().replace('-', '_').replace('.', '_')
+
+        if len(self.since) == 0:
+            self.since = utils.lookup_since(self.annotations)
+            if len(self.since) == 0:
+                self.since = container.since
+
+        for a in self.annotations:
+            a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
 
 class Arg:
     def __init__(self, name, signature):
@@ -42,7 +61,7 @@ class Arg:
         if len(self.since) == 0:
             self.since = utils.lookup_since(self.annotations)
 
-        if self.name == None:
+        if self.name is None:
             self.name = 'unnamed_arg%d'%arg_number
         # default to GVariant
         self.ctype_in_g  = 'GVariant *'
@@ -229,6 +248,8 @@ class Arg:
                 self.gvalue_get = 'g_value_get_boxed'
                 self.array_annotation = '(array zero-terminated=1)'
 
+        for a in self.annotations:
+            a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
 
 class Method:
     def __init__(self, name):
@@ -270,6 +291,9 @@ class Method:
         if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
             self.deprecated = True
 
+        for a in self.annotations:
+            a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
+
 class Signal:
     def __init__(self, name):
         self.name = name
@@ -305,6 +329,9 @@ class Signal:
         if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
             self.deprecated = True
 
+        for a in self.annotations:
+            a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
+
 class Property:
     def __init__(self, name, signature, access):
         self.name = name
@@ -356,6 +383,9 @@ class Property:
         if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
             self.deprecated = True
 
+        for a in self.annotations:
+            a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
+
 class Interface:
     def __init__(self, name):
         self.name = name
@@ -429,3 +459,6 @@ class Interface:
 
         for p in self.properties:
             p.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
+
+        for a in self.annotations:
+            a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index 54a86b0d6..24d2527bc 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -10,7 +10,7 @@ gdbus_codegen_files = [
 
 gdbus_codegen_conf = configuration_data()
 gdbus_codegen_conf.set('VERSION', glib_version)
-gdbus_codegen_conf.set('PYTHON', python.path())
+gdbus_codegen_conf.set('PYTHON', python_name)
 gdbus_codegen_conf.set('DATADIR', glib_datadir)
 
 # Install gdbus-codegen executable
@@ -20,6 +20,8 @@ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
   install_dir : get_option('bindir'),
   configuration : gdbus_codegen_conf
 )
+  # Provide tools for others when we're a subproject and they use the Meson GNOME module
+meson.override_find_program('gdbus-codegen', gdbus_codegen)
 
 codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')
 
@@ -30,12 +32,11 @@ gdbus_codegen_built_files += configure_file(input : 'config.py.in',
                                             install_dir : codegen_dir,
                                             configuration : gdbus_codegen_conf)
 
-blank_conf = configuration_data()
 foreach f : gdbus_codegen_files
   # Copy these into the builddir so that gdbus-codegen can be used uninstalled
   # and then install it too so that it can be used after installation
   gdbus_codegen_built_files += configure_file(input : f, output : f,
                                               install : true,
                                               install_dir : codegen_dir,
-                                              configuration : blank_conf)
+                                              copy : true)
 endforeach
diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
index bdfa703ac..95ba107d3 100644
--- a/gio/gdbus-2.0/codegen/utils.py
+++ b/gio/gdbus-2.0/codegen/utils.py
@@ -116,21 +116,21 @@ def lookup_annotation(annotations, key):
 
 def lookup_docs(annotations):
     s = lookup_annotation(annotations, 'org.gtk.GDBus.DocString')
-    if s == None:
+    if s is None:
         return ''
     else:
         return s
 
 def lookup_since(annotations):
     s = lookup_annotation(annotations, 'org.gtk.GDBus.Since')
-    if s == None:
+    if s is None:
         return ''
     else:
         return s
 
 def lookup_brief_docs(annotations):
     s = lookup_annotation(annotations, 'org.gtk.GDBus.DocString.Short')
-    if s == None:
+    if s is None:
         return ''
     else:
         return s
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 2e4d861bb..5fc6a121b 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -419,6 +419,10 @@ g_dbus_is_supported_address (const gchar  *string,
         supported = is_valid_nonce_tcp (a[n], key_value_pairs, error);
       else if (g_strcmp0 (a[n], "autolaunch:") == 0)
         supported = TRUE;
+      else
+        g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
+                     _("Unknown or unsupported transport “%s� for address “%s�"),
+                     transport_name, a[n]);
 
       g_free (transport_name);
       g_hash_table_unref (key_value_pairs);
diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
index aba9cea59..553bcdc32 100644
--- a/gio/gdbusauthmechanismsha1.c
+++ b/gio/gdbusauthmechanismsha1.c
@@ -603,7 +603,7 @@ keyring_generate_entry (const gchar  *cookie_context,
   gchar **lines;
   gint max_line_id;
   GString *new_contents;
-  guint64 now;
+  gint64 now;
   gboolean have_id;
   gint use_id;
   gchar *use_cookie;
@@ -658,7 +658,7 @@ keyring_generate_entry (const gchar  *cookie_context,
     }
 
   new_contents = g_string_new (NULL);
-  now = time (NULL);
+  now = g_get_real_time () / G_USEC_PER_SEC;
   changed_file = FALSE;
 
   max_line_id = 0;
@@ -672,7 +672,7 @@ keyring_generate_entry (const gchar  *cookie_context,
           gchar **tokens;
           gchar *endp;
           gint line_id;
-          guint64 line_when;
+          gint64 line_when;
           gboolean keep_entry;
 
           if (line[0] == '\0')
@@ -807,9 +807,9 @@ keyring_generate_entry (const gchar  *cookie_context,
       g_free (raw_cookie);
 
       g_string_append_printf (new_contents,
-                              "%d %" G_GUINT64_FORMAT " %s\n",
+                              "%d %" G_GINT64_FORMAT " %s\n",
                               *out_id,
-                              (guint64) time (NULL),
+                              g_get_real_time () / G_USEC_PER_SEC,
                               *out_cookie);
       changed_file = TRUE;
     }
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 1ba93fcb4..6466fbd00 100755
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -88,15 +88,6 @@
  *      kind of pitfalls it avoids
  *      - Export objects before claiming names
  *    - Talk about auto-starting services (cf. GBusNameWatcherFlags)
- *
- *  - use abstract sockets in test code
- *   - right now it doesn't work, dbus-daemon(1) fails with
- *
- *        /gdbus/connection/filter: Failed to start message bus: Failed to bind
- *        socket "/tmp/g-dbus-tests-pid-28531": Address already in use
- *        ** WARNING **: Error reading address from dbus daemon, 0 bytes read
- *
- *     or similar.
  */
 
 #include "config.h"
@@ -5023,7 +5014,7 @@ invoke_get_property_in_idle_cb (gpointer _data)
     {
       reply = g_dbus_message_new_method_error (data->message,
                                                "org.freedesktop.DBus.Error.UnknownMethod",
-                                               _("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
+                                               _("No such interface “org.freedesktop.DBus.Properties� on object at path %s"),
                                                g_dbus_message_get_path (data->message));
       g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
       g_object_unref (reply);
@@ -5165,7 +5156,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection            *connect
     {
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.InvalidArgs",
-                                               _("No such property '%s'"),
+                                               _("No such property “%s�"),
                                                property_name);
       g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
       g_object_unref (reply);
@@ -5177,7 +5168,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection            *connect
     {
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.InvalidArgs",
-                                               _("Property '%s' is not readable"),
+                                               _("Property “%s� is not readable"),
                                                property_name);
       g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
       g_object_unref (reply);
@@ -5188,7 +5179,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection            *connect
     {
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.InvalidArgs",
-                                               _("Property '%s' is not writable"),
+                                               _("Property “%s� is not writable"),
                                                property_name);
       g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
       g_object_unref (reply);
@@ -5208,7 +5199,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection            *connect
         {
           reply = g_dbus_message_new_method_error (message,
                                                    "org.freedesktop.DBus.Error.InvalidArgs",
-                                                   _("Error setting property '%s': Expected type '%s' but got '%s'"),
+                                                   _("Error setting property “%s�: Expected type “%s� but got “%s�"),
                                                    property_name, property_info->signature,
                                                    g_variant_get_type_string (value));
           g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
@@ -5313,7 +5304,7 @@ handle_getset_property (GDBusConnection *connection,
       GDBusMessage *reply;
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.InvalidArgs",
-                                               _("No such interface '%s'"),
+                                               _("No such interface “%s�"),
                                                interface_name);
       g_dbus_connection_send_message_unlocked (eo->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
       g_object_unref (reply);
@@ -5370,7 +5361,7 @@ invoke_get_all_properties_in_idle_cb (gpointer _data)
     {
       reply = g_dbus_message_new_method_error (data->message,
                                                "org.freedesktop.DBus.Error.UnknownMethod",
-                                               _("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
+                                               _("No such interface “org.freedesktop.DBus.Properties� on object at path %s"),
                                                g_dbus_message_get_path (data->message));
       g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
       g_object_unref (reply);
@@ -5521,7 +5512,7 @@ handle_get_all_properties (GDBusConnection *connection,
       GDBusMessage *reply;
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.InvalidArgs",
-                                               _("No such interface '%s'"),
+                                               _("No such interface “%s�"),
                                                interface_name);
       g_dbus_connection_send_message_unlocked (eo->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
       g_object_unref (reply);
@@ -5739,7 +5730,7 @@ call_in_idle_cb (gpointer user_data)
       GDBusMessage *reply;
       reply = g_dbus_message_new_method_error (g_dbus_method_invocation_get_message (invocation),
                                                "org.freedesktop.DBus.Error.UnknownMethod",
-                                               _("No such interface '%s' on object at path %s"),
+                                               _("No such interface “%s� on object at path %s"),
                                                g_dbus_method_invocation_get_interface_name (invocation),
                                                g_dbus_method_invocation_get_object_path (invocation));
       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -5837,7 +5828,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection            *connection,
     {
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.UnknownMethod",
-                                               _("No such method '%s'"),
+                                               _("No such method “%s�"),
                                                g_dbus_message_get_member (message));
       g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
       g_object_unref (reply);
@@ -5868,7 +5859,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection            *connection,
 
       reply = g_dbus_message_new_method_error (message,
                                                "org.freedesktop.DBus.Error.InvalidArgs",
-                                               _("Type of message, '%s', does not match expected type '%s'"),
+                                               _("Type of message, “%s�, does not match expected type “%s�"),
                                                g_variant_get_type_string (parameters),
                                                type_string);
       g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
@@ -6526,7 +6517,7 @@ decode_method_reply (GDBusMessage        *reply,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Method '%s' returned type '%s', but expected '%s'"),
+                       _("Method “%s� returned type “%s�, but expected “%s�"),
                        method_name, g_variant_get_type_string (result), type_string);
 
           g_variant_unref (result);
@@ -7500,7 +7491,7 @@ handle_subtree_method_invocation (GDBusConnection *connection,
           GDBusMessage *reply;
           reply = g_dbus_message_new_method_error (message,
                                                    "org.freedesktop.DBus.Error.InvalidArgs",
-                                                   _("No such interface '%s'"),
+                                                   _("No such interface “%s�"),
                                                    interface_name);
           g_dbus_connection_send_message (es->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
           g_object_unref (reply);
@@ -7611,7 +7602,7 @@ process_subtree_vtable_message_in_idle_cb (gpointer _data)
       GDBusMessage *reply;
       reply = g_dbus_message_new_method_error (data->message,
                                                "org.freedesktop.DBus.Error.UnknownMethod",
-                                               _("Method '%s' on interface '%s' with signature '%s' does not exist"),
+                                               _("Method “%s� on interface “%s� with signature “%s� does not exist"),
                                                g_dbus_message_get_member (data->message),
                                                g_dbus_message_get_interface (data->message),
                                                g_dbus_message_get_signature (data->message));
@@ -8009,7 +8000,7 @@ distribute_method_call (GDBusConnection *connection,
   /* if we end up here, the message has not been not handled - so return an error saying this */
   reply = g_dbus_message_new_method_error (message,
                                            "org.freedesktop.DBus.Error.UnknownMethod",
-                                           _("No such interface '%s' on object at path %s"),
+                                           _("No such interface “%s� on object at path %s"),
                                            interface_name,
                                            object_path);
   g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL, -1);
@@ -8061,7 +8052,7 @@ message_bus_get_singleton (GBusType   bus_type,
                            G_IO_ERROR,
                            G_IO_ERROR_INVALID_ARGUMENT,
                            _("Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable"
-                             " - unknown value '%s'"),
+                             " — unknown value “%s�"),
                            starter_bus);
             }
           else
diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c
index 3516183f9..e6b3c1af0 100644
--- a/gio/gdbusdaemon.c
+++ b/gio/gdbusdaemon.c
@@ -1247,8 +1247,8 @@ handle_remove_match (_GFreedesktopDBus *object,
       else
 	_g_freedesktop_dbus_complete_remove_match (object, invocation);
     }
-
-  match_free (match);
+  if (match)    
+    match_free (match);
 
   return TRUE;
 }
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 7b0cbb0a4..9479b3f9f 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -32,6 +32,8 @@
 #include <sys/mkdev.h>
 #elif MAJOR_IN_SYSMACROS
 #include <sys/sysmacros.h>
+#elif MAJOR_IN_TYPES
+#include <sys/types.h>
 #else
 #define MAJOR_MINOR_NOT_FOUND 1
 #endif
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index a2aa760c7..d0ffbace3 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -155,6 +155,7 @@ static guint           n_desktop_file_dirs;
 static const guint     desktop_file_dir_user_config_index = 0;
 static guint           desktop_file_dir_user_data_index;
 static GMutex          desktop_file_dir_lock;
+static const gchar    *gio_launch_desktop_path = NULL;
 
 /* Monitor 'changed' signal handler {{{2 */
 static void desktop_file_dir_reset (DesktopFileDir *dir);
@@ -2562,41 +2563,6 @@ create_files_for_uris (GList *uris)
   return g_list_reverse (res);
 }
 
-typedef struct
-{
-  GSpawnChildSetupFunc user_setup;
-  gpointer user_setup_data;
-
-  char *pid_envvar;
-} ChildSetupData;
-
-static void
-child_setup (gpointer user_data)
-{
-  ChildSetupData *data = user_data;
-
-  if (data->pid_envvar)
-    {
-      pid_t pid = getpid ();
-      char buf[20];
-      int i;
-
-      /* Write the pid into the space already reserved for it in the
-       * environment array. We can't use sprintf because it might
-       * malloc, so we do it by hand. It's simplest to write the pid
-       * out backwards first, then copy it over.
-       */
-      for (i = 0; pid; i++, pid /= 10)
-        buf[i] = (pid % 10) + '0';
-      for (i--; i >= 0; i--)
-        *(data->pid_envvar++) = buf[i];
-      *data->pid_envvar = '\0';
-    }
-
-  if (data->user_setup)
-    data->user_setup (data->user_setup_data);
-}
-
 static void
 notify_desktop_launch (GDBusConnection  *session_bus,
                        GDesktopAppInfo  *info,
@@ -2675,6 +2641,9 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
                                            gpointer                    user_setup_data,
                                            GDesktopAppLaunchCallback   pid_callback,
                                            gpointer                    pid_callback_data,
+                                           gint                        stdin_fd,
+                                           gint                        stdout_fd,
+                                           gint                        stderr_fd,
                                            GError                    **error)
 {
   gboolean completed = FALSE;
@@ -2683,7 +2652,6 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
 
   char **argv, **envp;
   int argc;
-  ChildSetupData data;
 
   g_return_val_if_fail (info != NULL, FALSE);
 
@@ -2705,6 +2673,8 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
       GList *launched_uris;
       GList *iter;
       char *sn_id = NULL;
+      char **wrapped_argv;
+      int i;
 
       old_uris = dup_uris;
       if (!expand_application_parameters (info, exec_line, &dup_uris, &argc, &argv, error))
@@ -2723,25 +2693,11 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
           goto out;
         }
 
-      data.user_setup = user_setup;
-      data.user_setup_data = user_setup_data;
-
       if (info->filename)
-        {
-          envp = g_environ_setenv (envp,
-                                   "GIO_LAUNCHED_DESKTOP_FILE",
-                                   info->filename,
-                                   TRUE);
-          envp = g_environ_setenv (envp,
-                                   "GIO_LAUNCHED_DESKTOP_FILE_PID",
-                                   "XXXXXXXXXXXXXXXXXXXX", /* filled in child_setup */
-                                   TRUE);
-          data.pid_envvar = (char *)g_environ_getenv (envp, "GIO_LAUNCHED_DESKTOP_FILE_PID");
-        }
-      else
-        {
-          data.pid_envvar = NULL;
-        }
+        envp = g_environ_setenv (envp,
+                                 "GIO_LAUNCHED_DESKTOP_FILE",
+                                 info->filename,
+                                 TRUE);
 
       sn_id = NULL;
       if (launch_context)
@@ -2760,14 +2716,40 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
           g_list_free_full (launched_files, g_object_unref);
         }
 
-      if (!g_spawn_async (info->path,
-                          argv,
-                          envp,
-                          spawn_flags,
-                          child_setup,
-                          &data,
-                          &pid,
-                          error))
+      if (g_once_init_enter (&gio_launch_desktop_path))
+        {
+          const gchar *tmp;
+
+          /* Allow test suite to specify path to gio-launch-desktop */
+          tmp = g_getenv ("GIO_LAUNCH_DESKTOP");
+
+          /* Fall back on usual searching in $PATH */
+          if (tmp == NULL)
+            tmp = "gio-launch-desktop";
+          g_once_init_leave (&gio_launch_desktop_path, tmp);
+        }
+
+      wrapped_argv = g_new (char *, argc + 2);
+      wrapped_argv[0] = g_strdup (gio_launch_desktop_path);
+
+      for (i = 0; i < argc; i++)
+        wrapped_argv[i + 1] = g_steal_pointer (&argv[i]);
+
+      wrapped_argv[i + 1] = NULL;
+      g_free (argv);
+      argv = NULL;
+
+      if (!g_spawn_async_with_fds (info->path,
+                                   wrapped_argv,
+                                   envp,
+                                   spawn_flags,
+                                   user_setup,
+                                   user_setup_data,
+                                   &pid,
+                                   stdin_fd,
+                                   stdout_fd,
+                                   stderr_fd,
+                                   error))
         {
           if (sn_id)
             g_app_launch_context_launch_failed (launch_context, sn_id);
@@ -2805,8 +2787,8 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
       g_free (sn_id);
       g_list_free (launched_uris);
 
-      g_strfreev (argv);
-      argv = NULL;
+      g_strfreev (wrapped_argv);
+      wrapped_argv = NULL;
     }
   while (dup_uris != NULL);
 
@@ -2940,6 +2922,9 @@ g_desktop_app_info_launch_uris_internal (GAppInfo                   *appinfo,
                                          gpointer                    user_setup_data,
                                          GDesktopAppLaunchCallback   pid_callback,
                                          gpointer                    pid_callback_data,
+                                         gint                        stdin_fd,
+                                         gint                        stdout_fd,
+                                         gint                        stderr_fd,
                                          GError                     **error)
 {
   GDesktopAppInfo *info = G_DESKTOP_APP_INFO (appinfo);
@@ -2953,7 +2938,8 @@ g_desktop_app_info_launch_uris_internal (GAppInfo                   *appinfo,
   else
     success = g_desktop_app_info_launch_uris_with_spawn (info, session_bus, info->exec, uris, launch_context,
                                                          spawn_flags, user_setup, user_setup_data,
-                                                         pid_callback, pid_callback_data, error);
+                                                         pid_callback, pid_callback_data,
+                                                         stdin_fd, stdout_fd, stderr_fd, error);
 
   if (session_bus != NULL)
     {
@@ -2978,6 +2964,7 @@ g_desktop_app_info_launch_uris (GAppInfo           *appinfo,
                                                   launch_context,
                                                   _SPAWN_FLAGS_DEFAULT,
                                                   NULL, NULL, NULL, NULL,
+                                                  -1, -1, -1,
                                                   error);
 }
 
@@ -3029,6 +3016,61 @@ g_desktop_app_info_launch (GAppInfo           *appinfo,
 }
 
 /**
+ * g_desktop_app_info_launch_uris_as_manager_with_fds:
+ * @appinfo: a #GDesktopAppInfo
+ * @uris: (element-type utf8): List of URIs
+ * @launch_context: (nullable): a #GAppLaunchContext
+ * @spawn_flags: #GSpawnFlags, used for each process
+ * @user_setup: (scope async) (nullable): a #GSpawnChildSetupFunc, used once
+ *     for each process.
+ * @user_setup_data: (closure user_setup) (nullable): User data for @user_setup
+ * @pid_callback: (scope call) (nullable): Callback for child processes
+ * @pid_callback_data: (closure pid_callback) (nullable): User data for @callback
+ * @stdin_fd: file descriptor to use for child's stdin, or -1
+ * @stdout_fd: file descriptor to use for child's stdout, or -1
+ * @stderr_fd: file descriptor to use for child's stderr, or -1
+ * @error: return location for a #GError, or %NULL
+ *
+ * Equivalent to g_desktop_app_info_launch_uris_as_manager() but allows
+ * you to pass in file descriptors for the stdin, stdout and stderr streams
+ * of the launched process.
+ *
+ * If application launching occurs via some non-spawn mechanism (e.g. D-Bus
+ * activation) then @stdin_fd, @stdout_fd and @stderr_fd are ignored.
+ *
+ * Returns: %TRUE on successful launch, %FALSE otherwise.
+ *
+ * Since: 2.58
+ */
+gboolean
+g_desktop_app_info_launch_uris_as_manager_with_fds (GDesktopAppInfo            *appinfo,
+                                                    GList                      *uris,
+                                                    GAppLaunchContext          *launch_context,
+                                                    GSpawnFlags                 spawn_flags,
+                                                    GSpawnChildSetupFunc        user_setup,
+                                                    gpointer                    user_setup_data,
+                                                    GDesktopAppLaunchCallback   pid_callback,
+                                                    gpointer                    pid_callback_data,
+                                                    gint                        stdin_fd,
+                                                    gint                        stdout_fd,
+                                                    gint                        stderr_fd,
+                                                    GError                    **error)
+{
+  return g_desktop_app_info_launch_uris_internal ((GAppInfo*)appinfo,
+                                                  uris,
+                                                  launch_context,
+                                                  spawn_flags,
+                                                  user_setup,
+                                                  user_setup_data,
+                                                  pid_callback,
+                                                  pid_callback_data,
+                                                  stdin_fd,
+                                                  stdout_fd,
+                                                  stderr_fd,
+                                                  error);
+}
+
+/**
  * g_desktop_app_info_launch_uris_as_manager:
  * @appinfo: a #GDesktopAppInfo
  * @uris: (element-type utf8): List of URIs
@@ -3046,11 +3088,12 @@ g_desktop_app_info_launch (GAppInfo           *appinfo,
  * launch applications.  Ordinary applications should use
  * g_app_info_launch_uris().
  *
- * If the application is launched via traditional UNIX fork()/exec()
- * then @spawn_flags, @user_setup and @user_setup_data are used for the
- * call to g_spawn_async().  Additionally, @pid_callback (with
- * @pid_callback_data) will be called to inform about the PID of the
- * created process.
+ * If the application is launched via GSpawn, then @spawn_flags, @user_setup
+ * and @user_setup_data are used for the call to g_spawn_async().
+ * Additionally, @pid_callback (with @pid_callback_data) will be called to
+ * inform about the PID of the created process. See g_spawn_async_with_pipes()
+ * for information on certain parameter conditions that can enable an
+ * optimized posix_spawn() codepath to be used.
  *
  * If application launching occurs via some other mechanism (eg: D-Bus
  * activation) then @spawn_flags, @user_setup, @user_setup_data,
@@ -3069,15 +3112,16 @@ g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo            *appinfo,
                                            gpointer                    pid_callback_data,
                                            GError                    **error)
 {
-  return g_desktop_app_info_launch_uris_internal ((GAppInfo*)appinfo,
-                                                  uris,
-                                                  launch_context,
-                                                  spawn_flags,
-                                                  user_setup,
-                                                  user_setup_data,
-                                                  pid_callback,
-                                                  pid_callback_data,
-                                                  error);
+  return g_desktop_app_info_launch_uris_as_manager_with_fds (appinfo,
+                                                             uris,
+                                                             launch_context,
+                                                             spawn_flags,
+                                                             user_setup,
+                                                             user_setup_data,
+                                                             pid_callback,
+                                                             pid_callback_data,
+                                                             -1, -1, -1,
+                                                             error);
 }
 
 /* OnlyShowIn API support {{{2 */
@@ -4652,7 +4696,10 @@ g_desktop_app_info_launch_action (GDesktopAppInfo   *info,
 
       if (exec_line)
         g_desktop_app_info_launch_uris_with_spawn (info, session_bus, exec_line, NULL, launch_context,
-                                                   _SPAWN_FLAGS_DEFAULT, NULL, NULL, NULL, NULL, NULL);
+                                                   _SPAWN_FLAGS_DEFAULT, NULL, NULL, NULL, NULL,
+                                                   -1, -1, -1, NULL);
+
+      g_free (exec_line);
     }
 
   if (session_bus != NULL)
diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h
index a2df3dd51..86a3caa30 100644
--- a/gio/gdesktopappinfo.h
+++ b/gio/gdesktopappinfo.h
@@ -169,6 +169,20 @@ gboolean    g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo
 						       gpointer                    pid_callback_data,
 						       GError                    **error);
 
+GLIB_AVAILABLE_IN_2_58
+gboolean    g_desktop_app_info_launch_uris_as_manager_with_fds (GDesktopAppInfo            *appinfo,
+								GList                      *uris,
+								GAppLaunchContext          *launch_context,
+								GSpawnFlags                 spawn_flags,
+								GSpawnChildSetupFunc        user_setup,
+								gpointer                    user_setup_data,
+								GDesktopAppLaunchCallback   pid_callback,
+								gpointer                    pid_callback_data,
+								gint                        stdin_fd,
+								gint                        stdout_fd,
+								gint                        stderr_fd,
+								GError                    **error);
+
 GLIB_AVAILABLE_IN_2_40
 gchar *** g_desktop_app_info_search (const gchar *search_string);
 
diff --git a/gio/gdrive.c b/gio/gdrive.c
index bd42691d9..24784f3df 100644
--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@ -611,10 +611,12 @@ g_drive_poll_for_media_finish (GDrive        *drive,
  * @drive: a #GDrive
  * @kind: the kind of identifier to return
  *
- * Gets the identifier of the given kind for @drive.
+ * Gets the identifier of the given kind for @drive. The only
+ * identifier currently available is
+ * #G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE.
  *
- * Returns: a newly allocated string containing the
- *     requested identfier, or %NULL if the #GDrive
+ * Returns: (nullable) (transfer full): a newly allocated string containing the
+ *     requested identifier, or %NULL if the #GDrive
  *     doesn't have this kind of identifier.
  */
 char *
@@ -921,7 +923,7 @@ g_drive_stop_finish (GDrive        *drive,
  *
  * Gets the sort key for @drive, if any.
  *
- * Returns: Sorting key for @drive or %NULL if no such key is available.
+ * Returns: (nullable): Sorting key for @drive or %NULL if no such key is available.
  *
  * Since: 2.32
  */
diff --git a/gio/gdrive.h b/gio/gdrive.h
index a33704219..ec92071c7 100644
--- a/gio/gdrive.h
+++ b/gio/gdrive.h
@@ -30,6 +30,15 @@
 
 G_BEGIN_DECLS
 
+/**
+ * G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE:
+ *
+ * The string used to obtain a Unix device path with g_drive_get_identifier().
+ *
+ * Since: 2.58
+ */
+#define G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE "unix-device"
+
 #define G_TYPE_DRIVE           (g_drive_get_type ())
 #define G_DRIVE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DRIVE, GDrive))
 #define G_IS_DRIVE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DRIVE))
diff --git a/gio/gfdonotificationbackend.c b/gio/gfdonotificationbackend.c
index a0d481433..c4fa0dc1d 100644
--- a/gio/gfdonotificationbackend.c
+++ b/gio/gfdonotificationbackend.c
@@ -62,12 +62,12 @@ typedef struct
   GVariant *default_action_target;
 } FreedesktopNotification;
 
-
 static void
 freedesktop_notification_free (gpointer data)
 {
   FreedesktopNotification *n = data;
 
+  g_object_unref (n->backend);
   g_free (n->id);
   g_free (n->default_action);
   if (n->default_action_target)
@@ -77,6 +77,24 @@ freedesktop_notification_free (gpointer data)
 }
 
 static FreedesktopNotification *
+freedesktop_notification_new (GFdoNotificationBackend *backend,
+                              const gchar             *id,
+                              GNotification           *notification)
+{
+  FreedesktopNotification *n;
+
+  n = g_slice_new0 (FreedesktopNotification);
+  n->backend = g_object_ref (backend);
+  n->id = g_strdup (id);
+  n->notify_id = 0;
+  g_notification_get_default_action (notification,
+                                     &n->default_action,
+                                     &n->default_action_target);
+
+  return n;
+}
+
+static FreedesktopNotification *
 g_fdo_notification_backend_find_notification (GFdoNotificationBackend *backend,
                                               const gchar             *id)
 {
@@ -319,8 +337,19 @@ notification_sent (GObject      *source_object,
   val = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), result, &error);
   if (val)
     {
+      GFdoNotificationBackend *backend = n->backend;
+      FreedesktopNotification *match;
+
       g_variant_get (val, "(u)", &n->notify_id);
       g_variant_unref (val);
+
+      match = g_fdo_notification_backend_find_notification_by_notify_id (backend, n->notify_id);
+      if (match != NULL)
+        {
+          backend->notifications = g_slist_remove (backend->notifications, match);
+          freedesktop_notification_free (match);
+        }
+      backend->notifications = g_slist_prepend (backend->notifications, n);
     }
   else
     {
@@ -331,9 +360,7 @@ notification_sent (GObject      *source_object,
           warning_printed = TRUE;
         }
 
-      n->backend->notifications = g_slist_remove (n->backend->notifications, n);
       freedesktop_notification_free (n);
-
       g_error_free (error);
     }
 }
@@ -378,7 +405,7 @@ g_fdo_notification_backend_send_notification (GNotificationBackend *backend,
                                               GNotification        *notification)
 {
   GFdoNotificationBackend *self = G_FDO_NOTIFICATION_BACKEND (backend);
-  FreedesktopNotification *n;
+  FreedesktopNotification *n, *tmp;
 
   if (self->notify_subscription == 0)
     {
@@ -391,24 +418,11 @@ g_fdo_notification_backend_send_notification (GNotificationBackend *backend,
                                             notify_signal, backend, NULL);
     }
 
-  n = g_fdo_notification_backend_find_notification (self, id);
-  if (n == NULL)
-    {
-      n = g_slice_new0 (FreedesktopNotification);
-      n->backend = self;
-      n->id = g_strdup (id);
-      n->notify_id = 0;
-
-      n->backend->notifications = g_slist_prepend (n->backend->notifications, n);
-    }
-  else
-    {
-      /* Only clear default action. All other fields are still valid */
-      g_clear_pointer (&n->default_action, g_free);
-      g_clear_pointer (&n->default_action_target, g_variant_unref);
-    }
+  n = freedesktop_notification_new (self, id, notification);
 
-  g_notification_get_default_action (notification, &n->default_action, &n->default_action_target);
+  tmp = g_fdo_notification_backend_find_notification (self, id);
+  if (tmp)
+    n->notify_id = tmp->notify_id;
 
   call_notify (backend->dbus_connection, backend->application, n->notify_id, notification, notification_sent, n);
 }
diff --git a/gio/gfile.c b/gio/gfile.c
index f475583af..aa592e197 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -702,6 +702,11 @@ g_file_get_parse_name (GFile *file)
  * the actual file or directory represented by the #GFile; see
  * g_file_copy() if attempting to copy a file.
  *
+ * g_file_dup() is useful when a second handle is needed to the same underlying
+ * file, for use in a separate thread (#GFile is not thread-safe). For use
+ * within the same thread, use g_object_ref() to increment the existing object’s
+ * reference count.
+ *
  * This call does no blocking I/O.
  *
  * Returns: (transfer full): a new #GFile that is a duplicate
@@ -2974,7 +2979,7 @@ retry:
 
       if (errsv == EINTR)
         goto retry;
-      else if (errsv == ENOSYS || errsv == EINVAL)
+      else if (errsv == ENOSYS || errsv == EINVAL || errsv == EOPNOTSUPP)
         g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
                              _("Splice not supported"));
       else
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 4decee346..8416b4fad 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -644,7 +644,8 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  *
  * A key in the "unix" namespace for checking if the file represents a
  * UNIX mount point. This attribute is %TRUE if the file is a UNIX mount
- * point. This attribute is only available for UNIX file systems.
+ * point. Since 2.58, `/` is considered to be a mount point.
+ * This attribute is only available for UNIX file systems.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
 #define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix::is-mountpoint" /* boolean */
diff --git a/gio/ginetaddress.c b/gio/ginetaddress.c
index 0a0a85a48..787c757da 100644
--- a/gio/ginetaddress.c
+++ b/gio/ginetaddress.c
@@ -376,98 +376,6 @@ g_inet_address_init (GInetAddress *address)
   address->priv = g_inet_address_get_instance_private (address);
 }
 
-/* These are provided so that we can use inet_pton() and inet_ntop() on Windows
- * if they are available (i.e. Vista and later), and use the existing code path
- * on Windows XP/Server 2003.  We can drop this portion when we drop support for
- * XP/Server 2003.
- */
-#if defined(G_OS_WIN32) && _WIN32_WINNT < 0x0600
-static gint
-inet_pton (gint family,
-           const gchar *addr_string,
-           gpointer addr)
-{
-  /* For Vista/Server 2008 and later, there is native inet_pton() in Winsock2 */
-  if (ws2funcs.pInetPton != NULL)
-    return ws2funcs.pInetPton (family, addr_string, addr);
-  else
-    {
-      /* Fallback codepath for XP/Server 2003 */
-      struct sockaddr_storage sa;
-      struct sockaddr_in *sin = (struct sockaddr_in *)&sa;
-      struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&sa;
-      gint len = sizeof (sa);
-
-      if (family != AF_INET && family != AF_INET6)
-        {
-          WSASetLastError (WSAEAFNOSUPPORT);
-          return -1;
-        }
-
-      /* WSAStringToAddress() will accept various not-an-IP-address
-       * strings like "127.0.0.1:80", "[1234::5678]:80", "127.1", etc.
-       */
-      if (!g_hostname_is_ip_address (addr_string))
-        return 0;
-
-      if (WSAStringToAddress ((LPTSTR) addr_string, family, NULL, (LPSOCKADDR) &sa, &len) != 0)
-        return 0;
-
-      if (family == AF_INET)
-        *(IN_ADDR *)addr = sin->sin_addr;
-      else
-        *(IN6_ADDR *)addr = sin6->sin6_addr;
-
-      return 1;
-    }
-}
-
-static const gchar *
-inet_ntop (gint family,
-           const gpointer addr,
-           gchar *addr_str,
-           socklen_t size)
-{
-  /* On Vista/Server 2008 and later, there is native inet_ntop() in Winsock2 */
-  if (ws2funcs.pInetNtop != NULL)
-    return ws2funcs.pInetNtop (family, addr, addr_str, size);
-  else
-    {
-      /* Fallback codepath for XP/Server 2003 */
-      DWORD buflen = size, addrlen;
-      struct sockaddr_storage sa;
-      struct sockaddr_in *sin = (struct sockaddr_in *)&sa;
-      struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&sa;
-
-      memset (&sa, 0, sizeof (sa));
-      sa.ss_family = family;
-      if (sa.ss_family == AF_INET)
-        {
-          struct in_addr *addrv4 = (struct in_addr *) addr;
-
-          addrlen = sizeof (*sin);
-          memcpy (&sin->sin_addr, addrv4, sizeof (sin->sin_addr));
-        }
-      else if (sa.ss_family == AF_INET6)
-        {
-          struct in6_addr *addrv6 = (struct in6_addr *) addr;
-
-          addrlen = sizeof (*sin6);
-          memcpy (&sin6->sin6_addr, addrv6, sizeof (sin6->sin6_addr));
-        }
-      else
-        {
-          WSASetLastError (WSAEAFNOSUPPORT);
-          return NULL;
-        }
-      if (WSAAddressToString ((LPSOCKADDR) &sa, addrlen, NULL, addr_str, &buflen) == 0)
-        return addr_str;
-      else
-        return NULL;
-    }
-}
-#endif
-
 /**
  * g_inet_address_new_from_string:
  * @string: a string representation of an IP address
diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h
index 624702289..dcba4d976 100644
--- a/gio/gio-autocleanups.h
+++ b/gio/gio-autocleanups.h
@@ -108,6 +108,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GProxy, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GProxyResolver, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRemoteActionGroup, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GResolver, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GResource, g_resource_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSeekable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSettingsBackend, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSettingsSchema, g_settings_schema_unref)
diff --git a/gio/gio-launch-desktop.c b/gio/gio-launch-desktop.c
new file mode 100644
index 000000000..03845df28
--- /dev/null
+++ b/gio/gio-launch-desktop.c
@@ -0,0 +1,52 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright (C) 2018 Endless Mobile, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel Drake <drake@endlessm.com>
+ */
+
+/*
+ * gio-launch-desktop: GDesktopAppInfo helper
+ * Executable wrapper to set GIO_LAUNCHED_DESKTOP_FILE_PID
+ * There are complications when doing this in a fork()/exec() codepath,
+ * and it cannot otherwise be done with posix_spawn().
+ * This wrapper is designed to be minimal and lightweight.
+ * It does not even link against glib.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+int
+main (int argc, char *argv[])
+{
+  pid_t pid = getpid ();
+  char buf[50];
+  int r;
+
+  if (argc < 2)
+    return -1;
+
+  r = snprintf (buf, sizeof (buf), "GIO_LAUNCHED_DESKTOP_FILE_PID=%ld", (long) pid);
+  if (r >= sizeof (buf))
+    return -1;
+
+  putenv (buf);
+
+  return execvp (argv[1], argv + 1);
+}
diff --git a/gio/gio-querymodules-wrapper.py b/gio/gio-querymodules-wrapper.py
new file mode 100644
index 000000000..8960540b4
--- /dev/null
+++ b/gio/gio-querymodules-wrapper.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+import sys
+
+if not os.environ.get('DESTDIR'):
+  print('GIO module cache creation...')
+  subprocess.call([sys.argv[1], sys.argv[2]])
diff --git a/gio/gio-tool-cat.c b/gio/gio-tool-cat.c
index 394748815..66841dd3e 100644
--- a/gio/gio-tool-cat.c
+++ b/gio/gio-tool-cat.c
@@ -130,7 +130,7 @@ handle_cat (int argc, char *argv[], gboolean do_help)
 
   g_set_prgname ("gio cat");
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s...", _("LOCATION"));
+  param = g_strdup_printf ("%s…", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-copy.c b/gio/gio-tool-copy.c
index c6a9b6b2d..4cc4a9d96 100644
--- a/gio/gio-tool-copy.c
+++ b/gio/gio-tool-copy.c
@@ -95,7 +95,7 @@ handle_copy (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio copy");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s... %s", _("SOURCE"), _("DESTINATION"));
+  param = g_strdup_printf ("%s… %s", _("SOURCE"), _("DESTINATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-info.c b/gio/gio-tool-info.c
index c446d60e8..d6fc6b46c 100644
--- a/gio/gio-tool-info.c
+++ b/gio/gio-tool-info.c
@@ -279,7 +279,7 @@ handle_info (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio info");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s...", _("LOCATION"));
+  param = g_strdup_printf ("%s…", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-list.c b/gio/gio-tool-list.c
index 202d79978..d1501b8e0 100644
--- a/gio/gio-tool-list.c
+++ b/gio/gio-tool-list.c
@@ -162,7 +162,7 @@ handle_list (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio list");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("[%s...]", _("LOCATION"));
+  param = g_strdup_printf ("[%s…]", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-mkdir.c b/gio/gio-tool-mkdir.c
index 3d7b50a02..7900704c9 100644
--- a/gio/gio-tool-mkdir.c
+++ b/gio/gio-tool-mkdir.c
@@ -45,7 +45,7 @@ handle_mkdir (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio mkdir");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s...", _("LOCATION"));
+  param = g_strdup_printf ("%s…", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-monitor.c b/gio/gio-tool-monitor.c
index d6de7a2b0..f2ffb3387 100644
--- a/gio/gio-tool-monitor.c
+++ b/gio/gio-tool-monitor.c
@@ -200,7 +200,7 @@ handle_monitor (int argc, gchar *argv[], gboolean do_help)
   g_set_prgname ("gio monitor");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("[%s...]", _("LOCATION"));
+  param = g_strdup_printf ("%s…", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-mount.c b/gio/gio-tool-mount.c
index 9522713e9..b5aaa1af2 100644
--- a/gio/gio-tool-mount.c
+++ b/gio/gio-tool-mount.c
@@ -48,8 +48,12 @@ static gboolean anonymous = FALSE;
 static gboolean mount_list = FALSE;
 static gboolean extra_detail = FALSE;
 static gboolean mount_monitor = FALSE;
+static gboolean tcrypt_hidden = FALSE;
+static gboolean tcrypt_system = FALSE;
+static guint tcrypt_pim = 0;
 static const char *unmount_scheme = NULL;
 static const char *mount_device_file = NULL;
+static const char *stop_device_file = NULL;
 static gboolean success = TRUE;
 
 
@@ -59,6 +63,7 @@ static const GOptionEntry entries[] =
   { "device", 'd', 0, G_OPTION_ARG_STRING, &mount_device_file, N_("Mount volume with device file"), N_("DEVICE") },
   { "unmount", 'u', 0, G_OPTION_ARG_NONE, &mount_unmount, N_("Unmount"), NULL},
   { "eject", 'e', 0, G_OPTION_ARG_NONE, &mount_eject, N_("Eject"), NULL},
+  { "stop", 't', 0, G_OPTION_ARG_STRING, &stop_device_file, N_("Stop drive with device file"), N_("DEVICE") },
   { "unmount-scheme", 's', 0, G_OPTION_ARG_STRING, &unmount_scheme, N_("Unmount all mounts with the given scheme"), N_("SCHEME") },
   { "force", 'f', 0, G_OPTION_ARG_NONE, &force, N_("Ignore outstanding file operations when unmounting or ejecting"), NULL },
   { "anonymous", 'a', 0, G_OPTION_ARG_NONE, &anonymous, N_("Use an anonymous user when authenticating"), NULL },
@@ -66,6 +71,9 @@ static const GOptionEntry entries[] =
   { "list", 'l', 0, G_OPTION_ARG_NONE, &mount_list, N_("List"), NULL},
   { "monitor", 'o', 0, G_OPTION_ARG_NONE, &mount_monitor, N_("Monitor events"), NULL},
   { "detail", 'i', 0, G_OPTION_ARG_NONE, &extra_detail, N_("Show extra information"), NULL},
+  { "tcrypt-pim", 0, 0, G_OPTION_ARG_INT, &tcrypt_pim, N_("The numeric PIM when unlocking a VeraCrypt volume"), N_("PIM")},
+  { "tcrypt-hidden", 0, 0, G_OPTION_ARG_NONE, &tcrypt_hidden, N_("Mount a TCRYPT hidden volume"), NULL},
+  { "tcrypt-system", 0, 0, G_OPTION_ARG_NONE, &tcrypt_system, N_("Mount a TCRYPT system volume"), NULL},
   { NULL }
 };
 
@@ -172,6 +180,16 @@ ask_password_cb (GMountOperation *op,
         }
     }
 
+  if (flags & G_ASK_PASSWORD_TCRYPT)
+    {
+      if (tcrypt_pim)
+        g_mount_operation_set_pim (op, tcrypt_pim);
+      if (tcrypt_hidden)
+        g_mount_operation_set_is_tcrypt_hidden_volume (op, TRUE);
+      if (tcrypt_system)
+        g_mount_operation_set_is_tcrypt_system_volume (op, TRUE);
+    }
+
   /* Only try anonymous access once. */
   if (anonymous &&
       GPOINTER_TO_INT (g_object_get_data (G_OBJECT (op), "state")) == MOUNT_OP_ASKED)
@@ -252,6 +270,8 @@ mount_mountable_done_cb (GObject *object,
   else
     g_object_unref (target);
 
+  g_object_unref (op);
+
   outstanding_mounts--;
 
   if (outstanding_mounts == 0)
@@ -280,6 +300,8 @@ mount_done_cb (GObject *object,
       g_error_free (error);
     }
 
+  g_object_unref (op);
+
   outstanding_mounts--;
 
   if (outstanding_mounts == 0)
@@ -436,6 +458,76 @@ eject (GFile *file)
   outstanding_mounts++;
 }
 
+static void
+stop_with_device_file_cb (GObject *object,
+                          GAsyncResult *res,
+                          gpointer user_data)
+{
+  GError *error = NULL;
+  gchar *device_path = user_data;
+
+  if (!g_drive_stop_finish (G_DRIVE (object), res, &error))
+    {
+      print_error ("%s: %s", device_path, error->message);
+      g_error_free (error);
+      success = FALSE;
+    }
+
+  g_free (device_path);
+
+  outstanding_mounts--;
+
+  if (outstanding_mounts == 0)
+    g_main_loop_quit (main_loop);
+}
+
+static void
+stop_with_device_file (const char *device_file)
+{
+  GVolumeMonitor *volume_monitor;
+  GList *drives;
+  GList *l;
+
+  volume_monitor = g_volume_monitor_get ();
+
+  drives = g_volume_monitor_get_connected_drives (volume_monitor);
+  for (l = drives; l != NULL; l = l->next)
+    {
+      GDrive *drive = G_DRIVE (l->data);
+      gchar *id;
+
+      id = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+      if (g_strcmp0 (id, device_file) == 0)
+        {
+          GMountOperation *op;
+          GMountUnmountFlags flags;
+
+          op = new_mount_op ();
+          flags = force ? G_MOUNT_UNMOUNT_FORCE : G_MOUNT_UNMOUNT_NONE;
+          g_drive_stop (drive,
+                        flags,
+                        op,
+                        NULL,
+                        stop_with_device_file_cb,
+                        g_steal_pointer (&id));
+          g_object_unref (op);
+
+          outstanding_mounts++;
+        }
+
+      g_free (id);
+    }
+  g_list_free_full (drives, g_object_unref);
+
+  if (outstanding_mounts == 0)
+    {
+      print_error ("%s: %s", device_file, _("No drive for device file"));
+      success = FALSE;
+    }
+
+  g_object_unref (volume_monitor);
+}
+
 static gboolean
 iterate_gmain_timeout_function (gpointer data)
 {
@@ -938,6 +1030,8 @@ mount_with_device_file (const char *device_file)
                           mount_with_device_file_cb,
                           id);
 
+          g_object_unref (op);
+
           outstanding_mounts++;
         }
       else
@@ -1138,7 +1232,7 @@ handle_mount (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio mount");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("[%s...]", _("LOCATION"));
+  param = g_strdup_printf ("[%s…]", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
@@ -1160,14 +1254,14 @@ handle_mount (int argc, char *argv[], gboolean do_help)
       return 1;
     }
 
-  g_option_context_free (context);
-
   main_loop = g_main_loop_new (NULL, FALSE);
 
   if (mount_list)
     list_monitor_items ();
   else if (mount_device_file != NULL)
     mount_with_device_file (mount_device_file);
+  else if (stop_device_file)
+    stop_with_device_file (stop_device_file);
   else if (unmount_scheme != NULL)
     unmount_all_with_scheme (unmount_scheme);
   else if (mount_monitor)
@@ -1186,6 +1280,14 @@ handle_mount (int argc, char *argv[], gboolean do_help)
           g_object_unref (file);
         }
     }
+  else
+    {
+      show_help (context, _("No locations given"));
+      g_option_context_free (context);
+      return 1;
+    }
+
+  g_option_context_free (context);
 
   if (outstanding_mounts > 0)
     g_main_loop_run (main_loop);
diff --git a/gio/gio-tool-move.c b/gio/gio-tool-move.c
index 97e11d26e..5755f59d4 100644
--- a/gio/gio-tool-move.c
+++ b/gio/gio-tool-move.c
@@ -91,7 +91,7 @@ handle_move (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio move");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s... %s", _("SOURCE"), _("DESTINATION"));
+  param = g_strdup_printf ("%s… %s", _("SOURCE"), _("DESTINATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
@@ -106,6 +106,7 @@ handle_move (int argc, char *argv[], gboolean do_help)
   if (do_help)
     {
       show_help (context, NULL);
+      g_option_context_free (context);
       return 0;
     }
 
diff --git a/gio/gio-tool-open.c b/gio/gio-tool-open.c
index f4a164227..73863c7c5 100644
--- a/gio/gio-tool-open.c
+++ b/gio/gio-tool-open.c
@@ -110,7 +110,7 @@ handle_open (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio open");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s...", _("LOCATION"));
+  param = g_strdup_printf ("%s…", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-remove.c b/gio/gio-tool-remove.c
index bf3a0fac6..8748b4629 100644
--- a/gio/gio-tool-remove.c
+++ b/gio/gio-tool-remove.c
@@ -45,7 +45,7 @@ handle_remove (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio remove");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s...", _("LOCATION"));
+  param = g_strdup_printf ("%s…", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-set.c b/gio/gio-tool-set.c
index acb471aca..ab3ac1544 100644
--- a/gio/gio-tool-set.c
+++ b/gio/gio-tool-set.c
@@ -86,7 +86,7 @@ handle_set (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio set");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("%s %s %s...", _("LOCATION"), _("ATTRIBUTE"), _("VALUE"));
+  param = g_strdup_printf ("%s %s %s…", _("LOCATION"), _("ATTRIBUTE"), _("VALUE"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool-trash.c b/gio/gio-tool-trash.c
index 7f30f2dd4..4f9e3668a 100644
--- a/gio/gio-tool-trash.c
+++ b/gio/gio-tool-trash.c
@@ -78,7 +78,7 @@ handle_trash (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio trash");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("[%s...]", _("LOCATION"));
+  param = g_strdup_printf ("[%s…]", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
@@ -101,8 +101,6 @@ handle_trash (int argc, char *argv[], gboolean do_help)
       return 1;
     }
 
-  g_option_context_free (context);
-
   if (argc > 1)
     {
       int i;
@@ -133,5 +131,14 @@ handle_trash (int argc, char *argv[], gboolean do_help)
       g_object_unref (file);
     }
 
+  if (argc == 1 && !empty)
+    {
+      show_help (context, _("No locations given"));
+      g_option_context_free (context);
+      return 1;
+    }
+
+  g_option_context_free (context);
+
   return retval;
 }
diff --git a/gio/gio-tool-tree.c b/gio/gio-tool-tree.c
index 8a68c3d18..e63752edb 100644
--- a/gio/gio-tool-tree.c
+++ b/gio/gio-tool-tree.c
@@ -236,7 +236,7 @@ handle_tree (int argc, char *argv[], gboolean do_help)
   g_set_prgname ("gio tree");
 
   /* Translators: commandline placeholder */
-  param = g_strdup_printf ("[%s...]", _("LOCATION"));
+  param = g_strdup_printf ("[%s…]", _("LOCATION"));
   context = g_option_context_new (param);
   g_free (param);
   g_option_context_set_help_enabled (context, FALSE);
diff --git a/gio/gio-tool.c b/gio/gio-tool.c
index b4a863b45..18200014c 100644
--- a/gio/gio-tool.c
+++ b/gio/gio-tool.c
@@ -221,7 +221,7 @@ static void
 usage (void)
 {
   g_printerr ("%s\n", _("Usage:"));
-  g_printerr ("  gio %s %s\n", _("COMMAND"), _("[ARGS...]"));
+  g_printerr ("  gio %s %s\n", _("COMMAND"), _("[ARGS…]"));
   g_printerr ("\n");
   g_printerr ("%s\n", _("Commands:"));
   g_printerr ("  help     %s\n", _("Print help"));
diff --git a/gio/gioenums.h b/gio/gioenums.h
index 5e9589730..d7525d4e4 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -572,17 +572,19 @@ typedef enum {
  * @G_ASK_PASSWORD_NEED_DOMAIN: operation requires a domain.
  * @G_ASK_PASSWORD_SAVING_SUPPORTED: operation supports saving settings.
  * @G_ASK_PASSWORD_ANONYMOUS_SUPPORTED: operation supports anonymous users.
+ * @G_ASK_PASSWORD_TCRYPT: operation takes TCRYPT parameters (Since: 2.58)
  *
  * #GAskPasswordFlags are used to request specific information from the
  * user, or to notify the user of their choices in an authentication
  * situation.
  **/
 typedef enum {
-  G_ASK_PASSWORD_NEED_PASSWORD       = (1 << 0),
-  G_ASK_PASSWORD_NEED_USERNAME       = (1 << 1),
-  G_ASK_PASSWORD_NEED_DOMAIN         = (1 << 2),
-  G_ASK_PASSWORD_SAVING_SUPPORTED    = (1 << 3),
-  G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
+  G_ASK_PASSWORD_NEED_PASSWORD           = (1 << 0),
+  G_ASK_PASSWORD_NEED_USERNAME           = (1 << 1),
+  G_ASK_PASSWORD_NEED_DOMAIN             = (1 << 2),
+  G_ASK_PASSWORD_SAVING_SUPPORTED        = (1 << 3),
+  G_ASK_PASSWORD_ANONYMOUS_SUPPORTED     = (1 << 4),
+  G_ASK_PASSWORD_TCRYPT                  = (1 << 5),
 } GAskPasswordFlags;
 
 
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 30731f7c2..36c0cefed 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -802,14 +802,29 @@ _g_io_module_get_default_type (const gchar *extension_point,
 }
 
 static gpointer
-try_implementation (GIOExtension         *extension,
+try_implementation (const char           *extension_point,
+                    GIOExtension         *extension,
 		    GIOModuleVerifyFunc   verify_func)
 {
   GType type = g_io_extension_get_type (extension);
   gpointer impl;
 
   if (g_type_is_a (type, G_TYPE_INITABLE))
-    return g_initable_new (type, NULL, NULL, NULL);
+    {
+      GError *error = NULL;
+
+      impl = g_initable_new (type, NULL, &error, NULL);
+      if (impl)
+        return impl;
+
+      g_debug ("Failed to initialize %s (%s) for %s: %s",
+               g_io_extension_get_name (extension),
+               g_type_name (type),
+               extension_point,
+               error ? error->message : "");
+      g_clear_error (&error);
+      return NULL;
+    }
   else
     {
       impl = g_object_new (type, NULL);
@@ -895,7 +910,7 @@ _g_io_module_get_default (const gchar         *extension_point,
       preferred = g_io_extension_point_get_extension_by_name (ep, use_this);
       if (preferred)
 	{
-	  impl = try_implementation (preferred, verify_func);
+	  impl = try_implementation (extension_point, preferred, verify_func);
 	  if (impl)
 	    goto done;
 	}
@@ -911,7 +926,7 @@ _g_io_module_get_default (const gchar         *extension_point,
       if (extension == preferred)
 	continue;
 
-      impl = try_implementation (extension, verify_func);
+      impl = try_implementation (extension_point, extension, verify_func);
       if (impl)
 	goto done;
     }
diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c
index 99bcc58ba..bf88334b1 100644
--- a/gio/glib-compile-resources.c
+++ b/gio/glib-compile-resources.c
@@ -734,13 +734,13 @@ main (int argc, char **argv)
   GOptionContext *context;
   GOptionEntry entries[] = {
     { "version", 0, 0, G_OPTION_ARG_NONE, &show_version_and_exit, N_("Show program version and exit"), NULL },
-    { "target", 0, 0, G_OPTION_ARG_FILENAME, &target, N_("name of the output file"), N_("FILE") },
-    { "sourcedir", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &sourcedirs, N_("The directories where files are to be read from (default to current directory)"), N_("DIRECTORY") },
+    { "target", 0, 0, G_OPTION_ARG_FILENAME, &target, N_("Name of the output file"), N_("FILE") },
+    { "sourcedir", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &sourcedirs, N_("The directories to load files referenced in FILE from (default: current directory)"), N_("DIRECTORY") },
     { "generate", 0, 0, G_OPTION_ARG_NONE, &generate_automatic, N_("Generate output in the format selected for by the target filename extension"), NULL },
     { "generate-header", 0, 0, G_OPTION_ARG_NONE, &generate_header, N_("Generate source header"), NULL },
-    { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate sourcecode used to link in the resource file into your code"), NULL },
+    { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate source code used to link in the resource file into your code"), NULL },
     { "generate-dependencies", 0, 0, G_OPTION_ARG_NONE, &generate_dependencies, N_("Generate dependency list"), NULL },
-    { "dependency-file", 0, 0, G_OPTION_ARG_FILENAME, &dependency_file, N_("name of the dependency file to generate"), N_("FILE") },
+    { "dependency-file", 0, 0, G_OPTION_ARG_FILENAME, &dependency_file, N_("Name of the dependency file to generate"), N_("FILE") },
     { "generate-phony-targets", 0, 0, G_OPTION_ARG_NONE, &generate_phony_targets, N_("Include phony targets in the generated dependency file"), NULL },
     { "manual-register", 0, 0, G_OPTION_ARG_NONE, &manual_register, N_("Don’t automatically create and register resource"), NULL },
     { "internal", 0, 0, G_OPTION_ARG_NONE, &internal, N_("Don’t export functions; declare them G_GNUC_INTERNAL"), NULL },
@@ -1030,7 +1030,7 @@ main (int argc, char **argv)
 	  return 1;
 	}
 
-      fprintf (file,
+      g_fprintf (file,
 	       "#ifndef __RESOURCE_%s_H__\n"
 	       "#define __RESOURCE_%s_H__\n"
 	       "\n"
@@ -1040,14 +1040,14 @@ main (int argc, char **argv)
 	       c_name, c_name, linkage, c_name);
 
       if (manual_register)
-	fprintf (file,
+	g_fprintf (file,
 		 "\n"
 		 "%s void %s_register_resource (void);\n"
 		 "%s void %s_unregister_resource (void);\n"
 		 "\n",
 		 linkage, c_name, linkage, c_name);
 
-      fprintf (file,
+      g_fprintf (file,
 	       "#endif\n");
 
       fclose (file);
@@ -1078,7 +1078,7 @@ main (int argc, char **argv)
 	  return 1;
 	}
 
-      fprintf (file,
+      g_fprintf (file,
 	       "#include <gio/gio.h>\n"
 	       "\n"
 	       "#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))\n"
@@ -1092,17 +1092,17 @@ main (int argc, char **argv)
 
       for (i = 0; i < data_size; i++) {
 	if (i % 8 == 0)
-	  fprintf (file, "  ");
-	fprintf (file, "0x%2.2x", (int)data[i]);
+	  g_fprintf (file, "  ");
+	g_fprintf (file, "0x%2.2x", (int)data[i]);
 	if (i != data_size - 1)
-	  fprintf (file, ", ");
+	  g_fprintf (file, ", ");
 	if ((i % 8 == 7) || (i == data_size - 1))
-	  fprintf (file, "\n");
+	  g_fprintf (file, "\n");
       }
 
-      fprintf (file, "} };\n");
+      g_fprintf (file, "} };\n");
 
-      fprintf (file,
+      g_fprintf (file,
 	       "\n"
 	       "static GStaticResource static_resource = { %s_resource_data.data, sizeof (%s_resource_data.data), NULL, NULL, NULL };\n"
 	       "%s GResource *%s_get_resource (void);\n"
@@ -1115,7 +1115,7 @@ main (int argc, char **argv)
 
       if (manual_register)
 	{
-	  fprintf (file,
+	  g_fprintf (file,
 		   "\n"
 		   "%s void %s_unregister_resource (void);\n"
 		   "void %s_unregister_resource (void)\n"
@@ -1132,8 +1132,8 @@ main (int argc, char **argv)
 	}
       else
 	{
-	  fprintf (file, "%s", gconstructor_code);
-	  fprintf (file,
+	  g_fprintf (file, "%s", gconstructor_code);
+	  g_fprintf (file,
 		   "\n"
 		   "#ifdef G_HAS_CONSTRUCTORS\n"
 		   "\n"
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index f6e1b4036..d4340d463 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -179,6 +179,8 @@ typedef struct
   GString      *unparsed_default_value;
   GVariant     *default_value;
 
+  GVariantDict *desktop_overrides;
+
   GString      *strinfo;
   gboolean      is_enum;
   gboolean      is_flags;
@@ -731,6 +733,11 @@ key_state_serialise (KeyState *state)
             g_variant_builder_add (&builder, "(y(**))", 'r',
                                    state->minimum, state->maximum);
 
+          /* per-desktop overrides */
+          if (state->desktop_overrides)
+            g_variant_builder_add (&builder, "(y@a{sv})", 'd',
+                                   g_variant_dict_end (state->desktop_overrides));
+
           state->serialised = g_variant_builder_end (&builder);
         }
 
@@ -770,6 +777,9 @@ key_state_free (gpointer data)
   if (state->serialised)
     g_variant_unref (state->serialised);
 
+  if (state->desktop_overrides)
+    g_variant_dict_unref (state->desktop_overrides);
+
   g_slice_free (KeyState, state);
 }
 
@@ -1882,6 +1892,8 @@ set_overrides (GHashTable  *schema_table,
       gchar **groups;
       gint i;
 
+      g_debug ("Processing override file '%s'", filename);
+
       key_file = g_key_file_new ();
       if (!g_key_file_load_from_file (key_file, filename, 0, &error))
         {
@@ -1904,18 +1916,31 @@ set_overrides (GHashTable  *schema_table,
       for (i = 0; groups[i]; i++)
         {
           const gchar *group = groups[i];
+          const gchar *schema_name;
+          const gchar *desktop_id;
           SchemaState *schema;
+          gchar **pieces;
           gchar **keys;
           gint j;
 
-          schema = g_hash_table_lookup (schema_table, group);
+          pieces = g_strsplit (group, ":", 2);
+          schema_name = pieces[0];
+          desktop_id = pieces[1];
+
+          g_debug ("Processing group '%s' (schema '%s', %s)",
+                   group, schema_name, desktop_id ? desktop_id : "all desktops");
+
+          schema = g_hash_table_lookup (schema_table, schema_name);
 
           if (schema == NULL)
-            /* Having the schema not be installed is expected to be a
-             * common case.  Don't even emit an error message about
-             * that.
-             */
-            continue;
+            {
+              /* Having the schema not be installed is expected to be a
+               * common case.  Don't even emit an error message about
+               * that.
+               */
+              g_strfreev (pieces);
+              continue;
+            }
 
           keys = g_key_file_get_keys (key_file, group, NULL, NULL);
           g_assert (keys != NULL);
@@ -1931,8 +1956,8 @@ set_overrides (GHashTable  *schema_table,
 
               if (state == NULL)
                 {
-                  fprintf (stderr, _("No such key '%s' in schema '%s' as "
-                                     "specified in override file '%s'"),
+                  fprintf (stderr, _("No such key “%s� in schema “%s� as "
+                                     "specified in override file “%s�"),
                            key, group, filename);
 
                   if (!strict)
@@ -1943,6 +1968,32 @@ set_overrides (GHashTable  *schema_table,
 
                   fprintf (stderr, _(" and --strict was specified; exiting.\n"));
                   g_key_file_free (key_file);
+                  g_strfreev (pieces);
+                  g_strfreev (groups);
+                  g_strfreev (keys);
+
+                  return FALSE;
+                }
+
+              if (desktop_id != NULL && state->l10n)
+                {
+                  /* Let's avoid the n*m case of per-desktop localised
+                   * default values, and just forbid it.
+                   */
+                  fprintf (stderr,
+                           _("cannot provide per-desktop overrides for localised "
+                             "key “%s� in schema “%s� (override file “%s�)"),
+                           key, group, filename);
+
+                  if (!strict)
+                    {
+                      fprintf (stderr, _("; ignoring override for this key.\n"));
+                      continue;
+                    }
+
+                  fprintf (stderr, _(" and --strict was specified; exiting.\n"));
+                  g_key_file_free (key_file);
+                  g_strfreev (pieces);
                   g_strfreev (groups);
                   g_strfreev (keys);
 
@@ -1957,8 +2008,8 @@ set_overrides (GHashTable  *schema_table,
 
               if (value == NULL)
                 {
-                  fprintf (stderr, _("error parsing key '%s' in schema '%s' "
-                                     "as specified in override file '%s': "
+                  fprintf (stderr, _("error parsing key “%s� in schema “%s� "
+                                     "as specified in override file “%s�: "
                                      "%s."),
                            key, group, filename, error->message);
 
@@ -1973,6 +2024,7 @@ set_overrides (GHashTable  *schema_table,
 
                   fprintf (stderr, _("--strict was specified; exiting.\n"));
                   g_key_file_free (key_file);
+                  g_strfreev (pieces);
                   g_strfreev (groups);
                   g_strfreev (keys);
 
@@ -1985,8 +2037,8 @@ set_overrides (GHashTable  *schema_table,
                       g_variant_compare (value, state->maximum) > 0)
                     {
                       fprintf (stderr,
-                               _("override for key '%s' in schema '%s' in "
-                                 "override file '%s' is outside the range "
+                               _("override for key “%s� in schema “%s� in "
+                                 "override file “%s� is outside the range "
                                  "given in the schema"),
                                key, group, filename);
 
@@ -2001,6 +2053,7 @@ set_overrides (GHashTable  *schema_table,
 
                       fprintf (stderr, _(" and --strict was specified; exiting.\n"));
                       g_key_file_free (key_file);
+                      g_strfreev (pieces);
                       g_strfreev (groups);
                       g_strfreev (keys);
 
@@ -2013,8 +2066,8 @@ set_overrides (GHashTable  *schema_table,
                   if (!is_valid_choices (value, state->strinfo))
                     {
                       fprintf (stderr,
-                               _("override for key '%s' in schema '%s' in "
-                                 "override file '%s' is not in the list "
+                               _("override for key “%s� in schema “%s� in "
+                                 "override file “%s� is not in the list "
                                  "of valid choices"),
                                key, group, filename);
 
@@ -2029,6 +2082,7 @@ set_overrides (GHashTable  *schema_table,
 
                       fprintf (stderr, _(" and --strict was specified; exiting.\n"));
                       g_key_file_free (key_file);
+                      g_strfreev (pieces);
                       g_strfreev (groups);
                       g_strfreev (keys);
 
@@ -2036,11 +2090,24 @@ set_overrides (GHashTable  *schema_table,
                     }
                 }
 
-              g_variant_unref (state->default_value);
-              state->default_value = value;
+              if (desktop_id != NULL)
+                {
+                  if (state->desktop_overrides == NULL)
+                    state->desktop_overrides = g_variant_dict_new (NULL);
+
+                  g_variant_dict_insert_value (state->desktop_overrides, desktop_id, value);
+                  g_variant_unref (value);
+                }
+              else
+                {
+                  g_variant_unref (state->default_value);
+                  state->default_value = value;
+                }
+
               g_free (string);
             }
 
+          g_strfreev (pieces);
           g_strfreev (keys);
         }
 
@@ -2076,6 +2143,7 @@ main (int argc, char **argv)
 
     /* These options are only for use in the gschema-compile tests */
     { "schema-file", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &schema_files, NULL, NULL },
+    { "override-file", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &override_files, NULL, NULL },
     { NULL }
   };
 
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 3cd0137d6..354ac7c8c 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1677,16 +1677,20 @@ find_mountpoint_for (const char *file,
     }
 }
 
-char *
-_g_local_file_find_topdir_for (const char *file)
+static char *
+_g_local_file_find_topdir_for_internal (const char *file, dev_t file_dev)
 {
   char *dir;
   char *mountpoint = NULL;
   dev_t dir_dev;
 
   dir = get_parent (file, &dir_dev);
-  if (dir == NULL)
-    return NULL;
+  if (dir == NULL || dir_dev != file_dev)
+    {
+      g_free (dir);
+
+      return NULL;
+    }
 
   mountpoint = find_mountpoint_for (dir, dir_dev);
   g_free (dir);
@@ -1694,6 +1698,17 @@ _g_local_file_find_topdir_for (const char *file)
   return mountpoint;
 }
 
+char *
+_g_local_file_find_topdir_for (const char *file)
+{
+  GStatBuf file_stat;
+
+  if (g_lstat (file, &file_stat) != 0)
+    return NULL;
+
+  return _g_local_file_find_topdir_for_internal (file, file_stat.st_dev);
+}
+
 static char *
 get_unique_filename (const char *basename, 
                      int         id)
@@ -1769,6 +1784,7 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
   char uid_str[32];
   GStatBuf global_stat, trash_stat;
   gboolean res;
+  GUnixMountEntry *mount;
 
   if (g_once_init_enter (&home_dev_set))
     {
@@ -1787,6 +1803,17 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
   if (topdir == NULL)
     return FALSE;
 
+  mount = g_unix_mount_at (topdir, NULL);
+  if (mount == NULL || g_unix_mount_is_system_internal (mount))
+    {
+      g_clear_pointer (&mount, g_unix_mount_free);
+      g_free (topdir);
+
+      return FALSE;
+    }
+
+  g_clear_pointer (&mount, g_unix_mount_free);
+
   globaldir = g_build_filename (topdir, ".Trash", NULL);
   if (g_lstat (globaldir, &global_stat) == 0 &&
       S_ISDIR (global_stat.st_mode) &&
@@ -1882,7 +1909,7 @@ g_local_file_trash (GFile         *file,
   int i;
   char *data;
   gboolean is_homedir_trash;
-  char delete_time[32];
+  char *delete_time = NULL;
   int fd;
   GStatBuf trash_stat, global_stat;
   char *dirname, *globaldir;
@@ -1930,19 +1957,35 @@ g_local_file_trash (GFile         *file,
     {
       uid_t uid;
       char uid_str[32];
+      GUnixMountEntry *mount;
 
       uid = geteuid ();
       g_snprintf (uid_str, sizeof (uid_str), "%lu", (unsigned long)uid);
 
-      topdir = _g_local_file_find_topdir_for (local->filename);
+      topdir = _g_local_file_find_topdir_for_internal (local->filename,
+                                                       file_stat.st_dev);
       if (topdir == NULL)
 	{
           g_set_io_error (error,
                           _("Unable to find toplevel directory to trash %s"),
-                          file, G_IO_ERROR_NOT_SUPPORTED);
+                          file, ENOTSUP);
 	  return FALSE;
 	}
-      
+
+      mount = g_unix_mount_at (topdir, NULL);
+      if (mount == NULL || g_unix_mount_is_system_internal (mount))
+        {
+          g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                       _("Trashing on system internal mounts is not supported"));
+
+          g_clear_pointer (&mount, g_unix_mount_free);
+          g_free (topdir);
+
+          return FALSE;
+        }
+
+      g_clear_pointer (&mount, g_unix_mount_free);
+
       /* Try looking for global trash dir $topdir/.Trash/$uid */
       globaldir = g_build_filename (topdir, ".Trash", NULL);
       if (g_lstat (globaldir, &global_stat) == 0 &&
@@ -2094,16 +2137,17 @@ g_local_file_trash (GFile         *file,
   g_free (topdir);
   
   {
-    time_t t;
-    struct tm now;
-    t = time (NULL);
-    localtime_r (&t, &now);
-    delete_time[0] = 0;
-    strftime(delete_time, sizeof (delete_time), "%Y-%m-%dT%H:%M:%S", &now);
+    GDateTime *now = g_date_time_new_now_local ();
+    if (now != NULL)
+      delete_time = g_date_time_format (now, "%Y-%m-%dT%H:%M:%S");
+    else
+      delete_time = g_strdup ("9999-12-31T23:59:59");
+    g_date_time_unref (now);
   }
 
   data = g_strdup_printf ("[Trash Info]\nPath=%s\nDeletionDate=%s\n",
 			  original_name_escaped, delete_time);
+  g_free (delete_time);
 
   g_file_set_contents (infofile, data, -1, NULL);
 
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 801695ad0..b3e29374a 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -821,6 +821,7 @@ _g_local_file_info_get_parent_info (const char            *dir,
   parent_info->is_sticky = FALSE;
   parent_info->has_trash_dir = FALSE;
   parent_info->device = 0;
+  parent_info->inode = 0;
 
   if (_g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_RENAME) ||
       _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_DELETE) ||
@@ -850,6 +851,7 @@ _g_local_file_info_get_parent_info (const char            *dir,
 #endif
 	  parent_info->owner = statbuf.st_uid;
 	  parent_info->device = statbuf.st_dev;
+	  parent_info->inode = statbuf.st_ino;
           /* No need to find trash dir if it's not writable anyway */
           if (parent_info->writable &&
               _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_TRASH))
@@ -922,9 +924,13 @@ get_access_rights (GFileAttributeMatcher *attribute_matcher,
 	_g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_DELETE,
 					         writable);
 
+      /* Trashing is supported only if the parent device is the same */
       if (_g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_TRASH))
-        _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_TRASH,
-                                                 writable && parent_info->has_trash_dir);
+        _g_file_info_set_attribute_boolean_by_id (info,
+                                                  G_FILE_ATTRIBUTE_ID_ACCESS_CAN_TRASH,
+                                                  writable &&
+                                                  parent_info->has_trash_dir &&
+                                                  parent_info->device == statbuf->st_dev);
     }
 }
 
@@ -1117,8 +1123,10 @@ lookup_uid_data (uid_t uid)
   char buffer[4096];
   struct passwd pwbuf;
   struct passwd *pwbufp;
+#ifndef __BIONIC__
   char *gecos, *comma;
-  
+#endif
+
   if (uid_cache == NULL)
     uid_cache = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify)uid_data_free);
 
@@ -1203,10 +1211,12 @@ static char *
 lookup_gid_name (gid_t gid)
 {
   char *name;
+#if defined (HAVE_GETGRGID_R)
   char buffer[4096];
   struct group gbuf;
+#endif
   struct group *gbufp;
-  
+
   if (gid_cache == NULL)
     gid_cache = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify)g_free);
 
@@ -1634,7 +1644,6 @@ _g_local_file_info_get_nostat (GFileInfo              *info,
 
 static const char *
 get_icon_name (const char *path,
-               const char *content_type,
                gboolean    use_symbolic,
                gboolean   *with_fallbacks_out)
 {
@@ -1679,10 +1688,6 @@ get_icon_name (const char *path,
     {
       name = use_symbolic ? "folder-videos-symbolic" : "folder-videos";
     }
-  else if (g_content_type_is_mime_type (content_type,"inode/directory"))
-    {
-      name = use_symbolic ? "folder-symbolic" : "folder";
-    }
   else
     {
       name = NULL;
@@ -1703,7 +1708,7 @@ get_icon (const char *path,
   const char *icon_name;
   gboolean with_fallbacks;
 
-  icon_name = get_icon_name (path, content_type, use_symbolic, &with_fallbacks);
+  icon_name = get_icon_name (path, use_symbolic, &with_fallbacks);
   if (icon_name != NULL)
     {
       if (with_fallbacks)
@@ -1970,7 +1975,7 @@ _g_local_file_info_get (const char             *basename,
 
   if (stat_ok && parent_info && parent_info->device != 0 &&
       _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT) &&
-      statbuf.st_dev != parent_info->device) 
+      (statbuf.st_dev != parent_info->device || statbuf.st_ino == parent_info->inode))
     _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT, TRUE);
   
   if (stat_ok)
diff --git a/gio/glocalfileinfo.h b/gio/glocalfileinfo.h
index a231c24ca..7a6566163 100644
--- a/gio/glocalfileinfo.h
+++ b/gio/glocalfileinfo.h
@@ -36,6 +36,7 @@ typedef struct
   gboolean has_trash_dir;
   int      owner;
   dev_t    device;
+  ino_t    inode;
   gpointer extra_data;
   GDestroyNotify free_extra_data;
 } GLocalParentFileInfo;
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index c19da3ba8..7b0a82439 100644
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.c
@@ -648,6 +648,8 @@ g_file_monitor_source_new (gpointer           instance,
   source = g_source_new (&source_funcs, sizeof (GFileMonitorSource));
   fms = (GFileMonitorSource *) source;
 
+  g_source_set_name (source, "GFileMonitorSource");
+
   g_mutex_init (&fms->lock);
   fms->instance = instance;
   fms->pending_changes = g_sequence_new (pending_change_free);
diff --git a/gio/gmount.c b/gio/gmount.c
index 0169ea54b..dad4b8513 100644
--- a/gio/gmount.c
+++ b/gio/gmount.c
@@ -255,7 +255,8 @@ g_mount_get_symbolic_icon (GMount *mount)
  * considered an opaque string. Returns %NULL if there is no UUID
  * available.
  * 
- * Returns: the UUID for @mount or %NULL if no UUID can be computed.
+ * Returns: (nullable) (transfer full): the UUID for @mount or %NULL if no UUID
+ *     can be computed.
  *     The returned string should be freed with g_free()
  *     when no longer needed.
  **/
@@ -276,8 +277,9 @@ g_mount_get_uuid (GMount *mount)
  * @mount: a #GMount.
  * 
  * Gets the volume for the @mount.
- * 
- * Returns: (transfer full): a #GVolume or %NULL if @mount is not associated with a volume.
+ *
+ * Returns: (transfer full) (nullable): a #GVolume or %NULL if @mount is not
+ *      associated with a volume.
  *      The returned object should be unreffed with 
  *      g_object_unref() when no longer needed.
  **/
@@ -302,7 +304,8 @@ g_mount_get_volume (GMount *mount)
  * This is a convenience method for getting the #GVolume and then
  * using that object to get the #GDrive.
  * 
- * Returns: (transfer full): a #GDrive or %NULL if @mount is not associated with a volume or a drive.
+ * Returns: (transfer full) (nullable): a #GDrive or %NULL if @mount is not
+ *      associated with a volume or a drive.
  *      The returned object should be unreffed with 
  *      g_object_unref() when no longer needed.
  **/
@@ -1037,7 +1040,7 @@ g_mount_unshadow (GMount *mount)
  *
  * Gets the sort key for @mount, if any.
  *
- * Returns: Sorting key for @mount or %NULL if no such key is available.
+ * Returns: (nullable): Sorting key for @mount or %NULL if no such key is available.
  *
  * Since: 2.32
  */
diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index 2a2b4ce5b..d59acb3b5 100644
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -47,6 +47,12 @@
  * #GtkMountOperation. If no user interaction is desired (for example
  * when automounting filesystems at login time), usually %NULL can be
  * passed, see each method taking a #GMountOperation for details.
+ *
+ * The term ‘TCRYPT’ is used to mean ‘compatible with TrueCrypt and VeraCrypt’.
+ * [TrueCrypt](https://en.wikipedia.org/wiki/TrueCrypt) is a discontinued system for
+ * encrypting file containers, partitions or whole disks, typically used with Windows.
+ * [VeraCrypt](https://www.veracrypt.fr/) is a maintained fork of TrueCrypt with various
+ * improvements and auditing fixes.
  */
 
 enum {
@@ -68,6 +74,9 @@ struct _GMountOperationPrivate {
   gboolean anonymous;
   GPasswordSave password_save;
   int choice;
+  gboolean hidden_volume;
+  gboolean system_volume;
+  guint pim;
 };
 
 enum {
@@ -77,7 +86,10 @@ enum {
   PROP_ANONYMOUS,
   PROP_DOMAIN,
   PROP_PASSWORD_SAVE,
-  PROP_CHOICE
+  PROP_CHOICE,
+  PROP_IS_TCRYPT_HIDDEN_VOLUME,
+  PROP_IS_TCRYPT_SYSTEM_VOLUME,
+  PROP_PIM
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GMountOperation, g_mount_operation, G_TYPE_OBJECT)
@@ -124,6 +136,21 @@ g_mount_operation_set_property (GObject      *object,
                                     g_value_get_int (value));
       break;
 
+    case PROP_IS_TCRYPT_HIDDEN_VOLUME:
+      g_mount_operation_set_is_tcrypt_hidden_volume (operation,
+                                                     g_value_get_boolean (value));
+      break;
+
+    case PROP_IS_TCRYPT_SYSTEM_VOLUME:
+      g_mount_operation_set_is_tcrypt_system_volume (operation,
+                                                     g_value_get_boolean (value));
+      break;
+
+    case PROP_PIM:
+        g_mount_operation_set_pim (operation,
+                                   g_value_get_uint (value));
+        break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -169,6 +196,18 @@ g_mount_operation_get_property (GObject    *object,
       g_value_set_int (value, priv->choice);
       break;
 
+    case PROP_IS_TCRYPT_HIDDEN_VOLUME:
+      g_value_set_boolean (value, priv->hidden_volume);
+      break;
+
+    case PROP_IS_TCRYPT_SYSTEM_VOLUME:
+      g_value_set_boolean (value, priv->system_volume);
+      break;
+
+    case PROP_PIM:
+      g_value_set_uint (value, priv->pim);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -504,6 +543,60 @@ g_mount_operation_class_init (GMountOperationClass *klass)
                                                      0, G_MAXINT, 0,
                                                      G_PARAM_READWRITE|
                                                      G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
+
+  /**
+   * GMountOperation:is-tcrypt-hidden-volume:
+   *
+   * Whether the device to be unlocked is a TCRYPT hidden volume.
+   * See https://www.veracrypt.fr/en/Hidden%20Volume.html.
+   *
+   * Since: 2.58
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_IS_TCRYPT_HIDDEN_VOLUME,
+                                   g_param_spec_boolean ("is-tcrypt-hidden-volume",
+                                                         P_("TCRYPT Hidden Volume"),
+                                                         P_("Whether to unlock a TCRYPT hidden volume. See https://www.veracrypt.fr/en/Hidden%20Volume.html."),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE|
+                                                         G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
+
+  /**
+  * GMountOperation:is-tcrypt-system-volume:
+  *
+  * Whether the device to be unlocked is a TCRYPT system volume.
+  * In this context, a system volume is a volume with a bootloader
+  * and operating system installed. This is only supported for Windows
+  * operating systems. For further documentation, see
+  * https://www.veracrypt.fr/en/System%20Encryption.html.
+  *
+  * Since: 2.58
+  */
+  g_object_class_install_property (object_class,
+                                   PROP_IS_TCRYPT_SYSTEM_VOLUME,
+                                   g_param_spec_boolean ("is-tcrypt-system-volume",
+                                                         P_("TCRYPT System Volume"),
+                                                         P_("Whether to unlock a TCRYPT system volume. Only supported for unlocking Windows system volumes. See https://www.veracrypt.fr/en/System%20Encryption.html."),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE|
+                                                         G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
+
+  /**
+  * GMountOperation:pim:
+  *
+  * The VeraCrypt PIM value, when unlocking a VeraCrypt volume. See
+  * https://www.veracrypt.fr/en/Personal%20Iterations%20Multiplier%20(PIM).html.
+  *
+  * Since: 2.58
+  */
+  g_object_class_install_property (object_class,
+                                   PROP_PIM,
+                                   g_param_spec_uint ("pim",
+                                                      P_("PIM"),
+                                                      P_("The VeraCrypt PIM value"),
+                                                      0, G_MAXUINT, 0,
+                                                      G_PARAM_READWRITE|
+                                                      G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
 }
 
 static void
@@ -737,6 +830,130 @@ g_mount_operation_set_choice (GMountOperation *op,
 }
 
 /**
+ * g_mount_operation_get_is_tcrypt_hidden_volume:
+ * @op: a #GMountOperation.
+ *
+ * Check to see whether the mount operation is being used
+ * for a TCRYPT hidden volume.
+ *
+ * Returns: %TRUE if mount operation is for hidden volume.
+ *
+ * Since: 2.58
+ **/
+gboolean
+g_mount_operation_get_is_tcrypt_hidden_volume (GMountOperation *op)
+{
+  g_return_val_if_fail (G_IS_MOUNT_OPERATION (op), FALSE);
+  return op->priv->hidden_volume;
+}
+
+/**
+ * g_mount_operation_set_is_tcrypt_hidden_volume:
+ * @op: a #GMountOperation.
+ * @hidden_volume: boolean value.
+ *
+ * Sets the mount operation to use a hidden volume if @hidden_volume is %TRUE.
+ *
+ * Since: 2.58
+ **/
+void
+g_mount_operation_set_is_tcrypt_hidden_volume (GMountOperation *op,
+                                               gboolean hidden_volume)
+{
+  GMountOperationPrivate *priv;
+  g_return_if_fail (G_IS_MOUNT_OPERATION (op));
+  priv = op->priv;
+
+  if (priv->hidden_volume != hidden_volume)
+    {
+      priv->hidden_volume = hidden_volume;
+      g_object_notify (G_OBJECT (op), "is-tcrypt-hidden-volume");
+    }
+}
+
+/**
+ * g_mount_operation_get_is_tcrypt_system_volume:
+ * @op: a #GMountOperation.
+ *
+ * Check to see whether the mount operation is being used
+ * for a TCRYPT system volume.
+ *
+ * Returns: %TRUE if mount operation is for system volume.
+ *
+ * Since: 2.58
+ **/
+gboolean
+g_mount_operation_get_is_tcrypt_system_volume (GMountOperation *op)
+{
+  g_return_val_if_fail (G_IS_MOUNT_OPERATION (op), FALSE);
+  return op->priv->system_volume;
+}
+
+/**
+ * g_mount_operation_set_is_tcrypt_system_volume:
+ * @op: a #GMountOperation.
+ * @system_volume: boolean value.
+ *
+ * Sets the mount operation to use a system volume if @system_volume is %TRUE.
+ *
+ * Since: 2.58
+ **/
+void
+g_mount_operation_set_is_tcrypt_system_volume (GMountOperation *op,
+                                               gboolean system_volume)
+{
+  GMountOperationPrivate *priv;
+  g_return_if_fail (G_IS_MOUNT_OPERATION (op));
+  priv = op->priv;
+
+  if (priv->system_volume != system_volume)
+    {
+      priv->system_volume = system_volume;
+      g_object_notify (G_OBJECT (op), "is-tcrypt-system-volume");
+    }
+}
+
+/**
+ * g_mount_operation_get_pim:
+ * @op: a #GMountOperation.
+ *
+ * Gets a PIM from the mount operation.
+ *
+ * Returns: The VeraCrypt PIM within @op.
+ *
+ * Since: 2.58
+ **/
+guint
+g_mount_operation_get_pim (GMountOperation *op)
+{
+  g_return_val_if_fail (G_IS_MOUNT_OPERATION (op), 0);
+  return op->priv->pim;
+}
+
+/**
+ * g_mount_operation_set_pim:
+ * @op: a #GMountOperation.
+ * @pim: an unsigned integer.
+ *
+ * Sets the mount operation's PIM to @pim.
+ *
+ * Since: 2.58
+ **/
+void
+g_mount_operation_set_pim (GMountOperation *op,
+                           guint pim)
+{
+  GMountOperationPrivate *priv;
+  g_return_if_fail (G_IS_MOUNT_OPERATION (op));
+  priv = op->priv;
+  if (priv->pim != pim)
+    {
+      priv->pim = pim;
+      g_object_notify (G_OBJECT (op), "pim");
+    }
+}
+
+/**
  * g_mount_operation_reply:
  * @op: a #GMountOperation
  * @result: a #GMountOperationResult
diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h
index 24b96e002..1361fb86f 100644
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.h
@@ -149,6 +149,21 @@ void          g_mount_operation_set_choice        (GMountOperation *op,
 GLIB_AVAILABLE_IN_ALL
 void          g_mount_operation_reply             (GMountOperation *op,
 						   GMountOperationResult result);
+GLIB_AVAILABLE_IN_2_58
+gboolean      g_mount_operation_get_is_tcrypt_hidden_volume (GMountOperation *op);
+GLIB_AVAILABLE_IN_2_58
+void          g_mount_operation_set_is_tcrypt_hidden_volume (GMountOperation *op,
+                                                             gboolean hidden_volume);
+GLIB_AVAILABLE_IN_2_58
+gboolean      g_mount_operation_get_is_tcrypt_system_volume (GMountOperation *op);
+GLIB_AVAILABLE_IN_2_58
+void          g_mount_operation_set_is_tcrypt_system_volume (GMountOperation *op,
+                                                             gboolean system_volume);
+GLIB_AVAILABLE_IN_2_58
+guint  g_mount_operation_get_pim           (GMountOperation *op);
+GLIB_AVAILABLE_IN_2_58
+void          g_mount_operation_set_pim           (GMountOperation *op,
+                                                   guint pim);
 
 G_END_DECLS
 
diff --git a/gio/gnetworking.h.win32 b/gio/gnetworking.h.win32
deleted file mode 100644
index 1f45dba32..000000000
--- a/gio/gnetworking.h.win32
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008-2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __G_NETWORKING_H__
-#define __G_NETWORKING_H__
-
-#include <glib.h>
-
-#ifdef G_OS_WIN32
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windns.h>
-#include <mswsock.h>
-#include <wspiapi.h>
-#include <iphlpapi.h>
-#undef interface
-
-#else /* !G_OS_WIN32 */
-
-#include <sys/types.h>
-
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <resolv.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <net/if.h>
-
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#ifndef T_SRV
-#define T_SRV 33
-#endif
-
-#ifndef _PATH_RESCONF
-#define _PATH_RESCONF "/etc/resolv.conf"
-#endif
-
-#ifndef CMSG_LEN
-/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on
- * some older platforms.
- */
-#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len))
-
-/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR()
- * adds. We overestimate here.
- */
-#define GLIB_ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1))
-#define CMSG_SPACE(len) GLIB_ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr)
-#endif
-#endif
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_36
-void g_networking_init (void);
-
-G_END_DECLS
-
-#endif /* __G_NETWORKING_H__ */
diff --git a/gio/gnetworkmonitorportal.c b/gio/gnetworkmonitorportal.c
index 856f8aa5b..16249ac55 100644
--- a/gio/gnetworkmonitorportal.c
+++ b/gio/gnetworkmonitorportal.c
@@ -21,7 +21,6 @@
 #include "gnetworkmonitorportal.h"
 #include "ginitable.h"
 #include "giomodule-priv.h"
-#include "gnetworkmonitor.h"
 #include "xdp-dbus.h"
 #include "gportalsupport.h"
 
@@ -39,8 +38,13 @@ enum
 
 struct _GNetworkMonitorPortalPrivate
 {
-  GXdpNetworkMonitor *proxy;
-  gboolean network_available;
+  GDBusProxy *proxy;
+  gboolean has_network;
+  int version;
+
+  gboolean available;
+  gboolean metered;
+  GNetworkConnectivity connectivity;
 };
 
 G_DEFINE_TYPE_WITH_CODE (GNetworkMonitorPortal, g_network_monitor_portal, G_TYPE_NETWORK_MONITOR_BASE,
@@ -72,22 +76,15 @@ g_network_monitor_portal_get_property (GObject    *object,
   switch (prop_id)
     {
     case PROP_NETWORK_AVAILABLE:
-      g_value_set_boolean (value,
-                           nm->priv->network_available &&
-                           gxdp_network_monitor_get_available (nm->priv->proxy));
+      g_value_set_boolean (value, nm->priv->available);
       break;
 
     case PROP_NETWORK_METERED:
-      g_value_set_boolean (value,
-                           nm->priv->network_available &&
-                           gxdp_network_monitor_get_metered (nm->priv->proxy));
+      g_value_set_boolean (value, nm->priv->metered);
       break;
 
     case PROP_CONNECTIVITY:
-      g_value_set_enum (value,
-                        nm->priv->network_available
-                        ? gxdp_network_monitor_get_connectivity (nm->priv->proxy)
-                        : G_NETWORK_CONNECTIVITY_LOCAL);
+      g_value_set_enum (value, nm->priv->connectivity);
       break;
 
     default:
@@ -97,22 +94,184 @@ g_network_monitor_portal_get_property (GObject    *object,
 }
 
 static void
-proxy_changed (GXdpNetworkMonitor    *proxy,
-               gboolean               available,
-               GNetworkMonitorPortal *nm)
+got_available (GObject *source,
+               GAsyncResult *res,
+               gpointer data)
 {
-  if (nm->priv->network_available)
-    g_signal_emit_by_name (nm, "network-changed", available);
+  GDBusProxy *proxy = G_DBUS_PROXY (source);
+  GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (data);
+  GError *error = NULL;
+  GVariant *ret;
+  gboolean available;
+  
+  ret = g_dbus_proxy_call_finish (proxy, res, &error);
+  if (ret == NULL)
+    {
+      g_warning ("%s", error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  g_variant_get (ret, "(b)", &available);
+  g_variant_unref (ret);
+
+  if (nm->priv->available != available)
+    {
+      nm->priv->available = available;
+      g_object_notify (G_OBJECT (nm), "network-available");
+      g_signal_emit_by_name (nm, "network-changed", available);
+    }
 }
 
+static void
+got_metered (GObject *source,
+             GAsyncResult *res,
+             gpointer data)
+{
+  GDBusProxy *proxy = G_DBUS_PROXY (source);
+  GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (data);
+  GError *error = NULL;
+  GVariant *ret;
+  gboolean metered;
+  
+  ret = g_dbus_proxy_call_finish (proxy, res, &error);
+  if (ret == NULL)
+    {
+      g_warning ("%s", error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  g_variant_get (ret, "(b)", &metered);
+  g_variant_unref (ret);
+
+  if (nm->priv->metered != metered)
+    {
+      nm->priv->metered = metered;
+      g_object_notify (G_OBJECT (nm), "network-metered");
+    }
+}
+
+static void
+got_connectivity (GObject *source,
+                  GAsyncResult *res,
+                  gpointer data)
+{
+  GDBusProxy *proxy = G_DBUS_PROXY (source);
+  GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (data);
+  GError *error = NULL;
+  GVariant *ret;
+  GNetworkConnectivity connectivity;
+  
+  ret = g_dbus_proxy_call_finish (proxy, res, &error);
+  if (ret == NULL)
+    {
+      g_warning ("%s", error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  g_variant_get (ret, "(u)", &connectivity);
+  g_variant_unref (ret);
+
+  if (nm->priv->connectivity != connectivity)
+    {
+      nm->priv->connectivity = connectivity;
+      g_object_notify (G_OBJECT (nm), "connectivity");
+    }
+}
+
+static void
+proxy_signal (GDBusProxy *proxy,
+              const char *sender,
+              const char *signal,
+              GVariant *parameters,
+              GNetworkMonitorPortal *nm)
+{
+  if (!nm->priv->has_network)
+    return;
+
+  if (nm->priv->version == 1)
+    {
+      gboolean available;
+
+      g_variant_get (parameters, "(b)", &available);
+      g_signal_emit_by_name (nm, "network-changed", available);
+    }
+  else if (nm->priv->version == 2)
+    {
+      g_dbus_proxy_call (proxy, "GetConnectivity", NULL, 0, -1, NULL, got_connectivity, nm);
+      g_dbus_proxy_call (proxy, "GetMetered", NULL, 0, -1, NULL, got_metered, nm);
+      g_dbus_proxy_call (proxy, "GetAvailable", NULL, 0, -1, NULL, got_available, nm);
+    }
+}
+
+static void
+proxy_properties_changed (GDBusProxy *proxy,
+                          GVariant *changed,
+                          GVariant *invalidated,
+                          GNetworkMonitorPortal *nm)
+{
+  if (!nm->priv->has_network)
+    return;
+
+  if (nm->priv->version == 1)
+    {
+      GVariant *ret;
+
+      ret = g_dbus_proxy_get_cached_property (proxy, "connectivity");
+      if (ret)
+        {
+          GNetworkConnectivity connectivity = g_variant_get_uint32 (ret);
+          if (nm->priv->connectivity != connectivity)
+            {
+              nm->priv->connectivity = connectivity;
+              g_object_notify (G_OBJECT (nm), "connectivity");
+            }
+          g_variant_unref (ret);
+        }
+
+      ret = g_dbus_proxy_get_cached_property (proxy, "metered");
+      if (ret)
+        {
+          gboolean metered = g_variant_get_boolean (ret);
+          if (nm->priv->metered != metered)
+            {
+              nm->priv->metered = metered;
+              g_object_notify (G_OBJECT (nm), "network-metered");
+            }
+          g_variant_unref (ret);
+        }
+
+      ret = g_dbus_proxy_get_cached_property (proxy, "available");
+      if (ret)
+        {
+          gboolean available = g_variant_get_boolean (ret);
+          if (nm->priv->available != available)
+            {
+              nm->priv->available = available;
+              g_object_notify (G_OBJECT (nm), "network-available");
+              g_signal_emit_by_name (nm, "network-changed", available);
+            }
+          g_variant_unref (ret);
+        }
+    }
+}
+                           
 static gboolean
 g_network_monitor_portal_initable_init (GInitable     *initable,
                                         GCancellable  *cancellable,
                                         GError       **error)
 {
   GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (initable);
-  GXdpNetworkMonitor *proxy;
+  GDBusProxy *proxy;
   gchar *name_owner = NULL;
+  int version;
+  GVariant *ret;
+
+  nm->priv->available = FALSE;
+  nm->priv->metered = FALSE;
+  nm->priv->connectivity = G_NETWORK_CONNECTIVITY_LOCAL;
 
   if (!glib_should_use_portal ())
     {
@@ -120,17 +279,19 @@ g_network_monitor_portal_initable_init (GInitable     *initable,
       return FALSE;
     }
 
-  proxy = gxdp_network_monitor_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                                       G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START
-                                                       | G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-                                                       "org.freedesktop.portal.Desktop",
-                                                       "/org/freedesktop/portal/desktop",
-                                                       cancellable,
-                                                       error);
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START
+                                         | G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+                                         NULL,
+                                         "org.freedesktop.portal.Desktop",
+                                         "/org/freedesktop/portal/desktop",
+					 "org.freedesktop.portal.NetworkMonitor",
+                                         cancellable,
+                                         error);
   if (!proxy)
     return FALSE;
 
-  name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy));
+  name_owner = g_dbus_proxy_get_name_owner (proxy);
 
   if (!name_owner)
     {
@@ -144,9 +305,26 @@ g_network_monitor_portal_initable_init (GInitable     *initable,
 
   g_free (name_owner);
 
-  g_signal_connect (proxy, "changed", G_CALLBACK (proxy_changed), nm);
+  ret = g_dbus_proxy_get_cached_property (proxy, "version");
+  g_variant_get (ret, "u", &version);
+  g_variant_unref (ret);
+
+  if (version != 1 && version != 2)
+    {
+      g_object_unref (proxy);
+      g_set_error (error,
+                   G_DBUS_ERROR,
+                   G_DBUS_ERROR_NAME_HAS_NO_OWNER,
+                   "NetworkMonitor portal unsupported version: %d", version);
+      return FALSE;
+    }
+
+  g_signal_connect (proxy, "g-signal", G_CALLBACK (proxy_signal), nm);
+  g_signal_connect (proxy, "g-properties-changed", G_CALLBACK (proxy_properties_changed), nm);
+
   nm->priv->proxy = proxy;
-  nm->priv->network_available = glib_network_available_in_sandbox ();
+  nm->priv->has_network = glib_network_available_in_sandbox ();
+  nm->priv->version = version;
 
   return initable_parent_iface->init (initable, cancellable, error);
 }
diff --git a/gio/gnextstepsettingsbackend.c b/gio/gnextstepsettingsbackend.m
index 44ea845d8..44ea845d8 100644
--- a/gio/gnextstepsettingsbackend.c
+++ b/gio/gnextstepsettingsbackend.m
diff --git a/gio/gosxappinfo.c b/gio/gosxappinfo.m
index 463b2da3c..463b2da3c 100644
--- a/gio/gosxappinfo.c
+++ b/gio/gosxappinfo.m
diff --git a/gio/gosxcontenttype.c b/gio/gosxcontenttype.m
index 52ba5763a..52ba5763a 100644
--- a/gio/gosxcontenttype.c
+++ b/gio/gosxcontenttype.m
diff --git a/gio/gresource.c b/gio/gresource.c
index 8ead26bc6..bf54f1d78 100644
--- a/gio/gresource.c
+++ b/gio/gresource.c
@@ -591,23 +591,24 @@ g_resource_load (const gchar  *filename,
   return g_resource_new_from_table (table);
 }
 
-static
-gboolean do_lookup (GResource             *resource,
-                    const gchar           *path,
-                    GResourceLookupFlags   lookup_flags,
-                    gsize                 *size,
-                    guint32               *flags,
-                    const void           **data,
-                    gsize                 *data_size,
-                    GError               **error)
+static gboolean
+do_lookup (GResource             *resource,
+           const gchar           *path,
+           GResourceLookupFlags   lookup_flags,
+           gsize                 *size,
+           guint32               *flags,
+           const void           **data,
+           gsize                 *data_size,
+           GError               **error)
 {
   char *free_path = NULL;
   gsize path_len;
   gboolean res = FALSE;
   GVariant *value;
 
+  /* Drop any trailing slash. */
   path_len = strlen (path);
-  if (path[path_len-1] == '/')
+  if (path_len >= 1 && path[path_len-1] == '/')
     {
       path = free_path = g_strdup (path);
       free_path[path_len-1] = 0;
diff --git a/gio/gsettings.c b/gio/gsettings.c
index e5ed54a46..ab7f43835 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1204,10 +1204,7 @@ g_settings_get_value (GSettings   *settings,
   value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
 
   if (value == NULL)
-    value = g_settings_schema_key_get_translated_default (&skey);
-
-  if (value == NULL)
-    value = g_variant_ref (skey.default_value);
+    value = g_settings_schema_key_get_default_value (&skey);
 
   g_settings_schema_key_clear (&skey);
 
@@ -1304,10 +1301,7 @@ g_settings_get_default_value (GSettings   *settings,
   value = g_settings_read_from_backend (settings, &skey, FALSE, TRUE);
 
   if (value == NULL)
-    value = g_settings_schema_key_get_translated_default (&skey);
-
-  if (value == NULL)
-    value = g_variant_ref (skey.default_value);
+    value = g_settings_schema_key_get_default_value (&skey);
 
   g_settings_schema_key_clear (&skey);
 
@@ -1360,10 +1354,7 @@ g_settings_get_enum (GSettings   *settings,
   value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
 
   if (value == NULL)
-    value = g_settings_schema_key_get_translated_default (&skey);
-
-  if (value == NULL)
-    value = g_variant_ref (skey.default_value);
+    value = g_settings_schema_key_get_default_value (&skey);
 
   result = g_settings_schema_key_to_enum (&skey, value);
   g_settings_schema_key_clear (&skey);
@@ -1473,10 +1464,7 @@ g_settings_get_flags (GSettings   *settings,
   value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
 
   if (value == NULL)
-    value = g_settings_schema_key_get_translated_default (&skey);
-
-  if (value == NULL)
-    value = g_variant_ref (skey.default_value);
+    value = g_settings_schema_key_get_default_value (&skey);
 
   result = g_settings_schema_key_to_flags (&skey, value);
   g_settings_schema_key_clear (&skey);
@@ -1751,6 +1739,13 @@ g_settings_get_mapped (GSettings           *settings,
       if (okay) goto okay;
     }
 
+  if ((value = g_settings_schema_key_get_per_desktop_default (&skey)))
+    {
+      okay = mapping (value, &result, user_data);
+      g_variant_unref (value);
+      if (okay) goto okay;
+    }
+
   if (mapping (skey.default_value, &result, user_data))
     goto okay;
 
@@ -2660,6 +2655,20 @@ g_settings_binding_key_changed (GSettings   *settings,
 
   if (variant == NULL)
     {
+      variant = g_settings_schema_key_get_per_desktop_default (&binding->key);
+      if (variant &&
+          !binding->get_mapping (&value, variant, binding->user_data))
+        {
+          g_error ("Per-desktop default value for key '%s' in schema '%s' "
+                   "was rejected by the binding mapping function.",
+                   binding->key.name, g_settings_schema_get_id (binding->key.schema));
+          g_variant_unref (variant);
+          variant = NULL;
+        }
+    }
+
+  if (variant == NULL)
+    {
       variant = g_variant_ref (binding->key.default_value);
       if (!binding->get_mapping (&value, variant, binding->user_data))
         g_error ("The schema default value for key '%s' in schema '%s' "
@@ -2912,10 +2921,12 @@ g_settings_bind_with_mapping (GSettings               *settings,
 
       if (!g_variant_type_equal (binding->key.type, G_VARIANT_TYPE_BOOLEAN))
         {
+          gchar *type_string = g_variant_type_dup_string (binding->key.type);
           g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
                       "was specified, but key '%s' on schema '%s' has "
                       "type '%s'", key, g_settings_schema_get_id (settings->priv->schema),
-                      g_variant_type_dup_string (binding->key.type));
+                      type_string);
+          g_free (type_string);
           return;
         }
 
@@ -2926,12 +2937,14 @@ g_settings_bind_with_mapping (GSettings               *settings,
            !g_settings_mapping_is_compatible (binding->property->value_type,
                                               binding->key.type))
     {
+      gchar *type_string = g_variant_type_dup_string (binding->key.type);
       g_critical ("g_settings_bind: property '%s' on class '%s' has type "
                   "'%s' which is not compatible with type '%s' of key '%s' "
                   "on schema '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
                   g_type_name (binding->property->value_type),
-                  g_variant_type_dup_string (binding->key.type), key,
+                  type_string, key,
                   g_settings_schema_get_id (settings->priv->schema));
+      g_free (type_string);
       return;
     }
 
diff --git a/gio/gsettingsschema-internal.h b/gio/gsettingsschema-internal.h
index f54de3b34..5f996b4bc 100644
--- a/gio/gsettingsschema-internal.h
+++ b/gio/gsettingsschema-internal.h
@@ -37,6 +37,7 @@ struct _GSettingsSchemaKey
   const GVariantType *type;
   GVariant *minimum, *maximum;
   GVariant *default_value;
+  GVariant *desktop_overrides;
 
   gint ref_count;
 };
@@ -58,6 +59,7 @@ gboolean                g_settings_schema_key_type_check                (GSettin
 GVariant *              g_settings_schema_key_range_fixup               (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
 GVariant *              g_settings_schema_key_get_translated_default    (GSettingsSchemaKey *key);
+GVariant *              g_settings_schema_key_get_per_desktop_default   (GSettingsSchemaKey *key);
 
 gint                    g_settings_schema_key_to_enum                   (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index f1274a369..17b7e3b01 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -27,6 +27,7 @@
 #include <glibintl.h>
 #include <locale.h>
 #include <string.h>
+#include <stdlib.h>
 
 /**
  * SECTION:gsettingsschema
@@ -1283,6 +1284,11 @@ g_settings_schema_key_init (GSettingsSchemaKey *key,
           endian_fixup (&key->maximum);
           break;
 
+        case 'd':
+          g_variant_get (data, "@a{sv}", &key->desktop_overrides);
+          endian_fixup (&key->desktop_overrides);
+          break;
+
         default:
           g_warning ("unknown schema extension '%c'", code);
           break;
@@ -1303,6 +1309,9 @@ g_settings_schema_key_clear (GSettingsSchemaKey *key)
   if (key->maximum)
     g_variant_unref (key->maximum);
 
+  if (key->desktop_overrides)
+    g_variant_unref (key->desktop_overrides);
+
   g_variant_unref (key->default_value);
 
   g_settings_schema_unref (key->schema);
@@ -1410,6 +1419,35 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
   return value;
 }
 
+GVariant *
+g_settings_schema_key_get_per_desktop_default (GSettingsSchemaKey *key)
+{
+  static const gchar * const *current_desktops;
+  GVariant *value = NULL;
+  gint i;
+
+  if (!key->desktop_overrides)
+    return NULL;
+
+  if (g_once_init_enter (&current_desktops))
+    {
+      const gchar *xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+      gchar **tmp;
+
+      if (xdg_current_desktop != NULL && xdg_current_desktop[0] != '\0')
+        tmp = g_strsplit (xdg_current_desktop, G_SEARCHPATH_SEPARATOR_S, -1);
+      else
+        tmp = g_new0 (gchar *, 0 + 1);
+
+      g_once_init_leave (&current_desktops, (const gchar **) tmp);
+    }
+
+  for (i = 0; value == NULL && current_desktops[i] != NULL; i++)
+    value = g_variant_lookup_value (key->desktop_overrides, current_desktops[i], NULL);
+
+  return value;
+}
+
 gint
 g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
                                GVariant           *value)
@@ -1699,6 +1737,9 @@ g_settings_schema_key_get_default_value (GSettingsSchemaKey *key)
   value = g_settings_schema_key_get_translated_default (key);
 
   if (!value)
+    value = g_settings_schema_key_get_per_desktop_default (key);
+
+  if (!value)
     value = g_variant_ref (key->default_value);
 
   return value;
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 11be2e738..859e807cb 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2957,9 +2957,11 @@ g_socket_check_connect_result (GSocket  *socket,
 gssize
 g_socket_get_available_bytes (GSocket *socket)
 {
-#ifdef G_OS_WIN32
+#ifndef SO_NREAD
   const gint bufsize = 64 * 1024;
   static guchar *buf = NULL;
+#endif
+#ifdef G_OS_WIN32
   u_long avail;
 #else
   gint avail;
@@ -2967,25 +2969,37 @@ g_socket_get_available_bytes (GSocket *socket)
 
   g_return_val_if_fail (G_IS_SOCKET (socket), -1);
 
-#if defined (SO_NREAD)
+#ifdef SO_NREAD
   if (!g_socket_get_option (socket, SOL_SOCKET, SO_NREAD, &avail, NULL))
       return -1;
-#elif !defined (G_OS_WIN32)
-  if (ioctl (socket->priv->fd, FIONREAD, &avail) < 0)
-    avail = -1;
 #else
   if (socket->priv->type == G_SOCKET_TYPE_DATAGRAM)
     {
       if (G_UNLIKELY (g_once_init_enter (&buf)))
         g_once_init_leave (&buf, g_malloc (bufsize));
 
+      /* On datagram sockets, FIONREAD ioctl is not reliable because many
+       * systems add internal header size to the reported size, making it
+       * unusable for this function. */
       avail = recv (socket->priv->fd, buf, bufsize, MSG_PEEK);
-      if (avail == -1 && get_socket_errno () == WSAEWOULDBLOCK)
-        avail = 0;
+      if (avail == -1)
+        {
+          int errsv = get_socket_errno ();
+#ifdef G_OS_WIN32
+          if (errsv == WSAEWOULDBLOCK)
+#else
+          if (errsv == EWOULDBLOCK || errsv == EAGAIN)
+#endif
+            avail = 0;
+        }
     }
   else
     {
+#ifdef G_OS_WIN32
       if (ioctlsocket (socket->priv->fd, FIONREAD, &avail) < 0)
+#else
+      if (ioctl (socket->priv->fd, FIONREAD, &avail) < 0)
+#endif
         avail = -1;
     }
 #endif
diff --git a/gio/gtask.c b/gio/gtask.c
index 814ba9433..df40357dd 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -1975,6 +1975,7 @@ g_task_thread_pool_init (void)
   g_thread_pool_set_sort_function (task_pool, g_task_compare_priority, NULL);
 
   task_pool_manager = g_source_new (&trivial_source_funcs, sizeof (GSource));
+  g_source_set_name (task_pool_manager, "GTask thread pool manager");
   g_source_set_callback (task_pool_manager, task_pool_manager_timeout, NULL, NULL);
   g_source_set_ready_time (task_pool_manager, -1);
   g_source_attach (task_pool_manager,
diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index e89dc156c..9e110cd0b 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -803,7 +803,9 @@ free_records (GList *records)
 
 #if defined(G_OS_UNIX)
 #ifdef __BIONIC__
+#ifndef C_IN
 #define C_IN 1
+#endif
 int res_query(const char *, int, int, u_char *, int);
 #endif
 #endif
@@ -876,7 +878,7 @@ do_lookup_records (GTask         *task,
 #elif defined(HAVE_RES_NCLOSE)
   res_nclose (&res);
 #elif defined(HAVE_RES_NINIT)
-#error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://bugzilla.gnome.org/enter_bug.cgi?product=glib"
+#error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://gitlab.gnome.org/GNOME/glib/issues/new"
 #endif
 
 #endif  /* HAVE_RES_NQUERY */
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index f2db27e66..355329c19 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -307,7 +307,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "autofs",
     "autofs4",
     "cgroup",
-    "cifs",
     "configfs",
     "cxfs",
     "debugfs",
@@ -329,8 +328,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "mfs",
     "mqueue",
     "ncpfs",
-    "nfs",
-    "nfs4",
     "nfsd",
     "nullfs",
     "ocfs2",
@@ -343,7 +340,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "rpc_pipefs",
     "securityfs",
     "selinuxfs",
-    "smbfs",
     "sysfs",
     "tmpfs",
     "usbfs",
diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c
index b0d3c8fe4..27e195e47 100644
--- a/gio/gunixsocketaddress.c
+++ b/gio/gunixsocketaddress.c
@@ -66,7 +66,9 @@ enum
   PROP_ADDRESS_TYPE
 };
 
+#ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX sizeof (((struct sockaddr_un *) 0)->sun_path)
+#endif
 
 struct _GUnixSocketAddressPrivate
 {
diff --git a/gio/gvolume.c b/gio/gvolume.c
index f97ce4c12..d3bd3b288 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.c
@@ -66,7 +66,7 @@
  * different kinds of identifiers, such as Hal UDIs, filesystem labels,
  * traditional Unix devices (e.g. `/dev/sda2`), UUIDs. GIO uses predefined
  * strings as names for the different kinds of identifiers:
- * #G_VOLUME_IDENTIFIER_KIND_HAL_UDI, #G_VOLUME_IDENTIFIER_KIND_LABEL, etc.
+ * #G_VOLUME_IDENTIFIER_KIND_UUID, #G_VOLUME_IDENTIFIER_KIND_LABEL, etc.
  * Use g_volume_get_identifier() to obtain an identifier for a volume.
  *
  *
@@ -195,7 +195,8 @@ g_volume_get_symbolic_icon (GVolume *volume)
  * considered an opaque string. Returns %NULL if there is no UUID
  * available.
  * 
- * Returns: the UUID for @volume or %NULL if no UUID can be computed.
+ * Returns: (nullable) (transfer full): the UUID for @volume or %NULL if no UUID
+ *     can be computed.
  *     The returned string should be freed with g_free() 
  *     when no longer needed.
  */
@@ -216,8 +217,8 @@ g_volume_get_uuid (GVolume *volume)
  * @volume: a #GVolume
  * 
  * Gets the drive for the @volume.
- * 
- * Returns: (transfer full): a #GDrive or %NULL if @volume is not
+ *
+ * Returns: (transfer full) (nullable): a #GDrive or %NULL if @volume is not
  *     associated with a drive. The returned object should be unreffed
  *     with g_object_unref() when no longer needed.
  */
@@ -238,8 +239,8 @@ g_volume_get_drive (GVolume *volume)
  * @volume: a #GVolume
  * 
  * Gets the mount for the @volume.
- * 
- * Returns: (transfer full): a #GMount or %NULL if @volume isn't mounted.
+ *
+ * Returns: (transfer full) (nullable): a #GMount or %NULL if @volume isn't mounted.
  *     The returned object should be unreffed with g_object_unref()
  *     when no longer needed.
  */
@@ -565,8 +566,8 @@ g_volume_eject_with_operation_finish (GVolume        *volume,
  * See the [introduction][volume-identifier] for more
  * information about volume identifiers.
  *
- * Returns: a newly allocated string containing the
- *     requested identfier, or %NULL if the #GVolume
+ * Returns: (nullable) (transfer full): a newly allocated string containing the
+ *     requested identifier, or %NULL if the #GVolume
  *     doesn't have this kind of identifier
  */
 char *
@@ -666,7 +667,7 @@ g_volume_get_activation_root (GVolume *volume)
  *
  * Gets the sort key for @volume, if any.
  *
- * Returns: Sorting key for @volume or %NULL if no such key is available
+ * Returns: (nullable): Sorting key for @volume or %NULL if no such key is available
  *
  * Since: 2.32
  */
diff --git a/gio/gvolume.h b/gio/gvolume.h
index c4a506e84..1bb47e5cf 100644
--- a/gio/gvolume.h
+++ b/gio/gvolume.h
@@ -30,12 +30,16 @@
 
 G_BEGIN_DECLS
 
+#ifndef G_DISABLE_DEPRECATED
 /**
  * G_VOLUME_IDENTIFIER_KIND_HAL_UDI:
  *
  * The string used to obtain a Hal UDI with g_volume_get_identifier().
+ *
+ * Deprecated: 2.58: Do not use, HAL is deprecated.
  */
 #define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi"
+#endif /* G_DISABLE_DEPRECATED */
 
 /**
  * G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE:
diff --git a/gio/gwin32notificationbackend.c b/gio/gwin32notificationbackend.c
index 7200fdffb..602f3f342 100644
--- a/gio/gwin32notificationbackend.c
+++ b/gio/gwin32notificationbackend.c
@@ -59,12 +59,18 @@ g_win32_notification_backend_send_notification (GNotificationBackend *backend,
                                                 const gchar          *id,
                                                 GNotification        *notification)
 {
+  static gsize warned = 0;
+
   /* FIXME: See https://bugzilla.gnome.org/show_bug.cgi?id=776583. This backend
    * exists purely to stop crashes when applications use g_notification*()
    * on Windows, by providing a dummy backend implementation. (The alternative
    * was to modify all of the backend call sites in g_notification*(), which
    * seemed less scalable.) */
-  g_warning ("Notifications are not yet supported on Windows.");
+  if (g_once_init_enter (&warned))
+    {
+      g_warning ("Notifications are not yet supported on Windows.");
+      g_once_init_leave (&warned, 1);
+    }
 }
 
 static void
diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am
index 8b4b3ae18..6dd9136b4 100644
--- a/gio/inotify/Makefile.am
+++ b/gio/inotify/Makefile.am
@@ -26,3 +26,7 @@ libinotify_la_CFLAGS = \
 	-DGIO_COMPILATION		\
 	-DG_DISABLE_DEPRECATED
 
+libinotify_la_LIBADD = \
+	$(top_builddir)/glib/libglib-2.0.la \
+	$(top_builddir)/gobject/libgobject-2.0.la \
+	$(NULL)
\ No newline at end of file
diff --git a/gio/inotify/meson.build b/gio/inotify/meson.build
index 1fa8e0464..8183f141e 100644
--- a/gio/inotify/meson.build
+++ b/gio/inotify/meson.build
@@ -10,6 +10,6 @@ inotify_sources = [
 inotify_lib = static_library('inotify',
   sources : inotify_sources,
   include_directories : [configinc, glibinc, gmoduleinc],
-  dependencies : [gioenumtypes_dep],
+  dependencies : [gioenumtypes_dep, libglib_dep, libgobject_dep],
   pic : true,
   c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
diff --git a/gio/kqueue/gkqueuefilemonitor.c b/gio/kqueue/gkqueuefilemonitor.c
index d6fea41cf..3088296b5 100644
--- a/gio/kqueue/gkqueuefilemonitor.c
+++ b/gio/kqueue/gkqueuefilemonitor.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include <glib-object.h>
+#include <glib/gfileutils.h>
 #include <gio/gfilemonitor.h>
 #include <gio/glocalfilemonitor.h>
 #include <gio/giomodule.h>
@@ -52,19 +53,44 @@ static int	      kq_queue = -1;
 #define G_KQUEUE_FILE_MONITOR(inst)	(G_TYPE_CHECK_INSTANCE_CAST ((inst), \
 					G_TYPE_KQUEUE_FILE_MONITOR, GKqueueFileMonitor))
 
+/* C11 allows type redefinition, but GLib is configured to use C89, which causes
+ * clang to show warnings when we use a C11 feature. Since the C89 requirement
+ * is mostly used to support MSVC, we simply ignore the warning here because
+ * this file is never going to be useful on Windows. */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtypedef-redefinition"
+#endif
+
 typedef GLocalFileMonitorClass GKqueueFileMonitorClass;
 
-typedef struct
+/* When the file we are monitoring is a directory, sub_dir is subscribed to the
+ * directory itself and sub_file is NULL.
+ *
+ * When the file we are monitoring is a regular file, sub_dir is subscribed to
+ * the directory containing the file and sub_file is subscribed to the file
+ * being monitored. We have to monitor both because it is possible that the
+ * file chosen for monitoring doesn't exist when the file monitor is started.
+ * We monitor on its parent in order to get notification when it is created.
+ *
+ * To distinguish between a directory monitor and a regular file monitor, check
+ * whether sub_file is NULL. */
+typedef struct _GKqueueFileMonitor
 {
   GLocalFileMonitor parent_instance;
 
-  kqueue_sub *sub;
+  kqueue_sub *sub_dir;
+  kqueue_sub *sub_file;
 #ifndef O_EVTONLY
   GFileMonitor *fallback;
   GFile *fbfile;
 #endif
 } GKqueueFileMonitor;
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 GType g_kqueue_file_monitor_get_type (void);
 G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
 	g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
@@ -78,12 +104,23 @@ G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL
 #define O_KQFLAG O_EVTONLY
 #endif
 
-#define NOTE_ALL (NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME)
+static inline unsigned int
+note_all (void)
+{
+  unsigned int notes = NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME;
+#ifdef NOTE_TRUNCATE
+  notes |= NOTE_TRUNCATE;
+#endif
+#ifdef NOTE_CLOSE_WRITE
+  notes |= NOTE_CLOSE_WRITE;
+#endif
+  return notes;
+}
 
 static gboolean g_kqueue_file_monitor_cancel (GFileMonitor* monitor);
 static gboolean g_kqueue_file_monitor_is_supported (void);
 
-static kqueue_sub	*_kqsub_new (const gchar *, GLocalFileMonitor *, GFileMonitorSource *);
+static kqueue_sub	*_kqsub_new (gchar *, gchar *, GKqueueFileMonitor *, GFileMonitorSource *);
 static void		 _kqsub_free (kqueue_sub *);
 static gboolean		 _kqsub_cancel (kqueue_sub *);
 
@@ -108,7 +145,7 @@ _fallback_callback (GFileMonitor      *unused,
  * Returns: TRUE if the file should be excluded from the kqueue-powered
  *      monitoring, FALSE otherwise.
  **/
-gboolean
+static gboolean
 _ke_is_excluded (const char *full_path)
 {
   GFile *f = NULL;
@@ -121,7 +158,7 @@ _ke_is_excluded (const char *full_path)
     g_object_unref (f);
   }
 
-  if ((mount != NULL && (g_mount_can_unmount (mount))) || g_str_has_prefix (full_path, "/mnt/"))
+  if (mount != NULL && (g_str_has_prefix (full_path, "/media/") || g_str_has_prefix (full_path, "/run/media/")))
   {
     g_warning ("Excluding %s from kernel notification, falling back to poll", full_path);
     if (mount)
@@ -138,11 +175,18 @@ g_kqueue_file_monitor_finalize (GObject *object)
 {
   GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (object);
 
-  if (kqueue_monitor->sub)
+  if (kqueue_monitor->sub_dir)
+    {
+      _kqsub_cancel (kqueue_monitor->sub_dir);
+      _kqsub_free (kqueue_monitor->sub_dir);
+      kqueue_monitor->sub_dir = NULL;
+    }
+
+  if (kqueue_monitor->sub_file)
     {
-      _kqsub_cancel (kqueue_monitor->sub);
-      _kqsub_free (kqueue_monitor->sub);
-      kqueue_monitor->sub = NULL;
+      _kqsub_cancel (kqueue_monitor->sub_file);
+      _kqsub_free (kqueue_monitor->sub_file);
+      kqueue_monitor->sub_file = NULL;
     }
 
 #ifndef O_EVTONLY
@@ -165,17 +209,51 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_monitor,
                              GFileMonitorSource *source)
 {
   GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor);
-  kqueue_sub *sub;
-  const gchar *path;
-
-  path = filename;
-  if (path == NULL)
-    path = dirname;
+  kqueue_sub *sub_dir = NULL, *sub_file = NULL;
+  gchar *path_dir, *path_file, *file_basename;
+
+  /* There are three possible cases here:
+   *
+   *  1. Directory: dirname != NULL, basename == NULL, filename == NULL
+   *  2. Regular file: dirname != NULL, basename != NULL, filename == NULL
+   *  3. Hard links: dirname == NULL, basename == NULL, filename != NULL
+   *
+   *  Note that we don't distinguish between case 2 and 3. Kqueue monitors
+   *  files based on file descriptors, so we always receive events come from
+   *  hard links.
+   */
+  if (filename != NULL)
+    {
+      path_dir = g_path_get_dirname (filename);
+      path_file = g_strdup (filename);
+      file_basename = g_path_get_basename (filename);
+    }
+  else
+    {
+      path_dir = g_strdup (dirname);
+      if (basename != NULL)
+        {
+          path_file = g_build_filename (dirname, basename, NULL);
+          file_basename = g_strdup (basename);
+        }
+      else
+        {
+          path_file = NULL;
+          file_basename = NULL;
+        }
+    }
 
 #ifndef O_EVTONLY
-  if (_ke_is_excluded (path))
+  if (_ke_is_excluded (path_dir))
     {
-      GFile *file = g_file_new_for_path (path);
+      GFile *file;
+      if (path_file != NULL)
+        file = g_file_new_for_path (path_file);
+      else
+        file = g_file_new_for_path (path_dir);
+      g_free (path_dir);
+      g_free (path_file);
+      g_free (file_basename);
       kqueue_monitor->fbfile = file;
       kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
       g_signal_connect (kqueue_monitor->fallback, "changed",
@@ -191,13 +269,30 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_monitor,
    * file, GIO uses a GKqueueFileMonitor object for that. If a directory
    * will be created under that path, GKqueueFileMonitor will have to
    * handle the directory notifications. */
-  sub = _kqsub_new (path, local_monitor, source);
-  if (sub == NULL)
-    return;
+  sub_dir = _kqsub_new (g_steal_pointer (&path_dir), NULL,
+                        kqueue_monitor, source);
+  if (!_kqsub_start_watching (sub_dir))
+    _km_add_missing (sub_dir);
+
+  /* Unlike GInotifyFileMonitor, which always uses a directory monitor
+   * regardless of the type of the file being monitored, kqueue doesn't
+   * give us events generated by files under it when we are monitoring
+   * a directory. We have to monitor the file itself to know changes which
+   * was made to the file itself. */
+  if (path_file != NULL)
+    {
+      sub_file = _kqsub_new (g_steal_pointer (&path_file),
+                             g_steal_pointer (&file_basename),
+                             kqueue_monitor, source);
+      if (!_kqsub_start_watching (sub_file))
+        _km_add_missing (sub_file);
+    }
 
-  kqueue_monitor->sub = sub;
-  if (!_kqsub_start_watching (sub))
-    _km_add_missing (sub);
+  kqueue_monitor->sub_dir = sub_dir;
+  kqueue_monitor->sub_file = sub_file;
+  g_clear_pointer (&path_dir, g_free);
+  g_clear_pointer (&path_file, g_free);
+  g_clear_pointer (&file_basename, g_free);
 }
 
 static void
@@ -230,59 +325,127 @@ g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_d
   struct timespec ts;
 
   memset (&ts, 0, sizeof(ts));
+
+  /* We must hold the global lock before accessing any kqueue_sub because it is
+   * possible for other threads to call g_kqueue_file_monitor_cancel, which may
+   * free the kqueue_sub struct we are accessing. */
+  G_LOCK (kq_lock);
+
   while (kevent(fd, NULL, 0, &ev, 1, &ts) > 0)
     {
-        GFileMonitorEvent mask = 0;
-
         if (ev.filter != EVFILT_VNODE || ev.udata == NULL)
           continue;
 
-	sub = ev.udata;
+        sub = ev.udata;
         source = sub->source;
 
+        /* When we are monitoring a regular file which already exists, ignore
+         * events generated by its parent directory. This has to be the first
+         * check to prevent the following code to emit useless events */
+        if (sub->is_dir && sub->mon->sub_file != NULL && sub->mon->sub_file->fd != -1)
+          continue;
+
         if (ev.flags & EV_ERROR)
           ev.fflags = NOTE_REVOKE;
 
-        if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE))
-          {
-            _kqsub_cancel (sub);
-            _km_add_missing (sub);
-          }
-
         if (sub->is_dir && ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
           {
-            _kh_dir_diff (sub);
+            /* If we are monitoring on a non-existent regular file, trigger the
+             * rescan of missing files immediately so we don't have to wait for
+             * 4 seconds for discovering missing files. We pass the sub_file
+             * corresponding to the GKqueueFileMonitor to 'check_this_sub_only'
+             * argument to prevent _km_scan_missing from emiting 'CREATED'
+             * events because _kh_dir_diff will do it for us. */
+            if (sub->mon->sub_file != NULL && sub->mon->sub_file->fd == -1)
+              _km_scan_missing (sub->mon->sub_file);
+
+            /* If we are monitoring a regular file, don't emit 'DELETED' events
+             * from the directory monitor because it will be emitted from the
+             * file itself when a NOTE_DELETE is reported on sub_file. */
+            _kh_dir_diff (sub, sub->mon->sub_file == NULL);
+
+#ifdef NOTE_TRUNCATE
+            ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND | NOTE_TRUNCATE);
+#else
             ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND);
+#endif
           }
 
+        /* Here starts the long section of mapping kqueue events to
+         * GFileMonitorEvent. Since kqueue can return multiple events in a
+         * single kevent struct, we must use 'if' instead of 'else if'. */
         if (ev.fflags & NOTE_DELETE)
           {
-            mask = G_FILE_MONITOR_EVENT_DELETED;
+            struct stat st;
+            if (fstat (sub->fd, &st) < 0)
+              st.st_nlink = 0;
+
+            g_file_monitor_source_handle_event (source,
+                                                G_FILE_MONITOR_EVENT_DELETED,
+                                                sub->basename, NULL, NULL, now);
+
+            /* If the last reference to the file was removed, delete the
+             * subscription from kqueue and add it to the missing list.
+             * If you are monitoring a file which has hard link count higher
+             * than 1, it is possible for the same file to emit 'DELETED'
+             * events multiple times. */
+            if (st.st_nlink == 0)
+              {
+                _kqsub_cancel (sub);
+                _km_add_missing (sub);
+              }
           }
-        else if (ev.fflags & NOTE_ATTRIB)
+         if (ev.fflags & NOTE_REVOKE)
+           {
+             g_file_monitor_source_handle_event (source,
+                                                 G_FILE_MONITOR_EVENT_UNMOUNTED,
+                                                 sub->basename, NULL, NULL, now);
+             _kqsub_cancel (sub);
+             _km_add_missing (sub);
+           }
+        if (ev.fflags & NOTE_ATTRIB)
           {
-            mask = G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
+            g_file_monitor_source_handle_event (source,
+                                                G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
+                                                sub->basename, NULL, NULL, now);
           }
-        else if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
+#ifdef NOTE_TRUNCATE
+        if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND | NOTE_TRUNCATE))
+#else
+        if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
+#endif
           {
-            mask = G_FILE_MONITOR_EVENT_CHANGED;
+            g_file_monitor_source_handle_event (source,
+                                                G_FILE_MONITOR_EVENT_CHANGED,
+                                                sub->basename, NULL, NULL, now);
           }
-        else if (ev.fflags & NOTE_RENAME)
+        if (ev.fflags & NOTE_RENAME)
           {
             /* Since there’s apparently no way to get the new name of the
              * file out of kqueue(), all we can do is say that this one has
              * been deleted. */
-            mask = G_FILE_MONITOR_EVENT_DELETED;
+            g_file_monitor_source_handle_event (source,
+                                                G_FILE_MONITOR_EVENT_DELETED,
+                                                sub->basename, NULL, NULL, now);
           }
-        else if (ev.fflags & NOTE_REVOKE)
+#ifdef NOTE_CLOSE_WRITE
+        if (ev.fflags & NOTE_CLOSE_WRITE)
           {
-            mask = G_FILE_MONITOR_EVENT_UNMOUNTED;
+            g_file_monitor_source_handle_event (source,
+                                                G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
+                                                sub->basename, NULL, NULL, now);
           }
+#endif
 
-        if (mask)
-          g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, now);
+        /* Handle the case when a file is created again shortly after it was
+         * deleted. It has to be the last check because 'DELETED' must happen
+         * before 'CREATED'. */
+        if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE))
+          _km_scan_missing (NULL);
     }
 
+  G_UNLOCK (kq_lock);
+
   return TRUE;
 }
 
@@ -320,14 +483,28 @@ g_kqueue_file_monitor_cancel (GFileMonitor *monitor)
 {
   GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (monitor);
 
-  if (kqueue_monitor->sub)
+  /* We must hold the global lock before calling _kqsub_cancel. However, we
+   * cannot call G_LOCK in _kqsub_cancel because it is also used by
+   * g_kqueue_file_monitor_callback, which already holds the lock itself. */
+  G_LOCK (kq_lock);
+
+  if (kqueue_monitor->sub_dir)
     {
-      _kqsub_cancel (kqueue_monitor->sub);
-      _kqsub_free (kqueue_monitor->sub);
-      kqueue_monitor->sub = NULL;
+      _kqsub_cancel (kqueue_monitor->sub_dir);
+      _kqsub_free (kqueue_monitor->sub_dir);
+      kqueue_monitor->sub_dir = NULL;
     }
+  if (kqueue_monitor->sub_file)
+    {
+      _kqsub_cancel (kqueue_monitor->sub_file);
+      _kqsub_free (kqueue_monitor->sub_file);
+      kqueue_monitor->sub_file = NULL;
+    }
+
+  G_UNLOCK (kq_lock);
+
 #ifndef O_EVTONLY
-  else if (kqueue_monitor->fallback)
+  if (kqueue_monitor->fallback)
     {
       g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor);
       g_file_monitor_cancel (kqueue_monitor->fallback);
@@ -341,12 +518,13 @@ g_kqueue_file_monitor_cancel (GFileMonitor *monitor)
 }
 
 static kqueue_sub *
-_kqsub_new (const gchar *filename, GLocalFileMonitor *mon, GFileMonitorSource *source)
+_kqsub_new (gchar *filename, gchar *basename, GKqueueFileMonitor *mon, GFileMonitorSource *source)
 {
   kqueue_sub *sub;
 
   sub = g_slice_new (kqueue_sub);
-  sub->filename = g_strdup (filename);
+  sub->filename = filename;
+  sub->basename = basename;
   sub->mon = mon;
   g_source_ref ((GSource *) source);
   sub->source = source;
@@ -365,19 +543,23 @@ _kqsub_free (kqueue_sub *sub)
 
   g_source_unref ((GSource *) sub->source);
   g_free (sub->filename);
+  g_free (sub->basename);
   g_slice_free (kqueue_sub, sub);
 }
 
 static gboolean
 _kqsub_cancel (kqueue_sub *sub)
 {
+  /* WARNING: Before calling this function, you must hold a lock on kq_lock
+   * or you will cause use-after-free in g_kqueue_file_monitor_callback. */
+
   struct kevent ev;
 
   /* Remove the event and close the file descriptor to automatically
    * delete pending events. */
   if (sub->fd != -1)
     {
-      EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub);
+      EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, note_all (), 0, sub);
       if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
         {
           g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno));
@@ -425,7 +607,7 @@ _kqsub_start_watching (kqueue_sub *sub)
       sub->deps = dl_listing (sub->filename);
     }
 
-  EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_ALL, 0, sub);
+  EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, note_all (), 0, sub);
   if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
     {
       g_warning ("Unable to add event for %s: %s", sub->filename, g_strerror (errno));
diff --git a/gio/kqueue/kqueue-helper.c b/gio/kqueue/kqueue-helper.c
index 497c30b15..36a5b58a7 100644
--- a/gio/kqueue/kqueue-helper.c
+++ b/gio/kqueue/kqueue-helper.c
@@ -25,6 +25,7 @@
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <gio/glocalfile.h>
 #include <gio/glocalfilemonitor.h>
 #include <gio/gfile.h>
@@ -38,6 +39,7 @@
 typedef struct {
   kqueue_sub *sub;
   GFileMonitorSource *source;
+  gboolean handle_deleted;
 } handle_ctx;
 
 /**
@@ -53,6 +55,9 @@ static void
 handle_created (void *udata, const char *path, ino_t inode)
 {
   handle_ctx *ctx = NULL;
+  gint64 now;
+  gchar *fullname;
+  struct stat st;
 
   (void) inode;
   ctx = (handle_ctx *) udata;
@@ -60,8 +65,16 @@ handle_created (void *udata, const char *path, ino_t inode)
   g_assert (ctx->sub != NULL);
   g_assert (ctx->source != NULL);
 
+  now = g_get_monotonic_time ();
   g_file_monitor_source_handle_event (ctx->source, G_FILE_MONITOR_EVENT_CREATED, path,
-                                      NULL, NULL, g_get_monotonic_time ());
+                                      NULL, NULL, now);
+
+  /* Copied from ih_event_callback to report 'CHANGES_DONE_HINT' earlier. */
+  fullname = g_build_filename (ctx->sub->filename, path, NULL);
+  if (stat (fullname, &st) != 0 || !S_ISREG (st.st_mode) || st.st_nlink != 1)
+    g_file_monitor_source_handle_event (ctx->source, G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, path,
+                                        NULL, NULL, now);
+  g_free (fullname);
 }
 
 /**
@@ -84,6 +97,9 @@ handle_deleted (void *udata, const char *path, ino_t inode)
   g_assert (ctx->sub != NULL);
   g_assert (ctx->source != NULL);
 
+  if (!ctx->handle_deleted)
+    return;
+
   g_file_monitor_source_handle_event (ctx->source, G_FILE_MONITOR_EVENT_DELETED, path,
                                       NULL, NULL, g_get_monotonic_time ());
 }
@@ -161,7 +177,7 @@ static const traverse_cbs cbs = {
 
 
 void
-_kh_dir_diff (kqueue_sub *sub)
+_kh_dir_diff (kqueue_sub *sub, gboolean handle_deleted)
 {
   dep_list *was;
   handle_ctx ctx;
@@ -169,6 +185,7 @@ _kh_dir_diff (kqueue_sub *sub)
   memset (&ctx, 0, sizeof (handle_ctx));
   ctx.sub = sub;
   ctx.source = sub->source;
+  ctx.handle_deleted = handle_deleted;
 
   was = sub->deps;
   sub->deps = dl_listing (sub->filename);
diff --git a/gio/kqueue/kqueue-helper.h b/gio/kqueue/kqueue-helper.h
index 38a32a2f9..418b38c08 100644
--- a/gio/kqueue/kqueue-helper.h
+++ b/gio/kqueue/kqueue-helper.h
@@ -28,26 +28,33 @@
 
 #include "dep-list.h"
 
+typedef struct _GKqueueFileMonitor GKqueueFileMonitor;
+
 /**
  * kqueue_sub:
+ * @mon: a pointer to the GKqueueFileMonitor which holds this subscription
  * @filename: a name of the file to monitor
  * @fd: the associated file descriptor (used by kqueue)
  *
- * Represents a subscription on a file or directory.
+ * Represents a subscription on a file or directory. To check whether a
+ * subscription is active, check the fd field. If fd is not -1, it is an
+ * active subscription which can emit events from kqueue.
  */
 typedef struct
 {
-  GLocalFileMonitor   *mon;
+  GKqueueFileMonitor  *mon;
   GFileMonitorSource  *source;
   gchar*    filename;
+  gchar*    basename;
   int       fd;
   dep_list* deps;
   int       is_dir;
 } kqueue_sub;
 
 gboolean _kqsub_start_watching (kqueue_sub *sub);
-void _kh_dir_diff    (kqueue_sub *sub);
+void _kh_dir_diff    (kqueue_sub *sub, gboolean handle_deleted);
 void _km_add_missing (kqueue_sub *sub);
+gboolean _km_scan_missing (kqueue_sub *check_this_sub_only);
 void _km_remove      (kqueue_sub *sub);
 
 #endif /* __KQUEUE_HELPER_H */
diff --git a/gio/kqueue/kqueue-missing.c b/gio/kqueue/kqueue-missing.c
index 93135b962..37af82e5b 100644
--- a/gio/kqueue/kqueue-missing.c
+++ b/gio/kqueue/kqueue-missing.c
@@ -21,16 +21,13 @@
 *******************************************************************************/
 
 #include <glib.h>
+#include "glib-private.h"
 
 #include "kqueue-helper.h"
 
 
 #define SCAN_MISSING_TIME 4 /* 1/4 Hz */
 
-void _kh_file_appeared_cb (kqueue_sub *sub);
-
-static gboolean km_scan_missing (gpointer user_data);
-
 static gboolean km_debug_enabled = FALSE;
 #define KM_W if (km_debug_enabled) g_warning
 
@@ -40,6 +37,12 @@ G_LOCK_DEFINE_STATIC (missing_lock);
 static volatile gboolean scan_missing_running = FALSE;
 
 
+static gboolean
+_km_scan_missing_cb (gpointer user_data)
+{
+  return _km_scan_missing (NULL);
+}
+
 /**
  * _km_add_missing:
  * @sub: a #kqueue_sub
@@ -63,8 +66,12 @@ _km_add_missing (kqueue_sub *sub)
 
   if (!scan_missing_running)
     {
+      GSource *source;
       scan_missing_running = TRUE;
-      g_timeout_add_seconds (SCAN_MISSING_TIME, km_scan_missing, NULL);
+      source = g_timeout_source_new_seconds (SCAN_MISSING_TIME);
+      g_source_set_callback (source, _km_scan_missing_cb, NULL, NULL);
+      g_source_attach (source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
+      g_source_unref (source);
     }
 }
 
@@ -77,10 +84,10 @@ _km_add_missing (kqueue_sub *sub)
  * Signals that a missing file has finally appeared in the filesystem.
  * Emits %G_FILE_MONITOR_EVENT_CREATED.
  **/
-void
+static void
 _kh_file_appeared_cb (kqueue_sub *sub)
 {
-  GFile *child;
+  gint64 now = g_get_monotonic_time ();
 
   g_assert (sub != NULL);
   g_assert (sub->filename);
@@ -88,18 +95,14 @@ _kh_file_appeared_cb (kqueue_sub *sub)
   if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
     return;
 
-  child = g_file_new_for_path (sub->filename);
-
-  g_file_monitor_emit_event (G_FILE_MONITOR (sub->mon),
-                             child,
-                             NULL,
-                             G_FILE_MONITOR_EVENT_CREATED);
-
-  g_object_unref (child);
+  g_file_monitor_source_handle_event (sub->source, G_FILE_MONITOR_EVENT_CREATED,
+                                      sub->basename, NULL, NULL, now);
+  g_file_monitor_source_handle_event (sub->source, G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
+                                      sub->basename, NULL, NULL, now);
 }
 
 /**
- * km_scan_missing:
+ * _km_scan_missing:
  * @user_data: unused
  *
  * The core missing files watching routine.
@@ -110,8 +113,8 @@ _kh_file_appeared_cb (kqueue_sub *sub)
  *
  * Returns: %FALSE if no missing files left, %TRUE otherwise.
  **/
-static gboolean
-km_scan_missing (gpointer user_data)
+gboolean
+_km_scan_missing (kqueue_sub *check_this_sub_only)
 {
   GSList *head;
   GSList *not_missing = NULL;
@@ -128,10 +131,14 @@ km_scan_missing (gpointer user_data)
       g_assert (sub != NULL);
       g_assert (sub->filename != NULL);
 
+      if (check_this_sub_only != NULL && sub != check_this_sub_only)
+        continue;
+
       if (_kqsub_start_watching (sub))
         {
           KM_W ("file %s now exists, starting watching", sub->filename);
-          _kh_file_appeared_cb (sub);
+          if (check_this_sub_only == NULL)
+            _kh_file_appeared_cb (sub);
           not_missing = g_slist_prepend (not_missing, head);
         }
     }
diff --git a/gio/meson.build b/gio/meson.build
index 42f67715d..a6af822b5 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -164,12 +164,6 @@ if host_system != 'windows'
 
 endif
 
-network_args_string = ''
-foreach arg : network_args
-  network_args_string += arg + ' '
-endforeach
-glib_conf.set('NETWORK_LIBS', network_args_string)
-
 gnetworking_h_conf.set('WSPIAPI_INCLUDE', gnetworking_h_wspiapi_include)
 gnetworking_h_conf.set('NAMESER_COMPAT_INCLUDE', gnetworking_h_nameser_compat_include)
 
@@ -240,7 +234,6 @@ subdir('gdbus-2.0/codegen')
 xdp_dbus_generated = custom_target('xdp-dbus',
     input : ['org.freedesktop.portal.Documents.xml',
              'org.freedesktop.portal.OpenURI.xml',
-             'org.freedesktop.portal.NetworkMonitor.xml',
              'org.freedesktop.portal.ProxyResolver.xml'],
     output : ['xdp-dbus.h', 'xdp-dbus.c'],
     depend_files : gdbus_codegen_built_files,
@@ -292,11 +285,6 @@ if host_system == 'windows'
   settings_sources += files('gregistrysettingsbackend.c')
 endif
 
-# FIXME:
-#if OS_COCOA
-#settings_sources += files('gnextstepsettingsbackend.c')
-#endif
-
 application_headers = files(
   'gapplication.h',
   'gapplicationcommandline.h',
@@ -412,19 +400,27 @@ if host_system != 'windows'
   )
 
   if glib_have_cocoa
-    contenttype_sources += files('gosxcontenttype.c')
-    appinfo_sources += files('gosxappinfo.c')
+    settings_sources += files('gnextstepsettingsbackend.m')
+    contenttype_sources += files('gosxcontenttype.m')
+    appinfo_sources += files('gosxappinfo.m')
     if glib_have_os_x_9_or_later
-      unix_sources += files('gcocoanotificationbackend.c')
+      unix_sources += files('gcocoanotificationbackend.m')
     endif
   else
     contenttype_sources += files('gcontenttype.c')
     appinfo_sources += files('gdesktopappinfo.c')
     gio_unix_include_headers += files('gdesktopappinfo.h')
-    subdir('xdgmime')
-    internal_deps += [xdgmime_lib]
+
+    executable('gio-launch-desktop', 'gio-launch-desktop.c',
+      install : true,
+      c_args : gio_c_args,
+      # intl.lib is not compatible with SAFESEH
+      link_args : noseh_link_args)
   endif
 
+  subdir('xdgmime')
+  internal_deps += [xdgmime_lib]
+
   install_headers(gio_unix_include_headers, subdir : 'gio-unix-2.0/gio')
 
   if glib_conf.has('HAVE_NETLINK')
@@ -762,15 +758,11 @@ if host_system == 'windows'
   internal_deps += [ giowin32_lib ]
 endif
 
-# FIXME: FAM support
-#if HAVE_FAM
-#  subdir('fam')
-#endif
-
 if have_bash
   install_data([
     'completion/gapplication',
     'completion/gdbus',
+    'completion/gio',
     'completion/gsettings',
     'completion/gresource'
   ],
@@ -798,6 +790,7 @@ libgio = library('gio-2.0',
                   libgobject_dep, libgmodule_dep, selinux_dep, xattr_dep,
                   platform_deps, network_libs],
   c_args : gio_c_args,
+  objc_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : [noseh_link_args, glib_link_flags],
 )
@@ -857,9 +850,26 @@ else
 endif
 
 # Dependencies used by executables below
+have_libelf = false
 libelf = dependency('libelf', version : '>= 0.8.12', required : false)
 if libelf.found()
+  have_libelf = true
+else
+  # This fallback is necessary on *BSD. elfutils isn't the only libelf
+  # implementation, and *BSD usually includes their own libelf as a system
+  # library which doesn't have a corresponding .pc file.
+  libelf = cc.find_library('elf', required : false)
+  have_libelf = libelf.found()
+  have_libelf = have_libelf and cc.has_function('elf_begin', dependencies : libelf)
+  have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf)
+  have_libelf = have_libelf and cc.has_function('elf_getshdrnum', dependencies : libelf)
+  have_libelf = have_libelf and cc.has_header('libelf.h')
+endif
+
+if have_libelf
   glib_conf.set('HAVE_LIBELF', 1)
+else
+  libelf = []
 endif
 
 gconstructor_as_data_h = custom_target('gconstructor_as_data.h',
@@ -902,7 +912,7 @@ executable('gresource', 'gresource-tool.c',
   link_args : noseh_link_args,
   dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
 
-executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
+gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
   install : true,
   c_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
@@ -943,7 +953,7 @@ executable('gdbus', 'gdbus-tool.c',
   link_args : noseh_link_args,
   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
 
-if host_system != 'windows'
+if host_system != 'windows' and not glib_have_cocoa
   executable('gapplication', 'gapplication-tool.c',
     install : true,
     c_args : gio_c_args,
@@ -960,6 +970,8 @@ if enable_systemtap
     install : true)
 endif
 
+subdir('fam')
+
 if host_system != 'windows'
   subdir('tests')
 endif
diff --git a/gio/org.freedesktop.portal.NetworkMonitor.xml b/gio/org.freedesktop.portal.NetworkMonitor.xml
deleted file mode 100644
index 8d3a471d5..000000000
--- a/gio/org.freedesktop.portal.NetworkMonitor.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (C) 2016 Red Hat, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>.
-
- Author: Matthias Clasen <mclasen@redhat.com>
--->
-<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd" name="/">
-  <interface name="org.freedesktop.portal.NetworkMonitor">
-    <signal name="changed">
-      <arg type="b" name="available"/>
-    </signal>
-    <property name="available" type="b" access="read"/>
-    <property name="metered" type="b" access="read"/>
-    <property name="connectivity" type="u" access="read"/>
-  </interface>
-</node>
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 819799b3f..5bf35888c 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -15,7 +15,9 @@ LDADD = \
 AM_CPPFLAGS = $(gio_INCLUDES) $(GLIB_DEBUG_FLAGS) -I$(top_builddir)/gio -I$(top_srcdir)/gio
 DEFS = -DG_LOG_DOMAIN=\"GLib-GIO\" -DTEST_SERVICES=\""$(abs_top_builddir)/gio/tests/services"\"
 AM_CFLAGS = $(GLIB_WARN_CFLAGS)
-AM_TESTS_ENVIRONMENT += GIO_MODULE_DIR=
+AM_TESTS_ENVIRONMENT += \
+	GIO_MODULE_DIR= \
+	GIO_LAUNCH_DESKTOP="$(top_builddir)/gio/gio-launch-desktop"
 
 # -----------------------------------------------------------------------------
 #  Test programs buildable on all platforms
@@ -47,6 +49,7 @@ test_programs = \
 	memory-input-stream			\
 	memory-output-stream			\
 	monitor					\
+	mount-operation				\
 	network-address				\
 	network-monitor				\
 	network-monitor-race			\
@@ -273,6 +276,7 @@ test_programs += \
 	unix-mounts				\
 	unix-streams				\
 	g-file-info-filesystem-readonly		\
+	trash					\
 	$(NULL)
 
 test_extra_programs += \
@@ -368,12 +372,14 @@ test.mo: de.po
 EXTRA_DIST += de.po
 dist_uninstalled_test_data += \
 	org.gtk.test.gschema.xml.orig		\
+	org.gtk.test.gschema.override.orig	\
 	org.gtk.schemasourcecheck.gschema.xml	\
 	testenum.h				\
 	enums.xml.template
 # Generated while running the testcase itself...
 CLEANFILES += \
 	org.gtk.test.gschema.xml	\
+	org.gtk.test.gschema.override	\
 	org.gtk.test.enums.xml		\
 	gsettings.store			\
 	gschemas.compiled		\
@@ -551,7 +557,8 @@ nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h
 resources_DEPENDENCIES = test.gresource
 
 test_ltlibraries += libresourceplugin.la
-libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c
+libresourceplugin_la_SOURCES = resourceplugin.c
+nodist_libresourceplugin_la_SOURCES = plugin_resources.c
 libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined)
 libresourceplugin_la_LIBADD = $(LDADD)
 
diff --git a/gio/tests/appinfo.c b/gio/tests/appinfo.c
index 2e69da051..a52bc7094 100644
--- a/gio/tests/appinfo.c
+++ b/gio/tests/appinfo.c
@@ -17,7 +17,7 @@ test_launch_for_app_info (GAppInfo *appinfo)
 
   if (g_getenv ("DISPLAY") == NULL || g_getenv ("DISPLAY")[0] == '\0')
     {
-      g_printerr ("No DISPLAY.  Skipping test.  ");
+      g_test_skip ("No DISPLAY set");
       return;
     }
 
@@ -128,10 +128,10 @@ static void
 test_locale (const char *locale)
 {
   GAppInfo *appinfo;
-  const gchar *orig;
+  gchar *orig = NULL;
   const gchar *path;
 
-  orig = setlocale (LC_ALL, NULL);
+  orig = g_strdup (setlocale (LC_ALL, NULL));
   g_setenv ("LANGUAGE", locale, TRUE);
   setlocale (LC_ALL, "");
 
@@ -161,6 +161,7 @@ test_locale (const char *locale)
 
   g_setenv ("LANGUAGE", orig, TRUE);
   setlocale (LC_ALL, "");
+  g_free (orig);
 }
 
 static void
@@ -380,6 +381,7 @@ test_associations (void)
                                                 "cmdline-app-test",
                                                 G_APP_INFO_CREATE_SUPPORTS_URIS,
                                                 NULL);
+  g_free (cmdline);
 
   error = NULL;
   result = g_app_info_set_as_default_for_type (appinfo, "application/x-glib-test", &error);
diff --git a/gio/tests/dbus-appinfo.c b/gio/tests/dbus-appinfo.c
index ee73d5833..8961a5495 100644
--- a/gio/tests/dbus-appinfo.c
+++ b/gio/tests/dbus-appinfo.c
@@ -254,11 +254,14 @@ test_dbus_appinfo (void)
   const gchar *argv[] = { "myapp", NULL };
   TestApplication *app;
   int status;
+  gchar *desktop_file = NULL;
 
-  appinfo = g_desktop_app_info_new_from_filename (g_test_build_filename (G_TEST_DIST,
-                                                                         "org.gtk.test.dbusappinfo.desktop",
-                                                                         NULL));
+  desktop_file = g_test_build_filename (G_TEST_DIST,
+                                        "org.gtk.test.dbusappinfo.desktop",
+                                        NULL);
+  appinfo = g_desktop_app_info_new_from_filename (desktop_file);
   g_assert (appinfo != NULL);
+  g_free (desktop_file);
 
   app = g_object_new (test_application_get_type (),
                       "application-id", "org.gtk.test.dbusappinfo",
diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
index 669db5769..4871d85a5 100644
--- a/gio/tests/desktop-app-info.c
+++ b/gio/tests/desktop-app-info.c
@@ -93,6 +93,8 @@ test_delete (void)
       res = g_app_info_delete (info);
       g_assert (!res);
     }
+
+  g_free (filename);
 }
 
 static void
@@ -115,6 +117,7 @@ test_default (void)
   info = g_app_info_get_default_for_type ("application/x-test", FALSE);
   g_assert (info != NULL);
   g_assert_cmpstr (g_app_info_get_id (info), ==, g_app_info_get_id (info2));
+  g_object_unref (info);
 
   /* now try adding something, but not setting as default */
   g_app_info_add_supports_type (info3, "application/x-test", &error);
@@ -124,6 +127,7 @@ test_default (void)
   info = g_app_info_get_default_for_type ("application/x-test", FALSE);
   g_assert (info != NULL);
   g_assert_cmpstr (g_app_info_get_id (info), ==, g_app_info_get_id (info2));
+  g_object_unref (info);
 
   /* now remove info1 again */
   g_app_info_remove_supports_type (info1, "application/x-test", &error);
@@ -133,6 +137,7 @@ test_default (void)
   info = g_app_info_get_default_for_type ("application/x-test", FALSE);
   g_assert (info != NULL);
   g_assert_cmpstr (g_app_info_get_id (info), ==, g_app_info_get_id (info2));
+  g_object_unref (info);
 
   /* now clean it all up */
   g_app_info_reset_type_associations ("application/x-test");
@@ -146,6 +151,7 @@ test_default (void)
 
   g_object_unref (info1);
   g_object_unref (info2);
+  g_object_unref (info3);
 }
 
 static void
@@ -324,6 +330,8 @@ cleanup_dir_recurse (GFile   *parent,
 
   ret = TRUE;
  out:
+  g_clear_object (&enumerator);
+
   return ret;
 }
 
@@ -342,6 +350,7 @@ cleanup_subdirs (const char *base_dir)
   (void) cleanup_dir_recurse (file, file, &error);
   g_assert_no_error (error);
   g_object_unref (file);
+  g_object_unref (base);
 }
 
 static void
@@ -788,6 +797,46 @@ test_show_in (void)
   assert_shown ("gcr-prompter.desktop", TRUE, "KDE:GNOME-Classic");
 }
 
+/* Test g_desktop_app_info_launch_uris_as_manager() and
+ * g_desktop_app_info_launch_uris_as_manager_with_fds()
+ */
+static void
+test_launch_as_manager (void)
+{
+  GDesktopAppInfo *appinfo;
+  GError *error = NULL;
+  gboolean retval;
+  const gchar *path;
+
+  if (g_getenv ("DISPLAY") == NULL || g_getenv ("DISPLAY")[0] == '\0')
+    {
+      g_test_skip ("No DISPLAY.  Skipping test.");
+      return;
+    }
+
+  path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
+  appinfo = g_desktop_app_info_new_from_filename (path);
+  g_assert_nonnull (appinfo);
+
+  retval = g_desktop_app_info_launch_uris_as_manager (appinfo, NULL, NULL, 0,
+                                                      NULL, NULL,
+                                                      NULL, NULL,
+                                                      &error);
+  g_assert_no_error (error);
+  g_assert_true (retval);
+
+  retval = g_desktop_app_info_launch_uris_as_manager_with_fds (appinfo,
+                                                               NULL, NULL, 0,
+                                                               NULL, NULL,
+                                                               NULL, NULL,
+                                                               -1, -1, -1,
+                                                               &error);
+  g_assert_no_error (error);
+  g_assert_true (retval);
+
+  g_object_unref (appinfo);
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -816,6 +865,7 @@ main (int   argc,
   g_test_add_func ("/desktop-app-info/search", test_search);
   g_test_add_func ("/desktop-app-info/implements", test_implements);
   g_test_add_func ("/desktop-app-info/show-in", test_show_in);
+  g_test_add_func ("/desktop-app-info/launch-as-manager", test_launch_as_manager);
 
   result = g_test_run ();
 
diff --git a/gio/tests/file.c b/gio/tests/file.c
index 04625fd68..d2f147419 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -477,7 +477,15 @@ test_create_delete (gconstpointer d)
    * that the monitor will notice a create immediately followed by a
    * delete, rather than coalescing them into nothing.
    */
-  if (!strcmp (G_OBJECT_TYPE_NAME (data->monitor), "GPollFileMonitor"))
+  /* This test also doesn't work with GKqueueFileMonitor because of
+   * the same reason. Kqueue is able to return a kevent when a file is
+   * created or deleted in a directory. However, the kernel doesn't tell
+   * the program file names, so GKqueueFileMonitor has to calculate the
+   * difference itself. This is usually too slow for rapid file creation
+   * and deletion tests.
+   */
+  if (strcmp (G_OBJECT_TYPE_NAME (data->monitor), "GPollFileMonitor") == 0 ||
+      strcmp (G_OBJECT_TYPE_NAME (data->monitor), "GKqueueFileMonitor") == 0)
     {
       g_test_skip ("skipping test for this GFileMonitor implementation");
       goto skip;
@@ -897,14 +905,21 @@ splice_to_string (GInputStream   *stream,
   return ret;
 }
 
-static guint64
-get_size_from_du (const gchar *path)
+static gboolean
+get_size_from_du (const gchar *path, guint64 *size)
 {
   GSubprocess *du;
+  gboolean ok;
   gchar *result;
   gchar *endptr;
-  guint64 size;
   GError *error = NULL;
+  gchar *du_path = NULL;
+
+  /* If we can’t find du, don’t try and run the test. */
+  du_path = g_find_program_in_path ("du");
+  if (du_path == NULL)
+    return FALSE;
+  g_free (du_path);
 
   du = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE,
                          &error,
@@ -914,12 +929,17 @@ get_size_from_du (const gchar *path)
   result = splice_to_string (g_subprocess_get_stdout_pipe (du), &error);
   g_assert_no_error (error);
 
-  size = g_ascii_strtoll (result, &endptr, 10);
+  *size = g_ascii_strtoll (result, &endptr, 10);
+
+  g_subprocess_wait (du, NULL, &error);
+  g_assert_no_error (error);
+
+  ok = g_subprocess_get_successful (du);
 
   g_object_unref (du);
   g_free (result);
 
-  return size;
+  return ok;
 }
 
 static void
@@ -937,13 +957,9 @@ test_measure (void)
   path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL);
   file = g_file_new_for_path (path);
 
-  if (g_find_program_in_path ("du"))
-    {
-      size = get_size_from_du (path);
-    }
-  else
+  if (!get_size_from_du (path, &size))
     {
-      g_test_message ("du not found, skipping byte measurement");
+      g_test_message ("du not found or fail to run, skipping byte measurement");
       size = 0;
     }
 
@@ -1043,13 +1059,9 @@ test_measure_async (void)
   path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL);
   file = g_file_new_for_path (path);
 
-  if (g_find_program_in_path ("du"))
-    {
-      data->expected_bytes = get_size_from_du (path);
-    }
-  else
+  if (!get_size_from_du (path, &data->expected_bytes))
     {
-      g_test_message ("du not found, skipping byte measurement");
+      g_test_message ("du not found or fail to run, skipping byte measurement");
       data->expected_bytes = 0;
     }
 
diff --git a/gio/tests/g-file-info-filesystem-readonly.c b/gio/tests/g-file-info-filesystem-readonly.c
index c2b0aa518..123dcd8a0 100644
--- a/gio/tests/g-file-info-filesystem-readonly.c
+++ b/gio/tests/g-file-info-filesystem-readonly.c
@@ -45,6 +45,8 @@ test_filesystem_readonly (gconstpointer with_mount_monitor)
     {
       /* We need these because "mount --bind" requires root privileges */
       g_test_skip ("'bindfs' and 'fusermount' commands are needed to run this test");
+      g_free (fusermount);
+      g_free (bindfs);
       return;
     }
 
diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
index 336135cb4..f5491ec9e 100644
--- a/gio/tests/gapplication.c
+++ b/gio/tests/gapplication.c
@@ -972,6 +972,8 @@ test_api (void)
 int
 main (int argc, char **argv)
 {
+  g_setenv ("LC_ALL", "C", TRUE);
+
   g_test_init (&argc, &argv, NULL);
 
   g_test_dbus_unset ();
diff --git a/gio/tests/gdbus-addresses.c b/gio/tests/gdbus-addresses.c
index 2e662d000..0ab05661a 100644
--- a/gio/tests/gdbus-addresses.c
+++ b/gio/tests/gdbus-addresses.c
@@ -39,65 +39,86 @@ test_empty_address (void)
   g_error_free (error);
 }
 
+static void
+assert_is_supported_address (const gchar *address)
+{
+  GError *error = NULL;
+
+  g_assert_true (g_dbus_is_supported_address (address, NULL));
+  g_assert_true (g_dbus_is_supported_address (address, &error));
+  g_assert_no_error (error);
+}
+
+static void
+assert_not_supported_address (const gchar *address)
+{
+  GError *error = NULL;
+
+  g_assert_false (g_dbus_is_supported_address (address, NULL));
+  g_assert_false (g_dbus_is_supported_address (address, &error));
+  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
+  g_clear_error (&error);
+}
+
 #ifdef G_OS_UNIX
 static void
 test_unix_address (void)
 {
-  g_assert (!g_dbus_is_supported_address ("some-imaginary-transport:foo=bar", NULL));
-  g_assert (g_dbus_is_supported_address ("unix:path=/tmp/dbus-test", NULL));
-  g_assert (g_dbus_is_supported_address ("unix:abstract=/tmp/dbus-another-test", NULL));
+  assert_not_supported_address ("some-imaginary-transport:foo=bar");
+  assert_is_supported_address ("unix:path=/tmp/dbus-test");
+  assert_is_supported_address ("unix:abstract=/tmp/dbus-another-test");
   g_assert (g_dbus_is_address ("unix:foo=bar"));
-  g_assert (!g_dbus_is_supported_address ("unix:foo=bar", NULL));
+  assert_not_supported_address ("unix:foo=bar");
   g_assert (!g_dbus_is_address ("unix:path=/foo;abstract=/bar"));
-  g_assert (!g_dbus_is_supported_address ("unix:path=/foo;abstract=/bar", NULL));
-  g_assert (g_dbus_is_supported_address ("unix:path=/tmp/concrete;unix:abstract=/tmp/abstract", NULL));
+  assert_not_supported_address ("unix:path=/foo;abstract=/bar");
+  assert_is_supported_address ("unix:path=/tmp/concrete;unix:abstract=/tmp/abstract");
   g_assert (g_dbus_is_address ("some-imaginary-transport:foo=bar"));
 
   g_assert (g_dbus_is_address ("some-imaginary-transport:foo=bar;unix:path=/this/is/valid"));
-  g_assert (!g_dbus_is_supported_address ("some-imaginary-transport:foo=bar;unix:path=/this/is/valid", NULL));
+  assert_not_supported_address ("some-imaginary-transport:foo=bar;unix:path=/this/is/valid");
 }
 #endif
 
 static void
 test_nonce_tcp_address (void)
 {
-  g_assert (g_dbus_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar", NULL));
-  g_assert (g_dbus_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=ipv6", NULL));
-  g_assert (g_dbus_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=ipv4", NULL));
-
-  g_assert (!g_dbus_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=blah", NULL));
-  g_assert (!g_dbus_is_supported_address ("nonce-tcp:host=localhost,port=420000,noncefile=/foo/bar,family=ipv4", NULL));
-  g_assert (!g_dbus_is_supported_address ("nonce-tcp:host=,port=x42,noncefile=/foo/bar,family=ipv4", NULL));
-  g_assert (!g_dbus_is_supported_address ("nonce-tcp:host=,port=42x,noncefile=/foo/bar,family=ipv4", NULL));
-  g_assert (!g_dbus_is_supported_address ("nonce-tcp:host=,port=420000,noncefile=/foo/bar,family=ipv4", NULL));
+  assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar");
+  assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=ipv6");
+  assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=ipv4");
+
+  assert_not_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=blah");
+  assert_not_supported_address ("nonce-tcp:host=localhost,port=420000,noncefile=/foo/bar,family=ipv4");
+  assert_not_supported_address ("nonce-tcp:host=,port=x42,noncefile=/foo/bar,family=ipv4");
+  assert_not_supported_address ("nonce-tcp:host=,port=42x,noncefile=/foo/bar,family=ipv4");
+  assert_not_supported_address ("nonce-tcp:host=,port=420000,noncefile=/foo/bar,family=ipv4");
 }
 
 static void
 test_tcp_address (void)
 {
-  g_assert (g_dbus_is_supported_address ("tcp:host=localhost", NULL));
-  g_assert (!g_dbus_is_supported_address ("tcp:host=localhost,noncefile=/tmp/foo", NULL));
-  g_assert (g_dbus_is_supported_address ("tcp:host=localhost,port=42", NULL));
-  g_assert (!g_dbus_is_supported_address ("tcp:host=localhost,port=-1", NULL));
-  g_assert (!g_dbus_is_supported_address ("tcp:host=localhost,port=420000", NULL));
-  g_assert (!g_dbus_is_supported_address ("tcp:host=localhost,port=42x", NULL));
-  g_assert (g_dbus_is_supported_address ("tcp:host=localhost,port=42,family=ipv4", NULL));
-  g_assert (g_dbus_is_supported_address ("tcp:host=localhost,port=42,family=ipv6", NULL));
-  g_assert (!g_dbus_is_supported_address ("tcp:host=localhost,port=42,family=sopranos", NULL));
+  assert_is_supported_address ("tcp:host=localhost");
+  assert_not_supported_address ("tcp:host=localhost,noncefile=/tmp/foo");
+  assert_is_supported_address ("tcp:host=localhost,port=42");
+  assert_not_supported_address ("tcp:host=localhost,port=-1");
+  assert_not_supported_address ("tcp:host=localhost,port=420000");
+  assert_not_supported_address ("tcp:host=localhost,port=42x");
+  assert_is_supported_address ("tcp:host=localhost,port=42,family=ipv4");
+  assert_is_supported_address ("tcp:host=localhost,port=42,family=ipv6");
+  assert_not_supported_address ("tcp:host=localhost,port=42,family=sopranos");
 }
 
 static void
 test_autolaunch_address (void)
 {
-  g_assert (g_dbus_is_supported_address ("autolaunch:", NULL));
+  assert_is_supported_address ("autolaunch:");
 }
 
 static void
 test_mixed_address (void)
 {
-  g_assert (g_dbus_is_supported_address ("unix:path=/tmp/dbus1;unix:path=/tmp/dbus2", NULL));
-  g_assert (g_dbus_is_supported_address ("tcp:host=localhost,port=42;autolaunch:", NULL));
-  g_assert (!g_dbus_is_supported_address ("tcp:host=localhost,port=42;tcp:family=bla", NULL));
+  assert_is_supported_address ("unix:path=/tmp/dbus1;unix:path=/tmp/dbus2");
+  assert_is_supported_address ("tcp:host=localhost,port=42;autolaunch:");
+  assert_not_supported_address ("tcp:host=localhost,port=42;tcp:family=bla");
 }
 
 static const struct { const char *before; const char *after; } escaping[] = {
diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c
index 6f0140986..9dbbeb2a4 100644
--- a/gio/tests/gdbus-connection-loss.c
+++ b/gio/tests/gdbus-connection-loss.c
@@ -136,7 +136,10 @@ main (int   argc,
 
   ret = g_test_run();
 
+  session_bus_down ();
+
   g_object_unref (c);
+  g_main_loop_unref (loop);
 
   return ret;
 }
diff --git a/gio/tests/gdbus-example-peer.c b/gio/tests/gdbus-example-peer.c
index b954f7426..179aabb7f 100644
--- a/gio/tests/gdbus-example-peer.c
+++ b/gio/tests/gdbus-example-peer.c
@@ -273,7 +273,8 @@ main (int argc, char *argv[])
                "Negotiated capabilities: unix-fd-passing=%d\n",
                g_dbus_connection_get_capabilities (connection) & G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING);
 
-      greeting = g_strdup_printf ("Hey, it's %" G_GUINT64_FORMAT " already!", (guint64) time (NULL));
+      greeting = g_strdup_printf ("Hey, it's %" G_GINT64_FORMAT " already!",
+                                  g_get_real_time () / G_USEC_PER_SEC);
       value = g_dbus_connection_call_sync (connection,
                                            NULL, /* bus_name */
                                            "/org/gtk/GDBus/TestObject",
diff --git a/gio/tests/gdbus-example-unix-fd-client.c b/gio/tests/gdbus-example-unix-fd-client.c
index cf1330fda..c676bcbb5 100644
--- a/gio/tests/gdbus-example-unix-fd-client.c
+++ b/gio/tests/gdbus-example-unix-fd-client.c
@@ -74,16 +74,14 @@ on_name_appeared (GDBusConnection *connection,
     }
   else
     {
-      gchar now_buf[256];
-      time_t now;
+      gchar *now_buf = NULL;
       gssize len;
       gchar *str;
+      GDateTime *now = g_date_time_new_now_local ();
 
-      now = time (NULL);
-      strftime (now_buf,
-                sizeof now_buf,
-                "%Y-%m-%d %H:%M:%S",
-                localtime (&now));
+      g_assert_nonnull (now);
+      now_buf = g_date_time_format (now, "%Y-%m-%d %H:%M:%S");
+      g_date_time_unref (now);
 
       str = g_strdup_printf ("On %s, gdbus-example-unix-fd-client with pid %d was here!\n",
                              now_buf,
@@ -95,6 +93,7 @@ on_name_appeared (GDBusConnection *connection,
       g_print ("Wrote the following on server's stdout:\n%s", str);
 
       g_free (str);
+      g_free (now_buf);
       exit (0);
     }
 }
diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c
index ef0dddeee..4d6d3a43e 100644
--- a/gio/tests/gdbus-export.c
+++ b/gio/tests/gdbus-export.c
@@ -813,7 +813,7 @@ test_dispatch_thread_func (gpointer user_data)
                                   NULL,
                                   &error);
   g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
-  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Type of message, '(s)', does not match expected type '()'");
+  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Type of message, “(s)�, does not match expected type “()�");
   g_error_free (error);
   g_assert (value == NULL);
 
@@ -826,7 +826,7 @@ test_dispatch_thread_func (gpointer user_data)
                                   NULL,
                                   &error);
   g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD);
-  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such method 'NonExistantMethod'");
+  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such method “NonExistantMethod�");
   g_error_free (error);
   g_assert (value == NULL);
 
@@ -874,7 +874,7 @@ test_dispatch_thread_func (gpointer user_data)
                                   &error);
   g_assert (value == NULL);
   g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
-  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: No such property 'ThisDoesntExist'");
+  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: No such property “ThisDoesntExist�");
   g_error_free (error);
 
   error = NULL;
@@ -889,7 +889,7 @@ test_dispatch_thread_func (gpointer user_data)
                                   &error);
   g_assert (value == NULL);
   g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
-  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property 'NotReadable' is not readable");
+  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property “NotReadable� is not readable");
   g_error_free (error);
 
   error = NULL;
@@ -926,7 +926,7 @@ test_dispatch_thread_func (gpointer user_data)
                                   &error);
   g_assert (value == NULL);
   g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
-  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property 'NotWritable' is not writable");
+  g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property “NotWritable� is not writable");
   g_error_free (error);
 
   error = NULL;
diff --git a/gio/tests/gdbus-peer-object-manager.c b/gio/tests/gdbus-peer-object-manager.c
index 933cc529d..676c9f080 100644
--- a/gio/tests/gdbus-peer-object-manager.c
+++ b/gio/tests/gdbus-peer-object-manager.c
@@ -258,6 +258,8 @@ setup (Test *test,
 
   g_assert (test->server);
   g_assert (test->client);
+
+  g_object_unref (stream);
 }
 
 static void
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index 101c2a8bb..7f35baae6 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -875,6 +875,7 @@ test_peer (void)
                       getuid ());
     g_assert_cmpuint (g_credentials_get_unix_pid (credentials, NULL), ==,
                       getpid ());
+    g_object_unref (credentials);
 #else
     g_assert_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED);
     g_assert (credentials == NULL);
@@ -1358,6 +1359,8 @@ test_nonce_tcp (void)
 
   g_main_loop_quit (service_loop);
   g_thread_join (service_thread);
+
+  g_ptr_array_unref (data.current_connections);
 }
 
 static void
@@ -1711,6 +1714,7 @@ codegen_test_peer (void)
    * change notifications anyway because those are done from an idle handler
    */
   example_animal_call_poke_sync (animal2, TRUE, TRUE, NULL, &error);
+  g_clear_error (&error);
 
   g_object_unref (animal1);
   g_object_unref (animal2);
diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c
index da28f1bc1..d2f0a6ce7 100644
--- a/gio/tests/gdbus-serialization.c
+++ b/gio/tests/gdbus-serialization.c
@@ -1085,6 +1085,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_setenv ("LC_ALL", "C", TRUE);
   setlocale (LC_ALL, "C");
 
   g_test_init (&argc, &argv, NULL);
diff --git a/gio/tests/gdbus-unix-addresses.c b/gio/tests/gdbus-unix-addresses.c
index 8b58513a8..746a7c2a7 100644
--- a/gio/tests/gdbus-unix-addresses.c
+++ b/gio/tests/gdbus-unix-addresses.c
@@ -106,7 +106,6 @@ set_up_mock_dbus_launch (void)
 {
   path = g_strconcat (g_test_get_dir (G_TEST_BUILT), ":",
       g_getenv ("PATH"), NULL);
-  g_debug ("PATH=%s", path);
   g_setenv ("PATH", path, TRUE);
 
   /* libdbus won't even try X11 autolaunch if DISPLAY is unset; GDBus
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 2f056ee95..2d18d4dd2 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -741,15 +741,18 @@ test_l10n (void)
 
   settings = g_settings_new ("org.gtk.test.localized");
 
+  g_setenv ("LC_MESSAGES", "C", TRUE);
   setlocale (LC_MESSAGES, "C");
   str = g_settings_get_string (settings, "error-message");
+  g_setenv ("LC_MESSAGES", locale, TRUE);
   setlocale (LC_MESSAGES, locale);
 
   g_assert_cmpstr (str, ==, "Unnamed");
   g_free (str);
   str = NULL;
 
-  setlocale (LC_MESSAGES, "de_DE");
+  g_setenv ("LC_MESSAGES", "de_DE.UTF-8", TRUE);
+  setlocale (LC_MESSAGES, "de_DE.UTF-8");
   /* Only do the test if translation is actually working... */
   if (g_str_equal (dgettext ("test", "\"Unnamed\""), "\"Unbenannt\""))
     {
@@ -762,6 +765,7 @@ test_l10n (void)
   else
     g_printerr ("warning: translation is not working... skipping test. ");
 
+  g_setenv ("LC_MESSAGES", locale, TRUE);
   setlocale (LC_MESSAGES, locale);
   g_free (locale);
   g_object_unref (settings);
@@ -788,15 +792,18 @@ test_l10n_context (void)
 
   settings = g_settings_new ("org.gtk.test.localized");
 
+  g_setenv ("LC_MESSAGES", "C", TRUE);
   setlocale (LC_MESSAGES, "C");
   g_settings_get (settings, "backspace", "s", &str);
+  g_setenv ("LC_MESSAGES", locale, TRUE);
   setlocale (LC_MESSAGES, locale);
 
   g_assert_cmpstr (str, ==, "BackSpace");
   g_free (str);
   str = NULL;
 
-  setlocale (LC_MESSAGES, "de_DE");
+  g_setenv ("LC_MESSAGES", "de_DE.UTF-8", TRUE);
+  setlocale (LC_MESSAGES, "de_DE.UTF-8");
   /* Only do the test if translation is actually working... */
   if (g_str_equal (dgettext ("test", "\"Unnamed\""), "\"Unbenannt\""))
     {
@@ -809,6 +816,7 @@ test_l10n_context (void)
   else
     g_printerr ("warning: translation is not working... skipping test.  ");
 
+  g_setenv ("LC_MESSAGES", locale, TRUE);
   setlocale (LC_MESSAGES, locale);
   g_free (locale);
   g_object_unref (settings);
@@ -2238,6 +2246,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
                             "org.gtk.test.range.direct",
                             "org.gtk.test.mapped",
                             "org.gtk.test.descriptions",
+                            "org.gtk.test.per-desktop",
                             NULL));
 }
 
@@ -2629,6 +2638,100 @@ test_default_value (void)
   g_object_unref (settings);
 }
 
+static gboolean
+string_map_func (GVariant *value,
+                 gpointer *result,
+                 gpointer  user_data)
+{
+  const gchar *str;
+
+  str = g_variant_get_string (value, NULL);
+  *result = g_variant_new_string (str);
+
+  return TRUE;
+}
+
+/* Test that per-desktop values from org.gtk.test.gschema.override
+ * does not change default value if current desktop is not listed in
+ * $XDG_CURRENT_DESKTOP.
+ */
+static void
+test_per_desktop (void)
+{
+  GSettings *settings;
+  TestObject *obj;
+  gpointer p;
+  gchar *str;
+
+  settings = g_settings_new ("org.gtk.test.per-desktop");
+  obj = test_object_new ();
+
+  if (!g_test_subprocess ())
+    {
+      g_test_trap_subprocess ("/gsettings/per-desktop/subprocess", 0, 0);
+      g_test_trap_assert_passed ();
+    }
+
+  str = g_settings_get_string (settings, "desktop");
+  g_assert_cmpstr (str, ==, "GNOME");
+  g_free (str);
+
+  p = g_settings_get_mapped (settings, "desktop", string_map_func, NULL);
+
+  str = g_variant_dup_string (p, NULL);
+  g_assert_cmpstr (str, ==, "GNOME");
+  g_free (str);
+
+  g_variant_unref (p);
+
+  g_settings_bind (settings, "desktop", obj, "string", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_get (obj, "string", &str, NULL);
+  g_assert_cmpstr (str, ==, "GNOME");
+  g_free (str);
+
+  g_object_unref (settings);
+  g_object_unref (obj);
+}
+
+/* Test that per-desktop values from org.gtk.test.gschema.override
+ * are successfully loaded based on the value of $XDG_CURRENT_DESKTOP.
+ */
+static void
+test_per_desktop_subprocess (void)
+{
+  GSettings *settings;
+  TestObject *obj;
+  gpointer p;
+  gchar *str;
+
+  g_setenv ("XDG_CURRENT_DESKTOP", "GNOME-Classic:GNOME", TRUE);
+
+  settings = g_settings_new ("org.gtk.test.per-desktop");
+  obj = test_object_new ();
+
+  str = g_settings_get_string (settings, "desktop");
+  g_assert_cmpstr (str, ==, "GNOME Classic");
+  g_free (str);
+
+  p = g_settings_get_mapped (settings, "desktop", string_map_func, NULL);
+
+  str = g_variant_dup_string (p, NULL);
+  g_assert_cmpstr (str, ==, "GNOME Classic");
+  g_free (str);
+
+  g_variant_unref (p);
+
+  g_settings_bind (settings, "desktop", obj, "string", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_get (obj, "string", &str, NULL);
+  g_assert_cmpstr (str, ==, "GNOME Classic");
+  g_free (str);
+
+  g_object_unref (settings);
+  g_object_unref (obj);
+}
+
 static void
 test_extended_schema (void)
 {
@@ -2649,6 +2752,7 @@ int
 main (int argc, char *argv[])
 {
   gchar *schema_text;
+  gchar *override_text;
   gchar *enums;
   gint result;
 
@@ -2671,6 +2775,7 @@ main (int argc, char *argv[])
       g_setenv ("XDG_DATA_DIRS", ".", TRUE);
       g_setenv ("XDG_DATA_HOME", ".", TRUE);
       g_setenv ("GSETTINGS_SCHEMA_DIR", ".", TRUE);
+      g_setenv ("XDG_CURRENT_DESKTOP", "", TRUE);
 
       if (!backend_set)
         g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
@@ -2693,6 +2798,10 @@ main (int argc, char *argv[])
       g_assert (g_file_set_contents ("org.gtk.test.gschema.xml", schema_text, -1, NULL));
       g_free (schema_text);
 
+      g_assert (g_file_get_contents (SRCDIR "/org.gtk.test.gschema.override.orig", &override_text, NULL, NULL));
+      g_assert (g_file_set_contents ("org.gtk.test.gschema.override", override_text, -1, NULL));
+      g_free (override_text);
+
 /* Meson build defines this, autotools build does not */
 #ifndef GLIB_COMPILE_SCHEMAS
 #define GLIB_COMPILE_SCHEMAS "../glib-compile-schemas"
@@ -2701,7 +2810,8 @@ main (int argc, char *argv[])
       g_remove ("gschemas.compiled");
       g_assert (g_spawn_command_line_sync (GLIB_COMPILE_SCHEMAS " --targetdir=. "
                                            "--schema-file=org.gtk.test.enums.xml "
-                                           "--schema-file=org.gtk.test.gschema.xml",
+                                           "--schema-file=org.gtk.test.gschema.xml "
+                                           "--override-file=org.gtk.test.gschema.override",
                                            NULL, NULL, &result, NULL));
       g_assert (result == 0);
 
@@ -2782,6 +2892,8 @@ main (int argc, char *argv[])
   g_test_add_func ("/gsettings/read-descriptions", test_read_descriptions);
   g_test_add_func ("/gsettings/test-extended-schema", test_extended_schema);
   g_test_add_func ("/gsettings/default-value", test_default_value);
+  g_test_add_func ("/gsettings/per-desktop", test_per_desktop);
+  g_test_add_func ("/gsettings/per-desktop/subprocess", test_per_desktop_subprocess);
 
   result = g_test_run ();
 
diff --git a/gio/tests/live-g-file.c b/gio/tests/live-g-file.c
index ba9d8d230..240fa8b25 100644
--- a/gio/tests/live-g-file.c
+++ b/gio/tests/live-g-file.c
@@ -417,6 +417,15 @@ test_attributes (struct StructureItem item, GFileInfo * info)
 					   G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN);
       g_assert_cmpint (is_hidden, ==, TRUE);
     }
+
+  /* unix::is-mountpoint */
+  if (posix_compat)
+    {
+      gboolean is_mountpoint =
+        g_file_info_get_attribute_boolean (info,
+                                      G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT);
+      g_assert_false (is_mountpoint);
+    }
 }
 
 static void
@@ -853,6 +862,33 @@ test_copy_move (gconstpointer test_data)
   g_object_unref (root);
 }
 
+/* Test that G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT is TRUE for / and for another
+ * known mountpoint. The FALSE case is tested for many directories and files by
+ * test_initial_structure(), via test_attributes().
+ */
+static void
+test_unix_is_mountpoint (gconstpointer data)
+{
+  const gchar *path = data;
+  GFile *file = g_file_new_for_path (path);
+  GFileInfo *info;
+  gboolean is_mountpoint;
+  GError *error = NULL;
+
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT,
+                            G_FILE_QUERY_INFO_NONE, NULL, &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (info);
+
+  is_mountpoint =
+    g_file_info_get_attribute_boolean (info,
+                                       G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT);
+  g_assert_true (is_mountpoint);
+
+  g_clear_object (&info);
+  g_clear_object (&file);
+}
+
 static void
 test_create (gconstpointer test_data)
 {
@@ -1342,6 +1378,18 @@ main (int argc, char *argv[])
   if (!only_create_struct)
     g_test_add_data_func ("/live-g-file/test_open", target_path, test_open);
 
+  if (posix_compat)
+    {
+      g_test_add_data_func ("/live-g-file/test_unix_is_mountpoint/sysroot",
+                            "/",
+                            test_unix_is_mountpoint);
+#ifdef __linux__
+      g_test_add_data_func ("/live-g-file/test_unix_is_mountpoint/proc",
+                            "/proc",
+                            test_unix_is_mountpoint);
+#endif
+    }
+
   /*  Write test - create  */
   if (write_test && (!only_create_struct))
     g_test_add_data_func ("/live-g-file/test_create", target_path,
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 96229bd8b..85d31d622 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -43,6 +43,7 @@ gio_tests = [
   'memory-input-stream',
   'memory-output-stream',
   'monitor',
+  'mount-operation',
   'network-address',
   'network-monitor',
   'network-monitor-race',
@@ -63,6 +64,14 @@ gio_tests = [
   'glistmodel',
   'testfilemonitor',
   'thumbnail-verification',
+  'tls-certificate',
+  'tls-interaction',
+]
+slow_tests = [
+  'actions',
+  'gdbus-export',
+  'gdbus-threading',
+  'testfilemonitor',
 ]
 
 test_extra_programs = [
@@ -70,11 +79,11 @@ test_extra_programs = [
   ['gdbus-testserver'],
 ]
 
-test_env = [
-  'G_TEST_SRCDIR=' + meson.current_source_dir(),
-  'G_TEST_BUILDDIR=' + meson.current_build_dir(),
-  'GIO_MODULE_DIR=',
-]
+test_env = environment()
+test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+test_env.set('GIO_MODULE_DIR', '')
+test_env.set('GIO_LAUNCH_DESKTOP', meson.build_root() + '/gio/gio-launch-desktop')
 
 test_c_args = [
   '-DG_LOG_DOMAIN="GLib-GIO"',
@@ -106,7 +115,7 @@ if dbus1_dep.found()
       install : false,
       c_args : test_c_args,
       dependencies : common_gio_tests_deps + [dbus1_dep])
-  test('gdbus-serialization', exe, env : test_env)
+  test('gdbus-serialization', exe, env : test_env, suite : ['gio'])
 endif
 
 #  Test programs buildable on UNIX only
@@ -123,6 +132,7 @@ if host_machine.system() != 'windows'
     'unix-streams',
     'g-file-info-filesystem-readonly',
     'gschema-compile',
+    'trash',
   ]
 
   # Uninstalled because of the check-for-executable logic in DesktopAppInfo
@@ -194,7 +204,7 @@ if host_machine.system() != 'windows'
     ]
 
     if not glib_have_cocoa
-      gio_dbus_tests = [['dbus-appinfo', [], []]]
+      gio_dbus_tests += [['dbus-appinfo', [], []]]
     endif
 
     # separate loop because extra source files for each test
@@ -207,7 +217,12 @@ if host_machine.system() != 'windows'
           install : false,
           c_args : test_c_args,
           dependencies : common_gio_tests_deps + extra_deps)
-      test(test_name, exe, env : test_env)
+      # These tests may take more than 30 seconds to run on the CI infrastructure
+      if slow_tests.contains(test_name)
+        test(test_name, exe, env : test_env, timeout : 120, suite : ['gio', 'slow'])
+      else
+        test(test_name, exe, env : test_env, suite : ['gio'])
+      endif
     endforeach
 
     exe = executable('gdbus-test-codegen-old', 'gdbus-test-codegen.c',
@@ -215,7 +230,7 @@ if host_machine.system() != 'windows'
           install : false,
           c_args : test_c_args + ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36'],
           dependencies : common_gio_tests_deps)
-    test('gdbus-test-codegen-old', exe, env : test_env)
+    test('gdbus-test-codegen-old', exe, env : test_env, suite : ['gio'])
 
     # There is already a gapplication exe target in gio so need to use a
     # different name for the unit test executable, since we can't have two
@@ -228,7 +243,7 @@ if host_machine.system() != 'windows'
                        c_args : test_c_args,
                        dependencies : common_gio_tests_deps)
     endif
-    test('gapplication', exe, env : test_env)
+    test('gapplication', exe, env : test_env, suite : ['gio'])
 
     gio_tests += ['gdbus-unix-addresses']
   endif # have_dbus_daemon
@@ -244,14 +259,14 @@ if host_machine.system() != 'windows'
       install : false,
       c_args : test_c_args,
       dependencies : common_gio_tests_deps)
-  test('gdbus-connection-flush', exe, env : test_env)
+  test('gdbus-connection-flush', exe, env : test_env, suite : ['gio'])
 
   exe = executable('gdbus-non-socket', 'gdbus-non-socket.c',
       'gdbus-tests.c', 'test-io-stream.c', 'test-pipe-unix.c',
       install : false,
       c_args : test_c_args,
       dependencies : common_gio_tests_deps)
-  test('gdbus-non-socket', exe, env : test_env)
+  test('gdbus-non-socket', exe, env : test_env, suite : ['gio'])
 
   # Generate test.mo from de.po using msgfmt
   msgfmt = find_program('msgfmt', required : false)
@@ -265,7 +280,7 @@ if host_machine.system() != 'windows'
                    '-DTEST_LOCALE_PATH="@0@"'.format(test_mo_dir),
                  ],
         dependencies : common_gio_tests_deps)
-    test('gsettings', exe, env : test_env)
+    test('gsettings', exe, env : test_env, suite : ['gio'])
   endif
 endif # unix
 
@@ -290,15 +305,18 @@ foreach test_name : gio_tests
     # This is peer to peer so it doesn't need a session bus, so we can run
     # it automatically as a test by default
     extra_deps = [libgdbus_example_objectmanager_dep]
+  elif test_name == 'tls-certificate' or test_name == 'tls-interaction'
+    srcs += ['gtesttlsbackend.c']
   endif
   exe = executable(test_name, srcs,
       install : false,
       c_args : test_c_args,
       dependencies : common_gio_tests_deps + extra_deps)
-  if test_name == 'testfilemonitor'
-    test(test_name, exe, env : test_env, timeout : 45)
+  # These tests may take more than 30 seconds to run on the CI infrastructure
+  if slow_tests.contains(test_name)
+    test(test_name, exe, env : test_env, timeout : 120, suite : ['gio', 'slow'])
   else
-    test(test_name, exe, env : test_env)
+    test(test_name, exe, env : test_env, suite : ['gio'])
   endif
 endforeach
 
@@ -329,8 +347,6 @@ uninstalled_test_extra_programs = [
   ['send-data'],
   ['socket-server'],
   ['socket-client', ['gtlsconsoleinteraction.c']],
-  ['tls-certificate', ['gtesttlsbackend.c']],
-  ['tls-interaction', ['gtesttlsbackend.c']],
   # These three are manual-run tests because they need a session bus but don't bring one up themselves
   # FIXME: these build but don't seem to work!
   ['gdbus-example-objectmanager-client', [], [libgdbus_example_objectmanager_dep]],
@@ -375,7 +391,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
     resource_plugin_platform_link_args = []
   endif
   shared_module ('resourceplugin', 'resourceplugin.c', plugin_resources_c,
-    link_args : ['-export-dynamic'] + resource_plugin_platform_link_args,
+    link_args : export_dynamic_ldflags + resource_plugin_platform_link_args,
     dependencies : common_gio_tests_deps)
 
   test_gresource = custom_target('test.gresource',
@@ -422,7 +438,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
   # referenced by test.gresource.xml
   test_generated_txt = configure_file(input : 'test1.txt',
     output : 'test-generated.txt',
-    configuration : configuration_data(),
+    copy : true,
     install : false)
 
   exe = executable('resources', 'resources.c', test_gresource,
@@ -430,7 +446,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
       install : false,
       c_args : test_c_args,
       dependencies : common_gio_tests_deps)
-  test('resources', exe, env : test_env)
+  test('resources', exe, env : test_env, suite : ['gio'])
 endif
 
 # FIXME: subdir('services')
diff --git a/gio/tests/monitor.c b/gio/tests/monitor.c
index 69eae346b..4d64fa826 100644
--- a/gio/tests/monitor.c
+++ b/gio/tests/monitor.c
@@ -84,6 +84,19 @@ delete_file_idle (gpointer data)
   return G_SOURCE_REMOVE;
 }
 
+static gboolean
+stop_loop_idle (gpointer data)
+{
+  MonitorData *d = data;
+
+  g_assert (d->state == 6);
+
+  if (d->loop)
+    g_main_loop_quit (d->loop);
+
+  return G_SOURCE_REMOVE;
+}
+
 static void
 changed_cb (GFileMonitor      *monitor,
             GFile             *file,
@@ -112,8 +125,7 @@ changed_cb (GFileMonitor      *monitor,
     case 5:
       g_assert (event == G_FILE_MONITOR_EVENT_DELETED);
       d->state = 6;
-      if (d->loop)
-        g_main_loop_quit (d->loop);
+      g_idle_add (stop_loop_idle, data);
       break;
     default:
       g_assert_not_reached ();
diff --git a/gio/tests/mount-operation.c b/gio/tests/mount-operation.c
new file mode 100644
index 000000000..0f8566ac7
--- /dev/null
+++ b/gio/tests/mount-operation.c
@@ -0,0 +1,132 @@
+/* GLib testing framework examples and tests
+ *
+ * Copyright © 2018 Endless Mobile, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Philip Withnall <withnall@endlessm.com>
+ */
+
+#include <gio/gio.h>
+#include <locale.h>
+
+
+/* Smoketest for construction of a #GMountOperation. */
+static void
+test_construction (void)
+{
+  GMountOperation *op = NULL;
+
+  op = g_mount_operation_new ();
+  g_assert_nonnull (op);
+  g_assert_true (G_IS_MOUNT_OPERATION (op));
+  g_object_unref (op);
+}
+
+/* Test the property getters and setters on #GMountOperation work correctly. */
+static void
+test_properties (void)
+{
+  GMountOperation *op = NULL;
+  gchar *username = NULL;
+  gchar *password = NULL;
+  gboolean anonymous;
+  gchar *domain = NULL;
+  GPasswordSave password_save;
+  int choice;
+  gboolean hidden_volume;
+  gboolean system_volume;
+  guint pim;
+
+  op = g_mount_operation_new ();
+
+  g_object_get (op,
+                "username", &username,
+                "password", &password,
+                "anonymous", &anonymous,
+                "domain", &domain,
+                "password-save", &password_save,
+                "choice", &choice,
+                "is-tcrypt-hidden-volume", &hidden_volume,
+                "is-tcrypt-system-volume", &system_volume,
+                "pim", &pim,
+                NULL);
+
+  g_assert_cmpstr (username, ==, g_mount_operation_get_username (op));
+  g_assert_cmpstr (password, ==, g_mount_operation_get_password (op));
+  g_assert_cmpint (anonymous, ==, g_mount_operation_get_anonymous (op));
+  g_assert_cmpstr (domain, ==, g_mount_operation_get_domain (op));
+  g_assert_cmpint (password_save, ==, g_mount_operation_get_password_save (op));
+  g_assert_cmpint (choice, ==, g_mount_operation_get_choice (op));
+  g_assert_cmpint (hidden_volume, ==, g_mount_operation_get_is_tcrypt_hidden_volume (op));
+  g_assert_cmpint (system_volume, ==, g_mount_operation_get_is_tcrypt_system_volume (op));
+  g_assert_cmpuint (pim, ==, g_mount_operation_get_pim (op));
+
+  g_mount_operation_set_username (op, "username");
+  g_assert_cmpstr (g_mount_operation_get_username (op), ==, "username");
+
+  g_mount_operation_set_password (op, "password");
+  g_assert_cmpstr (g_mount_operation_get_password (op), ==, "password");
+
+  g_mount_operation_set_anonymous (op, !anonymous);
+  g_assert_cmpint (g_mount_operation_get_anonymous (op), ==, !anonymous);
+
+  g_mount_operation_set_domain (op, "domain");
+  g_assert_cmpstr (g_mount_operation_get_domain (op), ==, "domain");
+
+  g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_NEVER);
+  g_assert_cmpint (g_mount_operation_get_password_save (op), ==, G_PASSWORD_SAVE_NEVER);
+
+  g_mount_operation_set_choice (op, 5);
+  g_assert_cmpint (g_mount_operation_get_choice (op), ==, 5);
+
+  g_mount_operation_set_is_tcrypt_hidden_volume (op, !hidden_volume);
+  g_assert_cmpint (g_mount_operation_get_is_tcrypt_hidden_volume (op), ==, !hidden_volume);
+
+  g_mount_operation_set_is_tcrypt_system_volume (op, !system_volume);
+  g_assert_cmpint (g_mount_operation_get_is_tcrypt_system_volume (op), ==, !system_volume);
+
+  g_mount_operation_set_pim (op, 5);
+  g_assert_cmpuint (g_mount_operation_get_pim (op), ==, 5);
+
+  g_object_set (op,
+                "username", "other-username",
+                "password", "other-password",
+                "anonymous", FALSE,
+                "domain", "other-domain",
+                "password-save", G_PASSWORD_SAVE_PERMANENTLY,
+                "choice", 4,
+                "is-tcrypt-hidden-volume", FALSE,
+                "is-tcrypt-system-volume", FALSE,
+                "pim", 4,
+                NULL);
+
+  g_free (domain);
+  g_free (password);
+  g_free (username);
+  g_object_unref (op);
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  setlocale (LC_ALL, "");
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/mount-operation/construction", test_construction);
+  g_test_add_func ("/mount-operation/properties", test_properties);
+
+  return g_test_run ();
+}
diff --git a/gio/tests/org.gtk.test.gschema.override.orig b/gio/tests/org.gtk.test.gschema.override.orig
new file mode 100644
index 000000000..6694baace
--- /dev/null
+++ b/gio/tests/org.gtk.test.gschema.override.orig
@@ -0,0 +1,2 @@
+[org.gtk.test.per-desktop:GNOME-Classic]
+desktop = "GNOME Classic"
diff --git a/gio/tests/org.gtk.test.gschema.xml.orig b/gio/tests/org.gtk.test.gschema.xml.orig
index 3c9d7b779..aad4e54df 100644
--- a/gio/tests/org.gtk.test.gschema.xml.orig
+++ b/gio/tests/org.gtk.test.gschema.xml.orig
@@ -213,4 +213,10 @@
     </key>
   </schema>
 
+  <schema id="org.gtk.test.per-desktop" path="/tests/per-desktop/">
+    <key name="desktop" type="s">
+      <default>"GNOME"</default>
+    </key>
+  </schema>
+
 </schemalist>
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index 8163aa141..6ae8e7d64 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -32,14 +32,24 @@ test_resource (GResource *resource)
   char **children;
   GInputStream *in;
   char buffer[128];
+  const gchar *not_found_paths[] =
+    {
+      "/not/there",
+      "/",
+      "",
+    };
+  gsize i;
 
-  found = g_resource_get_info (resource,
-			       "/not/there",
-			       G_RESOURCE_LOOKUP_FLAGS_NONE,
-			       &size, &flags, &error);
-  g_assert (!found);
-  g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
-  g_clear_error (&error);
+  for (i = 0; i < G_N_ELEMENTS (not_found_paths); i++)
+    {
+      found = g_resource_get_info (resource,
+                                   not_found_paths[i],
+                                   G_RESOURCE_LOOKUP_FLAGS_NONE,
+                                   &size, &flags, &error);
+      g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
+      g_clear_error (&error);
+      g_assert_false (found);
+    }
 
   found = g_resource_get_info (resource,
 			       "/test1.txt",
@@ -68,6 +78,17 @@ test_resource (GResource *resource)
   g_assert_cmpint (size, ==, 6);
   g_assert_cmpuint (flags, ==, 0);
 
+  for (i = 0; i < G_N_ELEMENTS (not_found_paths); i++)
+    {
+      data = g_resource_lookup_data (resource,
+                                     not_found_paths[i],
+                                     G_RESOURCE_LOOKUP_FLAGS_NONE,
+                                     &error);
+      g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
+      g_clear_error (&error);
+      g_assert_null (data);
+    }
+
   data = g_resource_lookup_data (resource,
 				 "/test1.txt",
 				 G_RESOURCE_LOOKUP_FLAGS_NONE,
@@ -76,6 +97,17 @@ test_resource (GResource *resource)
   g_assert_no_error (error);
   g_bytes_unref (data);
 
+  for (i = 0; i < G_N_ELEMENTS (not_found_paths); i++)
+    {
+      in = g_resource_open_stream (resource,
+                                   not_found_paths[i],
+                                   G_RESOURCE_LOOKUP_FLAGS_NONE,
+                                   &error);
+      g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
+      g_clear_error (&error);
+      g_assert_null (in);
+    }
+
   in = g_resource_open_stream (resource,
 			       "/test1.txt",
 			       G_RESOURCE_LOOKUP_FLAGS_NONE,
@@ -118,13 +150,19 @@ test_resource (GResource *resource)
   g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n");
   g_bytes_unref (data);
 
-  children = g_resource_enumerate_children  (resource,
-					     "/not/here",
-					     G_RESOURCE_LOOKUP_FLAGS_NONE,
-					     &error);
-  g_assert (children == NULL);
-  g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
-  g_clear_error (&error);
+  for (i = 0; i < G_N_ELEMENTS (not_found_paths); i++)
+    {
+      if (g_str_equal (not_found_paths[i], "/"))
+        continue;
+
+      children = g_resource_enumerate_children (resource,
+                                                not_found_paths[i],
+                                                G_RESOURCE_LOOKUP_FLAGS_NONE,
+                                                &error);
+      g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
+      g_clear_error (&error);
+      g_assert_null (children);
+    }
 
   children = g_resource_enumerate_children  (resource,
 					     "/a_prefix",
@@ -547,7 +585,8 @@ test_uri_query_info (void)
   GBytes *data;
   GFile *file;
   GFileInfo *info;
-  const char *content_type, *mime_type;
+  const char *content_type;
+  gchar *mime_type = NULL;
   const char *fs_type;
   gboolean readonly;
 
@@ -573,6 +612,7 @@ test_uri_query_info (void)
   mime_type = g_content_type_get_mime_type (content_type);
   g_assert (mime_type);
   g_assert_cmpstr (mime_type, ==, "text/plain");
+  g_free (mime_type);
 
   g_object_unref (info);
 
diff --git a/gio/tests/simple-proxy.c b/gio/tests/simple-proxy.c
index f1eb6af9b..ffc16eddd 100644
--- a/gio/tests/simple-proxy.c
+++ b/gio/tests/simple-proxy.c
@@ -77,6 +77,7 @@ test_uris (void)
   g_assert_cmpstr (error->message, ==, str);
   g_clear_error (&error);
   g_assert_null (proxies);
+  g_object_unref (result);
 
   g_object_unref (resolver);
   g_free (str);
diff --git a/gio/tests/task.c b/gio/tests/task.c
index 08d78e5ef..934262e40 100644
--- a/gio/tests/task.c
+++ b/gio/tests/task.c
@@ -1902,6 +1902,7 @@ legacy_error_callback (GObject      *object,
 
       g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED);
       *result_out = -2;
+      g_clear_error (&error);
     }
   else
     {
diff --git a/gio/tests/testfilemonitor.c b/gio/tests/testfilemonitor.c
index 6ef5d38f5..0fa72d3d9 100644
--- a/gio/tests/testfilemonitor.c
+++ b/gio/tests/testfilemonitor.c
@@ -9,12 +9,25 @@
  * the tests, e.g. the length of timeouts
  */
 
+typedef enum {
+  NONE      = 0,
+  INOTIFY   = (1 << 1),
+  KQUEUE    = (1 << 2)
+} Environment;
+
 typedef struct
 {
   gint event_type;
   gchar *file;
   gchar *other_file;
   gint step;
+
+  /* Since different file monitor implementation has different capabilities,
+   * we cannot expect all implementations to report all kind of events without
+   * any loss. This 'optional' field is a bit mask used to mark events which
+   * may be lost under specific platforms.
+   */
+  Environment optional;
 } RecordedEvent;
 
 static void
@@ -68,41 +81,158 @@ output_events (GList *list)
 /* a placeholder for temp file names we don't want to compare */
 static const gchar DONT_CARE[] = "";
 
-static void
-check_expected_event (gint           i,
-                      RecordedEvent *e1,
-                      RecordedEvent *e2)
+static Environment
+get_environment (GFileMonitor *monitor)
 {
-  g_assert_cmpint (e1->step, ==, e2->step);
-  if (e1->step < 0)
-    return;
-
-  g_assert_cmpint (e1->event_type, ==, e2->event_type);
-
-  if (e1->file != DONT_CARE)
-    g_assert_cmpstr (e1->file, ==, e2->file);
-
-  if (e1->other_file != DONT_CARE)
-    g_assert_cmpstr (e1->other_file, ==, e2->other_file);
+  if (g_str_equal (G_OBJECT_TYPE_NAME (monitor), "GInotifyFileMonitor"))
+    return INOTIFY;
+  if (g_str_equal (G_OBJECT_TYPE_NAME (monitor), "GKqueueFileMonitor"))
+    return KQUEUE;
+  return NONE;
 }
 
 static void
 check_expected_events (RecordedEvent *expected,
                        gsize          n_expected,
-                       GList         *recorded)
+                       GList         *recorded,
+                       Environment    env)
 {
-  gint i;
+  gint i, li;
   GList *l;
 
-  g_assert_cmpint (n_expected, ==, g_list_length (recorded));
-
-  for (i = 0, l = recorded; i < n_expected; i++, l = l->next)
+  for (i = 0, li = 0, l = recorded; i < n_expected && l != NULL;)
     {
       RecordedEvent *e1 = &expected[i];
-      RecordedEvent *e2 = (RecordedEvent *)l->data;
+      RecordedEvent *e2 = l->data;
+      gboolean mismatch = TRUE;
+      gboolean l_extra_step = FALSE;
 
-      check_expected_event (i, e1, e2);
+      do
+        {
+          gboolean ignore_other_file = FALSE;
+
+          if (e1->step != e2->step)
+            break;
+
+          /* Kqueue isn't good at detecting file renaming, so
+           * G_FILE_MONITOR_WATCH_MOVES is mostly useless there.  */
+          if (e1->event_type != e2->event_type && env & KQUEUE)
+            {
+              /* It is possible for kqueue file monitor to emit 'RENAMED' event,
+               * but most of the time it is reported as a 'DELETED' event and
+               * a 'CREATED' event. */
+              if (e1->event_type == G_FILE_MONITOR_EVENT_RENAMED)
+                {
+                  RecordedEvent *e2_next;
+
+                  if (l->next == NULL)
+                    break;
+                  e2_next = l->next->data;
+
+                  if (e2->event_type != G_FILE_MONITOR_EVENT_DELETED)
+                    break;
+                  if (e2_next->event_type != G_FILE_MONITOR_EVENT_CREATED)
+                    break;
+
+                  if (e1->step != e2_next->step)
+                    break;
+
+                  if (e1->file != DONT_CARE &&
+                      (g_strcmp0 (e1->file, e2->file) != 0 ||
+                       e2->other_file != NULL))
+                    break;
+
+                  if (e1->other_file != DONT_CARE &&
+                      (g_strcmp0 (e1->other_file, e2_next->file) != 0 ||
+                       e2_next->other_file != NULL))
+                    break;
+
+                  l_extra_step = TRUE;
+                  mismatch = FALSE;
+                  break;
+                }
+              /* Kqueue won't report 'MOVED_IN' and 'MOVED_OUT' events. We set
+               * 'ignore_other_file' here to let the following code know that
+               * 'other_file' may not match. */
+              else if (e1->event_type == G_FILE_MONITOR_EVENT_MOVED_IN)
+                {
+                  if (e2->event_type != G_FILE_MONITOR_EVENT_CREATED)
+                    break;
+                  ignore_other_file = TRUE;
+                }
+              else if (e1->event_type == G_FILE_MONITOR_EVENT_MOVED_OUT)
+                {
+                  if (e2->event_type != G_FILE_MONITOR_EVENT_DELETED)
+                    break;
+                  ignore_other_file = TRUE;
+                }
+              else
+                break;
+            }
+
+          if (e1->file != DONT_CARE &&
+              g_strcmp0 (e1->file, e2->file) != 0)
+            break;
+
+          if (e1->other_file != DONT_CARE && !ignore_other_file &&
+              g_strcmp0 (e1->other_file, e2->other_file) != 0)
+            break;
+
+          mismatch = FALSE;
+        }
+      while (0);
+
+      if (mismatch)
+        {
+          /* Sometimes the emission of 'CHANGES_DONE_HINT' may be late because
+           * it depends on the ability of file monitor implementation to report
+           * 'CHANGES_DONE_HINT' itself. If the file monitor implementation
+           * doesn't report 'CHANGES_DONE_HINT' itself, it may be emitted by
+           * GLocalFileMonitor after a few seconds, which causes the event to
+           * mix with results from different steps. Since 'CHANGES_DONE_HINT'
+           * is just a hint, we don't require it to be reliable and we simply
+           * ignore unexpected 'CHANGES_DONE_HINT' events here. */
+          if (e1->event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT &&
+              e2->event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
+            {
+              g_test_message ("Event CHANGES_DONE_HINT ignored at "
+                              "expected index %d, recorded index %d", i, li);
+              li++, l = l->next;
+              continue;
+            }
+          /* If an event is marked as optional in the current environment and
+           * the event doesn't match, it means the expected event has lost. */
+          else if (env & e1->optional)
+            {
+              g_test_message ("Event %d at expected index %d skipped because "
+                              "it is marked as optional", e1->event_type, i);
+              i++;
+              continue;
+            }
+          /* Run above checks under g_assert_* again to provide more useful
+           * error messages. */
+          else
+            {
+              g_assert_cmpint (e1->step, ==, e2->step);
+              g_assert_cmpint (e1->event_type, ==, e2->event_type);
+
+              if (e1->file != DONT_CARE)
+                g_assert_cmpstr (e1->file, ==, e2->file);
+
+              if (e1->other_file != DONT_CARE)
+                g_assert_cmpstr (e1->other_file, ==, e2->other_file);
+
+              g_assert_not_reached ();
+            }
+        }
+
+      i++, li++, l = l->next;
+      if (l_extra_step)
+        li++, l = l->next;
     }
+
+  g_assert_cmpint (i, ==, n_expected);
+  g_assert_cmpint (li, ==, g_list_length (recorded));
 }
 
 static void
@@ -180,15 +310,15 @@ atomic_replace_step (gpointer user_data)
 
 /* this is the output we expect from the above steps */
 static RecordedEvent atomic_replace_output[] = {
-  { -1, NULL, NULL, 0 },
-  { G_FILE_MONITOR_EVENT_CREATED, "atomic_replace_file", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGED, "atomic_replace_file", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "atomic_replace_file", NULL, -1 },
-  { -1, NULL, NULL, 1 },
-  { G_FILE_MONITOR_EVENT_RENAMED, (gchar*)DONT_CARE, "atomic_replace_file", -1 },
-  { -1, NULL, NULL, 2 },
-  { G_FILE_MONITOR_EVENT_DELETED, "atomic_replace_file", NULL, -1 },
-  { -1, NULL, NULL, 3 }
+  { -1, NULL, NULL, 0, NONE },
+  { G_FILE_MONITOR_EVENT_CREATED, "atomic_replace_file", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGED, "atomic_replace_file", NULL, -1, KQUEUE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "atomic_replace_file", NULL, -1, KQUEUE },
+  { -1, NULL, NULL, 1, NONE },
+  { G_FILE_MONITOR_EVENT_RENAMED, (gchar*)DONT_CARE, "atomic_replace_file", -1, NONE },
+  { -1, NULL, NULL, 2, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "atomic_replace_file", NULL, -1, NONE },
+  { -1, NULL, NULL, 3, NONE }
 };
 
 static void
@@ -216,7 +346,10 @@ test_atomic_replace (void)
   g_main_loop_run (data.loop);
 
   /*output_events (data.events);*/
-  check_expected_events (atomic_replace_output, G_N_ELEMENTS (atomic_replace_output), data.events);
+  check_expected_events (atomic_replace_output,
+                         G_N_ELEMENTS (atomic_replace_output),
+                         data.events,
+                         get_environment (data.monitor));
 
   g_list_free_full (data.events, (GDestroyNotify)free_recorded_event);
   g_main_loop_unref (data.loop);
@@ -277,18 +410,18 @@ change_step (gpointer user_data)
 
 /* this is the output we expect from the above steps */
 static RecordedEvent change_output[] = {
-  { -1, NULL, NULL, 0 },
-  { G_FILE_MONITOR_EVENT_CREATED, "change_file", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGED, "change_file", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "change_file", NULL, -1 },
-  { -1, NULL, NULL, 1 },
-  { G_FILE_MONITOR_EVENT_CHANGED, "change_file", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "change_file", NULL, -1 },
-  { -1, NULL, NULL, 2 },
-  { G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED, "change_file", NULL, -1 },
-  { -1, NULL, NULL, 3 },
-  { G_FILE_MONITOR_EVENT_DELETED, "change_file", NULL, -1 },
-  { -1, NULL, NULL, 4 }
+  { -1, NULL, NULL, 0, NONE },
+  { G_FILE_MONITOR_EVENT_CREATED, "change_file", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGED, "change_file", NULL, -1, KQUEUE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "change_file", NULL, -1, KQUEUE },
+  { -1, NULL, NULL, 1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGED, "change_file", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "change_file", NULL, -1, NONE },
+  { -1, NULL, NULL, 2, NONE },
+  { G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED, "change_file", NULL, -1, NONE },
+  { -1, NULL, NULL, 3, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "change_file", NULL, -1, NONE },
+  { -1, NULL, NULL, 4, NONE }
 };
 
 static void
@@ -316,7 +449,10 @@ test_file_changes (void)
   g_main_loop_run (data.loop);
 
   /*output_events (data.events);*/
-  check_expected_events (change_output, G_N_ELEMENTS (change_output), data.events);
+  check_expected_events (change_output,
+                         G_N_ELEMENTS (change_output),
+                         data.events,
+                         get_environment (data.monitor));
 
   g_list_free_full (data.events, (GDestroyNotify)free_recorded_event);
   g_main_loop_unref (data.loop);
@@ -391,16 +527,16 @@ dir_step (gpointer user_data)
 
 /* this is the output we expect from the above steps */
 static RecordedEvent dir_output[] = {
-  { -1, NULL, NULL, 1 },
-  { -1, NULL, NULL, 2 },
-  { G_FILE_MONITOR_EVENT_MOVED_IN, "dir_test_file", NULL, -1 },
-  { -1, NULL, NULL, 3 },
-  { G_FILE_MONITOR_EVENT_RENAMED, "dir_test_file", "dir_test_file2", -1 },
-  { -1, NULL, NULL, 4 },
-  { G_FILE_MONITOR_EVENT_MOVED_OUT, "dir_test_file2", NULL, -1 },
-  { -1, NULL, NULL, 5 },
-  { G_FILE_MONITOR_EVENT_DELETED, "dir_monitor_test", NULL, -1 },
-  { -1, NULL, NULL, 6 }
+  { -1, NULL, NULL, 1, NONE },
+  { -1, NULL, NULL, 2, NONE },
+  { G_FILE_MONITOR_EVENT_MOVED_IN, "dir_test_file", NULL, -1, NONE },
+  { -1, NULL, NULL, 3, NONE },
+  { G_FILE_MONITOR_EVENT_RENAMED, "dir_test_file", "dir_test_file2", -1, NONE },
+  { -1, NULL, NULL, 4, NONE },
+  { G_FILE_MONITOR_EVENT_MOVED_OUT, "dir_test_file2", NULL, -1, NONE },
+  { -1, NULL, NULL, 5, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "dir_monitor_test", NULL, -1, NONE },
+  { -1, NULL, NULL, 6, NONE }
 };
 
 static void
@@ -429,7 +565,10 @@ test_dir_monitor (void)
   g_main_loop_run (data.loop);
 
   /*output_events (data.events);*/
-  check_expected_events (dir_output, G_N_ELEMENTS (dir_output), data.events);
+  check_expected_events (dir_output,
+                         G_N_ELEMENTS (dir_output),
+                         data.events,
+                         get_environment (data.monitor));
 
   g_list_free_full (data.events, (GDestroyNotify)free_recorded_event);
   g_main_loop_unref (data.loop);
@@ -482,17 +621,17 @@ nodir_step (gpointer user_data)
 }
 
 static RecordedEvent nodir_output[] = {
-  { -1, NULL, NULL, 0 },
-  { G_FILE_MONITOR_EVENT_CREATED, "nosuchfile", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "nosuchfile", NULL, -1 },
-  { -1, NULL, NULL, 1 },
-  { G_FILE_MONITOR_EVENT_CREATED, "nosuchfile", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGED, "nosuchfile", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "nosuchfile", NULL, -1 },
-  { -1, NULL, NULL, 2 },
-  { G_FILE_MONITOR_EVENT_DELETED, "nosuchfile", NULL, -1 },
-  { -1, NULL, NULL, 3 },
-  { -1, NULL, NULL, 4 }
+  { -1, NULL, NULL, 0, NONE },
+  { G_FILE_MONITOR_EVENT_CREATED, "nosuchfile", NULL, -1, KQUEUE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "nosuchfile", NULL, -1, KQUEUE },
+  { -1, NULL, NULL, 1, NONE },
+  { G_FILE_MONITOR_EVENT_CREATED, "nosuchfile", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGED, "nosuchfile", NULL, -1, KQUEUE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "nosuchfile", NULL, -1, KQUEUE },
+  { -1, NULL, NULL, 2, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "nosuchfile", NULL, -1, NONE },
+  { -1, NULL, NULL, 3, NONE },
+  { -1, NULL, NULL, 4, NONE }
 };
 
 static void
@@ -521,7 +660,10 @@ test_dir_non_existent (void)
   g_main_loop_run (data.loop);
 
   /*output_events (data.events);*/
-  check_expected_events (nodir_output, G_N_ELEMENTS (nodir_output), data.events);
+  check_expected_events (nodir_output,
+                         G_N_ELEMENTS (nodir_output),
+                         data.events,
+                         get_environment (data.monitor));
 
   g_list_free_full (data.events, (GDestroyNotify)free_recorded_event);
   g_main_loop_unref (data.loop);
@@ -578,26 +720,26 @@ cross_dir_step (gpointer user_data)
 }
 
 static RecordedEvent cross_dir_a_output[] = {
-  { -1, NULL, NULL, 0 },
-  { -1, NULL, NULL, 1 },
-  { G_FILE_MONITOR_EVENT_CREATED, "a", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "a", NULL, -1 },
-  { -1, NULL, NULL, 2 },
-  { G_FILE_MONITOR_EVENT_DELETED, "a", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_DELETED, "cross_dir_a", NULL, -1 },
-  { -1, NULL, NULL, 3 },
+  { -1, NULL, NULL, 0, NONE },
+  { -1, NULL, NULL, 1, NONE },
+  { G_FILE_MONITOR_EVENT_CREATED, "a", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "a", NULL, -1, KQUEUE },
+  { -1, NULL, NULL, 2, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "a", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "cross_dir_a", NULL, -1, NONE },
+  { -1, NULL, NULL, 3, NONE },
 };
 
 static RecordedEvent cross_dir_b_output[] = {
-  { -1, NULL, NULL, 0 },
-  { G_FILE_MONITOR_EVENT_CREATED, "a", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGED, "a", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "a", NULL, -1 },
-  { -1, NULL, NULL, 1 },
-  { G_FILE_MONITOR_EVENT_MOVED_OUT, "a", "a", -1 },
-  { -1, NULL, NULL, 2 },
-  { G_FILE_MONITOR_EVENT_DELETED, "cross_dir_b", NULL, -1 },
-  { -1, NULL, NULL, 3 },
+  { -1, NULL, NULL, 0, NONE },
+  { G_FILE_MONITOR_EVENT_CREATED, "a", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGED, "a", NULL, -1, KQUEUE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "a", NULL, -1, KQUEUE },
+  { -1, NULL, NULL, 1, NONE },
+  { G_FILE_MONITOR_EVENT_MOVED_OUT, "a", "a", -1, NONE },
+  { -1, NULL, NULL, 2, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "cross_dir_b", NULL, -1, NONE },
+  { -1, NULL, NULL, 3, NONE },
 };
 static void
 test_cross_dir_moves (void)
@@ -644,8 +786,14 @@ test_cross_dir_moves (void)
   output_events (data[1].events);
 #endif
 
-  check_expected_events (cross_dir_a_output, G_N_ELEMENTS (cross_dir_a_output), data[0].events);
-  check_expected_events (cross_dir_b_output, G_N_ELEMENTS (cross_dir_b_output), data[1].events);
+  check_expected_events (cross_dir_a_output,
+                         G_N_ELEMENTS (cross_dir_a_output),
+                         data[0].events,
+                         get_environment (data[0].monitor));
+  check_expected_events (cross_dir_b_output,
+                         G_N_ELEMENTS (cross_dir_b_output),
+                         data[1].events,
+                         get_environment (data[1].monitor));
 
   g_list_free_full (data[0].events, (GDestroyNotify)free_recorded_event);
   g_main_loop_unref (data[0].loop);
@@ -742,19 +890,26 @@ file_hard_links_step (gpointer user_data)
 }
 
 static RecordedEvent file_hard_links_output[] = {
-  { -1, NULL, NULL, 0 },
-  { G_FILE_MONITOR_EVENT_CHANGED, "testfilemonitor.db", NULL, -1 },
-  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "testfilemonitor.db", NULL, -1 },
-  { -1, NULL, NULL, 1 },
-  { G_FILE_MONITOR_EVENT_RENAMED, NULL  /* .goutputstream-XXXXXX */, "testfilemonitor.db", -1 },
-  { -1, NULL, NULL, 2 },
-  { -1, NULL, NULL, 3 },
-  /* FIXME: There should be a EVENT_CHANGED and EVENT_CHANGES_DONE_HINT here
-   * from the modification of the hard link. */
-  { -1, NULL, NULL, 4 },
-  { G_FILE_MONITOR_EVENT_DELETED, "testfilemonitor.db", NULL, -1 },
-  { -1, NULL, NULL, 5 },
-  { -1, NULL, NULL, 6 },
+  { -1, NULL, NULL, 0, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGED, "testfilemonitor.db", NULL, -1, NONE },
+  { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "testfilemonitor.db", NULL, -1, NONE },
+  { -1, NULL, NULL, 1, NONE },
+  { G_FILE_MONITOR_EVENT_RENAMED, (gchar*)DONT_CARE /* .goutputstream-XXXXXX */, "testfilemonitor.db", -1, NONE },
+  { -1, NULL, NULL, 2, NONE },
+  { -1, NULL, NULL, 3, NONE },
+  /* Kqueue is based on file descriptors. You can get events from all hard
+   * links by just monitoring one open file descriptor, and it is not possible
+   * to know whether it is done on the file name we use to open the file. Since
+   * the hard link count of 'testfilemonitor.db' is 2, it is expected to see
+   * two 'DELETED' events reported here. You have to call 'unlink' twice on
+   * different file names to remove 'testfilemonitor.db' from the file system,
+   * and each 'unlink' call generates a 'DELETED' event. */
+  { G_FILE_MONITOR_EVENT_CHANGED, "testfilemonitor.db", NULL, -1, INOTIFY },
+  { -1, NULL, NULL, 4, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "testfilemonitor.db", NULL, -1, NONE },
+  { -1, NULL, NULL, 5, NONE },
+  { G_FILE_MONITOR_EVENT_DELETED, "testfilemonitor.db", NULL, -1, INOTIFY },
+  { -1, NULL, NULL, 6, NONE },
 };
 
 static void
@@ -800,7 +955,9 @@ test_file_hard_links (void)
 
   /* output_events (data.events); */
   check_expected_events (file_hard_links_output,
-                         G_N_ELEMENTS (file_hard_links_output), data.events);
+                         G_N_ELEMENTS (file_hard_links_output),
+                         data.events,
+                         get_environment (data.monitor));
 
   g_list_free_full (data.events, (GDestroyNotify) free_recorded_event);
   g_main_loop_unref (data.loop);
diff --git a/gio/tests/trash.c b/gio/tests/trash.c
new file mode 100644
index 000000000..2abe0aa0c
--- /dev/null
+++ b/gio/tests/trash.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * licence, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+
+#ifndef G_OS_UNIX
+#error This is a Unix-specific test
+#endif
+
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <gio/gunixmounts.h>
+
+/* Test that g_file_trash() returns G_IO_ERROR_NOT_SUPPORTED for files on system mounts. */
+static void
+test_trash_not_supported (void)
+{
+  GFile *file;
+  GFileIOStream *stream;
+  GUnixMountEntry *mount;
+  GFileInfo *info;
+  GError *error = NULL;
+  gboolean ret;
+  GStatBuf file_stat, home_stat;
+
+  /* The test assumes that tmp file is located on system internal mount. */
+  file = g_file_new_tmp ("test-trashXXXXXX", &stream, &error);
+  g_assert_no_error (error);
+  g_assert_cmpint (g_lstat (g_file_peek_path (file), &file_stat), ==, 0);
+  g_test_message ("File: %s (dev: %" G_GUINT64_FORMAT ")",
+                  g_file_peek_path (file), (guint64) file_stat.st_dev);
+
+  g_assert_cmpint (g_stat (g_get_home_dir (), &home_stat), ==, 0);
+  g_test_message ("Home: %s (dev: %" G_GUINT64_FORMAT ")",
+                  g_get_home_dir (), (guint64) home_stat.st_dev);
+
+  if (file_stat.st_dev == home_stat.st_dev)
+    {
+      g_test_skip ("The file has to be on another filesystem than the home trash to run this test");
+
+      g_object_unref (stream);
+      g_object_unref (file);
+
+      return;
+    }
+
+  mount = g_unix_mount_for (g_file_peek_path (file), NULL);
+  g_assert_true (mount == NULL || g_unix_mount_is_system_internal (mount));
+  g_test_message ("Mount: %s", (mount != NULL) ? g_unix_mount_get_mount_path (mount) : "(null)");
+  g_clear_pointer (&mount, g_unix_mount_free);
+
+  /* g_file_trash() shouldn't be supported on system internal mounts,
+   * because those are not monitored by gvfsd-trash.
+   */
+  ret = g_file_trash (file, NULL, &error);
+  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED);
+  g_test_message ("Error: %s", error->message);
+  g_assert_false (ret);
+  g_clear_error (&error);
+
+  info = g_file_query_info (file,
+                            G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH,
+                            G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                            NULL,
+                            &error);
+  g_assert_no_error (error);
+
+  g_assert_false (g_file_info_get_attribute_boolean (info,
+                                                     G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH));
+
+  g_io_stream_close (G_IO_STREAM (stream), NULL, &error);
+  g_assert_no_error (error);
+
+  g_object_unref (info);
+  g_object_unref (stream);
+  g_object_unref (file);
+}
+
+int
+main (int argc, char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_bug_base ("htps://gitlab.gnome.org/GNOME/glib/issues/");
+  g_test_bug ("251");
+
+  g_test_add_func ("/trash/not-supported", test_trash_not_supported);
+
+  return g_test_run ();
+}
+
diff --git a/gio/tests/unix-mounts.c b/gio/tests/unix-mounts.c
index 3d54047dc..67b8c8d98 100644
--- a/gio/tests/unix-mounts.c
+++ b/gio/tests/unix-mounts.c
@@ -33,6 +33,12 @@ test_is_system_fs_type (void)
 {
   g_assert_true (g_unix_is_system_fs_type ("tmpfs"));
   g_assert_false (g_unix_is_system_fs_type ("ext4"));
+
+  /* Check that some common network file systems aren’t considered ‘system’. */
+  g_assert_false (g_unix_is_system_fs_type ("cifs"));
+  g_assert_false (g_unix_is_system_fs_type ("nfs"));
+  g_assert_false (g_unix_is_system_fs_type ("nfs4"));
+  g_assert_false (g_unix_is_system_fs_type ("smbfs"));
 }
 
 static void
diff --git a/gio/tests/unix-streams.c b/gio/tests/unix-streams.c
index dafaf66aa..67a90d83d 100644
--- a/gio/tests/unix-streams.c
+++ b/gio/tests/unix-streams.c
@@ -178,6 +178,7 @@ main_thread_read (GObject *source, GAsyncResult *res, gpointer user_data)
   if (g_cancellable_is_cancelled (main_cancel))
     {
       do_main_cancel (out);
+      g_clear_error (&err);
       return;
     }
 
@@ -214,6 +215,7 @@ main_thread_wrote (GObject *source, GAsyncResult *res, gpointer user_data)
   if (g_cancellable_is_cancelled (main_cancel))
     {
       do_main_cancel (out);
+      g_clear_error (&err);
       return;
     }
 
diff --git a/gio/thumbnail-verify.c b/gio/thumbnail-verify.c
index 44fde6bc7..1a722e40c 100644
--- a/gio/thumbnail-verify.c
+++ b/gio/thumbnail-verify.c
@@ -232,7 +232,7 @@ thumbnail_verify (const char     *thumbnail_path,
     return FALSE;
 
   expected_info.uri = file_uri;
-  expected_info.mtime = file_stat_buf->st_mtime;
+  expected_info.mtime = (guint64) file_stat_buf->st_mtime;
   expected_info.size = file_stat_buf->st_size;
 
   file = g_mapped_file_new (thumbnail_path, FALSE, NULL);
diff --git a/glib-gettextize.in b/glib-gettextize.in
index b07078bc5..af7052f6f 100755
--- a/glib-gettextize.in
+++ b/glib-gettextize.in
@@ -35,7 +35,7 @@ Usage: glib-gettextize [OPTION]... [package-dir]
       --version        print version information and exit
   -c, --copy           copy files instead of making symlinks
   -f, --force          force writing of new files even if old exist
-Report bugs to http://bugzilla.gnome.org/."
+Report bugs to https://gitlab.gnome.org/GNOME/glib/issues/new."
 package=@PACKAGE@
 version=@VERSION@
 try_ln_s=:
diff --git a/glib-zip.in b/glib-zip.in
deleted file mode 100755
index 40d3c6722..000000000
--- a/glib-zip.in
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Build zipfiles for GLib on Win32: Separate runtime and developer ones.
-# After running make install, run this.
-
-ZIP=/tmp/glib-@GLIB_VERSION@.zip
-DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
-
-cd @prefix@
-
-mkdir -p share/doc/glib-@GLIB_VERSION@
-cp -p @abs_srcdir@/COPYING share/doc/glib-@GLIB_VERSION@
-
-mkdir -p share/doc/glib-dev-@GLIB_VERSION@
-cp -p @abs_srcdir@/COPYING share/doc/glib-dev-@GLIB_VERSION@
-
-if test @LIB_EXE_MACHINE_FLAG@ = X64; then
-  helperbits=64
-else
-  helperbits=32
-fi
-
-rm $ZIP
-zip $ZIP -@ <<EOF
-bin/gspawn-win${helperbits}-helper.exe
-bin/gspawn-win${helperbits}-helper-console.exe
-bin/libgio-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
-EOF
-
-zip $ZIP share/locale/*/LC_MESSAGES/glib20.mo
-
-zip -r -D $ZIP share/doc/glib-@GLIB_VERSION@
-
-rm $DEVZIP
-zip -r -D $DEVZIP -@ <<EOF
-bin/gdbus.exe
-bin/gdbus-codegen
-bin/gio-querymodules.exe
-bin/glib-compile-schemas.exe
-bin/glib-genmarshal.exe
-bin/glib-gettextize
-bin/glib-mkenums
-bin/gobject-query.exe
-bin/gsettings.exe
-etc/bash_completion.d/gdbus-bash-completion.sh
-etc/bash_completion.d/gsettings-bash-completion.sh
-include/gio-win32-2.0
-include/glib-2.0
-lib/gdbus-2.0
-lib/gio
-lib/glib-2.0
-lib/pkgconfig/glib-2.0.pc
-lib/pkgconfig/gmodule-2.0.pc
-lib/pkgconfig/gmodule-no-export-2.0.pc
-lib/pkgconfig/gobject-2.0.pc
-lib/pkgconfig/gthread-2.0.pc
-lib/pkgconfig/gio-2.0.pc
-lib/pkgconfig/gio-windows-2.0.pc
-lib/gio-2.0.def
-lib/gio-2.0.lib
-lib/glib-2.0.def
-lib/glib-2.0.lib
-lib/gmodule-2.0.def
-lib/gmodule-2.0.lib
-lib/gobject-2.0.def
-lib/gobject-2.0.lib
-lib/gthread-2.0.def
-lib/gthread-2.0.lib
-lib/libgio-2.0.dll.a
-lib/libglib-2.0.dll.a
-lib/libgmodule-2.0.dll.a
-lib/libgobject-2.0.dll.a
-lib/libgthread-2.0.dll.a
-share/aclocal/glib-2.0.m4
-share/aclocal/glib-gettext.m4
-share/aclocal/gsettings.m4
-share/glib-2.0
-share/gtk-doc/html
-share/man/man1/gdbus.1
-share/man/man1/gdbus-codegen.1
-share/man/man1/gio-querymodules.1
-share/man/man1/glib-compile-schemas.1
-share/man/man1/glib-genmarshal.1
-share/man/man1/glib-gettextize.1
-share/man/man1/glib-mkenums.1
-share/man/man1/gobject-query.1
-share/man/man1/gsettings.1
-EOF
-
-zip -r $DEVZIP share/doc/glib-dev-@GLIB_VERSION@
diff --git a/glib.doap b/glib.doap
index 0f43d3b34..8743257da 100644
--- a/glib.doap
+++ b/glib.doap
@@ -14,7 +14,7 @@
 
   <homepage rdf:resource="http://www.gtk.org" />
   <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/enter_bug.cgi?product=glib"/>
+  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/glib/issues/new"/>
   <download-page rdf:resource="http://download.gnome.org/sources/glib/" />
   <mailing-list rdf:resource="mailto:gtk-devel-list@gnome.org" />
   <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
diff --git a/glib.supp b/glib.supp
index e3ce6bc49..f64826b3c 100644
--- a/glib.supp
+++ b/glib.supp
@@ -17,7 +17,7 @@
 # This file should be updated if GLib introduces a new deliberate one-time leak,
 # or another false race positive in Valgrind: please file bugs at:
 #
-# https://bugzilla.gnome.org/enter_bug.cgi?product=glib
+# https://gitlab.gnome.org/GNOME/glib/issues/new
 
 {
 	gnutls-init-calloc
@@ -51,6 +51,16 @@
 	fun:initialize_module_inlock_reentrant
 }
 
+# One-time allocation from libc for getpwnam() results
+{
+	g-local-vfs-getpwnam
+	Memcheck:Leak
+	fun:malloc
+	...
+	fun:getpwnam
+	fun:g_local_vfs_parse_name
+}
+
 {
 	gobject-init-malloc
 	Memcheck:Leak
@@ -232,6 +242,18 @@
 	fun:_g_io_module_get_default
 }
 
+# One-time getaddrinfo() configuration loading
+{
+	g-threaded-resolver-getaddrinfo-config
+	Memcheck:Leak
+	fun:malloc
+	...
+	fun:__resolv_conf_allocate
+	...
+	fun:getaddrinfo
+	fun:do_lookup_by_name
+}
+
 # memcheck checks that the third argument to ioctl() is a valid pointer, but
 # some ioctls use that argument as an integer
 {
diff --git a/glib/.gitignore b/glib/.gitignore
index 17142a60c..f79e130df 100644
--- a/glib/.gitignore
+++ b/glib/.gitignore
@@ -1,5 +1,4 @@
 glibconfig.h
-glibconfig.h.win32
 glibconfig-stamp
 
 gtester
diff --git a/glib/Makefile.am b/glib/Makefile.am
index eab0b8126..2e0d149a6 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/glib.mk
 
+bin_PROGRAMS =
+
 #
 # Generate glibconfig.h
 #
@@ -9,15 +11,13 @@ include $(top_srcdir)/glib.mk
 # to config.status will not result in changes to glibconfig.h so we
 # avoid touching its timestamp (in order not to rebuild the whole tree).
 #
-DISTCLEANFILES += glibconfig-stamp glibconfig.h glibconfig.h.win32
+DISTCLEANFILES += glibconfig-stamp glibconfig.h
 BUILT_SOURCES += glibconfig-stamp
 configexecincludedir = $(libdir)/glib-2.0/include
 nodist_configexecinclude_HEADERS = glibconfig.h
 glibconfig-stamp: ../config.status
 	$(AM_V_GEN) cd $(top_builddir) && \
 	  $(SHELL) ./config.status glib/glibconfig.h
-	$(AM_V_GEN) cd $(top_builddir) && \
-	  $(SHELL) ./config.status glib/glibconfig.h.win32
 	@touch glibconfig-stamp
 
 
@@ -57,7 +57,6 @@ MIRRORING_TAB_SOURCE = 				\
 EXTRA_DIST += 			\
 	glib.rc.in		\
 	gen-unicode-tables.pl	\
-	glibconfig.h.win32.in	\
 	gregex.c		\
 	gregex.h		\
 	win_iconv.c		\
@@ -70,7 +69,6 @@ CLEANFILES += libglib-gdb.py
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST += 		\
-	glibconfig.h.win32	\
 	glib.rc
 
 lib_LTLIBRARIES = libglib-2.0.la
@@ -100,6 +98,7 @@ deprecated_sources = \
 libglib_2_0_la_SOURCES = 	\
 	$(deprecated_sources)	\
 	glib_probes.d		\
+	garcbox.c		\
 	garray.c		\
 	gasyncqueue.c		\
 	gasyncqueueprivate.h	\
@@ -154,6 +153,10 @@ libglib_2_0_la_SOURCES = 	\
 	gquark.c		\
 	gqueue.c		\
 	grand.c			\
+	grcbox.c		\
+	grcboxprivate.h		\
+	grefcount.c		\
+	grefstring.c		\
 	gregex.c		\
 	gscanner.c		\
 	gscripttable.h		\
@@ -161,6 +164,7 @@ libglib_2_0_la_SOURCES = 	\
 	gshell.c		\
 	gslice.c		\
 	gslist.c		\
+	gspawn-private.h	\
 	gstdio.c		\
 	gstdioprivate.h		\
 	gstrfuncs.c		\
@@ -189,6 +193,7 @@ libglib_2_0_la_SOURCES = 	\
 	gurifuncs.c 		\
 	gutils.c		\
 	guuid.c			\
+	gvalgrind.h		\
 	gvariant.h		\
 	gvariant.c		\
 	gvariant-core.h		\
@@ -221,12 +226,21 @@ libglib_2_0_la_SOURCES += gthread-posix.c
 endif
 endif
 
-EXTRA_libglib_2_0_la_SOURCES = \
-	giounix.c	\
-	giowin32.c	\
-	gspawn.c	\
-	gspawn-win32.c	\
-	gwin32.c
+if PLATFORM_WIN32
+libglib_2_0_la_SOURCES += gwin32.c
+endif
+
+if G_SPAWN_WIN32
+libglib_2_0_la_SOURCES += gspawn-win32.c
+else
+libglib_2_0_la_SOURCES += gspawn.c
+endif
+
+if G_IO_CHANNEL_WIN32
+libglib_2_0_la_SOURCES += giowin32.c
+else
+libglib_2_0_la_SOURCES += giounix.c
+endif
 
 glibincludedir=$(includedir)/glib-2.0
 glibinclude_HEADERS =   \
@@ -290,6 +304,9 @@ glibsubinclude_HEADERS = \
 	gquark.h	\
 	gqueue.h	\
 	grand.h		\
+	grcbox.h	\
+	grefcount.h	\
+	grefstring.h	\
 	gregex.h	\
 	gscanner.h	\
 	gsequence.h	\
@@ -355,16 +372,14 @@ pcre_inc =
 endif
 
 libglib_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) $(LIBSYSTEMD_CFLAGS)
-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(LIBSYSTEMD_LIBS)
-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(LIBSYSTEMD_LIBS)
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) $(glib_win32_res) $(glib_def)
 
 libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 	 $(glib_win32_res_ldflag) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined)
 
-INSTALL_PROGS=
-
 if ENABLE_DTRACE
 glib_probes.h: glib_probes.d
 	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
@@ -407,15 +422,26 @@ gspawn-win64-helper-console.c:
 	echo '#define HELPER_CONSOLE' >$@
 	echo '#include "gspawn-win32-helper.c"' >>$@
 
+nodist_win_helper_sources = \
+	gspawn-win32-helper-console.c \
+	gspawn-win64-helper.c \
+	gspawn-win64-helper-console.c \
+	$(NULL)
+
+BUILT_SOURCES += $(nodist_win_helper_sources)
+CLEANFILES += $(nodist_win_helper_sources)
 
 if OS_WIN32
 if OS_WIN32_X64
-INSTALL_PROGS += gspawn-win64-helper gspawn-win64-helper-console
+bin_PROGRAMS += gspawn-win64-helper gspawn-win64-helper-console
+nodist_gspawn_win64_helper_SOURCES = gspawn-win64-helper.c
+nodist_gspawn_win64_helper_console_SOURCES = gspawn-win64-helper-console.c
 gspawn_win64_helper_LDADD = libglib-2.0.la
 gspawn_win64_helper_LDFLAGS = -pie -mwindows
 gspawn_win64_helper_console_LDADD = libglib-2.0.la
 else
-INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
+bin_PROGRAMS += gspawn-win32-helper gspawn-win32-helper-console
+nodist_gspawn_win32_helper_console_SOURCES = gspawn-win32-helper-console.c
 gspawn_win32_helper_LDADD = libglib-2.0.la
 gspawn_win32_helper_LDFLAGS = -pie -mwindows
 gspawn_win32_helper_console_LDADD = libglib-2.0.la
@@ -425,11 +451,9 @@ endif
 glib-win32-res.o: glib.rc
 	$(WINDRES) glib.rc $@
 
-bin_PROGRAMS	 = ${INSTALL_PROGS}
-
 if OS_UNIX
 
-INSTALL_PROGS	+= gtester
+bin_PROGRAMS += gtester
 gtester_SOURCES	 = gtester.c
 gtester_LDADD	 = libglib-2.0.la
 gtester_LDFLAGS	 = -pie
@@ -461,19 +485,7 @@ glib.def: libglib-2.0.la
 glib-2.0.lib: libglib-2.0.la glib.def
 	$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
 
-# ------ MSVC Project File Generation ------
-MSVCPROJS = glib
-
-glib_FILES = $(libglib_2_0_la_SOURCES)
-glib_EXCLUDES = *-unix.c|gthread-*.c
-
-glib_HEADERS_DIR = $(glibsubincludedir)
-glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS)
-glib_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/glib.vcproj $(top_builddir)/win32/vs9/glib.headers
+dist-hook: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)'; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/glib/docs.c b/glib/docs.c
index 080c1b0de..5a786311c 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -1789,6 +1789,26 @@
  */
 
 /**
+ * G_APPROX_VALUE:
+ * @a: a numeric value
+ * @b: a numeric value
+ * @epsilon: a numeric value that expresses the tolerance between @a and @b
+ *
+ * Evaluates to a truth value if the absolute difference between @a and @b is
+ * smaller than @epsilon, and to a false value otherwise.
+ *
+ * For example,
+ * - `G_APPROX_VALUE (5, 6, 2)` evaluates to true
+ * - `G_APPROX_VALUE (3.14, 3.15, 0.001)` evaluates to false
+ * - `G_APPROX_VALUE (n, 0.f, FLT_EPSILON)` evaluates to true if `n` is within
+ *   the single precision floating point epsilon from zero
+ *
+ * Returns: %TRUE if the two values are within the desired range
+ *
+ * Since: 2.58
+ */
+
+/**
  * G_STRUCT_MEMBER:
  * @member_type: the type of the struct field
  * @struct_p: a pointer to a struct
diff --git a/glib/garcbox.c b/glib/garcbox.c
new file mode 100644
index 000000000..9c1bd8fe5
--- /dev/null
+++ b/glib/garcbox.c
@@ -0,0 +1,373 @@
+/* garcbox.c: Atomically reference counted data
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "grcboxprivate.h"
+
+#include "gmessages.h"
+#include "grefcount.h"
+
+#ifdef ENABLE_VALGRIND
+#include "valgrind.h"
+#endif
+
+#include "glib_trace.h"
+
+#include <string.h>
+
+#define G_ARC_BOX(p)            (GArcBox *) (((char *) (p)) - G_ARC_BOX_SIZE)
+
+/**
+ * SECTION:arcbox
+ * @Title: Atomically reference counted data
+ * @Short_description: Allocated memory with atomic reference counting semantics
+ *
+ * An "atomically reference counted box", or "ArcBox", is an opaque wrapper
+ * data type that is guaranteed to be as big as the size of a given data type,
+ * and which augments the given data type with thread safe reference counting
+ * semantics for its memory management.
+ *
+ * ArcBox is useful if you have a plain old data type, like a structure
+ * typically placed on the stack, and you wish to provide additional API
+ * to use it on the heap; or if you want to implement a new type to be
+ * passed around by reference without necessarily implementing copy/free
+ * semantics or your own reference counting.
+ *
+ * The typical use is:
+ *
+ * |[<!-- language="C" -->
+ * typedef struct {
+ *   char *name;
+ *   char *address;
+ *   char *city;
+ *   char *state;
+ *   int age;
+ * } Person;
+ *
+ * Person *
+ * person_new (void)
+ * {
+ *   return g_atomic_rc_box_new0 (Person);
+ * }
+ * ]|
+ *
+ * Every time you wish to acquire a reference on the memory, you should
+ * call g_atomic_rc_box_acquire(); similarly, when you wish to release a reference
+ * you should call g_atomic_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * // Add a Person to the Database; the Database acquires ownership
+ * // of the Person instance
+ * void
+ * add_person_to_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_prepend (db->persons, g_atomic_rc_box_acquire (p));
+ * }
+ *
+ * // Removes a Person from the Database; the reference acquired by
+ * // add_person_to_database() is released here
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_atomic_rc_box_release (p);
+ * }
+ * ]|
+ *
+ * If you have additional memory allocated inside the structure, you can
+ * use g_atomic_rc_box_release_full(), which takes a function pointer, which
+ * will be called if the reference released was the last:
+ *
+ * |[<!-- language="C" -->
+ * void
+ * person_clear (Person *p)
+ * {
+ *   g_free (p->name);
+ *   g_free (p->address);
+ *   g_free (p->city);
+ *   g_free (p->state);
+ * }
+ *
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_atomic_rc_box_release_full (p, (GDestroyNotify) person_clear);
+ * }
+ * ]|
+ *
+ * If you wish to transfer the ownership of a reference counted data
+ * type without increasing the reference count, you can use g_steal_pointer():
+ *
+ * |[<!-- language="C" -->
+ *   Person *p = g_atomic_rc_box_new (Person);
+ *
+ *   fill_person_details (p);
+ *
+ *   add_person_to_database (db, g_steal_pointer (&p));
+ * ]|
+ *
+ * ## Thread safety
+ *
+ * The reference counting operations on data allocated using g_atomic_rc_box_alloc(),
+ * g_atomic_rc_box_new(), and g_atomic_rc_box_dup() are guaranteed to be atomic, and thus
+ * can be safely be performed by different threads. It is important to note that
+ * only the reference acquisition and release are atomic; changes to the content
+ * of the data are your responsibility.
+ *
+ * ## Automatic pointer clean up
+ *
+ * If you want to add g_autoptr() support to your plain old data type through
+ * reference counting, you can use the G_DEFINE_AUTOPTR_CLEANUP_FUNC() and
+ * g_atomic_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, g_atomic_rc_box_release)
+ * ]|
+ *
+ * If you need to clear the contents of the data, you will need to use an
+ * ancillary function that calls g_rc_box_release_full():
+ *
+ * |[<!-- laguage="C" -->
+ * static void
+ * my_data_struct_release (MyDataStruct *data)
+ * {
+ *   // my_data_struct_clear() is defined elsewhere
+ *   g_atomic_rc_box_release_full (data, (GDestroyNotify) my_data_struct_clear);
+ * }
+ *
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_clear)
+ * ]|
+ *
+ * Since: 2.58.
+ */
+
+/**
+ * g_atomic_rc_box_alloc:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds atomic
+ * reference counting semantics to it.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ *
+ * Since: 2.58
+ */
+gpointer
+g_atomic_rc_box_alloc (gsize block_size)
+{
+  g_return_val_if_fail (block_size > 0, NULL);
+
+  return g_rc_box_alloc_full (block_size, TRUE, FALSE);
+}
+
+/**
+ * g_atomic_rc_box_alloc0:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds atomic
+ * referenc counting semantics to it.
+ *
+ * The contents of the returned data is set to zero.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ *
+ * Since: 2.58
+ */
+gpointer
+g_atomic_rc_box_alloc0 (gsize block_size)
+{
+  g_return_val_if_fail (block_size > 0, NULL);
+
+  return g_rc_box_alloc_full (block_size, TRUE, TRUE);
+}
+
+/**
+ * g_atomic_rc_box_new:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate atomically reference counted
+ * data with the size of the given @type.
+ *
+ * This macro calls g_atomic_rc_box_alloc() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory, cast to a pointer for the given @type
+ *
+ * Since: 2.58
+ */
+
+/**
+ * g_atomic_rc_box_new0:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate atomically reference counted
+ * data with the size of the given @type, and set its contents
+ * to zero.
+ *
+ * This macro calls g_atomic_rc_box_alloc0() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory, cast to a pointer for the given @type
+ *
+ * Since: 2.58
+ */
+
+/**
+ * g_atomic_rc_box_dup:
+ * @block_size: the number of bytes to copy, must be greater than 0
+ * @mem_block: (not nullable): the memory to copy
+ *
+ * Allocates a new block of data with atomit reference counting
+ * semantics, and copies @block_size bytes of @mem_block
+ * into it.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory
+ *
+ * Since: 2.58
+ */
+gpointer
+(g_atomic_rc_box_dup) (gsize         block_size,
+                       gconstpointer mem_block)
+{
+  gpointer res;
+
+  g_return_val_if_fail (block_size > 0, NULL);
+  g_return_val_if_fail (mem_block != NULL, NULL);
+
+  res = g_rc_box_alloc_full (block_size, TRUE, FALSE);
+  memcpy (res, mem_block, block_size);
+
+  return res;
+}
+
+/**
+ * g_atomic_rc_box_acquire:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Atomically acquires a reference on the data pointed by @mem_block.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the data,
+ *   with its reference count increased
+ *
+ * Since: 2.58
+ */
+gpointer
+(g_atomic_rc_box_acquire) (gpointer mem_block)
+{
+  GArcBox *real_box = G_ARC_BOX (mem_block);
+
+  g_return_val_if_fail (mem_block != NULL, NULL);
+#ifndef G_DISABLE_ASSERT
+  g_return_val_if_fail (real_box->magic == G_BOX_MAGIC, NULL);
+#endif
+
+  g_atomic_ref_count_inc (&real_box->ref_count);
+
+  TRACE (GLIB_RCBOX_ACQUIRE (mem_block, 1));
+
+  return mem_block;
+}
+
+/**
+ * g_atomic_rc_box_release:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ *
+ * Atomically releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+void
+g_atomic_rc_box_release (gpointer mem_block)
+{
+  g_atomic_rc_box_release_full (mem_block, NULL);
+}
+
+/**
+ * g_atomic_rc_box_release_full:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ * @clear_func: (not nullable): a function to call when clearing the data
+ *
+ * Atomically releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will call @clear_func
+ * to clear the contents of @mem_block, and then will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+void
+g_atomic_rc_box_release_full (gpointer       mem_block,
+                              GDestroyNotify clear_func)
+{
+  GArcBox *real_box = G_ARC_BOX (mem_block);
+
+  g_return_if_fail (mem_block != NULL);
+#ifndef G_DISABLE_ASSERT
+  g_return_if_fail (real_box->magic == G_BOX_MAGIC);
+#endif
+
+  if (g_atomic_ref_count_dec (&real_box->ref_count))
+    {
+      TRACE (GLIB_RCBOX_RELEASE (mem_block, 1));
+
+      if (clear_func != NULL)
+        clear_func (mem_block);
+
+      TRACE (GLIB_RCBOX_FREE (mem_block));
+      g_free (real_box);
+    }
+}
+
+/**
+ * g_atomic_rc_box_get_size:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Retrieves the size of the reference counted data pointed by @mem_block.
+ *
+ * Returns: the size of the data, in bytes
+ *
+ * Since: 2.58
+ */
+gsize
+g_atomic_rc_box_get_size (gpointer mem_block)
+{
+  GArcBox *real_box = G_ARC_BOX (mem_block);
+
+  g_return_val_if_fail (mem_block != NULL, 0);
+#ifndef G_DISABLE_ASSERT
+  g_return_val_if_fail (real_box->magic == G_BOX_MAGIC, 0);
+#endif
+
+  return real_box->mem_size;
+}
diff --git a/glib/garray.c b/glib/garray.c
index 914eaee34..5b71c887a 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -41,7 +41,7 @@
 #include "gthread.h"
 #include "gmessages.h"
 #include "gqsort.h"
-
+#include "grefcount.h"
 
 /**
  * SECTION:arrays
@@ -106,7 +106,7 @@ struct _GRealArray
   guint   elt_size;
   guint   zero_terminated : 1;
   guint   clear : 1;
-  gint    ref_count;
+  gatomicrefcount ref_count;
   GDestroyNotify clear_func;
 };
 
@@ -139,9 +139,9 @@ struct _GRealArray
     g_array_elt_zero ((array), (array)->len, 1);                        \
 }G_STMT_END
 
-static guint g_nearest_pow        (gint        num) G_GNUC_CONST;
+static guint g_nearest_pow        (guint       num) G_GNUC_CONST;
 static void  g_array_maybe_expand (GRealArray *array,
-                                   gint        len);
+                                   guint       len);
 
 /**
  * g_array_new:
@@ -199,9 +199,10 @@ g_array_sized_new (gboolean zero_terminated,
   array->zero_terminated = (zero_terminated ? 1 : 0);
   array->clear           = (clear ? 1 : 0);
   array->elt_size        = elt_size;
-  array->ref_count       = 1;
   array->clear_func      = NULL;
 
+  g_atomic_ref_count_init (&array->ref_count);
+
   if (array->zero_terminated || reserved_size != 0)
     {
       g_array_maybe_expand (array, reserved_size);
@@ -257,7 +258,7 @@ g_array_ref (GArray *array)
   GRealArray *rarray = (GRealArray*) array;
   g_return_val_if_fail (array, NULL);
 
-  g_atomic_int_inc (&rarray->ref_count);
+  g_atomic_ref_count_inc (&rarray->ref_count);
 
   return array;
 }
@@ -287,7 +288,7 @@ g_array_unref (GArray *array)
   GRealArray *rarray = (GRealArray*) array;
   g_return_if_fail (array);
 
-  if (g_atomic_int_dec_and_test (&rarray->ref_count))
+  if (g_atomic_ref_count_dec (&rarray->ref_count))
     array_free (rarray, FREE_SEGMENT);
 }
 
@@ -346,7 +347,7 @@ g_array_free (GArray   *farray,
   flags = (free_segment ? FREE_SEGMENT : 0);
 
   /* if others are holding a reference, preserve the wrapper but do free/return the data */
-  if (!g_atomic_int_dec_and_test (&array->ref_count))
+  if (!g_atomic_ref_count_dec (&array->ref_count))
     flags |= PRESERVE_WRAPPER;
 
   return array_free (array, flags);
@@ -439,11 +440,14 @@ g_array_append_vals (GArray       *farray,
 /**
  * g_array_prepend_vals:
  * @array: a #GArray
- * @data: (not nullable): a pointer to the elements to prepend to the start of the array
- * @len: the number of elements to prepend
+ * @data: (nullable): a pointer to the elements to prepend to the start of the array
+ * @len: the number of elements to prepend, which may be zero
  *
  * Adds @len elements onto the start of the array.
  *
+ * @data may be %NULL if (and only if) @len is zero. If @len is zero, this
+ * function is a no-op.
+ *
  * This operation is slower than g_array_append_vals() since the
  * existing elements in the array have to be moved to make space for
  * the new elements.
@@ -498,11 +502,19 @@ g_array_prepend_vals (GArray        *farray,
  * g_array_insert_vals:
  * @array: a #GArray
  * @index_: the index to place the elements at
- * @data: (not nullable): a pointer to the elements to insert
+ * @data: (nullable): a pointer to the elements to insert
  * @len: the number of elements to insert
  *
  * Inserts @len elements into a #GArray at the given index.
  *
+ * If @index_ is greater than the array’s current length, the array is expanded.
+ * The elements between the old end of the array and the newly inserted elements
+ * will be initialised to zero if the array was configured to clear elements;
+ * otherwise their values will be undefined.
+ *
+ * @data may be %NULL if (and only if) @len is zero. If @len is zero, this
+ * function is a no-op.
+ *
  * Returns: the #GArray
  */
 /**
@@ -532,6 +544,14 @@ g_array_insert_vals (GArray        *farray,
   if (len == 0)
     return farray;
 
+  /* Is the index off the end of the array, and hence do we need to over-allocate
+   * and clear some elements? */
+  if (index_ >= array->len)
+    {
+      g_array_maybe_expand (array, index_ - array->len + len);
+      return g_array_append_vals (g_array_set_size (farray, index_), data, len);
+    }
+
   g_array_maybe_expand (array, len);
 
   memmove (g_array_elt_pos (array, len + index_),
@@ -769,7 +789,7 @@ g_array_sort_with_data (GArray           *farray,
  * such power does not fit in a guint
  */
 static guint
-g_nearest_pow (gint num)
+g_nearest_pow (guint num)
 {
   guint n = 1;
 
@@ -781,7 +801,7 @@ g_nearest_pow (gint num)
 
 static void
 g_array_maybe_expand (GRealArray *array,
-                      gint        len)
+                      guint       len)
 {
   guint want_alloc = g_array_elt_len (array, array->len + len + 
                                       array->zero_terminated);
@@ -863,7 +883,7 @@ struct _GRealPtrArray
   gpointer       *pdata;
   guint           len;
   guint           alloc;
-  gint            ref_count;
+  gatomicrefcount ref_count;
   GDestroyNotify  element_free_func;
 };
 
@@ -917,9 +937,10 @@ g_ptr_array_sized_new (guint reserved_size)
   array->pdata = NULL;
   array->len = 0;
   array->alloc = 0;
-  array->ref_count = 1;
   array->element_free_func = NULL;
 
+  g_atomic_ref_count_init (&array->ref_count);
+
   if (reserved_size != 0)
     g_ptr_array_maybe_expand (array, reserved_size);
 
@@ -1022,7 +1043,7 @@ g_ptr_array_ref (GPtrArray *array)
 
   g_return_val_if_fail (array, NULL);
 
-  g_atomic_int_inc (&rarray->ref_count);
+  g_atomic_ref_count_inc (&rarray->ref_count);
 
   return array;
 }
@@ -1047,7 +1068,7 @@ g_ptr_array_unref (GPtrArray *array)
 
   g_return_if_fail (array);
 
-  if (g_atomic_int_dec_and_test (&rarray->ref_count))
+  if (g_atomic_ref_count_dec (&rarray->ref_count))
     ptr_array_free (array, FREE_SEGMENT);
 }
 
@@ -1088,7 +1109,7 @@ g_ptr_array_free (GPtrArray *array,
   /* if others are holding a reference, preserve the wrapper but
    * do free/return the data
    */
-  if (!g_atomic_int_dec_and_test (&rarray->ref_count))
+  if (!g_atomic_ref_count_dec (&rarray->ref_count))
     flags |= PRESERVE_WRAPPER;
 
   return ptr_array_free (array, flags);
@@ -1168,27 +1189,31 @@ g_ptr_array_set_size  (GPtrArray *array,
                        gint       length)
 {
   GRealPtrArray *rarray = (GRealPtrArray *)array;
+  guint length_unsigned;
 
   g_return_if_fail (rarray);
   g_return_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL));
+  g_return_if_fail (length >= 0);
 
-  if (length > rarray->len)
+  length_unsigned = (guint) length;
+
+  if (length_unsigned > rarray->len)
     {
-      int i;
-      g_ptr_array_maybe_expand (rarray, (length - rarray->len));
+      guint i;
+      g_ptr_array_maybe_expand (rarray, (length_unsigned - rarray->len));
       /* This is not 
        *     memset (array->pdata + array->len, 0,
-       *            sizeof (gpointer) * (length - array->len));
+       *            sizeof (gpointer) * (length_unsigned - array->len));
        * to make it really portable. Remember (void*)NULL needn't be
        * bitwise zero. It of course is silly not to use memset (..,0,..).
        */
-      for (i = rarray->len; i < length; i++)
+      for (i = rarray->len; i < length_unsigned; i++)
         rarray->pdata[i] = NULL;
     }
-  else if (length < rarray->len)
-    g_ptr_array_remove_range (array, length, rarray->len - length);
+  else if (length_unsigned < rarray->len)
+    g_ptr_array_remove_range (array, length_unsigned, rarray->len - length_unsigned);
 
-  rarray->len = length;
+  rarray->len = length_unsigned;
 }
 
 static gpointer
diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c
index 8529beb8b..3eb38393d 100644
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.c
@@ -539,6 +539,8 @@ g_async_queue_timeout_pop (GAsyncQueue *queue,
   gint64 end_time = g_get_monotonic_time () + timeout;
   gpointer retval;
 
+  g_return_val_if_fail (queue != NULL, NULL);
+
   g_mutex_lock (&queue->mutex);
   retval = g_async_queue_pop_intern_unlocked (queue, TRUE, end_time);
   g_mutex_unlock (&queue->mutex);
@@ -567,6 +569,8 @@ g_async_queue_timeout_pop_unlocked (GAsyncQueue *queue,
 {
   gint64 end_time = g_get_monotonic_time () + timeout;
 
+  g_return_val_if_fail (queue != NULL, NULL);
+
   return g_async_queue_pop_intern_unlocked (queue, TRUE, end_time);
 }
 
diff --git a/glib/gatomic.h b/glib/gatomic.h
index 8e5efccb4..971176eb9 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -109,7 +109,8 @@ G_END_DECLS
 #define g_atomic_pointer_get(atomic) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (gpointer) __atomic_load_8 ((atomic), __ATOMIC_SEQ_CST);                 \
+    guint64 gapg_temp = __atomic_load_8 ((atomic), __ATOMIC_SEQ_CST);        \
+    (gpointer) gapg_temp;                                                    \
   }))
 #define g_atomic_pointer_set(atomic, newval) \
   (G_GNUC_EXTENSION ({                                                       \
@@ -127,7 +128,8 @@ G_END_DECLS
 #define g_atomic_pointer_get(atomic) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (gpointer) __atomic_load_4 ((atomic), __ATOMIC_SEQ_CST);                 \
+    guint32 gapg_temp = __atomic_load_4 ((atomic), __ATOMIC_SEQ_CST);        \
+    (gpointer) gapg_temp;                                                    \
   }))
 #define g_atomic_pointer_set(atomic, newval) \
   (G_GNUC_EXTENSION ({                                                       \
@@ -186,7 +188,7 @@ G_END_DECLS
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
     (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1);                        \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
+    __sync_bool_compare_and_swap ((atomic), (oldval), (newval)) ? TRUE : FALSE; \
   }))
 #define g_atomic_int_add(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
@@ -217,7 +219,7 @@ G_END_DECLS
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
     (void) (0 ? (gpointer) *(atomic) : NULL);                                \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
+    __sync_bool_compare_and_swap ((atomic), (oldval), (newval)) ? TRUE : FALSE; \
   }))
 #define g_atomic_pointer_add(atomic, val) \
   (G_GNUC_EXTENSION ({                                                       \
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index d29f4fad6..e83079985 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -68,18 +68,6 @@
 #include "gprintfint.h"
 #include "gutils.h"
 
-
-#ifndef NO_FD_SET
-#  define SELECT_MASK fd_set
-#else
-#  if defined(_IBMR2)
-#    define SELECT_MASK void
-#  else
-#    define SELECT_MASK int
-#  endif
-#endif
-
-
 #ifndef G_OS_WIN32
 static void stack_trace (const char * const *args);
 #endif
@@ -274,8 +262,8 @@ stack_trace (const char * const *args)
   pid_t pid;
   int in_fd[2];
   int out_fd[2];
-  SELECT_MASK fdset;
-  SELECT_MASK readset;
+  fd_set fdset;
+  fd_set readset;
   struct timeval tv;
   int sel, idx, state;
   char buffer[256];
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index bbbc66e5d..e6f885e6b 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -210,7 +210,7 @@ struct _GBookmarkFile
 };
 
 /* parser state machine */
-enum
+typedef enum
 {
   STATE_STARTED        = 0,
   
@@ -228,7 +228,7 @@ enum
   STATE_ICON,
   
   STATE_FINISHED
-};
+} ParserState;
 
 static void          g_bookmark_file_init        (GBookmarkFile  *bookmark);
 static void          g_bookmark_file_clear       (GBookmarkFile  *bookmark);
@@ -681,7 +681,7 @@ g_bookmark_file_clear (GBookmarkFile *bookmark)
 
 struct _ParseData
 {
-  gint state;
+  ParserState state;
   
   GHashTable *namespaces;
   
@@ -1083,6 +1083,43 @@ is_element_full (ParseData   *parse_data,
 #define IS_ELEMENT(p,s,e)	(is_element_full ((p), (s), NULL, (e), '\0'))
 #define IS_ELEMENT_NS(p,s,n,e)	(is_element_full ((p), (s), (n), (e), '|'))
 
+static const gchar *
+parser_state_to_element_name (ParserState state)
+{
+  switch (state)
+    {
+    case STATE_STARTED:
+    case STATE_FINISHED:
+      return "(top-level)";
+    case STATE_ROOT:
+      return XBEL_ROOT_ELEMENT;
+    case STATE_BOOKMARK:
+      return XBEL_BOOKMARK_ELEMENT;
+    case STATE_TITLE:
+      return XBEL_TITLE_ELEMENT;
+    case STATE_DESC:
+      return XBEL_DESC_ELEMENT;
+    case STATE_INFO:
+      return XBEL_INFO_ELEMENT;
+    case STATE_METADATA:
+      return XBEL_METADATA_ELEMENT;
+    case STATE_APPLICATIONS:
+      return BOOKMARK_APPLICATIONS_ELEMENT;
+    case STATE_APPLICATION:
+      return BOOKMARK_APPLICATION_ELEMENT;
+    case STATE_GROUPS:
+      return BOOKMARK_GROUPS_ELEMENT;
+    case STATE_GROUP:
+      return BOOKMARK_GROUP_ELEMENT;
+    case STATE_MIME:
+      return MIME_TYPE_ELEMENT;
+    case STATE_ICON:
+      return BOOKMARK_ICON_ELEMENT;
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static void
 start_element_raw_cb (GMarkupParseContext *context,
                       const gchar         *element_name,
@@ -1263,8 +1300,23 @@ start_element_raw_cb (GMarkupParseContext *context,
         	     element_name,
         	     BOOKMARK_GROUP_ELEMENT);
       break;
+
+    case STATE_TITLE:
+    case STATE_DESC:
+    case STATE_APPLICATION:
+    case STATE_GROUP:
+    case STATE_MIME:
+    case STATE_ICON:
+    case STATE_FINISHED:
+      g_set_error (error, G_MARKUP_ERROR,
+                   G_MARKUP_ERROR_INVALID_CONTENT,
+                   _("Unexpected tag “%s� inside “%s�"),
+                   element_name,
+                   parser_state_to_element_name (parse_data->state));
+      break;
+
     default:
-      g_warn_if_reached ();
+      g_assert_not_reached ();
       break;
     }
 }
@@ -1774,7 +1826,7 @@ find_file_in_data_dirs (const gchar   *file,
  * This function looks for a desktop bookmark file named @file in the
  * paths returned from g_get_user_data_dir() and g_get_system_data_dirs(), 
  * loads the file into @bookmark and returns the file's full path in 
- * @full_path.  If the file could not be loaded then an %error is
+ * @full_path.  If the file could not be loaded then @error is
  * set to either a #GFileError or #GBookmarkFileError.
  *
  * Returns: %TRUE if a key file could be loaded, %FALSE otherwise
diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h
index 832522e27..39afa3f79 100644
--- a/glib/gbsearcharray.h
+++ b/glib/gbsearcharray.h
@@ -116,11 +116,7 @@ static inline void              g_bsearch_array_free      (GBSearchArray
 
 /* --- implementation --- */
 /* helper macro to cut down realloc()s */
-#ifdef  DISABLE_MEM_POOLS
-#define G_BSEARCH_UPPER_POWER2(n)       (n)
-#else   /* !DISABLE_MEM_POOLS */
 #define G_BSEARCH_UPPER_POWER2(n)       ((n) ? 1 << g_bit_storage ((n) - 1) : 0)
-#endif  /* !DISABLE_MEM_POOLS */
 #define G_BSEARCH_ARRAY_NODES(barray)    (((guint8*) (barray)) + sizeof (GBSearchArray))
 static inline GBSearchArray*
 g_bsearch_array_create (const GBSearchConfig *bconfig)
diff --git a/glib/gbytes.c b/glib/gbytes.c
index 56133b6b2..ee2484454 100644
--- a/glib/gbytes.c
+++ b/glib/gbytes.c
@@ -30,6 +30,7 @@
 #include <glib/gtestutils.h>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
+#include <glib/grefcount.h>
 
 #include <string.h>
 #include <errno.h>
@@ -76,7 +77,7 @@
 struct _GBytes
 {
   gsize size;
-  gint  ref_count;
+  gatomicrefcount ref_count;
   gint  type_or_fd;
 };
 
@@ -138,7 +139,7 @@ g_bytes_allocate (guint struct_size,
 
   bytes = g_slice_alloc (struct_size);
   bytes->size = data_size;
-  bytes->ref_count = 1;
+  g_atomic_ref_count_init (&bytes->ref_count);
   bytes->type_or_fd = type_or_fd;
 
   return bytes;
@@ -500,7 +501,7 @@ g_bytes_ref (GBytes *bytes)
 {
   g_return_val_if_fail (bytes != NULL, NULL);
 
-  g_atomic_int_inc (&bytes->ref_count);
+  g_atomic_ref_count_inc (&bytes->ref_count);
 
   return bytes;
 }
@@ -520,7 +521,7 @@ g_bytes_unref (GBytes *bytes)
   if (bytes == NULL)
     return;
 
-  if (g_atomic_int_dec_and_test (&bytes->ref_count))
+  if (g_atomic_ref_count_dec (&bytes->ref_count))
     {
       switch (bytes->type_or_fd)
         {
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index f151ced49..5530aad2f 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -1118,46 +1118,46 @@ sha256_sum_digest (Sha256sum *sha256,
 
 /* SHA-384 and SHA-512 constants [§4.2.3] */
 static const guint64 SHA2_K[80] = {
-  0x428a2f98d728ae22, 0x7137449123ef65cd,
-  0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc,
-  0x3956c25bf348b538, 0x59f111f1b605d019,
-  0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
-  0xd807aa98a3030242, 0x12835b0145706fbe,
-  0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
-  0x72be5d74f27b896f, 0x80deb1fe3b1696b1,
-  0x9bdc06a725c71235, 0xc19bf174cf692694,
-  0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
-  0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
-  0x2de92c6f592b0275, 0x4a7484aa6ea6e483,
-  0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
-  0x983e5152ee66dfab, 0xa831c66d2db43210,
-  0xb00327c898fb213f, 0xbf597fc7beef0ee4,
-  0xc6e00bf33da88fc2, 0xd5a79147930aa725,
-  0x06ca6351e003826f, 0x142929670a0e6e70,
-  0x27b70a8546d22ffc, 0x2e1b21385c26c926,
-  0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
-  0x650a73548baf63de, 0x766a0abb3c77b2a8,
-  0x81c2c92e47edaee6, 0x92722c851482353b,
-  0xa2bfe8a14cf10364, 0xa81a664bbc423001,
-  0xc24b8b70d0f89791, 0xc76c51a30654be30,
-  0xd192e819d6ef5218, 0xd69906245565a910,
-  0xf40e35855771202a, 0x106aa07032bbd1b8,
-  0x19a4c116b8d2d0c8, 0x1e376c085141ab53,
-  0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8,
-  0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb,
-  0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3,
-  0x748f82ee5defb2fc, 0x78a5636f43172f60,
-  0x84c87814a1f0ab72, 0x8cc702081a6439ec,
-  0x90befffa23631e28, 0xa4506cebde82bde9,
-  0xbef9a3f7b2c67915, 0xc67178f2e372532b,
-  0xca273eceea26619c, 0xd186b8c721c0c207,
-  0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
-  0x06f067aa72176fba, 0x0a637dc5a2c898a6,
-  0x113f9804bef90dae, 0x1b710b35131c471b,
-  0x28db77f523047d84, 0x32caab7b40c72493,
-  0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c,
-  0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
-  0x5fcb6fab3ad6faec, 0x6c44198c4a475817
+  G_GUINT64_CONSTANT (0x428a2f98d728ae22), G_GUINT64_CONSTANT (0x7137449123ef65cd),
+  G_GUINT64_CONSTANT (0xb5c0fbcfec4d3b2f), G_GUINT64_CONSTANT (0xe9b5dba58189dbbc),
+  G_GUINT64_CONSTANT (0x3956c25bf348b538), G_GUINT64_CONSTANT (0x59f111f1b605d019),
+  G_GUINT64_CONSTANT (0x923f82a4af194f9b), G_GUINT64_CONSTANT (0xab1c5ed5da6d8118),
+  G_GUINT64_CONSTANT (0xd807aa98a3030242), G_GUINT64_CONSTANT (0x12835b0145706fbe),
+  G_GUINT64_CONSTANT (0x243185be4ee4b28c), G_GUINT64_CONSTANT (0x550c7dc3d5ffb4e2),
+  G_GUINT64_CONSTANT (0x72be5d74f27b896f), G_GUINT64_CONSTANT (0x80deb1fe3b1696b1),
+  G_GUINT64_CONSTANT (0x9bdc06a725c71235), G_GUINT64_CONSTANT (0xc19bf174cf692694),
+  G_GUINT64_CONSTANT (0xe49b69c19ef14ad2), G_GUINT64_CONSTANT (0xefbe4786384f25e3),
+  G_GUINT64_CONSTANT (0x0fc19dc68b8cd5b5), G_GUINT64_CONSTANT (0x240ca1cc77ac9c65),
+  G_GUINT64_CONSTANT (0x2de92c6f592b0275), G_GUINT64_CONSTANT (0x4a7484aa6ea6e483),
+  G_GUINT64_CONSTANT (0x5cb0a9dcbd41fbd4), G_GUINT64_CONSTANT (0x76f988da831153b5),
+  G_GUINT64_CONSTANT (0x983e5152ee66dfab), G_GUINT64_CONSTANT (0xa831c66d2db43210),
+  G_GUINT64_CONSTANT (0xb00327c898fb213f), G_GUINT64_CONSTANT (0xbf597fc7beef0ee4),
+  G_GUINT64_CONSTANT (0xc6e00bf33da88fc2), G_GUINT64_CONSTANT (0xd5a79147930aa725),
+  G_GUINT64_CONSTANT (0x06ca6351e003826f), G_GUINT64_CONSTANT (0x142929670a0e6e70),
+  G_GUINT64_CONSTANT (0x27b70a8546d22ffc), G_GUINT64_CONSTANT (0x2e1b21385c26c926),
+  G_GUINT64_CONSTANT (0x4d2c6dfc5ac42aed), G_GUINT64_CONSTANT (0x53380d139d95b3df),
+  G_GUINT64_CONSTANT (0x650a73548baf63de), G_GUINT64_CONSTANT (0x766a0abb3c77b2a8),
+  G_GUINT64_CONSTANT (0x81c2c92e47edaee6), G_GUINT64_CONSTANT (0x92722c851482353b),
+  G_GUINT64_CONSTANT (0xa2bfe8a14cf10364), G_GUINT64_CONSTANT (0xa81a664bbc423001),
+  G_GUINT64_CONSTANT (0xc24b8b70d0f89791), G_GUINT64_CONSTANT (0xc76c51a30654be30),
+  G_GUINT64_CONSTANT (0xd192e819d6ef5218), G_GUINT64_CONSTANT (0xd69906245565a910),
+  G_GUINT64_CONSTANT (0xf40e35855771202a), G_GUINT64_CONSTANT (0x106aa07032bbd1b8),
+  G_GUINT64_CONSTANT (0x19a4c116b8d2d0c8), G_GUINT64_CONSTANT (0x1e376c085141ab53),
+  G_GUINT64_CONSTANT (0x2748774cdf8eeb99), G_GUINT64_CONSTANT (0x34b0bcb5e19b48a8),
+  G_GUINT64_CONSTANT (0x391c0cb3c5c95a63), G_GUINT64_CONSTANT (0x4ed8aa4ae3418acb),
+  G_GUINT64_CONSTANT (0x5b9cca4f7763e373), G_GUINT64_CONSTANT (0x682e6ff3d6b2b8a3),
+  G_GUINT64_CONSTANT (0x748f82ee5defb2fc), G_GUINT64_CONSTANT (0x78a5636f43172f60),
+  G_GUINT64_CONSTANT (0x84c87814a1f0ab72), G_GUINT64_CONSTANT (0x8cc702081a6439ec),
+  G_GUINT64_CONSTANT (0x90befffa23631e28), G_GUINT64_CONSTANT (0xa4506cebde82bde9),
+  G_GUINT64_CONSTANT (0xbef9a3f7b2c67915), G_GUINT64_CONSTANT (0xc67178f2e372532b),
+  G_GUINT64_CONSTANT (0xca273eceea26619c), G_GUINT64_CONSTANT (0xd186b8c721c0c207),
+  G_GUINT64_CONSTANT (0xeada7dd6cde0eb1e), G_GUINT64_CONSTANT (0xf57d4f7fee6ed178),
+  G_GUINT64_CONSTANT (0x06f067aa72176fba), G_GUINT64_CONSTANT (0x0a637dc5a2c898a6),
+  G_GUINT64_CONSTANT (0x113f9804bef90dae), G_GUINT64_CONSTANT (0x1b710b35131c471b),
+  G_GUINT64_CONSTANT (0x28db77f523047d84), G_GUINT64_CONSTANT (0x32caab7b40c72493),
+  G_GUINT64_CONSTANT (0x3c9ebe0a15c9bebc), G_GUINT64_CONSTANT (0x431d67c49c100d4c),
+  G_GUINT64_CONSTANT (0x4cc5d4becb3e42b6), G_GUINT64_CONSTANT (0x597f299cfc657e2a),
+  G_GUINT64_CONSTANT (0x5fcb6fab3ad6faec), G_GUINT64_CONSTANT (0x6c44198c4a475817)
 };
 
 
@@ -1165,14 +1165,14 @@ static void
 sha384_sum_init (Sha512sum *sha512)
 {
   /* Initial Hash Value [§5.3.4] */
-  sha512->H[0] = 0xcbbb9d5dc1059ed8;
-  sha512->H[1] = 0x629a292a367cd507;
-  sha512->H[2] = 0x9159015a3070dd17;
-  sha512->H[3] = 0x152fecd8f70e5939;
-  sha512->H[4] = 0x67332667ffc00b31;
-  sha512->H[5] = 0x8eb44a8768581511;
-  sha512->H[6] = 0xdb0c2e0d64f98fa7;
-  sha512->H[7] = 0x47b5481dbefa4fa4;
+  sha512->H[0] = G_GUINT64_CONSTANT (0xcbbb9d5dc1059ed8);
+  sha512->H[1] = G_GUINT64_CONSTANT (0x629a292a367cd507);
+  sha512->H[2] = G_GUINT64_CONSTANT (0x9159015a3070dd17);
+  sha512->H[3] = G_GUINT64_CONSTANT (0x152fecd8f70e5939);
+  sha512->H[4] = G_GUINT64_CONSTANT (0x67332667ffc00b31);
+  sha512->H[5] = G_GUINT64_CONSTANT (0x8eb44a8768581511);
+  sha512->H[6] = G_GUINT64_CONSTANT (0xdb0c2e0d64f98fa7);
+  sha512->H[7] = G_GUINT64_CONSTANT (0x47b5481dbefa4fa4);
 
   sha512->block_len = 0;
 
@@ -1184,14 +1184,14 @@ static void
 sha512_sum_init (Sha512sum *sha512)
 {
   /* Initial Hash Value [§5.3.5] */
-  sha512->H[0] = 0x6a09e667f3bcc908;
-  sha512->H[1] = 0xbb67ae8584caa73b;
-  sha512->H[2] = 0x3c6ef372fe94f82b;
-  sha512->H[3] = 0xa54ff53a5f1d36f1;
-  sha512->H[4] = 0x510e527fade682d1;
-  sha512->H[5] = 0x9b05688c2b3e6c1f;
-  sha512->H[6] = 0x1f83d9abfb41bd6b;
-  sha512->H[7] = 0x5be0cd19137e2179;
+  sha512->H[0] = G_GUINT64_CONSTANT (0x6a09e667f3bcc908);
+  sha512->H[1] = G_GUINT64_CONSTANT (0xbb67ae8584caa73b);
+  sha512->H[2] = G_GUINT64_CONSTANT (0x3c6ef372fe94f82b);
+  sha512->H[3] = G_GUINT64_CONSTANT (0xa54ff53a5f1d36f1);
+  sha512->H[4] = G_GUINT64_CONSTANT (0x510e527fade682d1);
+  sha512->H[5] = G_GUINT64_CONSTANT (0x9b05688c2b3e6c1f);
+  sha512->H[6] = G_GUINT64_CONSTANT (0x1f83d9abfb41bd6b);
+  sha512->H[7] = G_GUINT64_CONSTANT (0x5be0cd19137e2179);
 
   sha512->block_len = 0;
 
diff --git a/glib/gconvert.h b/glib/gconvert.h
index d0d372150..c2e69a5a0 100644
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -164,7 +164,7 @@ gchar *g_filename_to_uri   (const gchar *filename,
 GLIB_AVAILABLE_IN_ALL
 gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
 GLIB_AVAILABLE_IN_ALL
-gboolean g_get_filename_charsets (const gchar ***charsets);
+gboolean g_get_filename_charsets (const gchar ***filename_charsets);
 
 GLIB_AVAILABLE_IN_ALL
 gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
diff --git a/glib/gdate.c b/glib/gdate.c
index 13a16aaeb..6e163b8a7 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -1088,7 +1088,7 @@ g_date_prepare_to_parse (const gchar      *str,
         {
 	  gchar *casefold;
 	  
-          g_date_set_dmy (&d, 1, i, 1);
+          g_date_set_dmy (&d, 1, i, 1976);
 	  
           g_return_if_fail (g_date_valid (&d));
 	  
@@ -1387,7 +1387,10 @@ g_date_set_parse (GDate       *d,
  *
  * To set the value of a date to the current day, you could write:
  * |[<!-- language="C" -->
- *  g_date_set_time_t (date, time (NULL)); 
+ *  time_t now = time (NULL);
+ *  if (now == (time_t) -1)
+ *    // handle the error
+ *  g_date_set_time_t (date, now);
  * ]|
  *
  * Since: 2.10
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 6f62c806e..952ed3b28 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -1173,6 +1173,17 @@ write_to_temp_file (const gchar  *contents,
  *   lists, metadata etc. may be lost. If @filename is a symbolic link,
  *   the link itself will be replaced, not the linked file.
  *
+ * - On UNIX, if @filename already exists and is non-empty, and if the system
+ *   supports it (via a journalling filesystem or equivalent), the fsync()
+ *   call (or equivalent) will be used to ensure atomic replacement: @filename
+ *   will contain either its old contents or @contents, even in the face of
+ *   system power loss, the disk being unsafely removed, etc.
+ *
+ * - On UNIX, if @filename does not already exist or is empty, there is a
+ *   possibility that system power loss etc. after calling this function will
+ *   leave @filename empty or full of NUL bytes, depending on the underlying
+ *   filesystem.
+ *
  * - On Windows renaming a file will not remove an existing file with the
  *   new name, so on Windows there is a race condition between the existing
  *   file being removed and the temporary file being renamed.
diff --git a/glib/ghash.c b/glib/ghash.c
index 87218114f..433004cf8 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -37,7 +37,7 @@
 #include "gatomic.h"
 #include "gtestutils.h"
 #include "gslice.h"
-
+#include "grefcount.h"
 
 /**
  * SECTION:hash_tables
@@ -227,7 +227,7 @@ struct _GHashTable
 
   GHashFunc        hash_func;
   GEqualFunc       key_equal_func;
-  gint             ref_count;
+  gatomicrefcount  ref_count;
 #ifndef G_DISABLE_ASSERT
   /*
    * Tracks the structure of the hash table, not its contents: is only
@@ -374,7 +374,7 @@ g_hash_table_lookup_node (GHashTable    *hash_table,
    * (as keys, etc. will be NULL).
    * Applications need to either use g_hash_table_destroy, or ensure the hash
    * table is empty prior to removing the last reference using g_hash_table_unref(). */
-  g_assert (hash_table->ref_count > 0);
+  g_assert (!g_atomic_ref_count_compare (&hash_table->ref_count, 0));
 
   hash_value = hash_table->hash_func (key);
   if (G_UNLIKELY (!HASH_IS_REAL (hash_value)))
@@ -716,11 +716,11 @@ g_hash_table_new_full (GHashFunc      hash_func,
 
   hash_table = g_slice_new (GHashTable);
   g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT);
+  g_atomic_ref_count_init (&hash_table->ref_count);
   hash_table->nnodes             = 0;
   hash_table->noccupied          = 0;
   hash_table->hash_func          = hash_func ? hash_func : g_direct_hash;
   hash_table->key_equal_func     = key_equal_func;
-  hash_table->ref_count          = 1;
 #ifndef G_DISABLE_ASSERT
   hash_table->version            = 0;
 #endif
@@ -1077,7 +1077,7 @@ g_hash_table_ref (GHashTable *hash_table)
 {
   g_return_val_if_fail (hash_table != NULL, NULL);
 
-  g_atomic_int_inc (&hash_table->ref_count);
+  g_atomic_ref_count_inc (&hash_table->ref_count);
 
   return hash_table;
 }
@@ -1098,7 +1098,7 @@ g_hash_table_unref (GHashTable *hash_table)
 {
   g_return_if_fail (hash_table != NULL);
 
-  if (g_atomic_int_dec_and_test (&hash_table->ref_count))
+  if (g_atomic_ref_count_dec (&hash_table->ref_count))
     {
       g_hash_table_remove_all_nodes (hash_table, TRUE, TRUE);
       if (hash_table->keys != hash_table->values)
@@ -1909,9 +1909,9 @@ g_hash_table_get_values (GHashTable *hash_table)
  * @key_equal_func parameter, when using non-%NULL strings as keys in a
  * #GHashTable.
  *
- * Note that this function is primarily meant as a hash table comparison
- * function. For a general-purpose, %NULL-safe string comparison function,
- * see g_strcmp0().
+ * This function is typically used for hash table comparisons, but can be used
+ * for general purpose comparisons of non-%NULL strings. For a %NULL-safe string
+ * comparison function, see g_strcmp0().
  *
  * Returns: %TRUE if the two keys match
  */
diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h
index fa16376de..8a44dbfaf 100644
--- a/glib/glib-autocleanups.h
+++ b/glib/glib-autocleanups.h
@@ -87,3 +87,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantDict, g_variant_dict_unref)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GVariantDict, g_variant_dict_clear)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantType, g_variant_type_free)
 G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GRefString, g_ref_string_release)
diff --git a/glib/glib-init.c b/glib/glib-init.c
index 5f312113a..6cb4e4a0d 100644
--- a/glib/glib-init.c
+++ b/glib/glib-init.c
@@ -74,11 +74,8 @@ G_STATIC_ASSERT (_g_alignof (TestInt) == _g_alignof (int));
  * This variable is %TRUE if the `G_DEBUG` environment variable
  * includes the key `gc-friendly`.
  */
-#ifdef ENABLE_GC_FRIENDLY_DEFAULT
-gboolean g_mem_gc_friendly = TRUE;
-#else
 gboolean g_mem_gc_friendly = FALSE;
-#endif
+
 GLogLevelFlags g_log_msg_prefix = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING |
                                   G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
 GLogLevelFlags g_log_always_fatal = G_LOG_FATAL_MASK;
@@ -295,6 +292,8 @@ DllMain (HINSTANCE hinstDLL,
       g_thread_win32_init ();
 #endif
       glib_init ();
+      /* must go after glib_init */
+      g_console_win32_init ();
       break;
 
     case DLL_THREAD_DETACH:
diff --git a/glib/glib-init.h b/glib/glib-init.h
index 5da33c052..695dc044b 100644
--- a/glib/glib-init.h
+++ b/glib/glib-init.h
@@ -34,6 +34,7 @@ void g_quark_init (void);
 void g_thread_win32_process_detach (void);
 void g_thread_win32_thread_detach (void);
 void g_thread_win32_init (void);
+void g_console_win32_init (void);
 void g_clock_win32_init (void);
 extern HMODULE glib_dll;
 #endif
diff --git a/glib/glib.h b/glib/glib.h
index 4f5a7f702..94a11fb62 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -69,6 +69,9 @@
 #include <glib/gquark.h>
 #include <glib/gqueue.h>
 #include <glib/grand.h>
+#include <glib/grcbox.h>
+#include <glib/grefcount.h>
+#include <glib/grefstring.h>
 #include <glib/gregex.h>
 #include <glib/gscanner.h>
 #include <glib/gsequence.h>
diff --git a/glib/glib.stp.in b/glib/glib.stp.in
index dc80e708d..0577d8ca2 100644
--- a/glib/glib.stp.in
+++ b/glib/glib.stp.in
@@ -598,3 +598,48 @@ probe glib.thread_spawned = process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.
   name = user_string($arg3);
   probestr = sprintf("glib.thread_spawned(%p, %p, %s)", func, data, name);
 }
+
+/**
+ * probe glib.rcbox_alloc - Called when a refcounted block is initially requested
+ * @mem: Raw memory pointer returned
+ * @n_bytes: number of bytes
+ * @atomic: Boolean value, %TRUE if this block is atomically refcounted
+ * @zeroed: Boolean value, %TRUE if this block was filled with NUL bytes
+ */
+probe glib.rcbox_alloc = process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("rcbox__alloc")
+{
+  mem = $arg1;
+  n_bytes = $arg2;
+  atomic = $arg3;
+  zeroed = $arg4;
+  probestr = sprintf("glib.rcbox_alloc(n_bytes=%d) -> %p", n_bytes, mem);
+}
+
+/**
+ * probe glib.rcbox_acquire - Called when a refcounted block acquires a ref
+ */
+probe glib.rcbox_acquire = process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("rcbox__acquire")
+{
+  mem = $arg1;  /* ARG: @mem: Raw memory pointer */
+  atomic = $arg2;  /* ARG: @atomic: Boolean value, %TRUE if the reference was acquired atomically */
+  probestr = sprintf("glib.rcbox_acquire(mem=%p)", mem);
+}
+
+/**
+ * probe glib.rcbox_release - Called when a refcounted block acquires a ref
+ */
+probe glib.rcbox_acquire = process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("rcbox__release")
+{
+  mem = $arg1;  /* ARG: @mem: Raw memory pointer */
+  atomic = $arg2;  /* ARG: @atomic: Boolean value, %TRUE if the reference was released atomically */
+  probestr = sprintf("glib.rcbox_release(mem=%p)", mem);
+}
+
+/**
+ * probe glib.rcbox_free - Called when a refcounted block is freed
+ */
+probe glib.rcbox_free = process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("rcbox__free")
+{
+  mem = $arg1;  /* ARG: @mem: Raw memory pointer */
+  probestr = sprintf("glib.rcbox_free(mem=%p)", mem);
+}
diff --git a/glib/glib_gdb.py b/glib/glib_gdb.py
index 38f101ad5..1cf2ed936 100644
--- a/glib/glib_gdb.py
+++ b/glib/glib_gdb.py
@@ -9,7 +9,7 @@ def read_global_var (symname):
     return gdb.selected_frame().read_var(symname)
 
 def g_quark_to_string (quark):
-    if quark == None:
+    if quark is None:
         return None
     quark = long(quark)
     if quark == 0:
@@ -171,7 +171,7 @@ def pretty_printer_lookup (val):
     return None
 
 def register (obj):
-    if obj == None:
+    if obj is None:
         obj = gdb
 
     obj.pretty_printers.append(pretty_printer_lookup)
diff --git a/glib/glib_probes.d b/glib/glib_probes.d
index 29f7ff12e..d6b1f8d15 100644
--- a/glib/glib_probes.d
+++ b/glib/glib_probes.d
@@ -43,4 +43,8 @@ provider glib {
 	probe source__set_name(void*, const char*);
 	probe source__before_free(void*, void*, void*);
 	probe thread__spawned(void*, void*, char*);
+        probe rcbox__alloc(void*, unsigned int, unsigned int, unsigned int);
+        probe rcbox__acquire(void*, unsigned int);
+        probe rcbox__release(void*, unsigned int);
+        probe rcbox__free(void*);
 };
diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in
deleted file mode 100644
index b8214c009..000000000
--- a/glib/glibconfig.h.win32.in
+++ /dev/null
@@ -1,262 +0,0 @@
-/* glibconfig.h.win32.in. Originally merged from two versions of
- * glibconfig.h, generated by the GLib configure script, for gcc and
- * MSVC.
- */
-
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'glibconfig.h.win32.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-/* #undef 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().
- */
-#define 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 short gint16;
-typedef unsigned short guint16;
-#define G_GINT16_MODIFIER "h"
-#define G_GINT16_FORMAT "hi"
-#define G_GUINT16_FORMAT "hu"
-typedef signed int gint32;
-typedef unsigned int guint32;
-#define G_GINT32_MODIFIER ""
-#define G_GINT32_FORMAT "i"
-#define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1          /* deprecated, always true */
-
-G_GNUC_EXTENSION typedef signed long long gint64;
-G_GNUC_EXTENSION typedef unsigned long long guint64;
-
-#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-#define G_GINT64_MODIFIER "I64"
-#define G_GINT64_FORMAT "I64i"
-#define G_GUINT64_FORMAT "I64u"
-
-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
-
-#define GLIB_SIZEOF_VOID_P 8
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 8
-
-typedef signed long long gssize;
-typedef unsigned long long gsize;
-#define G_GSIZE_MODIFIER "I64"
-#define G_GSSIZE_MODIFIER "I64"
-#define G_GSIZE_FORMAT "I64u"
-#define G_GSSIZE_FORMAT "I64i"
-
-#define G_MAXSIZE	G_MAXUINT64
-#define G_MINSSIZE	G_MININT64
-#define G_MAXSSIZE	G_MAXINT64
-
-#else
-
-#define GLIB_SIZEOF_VOID_P 4
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 4
-
-typedef signed int gssize;
-typedef unsigned int gsize;
-#define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_MODIFIER ""
-#define G_GSIZE_FORMAT "u"
-#define G_GSSIZE_FORMAT "i"
-
-#define G_MAXSIZE	G_MAXUINT
-#define G_MINSSIZE	G_MININT
-#define G_MAXSSIZE	G_MAXINT
-
-#endif
-
-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)
-
-
-#ifdef _WIN64
-# define G_POLLFD_FORMAT "%#I64x"
-# define GPOINTER_TO_INT(p)	((gint)  (gint64) (p))
-# define GPOINTER_TO_UINT(p)	((guint) (guint64) (p))
-
-# define GINT_TO_POINTER(i)	((gpointer) (gint64) (i))
-# define GUINT_TO_POINTER(u)	((gpointer) (guint64) (u))
-
-typedef signed long long gintptr;
-typedef unsigned long long guintptr;
-
-# define G_GINTPTR_MODIFIER      "I64"
-# define G_GINTPTR_FORMAT        "I64i"
-# define G_GUINTPTR_FORMAT       "I64u"
-#else
-# define G_POLLFD_FORMAT "%#x"
-
-# define GPOINTER_TO_INT(p)	((gint)  (gint) (p))
-# define GPOINTER_TO_UINT(p)	((guint) (guint) (p))
-
-# define GINT_TO_POINTER(i)	((gpointer) (gint) (i))
-# define GUINT_TO_POINTER(u)	((gpointer) (guint) (u))
-
-typedef signed int gintptr;
-typedef unsigned int guintptr;
-
-# define G_GINTPTR_MODIFIER      ""
-# define G_GINTPTR_FORMAT        "i"
-# define G_GUINTPTR_FORMAT       "u"
-#endif
-
-#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@
-
-#define G_OS_WIN32
-#define G_PLATFORM_WIN32
-@GLIB_WIN32_STATIC_COMPILATION_DEFINE@
-
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define G_VA_COPY	va_copy
-#endif /* not _MSC_VER or 2013 or later */
-
-#ifndef _MSC_VER
-# define G_HAVE_ISO_VARARGS 1
-# define G_HAVE_GNUC_VARARGS 1
-# define G_HAVE_GNUC_VISIBILITY 1
-
-/* 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
-
-#define G_HAVE_GROWING_STACK 0
-
-#else /* _MSC_VER */
-# define G_HAVE_ISO_VARARGS 1
-#endif /* not _MSC_VER */
-
-#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_WIN32
-
-#define G_ATOMIC_LOCK_FREE
-
-#define GINT16_TO_LE(val)	((gint16) (val))
-#define GUINT16_TO_LE(val)	((guint16) (val))
-#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-#define GINT32_TO_LE(val)	((gint32) (val))
-#define GUINT32_TO_LE(val)	((guint32) (val))
-#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-#define GINT64_TO_LE(val)	((gint64) (val))
-#define GUINT64_TO_LE(val)	((guint64) (val))
-#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
-#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-#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))
-
-#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 =768
-#define GLIB_SYSDEF_POLLOUT =16
-#define GLIB_SYSDEF_POLLPRI =1024
-#define GLIB_SYSDEF_POLLHUP =2
-#define GLIB_SYSDEF_POLLERR =1
-#define GLIB_SYSDEF_POLLNVAL =4
-
-#define G_MODULE_SUFFIX "dll"
-
-/* A GPid is an abstraction for a process "handle". It is *not* an
- * abstraction for a process identifier in general. GPid is used in
- * GLib only for descendant processes spawned with the g_spawn*
- * functions. On POSIX there is no "process handle" concept as such,
- * but on Windows a GPid is a handle to a process, a kind of pointer,
- * not a process identifier.
- */
-typedef void * GPid;
-#define G_PID_FORMAT "p"
-
-#define GLIB_SYSDEF_AF_UNIX 1
-#define GLIB_SYSDEF_AF_INET 2
-#define GLIB_SYSDEF_AF_INET6 23
-
-#define GLIB_SYSDEF_MSG_OOB       1
-#define GLIB_SYSDEF_MSG_PEEK      2
-#define GLIB_SYSDEF_MSG_DONTROUTE 4
-
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 55fb81e5b..9b8ef0e89 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -111,6 +111,18 @@
 #endif
 
 /*
+ * We can only use __typeof__ on GCC >= 4.8, and not when compiling C++. Since
+ * __typeof__ is used in a few places in GLib, provide a pre-processor symbol
+ * to factor the check out from callers.
+ *
+ * This symbol is private.
+ */
+#undef g_has_typeof
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus)
+#define g_has_typeof
+#endif
+
+/*
  * Clang feature detection: http://clang.llvm.org/docs/LanguageExtensions.html
  * These are not available on GCC, but since the pre-processor doesn't do
  * operator short-circuiting, we can't use it in a statement or we'll get:
@@ -329,6 +341,9 @@
 #undef	CLAMP
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
+#define G_APPROX_VALUE(a, b, epsilon) \
+  (((a) > (b) ? (a) - (b) : (b) - (a)) < (epsilon))
+
 /* Count the number of elements in an array. The array must be defined
  * as such; using this with a dynamically allocated array will give
  * incorrect results.
@@ -482,9 +497,9 @@
   typedef GList *_GLIB_AUTOPTR_LIST_TYPENAME(TypeName);                                                         \
   typedef GSList *_GLIB_AUTOPTR_SLIST_TYPENAME(TypeName);                                                         \
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS                                                                              \
-  static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
-  static inline void _GLIB_AUTOPTR_LIST_FUNC_NAME(TypeName) (GList **_l) { g_list_free_full (*_l, (GDestroyNotify) func); } \
-  static inline void _GLIB_AUTOPTR_SLIST_FUNC_NAME(TypeName) (GSList **_l) { g_slist_free_full (*_l, (GDestroyNotify) func); } \
+  static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
+  static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_LIST_FUNC_NAME(TypeName) (GList **_l) { g_list_free_full (*_l, (GDestroyNotify) (void(*)(void)) func); } \
+  static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_SLIST_FUNC_NAME(TypeName) (GSList **_l) { g_slist_free_full (*_l, (GDestroyNotify) (void(*)(void)) func); } \
   G_GNUC_END_IGNORE_DEPRECATIONS
 #define G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(TypeName, func) \
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS                                                                              \
diff --git a/glib/gmain.c b/glib/gmain.c
index 181483527..0a6857ce8 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1296,6 +1296,11 @@ g_source_destroy (GSource *source)
  * context. The reverse
  * mapping from ID to source is done by g_main_context_find_source_by_id().
  *
+ * You can only call this function while the source is associated to a
+ * #GMainContext instance; calling this function before g_source_attach()
+ * or after g_source_destroy() yields undefined behavior. The ID returned
+ * is unique within the #GMainContext instance passed to g_source_attach().
+ *
  * Returns: the ID (greater than 0) for the source
  **/
 guint
@@ -1628,7 +1633,8 @@ g_source_set_callback_indirect (GSource              *source,
  *
  * The exact type of @func depends on the type of source; ie. you
  * should not count on @func being called with @data as its first
- * parameter.
+ * parameter. Cast @func with G_SOURCE_FUNC() to avoid warnings about
+ * incompatible function types.
  *
  * See [memory management of sources][mainloop-memory-management] for details
  * on how to handle memory management of @data.
@@ -2437,8 +2443,7 @@ g_clear_handle_id (guint            *tag_ptr,
   if (_handle_id > 0)
     {
       *tag_ptr = 0;
-      if (clear_func != NULL)
-        clear_func (_handle_id);
+      clear_func (_handle_id);
     }
 }
 
@@ -3302,25 +3307,10 @@ g_main_context_release (GMainContext *context)
   UNLOCK_CONTEXT (context); 
 }
 
-/**
- * g_main_context_wait:
- * @context: a #GMainContext
- * @cond: a condition variable
- * @mutex: a mutex, currently held
- * 
- * Tries to become the owner of the specified context,
- * as with g_main_context_acquire(). But if another thread
- * is the owner, atomically drop @mutex and wait on @cond until 
- * that owner releases ownership or until @cond is signaled, then
- * try again (once) to become the owner.
- * 
- * Returns: %TRUE if the operation succeeded, and
- *   this thread is now the owner of @context.
- **/
-gboolean
-g_main_context_wait (GMainContext *context,
-		     GCond        *cond,
-		     GMutex       *mutex)
+static gboolean
+g_main_context_wait_internal (GMainContext *context,
+                              GCond        *cond,
+                              GMutex       *mutex)
 {
   gboolean result = FALSE;
   GThread *self = G_THREAD_SELF;
@@ -3329,18 +3319,6 @@ g_main_context_wait (GMainContext *context,
   if (context == NULL)
     context = g_main_context_default ();
 
-  if G_UNLIKELY (cond != &context->cond || mutex != &context->mutex)
-    {
-      static gboolean warned;
-
-      if (!warned)
-        {
-          g_critical ("WARNING!! g_main_context_wait() will be removed in a future release.  "
-                      "If you see this message, please file a bug immediately.");
-          warned = TRUE;
-        }
-    }
-
   loop_internal_waiter = (mutex == &context->mutex);
   
   if (!loop_internal_waiter)
@@ -3356,10 +3334,10 @@ g_main_context_wait (GMainContext *context,
       context->waiters = g_slist_append (context->waiters, &waiter);
       
       if (!loop_internal_waiter)
-	UNLOCK_CONTEXT (context);
+        UNLOCK_CONTEXT (context);
       g_cond_wait (cond, mutex);
-      if (!loop_internal_waiter)      
-	LOCK_CONTEXT (context);
+      if (!loop_internal_waiter)
+        LOCK_CONTEXT (context);
 
       context->waiters = g_slist_remove (context->waiters, &waiter);
     }
@@ -3383,6 +3361,45 @@ g_main_context_wait (GMainContext *context,
 }
 
 /**
+ * g_main_context_wait:
+ * @context: a #GMainContext
+ * @cond: a condition variable
+ * @mutex: a mutex, currently held
+ *
+ * Tries to become the owner of the specified context,
+ * as with g_main_context_acquire(). But if another thread
+ * is the owner, atomically drop @mutex and wait on @cond until
+ * that owner releases ownership or until @cond is signaled, then
+ * try again (once) to become the owner.
+ *
+ * Returns: %TRUE if the operation succeeded, and
+ *   this thread is now the owner of @context.
+ * Deprecated: 2.58: Use g_main_context_is_owner() and separate locking instead.
+ */
+gboolean
+g_main_context_wait (GMainContext *context,
+                     GCond        *cond,
+                     GMutex       *mutex)
+{
+  if (context == NULL)
+    context = g_main_context_default ();
+
+  if (G_UNLIKELY (cond != &context->cond || mutex != &context->mutex))
+    {
+      static gboolean warned;
+
+      if (!warned)
+        {
+          g_critical ("WARNING!! g_main_context_wait() will be removed in a future release.  "
+                      "If you see this message, please file a bug immediately.");
+          warned = TRUE;
+        }
+    }
+
+  return g_main_context_wait_internal (context, cond, mutex);
+}
+
+/**
  * g_main_context_prepare:
  * @context: a #GMainContext
  * @priority: location to store priority of highest priority
@@ -3859,9 +3876,9 @@ g_main_context_iterate (GMainContext *context,
       if (!block)
 	return FALSE;
 
-      got_ownership = g_main_context_wait (context,
-                                           &context->cond,
-                                           &context->mutex);
+      got_ownership = g_main_context_wait_internal (context,
+                                                    &context->cond,
+                                                    &context->mutex);
 
       if (!got_ownership)
 	return FALSE;
@@ -4068,9 +4085,9 @@ g_main_loop_run (GMainLoop *loop)
 	loop->is_running = TRUE;
 
       while (loop->is_running && !got_ownership)
-	got_ownership = g_main_context_wait (loop->context,
-                                             &loop->context->cond,
-                                             &loop->context->mutex);
+        got_ownership = g_main_context_wait_internal (loop->context,
+                                                      &loop->context->cond,
+                                                      &loop->context->mutex);
       
       if (!loop->is_running)
 	{
@@ -5234,6 +5251,68 @@ unref_unix_signal_handler_unlocked (int signum)
     }
 }
 
+/* Return a const string to avoid allocations. We lose precision in the case the
+ * @signum is unrecognised, but that’ll do. */
+static const gchar *
+signum_to_string (int signum)
+{
+  /* See `man 0P signal.h` */
+#define SIGNAL(s) \
+    case (s): \
+      return ("GUnixSignalSource: " #s);
+  switch (signum)
+    {
+    /* These signals are guaranteed to exist by POSIX. */
+    SIGNAL (SIGABRT)
+    SIGNAL (SIGFPE)
+    SIGNAL (SIGILL)
+    SIGNAL (SIGINT)
+    SIGNAL (SIGSEGV)
+    SIGNAL (SIGTERM)
+    /* Frustratingly, these are not, and hence for brevity the list is
+     * incomplete. */
+#ifdef SIGALRM
+    SIGNAL (SIGALRM)
+#endif
+#ifdef SIGCHLD
+    SIGNAL (SIGCHLD)
+#endif
+#ifdef SIGHUP
+    SIGNAL (SIGHUP)
+#endif
+#ifdef SIGKILL
+    SIGNAL (SIGKILL)
+#endif
+#ifdef SIGPIPE
+    SIGNAL (SIGPIPE)
+#endif
+#ifdef SIGQUIT
+    SIGNAL (SIGQUIT)
+#endif
+#ifdef SIGSTOP
+    SIGNAL (SIGSTOP)
+#endif
+#ifdef SIGUSR1
+    SIGNAL (SIGUSR1)
+#endif
+#ifdef SIGUSR2
+    SIGNAL (SIGUSR2)
+#endif
+#ifdef SIGPOLL
+    SIGNAL (SIGPOLL)
+#endif
+#ifdef SIGPROF
+    SIGNAL (SIGPROF)
+#endif
+#ifdef SIGTRAP
+    SIGNAL (SIGTRAP)
+#endif
+    default:
+      return "GUnixSignalSource: Unrecognized signal";
+    }
+#undef SIGNAL
+}
+
 GSource *
 _g_main_create_unix_signal_watch (int signum)
 {
@@ -5246,6 +5325,9 @@ _g_main_create_unix_signal_watch (int signum)
   unix_signal_source->signum = signum;
   unix_signal_source->pending = FALSE;
 
+  /* Set a default name on the source, just in case the caller does not. */
+  g_source_set_name (source, signum_to_string (signum));
+
   G_LOCK (unix_signal_lock);
   ref_unix_signal_handler_unlocked (signum);
   unix_signal_watches = g_slist_prepend (unix_signal_watches, unix_signal_source);
@@ -5374,6 +5456,9 @@ g_child_watch_source_new (GPid pid)
   source = g_source_new (&g_child_watch_funcs, sizeof (GChildWatchSource));
   child_watch_source = (GChildWatchSource *)source;
 
+  /* Set a default name on the source, just in case the caller does not. */
+  g_source_set_name (source, "GChildWatchSource");
+
   child_watch_source->pid = pid;
 
 #ifdef G_OS_WIN32
@@ -5560,6 +5645,9 @@ g_idle_source_new (void)
   source = g_source_new (&g_idle_funcs, sizeof (GSource));
   g_source_set_priority (source, G_PRIORITY_DEFAULT_IDLE);
 
+  /* Set a default name on the source, just in case the caller does not. */
+  g_source_set_name (source, "GIdleSource");
+
   return source;
 }
 
diff --git a/glib/gmain.h b/glib/gmain.h
index 76e2c14c1..eca14d7d5 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -163,12 +163,34 @@ typedef struct _GSourceFuncs            GSourceFuncs;
  * Specifies the type of function passed to g_timeout_add(),
  * g_timeout_add_full(), g_idle_add(), and g_idle_add_full().
  *
+ * When calling g_source_set_callback(), you may need to cast a function of a
+ * different type to this type. Use G_SOURCE_FUNC() to avoid warnings about
+ * incompatible function types.
+ *
  * Returns: %FALSE if the source should be removed. #G_SOURCE_CONTINUE and
  * #G_SOURCE_REMOVE are more memorable names for the return value.
  */
 typedef gboolean (*GSourceFunc)       (gpointer user_data);
 
 /**
+ * G_SOURCE_FUNC:
+ * @f: a function pointer.
+ *
+ * Cast a function pointer to a #GSourceFunc, suppressing warnings from GCC 8
+ * onwards with `-Wextra` or `-Wcast-function-type` enabled about the function
+ * types being incompatible.
+ *
+ * For example, the correct type of callback for a source created by
+ * g_child_watch_source_new() is #GChildWatchFunc, which accepts more arguments
+ * than #GSourceFunc. Casting the function with `(GSourceFunc)` to call
+ * g_source_set_callback() will trigger a warning, even though it will be cast
+ * back to the correct type before it is called by the source.
+ *
+ * Since: 2.58
+ */
+#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
+
+/**
  * GChildWatchFunc:
  * @pid: the process id of the child process
  * @status: Status information about the child process, encoded
@@ -354,7 +376,7 @@ GLIB_AVAILABLE_IN_ALL
 void     g_main_context_release (GMainContext *context);
 GLIB_AVAILABLE_IN_ALL
 gboolean g_main_context_is_owner (GMainContext *context);
-GLIB_AVAILABLE_IN_ALL
+GLIB_DEPRECATED_IN_2_58_FOR(g_main_context_is_owner)
 gboolean g_main_context_wait    (GMainContext *context,
                                  GCond        *cond,
                                  GMutex       *mutex);
@@ -590,8 +612,7 @@ void    g_clear_handle_id (guint           *tag_ptr,
     if (_handle_id > 0)                                    \
       {                                                    \
         *_tag_ptr = 0;                                     \
-        if (clear_func != NULL)                            \
-          clear_func (_handle_id);                         \
+        clear_func (_handle_id);                           \
       }                                                    \
   } G_STMT_END
 
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index a2b1ed0de..f1ab94e56 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -458,7 +458,7 @@ slow_name_validate (GMarkupParseContext  *context,
   if (!g_utf8_validate (name, strlen (name), NULL))
     {
       set_error (context, error, G_MARKUP_ERROR_BAD_UTF8,
-                 _("Invalid UTF-8 encoded text in name - not valid '%s'"), name);
+                 _("Invalid UTF-8 encoded text in name — not valid “%s�"), name);
       return FALSE;
     }
 
@@ -469,7 +469,7 @@ slow_name_validate (GMarkupParseContext  *context,
           g_unichar_isalpha (g_utf8_get_char (p))))))
     {
       set_error (context, error, G_MARKUP_ERROR_PARSE,
-                 _("'%s' is not a valid name"), name);
+                 _("“%s� is not a valid name"), name);
       return FALSE;
     }
 
@@ -485,7 +485,7 @@ slow_name_validate (GMarkupParseContext  *context,
               g_unichar_isalpha (g_utf8_get_char (p))))))
         {
           set_error (context, error, G_MARKUP_ERROR_PARSE,
-                     _("'%s' is not a valid name: '%c'"), name, *p);
+                     _("“%s� is not a valid name: “%c�"), name, *p);
           return FALSE;
         }
     }
@@ -541,7 +541,7 @@ text_validate (GMarkupParseContext  *context,
   if (!g_utf8_validate (p, len, NULL))
     {
       set_error (context, error, G_MARKUP_ERROR_BAD_UTF8,
-                 _("Invalid UTF-8 encoded text in name - not valid '%s'"), p);
+                 _("Invalid UTF-8 encoded text in name — not valid “%s�"), p);
       return FALSE;
     }
   else
@@ -684,10 +684,10 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                 {
                   set_unescape_error (context, error,
                                       from, G_MARKUP_ERROR_PARSE,
-                                      _("Failed to parse '%-.*s', which "
+                                      _("Failed to parse “%-.*s�, which "
                                         "should have been a digit "
                                         "inside a character reference "
-                                        "(&#234; for example) - perhaps "
+                                        "(&#234; for example) — perhaps "
                                         "the digit is too large"),
                                       (int)(end - from), from);
                   return FALSE;
@@ -700,7 +700,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                                         "semicolon; "
                                         "most likely you used an ampersand "
                                         "character without intending to start "
-                                        "an entity - escape ampersand as &amp;"));
+                                        "an entity — escape ampersand as &amp;"));
                   return FALSE;
                 }
               else
@@ -722,7 +722,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                     {
                       set_unescape_error (context, error,
                                           from, G_MARKUP_ERROR_PARSE,
-                                          _("Character reference '%-.*s' does not "
+                                          _("Character reference “%-.*s� does not "
                                             "encode a permitted character"),
                                           (int)(end - from), from);
                       return FALSE;
@@ -760,7 +760,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
               if (*from == ';')
                 set_unescape_error (context, error,
                                     from, G_MARKUP_ERROR_PARSE,
-                                    _("Empty entity '&;' seen; valid "
+                                    _("Empty entity “&;� seen; valid "
                                       "entities are: &amp; &quot; &lt; &gt; &apos;"));
               else
                 {
@@ -768,7 +768,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                   if (end)
                     set_unescape_error (context, error,
                                         from, G_MARKUP_ERROR_PARSE,
-                                        _("Entity name '%-.*s' is not known"),
+                                        _("Entity name “%-.*s� is not known"),
                                         (int)(end - from), from);
                   else
                     set_unescape_error (context, error,
@@ -776,7 +776,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
                                         _("Entity did not end with a semicolon; "
                                           "most likely you used an ampersand "
                                           "character without intending to start "
-                                          "an entity - escape ampersand as &amp;"));
+                                          "an entity — escape ampersand as &amp;"));
                 }
               return FALSE;
             }
@@ -1219,8 +1219,8 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
               set_error (context,
                          error,
                          G_MARKUP_ERROR_PARSE,
-                         _("'%s' is not a valid character following "
-                           "a '<' character; it may not begin an "
+                         _("“%s� is not a valid character following "
+                           "a “<� character; it may not begin an "
                            "element name"),
                          utf8_str (context->iter, buf));
             }
@@ -1261,8 +1261,8 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
               set_error (context,
                          error,
                          G_MARKUP_ERROR_PARSE,
-                         _("Odd character '%s', expected a '>' character "
-                           "to end the empty-element tag '%s'"),
+                         _("Odd character “%s�, expected a “>� character "
+                           "to end the empty-element tag “%s�"),
                          utf8_str (context->iter, buf),
                          current_element (context));
             }
@@ -1342,8 +1342,8 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
                   set_error (context,
                              error,
                              G_MARKUP_ERROR_PARSE,
-                             _("Odd character '%s', expected a '=' after "
-                               "attribute name '%s' of element '%s'"),
+                             _("Odd character “%s�, expected a “=� after "
+                               "attribute name “%s� of element “%s�"),
                              utf8_str (context->iter, buf),
                              current_attribute (context),
                              current_element (context));
@@ -1383,9 +1383,9 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
                   set_error (context,
                              error,
                              G_MARKUP_ERROR_PARSE,
-                             _("Odd character '%s', expected a '>' or '/' "
+                             _("Odd character “%s�, expected a “>� or “/� "
                                "character to end the start tag of "
-                               "element '%s', or optionally an attribute; "
+                               "element “%s�, or optionally an attribute; "
                                "perhaps you used an invalid character in "
                                "an attribute name"),
                              utf8_str (context->iter, buf),
@@ -1427,9 +1427,9 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
                   set_error (context,
                              error,
                              G_MARKUP_ERROR_PARSE,
-                             _("Odd character '%s', expected an open quote mark "
+                             _("Odd character “%s�, expected an open quote mark "
                                "after the equals sign when giving value for "
-                               "attribute '%s' of element '%s'"),
+                               "attribute “%s� of element “%s�"),
                              utf8_str (context->iter, buf),
                              current_attribute (context),
                              current_element (context));
@@ -1560,8 +1560,8 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
               set_error (context,
                          error,
                          G_MARKUP_ERROR_PARSE,
-                         _("'%s' is not a valid character following "
-                           "the characters '</'; '%s' may not begin an "
+                         _("“%s� is not a valid character following "
+                           "the characters “</�; “%s� may not begin an "
                            "element name"),
                          utf8_str (context->iter, buf),
                          utf8_str (context->iter, buf));
@@ -1596,9 +1596,9 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
                   set_error (context,
                              error,
                              G_MARKUP_ERROR_PARSE,
-                             _("'%s' is not a valid character following "
-                               "the close element name '%s'; the allowed "
-                               "character is '>'"),
+                             _("“%s� is not a valid character following "
+                               "the close element name “%s�; the allowed "
+                               "character is “>�"),
                              utf8_str (context->iter, buf),
                              close_name->str);
                 }
@@ -1607,7 +1607,7 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
                   set_error (context,
                              error,
                              G_MARKUP_ERROR_PARSE,
-                             _("Element '%s' was closed, no element "
+                             _("Element “%s� was closed, no element "
                                "is currently open"),
                              close_name->str);
                 }
@@ -1616,8 +1616,8 @@ g_markup_parse_context_parse (GMarkupParseContext  *context,
                   set_error (context,
                              error,
                              G_MARKUP_ERROR_PARSE,
-                             _("Element '%s' was closed, but the currently "
-                               "open element is '%s'"),
+                             _("Element “%s� was closed, but the currently "
+                               "open element is “%s�"),
                              close_name->str,
                              current_element (context));
                 }
@@ -1783,7 +1783,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext  *context,
 
     case STATE_AFTER_OPEN_ANGLE:
       set_error_literal (context, error, G_MARKUP_ERROR_PARSE,
-                         _("Document ended unexpectedly just after an open angle bracket '<'"));
+                         _("Document ended unexpectedly just after an open angle bracket “<�"));
       break;
 
     case STATE_AFTER_CLOSE_ANGLE:
@@ -1791,8 +1791,8 @@ g_markup_parse_context_end_parse (GMarkupParseContext  *context,
         {
           /* Error message the same as for INSIDE_TEXT */
           set_error (context, error, G_MARKUP_ERROR_PARSE,
-                     _("Document ended unexpectedly with elements still open - "
-                       "'%s' was the last element opened"),
+                     _("Document ended unexpectedly with elements still open — "
+                       "“%s� was the last element opened"),
                      current_element (context));
         }
       break;
@@ -1836,8 +1836,8 @@ g_markup_parse_context_end_parse (GMarkupParseContext  *context,
     case STATE_INSIDE_TEXT:
       g_assert (context->tag_stack != NULL);
       set_error (context, error, G_MARKUP_ERROR_PARSE,
-                 _("Document ended unexpectedly with elements still open - "
-                   "'%s' was the last element opened"),
+                 _("Document ended unexpectedly with elements still open — "
+                   "“%s� was the last element opened"),
                  current_element (context));
       break;
 
diff --git a/glib/gmem.h b/glib/gmem.h
index 9530512d0..1860d014f 100644
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -110,6 +110,16 @@ gpointer g_try_realloc_n  (gpointer	 mem,
 			   gsize	 n_blocks,
 			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
 
+#if defined(g_has_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58
+#define g_clear_pointer(pp, destroy)                                           \
+  G_STMT_START {                                                               \
+    G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer));                       \
+    __typeof__(*(pp)) _ptr = *(pp);                                            \
+    *(pp) = NULL;                                                              \
+    if (_ptr)                                                                  \
+      (destroy) (_ptr);                                                        \
+  } G_STMT_END
+#else /* __GNUC__ */
 #define g_clear_pointer(pp, destroy) \
   G_STMT_START {                                                               \
     G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer));                       \
@@ -127,6 +137,7 @@ gpointer g_try_realloc_n  (gpointer	 mem,
         _destroy (_p);                                                         \
       }                                                                        \
   } G_STMT_END
+#endif /* __GNUC__ */
 
 /**
  * g_steal_pointer:
@@ -196,8 +207,14 @@ g_steal_pointer (gpointer pp)
 }
 
 /* type safety */
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58
+#define g_steal_pointer(pp) ((__typeof__(*pp)) (g_steal_pointer) (pp))
+#else  /* __GNUC__ */
+/* This version does not depend on gcc extensions, but gcc does not warn
+ * about incompatible-pointer-types: */
 #define g_steal_pointer(pp) \
   (0 ? (*(pp)) : (g_steal_pointer) (pp))
+#endif /* __GNUC__ */
 
 /* Optimise: avoid the call to the (slower) _n function if we can
  * determine at compile-time that no overflow happens.
diff --git a/glib/gmessages.c b/glib/gmessages.c
index eaca78387..b468ef3b7 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -211,47 +211,6 @@
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
 #endif
 
-/* XXX: Remove once XP support really dropped */
-#if _WIN32_WINNT < 0x0600
-
-typedef enum _FILE_INFO_BY_HANDLE_CLASS
-{
-  FileBasicInfo                   = 0,
-  FileStandardInfo                = 1,
-  FileNameInfo                    = 2,
-  FileRenameInfo                  = 3,
-  FileDispositionInfo             = 4,
-  FileAllocationInfo              = 5,
-  FileEndOfFileInfo               = 6,
-  FileStreamInfo                  = 7,
-  FileCompressionInfo             = 8,
-  FileAttributeTagInfo            = 9,
-  FileIdBothDirectoryInfo         = 10,
-  FileIdBothDirectoryRestartInfo  = 11,
-  FileIoPriorityHintInfo          = 12,
-  FileRemoteProtocolInfo          = 13,
-  FileFullDirectoryInfo           = 14,
-  FileFullDirectoryRestartInfo    = 15,
-  FileStorageInfo                 = 16,
-  FileAlignmentInfo               = 17,
-  FileIdInfo                      = 18,
-  FileIdExtdDirectoryInfo         = 19,
-  FileIdExtdDirectoryRestartInfo  = 20,
-  MaximumFileInfoByHandlesClass
-} FILE_INFO_BY_HANDLE_CLASS;
-
-typedef struct _FILE_NAME_INFO
-{
-  DWORD FileNameLength;
-  WCHAR FileName[1];
-} FILE_NAME_INFO;
-
-typedef BOOL (WINAPI fGetFileInformationByHandleEx) (HANDLE,
-                                                     FILE_INFO_BY_HANDLE_CLASS,
-                                                     LPVOID,
-                                                     DWORD);
-#endif
-
 #if defined (_MSC_VER) && (_MSC_VER >=1400)
 /* This is ugly, but we need it for isatty() in case we have bad fd's,
  * otherwise Windows will abort() the program on msvcrt80.dll and later
@@ -1539,34 +1498,13 @@ win32_is_pipe_tty (int fd)
   wchar_t *name = NULL;
   gint length;
 
-  /* XXX: Remove once XP support really dropped */
-#if _WIN32_WINNT < 0x0600
-  HANDLE h_kerneldll = NULL;
-  fGetFileInformationByHandleEx *GetFileInformationByHandleEx;
-#endif
-
   h_fd = (HANDLE) _get_osfhandle (fd);
 
   if (h_fd == INVALID_HANDLE_VALUE || GetFileType (h_fd) != FILE_TYPE_PIPE)
     goto done_query;
 
-  /* The following check is available on Vista or later, so on XP, no color support */
   /* mintty uses a pipe, in the form of \{cygwin|msys}-xxxxxxxxxxxxxxxx-ptyN-{from|to}-master */
 
-  /* XXX: Remove once XP support really dropped */
-#if _WIN32_WINNT < 0x0600
-  h_kerneldll = LoadLibraryW (L"kernel32.dll");
-
-  if (h_kerneldll == NULL)
-    goto done_query;
-
-  GetFileInformationByHandleEx =
-    (fGetFileInformationByHandleEx *) GetProcAddress (h_kerneldll, "GetFileInformationByHandleEx");
-
-  if (GetFileInformationByHandleEx == NULL)
-    goto done_query;
-#endif
-
   info = g_try_malloc (info_size);
 
   if (info == NULL ||
@@ -1614,12 +1552,6 @@ done_query:
   if (info != NULL)
     g_free (info);
 
-  /* XXX: Remove once XP support really dropped */
-#if _WIN32_WINNT < 0x0600
-  if (h_kerneldll != NULL)
-    FreeLibrary (h_kerneldll);
-#endif
-
   return result;
 }
 #endif
diff --git a/glib/goption.c b/glib/goption.c
index dc9ec3bc9..4b2abc057 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -2028,7 +2028,7 @@ g_option_context_parse (GOptionContext   *context,
 
                   /* Now look for --<group>-<option> */
                   dash = strchr (arg, '-');
-                  if (dash)
+                  if (dash && arg < dash)
                     {
                       /* Try the groups */
                       list = context->groups;
@@ -2293,7 +2293,7 @@ g_option_group_free (GOptionGroup *group)
  *
  * Increments the reference count of @group by one.
  *
- * Returns: a #GoptionGroup
+ * Returns: a #GOptionGroup
  *
  * Since: 2.44
  */
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 01d19c048..5f46906ba 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -333,26 +333,13 @@ g_poll (GPollFD *fds,
 #include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
 
-#ifndef NO_FD_SET
-#  define SELECT_MASK fd_set
-#else /* !NO_FD_SET */
-#  ifndef _AIX
-typedef long fd_mask;
-#  endif /* _AIX */
-#  ifdef _IBMR2
-#    define SELECT_MASK void
-#  else /* !_IBMR2 */
-#    define SELECT_MASK int
-#  endif /* !_IBMR2 */
-#endif /* !NO_FD_SET */
-
 gint
 g_poll (GPollFD *fds,
 	guint    nfds,
 	gint     timeout)
 {
   struct timeval tv;
-  SELECT_MASK rset, wset, xset;
+  fd_set rset, wset, xset;
   GPollFD *f;
   int ready;
   int maxfd = 0;
diff --git a/glib/gqueue.c b/glib/gqueue.c
index bf172f6ff..9f34790b9 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -372,7 +372,7 @@ g_queue_push_nth (GQueue   *queue,
 {
   g_return_if_fail (queue != NULL);
 
-  if (n < 0 || n >= queue->length)
+  if (n < 0 || (guint) n >= queue->length)
     {
       g_queue_push_tail (queue, data);
       return;
@@ -475,7 +475,7 @@ g_queue_push_nth_link (GQueue *queue,
   g_return_if_fail (queue != NULL);
   g_return_if_fail (link_ != NULL);
 
-  if (n < 0 || n >= queue->length)
+  if (n < 0 || (guint) n >= queue->length)
     {
       g_queue_push_tail_link (queue, link_);
       return;
@@ -749,7 +749,7 @@ g_queue_peek_nth_link (GQueue *queue,
                        guint   n)
 {
   GList *link;
-  gint i;
+  guint i;
   
   g_return_val_if_fail (queue != NULL, NULL);
 
diff --git a/glib/grand.c b/glib/grand.c
index 56b134885..19339afc6 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -388,7 +388,7 @@ g_rand_set_seed_array (GRand         *rand,
                        const guint32 *seed,
                        guint          seed_length)
 {
-  int i, j, k;
+  guint i, j, k;
 
   g_return_if_fail (rand != NULL);
   g_return_if_fail (seed_length >= 1);
diff --git a/glib/grcbox.c b/glib/grcbox.c
new file mode 100644
index 000000000..f31db78ab
--- /dev/null
+++ b/glib/grcbox.c
@@ -0,0 +1,450 @@
+/* grcbox.c: Reference counted data
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "grcboxprivate.h"
+
+#include "gmessages.h"
+#include "grefcount.h"
+#include "gtestutils.h"
+
+#ifdef ENABLE_VALGRIND
+#include "valgrind.h"
+#endif
+
+#include "glib_trace.h"
+
+#include <string.h>
+
+/**
+ * SECTION:rcbox
+ * @Title: Reference counted data
+ * @Short_description: Allocated memory with reference counting semantics
+ *
+ * A "reference counted box", or "RcBox", is an opaque wrapper data type
+ * that is guaranteed to be as big as the size of a given data type, and
+ * which augments the given data type with reference counting semantics
+ * for its memory management.
+ *
+ * RcBox is useful if you have a plain old data type, like a structure
+ * typically placed on the stack, and you wish to provide additional API
+ * to use it on the heap; or if you want to implement a new type to be
+ * passed around by reference without necessarily implementing copy/free
+ * semantics or your own reference counting.
+ *
+ * The typical use is:
+ *
+ * |[<!-- language="C" -->
+ * typedef struct {
+ *   char *name;
+ *   char *address;
+ *   char *city;
+ *   char *state;
+ *   int age;
+ * } Person;
+ *
+ * Person *
+ * person_new (void)
+ * {
+ *   return g_rc_box_new0 (Person);
+ * }
+ * ]|
+ *
+ * Every time you wish to acquire a reference on the memory, you should
+ * call g_rc_box_acquire(); similarly, when you wish to release a reference
+ * you should call g_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * // Add a Person to the Database; the Database acquires ownership
+ * // of the Person instance
+ * void
+ * add_person_to_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_prepend (db->persons, g_rc_box_acquire (p));
+ * }
+ *
+ * // Removes a Person from the Database; the reference acquired by
+ * // add_person_to_database() is released here
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_rc_box_release (p);
+ * }
+ * ]|
+ *
+ * If you have additional memory allocated inside the structure, you can
+ * use g_rc_box_release_full(), which takes a function pointer, which
+ * will be called if the reference released was the last:
+ *
+ * |[<!-- language="C" -->
+ * void
+ * person_clear (Person *p)
+ * {
+ *   g_free (p->name);
+ *   g_free (p->address);
+ *   g_free (p->city);
+ *   g_free (p->state);
+ * }
+ *
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_rc_box_release_full (p, (GDestroyNotify) person_clear);
+ * }
+ * ]|
+ *
+ * If you wish to transfer the ownership of a reference counted data
+ * type without increasing the reference count, you can use g_steal_pointer():
+ *
+ * |[<!-- language="C" -->
+ *   Person *p = g_rc_box_new (Person);
+ *
+ *   // fill_person_details() is defined elsewhere
+ *   fill_person_details (p);
+ *
+ *   // add_person_to_database_no_ref() is defined elsewhere; it adds
+ *   // a Person to the Database without taking a reference
+ *   add_person_to_database_no_ref (db, g_steal_pointer (&p));
+ * ]|
+ *
+ * ## Thread safety
+ *
+ * The reference counting operations on data allocated using g_rc_box_alloc(),
+ * g_rc_box_new(), and g_rc_box_dup() are not thread safe; it is your code's
+ * responsibility to ensure that references are acquired are released on the
+ * same thread.
+ *
+ * If you need thread safe reference counting, see the [atomic reference counted
+ * data][arcbox] API.
+ *
+ * ## Automatic pointer clean up
+ *
+ * If you want to add g_autoptr() support to your plain old data type through
+ * reference counting, you can use the G_DEFINE_AUTOPTR_CLEANUP_FUNC() and
+ * g_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, g_rc_box_release)
+ * ]|
+ *
+ * If you need to clear the contents of the data, you will need to use an
+ * ancillary function that calls g_rc_box_release_full():
+ *
+ * |[<!-- language="C" -->
+ * static void
+ * my_data_struct_release (MyDataStruct *data)
+ * {
+ *   // my_data_struct_clear() is defined elsewhere
+ *   g_rc_box_release_full (data, (GDestroyNotify) my_data_struct_clear);
+ * }
+ *
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_clear)
+ * ]|
+ *
+ * Since: 2.58.
+ */
+
+#define G_RC_BOX(p)             (GRcBox *) (((char *) (p)) - G_RC_BOX_SIZE)
+
+/* We use the same alignment as GTypeInstance and GNU libc's malloc */
+#define STRUCT_ALIGNMENT        (2 * sizeof (gsize))
+#define ALIGN_STRUCT(offset)    ((offset + (STRUCT_ALIGNMENT - 1)) & -STRUCT_ALIGNMENT)
+
+gpointer
+g_rc_box_alloc_full (gsize    block_size,
+                     gboolean atomic,
+                     gboolean clear)
+{
+  /* sizeof GArcBox == sizeof GRcBox */
+  gsize private_size = G_ARC_BOX_SIZE;
+  gsize real_size;
+  char *allocated;
+
+  g_assert (block_size < (G_MAXSIZE - G_ARC_BOX_SIZE));
+  real_size = private_size + block_size;
+
+#ifdef ENABLE_VALGRIND
+  if (RUNNING_ON_VALGRIND)
+    {
+      /* When running under Valgrind we massage the memory allocation
+       * to include a pointer at the tail end of the block; the pointer
+       * is then set to the start of the block. This trick allows
+       * Valgrind to keep track of the over-allocation and not be
+       * confused when passing the pointer around
+       */
+      g_assert (private_size < (G_MAXSIZE - ALIGN_STRUCT (1)));
+      private_size += ALIGN_STRUCT (1);
+
+      if (clear)
+        allocated = g_malloc0 (real_size + sizeof (gpointer));
+      else
+        allocated = g_malloc (real_size + sizeof (gpointer));
+
+      *(gpointer *) (allocated + private_size + block_size) = allocated + ALIGN_STRUCT (1);
+
+      VALGRIND_MALLOCLIKE_BLOCK (allocated + private_size, block_size + sizeof (gpointer), 0, TRUE);
+      VALGRIND_MALLOCLIKE_BLOCK (allocated + ALIGN_STRUCT (1), private_size - ALIGN_STRUCT (1), 0, TRUE);
+    }
+  else
+#endif /* ENABLE_VALGRIND */
+    {
+      if (clear)
+        allocated = g_malloc0 (real_size);
+      else
+        allocated = g_malloc (real_size);
+    }
+
+  if (atomic)
+    {
+      GArcBox *real_box = (GArcBox *) allocated;
+      real_box->mem_size = block_size;
+#ifndef G_DISABLE_ASSERT
+      real_box->magic = G_BOX_MAGIC;
+#endif
+      g_atomic_ref_count_init (&real_box->ref_count);
+    }
+  else
+    {
+      GRcBox *real_box = (GRcBox *) allocated;
+      real_box->mem_size = block_size;
+#ifndef G_DISABLE_ASSERT
+      real_box->magic = G_BOX_MAGIC;
+#endif
+      g_ref_count_init (&real_box->ref_count);
+    }
+
+  TRACE (GLIB_RCBOX_ALLOC (allocated, block_size, atomic, clear));
+
+  return allocated + private_size;
+}
+
+/**
+ * g_rc_box_alloc:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds reference
+ * counting semantics to it.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ *
+ * Since: 2.58
+ */
+gpointer
+g_rc_box_alloc (gsize block_size)
+{
+  g_return_val_if_fail (block_size > 0, NULL);
+
+  return g_rc_box_alloc_full (block_size, FALSE, FALSE);
+}
+
+/**
+ * g_rc_box_alloc0:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds reference
+ * counting semantics to it.
+ *
+ * The contents of the returned data is set to zero.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ *
+ * Since: 2.58
+ */
+gpointer
+g_rc_box_alloc0 (gsize block_size)
+{
+  g_return_val_if_fail (block_size > 0, NULL);
+
+  return g_rc_box_alloc_full (block_size, FALSE, TRUE);
+}
+
+/**
+ * g_rc_box_new:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate reference counted data with
+ * the size of the given @type.
+ *
+ * This macro calls g_rc_box_alloc() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the
+ *   allocated memory, cast to a pointer for the given @type
+ *
+ * Since: 2.58
+ */
+
+/**
+ * g_rc_box_new0:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate reference counted data with
+ * the size of the given @type, and set its contents to zero.
+ *
+ * This macro calls g_rc_box_alloc0() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the
+ *   allocated memory, cast to a pointer for the given @type
+ *
+ * Since: 2.58
+ */
+
+/**
+ * g_rc_box_dup:
+ * @block_size: the number of bytes to copy, must be greater than 0
+ * @mem_block: (not nullable): the memory to copy
+ *
+ * Allocates a new block of data with reference counting
+ * semantics, and copies @block_size bytes of @mem_block
+ * into it.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory
+ *
+ * Since: 2.58
+ */
+gpointer
+(g_rc_box_dup) (gsize         block_size,
+                gconstpointer mem_block)
+{
+  gpointer res;
+
+  g_return_val_if_fail (block_size > 0, NULL);
+  g_return_val_if_fail (mem_block != NULL, NULL);
+
+  res = g_rc_box_alloc_full (block_size, FALSE, FALSE);
+  memcpy (res, mem_block, block_size);
+
+  return res;
+}
+
+/**
+ * g_rc_box_acquire:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Acquires a reference on the data pointed by @mem_block.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the data,
+ *   with its reference count increased
+ *
+ * Since: 2.58
+ */
+gpointer
+(g_rc_box_acquire) (gpointer mem_block)
+{
+  GRcBox *real_box = G_RC_BOX (mem_block);
+
+  g_return_val_if_fail (mem_block != NULL, NULL);
+#ifndef G_DISABLE_ASSERT
+  g_return_val_if_fail (real_box->magic == G_BOX_MAGIC, NULL);
+#endif
+
+  g_ref_count_inc (&real_box->ref_count);
+
+  TRACE (GLIB_RCBOX_ACQUIRE (mem_block, 0));
+
+  return mem_block;
+}
+
+/**
+ * g_rc_box_release:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ *
+ * Releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+void
+g_rc_box_release (gpointer mem_block)
+{
+  g_rc_box_release_full (mem_block, NULL);
+}
+
+/**
+ * g_rc_box_release_full:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ * @clear_func: (not nullable): a function to call when clearing the data
+ *
+ * Releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will call @clear_func
+ * to clear the contents of @mem_block, and then will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+void
+g_rc_box_release_full (gpointer       mem_block,
+                       GDestroyNotify clear_func)
+{
+  GRcBox *real_box = G_RC_BOX (mem_block);
+
+  g_return_if_fail (mem_block != NULL);
+#ifndef G_DISABLE_ASSERT
+  g_return_if_fail (real_box->magic == G_BOX_MAGIC);
+#endif
+
+  if (g_ref_count_dec (&real_box->ref_count))
+    {
+      TRACE (GLIB_RCBOX_RELEASE (mem_block, 0));
+
+      if (clear_func != NULL)
+        clear_func (mem_block);
+
+      TRACE (GLIB_RCBOX_FREE (mem_block));
+      g_free (real_box);
+    }
+}
+
+/**
+ * g_rc_box_get_size:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Retrieves the size of the reference counted data pointed by @mem_block.
+ *
+ * Returns: the size of the data, in bytes
+ *
+ * Since: 2.58
+ */
+gsize
+g_rc_box_get_size (gpointer mem_block)
+{
+  GRcBox *real_box = G_RC_BOX (mem_block);
+
+  g_return_val_if_fail (mem_block != NULL, 0);
+#ifndef G_DISABLE_ASSERT
+  g_return_val_if_fail (real_box->magic == G_BOX_MAGIC, 0);
+#endif
+
+  return real_box->mem_size;
+}
diff --git a/glib/grcbox.h b/glib/grcbox.h
new file mode 100644
index 000000000..e66f1ff6d
--- /dev/null
+++ b/glib/grcbox.h
@@ -0,0 +1,88 @@
+/* grcbox.h: Reference counted data
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#include <glib/gmem.h>
+
+G_BEGIN_DECLS
+
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_rc_box_alloc                  (gsize           block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_rc_box_alloc0                 (gsize           block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_rc_box_dup                    (gsize           block_size,
+                                                 gconstpointer   mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_rc_box_acquire                (gpointer        mem_block);
+GLIB_AVAILABLE_IN_2_58
+void            g_rc_box_release                (gpointer        mem_block);
+GLIB_AVAILABLE_IN_2_58
+void            g_rc_box_release_full           (gpointer        mem_block,
+                                                 GDestroyNotify  clear_func);
+
+GLIB_AVAILABLE_IN_2_58
+gsize           g_rc_box_get_size               (gpointer        mem_block);
+
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_atomic_rc_box_alloc           (gsize           block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_atomic_rc_box_alloc0          (gsize           block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_atomic_rc_box_dup             (gsize           block_size,
+                                                 gconstpointer   mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_2_58
+gpointer        g_atomic_rc_box_acquire         (gpointer        mem_block);
+GLIB_AVAILABLE_IN_2_58
+void            g_atomic_rc_box_release         (gpointer        mem_block);
+GLIB_AVAILABLE_IN_2_58
+void            g_atomic_rc_box_release_full    (gpointer        mem_block,
+                                                 GDestroyNotify  clear_func);
+
+GLIB_AVAILABLE_IN_2_58
+gsize           g_atomic_rc_box_get_size        (gpointer        mem_block);
+
+#define g_rc_box_new(type) \
+  ((type *) g_rc_box_alloc (sizeof (type)))
+#define g_rc_box_new0(type) \
+  ((type *) g_rc_box_alloc0 (sizeof (type)))
+#define g_atomic_rc_box_new(type) \
+  ((type *) g_atomic_rc_box_alloc (sizeof (type)))
+#define g_atomic_rc_box_new0(type) \
+  ((type *) g_atomic_rc_box_alloc0 (sizeof (type)))
+
+#ifdef g_has_typeof
+/* Type check to avoid assigning references to different types */
+# define g_rc_box_acquire(mem_block) \
+  ((__typeof__(mem_block)) (g_rc_box_acquire) (mem_block))
+# define g_atomic_rc_box_acquire(mem_block) \
+  ((__typeof__(mem_block)) (g_atomic_rc_box_acquire) (mem_block))
+
+/* Type check to avoid duplicating data to different types */
+# define g_rc_box_dup(block_size,mem_block) \
+  ((__typeof__(mem_block)) (g_rc_box_dup) (block_size,mem_block))
+# define g_atomic_rc_box_dup(block_size,mem_block) \
+  ((__typeof__(mem_block)) (g_atomic_rc_box_dup) (block_size,mem_block))
+#endif
+
+G_END_DECLS
diff --git a/glib/grcboxprivate.h b/glib/grcboxprivate.h
new file mode 100644
index 000000000..8b0d8dd4e
--- /dev/null
+++ b/glib/grcboxprivate.h
@@ -0,0 +1,61 @@
+/* grcboxprivate.h: Reference counted data
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "gtypes.h"
+#include "grcbox.h"
+
+G_BEGIN_DECLS
+
+typedef struct {
+  grefcount ref_count;
+
+  gsize mem_size;
+
+#ifndef G_DISABLE_ASSERT
+  /* A "magic" number, used to perform additional integrity
+   * checks on the allocated data
+   */
+  guint32 magic;
+#endif
+} GRcBox;
+
+typedef struct {
+  gatomicrefcount ref_count;
+
+  gsize mem_size;
+
+#ifndef G_DISABLE_ASSERT
+  guint32 magic;
+#endif
+} GArcBox;
+
+#define G_BOX_MAGIC             0x44ae2bf0
+
+/* Keep the two refcounted boxes identical in size */
+G_STATIC_ASSERT (sizeof (GRcBox) == sizeof (GArcBox));
+
+#define G_RC_BOX_SIZE sizeof (GRcBox)
+#define G_ARC_BOX_SIZE sizeof (GArcBox)
+
+gpointer        g_rc_box_alloc_full     (gsize    block_size,
+                                         gboolean atomic,
+                                         gboolean clear);
+
+G_END_DECLS
diff --git a/glib/grefcount.c b/glib/grefcount.c
new file mode 100644
index 000000000..37085316b
--- /dev/null
+++ b/glib/grefcount.c
@@ -0,0 +1,285 @@
+/* grefcount.c: Reference counting
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * SECTION:refcount
+ * @Title: Reference counting
+ * @Short_description: Reference counting types and functions
+ *
+ * Reference counting is a garbage collection mechanism that is based on
+ * assigning a counter to a data type, or any memory area; the counter is
+ * increased whenever a new reference to that data type is acquired, and
+ * decreased whenever the reference is released. Once the last reference
+ * is released, the resources associated to that data type are freed.
+ *
+ * GLib uses reference counting in many of its data types, and provides
+ * the #grefcount and #gatomicrefcount types to implement safe and atomic
+ * reference counting semantics in new data types.
+ *
+ * It is important to note that #grefcount and #gatomicrefcount should be
+ * considered completely opaque types; you should always use the provided
+ * API to increase and decrease the counters, and you should never check
+ * their content directly, or compare their content with other values.
+ *
+ * Since: 2.58
+ */
+
+#include "config.h"
+
+#include "grefcount.h"
+
+#include "gatomic.h"
+#include "gmessages.h"
+
+/**
+ * grefcount:
+ *
+ * A type for implementing non-atomic reference count semantics.
+ *
+ * Use g_ref_count_init() to initialize it; g_ref_count_inc() to
+ * increase the counter, and g_ref_count_dec() to decrease it.
+ *
+ * It is safe to use #grefcount only if you're expecting to operate
+ * on the reference counter from a single thread. It is entirely up
+ * to you to ensure that all reference count changes happen in the
+ * same thread.
+ *
+ * See also: #gatomicrefcount
+ *
+ * Since: 2.58
+ */
+
+/**
+ * gatomicrefcount:
+ *
+ * A type for implementing atomic reference count semantics.
+ *
+ * Use g_atomic_ref_count_init() to initialize it; g_atomic_ref_count_inc()
+ * to increase the counter, and g_atomic_ref_count_dec() to decrease it.
+ *
+ * It is safe to use #gatomicrefcount if you're expecting to operate on the
+ * reference counter from multiple threads.
+ *
+ * See also: #grefcount
+ *
+ * Since: 2.58
+ */
+
+/**
+ * g_ref_count_init:
+ * @rc: the address of a reference count variable
+ *
+ * Initializes a reference count variable.
+ *
+ * Since: 2.58
+ */
+void
+(g_ref_count_init) (grefcount *rc)
+{
+  g_return_if_fail (rc != NULL);
+
+  /* Non-atomic refcounting is implemented using the negative range
+   * of signed integers:
+   *
+   * G_MININT                 Z¯< 0 > Z�                G_MAXINT
+   * |----------------------------|----------------------------|
+   *
+   * Acquiring a reference moves us towards MININT, and releasing a
+   * reference moves us towards 0.
+   */
+  *rc = -1;
+}
+
+/**
+ * g_ref_count_inc:
+ * @rc: the address of a reference count variable
+ *
+ * Increases the reference count.
+ *
+ * Since: 2.58
+ */
+void
+(g_ref_count_inc) (grefcount *rc)
+{
+  grefcount rrc;
+
+  g_return_if_fail (rc != NULL);
+
+  rrc = *rc;
+
+  g_return_if_fail (rrc < 0);
+
+  /* Check for saturation */
+  if (rrc == G_MININT)
+    {
+      g_critical ("Reference count %p has reached saturation", rc);
+      return;
+    }
+
+  rrc -= 1;
+
+  *rc = rrc;
+}
+
+/**
+ * g_ref_count_dec:
+ * @rc: the address of a reference count variable
+ *
+ * Decreases the reference count.
+ *
+ * Returns: %TRUE if the reference count reached 0, and %FALSE otherwise
+ *
+ * Since: 2.58
+ */
+gboolean
+(g_ref_count_dec) (grefcount *rc)
+{
+  grefcount rrc;
+
+  g_return_val_if_fail (rc != NULL, FALSE);
+
+  rrc = *rc;
+
+  g_return_val_if_fail (rrc < 0, FALSE);
+
+  rrc += 1;
+  if (rrc == 0)
+    return TRUE;
+
+  *rc = rrc;
+
+  return FALSE;
+}
+
+/**
+ * g_ref_count_compare:
+ * @rc: the address of a reference count variable
+ * @val: the value to compare
+ *
+ * Compares the current value of @rc with @val.
+ *
+ * Returns: %TRUE if the reference count is the same
+ *   as the given value
+ *
+ * Since: 2.58
+ */
+gboolean
+(g_ref_count_compare) (grefcount *rc,
+                       gint       val)
+{
+  grefcount rrc;
+
+  g_return_val_if_fail (rc != NULL, FALSE);
+  g_return_val_if_fail (val >= 0, FALSE);
+
+  rrc = *rc;
+
+  if (val == G_MAXINT)
+    return rrc == G_MININT;
+
+  return rrc == -val;
+}
+
+/**
+ * g_atomic_ref_count_init:
+ * @arc: the address of an atomic reference count variable
+ *
+ * Atomically initializes a reference count variable.
+ *
+ * Since: 2.58
+ */
+void
+(g_atomic_ref_count_init) (gatomicrefcount *arc)
+{
+  g_return_if_fail (arc != NULL);
+
+  /* Atomic refcounting is implemented using the positive range
+   * of signed integers:
+   *
+   * G_MININT                 Z¯< 0 > Z�                G_MAXINT
+   * |----------------------------|----------------------------|
+   *
+   * Acquiring a reference moves us towards MAXINT, and releasing a
+   * reference moves us towards 0.
+   */
+  g_atomic_int_set (arc, 1);
+}
+
+/**
+ * g_atomic_ref_count_inc:
+ * @arc: the address of an atomic reference count variable
+ *
+ * Atomically increases the reference count.
+ *
+ * Since: 2.58
+ */
+void
+(g_atomic_ref_count_inc) (gatomicrefcount *arc)
+{
+  g_return_if_fail (arc != NULL);
+  g_return_if_fail (g_atomic_int_get (arc) > 0);
+
+  if (g_atomic_int_get (arc) == G_MAXINT)
+    {
+      g_critical ("Reference count has reached saturation");
+      return;
+    }
+
+  g_atomic_int_inc (arc);
+}
+
+/**
+ * g_atomic_ref_count_dec:
+ * @arc: the address of an atomic reference count variable
+ *
+ * Atomically decreases the reference count.
+ *
+ * Returns: %TRUE if the reference count reached 0, and %FALSE otherwise
+ *
+ * Since: 2.58
+ */
+gboolean
+(g_atomic_ref_count_dec) (gatomicrefcount *arc)
+{
+  g_return_val_if_fail (arc != NULL, FALSE);
+  g_return_val_if_fail (g_atomic_int_get (arc) > 0, FALSE);
+
+  return g_atomic_int_dec_and_test (arc);
+}
+
+/**
+ * g_atomic_ref_count_compare:
+ * @arc: the address of an atomic reference count variable
+ * @val: the value to compare
+ *
+ * Atomically compares the current value of @arc with @val.
+ *
+ * Returns: %TRUE if the reference count is the same
+ *   as the given value
+ *
+ * Since: 2.58
+ */
+gboolean
+(g_atomic_ref_count_compare) (gatomicrefcount *arc,
+                              gint             val)
+{
+  g_return_val_if_fail (arc != NULL, FALSE);
+  g_return_val_if_fail (val >= 0, FALSE);
+
+  return g_atomic_int_get (arc) == val;
+}
diff --git a/glib/grefcount.h b/glib/grefcount.h
new file mode 100644
index 000000000..dec9a5ffb
--- /dev/null
+++ b/glib/grefcount.h
@@ -0,0 +1,122 @@
+/* grefcount.h: Reference counting
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GREFCOUNT_H__
+#define __GREFCOUNT_H__
+
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#include <glib/gtypes.h>
+
+G_BEGIN_DECLS
+
+GLIB_AVAILABLE_IN_2_58
+void            g_ref_count_init                (grefcount       *rc);
+GLIB_AVAILABLE_IN_2_58
+void            g_ref_count_inc                 (grefcount       *rc);
+GLIB_AVAILABLE_IN_2_58
+gboolean        g_ref_count_dec                 (grefcount       *rc);
+GLIB_AVAILABLE_IN_2_58
+gboolean        g_ref_count_compare             (grefcount       *rc,
+                                                 gint             val);
+
+GLIB_AVAILABLE_IN_2_58
+void            g_atomic_ref_count_init         (gatomicrefcount *arc);
+GLIB_AVAILABLE_IN_2_58
+void            g_atomic_ref_count_inc          (gatomicrefcount *arc);
+GLIB_AVAILABLE_IN_2_58
+gboolean        g_atomic_ref_count_dec          (gatomicrefcount *arc);
+GLIB_AVAILABLE_IN_2_58
+gboolean        g_atomic_ref_count_compare      (gatomicrefcount *arc,
+                                                 gint             val);
+
+/* On GCC we can use __extension__ to inline the API without using
+ * ancillary functions; we only do this when disabling checks, as
+ * it disables warnings when saturating the reference counters
+ */
+#if defined(__GNUC__) && defined(G_DISABLE_CHECKS)
+
+# define g_ref_count_init(rc) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (grefcount)); \
+    (void) (0 ? *(rc) ^ *(rc) : 1); \
+    *(rc) = -1; \
+  }))
+
+# define g_ref_count_inc(rc) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (grefcount)); \
+    (void) (0 ? *(rc) ^ *(rc) : 1); \
+    if (*(rc) == G_MININT) ; else { \
+      *(rc) -= 1; \
+    } \
+  }))
+
+# define g_ref_count_dec(rc) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (grefcount)); \
+    grefcount __rc = *(rc); \
+    __rc += 1; \
+    if (__rc == 0) ; else { \
+      *(rc) = __rc; \
+    } \
+    (gboolean) (__rc == 0); \
+  }))
+
+# define g_ref_count_compare(rc,val) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (grefcount)); \
+    (void) (0 ? *(rc) ^ (val) : 1); \
+    (gboolean) (*(rc) == -(val)); \
+  }))
+
+# define g_atomic_ref_count_init(rc) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (gatomicrefcount)); \
+    (void) (0 ? *(rc) ^ *(rc) : 1); \
+    g_atomic_int_set ((rc), 1); \
+  }))
+
+# define g_atomic_ref_count_inc(rc) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (gatomicrefcount)); \
+    (void) (0 ? *(rc) ^ *(rc) : 1); \
+    (void) (g_atomic_int_get (rc) == G_MAXINT ? 0 : g_atomic_int_inc ((rc))); \
+  }))
+
+# define g_atomic_ref_count_dec(rc) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (gatomicrefcount)); \
+    (void) (0 ? *(rc) ^ *(rc) : 1); \
+    g_atomic_int_dec_and_test ((rc)); \
+  }))
+
+# define g_atomic_ref_count_compare(rc,val) \
+  (G_GNUC_EXTENSION ({ \
+    G_STATIC_ASSERT (sizeof *(rc) == sizeof (gatomicrefcount)); \
+    (void) (0 ? *(rc) ^ (val) : 1); \
+    (gboolean) (g_atomic_int_get (rc) == (val)); \
+  }))
+
+#endif /* __GNUC__ && G_DISABLE_CHECKS */
+
+G_END_DECLS
+
+#endif /* __GREFCOUNT_H__ */
diff --git a/glib/grefstring.c b/glib/grefstring.c
new file mode 100644
index 000000000..f3ed4df72
--- /dev/null
+++ b/glib/grefstring.c
@@ -0,0 +1,303 @@
+/* grefstring.c: Reference counted strings
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * SECTION:refstring
+ * @Title: Reference counted strings
+ * @Short_description: Strings with reference counted memory management
+ *
+ * Reference counted strings are normal C strings that have been augmented
+ * with a reference counter to manage their resources. You allocate a new
+ * reference counted string and acquire and release references as needed,
+ * instead of copying the string among callers; when the last reference on
+ * the string is released, the resources allocated for it are freed.
+ *
+ * Typically, reference counted strings can be used when parsing data from
+ * files and storing them into data structures that are passed to various
+ * callers:
+ *
+ * |[<!-- language="C" -->
+ * PersonDetails *
+ * person_details_from_data (const char *data)
+ * {
+ *   // Use g_autoptr() to simplify error cases
+ *   g_autoptr(GRefString) full_name = NULL;
+ *   g_autoptr(GRefString) address =  NULL;
+ *   g_autoptr(GRefString) city = NULL;
+ *   g_autoptr(GRefString) state = NULL;
+ *   g_autoptr(GRefString) zip_code = NULL;
+ *
+ *   // parse_person_details() is defined elsewhere; returns refcounted strings
+ *   if (!parse_person_details (data, &full_name, &address, &city, &state, &zip_code))
+ *     return NULL;
+ *
+ *   if (!validate_zip_code (zip_code))
+ *     return NULL;
+ *
+ *   // add_address_to_cache() and add_full_name_to_cache() are defined
+ *   // elsewhere; they add strings to various caches, using refcounted
+ *   // strings to avoid copying data over and over again
+ *   add_address_to_cache (address, city, state, zip_code);
+ *   add_full_name_to_cache (full_name);
+ *
+ *   // person_details_new() is defined elsewhere; it takes a reference
+ *   // on each string
+ *   PersonDetails *res = person_details_new (full_name,
+ *                                            address,
+ *                                            city,
+ *                                            state,
+ *                                            zip_code);
+ *
+ *   return res;
+ * }
+ * ]|
+ *
+ * In the example above, we have multiple functions taking the same strings
+ * for different uses; with typical C strings, we'd have to copy the strings
+ * every time the life time rules of the data differ from the life time of
+ * the string parsed from the original buffer. With reference counted strings,
+ * each caller can take a reference on the data, and keep it as long as it
+ * needs to own the string.
+ *
+ * Reference counted strings can also be "interned" inside a global table
+ * owned by GLib; while an interned string has at least a reference, creating
+ * a new interned reference counted string with the same contents will return
+ * a reference to the existing string instead of creating a new reference
+ * counted string instance. Once the string loses its last reference, it will
+ * be automatically removed from the global interned strings table.
+ *
+ * Since: 2.58
+ */
+
+#include "config.h"
+
+#include "grefstring.h"
+
+#include "ghash.h"
+#include "gmessages.h"
+#include "grcbox.h"
+#include "gthread.h"
+
+#include <string.h>
+
+/* A global table of refcounted strings; the hash table does not own
+ * the strings, just a pointer to them. Strings are interned as long
+ * as they are alive; once their reference count drops to zero, they
+ * are removed from the table
+ */
+G_LOCK_DEFINE_STATIC (interned_ref_strings);
+static GHashTable *interned_ref_strings;
+
+/**
+ * g_ref_string_new:
+ * @str: (not nullable): a NUL-terminated string
+ *
+ * Creates a new reference counted string and copies the contents of @str
+ * into it.
+ *
+ * Returns: (transfer full) (not nullable): the newly created reference counted string
+ *
+ * Since: 2.58
+ */
+char *
+g_ref_string_new (const char *str)
+{
+  char *res;
+  gsize len;
+
+  g_return_val_if_fail (str != NULL, NULL);
+  
+  len = strlen (str);
+  
+  res = (char *) g_atomic_rc_box_dup (sizeof (char) * len + 1, str);
+  res[len] = '\0';
+
+  return res;
+}
+
+/**
+ * g_ref_string_new_len:
+ * @str: (not nullable): a string
+ * @len: length of @str to use, or -1 if @str is nul-terminated
+ *
+ * Creates a new reference counted string and copies the contents of @str
+ * into it, up to @len bytes.
+ *
+ * Since this function does not stop at nul bytes, it is the caller's
+ * responsibility to ensure that @str has at least @len addressable bytes.
+ *
+ * Returns: (transfer full) (not nullable): the newly created reference counted string
+ *
+ * Since: 2.58
+ */
+char *
+g_ref_string_new_len (const char *str, gssize len)
+{
+  char *res;
+
+  g_return_val_if_fail (str != NULL, NULL);
+
+  if (len < 0)
+    return g_ref_string_new (str);
+
+  /* allocate then copy as str[len] may not be readable */
+  res = (char *) g_atomic_rc_box_alloc ((gsize) len + 1);
+  memcpy (res, str, len);
+  res[len] = '\0';
+
+  return res;
+}
+
+/* interned_str_equal: variant of g_str_equal() that compares
+ * pointers as well as contents; this avoids running strcmp()
+ * on arbitrarily long strings, as it's more likely to have
+ * g_ref_string_new_intern() being called on the same refcounted
+ * string instance, than on a different string with the same
+ * contents
+ */
+static gboolean
+interned_str_equal (gconstpointer v1,
+                    gconstpointer v2)
+{
+  const char *str1 = v1;
+  const char *str2 = v2;
+
+  if (v1 == v2)
+    return TRUE;
+
+  return strcmp (str1, str2) == 0;
+}
+
+/**
+ * g_ref_string_new_intern:
+ * @str: (not nullable): a NUL-terminated string
+ *
+ * Creates a new reference counted string and copies the content of @str
+ * into it.
+ *
+ * If you call this function multiple times with the same @str, or with
+ * the same contents of @str, it will return a new reference, instead of
+ * creating a new string.
+ *
+ * Returns: (transfer full) (not nullable): the newly created reference
+ *   counted string, or a new reference to an existing string
+ *
+ * Since: 2.58
+ */
+char *
+g_ref_string_new_intern (const char *str)
+{
+  char *res;
+
+  g_return_val_if_fail (str != NULL, NULL);
+
+  G_LOCK (interned_ref_strings);
+
+  if (G_UNLIKELY (interned_ref_strings == NULL))
+    interned_ref_strings = g_hash_table_new (g_str_hash, interned_str_equal);
+
+  res = g_hash_table_lookup (interned_ref_strings, str);
+  if (res != NULL)
+    {
+      /* We acquire the reference while holding the lock, to
+       * avoid a potential race between releasing the lock on
+       * the hash table and another thread releasing the reference
+       * on the same string
+       */
+      g_atomic_rc_box_acquire (res);
+      G_UNLOCK (interned_ref_strings);
+      return res;
+    }
+
+  res = g_ref_string_new (str);
+  g_hash_table_add (interned_ref_strings, res);
+  G_UNLOCK (interned_ref_strings);
+
+  return res;
+}
+
+/**
+ * g_ref_string_acquire:
+ * @str: a reference counted string
+ *
+ * Acquires a reference on a string.
+ *
+ * Returns: the given string, with its reference count increased
+ *
+ * Since: 2.58
+ */
+char *
+g_ref_string_acquire (char *str)
+{
+  g_return_val_if_fail (str != NULL, NULL);
+
+  return g_atomic_rc_box_acquire (str);
+}
+
+static void
+remove_if_interned (gpointer data)
+{
+  char *str = data;
+
+  G_LOCK (interned_ref_strings);
+
+  if (G_LIKELY (interned_ref_strings != NULL))
+    {
+      g_hash_table_remove (interned_ref_strings, str);
+
+      if (g_hash_table_size (interned_ref_strings) == 0)
+        g_clear_pointer (&interned_ref_strings, g_hash_table_destroy);
+    }
+
+  G_UNLOCK (interned_ref_strings);
+}
+
+/**
+ * g_ref_string_release:
+ * @str: a reference counted string
+ *
+ * Releases a reference on a string; if it was the last reference, the
+ * resources allocated by the string are freed as well.
+ *
+ * Since: 2.58
+ */
+void
+g_ref_string_release (char *str)
+{
+  g_return_if_fail (str != NULL);
+
+  g_atomic_rc_box_release_full (str, remove_if_interned);
+}
+
+/**
+ * g_ref_string_length:
+ * @str: a reference counted string
+ *
+ * Retrieves the length of @str.
+ *
+ * Returns: the length of the given string, in bytes
+ *
+ * Since: 2.58
+ */
+gsize
+g_ref_string_length (char *str)
+{
+  g_return_val_if_fail (str != NULL, 0);
+
+  return g_atomic_rc_box_get_size (str) - 1;
+}
diff --git a/glib/grefstring.h b/glib/grefstring.h
new file mode 100644
index 000000000..65b391ffa
--- /dev/null
+++ b/glib/grefstring.h
@@ -0,0 +1,44 @@
+/* grefstring.h: Reference counted strings
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "gmem.h"
+#include "gmacros.h"
+
+G_BEGIN_DECLS
+
+GLIB_AVAILABLE_IN_2_58
+char *  g_ref_string_new        (const char *str);
+GLIB_AVAILABLE_IN_2_58
+char *  g_ref_string_new_len    (const char *str,
+                                 gssize      len);
+GLIB_AVAILABLE_IN_2_58
+char *  g_ref_string_new_intern (const char *str);
+
+GLIB_AVAILABLE_IN_2_58
+char *  g_ref_string_acquire    (char       *str);
+GLIB_AVAILABLE_IN_2_58
+void    g_ref_string_release    (char       *str);
+
+GLIB_AVAILABLE_IN_2_58
+gsize   g_ref_string_length     (char       *str);
+
+typedef char GRefString;
+
+G_END_DECLS
diff --git a/glib/gscripttable.h b/glib/gscripttable.h
index c30d3175c..ed9542a85 100644
--- a/glib/gscripttable.h
+++ b/glib/gscripttable.h
@@ -466,7 +466,6 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
-  G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
@@ -480,7 +479,8 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_ARMENIAN,
+  G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN,
+  G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_ARMENIAN,
   G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_ARMENIAN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW,
@@ -514,7 +514,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW,
   G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_HEBREW,
+  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW,
   G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_HEBREW,
   G_UNICODE_SCRIPT_HEBREW, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
@@ -689,8 +689,8 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO,
   G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO,
   G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_SAMARITAN,
+  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_NKO,
+  G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_NKO, G_UNICODE_SCRIPT_SAMARITAN,
   G_UNICODE_SCRIPT_SAMARITAN, G_UNICODE_SCRIPT_SAMARITAN, G_UNICODE_SCRIPT_SAMARITAN,
   G_UNICODE_SCRIPT_SAMARITAN, G_UNICODE_SCRIPT_SAMARITAN, G_UNICODE_SCRIPT_SAMARITAN,
   G_UNICODE_SCRIPT_SAMARITAN, G_UNICODE_SCRIPT_SAMARITAN, G_UNICODE_SCRIPT_SAMARITAN,
@@ -761,7 +761,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC,
+  G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC,
   G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC,
   G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC,
   G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC, G_UNICODE_SCRIPT_ARABIC,
@@ -860,7 +860,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI,
   G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI,
   G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI,
-  G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_UNKNOWN,
+  G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI, G_UNICODE_SCRIPT_BENGALI,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_GURMUKHI,
   G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI,
@@ -900,7 +900,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI,
   G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI,
   G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI,
-  G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_UNKNOWN,
+  G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI, G_UNICODE_SCRIPT_GURMUKHI,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
@@ -1033,7 +1033,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_TAMIL, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU,
-  G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_TELUGU,
+  G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU,
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU,
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU,
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_TELUGU,
@@ -1076,7 +1076,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU,
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_KANNADA,
   G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA,
+  G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA,
   G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA,
   G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_KANNADA, G_UNICODE_SCRIPT_KANNADA,
@@ -2096,7 +2096,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN,
   G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN,
   G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
+  G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_MONGOLIAN,
   G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN, G_UNICODE_SCRIPT_MONGOLIAN,
@@ -2445,23 +2445,23 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_CYRILLIC, G_UNICODE_SCRIPT_CYRILLIC, G_UNICODE_SCRIPT_CYRILLIC,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_SUNDANESE, G_UNICODE_SCRIPT_SUNDANESE,
+  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_UNKNOWN,
+  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_GEORGIAN,
+  G_UNICODE_SCRIPT_GEORGIAN, G_UNICODE_SCRIPT_SUNDANESE, G_UNICODE_SCRIPT_SUNDANESE,
   G_UNICODE_SCRIPT_SUNDANESE, G_UNICODE_SCRIPT_SUNDANESE, G_UNICODE_SCRIPT_SUNDANESE,
   G_UNICODE_SCRIPT_SUNDANESE, G_UNICODE_SCRIPT_SUNDANESE, G_UNICODE_SCRIPT_SUNDANESE,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
@@ -2774,10 +2774,8 @@ static const struct {
  { 0x2800,   256, G_UNICODE_SCRIPT_BRAILLE },
  { 0x2900,   628, G_UNICODE_SCRIPT_COMMON },
  { 0x2b76,    32, G_UNICODE_SCRIPT_COMMON },
- { 0x2b98,    34, G_UNICODE_SCRIPT_COMMON },
- { 0x2bbd,    12, G_UNICODE_SCRIPT_COMMON },
- { 0x2bca,     9, G_UNICODE_SCRIPT_COMMON },
- { 0x2bec,     4, G_UNICODE_SCRIPT_COMMON },
+ { 0x2b98,    49, G_UNICODE_SCRIPT_COMMON },
+ { 0x2bca,    53, G_UNICODE_SCRIPT_COMMON },
  { 0x2c00,    47, G_UNICODE_SCRIPT_GLAGOLITIC },
  { 0x2c30,    47, G_UNICODE_SCRIPT_GLAGOLITIC },
  { 0x2c60,    32, G_UNICODE_SCRIPT_LATIN },
@@ -2799,7 +2797,7 @@ static const struct {
  { 0x2dd0,     7, G_UNICODE_SCRIPT_ETHIOPIC },
  { 0x2dd8,     7, G_UNICODE_SCRIPT_ETHIOPIC },
  { 0x2de0,    32, G_UNICODE_SCRIPT_CYRILLIC },
- { 0x2e00,    74, G_UNICODE_SCRIPT_COMMON },
+ { 0x2e00,    79, G_UNICODE_SCRIPT_COMMON },
  { 0x2e80,    26, G_UNICODE_SCRIPT_HAN },
  { 0x2e9b,    89, G_UNICODE_SCRIPT_HAN },
  { 0x2f00,   214, G_UNICODE_SCRIPT_HAN },
@@ -2823,7 +2821,7 @@ static const struct {
  { 0x30a1,    90, G_UNICODE_SCRIPT_KATAKANA },
  { 0x30fb,     2, G_UNICODE_SCRIPT_COMMON },
  { 0x30fd,     3, G_UNICODE_SCRIPT_KATAKANA },
- { 0x3105,    42, G_UNICODE_SCRIPT_BOPOMOFO },
+ { 0x3105,    43, G_UNICODE_SCRIPT_BOPOMOFO },
  { 0x3131,    94, G_UNICODE_SCRIPT_HANGUL },
  { 0x3190,    16, G_UNICODE_SCRIPT_COMMON },
  { 0x31a0,    27, G_UNICODE_SCRIPT_BOPOMOFO },
@@ -2838,7 +2836,7 @@ static const struct {
  { 0x3358,   168, G_UNICODE_SCRIPT_COMMON },
  { 0x3400,  6582, G_UNICODE_SCRIPT_HAN },
  { 0x4dc0,    64, G_UNICODE_SCRIPT_COMMON },
- { 0x4e00, 20971, G_UNICODE_SCRIPT_HAN },
+ { 0x4e00, 20976, G_UNICODE_SCRIPT_HAN },
  { 0xa000,  1165, G_UNICODE_SCRIPT_YI },
  { 0xa490,    55, G_UNICODE_SCRIPT_YI },
  { 0xa4d0,    48, G_UNICODE_SCRIPT_LISU },
@@ -2848,15 +2846,14 @@ static const struct {
  { 0xa700,    34, G_UNICODE_SCRIPT_COMMON },
  { 0xa722,   102, G_UNICODE_SCRIPT_LATIN },
  { 0xa788,     3, G_UNICODE_SCRIPT_COMMON },
- { 0xa78b,    36, G_UNICODE_SCRIPT_LATIN },
- { 0xa7b0,     8, G_UNICODE_SCRIPT_LATIN },
+ { 0xa78b,    47, G_UNICODE_SCRIPT_LATIN },
  { 0xa7f7,     9, G_UNICODE_SCRIPT_LATIN },
  { 0xa800,    44, G_UNICODE_SCRIPT_SYLOTI_NAGRI },
  { 0xa830,    10, G_UNICODE_SCRIPT_COMMON },
  { 0xa840,    56, G_UNICODE_SCRIPT_PHAGS_PA },
  { 0xa880,    70, G_UNICODE_SCRIPT_SAURASHTRA },
  { 0xa8ce,    12, G_UNICODE_SCRIPT_SAURASHTRA },
- { 0xa8e0,    30, G_UNICODE_SCRIPT_DEVANAGARI },
+ { 0xa8e0,    32, G_UNICODE_SCRIPT_DEVANAGARI },
  { 0xa900,    46, G_UNICODE_SCRIPT_KAYAH_LI },
  { 0xa92e,     1, G_UNICODE_SCRIPT_COMMON },
  { 0xa92f,     1, G_UNICODE_SCRIPT_KAYAH_LI },
@@ -2999,9 +2996,9 @@ static const struct {
  { 0x10a05,     2, G_UNICODE_SCRIPT_KHAROSHTHI },
  { 0x10a0c,     8, G_UNICODE_SCRIPT_KHAROSHTHI },
  { 0x10a15,     3, G_UNICODE_SCRIPT_KHAROSHTHI },
- { 0x10a19,    27, G_UNICODE_SCRIPT_KHAROSHTHI },
+ { 0x10a19,    29, G_UNICODE_SCRIPT_KHAROSHTHI },
  { 0x10a38,     3, G_UNICODE_SCRIPT_KHAROSHTHI },
- { 0x10a3f,     9, G_UNICODE_SCRIPT_KHAROSHTHI },
+ { 0x10a3f,    10, G_UNICODE_SCRIPT_KHAROSHTHI },
  { 0x10a50,     9, G_UNICODE_SCRIPT_KHAROSHTHI },
  { 0x10a60,    32, G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN },
  { 0x10a80,    32, G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN },
@@ -3020,15 +3017,20 @@ static const struct {
  { 0x10c80,    51, G_UNICODE_SCRIPT_OLD_HUNGARIAN },
  { 0x10cc0,    51, G_UNICODE_SCRIPT_OLD_HUNGARIAN },
  { 0x10cfa,     6, G_UNICODE_SCRIPT_OLD_HUNGARIAN },
+ { 0x10d00,    40, G_UNICODE_SCRIPT_HANIFI_ROHINGYA },
+ { 0x10d30,    10, G_UNICODE_SCRIPT_HANIFI_ROHINGYA },
  { 0x10e60,    31, G_UNICODE_SCRIPT_ARABIC },
+ { 0x10f00,    40, G_UNICODE_SCRIPT_OLD_SOGDIAN },
+ { 0x10f30,    42, G_UNICODE_SCRIPT_SOGDIAN },
  { 0x11000,    78, G_UNICODE_SCRIPT_BRAHMI },
  { 0x11052,    30, G_UNICODE_SCRIPT_BRAHMI },
  { 0x1107f,     1, G_UNICODE_SCRIPT_BRAHMI },
  { 0x11080,    66, G_UNICODE_SCRIPT_KAITHI },
+ { 0x110cd,     1, G_UNICODE_SCRIPT_KAITHI },
  { 0x110d0,    25, G_UNICODE_SCRIPT_SORA_SOMPENG },
  { 0x110f0,    10, G_UNICODE_SCRIPT_SORA_SOMPENG },
  { 0x11100,    53, G_UNICODE_SCRIPT_CHAKMA },
- { 0x11136,    14, G_UNICODE_SCRIPT_CHAKMA },
+ { 0x11136,    17, G_UNICODE_SCRIPT_CHAKMA },
  { 0x11150,    39, G_UNICODE_SCRIPT_MAHAJANI },
  { 0x11180,    78, G_UNICODE_SCRIPT_SHARADA },
  { 0x111d0,    16, G_UNICODE_SCRIPT_SHARADA },
@@ -3049,6 +3051,7 @@ static const struct {
  { 0x1132a,     7, G_UNICODE_SCRIPT_GRANTHA },
  { 0x11332,     2, G_UNICODE_SCRIPT_GRANTHA },
  { 0x11335,     5, G_UNICODE_SCRIPT_GRANTHA },
+ { 0x1133b,     1, G_UNICODE_SCRIPT_INHERITED },
  { 0x1133c,     9, G_UNICODE_SCRIPT_GRANTHA },
  { 0x11347,     2, G_UNICODE_SCRIPT_GRANTHA },
  { 0x1134b,     3, G_UNICODE_SCRIPT_GRANTHA },
@@ -3059,7 +3062,7 @@ static const struct {
  { 0x11370,     5, G_UNICODE_SCRIPT_GRANTHA },
  { 0x11400,    90, G_UNICODE_SCRIPT_NEWA },
  { 0x1145b,     1, G_UNICODE_SCRIPT_NEWA },
- { 0x1145d,     1, G_UNICODE_SCRIPT_NEWA },
+ { 0x1145d,     2, G_UNICODE_SCRIPT_NEWA },
  { 0x11480,    72, G_UNICODE_SCRIPT_TIRHUTA },
  { 0x114d0,    10, G_UNICODE_SCRIPT_TIRHUTA },
  { 0x11580,    54, G_UNICODE_SCRIPT_SIDDHAM },
@@ -3069,15 +3072,15 @@ static const struct {
  { 0x11660,    13, G_UNICODE_SCRIPT_MONGOLIAN },
  { 0x11680,    56, G_UNICODE_SCRIPT_TAKRI },
  { 0x116c0,    10, G_UNICODE_SCRIPT_TAKRI },
- { 0x11700,    26, G_UNICODE_SCRIPT_AHOM },
+ { 0x11700,    27, G_UNICODE_SCRIPT_AHOM },
  { 0x1171d,    15, G_UNICODE_SCRIPT_AHOM },
  { 0x11730,    16, G_UNICODE_SCRIPT_AHOM },
+ { 0x11800,    60, G_UNICODE_SCRIPT_DOGRA },
  { 0x118a0,    83, G_UNICODE_SCRIPT_WARANG_CITI },
  { 0x118ff,     1, G_UNICODE_SCRIPT_WARANG_CITI },
  { 0x11a00,    72, G_UNICODE_SCRIPT_ZANABAZAR_SQUARE },
  { 0x11a50,    52, G_UNICODE_SCRIPT_SOYOMBO },
- { 0x11a86,    23, G_UNICODE_SCRIPT_SOYOMBO },
- { 0x11a9e,     5, G_UNICODE_SCRIPT_SOYOMBO },
+ { 0x11a86,    29, G_UNICODE_SCRIPT_SOYOMBO },
  { 0x11ac0,    57, G_UNICODE_SCRIPT_PAU_CIN_HAU },
  { 0x11c00,     9, G_UNICODE_SCRIPT_BHAIKSUKI },
  { 0x11c0a,    45, G_UNICODE_SCRIPT_BHAIKSUKI },
@@ -3093,6 +3096,13 @@ static const struct {
  { 0x11d3c,     2, G_UNICODE_SCRIPT_MASARAM_GONDI },
  { 0x11d3f,     9, G_UNICODE_SCRIPT_MASARAM_GONDI },
  { 0x11d50,    10, G_UNICODE_SCRIPT_MASARAM_GONDI },
+ { 0x11d60,     6, G_UNICODE_SCRIPT_GUNJALA_GONDI },
+ { 0x11d67,     2, G_UNICODE_SCRIPT_GUNJALA_GONDI },
+ { 0x11d6a,    37, G_UNICODE_SCRIPT_GUNJALA_GONDI },
+ { 0x11d90,     2, G_UNICODE_SCRIPT_GUNJALA_GONDI },
+ { 0x11d93,     6, G_UNICODE_SCRIPT_GUNJALA_GONDI },
+ { 0x11da0,    10, G_UNICODE_SCRIPT_GUNJALA_GONDI },
+ { 0x11ee0,    25, G_UNICODE_SCRIPT_MAKASAR },
  { 0x12000,   922, G_UNICODE_SCRIPT_CUNEIFORM },
  { 0x12400,   111, G_UNICODE_SCRIPT_CUNEIFORM },
  { 0x12470,     5, G_UNICODE_SCRIPT_CUNEIFORM },
@@ -3110,12 +3120,13 @@ static const struct {
  { 0x16b5b,     7, G_UNICODE_SCRIPT_PAHAWH_HMONG },
  { 0x16b63,    21, G_UNICODE_SCRIPT_PAHAWH_HMONG },
  { 0x16b7d,    19, G_UNICODE_SCRIPT_PAHAWH_HMONG },
+ { 0x16e40,    91, G_UNICODE_SCRIPT_MEDEFAIDRIN },
  { 0x16f00,    69, G_UNICODE_SCRIPT_MIAO },
  { 0x16f50,    47, G_UNICODE_SCRIPT_MIAO },
  { 0x16f8f,    17, G_UNICODE_SCRIPT_MIAO },
  { 0x16fe0,     1, G_UNICODE_SCRIPT_TANGUT },
  { 0x16fe1,     1, G_UNICODE_SCRIPT_NUSHU },
- { 0x17000,  6125, G_UNICODE_SCRIPT_TANGUT },
+ { 0x17000,  6130, G_UNICODE_SCRIPT_TANGUT },
  { 0x18800,   755, G_UNICODE_SCRIPT_TANGUT },
  { 0x1b000,     1, G_UNICODE_SCRIPT_KATAKANA },
  { 0x1b001,   286, G_UNICODE_SCRIPT_HIRAGANA },
@@ -3138,8 +3149,9 @@ static const struct {
  { 0x1d1aa,     4, G_UNICODE_SCRIPT_INHERITED },
  { 0x1d1ae,    59, G_UNICODE_SCRIPT_COMMON },
  { 0x1d200,    70, G_UNICODE_SCRIPT_GREEK },
+ { 0x1d2e0,    20, G_UNICODE_SCRIPT_COMMON },
  { 0x1d300,    87, G_UNICODE_SCRIPT_COMMON },
- { 0x1d360,    18, G_UNICODE_SCRIPT_COMMON },
+ { 0x1d360,    25, G_UNICODE_SCRIPT_COMMON },
  { 0x1d400,    85, G_UNICODE_SCRIPT_COMMON },
  { 0x1d456,    71, G_UNICODE_SCRIPT_COMMON },
  { 0x1d49e,     2, G_UNICODE_SCRIPT_COMMON },
@@ -3174,6 +3186,7 @@ static const struct {
  { 0x1e900,    75, G_UNICODE_SCRIPT_ADLAM },
  { 0x1e950,    10, G_UNICODE_SCRIPT_ADLAM },
  { 0x1e95e,     2, G_UNICODE_SCRIPT_ADLAM },
+ { 0x1ec71,    68, G_UNICODE_SCRIPT_COMMON },
  { 0x1ee00,     4, G_UNICODE_SCRIPT_ARABIC },
  { 0x1ee05,    27, G_UNICODE_SCRIPT_ARABIC },
  { 0x1ee21,     2, G_UNICODE_SCRIPT_ARABIC },
@@ -3215,8 +3228,7 @@ static const struct {
  { 0x1f0c1,    15, G_UNICODE_SCRIPT_COMMON },
  { 0x1f0d1,    37, G_UNICODE_SCRIPT_COMMON },
  { 0x1f100,    13, G_UNICODE_SCRIPT_COMMON },
- { 0x1f110,    31, G_UNICODE_SCRIPT_COMMON },
- { 0x1f130,    60, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f110,    92, G_UNICODE_SCRIPT_COMMON },
  { 0x1f170,    61, G_UNICODE_SCRIPT_COMMON },
  { 0x1f1e6,    26, G_UNICODE_SCRIPT_COMMON },
  { 0x1f200,     1, G_UNICODE_SCRIPT_HIRAGANA },
@@ -3227,9 +3239,9 @@ static const struct {
  { 0x1f260,     6, G_UNICODE_SCRIPT_COMMON },
  { 0x1f300,   981, G_UNICODE_SCRIPT_COMMON },
  { 0x1f6e0,    13, G_UNICODE_SCRIPT_COMMON },
- { 0x1f6f0,     9, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f6f0,    10, G_UNICODE_SCRIPT_COMMON },
  { 0x1f700,   116, G_UNICODE_SCRIPT_COMMON },
- { 0x1f780,    85, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f780,    89, G_UNICODE_SCRIPT_COMMON },
  { 0x1f800,    12, G_UNICODE_SCRIPT_COMMON },
  { 0x1f810,    56, G_UNICODE_SCRIPT_COMMON },
  { 0x1f850,    10, G_UNICODE_SCRIPT_COMMON },
@@ -3237,11 +3249,14 @@ static const struct {
  { 0x1f890,    30, G_UNICODE_SCRIPT_COMMON },
  { 0x1f900,    12, G_UNICODE_SCRIPT_COMMON },
  { 0x1f910,    47, G_UNICODE_SCRIPT_COMMON },
- { 0x1f940,    13, G_UNICODE_SCRIPT_COMMON },
- { 0x1f950,    28, G_UNICODE_SCRIPT_COMMON },
- { 0x1f980,    24, G_UNICODE_SCRIPT_COMMON },
- { 0x1f9c0,     1, G_UNICODE_SCRIPT_COMMON },
- { 0x1f9d0,    23, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f940,    49, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f973,     4, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f97a,     1, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f97c,    39, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f9b0,    10, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f9c0,     3, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f9d0,    48, G_UNICODE_SCRIPT_COMMON },
+ { 0x1fa60,    14, G_UNICODE_SCRIPT_COMMON },
  { 0x20000, 42711, G_UNICODE_SCRIPT_HAN },
  { 0x2a700,  4149, G_UNICODE_SCRIPT_HAN },
  { 0x2b740,   222, G_UNICODE_SCRIPT_HAN },
diff --git a/glib/gslice.c b/glib/gslice.c
index 5af723686..e7a2d83e1 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -19,11 +19,7 @@
 #include "config.h"
 #include "glibconfig.h"
 
-#if     defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS
-#  define HAVE_COMPLIANT_POSIX_MEMALIGN 1
-#endif
-
-#if defined(HAVE_COMPLIANT_POSIX_MEMALIGN) && !defined(_XOPEN_SOURCE)
+#if defined(HAVE_POSIX_MEMALIGN) && !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE 600       /* posix_memalign() */
 #endif
 #include <stdlib.h>             /* posix_memalign() */
@@ -38,7 +34,7 @@
 #include <process.h>
 #endif
 
-#include <stdio.h>              /* fputs/fprintf */
+#include <stdio.h>              /* fputs */
 
 #include "gslice.h"
 
@@ -50,8 +46,9 @@
 #include "gtestutils.h"
 #include "gthread.h"
 #include "glib_trace.h"
+#include "gprintf.h"
 
-#include "valgrind.h"
+#include "gvalgrind.h"
 
 /**
  * SECTION:memory_slices
@@ -388,8 +385,10 @@ slice_config_init (SliceConfig *config)
        * This way it's possible to force gslice to be enabled under
        * valgrind just by setting G_SLICE to the empty string.
        */
+#ifdef ENABLE_VALGRIND
       if (RUNNING_ON_VALGRIND)
         config->always_malloc = TRUE;
+#endif
     }
 }
 
@@ -413,7 +412,7 @@ g_slice_init_nomessage (void)
   mem_assert ((sys_page_size & (sys_page_size - 1)) == 0);
   slice_config_init (&allocator->config);
   allocator->min_page_size = sys_page_size;
-#if HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN
+#if HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN
   /* allow allocation of pages up to 8KB (with 8KB alignment).
    * this is useful because many medium to large sized structures
    * fit less than 8 times (see [4]) into 4KB pages.
@@ -1390,13 +1389,12 @@ slab_allocator_free_chunk (gsize    chunk_size,
 
 /* from config.h:
  * define HAVE_POSIX_MEMALIGN           1 // if free(posix_memalign(3)) works, <stdlib.h>
- * define HAVE_COMPLIANT_POSIX_MEMALIGN 1 // if free(posix_memalign(3)) works for sizes != 2^n, <stdlib.h>
  * define HAVE_MEMALIGN                 1 // if free(memalign(3)) works, <malloc.h>
  * define HAVE_VALLOC                   1 // if free(valloc(3)) works, <stdlib.h> or <malloc.h>
  * if none is provided, we implement malloc(3)-based alloc-only page alignment
  */
 
-#if !(HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC)
+#if !(HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC)
 static GTrashStack *compat_valloc_trash = NULL;
 #endif
 
@@ -1406,7 +1404,7 @@ allocator_memalign (gsize alignment,
 {
   gpointer aligned_memory = NULL;
   gint err = ENOMEM;
-#if     HAVE_COMPLIANT_POSIX_MEMALIGN
+#if     HAVE_POSIX_MEMALIGN
   err = posix_memalign (&aligned_memory, alignment, memsize);
 #elif   HAVE_MEMALIGN
   errno = 0;
@@ -1450,7 +1448,7 @@ static void
 allocator_memfree (gsize    memsize,
                    gpointer mem)
 {
-#if     HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC
+#if     HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC
   free (mem);
 #else
   mem_assert (memsize <= sys_page_size);
@@ -1469,9 +1467,9 @@ mem_error (const char *format,
   /* at least, put out "MEMORY-ERROR", in case we segfault during the rest of the function */
   fputs ("\n***MEMORY-ERROR***: ", stderr);
   pname = g_get_prgname();
-  fprintf (stderr, "%s[%ld]: GSlice: ", pname ? pname : "", (long)getpid());
+  g_fprintf (stderr, "%s[%ld]: GSlice: ", pname ? pname : "", (long)getpid());
   va_start (args, format);
-  vfprintf (stderr, format, args);
+  g_vfprintf (stderr, format, args);
   va_end (args);
   fputs ("\n", stderr);
   abort();
@@ -1525,17 +1523,17 @@ smc_notify_free (void   *pointer,
   found_one = smc_tree_lookup (address, &real_size);
   if (!found_one)
     {
-      fprintf (stderr, "GSlice: MemChecker: attempt to release non-allocated block: %p size=%" G_GSIZE_FORMAT "\n", pointer, size);
+      g_fprintf (stderr, "GSlice: MemChecker: attempt to release non-allocated block: %p size=%" G_GSIZE_FORMAT "\n", pointer, size);
       return 0;
     }
   if (real_size != size && (real_size || size))
     {
-      fprintf (stderr, "GSlice: MemChecker: attempt to release block with invalid size: %p size=%" G_GSIZE_FORMAT " invalid-size=%" G_GSIZE_FORMAT "\n", pointer, real_size, size);
+      g_fprintf (stderr, "GSlice: MemChecker: attempt to release block with invalid size: %p size=%" G_GSIZE_FORMAT " invalid-size=%" G_GSIZE_FORMAT "\n", pointer, real_size, size);
       return 0;
     }
   if (!smc_tree_remove (address))
     {
-      fprintf (stderr, "GSlice: MemChecker: attempt to release non-allocated block: %p size=%" G_GSIZE_FORMAT "\n", pointer, size);
+      g_fprintf (stderr, "GSlice: MemChecker: attempt to release non-allocated block: %p size=%" G_GSIZE_FORMAT "\n", pointer, size);
       return 0;
     }
   return 1; /* all fine */
@@ -1714,15 +1712,15 @@ g_slice_debug_tree_statistics (void)
       en = b ? en : 0;
       tf = MAX (t, 1.0); /* max(1) to be a valid divisor */
       bf = MAX (b, 1.0); /* max(1) to be a valid divisor */
-      fprintf (stderr, "GSlice: MemChecker: %u trunks, %u branches, %u old branches\n", t, b, o);
-      fprintf (stderr, "GSlice: MemChecker: %f branches per trunk, %.2f%% utilization\n",
+      g_fprintf (stderr, "GSlice: MemChecker: %u trunks, %u branches, %u old branches\n", t, b, o);
+      g_fprintf (stderr, "GSlice: MemChecker: %f branches per trunk, %.2f%% utilization\n",
                b / tf,
                100.0 - (SMC_BRANCH_COUNT - b / tf) / (0.01 * SMC_BRANCH_COUNT));
-      fprintf (stderr, "GSlice: MemChecker: %f entries per branch, %u minimum, %u maximum\n",
+      g_fprintf (stderr, "GSlice: MemChecker: %f entries per branch, %u minimum, %u maximum\n",
                su / bf, en, ex);
     }
   else
-    fprintf (stderr, "GSlice: MemChecker: root=NULL\n");
+    g_fprintf (stderr, "GSlice: MemChecker: root=NULL\n");
   g_mutex_unlock (&smc_tree_mutex);
   
   /* sample statistics (beast + GSLice + 24h scripted core & GUI activity):
diff --git a/glib/gspawn-private.h b/glib/gspawn-private.h
new file mode 100644
index 000000000..16f816c89
--- /dev/null
+++ b/glib/gspawn-private.h
@@ -0,0 +1,115 @@
+/* gspawn.c - Process launching
+ *
+ *  Copyright 2000 Red Hat, Inc.
+ *  g_execvpe implementation based on GNU libc execvp:
+ *   Copyright 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+
+#include "gspawn.h"
+
+static inline gint
+_g_spawn_exec_err_to_g_error (gint en)
+{
+  switch (en)
+    {
+#ifdef EACCES
+    case EACCES:
+      return G_SPAWN_ERROR_ACCES;
+#endif
+
+#ifdef EPERM
+    case EPERM:
+      return G_SPAWN_ERROR_PERM;
+#endif
+
+#ifdef E2BIG
+    case E2BIG:
+      return G_SPAWN_ERROR_TOO_BIG;
+#endif
+
+#ifdef ENOEXEC
+    case ENOEXEC:
+      return G_SPAWN_ERROR_NOEXEC;
+#endif
+
+#ifdef ENAMETOOLONG
+    case ENAMETOOLONG:
+      return G_SPAWN_ERROR_NAMETOOLONG;
+#endif
+
+#ifdef ENOENT
+    case ENOENT:
+      return G_SPAWN_ERROR_NOENT;
+#endif
+
+#ifdef ENOMEM
+    case ENOMEM:
+      return G_SPAWN_ERROR_NOMEM;
+#endif
+
+#ifdef ENOTDIR
+    case ENOTDIR:
+      return G_SPAWN_ERROR_NOTDIR;
+#endif
+
+#ifdef ELOOP
+    case ELOOP:
+      return G_SPAWN_ERROR_LOOP;
+#endif
+
+#ifdef ETXTBUSY
+    case ETXTBUSY:
+      return G_SPAWN_ERROR_TXTBUSY;
+#endif
+
+#ifdef EIO
+    case EIO:
+      return G_SPAWN_ERROR_IO;
+#endif
+
+#ifdef ENFILE
+    case ENFILE:
+      return G_SPAWN_ERROR_NFILE;
+#endif
+
+#ifdef EMFILE
+    case EMFILE:
+      return G_SPAWN_ERROR_MFILE;
+#endif
+
+#ifdef EINVAL
+    case EINVAL:
+      return G_SPAWN_ERROR_INVAL;
+#endif
+
+#ifdef EISDIR
+    case EISDIR:
+      return G_SPAWN_ERROR_ISDIR;
+#endif
+
+#ifdef ELIBBAD
+    case ELIBBAD:
+      return G_SPAWN_ERROR_LIBBAD;
+#endif
+
+    default:
+      return G_SPAWN_ERROR_FAILED;
+    }
+}
diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
index 360f47ebb..045d90f71 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -352,7 +352,12 @@ main (int ignored_argc, char **ignored_argv)
   saved_errno = errno;
 
   if (handle == -1 && saved_errno != 0)
-    write_err_and_exit (child_err_report_fd, CHILD_SPAWN_FAILED);
+    {
+      int ec = (saved_errno == ENOENT)
+          ? CHILD_SPAWN_NOENT
+          : CHILD_SPAWN_FAILED;
+      write_err_and_exit (child_err_report_fd, ec);
+    }
 
   write (child_err_report_fd, &no_error, sizeof (no_error));
   write (child_err_report_fd, &handle, sizeof (handle));
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index 636e9ebe8..b0cf5ab7a 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -46,6 +46,7 @@
 #include "glib-private.h"
 #include "gprintfint.h"
 #include "glibintl.h"
+#include "gspawn-private.h"
 #include "gthread.h"
 
 #include <string.h>
@@ -86,6 +87,7 @@ enum
   CHILD_NO_ERROR,
   CHILD_CHDIR_FAILED,
   CHILD_SPAWN_FAILED,
+  CHILD_SPAWN_NOENT,
 };
 
 enum {
@@ -316,6 +318,7 @@ read_helper_report (int      fd,
   while (bytes < sizeof(gintptr)*2)
     {
       gint chunk;
+      int errsv;
 
       if (debug)
 	g_print ("%s:read_helper_report: read %" G_GSIZE_FORMAT "...\n",
@@ -324,14 +327,13 @@ read_helper_report (int      fd,
 
       chunk = read (fd, ((gchar*)report) + bytes,
 		    sizeof(gintptr)*2 - bytes);
+      errsv = errno;
 
       if (debug)
 	g_print ("...got %d bytes\n", chunk);
           
       if (chunk < 0)
         {
-          int errsv = errno;
-
           /* Some weird shit happened, bail out */
           g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
                        _("Failed to read from child pipe (%s)"),
@@ -374,6 +376,11 @@ set_child_error (gintptr      report[2],
 		   _("Failed to execute child process (%s)"),
 		   g_strerror (report[1]));
       break;
+    case CHILD_SPAWN_NOENT:
+      g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT,
+                   _("Failed to execute child process (%s)"),
+                   g_strerror (report[1]));
+      break;
     default:
       g_assert_not_reached ();
     }
@@ -429,7 +436,7 @@ do_spawn_directly (gint                 *exit_status,
   const int mode = (exit_status == NULL) ? P_NOWAIT : P_WAIT;
   char **new_argv;
   gintptr rc = -1;
-  int saved_errno;
+  int errsv;
   GError *conv_error = NULL;
   gint conv_error_index;
   wchar_t *wargv0, **wargv, **wenvp;
@@ -481,17 +488,17 @@ do_spawn_directly (gint                 *exit_status,
     else
       rc = _wspawnv (mode, wargv0, (const wchar_t **) wargv);
 
+  errsv = errno;
+
   g_free (wargv0);
   g_strfreev ((gchar **) wargv);
   g_strfreev ((gchar **) wenvp);
 
-  saved_errno = errno;
-
-  if (rc == -1 && saved_errno != 0)
+  if (rc == -1 && errsv != 0)
     {
-      g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
+      g_set_error (error, G_SPAWN_ERROR, _g_spawn_exec_err_to_g_error (errsv),
 		   _("Failed to execute child process (%s)"),
-		   g_strerror (saved_errno));
+		   g_strerror (errsv));
       return FALSE;
     }
 
@@ -513,30 +520,27 @@ do_spawn_directly (gint                 *exit_status,
 }
 
 static gboolean
-do_spawn_with_pipes (gint                 *exit_status,
-		     gboolean		   do_return_handle,
-		     const gchar          *working_directory,
-		     gchar               **argv,
-		     char                **envp,
-		     GSpawnFlags           flags,
-		     GSpawnChildSetupFunc  child_setup,
-		     GPid                 *child_handle,
-		     gint                 *standard_input,
-		     gint                 *standard_output,
-		     gint                 *standard_error,
-		     gint		  *err_report,
-		     GError              **error)     
+do_spawn_with_fds (gint                 *exit_status,
+		   gboolean		   do_return_handle,
+		   const gchar          *working_directory,
+		   gchar               **argv,
+		   char                **envp,
+		   GSpawnFlags           flags,
+		   GSpawnChildSetupFunc  child_setup,
+		   GPid                 *child_handle,
+		   gint                  stdin_fd,
+		   gint                  stdout_fd,
+		   gint                  stderr_fd,
+		   gint		  *err_report,
+		   GError              **error)
 {
   char **protected_argv;
   char args[ARG_COUNT][10];
   char **new_argv;
   int i;
   gintptr rc = -1;
-  int saved_errno;
+  int errsv;
   int argc;
-  int stdin_pipe[2] = { -1, -1 };
-  int stdout_pipe[2] = { -1, -1 };
-  int stderr_pipe[2] = { -1, -1 };
   int child_err_report_pipe[2] = { -1, -1 };
   int helper_sync_pipe[2] = { -1, -1 };
   gintptr helper_report[2];
@@ -555,7 +559,7 @@ do_spawn_with_pipes (gint                 *exit_status,
 
   argc = protect_argv (argv, &protected_argv);
 
-  if (!standard_input && !standard_output && !standard_error &&
+  if (stdin_fd == -1 && stdout_fd == -1 && stderr_fd == -1 &&
       (flags & G_SPAWN_CHILD_INHERITS_STDIN) &&
       !(flags & G_SPAWN_STDOUT_TO_DEV_NULL) &&
       !(flags & G_SPAWN_STDERR_TO_DEV_NULL) &&
@@ -571,15 +575,6 @@ do_spawn_with_pipes (gint                 *exit_status,
       return retval;
     }
 
-  if (standard_input && !make_pipe (stdin_pipe, error))
-    goto cleanup_and_fail;
-  
-  if (standard_output && !make_pipe (stdout_pipe, error))
-    goto cleanup_and_fail;
-  
-  if (standard_error && !make_pipe (stderr_pipe, error))
-    goto cleanup_and_fail;
-  
   if (!make_pipe (child_err_report_pipe, error))
     goto cleanup_and_fail;
   
@@ -632,9 +627,9 @@ do_spawn_with_pipes (gint                 *exit_status,
    */
   helper_sync_pipe[1] = dup_noninherited (helper_sync_pipe[1], _O_WRONLY);
 
-  if (standard_input)
+  if (stdin_fd != -1)
     {
-      _g_sprintf (args[ARG_STDIN], "%d", stdin_pipe[0]);
+      _g_sprintf (args[ARG_STDIN], "%d", stdin_fd);
       new_argv[ARG_STDIN] = args[ARG_STDIN];
     }
   else if (flags & G_SPAWN_CHILD_INHERITS_STDIN)
@@ -648,9 +643,9 @@ do_spawn_with_pipes (gint                 *exit_status,
       new_argv[ARG_STDIN] = "z";
     }
   
-  if (standard_output)
+  if (stdout_fd != -1)
     {
-      _g_sprintf (args[ARG_STDOUT], "%d", stdout_pipe[1]);
+      _g_sprintf (args[ARG_STDOUT], "%d", stdout_fd);
       new_argv[ARG_STDOUT] = args[ARG_STDOUT];
     }
   else if (flags & G_SPAWN_STDOUT_TO_DEV_NULL)
@@ -662,9 +657,9 @@ do_spawn_with_pipes (gint                 *exit_status,
       new_argv[ARG_STDOUT] = "-";
     }
   
-  if (standard_error)
+  if (stdout_fd != -1)
     {
-      _g_sprintf (args[ARG_STDERR], "%d", stderr_pipe[1]);
+      _g_sprintf (args[ARG_STDERR], "%d", stderr_fd);
       new_argv[ARG_STDERR] = args[ARG_STDERR];
     }
   else if (flags & G_SPAWN_STDERR_TO_DEV_NULL)
@@ -752,7 +747,7 @@ do_spawn_with_pipes (gint                 *exit_status,
   else
     rc = _wspawnvp (P_NOWAIT, whelper, (const wchar_t **) wargv);
 
-  saved_errno = errno;
+  errsv = errno;
 
   g_free (whelper);
   g_strfreev ((gchar **) wargv);
@@ -763,9 +758,6 @@ do_spawn_with_pipes (gint                 *exit_status,
    */
   close_and_invalidate (&child_err_report_pipe[1]);
   close_and_invalidate (&helper_sync_pipe[0]);
-  close_and_invalidate (&stdin_pipe[0]);
-  close_and_invalidate (&stdout_pipe[1]);
-  close_and_invalidate (&stderr_pipe[1]);
 
   g_strfreev (protected_argv);
 
@@ -774,11 +766,11 @@ do_spawn_with_pipes (gint                 *exit_status,
   g_free (new_argv);
 
   /* Check if gspawn-win32-helper couldn't be run */
-  if (rc == -1 && saved_errno != 0)
+  if (rc == -1 && errsv != 0)
     {
       g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
 		   _("Failed to execute helper program (%s)"),
-		   g_strerror (saved_errno));
+		   g_strerror (errsv));
       goto cleanup_and_fail;
     }
 
@@ -835,12 +827,6 @@ do_spawn_with_pipes (gint                 *exit_status,
 
   /* Success against all odds! return the information */
       
-  if (standard_input)
-    *standard_input = stdin_pipe[1];
-  if (standard_output)
-    *standard_output = stdout_pipe[0];
-  if (standard_error)
-    *standard_error = stderr_pipe[0];
   if (rc != -1)
     CloseHandle ((HANDLE) rc);
   
@@ -858,6 +844,71 @@ do_spawn_with_pipes (gint                 *exit_status,
     close (helper_sync_pipe[0]);
   if (helper_sync_pipe[1] != -1)
     close (helper_sync_pipe[1]);
+
+  return FALSE;
+}
+
+static gboolean
+do_spawn_with_pipes (gint                 *exit_status,
+		     gboolean		   do_return_handle,
+		     const gchar          *working_directory,
+		     gchar               **argv,
+		     char                **envp,
+		     GSpawnFlags           flags,
+		     GSpawnChildSetupFunc  child_setup,
+		     GPid                 *child_handle,
+		     gint                 *standard_input,
+		     gint                 *standard_output,
+		     gint                 *standard_error,
+		     gint		  *err_report,
+		     GError              **error)
+{
+  int stdin_pipe[2] = { -1, -1 };
+  int stdout_pipe[2] = { -1, -1 };
+  int stderr_pipe[2] = { -1, -1 };
+
+  if (standard_input && !make_pipe (stdin_pipe, error))
+    goto cleanup_and_fail;
+
+  if (standard_output && !make_pipe (stdout_pipe, error))
+    goto cleanup_and_fail;
+
+  if (standard_error && !make_pipe (stderr_pipe, error))
+    goto cleanup_and_fail;
+
+  if (!do_spawn_with_fds (exit_status,
+			  do_return_handle,
+			  working_directory,
+			  argv,
+			  envp,
+			  flags,
+			  child_setup,
+			  child_handle,
+			  stdin_pipe[0],
+			  stdout_pipe[1],
+			  stderr_pipe[1],
+			  err_report,
+			  error))
+    goto cleanup_and_fail;
+
+  /* Close the other process's ends of the pipes in this process,
+   * otherwise the reader will never get EOF.
+   */
+  close_and_invalidate (&stdin_pipe[0]);
+  close_and_invalidate (&stdout_pipe[1]);
+  close_and_invalidate (&stderr_pipe[1]);
+
+  if (standard_input)
+    *standard_input = stdin_pipe[1];
+  if (standard_output)
+    *standard_output = stdout_pipe[0];
+  if (standard_error)
+    *standard_error = stderr_pipe[0];
+
+  return TRUE;
+
+ cleanup_and_fail:
+
   if (stdin_pipe[0] != -1)
     close (stdin_pipe[0]);
   if (stdin_pipe[1] != -1)
@@ -1154,6 +1205,43 @@ g_spawn_async_with_pipes (const gchar          *working_directory,
 }
 
 gboolean
+g_spawn_async_with_fds (const gchar          *working_directory,
+                        gchar               **argv,
+                        gchar               **envp,
+                        GSpawnFlags           flags,
+                        GSpawnChildSetupFunc  child_setup,
+                        gpointer              user_data,
+                        GPid                 *child_handle,
+                        gint                  stdin_fd,
+                        gint                  stdout_fd,
+                        gint                  stderr_fd,
+                        GError              **error)
+{
+  g_return_val_if_fail (argv != NULL, FALSE);
+  g_return_val_if_fail (stdin_fd == -1 ||
+                        !(flags & G_SPAWN_STDOUT_TO_DEV_NULL), FALSE);
+  g_return_val_if_fail (stderr_fd == -1 ||
+                        !(flags & G_SPAWN_STDERR_TO_DEV_NULL), FALSE);
+  /* can't inherit stdin if we have an input pipe. */
+  g_return_val_if_fail (stdin_fd == -1 ||
+                        !(flags & G_SPAWN_CHILD_INHERITS_STDIN), FALSE);
+
+  return do_spawn_with_fds (NULL,
+			    (flags & G_SPAWN_DO_NOT_REAP_CHILD),
+			    working_directory,
+			    argv,
+			    envp,
+			    flags,
+			    child_setup,
+			    child_handle,
+			    stdin_fd,
+			    stdout_fd,
+			    stderr_fd,
+			    NULL,
+			    error);
+}
+
+gboolean
 g_spawn_command_line_sync (const gchar  *command_line,
                            gchar       **standard_output,
                            gchar       **standard_error,
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 89824d176..1ab33077c 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -30,6 +30,11 @@
 #include <string.h>
 #include <stdlib.h>   /* for fdwalk */
 #include <dirent.h>
+#include <spawn.h>
+
+#ifdef HAVE_CRT_EXTERNS_H
+#include <crt_externs.h> /* for _NSGetEnviron */
+#endif
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -40,6 +45,7 @@
 #endif /* HAVE_SYS_RESOURCE_H */
 
 #include "gspawn.h"
+#include "gspawn-private.h"
 #include "gthread.h"
 #include "glib/gstdio.h"
 
@@ -53,6 +59,28 @@
 #include "glibintl.h"
 #include "glib-unix.h"
 
+/* posix_spawn() is assumed the fastest way to spawn, but glibc's
+ * implementation was buggy before glibc 2.24, so avoid it on old versions.
+ */
+#ifdef HAVE_POSIX_SPAWN
+#ifdef __GLIBC__
+
+#if __GLIBC_PREREQ(2,24)
+#define POSIX_SPAWN_AVAILABLE
+#endif
+
+#else /* !__GLIBC__ */
+/* Assume that all non-glibc posix_spawn implementations are fine. */
+#define POSIX_SPAWN_AVAILABLE
+#endif /* __GLIBC__ */
+#endif /* HAVE_POSIX_SPAWN */
+
+#ifdef HAVE__NSGETENVIRON
+#define environ (*_NSGetEnviron())
+#else
+extern char **environ;
+#endif
+
 /**
  * SECTION:spawn
  * @Short_description: process launching
@@ -141,6 +169,27 @@ static gboolean fork_exec_with_pipes (gboolean              intermediate_child,
                                       gint                 *standard_error,
                                       GError              **error);
 
+static gboolean fork_exec_with_fds (gboolean              intermediate_child,
+                                    const gchar          *working_directory,
+                                    gchar               **argv,
+                                    gchar               **envp,
+                                    gboolean              close_descriptors,
+                                    gboolean              search_path,
+                                    gboolean              search_path_from_envp,
+                                    gboolean              stdout_to_null,
+                                    gboolean              stderr_to_null,
+                                    gboolean              child_inherits_stdin,
+                                    gboolean              file_and_argv_zero,
+                                    gboolean              cloexec_pipes,
+                                    GSpawnChildSetupFunc  child_setup,
+                                    gpointer              user_data,
+                                    GPid                 *child_pid,
+                                    gint                 *child_close_fds,
+                                    gint                  stdin_fd,
+                                    gint                  stdout_fd,
+                                    gint                  stderr_fd,
+                                    GError              **error);
+
 G_DEFINE_QUARK (g-exec-error-quark, g_spawn_error)
 G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error)
 
@@ -599,10 +648,11 @@ g_spawn_sync (const gchar          *working_directory,
  * is equivalent to calling CloseHandle() on the process handle returned
  * in @child_pid). See g_child_watch_add().
  *
- * %G_SPAWN_LEAVE_DESCRIPTORS_OPEN means that the parent's open file
- * descriptors will be inherited by the child; otherwise all descriptors
- * except stdin/stdout/stderr will be closed before calling exec() in
- * the child. %G_SPAWN_SEARCH_PATH means that @argv[0] need not be an
+ * Open UNIX file descriptors marked as `FD_CLOEXEC` will be automatically
+ * closed in the child process. %G_SPAWN_LEAVE_DESCRIPTORS_OPEN means that
+ * other open file descriptors will be inherited by the child; otherwise all
+ * descriptors except stdin/stdout/stderr will be closed before calling exec()
+ * in the child. %G_SPAWN_SEARCH_PATH means that @argv[0] need not be an
  * absolute path, it will be looked for in the `PATH` environment
  * variable. %G_SPAWN_SEARCH_PATH_FROM_ENVP means need not be an
  * absolute path, it will be looked for in the `PATH` variable from
@@ -677,6 +727,21 @@ g_spawn_sync (const gchar          *working_directory,
  * If @child_pid is not %NULL and an error does not occur then the returned
  * process reference must be closed using g_spawn_close_pid().
  *
+ * On modern UNIX platforms, GLib can use an efficient process launching
+ * codepath driven internally by posix_spawn(). This has the advantage of
+ * avoiding the fork-time performance costs of cloning the parent process
+ * address space, and avoiding associated memory overcommit checks that are
+ * not relevant in the context of immediately executing a distinct process.
+ * This optimized codepath will be used provided that the following conditions
+ * are met:
+ *
+ * 1. %G_SPAWN_DO_NOT_REAP_CHILD is set
+ * 2. %G_SPAWN_LEAVE_DESCRIPTORS_OPEN is set
+ * 3. %G_SPAWN_SEARCH_PATH_FROM_ENVP is not set
+ * 4. @working_directory is %NULL
+ * 5. @child_setup is %NULL
+ * 6. The program is of a recognised binary format, or has a shebang. Otherwise, GLib will have to execute the program through the shell, which is not done using the optimized codepath.
+ *
  * If you are writing a GTK+ application, and the program you are spawning is a
  * graphical application too, then to ensure that the spawned program opens its
  * windows on the right screen, you may want to use #GdkAppLaunchContext,
@@ -728,6 +793,87 @@ g_spawn_async_with_pipes (const gchar          *working_directory,
 }
 
 /**
+ * g_spawn_async_with_fds:
+ * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding
+ * @argv: (array zero-terminated=1): child's argument vector, in the GLib file name encoding
+ * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's, in the GLib file name encoding
+ * @flags: flags from #GSpawnFlags
+ * @child_setup: (scope async) (nullable): function to run in the child just before exec()
+ * @user_data: (closure): user data for @child_setup
+ * @child_pid: (out) (optional): return location for child process ID, or %NULL
+ * @stdin_fd: file descriptor to use for child's stdin, or -1
+ * @stdout_fd: file descriptor to use for child's stdout, or -1
+ * @stderr_fd: file descriptor to use for child's stderr, or -1
+ * @error: return location for error
+ *
+ * Identical to g_spawn_async_with_pipes() but instead of
+ * creating pipes for the stdin/stdout/stderr, you can pass existing
+ * file descriptors into this function through the @stdin_fd,
+ * @stdout_fd and @stderr_fd parameters. The following @flags
+ * also have their behaviour slightly tweaked as a result:
+ *
+ * %G_SPAWN_STDOUT_TO_DEV_NULL means that the child's standard output
+ * will be discarded, instead of going to the same location as the parent's
+ * standard output. If you use this flag, @standard_output must be -1.
+ * %G_SPAWN_STDERR_TO_DEV_NULL means that the child's standard error
+ * will be discarded, instead of going to the same location as the parent's
+ * standard error. If you use this flag, @standard_error must be -1.
+ * %G_SPAWN_CHILD_INHERITS_STDIN means that the child will inherit the parent's
+ * standard input (by default, the child's standard input is attached to
+ * /dev/null). If you use this flag, @standard_input must be -1.
+ *
+ * It is valid to pass the same fd in multiple parameters (e.g. you can pass
+ * a single fd for both stdout and stderr).
+ *
+ * Returns: %TRUE on success, %FALSE if an error was set
+ *
+ * Since: 2.58
+ */
+gboolean
+g_spawn_async_with_fds (const gchar          *working_directory,
+                        gchar               **argv,
+                        gchar               **envp,
+                        GSpawnFlags           flags,
+                        GSpawnChildSetupFunc  child_setup,
+                        gpointer              user_data,
+                        GPid                 *child_pid,
+                        gint                  stdin_fd,
+                        gint                  stdout_fd,
+                        gint                  stderr_fd,
+                        GError              **error)
+{
+  g_return_val_if_fail (argv != NULL, FALSE);
+  g_return_val_if_fail (stdout_fd < 0 ||
+                        !(flags & G_SPAWN_STDOUT_TO_DEV_NULL), FALSE);
+  g_return_val_if_fail (stderr_fd < 0 ||
+                        !(flags & G_SPAWN_STDERR_TO_DEV_NULL), FALSE);
+  /* can't inherit stdin if we have an input pipe. */
+  g_return_val_if_fail (stdin_fd < 0 ||
+                        !(flags & G_SPAWN_CHILD_INHERITS_STDIN), FALSE);
+
+  return fork_exec_with_fds (!(flags & G_SPAWN_DO_NOT_REAP_CHILD),
+                               working_directory,
+                               argv,
+                               envp,
+                               !(flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN),
+                               (flags & G_SPAWN_SEARCH_PATH) != 0,
+                               (flags & G_SPAWN_SEARCH_PATH_FROM_ENVP) != 0,
+                               (flags & G_SPAWN_STDOUT_TO_DEV_NULL) != 0,
+                               (flags & G_SPAWN_STDERR_TO_DEV_NULL) != 0,
+                               (flags & G_SPAWN_CHILD_INHERITS_STDIN) != 0,
+                               (flags & G_SPAWN_FILE_AND_ARGV_ZERO) != 0,
+                               (flags & G_SPAWN_CLOEXEC_PIPES) != 0,
+                               child_setup,
+                               user_data,
+                               child_pid,
+                               NULL,
+                               stdin_fd,
+                               stdout_fd,
+                               stderr_fd,
+                               error);
+}
+
+/**
  * g_spawn_command_line_sync:
  * @command_line: (type filename): a command line
  * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child output
@@ -925,113 +1071,6 @@ g_spawn_check_exit_status (gint      exit_status,
   return ret;
 }
 
-static gint
-exec_err_to_g_error (gint en)
-{
-  switch (en)
-    {
-#ifdef EACCES
-    case EACCES:
-      return G_SPAWN_ERROR_ACCES;
-      break;
-#endif
-
-#ifdef EPERM
-    case EPERM:
-      return G_SPAWN_ERROR_PERM;
-      break;
-#endif
-
-#ifdef E2BIG
-    case E2BIG:
-      return G_SPAWN_ERROR_TOO_BIG;
-      break;
-#endif
-
-#ifdef ENOEXEC
-    case ENOEXEC:
-      return G_SPAWN_ERROR_NOEXEC;
-      break;
-#endif
-
-#ifdef ENAMETOOLONG
-    case ENAMETOOLONG:
-      return G_SPAWN_ERROR_NAMETOOLONG;
-      break;
-#endif
-
-#ifdef ENOENT
-    case ENOENT:
-      return G_SPAWN_ERROR_NOENT;
-      break;
-#endif
-
-#ifdef ENOMEM
-    case ENOMEM:
-      return G_SPAWN_ERROR_NOMEM;
-      break;
-#endif
-
-#ifdef ENOTDIR
-    case ENOTDIR:
-      return G_SPAWN_ERROR_NOTDIR;
-      break;
-#endif
-
-#ifdef ELOOP
-    case ELOOP:
-      return G_SPAWN_ERROR_LOOP;
-      break;
-#endif
-      
-#ifdef ETXTBUSY
-    case ETXTBUSY:
-      return G_SPAWN_ERROR_TXTBUSY;
-      break;
-#endif
-
-#ifdef EIO
-    case EIO:
-      return G_SPAWN_ERROR_IO;
-      break;
-#endif
-
-#ifdef ENFILE
-    case ENFILE:
-      return G_SPAWN_ERROR_NFILE;
-      break;
-#endif
-
-#ifdef EMFILE
-    case EMFILE:
-      return G_SPAWN_ERROR_MFILE;
-      break;
-#endif
-
-#ifdef EINVAL
-    case EINVAL:
-      return G_SPAWN_ERROR_INVAL;
-      break;
-#endif
-
-#ifdef EISDIR
-    case EISDIR:
-      return G_SPAWN_ERROR_ISDIR;
-      break;
-#endif
-
-#ifdef ELIBBAD
-    case ELIBBAD:
-      return G_SPAWN_ERROR_LIBBAD;
-      break;
-#endif
-      
-    default:
-      return G_SPAWN_ERROR_FAILED;
-      break;
-    }
-}
-
 static gssize
 write_all (gint fd, gconstpointer vbuf, gsize to_write)
 {
@@ -1224,13 +1263,12 @@ do_exec (gint                  child_err_report_fd,
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUP2_FAILED);
 
-      /* ignore this if it doesn't work */
-      close_and_invalidate (&stdin_fd);
+      set_cloexec (GINT_TO_POINTER(0), stdin_fd);
     }
   else if (!child_inherits_stdin)
     {
       /* Keep process from blocking on a read of stdin */
-      gint read_null = open ("/dev/null", O_RDONLY);
+      gint read_null = sane_open ("/dev/null", O_RDONLY);
       g_assert (read_null != -1);
       sane_dup2 (read_null, 0);
       close_and_invalidate (&read_null);
@@ -1244,8 +1282,7 @@ do_exec (gint                  child_err_report_fd,
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUP2_FAILED);
 
-      /* ignore this if it doesn't work */
-      close_and_invalidate (&stdout_fd);
+      set_cloexec (GINT_TO_POINTER(0), stdout_fd);
     }
   else if (stdout_to_null)
     {
@@ -1263,8 +1300,7 @@ do_exec (gint                  child_err_report_fd,
         write_err_and_exit (child_err_report_fd,
                             CHILD_DUP2_FAILED);
 
-      /* ignore this if it doesn't work */
-      close_and_invalidate (&stderr_fd);
+      set_cloexec (GINT_TO_POINTER(0), stderr_fd);
     }
   else if (stderr_to_null)
     {
@@ -1337,51 +1373,256 @@ read_ints (int      fd,
   return TRUE;
 }
 
+#ifdef POSIX_SPAWN_AVAILABLE
 static gboolean
-fork_exec_with_pipes (gboolean              intermediate_child,
-                      const gchar          *working_directory,
-                      gchar               **argv,
-                      gchar               **envp,
-                      gboolean              close_descriptors,
-                      gboolean              search_path,
-                      gboolean              search_path_from_envp,
-                      gboolean              stdout_to_null,
-                      gboolean              stderr_to_null,
-                      gboolean              child_inherits_stdin,
-                      gboolean              file_and_argv_zero,
-                      gboolean              cloexec_pipes,
-                      GSpawnChildSetupFunc  child_setup,
-                      gpointer              user_data,
-                      GPid                 *child_pid,
-                      gint                 *standard_input,
-                      gint                 *standard_output,
-                      gint                 *standard_error,
-                      GError              **error)     
+do_posix_spawn (gchar     **argv,
+                gchar     **envp,
+                gboolean    search_path,
+                gboolean    stdout_to_null,
+                gboolean    stderr_to_null,
+                gboolean    child_inherits_stdin,
+                gboolean    file_and_argv_zero,
+                GPid       *child_pid,
+                gint       *child_close_fds,
+                gint        stdin_fd,
+                gint        stdout_fd,
+                gint        stderr_fd)
+{
+  pid_t pid;
+  gchar **argv_pass;
+  posix_spawnattr_t attr;
+  posix_spawn_file_actions_t file_actions;
+  gint parent_close_fds[3];
+  gint num_parent_close_fds = 0;
+  GSList *child_close = NULL;
+  GSList *elem;
+  sigset_t mask;
+  int i, r;
+
+  if (*argv[0] == '\0')
+    {
+      /* We check the simple case first. */
+      return ENOENT;
+    }
+
+  r = posix_spawnattr_init (&attr);
+  if (r != 0)
+    return r;
+
+  if (child_close_fds)
+    {
+      int i = -1;
+      while (child_close_fds[++i] != -1)
+        child_close = g_slist_prepend (child_close,
+                                       GINT_TO_POINTER (child_close_fds[i]));
+    }
+
+  r = posix_spawnattr_setflags (&attr, POSIX_SPAWN_SETSIGDEF);
+  if (r != 0)
+    goto out_free_spawnattr;
+
+  /* Reset some signal handlers that we may use */
+  sigemptyset (&mask);
+  sigaddset (&mask, SIGCHLD);
+  sigaddset (&mask, SIGINT);
+  sigaddset (&mask, SIGTERM);
+  sigaddset (&mask, SIGHUP);
+
+  r = posix_spawnattr_setsigdefault (&attr, &mask);
+  if (r != 0)
+    goto out_free_spawnattr;
+
+  r = posix_spawn_file_actions_init (&file_actions);
+  if (r != 0)
+    goto out_free_spawnattr;
+
+  /* Redirect pipes as required */
+
+  if (stdin_fd >= 0)
+    {
+      r = posix_spawn_file_actions_adddup2 (&file_actions, stdin_fd, 0);
+      if (r != 0)
+        goto out_close_fds;
+
+      if (!g_slist_find (child_close, GINT_TO_POINTER (stdin_fd)))
+        child_close = g_slist_prepend (child_close, GINT_TO_POINTER (stdin_fd));
+    }
+  else if (!child_inherits_stdin)
+    {
+      /* Keep process from blocking on a read of stdin */
+      gint read_null = sane_open ("/dev/null", O_RDONLY | O_CLOEXEC);
+      g_assert (read_null != -1);
+      parent_close_fds[num_parent_close_fds++] = read_null;
+
+      r = posix_spawn_file_actions_adddup2 (&file_actions, read_null, 0);
+      if (r != 0)
+        goto out_close_fds;
+    }
+
+  if (stdout_fd >= 0)
+    {
+      r = posix_spawn_file_actions_adddup2 (&file_actions, stdout_fd, 1);
+      if (r != 0)
+        goto out_close_fds;
+
+      if (!g_slist_find (child_close, GINT_TO_POINTER (stdout_fd)))
+        child_close = g_slist_prepend (child_close, GINT_TO_POINTER (stdout_fd));
+    }
+  else if (stdout_to_null)
+    {
+      gint write_null = sane_open ("/dev/null", O_WRONLY | O_CLOEXEC);
+      g_assert (write_null != -1);
+      parent_close_fds[num_parent_close_fds++] = write_null;
+
+      r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 1);
+      if (r != 0)
+        goto out_close_fds;
+    }
+
+  if (stderr_fd >= 0)
+    {
+      r = posix_spawn_file_actions_adddup2 (&file_actions, stderr_fd, 2);
+      if (r != 0)
+        goto out_close_fds;
+
+      if (!g_slist_find (child_close, GINT_TO_POINTER (stderr_fd)))
+        child_close = g_slist_prepend (child_close, GINT_TO_POINTER (stderr_fd));
+    }
+  else if (stderr_to_null)
+    {
+      gint write_null = sane_open ("/dev/null", O_WRONLY | O_CLOEXEC);
+      g_assert (write_null != -1);
+      parent_close_fds[num_parent_close_fds++] = write_null;
+
+      r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 2);
+      if (r != 0)
+        goto out_close_fds;
+    }
+
+  /* Intentionally close the fds in the child as the last file action,
+   * having been careful not to add the same fd to this list twice.
+   *
+   * This is important to allow (e.g.) for the same fd to be passed as stdout
+   * and stderr (we must not close it before we have dupped it in both places,
+   * and we must not attempt to close it twice).
+   */
+  for (elem = child_close; elem != NULL; elem = elem->next)
+    {
+      r = posix_spawn_file_actions_addclose (&file_actions,
+                                             GPOINTER_TO_INT (elem->data));
+      if (r != 0)
+        goto out_close_fds;
+    }
+
+  argv_pass = file_and_argv_zero ? argv + 1 : argv;
+  if (envp == NULL)
+    envp = environ;
+
+  /* Don't search when it contains a slash. */
+  if (!search_path || strchr (argv[0], '/') != NULL)
+    r = posix_spawn (&pid, argv[0], &file_actions, &attr, argv_pass, envp);
+  else
+    r = posix_spawnp (&pid, argv[0], &file_actions, &attr, argv_pass, envp);
+
+  if (r == 0 && child_pid != NULL)
+    *child_pid = pid;
+
+out_close_fds:
+  for (i = 0; i < num_parent_close_fds; i++)
+    close_and_invalidate (&parent_close_fds [i]);
+
+  posix_spawn_file_actions_destroy (&file_actions);
+out_free_spawnattr:
+  posix_spawnattr_destroy (&attr);
+  g_slist_free (child_close);
+
+  return r;
+}
+#endif /* POSIX_SPAWN_AVAILABLE */
+
+static gboolean
+fork_exec_with_fds (gboolean              intermediate_child,
+                    const gchar          *working_directory,
+                    gchar               **argv,
+                    gchar               **envp,
+                    gboolean              close_descriptors,
+                    gboolean              search_path,
+                    gboolean              search_path_from_envp,
+                    gboolean              stdout_to_null,
+                    gboolean              stderr_to_null,
+                    gboolean              child_inherits_stdin,
+                    gboolean              file_and_argv_zero,
+                    gboolean              cloexec_pipes,
+                    GSpawnChildSetupFunc  child_setup,
+                    gpointer              user_data,
+                    GPid                 *child_pid,
+                    gint                 *child_close_fds,
+                    gint                  stdin_fd,
+                    gint                  stdout_fd,
+                    gint                  stderr_fd,
+                    GError              **error)
 {
   GPid pid = -1;
-  gint stdin_pipe[2] = { -1, -1 };
-  gint stdout_pipe[2] = { -1, -1 };
-  gint stderr_pipe[2] = { -1, -1 };
   gint child_err_report_pipe[2] = { -1, -1 };
   gint child_pid_report_pipe[2] = { -1, -1 };
   guint pipe_flags = cloexec_pipes ? FD_CLOEXEC : 0;
   gint status;
-  
+
+#ifdef POSIX_SPAWN_AVAILABLE
+  if (!intermediate_child && working_directory == NULL && !close_descriptors &&
+      !search_path_from_envp && child_setup == NULL)
+    {
+      g_debug ("Launching with posix_spawn");
+      status = do_posix_spawn (argv,
+                               envp,
+                               search_path,
+                               stdout_to_null,
+                               stderr_to_null,
+                               child_inherits_stdin,
+                               file_and_argv_zero,
+                               child_pid,
+                               child_close_fds,
+                               stdin_fd,
+                               stdout_fd,
+                               stderr_fd);
+      if (status == 0)
+        return TRUE;
+
+      if (status != ENOEXEC)
+        {
+          g_set_error (error,
+                       G_SPAWN_ERROR,
+                       G_SPAWN_ERROR_FAILED,
+                       _("Failed to spawn child process “%s� (%s)"),
+                       argv[0],
+                       g_strerror (status));
+          return FALSE;
+       }
+
+      /* posix_spawn is not intended to support script execution. It does in
+       * some situations on some glibc versions, but that will be fixed.
+       * So if it fails with ENOEXEC, we fall through to the regular
+       * gspawn codepath so that script execution can be attempted,
+       * per standard gspawn behaviour. */
+      g_debug ("posix_spawn failed (ENOEXEC), fall back to regular gspawn");
+    }
+  else
+    {
+      g_debug ("posix_spawn avoided %s%s%s%s%s",
+               !intermediate_child ? "" : "(automatic reaping requested) ",
+               working_directory == NULL ? "" : "(workdir specified) ",
+               !close_descriptors ? "" : "(fd close requested) ",
+               !search_path_from_envp ? "" : "(using envp for search path) ",
+               child_setup == NULL ? "" : "(child_setup specified) ");
+    }
+#endif /* POSIX_SPAWN_AVAILABLE */
+
   if (!g_unix_open_pipe (child_err_report_pipe, pipe_flags, error))
     return FALSE;
 
   if (intermediate_child && !g_unix_open_pipe (child_pid_report_pipe, pipe_flags, error))
     goto cleanup_and_fail;
   
-  if (standard_input && !g_unix_open_pipe (stdin_pipe, pipe_flags, error))
-    goto cleanup_and_fail;
-  
-  if (standard_output && !g_unix_open_pipe (stdout_pipe, pipe_flags, error))
-    goto cleanup_and_fail;
-
-  if (standard_error && !g_unix_open_pipe (stderr_pipe, FD_CLOEXEC, error))
-    goto cleanup_and_fail;
-
   pid = fork ();
 
   if (pid < 0)
@@ -1419,9 +1660,12 @@ fork_exec_with_pipes (gboolean              intermediate_child,
        */
       close_and_invalidate (&child_err_report_pipe[0]);
       close_and_invalidate (&child_pid_report_pipe[0]);
-      close_and_invalidate (&stdin_pipe[1]);
-      close_and_invalidate (&stdout_pipe[0]);
-      close_and_invalidate (&stderr_pipe[0]);
+      if (child_close_fds != NULL)
+        {
+           int i = -1;
+           while (child_close_fds[++i] != -1)
+             close_and_invalidate (&child_close_fds[i]);
+        }
       
       if (intermediate_child)
         {
@@ -1447,9 +1691,9 @@ fork_exec_with_pipes (gboolean              intermediate_child,
             {
               close_and_invalidate (&child_pid_report_pipe[1]);
               do_exec (child_err_report_pipe[1],
-                       stdin_pipe[0],
-                       stdout_pipe[1],
-                       stderr_pipe[1],
+                       stdin_fd,
+                       stdout_fd,
+                       stderr_fd,
                        working_directory,
                        argv,
                        envp,
@@ -1477,9 +1721,9 @@ fork_exec_with_pipes (gboolean              intermediate_child,
            */
 
           do_exec (child_err_report_pipe[1],
-                   stdin_pipe[0],
-                   stdout_pipe[1],
-                   stderr_pipe[1],
+                   stdin_fd,
+                   stdout_fd,
+                   stderr_fd,
                    working_directory,
                    argv,
                    envp,
@@ -1504,9 +1748,6 @@ fork_exec_with_pipes (gboolean              intermediate_child,
       /* Close the uncared-about ends of the pipes */
       close_and_invalidate (&child_err_report_pipe[1]);
       close_and_invalidate (&child_pid_report_pipe[1]);
-      close_and_invalidate (&stdin_pipe[0]);
-      close_and_invalidate (&stdout_pipe[1]);
-      close_and_invalidate (&stderr_pipe[1]);
 
       /* If we had an intermediate child, reap it */
       if (intermediate_child)
@@ -1549,7 +1790,7 @@ fork_exec_with_pipes (gboolean              intermediate_child,
             case CHILD_EXEC_FAILED:
               g_set_error (error,
                            G_SPAWN_ERROR,
-                           exec_err_to_g_error (buf[1]),
+                           _g_spawn_exec_err_to_g_error (buf[1]),
                            _("Failed to execute child process “%s� (%s)"),
                            argv[0],
                            g_strerror (buf[1]));
@@ -1619,13 +1860,6 @@ fork_exec_with_pipes (gboolean              intermediate_child,
       if (child_pid)
         *child_pid = pid;
 
-      if (standard_input)
-        *standard_input = stdin_pipe[1];
-      if (standard_output)
-        *standard_output = stdout_pipe[0];
-      if (standard_error)
-        *standard_error = stderr_pipe[0];
-      
       return TRUE;
     }
 
@@ -1654,6 +1888,92 @@ fork_exec_with_pipes (gboolean              intermediate_child,
   close_and_invalidate (&child_err_report_pipe[1]);
   close_and_invalidate (&child_pid_report_pipe[0]);
   close_and_invalidate (&child_pid_report_pipe[1]);
+
+  return FALSE;
+}
+
+static gboolean
+fork_exec_with_pipes (gboolean              intermediate_child,
+                      const gchar          *working_directory,
+                      gchar               **argv,
+                      gchar               **envp,
+                      gboolean              close_descriptors,
+                      gboolean              search_path,
+                      gboolean              search_path_from_envp,
+                      gboolean              stdout_to_null,
+                      gboolean              stderr_to_null,
+                      gboolean              child_inherits_stdin,
+                      gboolean              file_and_argv_zero,
+                      gboolean              cloexec_pipes,
+                      GSpawnChildSetupFunc  child_setup,
+                      gpointer              user_data,
+                      GPid                 *child_pid,
+                      gint                 *standard_input,
+                      gint                 *standard_output,
+                      gint                 *standard_error,
+                      GError              **error)
+{
+  guint pipe_flags = cloexec_pipes ? FD_CLOEXEC : 0;
+  gint stdin_pipe[2] = { -1, -1 };
+  gint stdout_pipe[2] = { -1, -1 };
+  gint stderr_pipe[2] = { -1, -1 };
+  gint child_close_fds[4];
+  gboolean ret;
+
+  if (standard_input && !g_unix_open_pipe (stdin_pipe, pipe_flags, error))
+    goto cleanup_and_fail;
+
+  if (standard_output && !g_unix_open_pipe (stdout_pipe, pipe_flags, error))
+    goto cleanup_and_fail;
+
+  if (standard_error && !g_unix_open_pipe (stderr_pipe, FD_CLOEXEC, error))
+    goto cleanup_and_fail;
+
+  child_close_fds[0] = stdin_pipe[1];
+  child_close_fds[1] = stdout_pipe[0];
+  child_close_fds[2] = stderr_pipe[0];
+  child_close_fds[3] = -1;
+
+  ret = fork_exec_with_fds (intermediate_child,
+                            working_directory,
+                            argv,
+                            envp,
+                            close_descriptors,
+                            search_path,
+                            search_path_from_envp,
+                            stdout_to_null,
+                            stderr_to_null,
+                            child_inherits_stdin,
+                            file_and_argv_zero,
+                            pipe_flags,
+                            child_setup,
+                            user_data,
+                            child_pid,
+                            child_close_fds,
+                            stdin_pipe[0],
+                            stdout_pipe[1],
+                            stderr_pipe[1],
+                            error);
+  if (!ret)
+    goto cleanup_and_fail;
+
+  /* Close the uncared-about ends of the pipes */
+  close_and_invalidate (&stdin_pipe[0]);
+  close_and_invalidate (&stdout_pipe[1]);
+  close_and_invalidate (&stderr_pipe[1]);
+
+  if (standard_input)
+    *standard_input = stdin_pipe[1];
+
+  if (standard_output)
+    *standard_output = stdout_pipe[0];
+
+  if (standard_error)
+    *standard_error = stderr_pipe[0];
+
+  return TRUE;
+
+cleanup_and_fail:
   close_and_invalidate (&stdin_pipe[0]);
   close_and_invalidate (&stdin_pipe[1]);
   close_and_invalidate (&stdout_pipe[0]);
diff --git a/glib/gspawn.h b/glib/gspawn.h
index 055743ea2..d6b0be7d0 100644
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -215,6 +215,19 @@ gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
                                    gint                 *standard_error,
                                    GError              **error);
 
+/* Lets you provide fds for stdin/stdout/stderr */
+GLIB_AVAILABLE_IN_2_58
+gboolean g_spawn_async_with_fds (const gchar          *working_directory,
+                                 gchar               **argv,
+                                 gchar               **envp,
+                                 GSpawnFlags           flags,
+                                 GSpawnChildSetupFunc  child_setup,
+                                 gpointer              user_data,
+                                 GPid                 *child_pid,
+                                 gint                  stdin_fd,
+                                 gint                  stdout_fd,
+                                 gint                  stderr_fd,
+                                 GError              **error);
 
 /* If standard_output or standard_error are non-NULL, the full
  * standard output or error of the command will be placed there.
diff --git a/glib/gstdio.c b/glib/gstdio.c
index e158de223..ffbd37180 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -544,6 +544,26 @@ _g_win32_readlink_utf16 (const gunichar2 *filename,
   return result;
 }
 
+static gchar *
+_g_win32_get_mode_alias (const gchar *mode)
+{
+  gchar *alias;
+
+  alias = g_strdup (mode);
+  if (strlen (mode) > 2 && mode[2] == '+')
+    {
+      /* Windows implementation of fopen() does not accept modes such as
+       * "wb+". The 'b' needs to be appended to "w+", i.e. "w+b". Note
+       * that otherwise these 2 modes are supposed to be aliases, hence
+       * swappable at will.
+       */
+      alias[1] = '+';
+      alias[2] = mode[1];
+    }
+
+  return alias;
+}
+
 int
 g_win32_readlink_utf8 (const gchar *filename,
                        gchar       *buf,
@@ -1268,6 +1288,7 @@ g_fopen (const gchar *filename,
 #ifdef G_OS_WIN32
   wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
   wchar_t *wmode;
+  gchar   *mode2;
   FILE *retval;
   int save_errno;
 
@@ -1277,7 +1298,9 @@ g_fopen (const gchar *filename,
       return NULL;
     }
 
-  wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
+  mode2 = _g_win32_get_mode_alias (mode);
+  wmode = g_utf8_to_utf16 (mode2, -1, NULL, NULL, NULL);
+  g_free (mode2);
 
   if (wmode == NULL)
     {
@@ -1324,6 +1347,7 @@ g_freopen (const gchar *filename,
 #ifdef G_OS_WIN32
   wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
   wchar_t *wmode;
+  gchar   *mode2;
   FILE *retval;
   int save_errno;
 
@@ -1332,8 +1356,10 @@ g_freopen (const gchar *filename,
       errno = EINVAL;
       return NULL;
     }
-  
-  wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
+
+  mode2 = _g_win32_get_mode_alias (mode);
+  wmode = g_utf8_to_utf16 (mode2, -1, NULL, NULL, NULL);
+  g_free (mode2);
 
   if (wmode == NULL)
     {
diff --git a/glib/gtester.c b/glib/gtester.c
index a799394a7..41bf877ff 100644
--- a/glib/gtester.c
+++ b/glib/gtester.c
@@ -109,7 +109,7 @@ testcase_close (long double duration,
   success = exit_status == G_TEST_RUN_SUCCESS || exit_status == G_TEST_RUN_SKIPPED;
   test_log_printfe ("%s<status exit-status=\"%d\" n-forks=\"%d\" result=\"%s\"/>\n",
                     sindent (log_indent), exit_status, n_forks,
-                    success ? "failed" : "success");
+                    success ? "success" : "failed");
   log_indent -= 2;
   test_log_printfe ("%s</testcase>\n", sindent (log_indent));
   testcase_open--;
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 761ad93a7..9006c0c3d 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -87,12 +87,17 @@
  * creates a test suite called "misc" with a single test case named
  * "assertions", which consists of running the test_assertions function.
  *
- * In addition to the traditional g_assert(), the test framework provides
+ * In addition to the traditional g_assert_true(), the test framework provides
  * an extended set of assertions for comparisons: g_assert_cmpfloat(),
- * g_assert_cmpint(), g_assert_cmpuint(), g_assert_cmphex(),
- * g_assert_cmpstr(), and g_assert_cmpmem(). The advantage of these
- * variants over plain g_assert() is that the assertion messages can be
- * more elaborate, and include the values of the compared entities.
+ * g_assert_cmpfloat_with_epsilon(), g_assert_cmpint(), g_assert_cmpuint(),
+ * g_assert_cmphex(), g_assert_cmpstr(), and g_assert_cmpmem(). The
+ * advantage of these variants over plain g_assert_true() is that the assertion
+ * messages can be more elaborate, and include the values of the compared
+ * entities.
+ *
+ * Note that g_assert() should not be used in unit tests, since it is a no-op
+ * when compiling with `G_DISABLE_ASSERT`. Use g_assert() in production code,
+ * and g_assert_true() in unit tests.
  *
  * A full example of creating a test suite with two tests using fixtures:
  * |[<!-- language="C" -->
@@ -472,7 +477,10 @@
  *
  * The macro can be turned off in final releases of code by defining
  * `G_DISABLE_ASSERT` when compiling the application, so code must
- * not depend on any side effects from @expr.
+ * not depend on any side effects from @expr. Similarly, it must not be used
+ * in unit tests, otherwise the unit tests will be ineffective if compiled with
+ * `G_DISABLE_ASSERT`. Use g_assert_true() and related macros in unit tests
+ * instead.
  *
  * For a version which is guaranteed to evaluate side effects in @expr,
  * see g_assert_se().
@@ -502,7 +510,8 @@
  * application is terminated.
  *
  * The macro can be turned off in final releases of code by defining
- * `G_DISABLE_ASSERT` when compiling the application.
+ * `G_DISABLE_ASSERT` when compiling the application. Hence, it should not be
+ * used in unit tests, where assertions should always be effective.
  */
 
 /**
@@ -515,6 +524,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.38
@@ -530,6 +543,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.38
@@ -545,6 +562,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.38
@@ -560,6 +581,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.40
@@ -656,6 +681,23 @@
  */
 
 /**
+ * g_assert_cmpfloat_with_epsilon:
+ * @n1: an floating point number
+ * @n2: another floating point number
+ * @epsilon: a numeric value that expresses the expected tolerance
+ *   between @n1 and @n2
+ *
+ * Debugging macro to compare two floating point numbers within an epsilon.
+ *
+ * The effect of `g_assert_cmpfloat_with_epsilon (n1, n2, epsilon)` is
+ * the same as `g_assert_true (abs (n1 - n2) < epsilon)`. The advantage
+ * of this macro is that it can produce a message that includes the
+ * actual values of @n1 and @n2.
+ *
+ * Since: 2.58
+ */
+
+/**
  * g_assert_cmpmem:
  * @m1: pointer to a buffer
  * @l1: length of @m1
@@ -1251,9 +1293,9 @@ parse_args (gint    *argc_p,
  * Since: 2.16
  */
 void
-g_test_init (int    *argc,
-             char ***argv,
-             ...)
+(g_test_init) (int    *argc,
+               char ***argv,
+               ...)
 {
   static char seedstr[4 + 4 * 8 + 1];
   va_list args;
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 2f2445fa9..c0b060397 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -64,11 +64,18 @@ typedef void (*GTestFixtureFunc) (gpointer      fixture,
                                                  #n1 " " #cmp " " #n2, (long double) __n1, #cmp, (long double) __n2, 'x'); \
                                         } G_STMT_END
 #define g_assert_cmpfloat(n1,cmp,n2)    G_STMT_START { \
-                                             long double __n1 = (n1), __n2 = (n2); \
+                                             long double __n1 = (long double) (n1), __n2 = (long double) (n2); \
                                              if (__n1 cmp __n2) ; else \
                                                g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
                                                  #n1 " " #cmp " " #n2, (long double) __n1, #cmp, (long double) __n2, 'f'); \
                                         } G_STMT_END
+#define g_assert_cmpfloat_with_epsilon(n1,n2,epsilon) \
+                                        G_STMT_START { \
+                                             double __n1 = (n1), __n2 = (n2), __epsilon = (epsilon); \
+                                             if (G_APPROX_VALUE (__n1,  __n2, __epsilon)) ; else \
+                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
+                                                 #n1 " == " #n2 " (+/- " #epsilon ")", __n1, "==", __n2, 'f'); \
+                                        } G_STMT_END
 #define g_assert_cmpmem(m1, l1, m2, l2) G_STMT_START {\
                                              gconstpointer __m1 = m1, __m2 = m2; \
                                              int __l1 = l1, __l2 = l2; \
@@ -142,6 +149,29 @@ GLIB_AVAILABLE_IN_ALL
 void    g_test_init                     (int            *argc,
                                          char         ***argv,
                                          ...) G_GNUC_NULL_TERMINATED;
+
+/* While we discourage its use, g_assert() is often used in unit tests
+ * (especially in legacy code). g_assert_*() should really be used instead.
+ * g_assert() can be disabled at client program compile time, which can render
+ * tests useless. Highlight that to the user. */
+#ifdef G_DISABLE_ASSERT
+#if defined(G_HAVE_ISO_VARARGS)
+#define g_test_init(argc, argv, ...) \
+  G_STMT_START { \
+    g_printerr ("Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.\n"); \
+    exit (1); \
+  } G_STMT_END
+#elif defined(G_HAVE_GNUC_VARARGS)
+#define g_test_init(argc, argv...) \
+  G_STMT_START { \
+    g_printerr ("Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.\n"); \
+    exit (1); \
+  } G_STMT_END
+#else  /* no varargs */
+  /* do nothing */
+#endif  /* varargs support */
+#endif  /* G_DISABLE_ASSERT */
+
 /* query testing framework config */
 #define g_test_initialized()            (g_test_config_vars->test_initialized)
 #define g_test_quick()                  (g_test_config_vars->test_quick)
diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 938ed5f3c..1ad5ece80 100644
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -73,81 +73,36 @@ g_thread_abort (gint         status,
  * of these new types is that they can be statically initialised to
  * zero.  That means that they are completely ABI compatible with our
  * GMutex and GCond APIs.
- *
- * Unfortunately, Windows XP lacks these facilities and GLib still
- * needs to support Windows XP.  Our approach here is as follows:
- *
- *   - avoid depending on structure declarations at compile-time by
- *     declaring our own GMutex and GCond strutures to be
- *     ABI-compatible with SRWLock and CONDITION_VARIABLE and using
- *     those instead
- *
- *   - avoid a hard dependency on the symbols used to manipulate these
- *     structures by doing a dynamic lookup of those symbols at
- *     runtime
- *
- *   - if the symbols are not available, emulate them using other
- *     primatives
- *
- * Using this approach also allows us to easily build a GLib that lacks
- * support for Windows XP or to remove this code entirely when XP is no
- * longer supported (end of line is currently April 8, 2014).
  */
-typedef struct
-{
-  void     (__stdcall * CallThisOnThreadExit)        (void);              /* fake */
-
-  void     (__stdcall * InitializeSRWLock)           (gpointer lock);
-  void     (__stdcall * DeleteSRWLock)               (gpointer lock);     /* fake */
-  void     (__stdcall * AcquireSRWLockExclusive)     (gpointer lock);
-  BOOLEAN  (__stdcall * TryAcquireSRWLockExclusive)  (gpointer lock);
-  void     (__stdcall * ReleaseSRWLockExclusive)     (gpointer lock);
-  void     (__stdcall * AcquireSRWLockShared)        (gpointer lock);
-  BOOLEAN  (__stdcall * TryAcquireSRWLockShared)     (gpointer lock);
-  void     (__stdcall * ReleaseSRWLockShared)        (gpointer lock);
-
-  void     (__stdcall * InitializeConditionVariable) (gpointer cond);
-  void     (__stdcall * DeleteConditionVariable)     (gpointer cond);     /* fake */
-  BOOL     (__stdcall * SleepConditionVariableSRW)   (gpointer cond,
-                                                      gpointer lock,
-                                                      DWORD    timeout,
-                                                      ULONG    flags);
-  void     (__stdcall * WakeAllConditionVariable)    (gpointer cond);
-  void     (__stdcall * WakeConditionVariable)       (gpointer cond);
-} GThreadImplVtable;
-
-static GThreadImplVtable g_thread_impl_vtable;
 
 /* {{{1 GMutex */
 void
 g_mutex_init (GMutex *mutex)
 {
-  g_thread_impl_vtable.InitializeSRWLock (mutex);
+  InitializeSRWLock ((gpointer) mutex);
 }
 
 void
 g_mutex_clear (GMutex *mutex)
 {
-  if (g_thread_impl_vtable.DeleteSRWLock != NULL)
-    g_thread_impl_vtable.DeleteSRWLock (mutex);
 }
 
 void
 g_mutex_lock (GMutex *mutex)
 {
-  g_thread_impl_vtable.AcquireSRWLockExclusive (mutex);
+  AcquireSRWLockExclusive ((gpointer) mutex);
 }
 
 gboolean
 g_mutex_trylock (GMutex *mutex)
 {
-  return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex);
+  return TryAcquireSRWLockExclusive ((gpointer) mutex);
 }
 
 void
 g_mutex_unlock (GMutex *mutex)
 {
-  g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex);
+  ReleaseSRWLockExclusive ((gpointer) mutex);
 }
 
 /* {{{1 GRecMutex */
@@ -221,83 +176,79 @@ g_rec_mutex_trylock (GRecMutex *mutex)
 void
 g_rw_lock_init (GRWLock *lock)
 {
-  g_thread_impl_vtable.InitializeSRWLock (lock);
+  InitializeSRWLock ((gpointer) lock);
 }
 
 void
 g_rw_lock_clear (GRWLock *lock)
 {
-  if (g_thread_impl_vtable.DeleteSRWLock != NULL)
-    g_thread_impl_vtable.DeleteSRWLock (lock);
 }
 
 void
 g_rw_lock_writer_lock (GRWLock *lock)
 {
-  g_thread_impl_vtable.AcquireSRWLockExclusive (lock);
+  AcquireSRWLockExclusive ((gpointer) lock);
 }
 
 gboolean
 g_rw_lock_writer_trylock (GRWLock *lock)
 {
-  return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock);
+  return TryAcquireSRWLockExclusive ((gpointer) lock);
 }
 
 void
 g_rw_lock_writer_unlock (GRWLock *lock)
 {
-  g_thread_impl_vtable.ReleaseSRWLockExclusive (lock);
+  ReleaseSRWLockExclusive ((gpointer) lock);
 }
 
 void
 g_rw_lock_reader_lock (GRWLock *lock)
 {
-  g_thread_impl_vtable.AcquireSRWLockShared (lock);
+  AcquireSRWLockShared ((gpointer) lock);
 }
 
 gboolean
 g_rw_lock_reader_trylock (GRWLock *lock)
 {
-  return g_thread_impl_vtable.TryAcquireSRWLockShared (lock);
+  return TryAcquireSRWLockShared ((gpointer) lock);
 }
 
 void
 g_rw_lock_reader_unlock (GRWLock *lock)
 {
-  g_thread_impl_vtable.ReleaseSRWLockShared (lock);
+  ReleaseSRWLockShared ((gpointer) lock);
 }
 
 /* {{{1 GCond */
 void
 g_cond_init (GCond *cond)
 {
-  g_thread_impl_vtable.InitializeConditionVariable (cond);
+  InitializeConditionVariable ((gpointer) cond);
 }
 
 void
 g_cond_clear (GCond *cond)
 {
-  if (g_thread_impl_vtable.DeleteConditionVariable)
-    g_thread_impl_vtable.DeleteConditionVariable (cond);
 }
 
 void
 g_cond_signal (GCond *cond)
 {
-  g_thread_impl_vtable.WakeConditionVariable (cond);
+  WakeConditionVariable ((gpointer) cond);
 }
 
 void
 g_cond_broadcast (GCond *cond)
 {
-  g_thread_impl_vtable.WakeAllConditionVariable (cond);
+  WakeAllConditionVariable ((gpointer) cond);
 }
 
 void
 g_cond_wait (GCond  *cond,
              GMutex *entered_mutex)
 {
-  g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0);
+  SleepConditionVariableSRW ((gpointer) cond, (gpointer) entered_mutex, INFINITE, 0);
 }
 
 gboolean
@@ -305,17 +256,38 @@ g_cond_wait_until (GCond  *cond,
                    GMutex *entered_mutex,
                    gint64  end_time)
 {
-  gint64 span;
+  gint64 span, start_time;
+  DWORD span_millis;
+  gboolean signalled;
 
-  span = end_time - g_get_monotonic_time ();
+  start_time = g_get_monotonic_time ();
+  do
+    {
+      span = end_time - start_time;
+
+      if G_UNLIKELY (span < 0)
+        span_millis = 0;
+      else if G_UNLIKELY (span > G_GINT64_CONSTANT (1000) * (DWORD) INFINITE)
+        span_millis = INFINITE;
+      else
+        /* Round up so we don't time out too early */
+        span_millis = (span + 1000 - 1) / 1000;
+
+      /* We never want to wait infinitely */
+      if (span_millis >= INFINITE)
+        span_millis = INFINITE - 1;
 
-  if G_UNLIKELY (span < 0)
-    span = 0;
+      signalled = SleepConditionVariableSRW ((gpointer) cond, (gpointer) entered_mutex, span_millis, 0);
+      if (signalled)
+        break;
 
-  if G_UNLIKELY (span > G_GINT64_CONSTANT (1000) * G_MAXINT32)
-    span = INFINITE;
+      /* In case we didn't wait long enough after a timeout, wait again for the
+       * remaining time */
+      start_time = g_get_monotonic_time ();
+    }
+  while (start_time < end_time);
 
-  return g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, span / 1000, 0);
+  return signalled;
 }
 
 /* {{{1 GPrivate */
@@ -559,491 +531,11 @@ g_system_thread_set_name (const gchar *name)
   SetThreadName ((DWORD) -1, name);
 }
 
-/* {{{1 SRWLock and CONDITION_VARIABLE emulation (for Windows XP) */
-
-static CRITICAL_SECTION g_thread_xp_lock;
-static DWORD            g_thread_xp_waiter_tls;
-
-/* {{{2 GThreadWaiter utility class for CONDITION_VARIABLE emulation */
-typedef struct _GThreadXpWaiter GThreadXpWaiter;
-struct _GThreadXpWaiter
-{
-  HANDLE                     event;
-  volatile GThreadXpWaiter  *next;
-  volatile GThreadXpWaiter **my_owner;
-};
-
-static GThreadXpWaiter *
-g_thread_xp_waiter_get (void)
-{
-  GThreadXpWaiter *waiter;
-
-  waiter = TlsGetValue (g_thread_xp_waiter_tls);
-
-  if G_UNLIKELY (waiter == NULL)
-    {
-      waiter = malloc (sizeof (GThreadXpWaiter));
-      if (waiter == NULL)
-        g_thread_abort (GetLastError (), "malloc");
-      waiter->event = CreateEvent (0, FALSE, FALSE, NULL);
-      if (waiter->event == NULL)
-        g_thread_abort (GetLastError (), "CreateEvent");
-      waiter->my_owner = NULL;
-
-      TlsSetValue (g_thread_xp_waiter_tls, waiter);
-    }
-
-  return waiter;
-}
-
-static void __stdcall
-g_thread_xp_CallThisOnThreadExit (void)
-{
-  GThreadXpWaiter *waiter;
-
-  waiter = TlsGetValue (g_thread_xp_waiter_tls);
-
-  if (waiter != NULL)
-    {
-      TlsSetValue (g_thread_xp_waiter_tls, NULL);
-      CloseHandle (waiter->event);
-      free (waiter);
-    }
-}
-
-/* {{{2 SRWLock emulation */
-typedef struct
-{
-  CRITICAL_SECTION  writer_lock;
-  gboolean          ever_shared;    /* protected by writer_lock */
-  gboolean          writer_locked;  /* protected by writer_lock */
-
-  /* below is only ever touched if ever_shared becomes true */
-  CRITICAL_SECTION  atomicity;
-  GThreadXpWaiter  *queued_writer; /* protected by atomicity lock */
-  gint              num_readers;   /* protected by atomicity lock */
-} GThreadSRWLock;
-
-static void __stdcall
-g_thread_xp_InitializeSRWLock (gpointer mutex)
-{
-  *(GThreadSRWLock * volatile *) mutex = NULL;
-}
-
-static void __stdcall
-g_thread_xp_DeleteSRWLock (gpointer mutex)
-{
-  GThreadSRWLock *lock = *(GThreadSRWLock * volatile *) mutex;
-
-  if (lock)
-    {
-      if (lock->ever_shared)
-        DeleteCriticalSection (&lock->atomicity);
-
-      DeleteCriticalSection (&lock->writer_lock);
-      free (lock);
-    }
-}
-
-static GThreadSRWLock * __stdcall
-g_thread_xp_get_srwlock (GThreadSRWLock * volatile *lock)
-{
-  GThreadSRWLock *result;
-
-  /* It looks like we're missing some barriers here, but this code only
-   * ever runs on Windows XP, which in turn only ever runs on hardware
-   * with a relatively rigid memory model.  The 'volatile' will take
-   * care of the compiler.
-   */
-  result = *lock;
-
-  if G_UNLIKELY (result == NULL)
-    {
-      EnterCriticalSection (&g_thread_xp_lock);
-
-      /* Check again */
-      result = *lock;
-      if (result == NULL)
-        {
-          result = malloc (sizeof (GThreadSRWLock));
-
-          if (result == NULL)
-            g_thread_abort (errno, "malloc");
-
-          InitializeCriticalSection (&result->writer_lock);
-          result->writer_locked = FALSE;
-          result->ever_shared = FALSE;
-          *lock = result;
-        }
-
-      LeaveCriticalSection (&g_thread_xp_lock);
-    }
-
-  return result;
-}
-
-static void __stdcall
-g_thread_xp_AcquireSRWLockExclusive (gpointer mutex)
-{
-  GThreadSRWLock *lock = g_thread_xp_get_srwlock (mutex);
-
-  EnterCriticalSection (&lock->writer_lock);
-
-  /* CRITICAL_SECTION is reentrant, but SRWLock is not.
-   * Detect the deadlock that would occur on later Windows version.
-   */
-  g_assert (!lock->writer_locked);
-  lock->writer_locked = TRUE;
-
-  if (lock->ever_shared)
-    {
-      GThreadXpWaiter *waiter = NULL;
-
-      EnterCriticalSection (&lock->atomicity);
-      if (lock->num_readers > 0)
-        lock->queued_writer = waiter = g_thread_xp_waiter_get ();
-      LeaveCriticalSection (&lock->atomicity);
-
-      if (waiter != NULL)
-        WaitForSingleObject (waiter->event, INFINITE);
-
-      lock->queued_writer = NULL;
-    }
-}
-
-static BOOLEAN __stdcall
-g_thread_xp_TryAcquireSRWLockExclusive (gpointer mutex)
-{
-  GThreadSRWLock *lock = g_thread_xp_get_srwlock (mutex);
-
-  if (!TryEnterCriticalSection (&lock->writer_lock))
-    return FALSE;
-
-  /* CRITICAL_SECTION is reentrant, but SRWLock is not.
-   * Ensure that this properly returns FALSE (as SRWLock would).
-   */
-  if G_UNLIKELY (lock->writer_locked)
-    {
-      LeaveCriticalSection (&lock->writer_lock);
-      return FALSE;
-    }
-
-  lock->writer_locked = TRUE;
-
-  if (lock->ever_shared)
-    {
-      gboolean available;
-
-      EnterCriticalSection (&lock->atomicity);
-      available = lock->num_readers == 0;
-      LeaveCriticalSection (&lock->atomicity);
-
-      if (!available)
-        {
-          LeaveCriticalSection (&lock->writer_lock);
-          return FALSE;
-        }
-    }
-
-  return TRUE;
-}
-
-static void __stdcall
-g_thread_xp_ReleaseSRWLockExclusive (gpointer mutex)
-{
-  GThreadSRWLock *lock = *(GThreadSRWLock * volatile *) mutex;
-
-  lock->writer_locked = FALSE;
-
-  /* We need this until we fix some weird parts of GLib that try to
-   * unlock freshly-allocated mutexes.
-   */
-  if (lock != NULL)
-    LeaveCriticalSection (&lock->writer_lock);
-}
-
-static void
-g_thread_xp_srwlock_become_reader (GThreadSRWLock *lock)
-{
-  if G_UNLIKELY (!lock->ever_shared)
-    {
-      InitializeCriticalSection (&lock->atomicity);
-      lock->queued_writer = NULL;
-      lock->num_readers = 0;
-
-      lock->ever_shared = TRUE;
-    }
-
-  EnterCriticalSection (&lock->atomicity);
-  lock->num_readers++;
-  LeaveCriticalSection (&lock->atomicity);
-}
-
-static void __stdcall
-g_thread_xp_AcquireSRWLockShared (gpointer mutex)
-{
-  GThreadSRWLock *lock = g_thread_xp_get_srwlock (mutex);
-
-  EnterCriticalSection (&lock->writer_lock);
-
-  /* See g_thread_xp_AcquireSRWLockExclusive */
-  g_assert (!lock->writer_locked);
-
-  g_thread_xp_srwlock_become_reader (lock);
-
-  LeaveCriticalSection (&lock->writer_lock);
-}
-
-static BOOLEAN __stdcall
-g_thread_xp_TryAcquireSRWLockShared (gpointer mutex)
-{
-  GThreadSRWLock *lock = g_thread_xp_get_srwlock (mutex);
-
-  if (!TryEnterCriticalSection (&lock->writer_lock))
-    return FALSE;
-
-  /* See g_thread_xp_AcquireSRWLockExclusive */
-  if G_UNLIKELY (lock->writer_locked)
-    {
-      LeaveCriticalSection (&lock->writer_lock);
-      return FALSE;
-    }
-
-  g_thread_xp_srwlock_become_reader (lock);
-
-  LeaveCriticalSection (&lock->writer_lock);
-
-  return TRUE;
-}
-
-static void __stdcall
-g_thread_xp_ReleaseSRWLockShared (gpointer mutex)
-{
-  GThreadSRWLock *lock = g_thread_xp_get_srwlock (mutex);
-
-  EnterCriticalSection (&lock->atomicity);
-
-  lock->num_readers--;
-
-  if (lock->num_readers == 0 && lock->queued_writer)
-    SetEvent (lock->queued_writer->event);
-
-  LeaveCriticalSection (&lock->atomicity);
-}
-
-/* {{{2 CONDITION_VARIABLE emulation */
-typedef struct
-{
-  volatile GThreadXpWaiter  *first;
-  volatile GThreadXpWaiter **last_ptr;
-} GThreadXpCONDITION_VARIABLE;
-
-static void __stdcall
-g_thread_xp_InitializeConditionVariable (gpointer cond)
-{
-  *(GThreadXpCONDITION_VARIABLE * volatile *) cond = NULL;
-}
-
-static void __stdcall
-g_thread_xp_DeleteConditionVariable (gpointer cond)
-{
-  GThreadXpCONDITION_VARIABLE *cv = *(GThreadXpCONDITION_VARIABLE * volatile *) cond;
-
-  if (cv)
-    free (cv);
-}
-
-static GThreadXpCONDITION_VARIABLE * __stdcall
-g_thread_xp_get_condition_variable (GThreadXpCONDITION_VARIABLE * volatile *cond)
-{
-  GThreadXpCONDITION_VARIABLE *result;
-
-  /* It looks like we're missing some barriers here, but this code only
-   * ever runs on Windows XP, which in turn only ever runs on hardware
-   * with a relatively rigid memory model.  The 'volatile' will take
-   * care of the compiler.
-   */
-  result = *cond;
-
-  if G_UNLIKELY (result == NULL)
-    {
-      result = malloc (sizeof (GThreadXpCONDITION_VARIABLE));
-
-      if (result == NULL)
-        g_thread_abort (errno, "malloc");
-
-      result->first = NULL;
-      result->last_ptr = &result->first;
-
-      if (InterlockedCompareExchangePointer (cond, result, NULL) != NULL)
-        {
-          free (result);
-          result = *cond;
-        }
-    }
-
-  return result;
-}
-
-static BOOL __stdcall
-g_thread_xp_SleepConditionVariableSRW (gpointer cond,
-                                       gpointer mutex,
-                                       DWORD    timeout,
-                                       ULONG    flags)
-{
-  GThreadXpCONDITION_VARIABLE *cv = g_thread_xp_get_condition_variable (cond);
-  GThreadXpWaiter *waiter = g_thread_xp_waiter_get ();
-  DWORD status;
-
-  waiter->next = NULL;
-
-  EnterCriticalSection (&g_thread_xp_lock);
-  waiter->my_owner = cv->last_ptr;
-  *cv->last_ptr = waiter;
-  cv->last_ptr = &waiter->next;
-  LeaveCriticalSection (&g_thread_xp_lock);
-
-  g_mutex_unlock (mutex);
-  status = WaitForSingleObject (waiter->event, timeout);
-
-  if (status != WAIT_TIMEOUT && status != WAIT_OBJECT_0)
-    g_thread_abort (GetLastError (), "WaitForSingleObject");
-  g_mutex_lock (mutex);
-
-  if (status == WAIT_TIMEOUT)
-    {
-      EnterCriticalSection (&g_thread_xp_lock);
-      if (waiter->my_owner)
-        {
-          if (waiter->next)
-            waiter->next->my_owner = waiter->my_owner;
-          else
-            cv->last_ptr = waiter->my_owner;
-          *waiter->my_owner = waiter->next;
-          waiter->my_owner = NULL;
-        }
-      LeaveCriticalSection (&g_thread_xp_lock);
-    }
-
-  return status == WAIT_OBJECT_0;
-}
-
-static void __stdcall
-g_thread_xp_WakeConditionVariable (gpointer cond)
-{
-  GThreadXpCONDITION_VARIABLE *cv = g_thread_xp_get_condition_variable (cond);
-  volatile GThreadXpWaiter *waiter;
-
-  EnterCriticalSection (&g_thread_xp_lock);
-
-  waiter = cv->first;
-  if (waiter != NULL)
-    {
-      waiter->my_owner = NULL;
-      cv->first = waiter->next;
-      if (cv->first != NULL)
-        cv->first->my_owner = &cv->first;
-      else
-        cv->last_ptr = &cv->first;
-    }
-
-  if (waiter != NULL)
-    SetEvent (waiter->event);
-
-  LeaveCriticalSection (&g_thread_xp_lock);
-}
-
-static void __stdcall
-g_thread_xp_WakeAllConditionVariable (gpointer cond)
-{
-  GThreadXpCONDITION_VARIABLE *cv = g_thread_xp_get_condition_variable (cond);
-  volatile GThreadXpWaiter *waiter;
-
-  EnterCriticalSection (&g_thread_xp_lock);
-
-  waiter = cv->first;
-  cv->first = NULL;
-  cv->last_ptr = &cv->first;
-
-  while (waiter != NULL)
-    {
-      volatile GThreadXpWaiter *next;
-
-      next = waiter->next;
-      SetEvent (waiter->event);
-      waiter->my_owner = NULL;
-      waiter = next;
-    }
-
-  LeaveCriticalSection (&g_thread_xp_lock);
-}
-
-/* {{{2 XP Setup */
-static void
-g_thread_xp_init (void)
-{
-  static const GThreadImplVtable g_thread_xp_impl_vtable = {
-    g_thread_xp_CallThisOnThreadExit,
-    g_thread_xp_InitializeSRWLock,
-    g_thread_xp_DeleteSRWLock,
-    g_thread_xp_AcquireSRWLockExclusive,
-    g_thread_xp_TryAcquireSRWLockExclusive,
-    g_thread_xp_ReleaseSRWLockExclusive,
-    g_thread_xp_AcquireSRWLockShared,
-    g_thread_xp_TryAcquireSRWLockShared,
-    g_thread_xp_ReleaseSRWLockShared,
-    g_thread_xp_InitializeConditionVariable,
-    g_thread_xp_DeleteConditionVariable,
-    g_thread_xp_SleepConditionVariableSRW,
-    g_thread_xp_WakeAllConditionVariable,
-    g_thread_xp_WakeConditionVariable
-  };
-
-  InitializeCriticalSection (&g_thread_xp_lock);
-  g_thread_xp_waiter_tls = TlsAlloc ();
-
-  g_thread_impl_vtable = g_thread_xp_impl_vtable;
-}
-
 /* {{{1 Epilogue */
 
-static gboolean
-g_thread_lookup_native_funcs (void)
-{
-  GThreadImplVtable native_vtable = { 0, };
-  HMODULE kernel32;
-
-  kernel32 = GetModuleHandle ("KERNEL32.DLL");
-
-  if (kernel32 == NULL)
-    return FALSE;
-
-#define GET_FUNC(name) if ((native_vtable.name = (void *) GetProcAddress (kernel32, #name)) == NULL) return FALSE
-  GET_FUNC(InitializeSRWLock);
-  GET_FUNC(AcquireSRWLockExclusive);
-  GET_FUNC(TryAcquireSRWLockExclusive);
-  GET_FUNC(ReleaseSRWLockExclusive);
-  GET_FUNC(AcquireSRWLockShared);
-  GET_FUNC(TryAcquireSRWLockShared);
-  GET_FUNC(ReleaseSRWLockShared);
-
-  GET_FUNC(InitializeConditionVariable);
-  GET_FUNC(SleepConditionVariableSRW);
-  GET_FUNC(WakeAllConditionVariable);
-  GET_FUNC(WakeConditionVariable);
-#undef GET_FUNC
-
-  g_thread_impl_vtable = native_vtable;
-
-  return TRUE;
-}
-
 void
 g_thread_win32_init (void)
 {
-  if (!g_thread_lookup_native_funcs ())
-    g_thread_xp_init ();
-
   InitializeCriticalSection (&g_private_lock);
 
 #ifndef _MSC_VER
@@ -1088,9 +580,6 @@ g_thread_win32_thread_detach (void)
         }
     }
   while (dtors_called);
-
-  if (g_thread_impl_vtable.CallThisOnThreadExit)
-    g_thread_impl_vtable.CallThisOnThreadExit ();
 }
 
 void
diff --git a/glib/gtimer.c b/glib/gtimer.c
index de0ef1b93..e95ac0ead 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -251,7 +251,8 @@ void
 g_usleep (gulong microseconds)
 {
 #ifdef G_OS_WIN32
-  Sleep (microseconds / 1000);
+  /* Round up to the next millisecond */
+  Sleep (microseconds ? (1 + (microseconds - 1) / 1000) : 0);
 #else
   struct timespec request, remaining;
   request.tv_sec = microseconds / G_USEC_PER_SEC;
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 72a4916ad..b3220dc35 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -1677,7 +1677,10 @@ interval_end (GTimeZone *tz,
               guint      interval)
 {
   if (tz->transitions && interval < tz->transitions->len)
-    return (TRANSITION(interval)).time - 1;
+    {
+      gint64 lim = (TRANSITION(interval)).time;
+      return lim - (lim != G_MININT64);
+    }
   return G_MAXINT64;
 }
 
diff --git a/glib/gtranslit.c b/glib/gtranslit.c
index 600638c86..4d83ee9f9 100644
--- a/glib/gtranslit.c
+++ b/glib/gtranslit.c
@@ -314,12 +314,12 @@ get_default_item_id (void)
  * If the source language of @str is known, it can used to improve the
  * accuracy of the translation by passing it as @from_locale.  It should
  * be a valid POSIX locale string (of the form
- * "language[_territory][.codeset][@modifier]").
+ * `language[_territory][.codeset][@modifier]`).
  *
  * If @from_locale is %NULL then the current locale is used.
  *
  * If you want to do translation for no specific locale, and you want it
- * to be done independently of the currently locale, specify "C" for
+ * to be done independently of the currently locale, specify `"C"` for
  * @from_locale.
  *
  * Returns: a string in plain ASCII
diff --git a/glib/gtypes.h b/glib/gtypes.h
index 09d9bd145..67adb7f1f 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -510,6 +510,9 @@ struct _GTimeVal
   glong tv_usec;
 };
 
+typedef gint            grefcount;
+typedef volatile gint   gatomicrefcount;
+
 G_END_DECLS
 
 /* We prefix variable declarations so they can
diff --git a/glib/gunibreak.h b/glib/gunibreak.h
index 659e8cc24..3b71b179d 100644
--- a/glib/gunibreak.h
+++ b/glib/gunibreak.h
@@ -7,7 +7,7 @@
 #include <glib/gtypes.h>
 #include <glib/gunicode.h>
 
-#define G_UNICODE_DATA_VERSION "10.0.0"
+#define G_UNICODE_DATA_VERSION "11.0.0"
 
 #define G_UNICODE_LAST_CHAR 0x10FFFF
 
@@ -586,7 +586,6 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -606,7 +605,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_INFIX_SEPARATOR, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_INFIX_SEPARATOR, 
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_PREFIX, G_UNICODE_BREAK_UNKNOWN, 
@@ -657,7 +657,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_HEBREW_LETTER, G_UNICODE_BREAK_HEBREW_LETTER, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_HEBREW_LETTER, 
+    G_UNICODE_BREAK_HEBREW_LETTER, G_UNICODE_BREAK_HEBREW_LETTER, 
     G_UNICODE_BREAK_HEBREW_LETTER, G_UNICODE_BREAK_HEBREW_LETTER, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -924,8 +924,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_INFIX_SEPARATOR, G_UNICODE_BREAK_EXCLAMATION, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_PREFIX, G_UNICODE_BREAK_PREFIX
   },
   { /* page 8, index 7 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1033,7 +1033,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -1184,7 +1184,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_PREFIX, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 10, index 9 */
@@ -1247,7 +1247,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -1450,7 +1450,7 @@ static const gint8 break_property_data[][256] = {
   { /* page 12, index 11 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1514,7 +1514,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2934,7 +2934,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -3464,34 +3464,34 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -5035,8 +5035,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -5047,29 +5047,29 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 44, index 39 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -5364,6 +5364,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_OPEN_PUNCTUATION, G_UNICODE_BREAK_AFTER, 
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -5388,10 +5390,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5404,7 +5403,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5449,12 +5448,13 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 47, index 42 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5761,7 +5761,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -6612,12 +6612,12 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -6781,7 +6781,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK
   },
   { /* page 169, index 52 */
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
@@ -14614,7 +14614,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN, 
@@ -14624,7 +14624,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER, 
@@ -14974,7 +14974,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 270, index 115 */
+  { /* page 269, index 115 */
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+  },
+  { /* page 270, index 116 */
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -15104,7 +15234,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 272, index 116 */
+  { /* page 271, index 117 */
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+  },
+  { /* page 272, index 118 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -15206,7 +15466,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -15233,7 +15493,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 273, index 117 */
+  { /* page 273, index 119 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -15267,8 +15527,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_AFTER, 
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -15333,7 +15593,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_NUMERIC, 
@@ -15361,7 +15621,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 274, index 118 */
+  { /* page 274, index 120 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -15490,7 +15750,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 275, index 119 */
+  { /* page 275, index 121 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -15520,7 +15780,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -15620,7 +15880,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 276, index 120 */
+  { /* page 276, index 122 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -15666,7 +15926,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -15749,7 +16009,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 277, index 121 */
+  { /* page 277, index 123 */
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -15877,7 +16137,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 278, index 122 */
+  { /* page 278, index 124 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -16005,7 +16265,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 279, index 123 */
+  { /* page 279, index 125 */
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
@@ -16019,7 +16279,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
@@ -16135,37 +16395,37 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 280, index 124 */
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+  { /* page 280, index 126 */
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -16265,7 +16525,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 282, index 125 */
+  { /* page 282, index 127 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -16343,9 +16603,9 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, 
-    G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_BEFORE, 
+    G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_BEFORE, G_UNICODE_BREAK_AFTER, 
+    G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -16393,7 +16653,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 284, index 126 */
+  { /* page 284, index 128 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -16522,7 +16782,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 285, index 127 */
+  { /* page 285, index 129 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -16571,6 +16831,103 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+  },
+  { /* page 286, index 130 */
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -16650,9 +17007,42 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 291, index 128 */
+  { /* page 291, index 131 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -16782,7 +17172,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 292, index 129 */
+  { /* page 292, index 132 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -16911,7 +17301,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 293, index 130 */
+  { /* page 293, index 133 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17041,7 +17431,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 306, index 131 */
+  { /* page 306, index 134 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17171,7 +17561,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 307, index 132 */
+  { /* page 307, index 135 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17301,7 +17691,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 308, index 133 */
+  { /* page 308, index 136 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17431,7 +17821,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 325, index 134 */
+  { /* page 325, index 137 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17561,7 +17951,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 326, index 135 */
+  { /* page 326, index 138 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17691,7 +18081,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 362, index 136 */
+  { /* page 362, index 139 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17820,7 +18210,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 363, index 137 */
+  { /* page 363, index 140 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -17950,7 +18340,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 367, index 138 */
+  { /* page 366, index 141 */
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN
+  },
+  { /* page 367, index 142 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -18080,7 +18600,10 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 391, index 139 */
+  { /* page 391, index 143 */
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -18199,9 +18722,6 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -18210,7 +18730,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 394, index 140 */
+  { /* page 394, index 144 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -18340,7 +18860,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 433, index 141 */
+  { /* page 433, index 145 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -18470,7 +18990,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 434, index 142 */
+  { /* page 434, index 146 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -18600,7 +19120,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 444, index 143 */
+  { /* page 444, index 147 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -18730,7 +19250,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 464, index 144 */
+  { /* page 464, index 148 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -18860,7 +19380,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 465, index 145 */
+  { /* page 465, index 149 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -18990,7 +19510,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 466, index 146 */
+  { /* page 466, index 150 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -19103,16 +19623,16 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -19120,7 +19640,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 467, index 147 */
+  { /* page 467, index 151 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -19178,10 +19698,10 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -19250,7 +19770,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 468, index 148 */
+  { /* page 468, index 152 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -19380,7 +19900,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 469, index 149 */
+  { /* page 469, index 153 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -19510,7 +20030,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 470, index 150 */
+  { /* page 470, index 154 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -19640,7 +20160,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 471, index 151 */
+  { /* page 471, index 155 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -19770,7 +20290,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC
   },
-  { /* page 474, index 152 */
+  { /* page 474, index 156 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -19899,7 +20419,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 480, index 153 */
+  { /* page 480, index 157 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -20029,7 +20549,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 488, index 154 */
+  { /* page 488, index 158 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20159,7 +20679,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 489, index 155 */
+  { /* page 489, index 159 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20289,7 +20809,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 494, index 156 */
+  { /* page 492, index 160 */
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
+  },
+  { /* page 494, index 161 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20419,7 +21069,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 497, index 157 */
+  { /* page 497, index 162 */
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -20443,7 +21093,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -20549,7 +21199,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_REGIONAL_INDICATOR, G_UNICODE_BREAK_REGIONAL_INDICATOR, 
     G_UNICODE_BREAK_REGIONAL_INDICATOR, G_UNICODE_BREAK_REGIONAL_INDICATOR
   },
-  { /* page 499, index 158 */
+  { /* page 499, index 163 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -20679,7 +21329,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_EMOJI_MODIFIER, G_UNICODE_BREAK_EMOJI_MODIFIER, 
     G_UNICODE_BREAK_EMOJI_MODIFIER, G_UNICODE_BREAK_EMOJI_MODIFIER
   },
-  { /* page 500, index 159 */
+  { /* page 500, index 164 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -20809,7 +21459,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 501, index 160 */
+  { /* page 501, index 165 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20939,7 +21589,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 502, index 161 */
+  { /* page 502, index 166 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21069,7 +21719,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 503, index 162 */
+  { /* page 503, index 167 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21199,7 +21849,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 504, index 163 */
+  { /* page 504, index 168 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21329,7 +21979,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 505, index 164 */
+  { /* page 505, index 169 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21420,9 +22070,9 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_EMOJI_BASE, 
+    G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21459,7 +22109,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 511, index 165 */
+  { /* page 511, index 170 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21589,7 +22239,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 767, index 166 */
+  { /* page 767, index 171 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21719,7 +22369,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 1023, index 167 */
+  { /* page 1023, index 172 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21849,7 +22499,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 3584, index 168 */
+  { /* page 3584, index 173 */
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -21979,7 +22629,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 3585, index 169 */
+  { /* page 3585, index 174 */
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -22382,31 +23032,31 @@ static const gint16 break_property_table_part1[763] = {
   112 /* page 266 */,
   113 /* page 267 */,
   114 /* page 268 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  115 /* page 270 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  116 /* page 272 */,
-  117 /* page 273 */,
-  118 /* page 274 */,
-  119 /* page 275 */,
-  120 /* page 276 */,
-  121 /* page 277 */,
-  122 /* page 278 */,
-  123 /* page 279 */,
-  124 /* page 280 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  125 /* page 282 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  126 /* page 284 */,
-  127 /* page 285 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  115 /* page 269 */,
+  116 /* page 270 */,
+  117 /* page 271 */,
+  118 /* page 272 */,
+  119 /* page 273 */,
+  120 /* page 274 */,
+  121 /* page 275 */,
+  122 /* page 276 */,
+  123 /* page 277 */,
+  124 /* page 278 */,
+  125 /* page 279 */,
+  126 /* page 280 */,
+  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  127 /* page 282 */,
+  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  128 /* page 284 */,
+  129 /* page 285 */,
+  130 /* page 286 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  128 /* page 291 */,
-  129 /* page 292 */,
-  130 /* page 293 */,
+  131 /* page 291 */,
+  132 /* page 292 */,
+  133 /* page 293 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
@@ -22419,9 +23069,9 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  131 /* page 306 */,
-  132 /* page 307 */,
-  133 /* page 308 */,
+  134 /* page 306 */,
+  135 /* page 307 */,
+  136 /* page 308 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
@@ -22438,8 +23088,8 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  134 /* page 325 */,
-  135 /* page 326 */,
+  137 /* page 325 */,
+  138 /* page 326 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
@@ -22475,12 +23125,12 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  136 /* page 362 */,
-  137 /* page 363 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  139 /* page 362 */,
+  140 /* page 363 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  138 /* page 367 */,
+  141 /* page 366 */,
+  142 /* page 367 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
@@ -22504,10 +23154,10 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  139 /* page 391 */,
+  143 /* page 391 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  140 /* page 394 */,
+  144 /* page 394 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
@@ -22546,8 +23196,8 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  141 /* page 433 */,
-  142 /* page 434 */,
+  145 /* page 433 */,
+  146 /* page 434 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
@@ -22557,7 +23207,7 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  143 /* page 444 */,
+  147 /* page 444 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
@@ -22577,54 +23227,54 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  144 /* page 464 */,
-  145 /* page 465 */,
-  146 /* page 466 */,
-  147 /* page 467 */,
-  148 /* page 468 */,
-  149 /* page 469 */,
-  150 /* page 470 */,
-  151 /* page 471 */,
+  148 /* page 464 */,
+  149 /* page 465 */,
+  150 /* page 466 */,
+  151 /* page 467 */,
+  152 /* page 468 */,
+  153 /* page 469 */,
+  154 /* page 470 */,
+  155 /* page 471 */,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  152 /* page 474 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  156 /* page 474 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  153 /* page 480 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  157 /* page 480 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  154 /* page 488 */,
-  155 /* page 489 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  158 /* page 488 */,
+  159 /* page 489 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  160 /* page 492 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  156 /* page 494 */,
+  161 /* page 494 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  157 /* page 497 */,
+  162 /* page 497 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  158 /* page 499 */,
-  159 /* page 500 */,
-  160 /* page 501 */,
-  161 /* page 502 */,
-  162 /* page 503 */,
-  163 /* page 504 */,
-  164 /* page 505 */,
+  163 /* page 499 */,
+  164 /* page 500 */,
+  165 /* page 501 */,
+  166 /* page 502 */,
+  167 /* page 503 */,
+  168 /* page 504 */,
+  169 /* page 505 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  165 /* page 511 */,
+  170 /* page 511 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
@@ -22880,8 +23530,8 @@ static const gint16 break_property_table_part1[763] = {
 
 /* U+E0000 through U+10FFFF */
 static const gint16 break_property_table_part2[768] = {
-  168 /* page 3584 */,
-  169 /* page 3585 */,
+  173 /* page 3584 */,
+  174 /* page 3585 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
diff --git a/glib/gunichartables.h b/glib/gunichartables.h
index c3332af60..4bb6b5794 100644
--- a/glib/gunichartables.h
+++ b/glib/gunichartables.h
@@ -4,7 +4,7 @@
 #ifndef CHARTABLES_H
 #define CHARTABLES_H
 
-#define G_UNICODE_DATA_VERSION "10.0.0"
+#define G_UNICODE_DATA_VERSION "11.0.0"
 
 #define G_UNICODE_LAST_CHAR 0x10ffff
 
@@ -699,7 +699,8 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_LETTER, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -719,7 +720,6 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
-    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_DASH_PUNCTUATION, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_UNASSIGNED, 
@@ -763,7 +763,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -973,8 +973,8 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_LETTER, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_MODIFIER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_CURRENCY_SYMBOL
   },
   { /* page 8, index 8 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1054,7 +1054,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -1175,7 +1175,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_CURRENCY_SYMBOL, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED
   },
   { /* page 10, index 10 */
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
@@ -1220,31 +1220,31 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -1368,30 +1368,30 @@ static const char type_data[][256] = {
   },
   { /* page 12, index 12 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -1415,26 +1415,26 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
@@ -1848,23 +1848,31 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_MODIFIER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER
   },
   { /* page 18, index 17 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2377,7 +2385,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2779,46 +2787,53 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -4031,7 +4046,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -4039,21 +4054,21 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_UNASSIGNED
   },
   { /* page 44, index 39 */
@@ -4323,6 +4338,9 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -4338,9 +4356,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -4349,7 +4365,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -4379,11 +4395,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+    G_UNICODE_UNASSIGNED
   },
   { /* page 47, index 42 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -4589,7 +4605,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -4916,8 +4932,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -5299,11 +5315,12 @@ static const char type_data[][256] = {
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
-    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -5324,8 +5341,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_MODIFIER_LETTER, 
     G_UNICODE_MODIFIER_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
@@ -5425,7 +5441,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+    G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK
   },
   { /* page 169, index 53 */
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -7158,14 +7174,14 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
-    G_UNICODE_OTHER_NUMBER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
@@ -7426,7 +7442,97 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER
   },
-  { /* page 270, index 74 */
+  { /* page 269, index 74 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED
+  },
+  { /* page 270, index 75 */
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -7514,7 +7620,98 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 272, index 75 */
+  { /* page 271, index 76 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED
+  },
+  { /* page 272, index 77 */
     G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7591,7 +7788,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_FORMAT, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7611,7 +7808,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 273, index 76 */
+  { /* page 273, index 78 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7640,7 +7837,7 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -7688,7 +7885,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -7711,7 +7908,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 274, index 77 */
+  { /* page 274, index 79 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7806,7 +8003,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 275, index 78 */
+  { /* page 275, index 80 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7827,8 +8024,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
@@ -7897,7 +8094,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 276, index 79 */
+  { /* page 276, index 81 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7935,7 +8132,8 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -7946,7 +8144,6 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7962,8 +8159,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -7995,7 +8192,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 277, index 80 */
+  { /* page 277, index 82 */
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -8089,7 +8286,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 278, index 81 */
+  { /* page 278, index 83 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8187,7 +8384,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 279, index 82 */
+  { /* page 279, index 84 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8196,7 +8394,6 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
@@ -8279,28 +8476,30 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 280, index 83 */
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+  { /* page 280, index 85 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -8333,7 +8532,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -8379,12 +8578,12 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER
   },
-  { /* page 282, index 84 */
+  { /* page 282, index 86 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8443,7 +8642,7 @@ static const char type_data[][256] = {
     G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -8478,7 +8677,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 284, index 85 */
+  { /* page 284, index 87 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8577,7 +8776,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 285, index 86 */
+  { /* page 285, index 88 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
@@ -8613,6 +8812,34 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -8640,6 +8867,9 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+  },
+  { /* page 286, index 89 */
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -8666,9 +8896,69 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED
   },
-  { /* page 291, index 87 */
+  { /* page 291, index 90 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8756,7 +9046,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 292, index 88 */
+  { /* page 292, index 91 */
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER, 
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER, 
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER, 
@@ -8863,7 +9153,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
-  { /* page 293, index 89 */
+  { /* page 293, index 92 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8951,7 +9241,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 308, index 90 */
+  { /* page 308, index 93 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9039,7 +9329,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 326, index 91 */
+  { /* page 326, index 94 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9127,7 +9417,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 362, index 92 */
+  { /* page 362, index 95 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9217,7 +9507,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 363, index 93 */
+  { /* page 363, index 96 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9309,7 +9599,106 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 367, index 94 */
+  { /* page 366, index 97 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+  },
+  { /* page 367, index 98 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9400,7 +9789,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 391, index 95 */
+  { /* page 391, index 99 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9480,15 +9869,15 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 394, index 96 */
+  { /* page 394, index 100 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9576,7 +9965,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 433, index 97 */
+  { /* page 433, index 101 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9664,7 +10053,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 434, index 98 */
+  { /* page 434, index 102 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9752,7 +10141,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 444, index 99 */
+  { /* page 444, index 103 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9840,7 +10229,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 464, index 100 */
+  { /* page 464, index 104 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -9928,7 +10317,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 465, index 101 */
+  { /* page 465, index 105 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -10020,7 +10409,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 466, index 102 */
+  { /* page 466, index 106 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -10096,19 +10485,19 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 467, index 103 */
+  { /* page 467, index 107 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -10147,9 +10536,9 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -10196,7 +10585,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 468, index 104 */
+  { /* page 468, index 108 */
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -10325,7 +10714,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER
   },
-  { /* page 469, index 105 */
+  { /* page 469, index 109 */
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -10454,7 +10843,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER
   },
-  { /* page 470, index 106 */
+  { /* page 470, index 110 */
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -10584,7 +10973,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER
   },
-  { /* page 471, index 107 */
+  { /* page 471, index 111 */
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -10714,7 +11103,7 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER
   },
-  { /* page 474, index 108 */
+  { /* page 474, index 112 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -10825,7 +11214,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 480, index 109 */
+  { /* page 480, index 113 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -10919,7 +11308,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 488, index 110 */
+  { /* page 488, index 114 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -11008,7 +11397,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 489, index 111 */
+  { /* page 489, index 115 */
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -11110,7 +11499,95 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 494, index 112 */
+  { /* page 492, index 116 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
+  },
+  { /* page 494, index 117 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -11198,7 +11675,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 496, index 113 */
+  { /* page 496, index 118 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11286,7 +11763,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 497, index 114 */
+  { /* page 497, index 119 */
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
@@ -11302,7 +11779,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11374,7 +11851,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL
   },
-  { /* page 498, index 115 */
+  { /* page 498, index 120 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -11462,7 +11939,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 499, index 116 */
+  { /* page 499, index 121 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11551,7 +12028,7 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL, 
     G_UNICODE_MODIFIER_SYMBOL
   },
-  { /* page 502, index 117 */
+  { /* page 502, index 122 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11635,11 +12112,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 503, index 118 */
+  { /* page 503, index 123 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11711,8 +12188,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -11727,7 +12204,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 504, index 119 */
+  { /* page 504, index 124 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11815,7 +12292,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 505, index 120 */
+  { /* page 505, index 125 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11841,8 +12318,24 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11852,13 +12345,24 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -11866,7 +12370,32 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL
+  },
+  { /* page 506, index 126 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -11880,19 +12409,55 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -11903,7 +12468,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 678, index 121 */
+  { /* page 678, index 127 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -11991,7 +12556,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 695, index 122 */
+  { /* page 695, index 128 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12079,7 +12644,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 696, index 123 */
+  { /* page 696, index 129 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12167,7 +12732,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 718, index 124 */
+  { /* page 718, index 130 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12255,7 +12820,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 747, index 125 */
+  { /* page 747, index 131 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12343,7 +12908,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 762, index 126 */
+  { /* page 762, index 132 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12431,7 +12996,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 3584, index 127 */
+  { /* page 3584, index 133 */
     G_UNICODE_UNASSIGNED, G_UNICODE_FORMAT, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -12511,7 +13076,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 3585, index 128 */
+  { /* page 3585, index 134 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -12639,7 +13204,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 4095, index 129 */
+  { /* page 4095, index 135 */
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, 
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, 
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, 
@@ -12727,7 +13292,7 @@ static const char type_data[][256] = {
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 4351, index 130 */
+  { /* page 4351, index 136 */
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, 
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, 
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, 
@@ -13088,31 +13653,31 @@ static const gint16 type_table_part1[763] = {
   71 /* page 266 */,
   72 /* page 267 */,
   73 /* page 268 */,
+  74 /* page 269 */,
+  75 /* page 270 */,
+  76 /* page 271 */,
+  77 /* page 272 */,
+  78 /* page 273 */,
+  79 /* page 274 */,
+  80 /* page 275 */,
+  81 /* page 276 */,
+  82 /* page 277 */,
+  83 /* page 278 */,
+  84 /* page 279 */,
+  85 /* page 280 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  74 /* page 270 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  75 /* page 272 */,
-  76 /* page 273 */,
-  77 /* page 274 */,
-  78 /* page 275 */,
-  79 /* page 276 */,
-  80 /* page 277 */,
-  81 /* page 278 */,
-  82 /* page 279 */,
-  83 /* page 280 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  84 /* page 282 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  85 /* page 284 */,
-  86 /* page 285 */,
+  86 /* page 282 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  87 /* page 284 */,
+  88 /* page 285 */,
+  89 /* page 286 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  87 /* page 291 */,
-  88 /* page 292 */,
-  89 /* page 293 */,
+  90 /* page 291 */,
+  91 /* page 292 */,
+  92 /* page 293 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13127,7 +13692,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  90 /* page 308 */,
+  93 /* page 308 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13145,7 +13710,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  91 /* page 326 */,
+  94 /* page 326 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13181,12 +13746,12 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  92 /* page 362 */,
-  93 /* page 363 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  95 /* page 362 */,
+  96 /* page 363 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  94 /* page 367 */,
+  97 /* page 366 */,
+  98 /* page 367 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
@@ -13210,10 +13775,10 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  95 /* page 391 */,
+  99 /* page 391 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  96 /* page 394 */,
+  100 /* page 394 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13252,8 +13817,8 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  97 /* page 433 */,
-  98 /* page 434 */,
+  101 /* page 433 */,
+  102 /* page 434 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13263,7 +13828,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  99 /* page 444 */,
+  103 /* page 444 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13283,23 +13848,23 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  100 /* page 464 */,
-  101 /* page 465 */,
-  102 /* page 466 */,
-  103 /* page 467 */,
-  104 /* page 468 */,
-  105 /* page 469 */,
-  106 /* page 470 */,
-  107 /* page 471 */,
+  104 /* page 464 */,
+  105 /* page 465 */,
+  106 /* page 466 */,
+  107 /* page 467 */,
+  108 /* page 468 */,
+  109 /* page 469 */,
+  110 /* page 470 */,
+  111 /* page 471 */,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
-  108 /* page 474 */,
+  112 /* page 474 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  109 /* page 480 */,
+  113 /* page 480 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13307,25 +13872,25 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  110 /* page 488 */,
-  111 /* page 489 */,
+  114 /* page 488 */,
+  115 /* page 489 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  116 /* page 492 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  117 /* page 494 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  112 /* page 494 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  113 /* page 496 */,
-  114 /* page 497 */,
-  115 /* page 498 */,
-  116 /* page 499 */,
+  118 /* page 496 */,
+  119 /* page 497 */,
+  120 /* page 498 */,
+  121 /* page 499 */,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
-  117 /* page 502 */,
-  118 /* page 503 */,
-  119 /* page 504 */,
-  120 /* page 505 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  122 /* page 502 */,
+  123 /* page 503 */,
+  124 /* page 504 */,
+  125 /* page 505 */,
+  126 /* page 506 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13497,7 +14062,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  121 /* page 678 */,
+  127 /* page 678 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
@@ -13514,8 +14079,8 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  122 /* page 695 */,
-  123 /* page 696 */,
+  128 /* page 695 */,
+  129 /* page 696 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
@@ -13537,7 +14102,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  124 /* page 718 */,
+  130 /* page 718 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
@@ -13566,7 +14131,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  125 /* page 747 */,
+  131 /* page 747 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -13581,13 +14146,13 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  126 /* page 762 */
+  132 /* page 762 */
 };
 
 /* U+E0000 through U+10FFFF */
 static const gint16 type_table_part2[768] = {
-  127 /* page 3584 */,
-  128 /* page 3585 */,
+  133 /* page 3584 */,
+  134 /* page 3585 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
@@ -14097,7 +14662,7 @@ static const gint16 type_table_part2[768] = {
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
-  129 /* page 4095 */,
+  135 /* page 4095 */,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
@@ -14353,7 +14918,7 @@ static const gint16 type_table_part2[768] = {
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
-  130 /* page 4351 */
+  136 /* page 4351 */
 };
 
 static const gunichar attr_data[][256] = {
@@ -14846,12 +15411,12 @@ static const gunichar attr_data[][256] = {
     0x2d14, 0x2d15, 0x2d16, 0x2d17, 0x2d18, 0x2d19, 0x2d1a, 0x2d1b, 0x2d1c, 
     0x2d1d, 0x2d1e, 0x2d1f, 0x2d20, 0x2d21, 0x2d22, 0x2d23, 0x2d24, 0x2d25, 
     0x0000, 0x2d27, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2d2d, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000
+    0x0000, 0x1c90, 0x1c91, 0x1c92, 0x1c93, 0x1c94, 0x1c95, 0x1c96, 0x1c97, 
+    0x1c98, 0x1c99, 0x1c9a, 0x1c9b, 0x1c9c, 0x1c9d, 0x1c9e, 0x1c9f, 0x1ca0, 
+    0x1ca1, 0x1ca2, 0x1ca3, 0x1ca4, 0x1ca5, 0x1ca6, 0x1ca7, 0x1ca8, 0x1ca9, 
+    0x1caa, 0x1cab, 0x1cac, 0x1cad, 0x1cae, 0x1caf, 0x1cb0, 0x1cb1, 0x1cb2, 
+    0x1cb3, 0x1cb4, 0x1cb5, 0x1cb6, 0x1cb7, 0x1cb8, 0x1cb9, 0x1cba, 0x0000, 
+    0x0000, 0x1cbd, 0x1cbe, 0x1cbf
   },
   { /* page 19, index 16 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15056,12 +15621,12 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0412, 0x0414, 0x041e, 0x0421, 0x0422, 0x0422, 0x042a, 
     0x0462, 0xa64a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7, 0x10d8, 
+    0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df, 0x10e0, 0x10e1, 
+    0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 
+    0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10ef, 0x10f0, 0x10f1, 0x10f2, 0x10f3, 
+    0x10f4, 0x10f5, 0x10f6, 0x10f7, 0x10f8, 0x10f9, 0x10fa, 0x0000, 0x0000, 
+    0x10fd, 0x10fe, 0x10ff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15312,7 +15877,7 @@ static const gunichar attr_data[][256] = {
     0xa798, 0xa79b, 0xa79a, 0xa79d, 0xa79c, 0xa79f, 0xa79e, 0xa7a1, 0xa7a0, 
     0xa7a3, 0xa7a2, 0xa7a5, 0xa7a4, 0xa7a7, 0xa7a6, 0xa7a9, 0xa7a8, 0x0266, 
     0x025c, 0x0261, 0x026c, 0x026a, 0x0000, 0x029e, 0x0287, 0x029d, 0xab53, 
-    0xa7b5, 0xa7b4, 0xa7b7, 0xa7b6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0xa7b5, 0xa7b4, 0xa7b7, 0xa7b6, 0xa7b9, 0xa7b8, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15574,7 +16139,38 @@ static const gunichar attr_data[][256] = {
     0x10caf, 0x10cb0, 0x10cb1, 0x10cb2, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 272, index 39 */
+  { /* page 269, index 39 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 
+    0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000
+  },
+  { /* page 272, index 40 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15605,7 +16201,7 @@ static const gunichar attr_data[][256] = {
     0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 273, index 40 */
+  { /* page 273, index 41 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15636,7 +16232,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 274, index 41 */
+  { /* page 274, index 42 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15667,7 +16263,7 @@ static const gunichar attr_data[][256] = {
     0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 276, index 42 */
+  { /* page 276, index 43 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15698,7 +16294,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 278, index 43 */
+  { /* page 278, index 44 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15729,7 +16325,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 279, index 44 */
+  { /* page 279, index 45 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15760,7 +16356,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 280, index 45 */
+  { /* page 280, index 46 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15792,7 +16388,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000
   },
-  { /* page 284, index 46 */
+  { /* page 284, index 47 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15823,7 +16419,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 285, index 47 */
+  { /* page 285, index 48 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15841,8 +16437,8 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 
+    0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15854,7 +16450,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 362, index 48 */
+  { /* page 362, index 49 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15885,7 +16481,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 363, index 49 */
+  { /* page 363, index 50 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15916,7 +16512,39 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000
   },
-  { /* page 471, index 50 */
+  { /* page 366, index 51 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x16e60, 0x16e61, 0x16e62, 0x16e63, 0x16e64, 0x16e65, 0x16e66, 
+    0x16e67, 0x16e68, 0x16e69, 0x16e6a, 0x16e6b, 0x16e6c, 0x16e6d, 0x16e6e, 
+    0x16e6f, 0x16e70, 0x16e71, 0x16e72, 0x16e73, 0x16e74, 0x16e75, 0x16e76, 
+    0x16e77, 0x16e78, 0x16e79, 0x16e7a, 0x16e7b, 0x16e7c, 0x16e7d, 0x16e7e, 
+    0x16e7f, 0x16e40, 0x16e41, 0x16e42, 0x16e43, 0x16e44, 0x16e45, 0x16e46, 
+    0x16e47, 0x16e48, 0x16e49, 0x16e4a, 0x16e4b, 0x16e4c, 0x16e4d, 0x16e4e, 
+    0x16e4f, 0x16e50, 0x16e51, 0x16e52, 0x16e53, 0x16e54, 0x16e55, 0x16e56, 
+    0x16e57, 0x16e58, 0x16e59, 0x16e5a, 0x16e5b, 0x16e5c, 0x16e5d, 0x16e5e, 
+    0x16e5f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000
+  },
+  { /* page 471, index 52 */
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15947,7 +16575,7 @@ static const gunichar attr_data[][256] = {
     0x0007, 0x0008, 0x0009, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 
     0x0006, 0x0007, 0x0008, 0x0009
   },
-  { /* page 489, index 51 */
+  { /* page 489, index 53 */
     0x1e922, 0x1e923, 0x1e924, 0x1e925, 0x1e926, 0x1e927, 0x1e928, 0x1e929, 
     0x1e92a, 0x1e92b, 0x1e92c, 0x1e92d, 0x1e92e, 0x1e92f, 0x1e930, 0x1e931, 
     0x1e932, 0x1e933, 0x1e934, 0x1e935, 0x1e936, 0x1e937, 0x1e938, 0x1e939, 
@@ -16252,24 +16880,23 @@ static const gint16 attr_table_part1[763] = {
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   38 /* page 268 */,
+  39 /* page 269 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
+  40 /* page 272 */,
+  41 /* page 273 */,
+  42 /* page 274 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  39 /* page 272 */,
-  40 /* page 273 */,
-  41 /* page 274 */,
-  0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  42 /* page 276 */,
-  0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  43 /* page 278 */,
-  44 /* page 279 */,
-  45 /* page 280 */,
+  43 /* page 276 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
+  44 /* page 278 */,
+  45 /* page 279 */,
+  46 /* page 280 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  46 /* page 284 */,
-  47 /* page 285 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
+  47 /* page 284 */,
+  48 /* page 285 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
@@ -16345,11 +16972,12 @@ static const gint16 attr_table_part1[763] = {
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  48 /* page 362 */,
-  49 /* page 363 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
+  49 /* page 362 */,
+  50 /* page 363 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
+  51 /* page 366 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
@@ -16454,7 +17082,7 @@ static const gint16 attr_table_part1[763] = {
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  50 /* page 471 */,
+  52 /* page 471 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
@@ -16472,7 +17100,7 @@ static const gint16 attr_table_part1[763] = {
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  51 /* page 489 */,
+  53 /* page 489 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
@@ -17979,7 +18607,7 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0x3000, 0x303E},
 {0x3041, 0x3096},
 {0x3099, 0x30FF},
-{0x3105, 0x312E},
+{0x3105, 0x312F},
 {0x3131, 0x318E},
 {0x3190, 0x31BA},
 {0x31C0, 0x31E3},
@@ -17999,7 +18627,7 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0xFF01, 0xFF60},
 {0xFFE0, 0xFFE6},
 {0x16FE0, 0x16FE1},
-{0x17000, 0x187EC},
+{0x17000, 0x187F1},
 {0x18800, 0x18AF2},
 {0x1B000, 0x1B11E},
 {0x1B170, 0x1B2FB},
@@ -18034,13 +18662,15 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0x1F6CC, 0x1F6CC},
 {0x1F6D0, 0x1F6D2},
 {0x1F6EB, 0x1F6EC},
-{0x1F6F4, 0x1F6F8},
+{0x1F6F4, 0x1F6F9},
 {0x1F910, 0x1F93E},
-{0x1F940, 0x1F94C},
-{0x1F950, 0x1F96B},
-{0x1F980, 0x1F997},
-{0x1F9C0, 0x1F9C0},
-{0x1F9D0, 0x1F9E6},
+{0x1F940, 0x1F970},
+{0x1F973, 0x1F976},
+{0x1F97A, 0x1F97A},
+{0x1F97C, 0x1F9A2},
+{0x1F9B0, 0x1F9B9},
+{0x1F9C0, 0x1F9C2},
+{0x1F9D0, 0x1F9FF},
 {0x20000, 0x2FFFD},
 {0x30000, 0x3FFFD},
 };
diff --git a/glib/gunicode.h b/glib/gunicode.h
index e6934d2b7..481bc5212 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -415,6 +415,13 @@ typedef enum
  * @G_UNICODE_SCRIPT_NUSHU:                Nushu. Since: 2.54
  * @G_UNICODE_SCRIPT_SOYOMBO:              Soyombo. Since: 2.54
  * @G_UNICODE_SCRIPT_ZANABAZAR_SQUARE:     Zanabazar Square. Since: 2.54
+ * @G_UNICODE_SCRIPT_DOGRA:                Dogra. Since: 2.58
+ * @G_UNICODE_SCRIPT_GUNJALA_GONDI:        Gunjala Gondi. Since: 2.58
+ * @G_UNICODE_SCRIPT_HANIFI_ROHINGYA:      Hanifi Rohingya. Since: 2.58
+ * @G_UNICODE_SCRIPT_MAKASAR:              Makasar. Since: 2.58
+ * @G_UNICODE_SCRIPT_MEDEFAIDRIN:          Medefaidrin. Since: 2.58
+ * @G_UNICODE_SCRIPT_OLD_SOGDIAN:          Old Sogdian. Since: 2.58
+ * @G_UNICODE_SCRIPT_SOGDIAN:              Sogdian. Since: 2.58
  *
  * The #GUnicodeScript enumeration identifies different writing
  * systems. The values correspond to the names as defined in the
@@ -591,7 +598,16 @@ typedef enum
   G_UNICODE_SCRIPT_MASARAM_GONDI,          /* Gonm */
   G_UNICODE_SCRIPT_NUSHU,                  /* Nshu */
   G_UNICODE_SCRIPT_SOYOMBO,                /* Soyo */
-  G_UNICODE_SCRIPT_ZANABAZAR_SQUARE        /* Zanb */
+  G_UNICODE_SCRIPT_ZANABAZAR_SQUARE,       /* Zanb */
+
+  /* Unicode 11.0 additions */
+  G_UNICODE_SCRIPT_DOGRA,                  /* Dogr */
+  G_UNICODE_SCRIPT_GUNJALA_GONDI,          /* Gong */
+  G_UNICODE_SCRIPT_HANIFI_ROHINGYA,        /* Rohg */
+  G_UNICODE_SCRIPT_MAKASAR,                /* Maka */
+  G_UNICODE_SCRIPT_MEDEFAIDRIN,            /* Medf */
+  G_UNICODE_SCRIPT_OLD_SOGDIAN,            /* Sogo */
+  G_UNICODE_SCRIPT_SOGDIAN                 /* Sogd */
 } GUnicodeScript;
 
 GLIB_AVAILABLE_IN_ALL
diff --git a/glib/gunidecomp.h b/glib/gunidecomp.h
index ab9f63d39..02f2c9191 100644
--- a/glib/gunidecomp.h
+++ b/glib/gunidecomp.h
@@ -83,7 +83,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230, 230, 230, 
-    220, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    220, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0
   },
   { /* page 8, index 5 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 
@@ -95,7 +95,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230, 230, 230, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 230, 230, 230, 230, 230, 230, 230, 
     230, 230, 230, 230, 230, 230, 230, 0, 220, 230, 230, 220, 230, 230, 220, 
     230, 230, 230, 220, 220, 220, 27, 28, 29, 230, 230, 230, 220, 230, 230, 
     220, 220, 230, 230, 230, 230, 230
@@ -111,7 +111,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 0
   },
   { /* page 10, index 7 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -513,7 +513,33 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 220, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 272, index 37 */
+  { /* page 269, index 37 */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  },
+  { /* page 271, index 38 */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 
+    220, 230, 230, 230, 220, 230, 220, 220, 220, 220, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  },
+  { /* page 272, index 39 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 
@@ -526,7 +552,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 273, index 38 */
+  { /* page 273, index 40 */
     230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -539,7 +565,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 274, index 39 */
+  { /* page 274, index 41 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -552,10 +578,10 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 275, index 40 */
+  { /* page 275, index 42 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230, 230, 230, 0, 0, 0, 230, 230, 
     230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -565,11 +591,11 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 276, index 41 */
+  { /* page 276, index 43 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 7, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -578,7 +604,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 277, index 42 */
+  { /* page 277, index 44 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -591,7 +617,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 278, index 43 */
+  { /* page 278, index 45 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -604,7 +630,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 279, index 44 */
+  { /* page 279, index 46 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -617,7 +643,20 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 282, index 45 */
+  { /* page 280, index 47 */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  },
+  { /* page 282, index 48 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 
@@ -630,7 +669,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 284, index 46 */
+  { /* page 284, index 49 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -643,20 +682,20 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 285, index 47 */
+  { /* page 285, index 50 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 9, 9, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 362, index 48 */
+  { /* page 362, index 51 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -669,7 +708,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 363, index 49 */
+  { /* page 363, index 52 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     230, 230, 230, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -682,7 +721,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 444, index 50 */
+  { /* page 444, index 53 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -695,7 +734,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 465, index 51 */
+  { /* page 465, index 54 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -709,7 +748,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 466, index 52 */
+  { /* page 466, index 55 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 0, 
@@ -722,7 +761,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 480, index 53 */
+  { /* page 480, index 56 */
     230, 230, 230, 230, 230, 230, 230, 0, 230, 230, 230, 230, 230, 230, 230, 
     230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 0, 0, 230, 230, 230, 
     230, 230, 230, 230, 0, 230, 230, 0, 230, 230, 230, 230, 230, 0, 0, 0, 0, 
@@ -736,7 +775,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 488, index 54 */
+  { /* page 488, index 57 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -749,7 +788,7 @@ static const guchar cclass_data[][256] = {
     220, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 489, index 55 */
+  { /* page 489, index 58 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 230, 
@@ -1034,23 +1073,23 @@ static const gint16 combining_class_table_part1[763] = {
   36 /* page 266 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  37 /* page 269 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  38 /* page 271 */,
+  39 /* page 272 */,
+  40 /* page 273 */,
+  41 /* page 274 */,
+  42 /* page 275 */,
+  43 /* page 276 */,
+  44 /* page 277 */,
+  45 /* page 278 */,
+  46 /* page 279 */,
+  47 /* page 280 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  48 /* page 282 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  37 /* page 272 */,
-  38 /* page 273 */,
-  39 /* page 274 */,
-  40 /* page 275 */,
-  41 /* page 276 */,
-  42 /* page 277 */,
-  43 /* page 278 */,
-  44 /* page 279 */,
-  0 + G_UNICODE_MAX_TABLE_INDEX,
-  0 + G_UNICODE_MAX_TABLE_INDEX,
-  45 /* page 282 */,
-  0 + G_UNICODE_MAX_TABLE_INDEX,
-  46 /* page 284 */,
-  47 /* page 285 */,
+  49 /* page 284 */,
+  50 /* page 285 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1127,8 +1166,8 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  48 /* page 362 */,
-  49 /* page 363 */,
+  51 /* page 362 */,
+  52 /* page 363 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1209,7 +1248,7 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  50 /* page 444 */,
+  53 /* page 444 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1230,8 +1269,8 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  51 /* page 465 */,
-  52 /* page 466 */,
+  54 /* page 465 */,
+  55 /* page 466 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1245,7 +1284,7 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  53 /* page 480 */,
+  56 /* page 480 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1253,8 +1292,8 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  54 /* page 488 */,
-  55 /* page 489 */,
+  57 /* page 488 */,
+  58 /* page 489 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 63e7ba531..793103182 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -1440,6 +1440,15 @@ static const guint32 iso15924_tags[] =
     PACK ('N','s','h','u'), /* G_UNICODE_SCRIPT_NUSHU */
     PACK ('S','o','y','o'), /* G_UNICODE_SCRIPT_SOYOMBO */
     PACK ('Z','a','n','b'), /* G_UNICODE_SCRIPT_ZANABAZAR_SQUARE */
+
+  /* Unicode 11.0 additions */
+    PACK ('D','o','g','r'), /* G_UNICODE_SCRIPT_DOGRA */
+    PACK ('G','o','n','g'), /* G_UNICODE_SCRIPT_GUNJALA_GONDI */
+    PACK ('R','o','h','g'), /* G_UNICODE_SCRIPT_HANIFI_ROHINGYA */
+    PACK ('M','a','k','a'), /* G_UNICODE_SCRIPT_MAKASAR */
+    PACK ('M','e','d','f'), /* G_UNICODE_SCRIPT_MEDEFAIDRIN */
+    PACK ('S','o','g','o'), /* G_UNICODE_SCRIPT_OLD_SOGDIAN */
+    PACK ('S','o','g','d'), /* G_UNICODE_SCRIPT_SOGDIAN */
 #undef PACK
 };
 
diff --git a/glib/gutils.c b/glib/gutils.c
index 5813b2281..2b750aba9 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -50,6 +50,9 @@
 #ifdef HAVE_CRT_EXTERNS_H 
 #include <crt_externs.h> /* for _NSGetEnviron */
 #endif
+#ifdef HAVE_SYS_AUXV_H
+#include <sys/auxv.h>
+#endif
 
 #include "glib-init.h"
 #include "glib-private.h"
@@ -2495,22 +2498,21 @@ const gchar *g_get_tmp_dir_utf8 (void) { return g_get_tmp_dir (); }
 
 /* Private API:
  *
- * Returns %TRUE if the current process was executed as setuid (or an
- * equivalent __libc_enable_secure is available).  See:
- * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html
+ * Returns %TRUE if the current process was executed as setuid
  */ 
 gboolean
 g_check_setuid (void)
 {
-  /* TODO: get __libc_enable_secure exported from glibc.
-   * See http://www.openwall.com/lists/owl-dev/2012/08/14/1
-   */
-#if 0 && defined(HAVE_LIBC_ENABLE_SECURE)
-  {
-    /* See glibc/include/unistd.h */
-    extern int __libc_enable_secure;
-    return __libc_enable_secure;
-  }
+#if defined(HAVE_SYS_AUXV_H)
+  unsigned long value;
+  int errsv;
+
+  errno = 0;
+  value = getauxval (AT_SECURE);
+  errsv = errno;
+  if (errsv)
+    g_error ("getauxval () failed: %s", g_strerror (errsv));
+  return value;
 #elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__)
   /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */
 
diff --git a/glib/gutils.h b/glib/gutils.h
index 333e2c5a4..84c0f4f20 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -83,7 +83,7 @@ GLIB_AVAILABLE_IN_ALL
 const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
 #endif
 
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
+#if defined (G_OS_WIN32) && defined (G_CAN_INLINE)
 /* This function is not part of the public GLib API either. Just call
  * g_get_system_data_dirs() in your code, never mind that that is
  * actually a macro and you will in fact call this inline function.
diff --git a/gmodule/gmoduleconf.h.win32 b/glib/gvalgrind.h
index 478365382..053c75a98 100644
--- a/gmodule/gmoduleconf.h.win32
+++ b/glib/gvalgrind.h
@@ -1,5 +1,5 @@
-/* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998 Tim Janik
+/*
+ * Copyright 2018 Collabora ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -13,27 +13,20 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Xavier Claessens <xavier.claessens@collabora.com>
  */
-#ifndef __G_MODULE_CONF_H__
-#define __G_MODULE_CONF_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define	G_MODULE_IMPL_NONE	0
-#define	G_MODULE_IMPL_DL	1
-#define	G_MODULE_IMPL_WIN32	3
-#define	G_MODULE_IMPL_DYLD	6
 
-#define	G_MODULE_IMPL		G_MODULE_IMPL_WIN32
-#undef	G_MODULE_HAVE_DLERROR
+#ifndef __G_VALGRIND_H__
+#define __G_VALGRIND_H__
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
+#ifndef _MSC_VER
+#include "valgrind.h"
+#define ENABLE_VALGRIND 1
+#endif
 
-#endif /* __G_MODULE_CONF_H__ */
+#endif /* __G_VALGRIND_H__ */
diff --git a/glib/gvariant.c b/glib/gvariant.c
index d4bd8f289..5c2e801cb 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -399,11 +399,11 @@ g_variant_get_boolean (GVariant *value)
  * It is an error to call this function with a @value of any type
  * other than %G_VARIANT_TYPE_BYTE.
  *
- * Returns: a #guchar
+ * Returns: a #guint8
  *
  * Since: 2.24
  **/
-NUMERIC_TYPE (BYTE, byte, guchar)
+NUMERIC_TYPE (BYTE, byte, guint8)
 
 /**
  * g_variant_new_int16:
@@ -1122,7 +1122,7 @@ g_variant_lookup_value (GVariant           *dictionary,
  * the appropriate type:
  * - %G_VARIANT_TYPE_INT16 (etc.): #gint16 (etc.)
  * - %G_VARIANT_TYPE_BOOLEAN: #guchar (not #gboolean!)
- * - %G_VARIANT_TYPE_BYTE: #guchar
+ * - %G_VARIANT_TYPE_BYTE: #guint8
  * - %G_VARIANT_TYPE_HANDLE: #guint32
  * - %G_VARIANT_TYPE_FLOAT: #gfloat
  * - %G_VARIANT_TYPE_DOUBLE: #gdouble
@@ -1382,10 +1382,10 @@ g_variant_new_object_path (const gchar *object_path)
  * should ensure that a string is a valid D-Bus object path before
  * passing it to g_variant_new_object_path().
  *
- * A valid object path starts with '/' followed by zero or more
- * sequences of characters separated by '/' characters.  Each sequence
- * must contain only the characters "[A-Z][a-z][0-9]_".  No sequence
- * (including the one following the final '/' character) may be empty.
+ * A valid object path starts with `/` followed by zero or more
+ * sequences of characters separated by `/` characters.  Each sequence
+ * must contain only the characters `[A-Z][a-z][0-9]_`.  No sequence
+ * (including the one following the final `/` character) may be empty.
  *
  * Returns: %TRUE if @string is a D-Bus object path
  *
@@ -4793,10 +4793,13 @@ g_variant_valist_new_nnp (const gchar **str,
           type = g_variant_type_element (type);
 
           if G_UNLIKELY (!g_variant_type_is_subtype_of (type, (GVariantType *) *str))
-            g_error ("g_variant_new: expected GVariantBuilder array element "
-                     "type '%s' but the built value has element type '%s'",
-                     g_variant_type_dup_string ((GVariantType *) *str),
-                     g_variant_get_type_string (value) + 1);
+            {
+              gchar *type_string = g_variant_type_dup_string ((GVariantType *) *str);
+              g_error ("g_variant_new: expected GVariantBuilder array element "
+                       "type '%s' but the built value has element type '%s'",
+                       type_string, g_variant_get_type_string (value) + 1);
+              g_free (type_string);
+            }
 
           g_variant_type_string_scan (*str, NULL, str);
 
@@ -4858,10 +4861,13 @@ g_variant_valist_new_nnp (const gchar **str,
 
     case '@':
       if G_UNLIKELY (!g_variant_is_of_type (ptr, (GVariantType *) *str))
-        g_error ("g_variant_new: expected GVariant of type '%s' but "
-                 "received value has type '%s'",
-                 g_variant_type_dup_string ((GVariantType *) *str),
-                 g_variant_get_type_string (ptr));
+        {
+          gchar *type_string = g_variant_type_dup_string ((GVariantType *) *str);
+          g_error ("g_variant_new: expected GVariant of type '%s' but "
+                   "received value has type '%s'",
+                   type_string, g_variant_get_type_string (ptr));
+          g_free (type_string);
+        }
 
       g_variant_type_string_scan (*str, NULL, str);
 
@@ -5102,7 +5108,7 @@ g_variant_valist_get_leaf (const gchar **str,
           return;
 
         case 'y':
-          *(guchar *) ptr = g_variant_get_byte (value);
+          *(guint8 *) ptr = g_variant_get_byte (value);
           return;
 
         case 'n':
@@ -5147,7 +5153,7 @@ g_variant_valist_get_leaf (const gchar **str,
       switch (*(*str)++)
         {
         case 'y':
-          *(guchar *) ptr = 0;
+          *(guint8 *) ptr = 0;
           return;
 
         case 'n':
diff --git a/glib/gvariant.h b/glib/gvariant.h
index e1f18cdfa..5f122c678 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -81,7 +81,7 @@ GVariantClass                   g_variant_classify                      (GVarian
 GLIB_AVAILABLE_IN_ALL
 GVariant *                      g_variant_new_boolean                   (gboolean              value);
 GLIB_AVAILABLE_IN_ALL
-GVariant *                      g_variant_new_byte                      (guchar                value);
+GVariant *                      g_variant_new_byte                      (guint8                value);
 GLIB_AVAILABLE_IN_ALL
 GVariant *                      g_variant_new_int16                     (gint16                value);
 GLIB_AVAILABLE_IN_ALL
@@ -136,7 +136,7 @@ GVariant *                      g_variant_new_fixed_array               (const G
 GLIB_AVAILABLE_IN_ALL
 gboolean                        g_variant_get_boolean                   (GVariant             *value);
 GLIB_AVAILABLE_IN_ALL
-guchar                          g_variant_get_byte                      (GVariant             *value);
+guint8                          g_variant_get_byte                      (GVariant             *value);
 GLIB_AVAILABLE_IN_ALL
 gint16                          g_variant_get_int16                     (GVariant             *value);
 GLIB_AVAILABLE_IN_ALL
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index b52c56e99..2d266a884 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -1057,7 +1057,7 @@ g_variant_type_new_tuple_slow (const GVariantType * const *items,
    * happen only in truly insane code, so it can be slow.
    */
   GString *string;
-  gsize i;
+  gint i;
 
   string = g_string_new ("(");
   for (i = 0; i < length; i++)
@@ -1083,16 +1083,19 @@ g_variant_type_new_tuple (const GVariantType * const *items,
   char buffer[1024];
   gsize offset;
   gsize i;
+  gsize length_unsigned;
 
   g_return_val_if_fail (length == 0 || items != NULL, NULL);
 
   if (length < 0)
-    for (length = 0; items[length] != NULL; length++);
+    for (length_unsigned = 0; items[length_unsigned] != NULL; length_unsigned++);
+  else
+    length_unsigned = (gsize) length;
 
   offset = 0;
   buffer[offset++] = '(';
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length_unsigned; i++)
     {
       const GVariantType *type;
       gsize size;
@@ -1103,7 +1106,7 @@ g_variant_type_new_tuple (const GVariantType * const *items,
       size = g_variant_type_get_string_length (type);
 
       if (offset + size >= sizeof buffer) /* leave room for ')' */
-        return g_variant_type_new_tuple_slow (items, length);
+        return g_variant_type_new_tuple_slow (items, length_unsigned);
 
       memcpy (&buffer[offset], type, size);
       offset += size;
diff --git a/glib/gwin32.c b/glib/gwin32.c
index a176514b1..8a7ab3aeb 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #define STRICT			/* Strict typing, please */
 #include <windows.h>
@@ -68,6 +69,7 @@
 
 #include "glib.h"
 #include "gthreadprivate.h"
+#include "glib-init.h"
 
 #ifdef G_WITH_CYGWIN
 #include <sys/cygwin.h>
@@ -804,3 +806,216 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 #endif
+
+#ifdef G_OS_WIN32
+
+/* This function looks up two environment
+ * variables, G_WIN32_ALLOC_CONSOLE and G_WIN32_ATTACH_CONSOLE.
+ * G_WIN32_ALLOC_CONSOLE, if set to 1, makes the process
+ * call AllocConsole(). This is useful for binaries that
+ * are compiled to run without automatically-allocated console
+ * (like most GUI applications).
+ * G_WIN32_ATTACH_CONSOLE, if set to a comma-separated list
+ * of one or more strings "stdout", "stdin" and "stderr",
+ * makes the process reopen the corresponding standard streams
+ * to ensure that they are attached to the files that
+ * GetStdHandle() returns, which, hopefully, would be
+ * either a file handle or a console handle.
+ *
+ * This function is called automatically when glib DLL is
+ * attached to a process, from DllMain().
+ */
+void
+g_console_win32_init (void)
+{
+  struct
+    {
+      gboolean     redirect;
+      FILE        *stream;
+      const gchar *stream_name;
+      DWORD        std_handle_type;
+      int          flags;
+      const gchar *mode;
+    }
+  streams[] =
+    {
+      { FALSE, stdin, "stdin", STD_INPUT_HANDLE, _O_RDONLY, "rb" },
+      { FALSE, stdout, "stdout", STD_OUTPUT_HANDLE, 0, "wb" },
+      { FALSE, stderr, "stderr", STD_ERROR_HANDLE, 0, "wb" },
+    };
+
+  const gchar  *attach_envvar;
+  guint         i;
+  gchar       **attach_strs;
+
+  /* Note: it's not a very good practice to use DllMain()
+   * to call any functions not in Kernel32.dll.
+   * The following only works if there are no weird
+   * circular DLL dependencies that could cause glib DllMain()
+   * to be called before CRT DllMain().
+   */
+
+  if (g_strcmp0 (g_getenv ("G_WIN32_ALLOC_CONSOLE"), "1") == 0)
+    AllocConsole (); /* no error handling, fails if console already exists */
+
+  attach_envvar = g_getenv ("G_WIN32_ATTACH_CONSOLE");
+
+  if (attach_envvar == NULL)
+    return;
+
+  /* Re-use parent console, if we don't have our own.
+   * If we do, it will fail, so just ignore the error.
+   */
+  AttachConsole (ATTACH_PARENT_PROCESS);
+
+  attach_strs = g_strsplit (attach_envvar, ",", -1);
+
+  for (i = 0; attach_strs[i]; i++)
+    {
+      if (g_strcmp0 (attach_strs[i], "stdout") == 0)
+        streams[1].redirect = TRUE;
+      else if (g_strcmp0 (attach_strs[i], "stderr") == 0)
+        streams[2].redirect = TRUE;
+      else if (g_strcmp0 (attach_strs[i], "stdin") == 0)
+        streams[0].redirect = TRUE;
+      else
+        g_warning ("Unrecognized stream name %s", attach_strs[i]);
+    }
+
+  g_strfreev (attach_strs);
+
+  for (i = 0; i < G_N_ELEMENTS (streams); i++)
+    {
+      int          old_fd;
+      int          backup_fd;
+      int          new_fd;
+      int          preferred_fd = i;
+      HANDLE       std_handle;
+      errno_t      errsv = 0;
+
+      if (!streams[i].redirect)
+        continue;
+
+      if (ferror (streams[i].stream) != 0)
+        {
+          g_warning ("Stream %s is in error state", streams[i].stream_name);
+          continue;
+        }
+
+      std_handle = GetStdHandle (streams[i].std_handle_type);
+
+      if (std_handle == INVALID_HANDLE_VALUE)
+        {
+          DWORD gle = GetLastError ();
+          g_warning ("Standard handle for %s can't be obtained: %lu",
+                     streams[i].stream_name, gle);
+          continue;
+        }
+
+      old_fd = fileno (streams[i].stream);
+
+      /* We need the stream object to be associated with
+       * any valid integer fd for the code to work.
+       * If it isn't, reopen it with NUL (/dev/null) to
+       * ensure that it is.
+       */
+      if (old_fd < 0)
+        {
+          if (freopen ("NUL", streams[i].mode, streams[i].stream) == NULL)
+            {
+              errsv = errno;
+              g_warning ("Failed to redirect %s: %d - %s",
+                         streams[i].stream_name,
+                         errsv,
+                         strerror (errsv));
+              continue;
+            }
+
+          old_fd = fileno (streams[i].stream);
+
+          if (old_fd < 0)
+            {
+              g_warning ("Stream %s does not have a valid fd",
+                         streams[i].stream_name);
+              continue;
+            }
+        }
+
+      new_fd = _open_osfhandle ((intptr_t) std_handle, streams[i].flags);
+
+      if (new_fd < 0)
+        {
+          g_warning ("Failed to create new fd for stream %s",
+                     streams[i].stream_name);
+          continue;
+        }
+
+      backup_fd = dup (old_fd);
+
+      if (backup_fd < 0)
+        g_warning ("Failed to backup old fd %d for stream %s",
+                   old_fd, streams[i].stream_name);
+
+      errno = 0;
+
+      /* Force old_fd to be associated with the same file
+       * as new_fd, i.e with the standard handle we need
+       * (or, rather, with the same kernel object; handle
+       * value will be different, but the kernel object
+       * won't be).
+       */
+      /* NOTE: MSDN claims that _dup2() returns 0 on success and -1 on error,
+       * POSIX claims that dup2() reurns new FD on success and -1 on error.
+       * The "< 0" check satisfies the error condition for either implementation.
+       */
+      if (_dup2 (new_fd, old_fd) < 0)
+        {
+          errsv = errno;
+          g_warning ("Failed to substitute fd %d for stream %s: %d : %s",
+                     old_fd, streams[i].stream_name, errsv, strerror (errsv));
+
+          _close (new_fd);
+
+          if (backup_fd < 0)
+            continue;
+
+          errno = 0;
+
+          /* Try to restore old_fd back to its previous
+           * handle, in case the _dup2() call above succeeded partially.
+           */
+          if (_dup2 (backup_fd, old_fd) < 0)
+            {
+              errsv = errno;
+              g_warning ("Failed to restore fd %d for stream %s: %d : %s",
+                         old_fd, streams[i].stream_name, errsv, strerror (errsv));
+            }
+
+          _close (backup_fd);
+
+          continue;
+        }
+
+      /* Success, drop the backup */
+      if (backup_fd >= 0)
+        _close (backup_fd);
+
+      /* Sadly, there's no way to check that preferred_fd
+       * is currently valid, so we can't back it up.
+       * Doing operations on invalid FDs invokes invalid
+       * parameter handler, which is bad for us.
+       */
+      if (old_fd != preferred_fd)
+        /* This extra code will also try to ensure that
+         * the expected file descriptors 0, 1 and 2 are
+         * associated with the appropriate standard
+         * handles.
+         */
+        if (_dup2 (new_fd, preferred_fd) < 0)
+          g_warning ("Failed to dup fd %d into fd %d", new_fd, preferred_fd);
+
+      _close (new_fd);
+    }
+}
+
+#endif
diff --git a/glib/meson.build b/glib/meson.build
index 1010f5d92..c05c69406 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -76,6 +76,9 @@ glib_sub_headers = files(
   'gquark.h',
   'gqueue.h',
   'grand.h',
+  'grcbox.h',
+  'grefcount.h',
+  'grefstring.h',
   'gregex.h',
   'gscanner.h',
   'gsequence.h',
@@ -117,6 +120,7 @@ deprecated_sources = files(
 )
 
 glib_sources = files(
+  'garcbox.c',
   'garray.c',
   'gasyncqueue.c',
   'gatomic.c',
@@ -159,6 +163,9 @@ glib_sources = files(
   'gquark.c',
   'gqueue.c',
   'grand.c',
+  'grcbox.c',
+  'grefcount.c',
+  'grefstring.c',
   'gregex.c',
   'gscanner.c',
   'gsequence.c',
@@ -327,7 +334,4 @@ if enable_systemtap
     install : true)
 endif
 
-# gtester doesn't work on native windows
-if cc.get_id() != 'msvc'
-  subdir('tests')
-endif
+subdir('tests')
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 7289b419e..2a53ae6fd 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -89,7 +89,9 @@ test_programs = \
 	protocol			\
 	queue				\
 	rand				\
+	rcbox				\
 	rec-mutex			\
+	refstring			\
 	regex				\
 	rwlock				\
 	scannerapi			\
@@ -141,6 +143,27 @@ dist_test_data += \
 	bookmarks/fail-15.xbel \
 	bookmarks/fail-16.xbel \
 	bookmarks/fail-17.xbel \
+	bookmarks/fail-18.xbel \
+	bookmarks/fail-19.xbel \
+	bookmarks/fail-20.xbel \
+	bookmarks/fail-21.xbel \
+	bookmarks/fail-22.xbel \
+	bookmarks/fail-23.xbel \
+	bookmarks/fail-24.xbel \
+	bookmarks/fail-25.xbel \
+	bookmarks/fail-26.xbel \
+	bookmarks/fail-27.xbel \
+	bookmarks/fail-28.xbel \
+	bookmarks/fail-29.xbel \
+	bookmarks/fail-30.xbel \
+	bookmarks/fail-31.xbel \
+	bookmarks/fail-32.xbel \
+	bookmarks/fail-33.xbel \
+	bookmarks/fail-34.xbel \
+	bookmarks/fail-35.xbel \
+	bookmarks/fail-36.xbel \
+	bookmarks/fail-37.xbel \
+	bookmarks/fail-38.xbel \
 	bookmarks/valid-01.xbel \
 	bookmarks/valid-02.xbel \
 	bookmarks/valid-03.xbel \
@@ -156,7 +179,8 @@ markup_tests = \
 	fail-31 fail-32 fail-33 fail-34 fail-35 \
 	fail-36 fail-37 fail-38 fail-39 fail-40 \
 	fail-41 fail-42 fail-43 fail-44 fail-45 \
-	fail-46 fail-47 fail-48 fail-49 \
+	fail-46 fail-47 fail-48 fail-49 fail-50 \
+	fail-51 \
 	valid-1 valid-2 valid-3 valid-4 valid-5 \
 	valid-6 valid-7 valid-8 valid-9 valid-10 \
 	valid-11 valid-12 valid-13 valid-14 valid-15 \
diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c
index 8c0872aef..e0a6109eb 100644
--- a/glib/tests/array-test.c
+++ b/glib/tests/array-test.c
@@ -30,6 +30,42 @@
 #include <string.h>
 #include "glib.h"
 
+/* Test data to be passed to any function which calls g_array_new(), providing
+ * the parameters for that call. Most #GArray tests should be repeated for all
+ * possible values of #ArrayTestData. */
+typedef struct
+{
+  gboolean zero_terminated;
+  gboolean clear_;
+} ArrayTestData;
+
+/* Assert that @garray contains @n_expected_elements as given in @expected_data.
+ * @garray must contain #gint elements. */
+static void
+assert_int_array_equal (GArray     *garray,
+                        const gint *expected_data,
+                        gsize       n_expected_elements)
+{
+  gsize i;
+
+  g_assert_cmpuint (garray->len, ==, n_expected_elements);
+  for (i = 0; i < garray->len; i++)
+    g_assert_cmpint (g_array_index (garray, gint, i), ==, expected_data[i]);
+}
+
+/* Iff config->zero_terminated is %TRUE, assert that the final element of
+ * @garray is zero. @garray must contain #gint elements. */
+static void
+assert_int_array_zero_terminated (const ArrayTestData *config,
+                                  GArray              *garray)
+{
+  if (config->zero_terminated)
+    {
+      gint *data = (gint *) garray->data;
+      g_assert_cmpint (data[garray->len], ==, 0);
+    }
+}
+
 static void
 sum_up (gpointer data,
 	gpointer user_data)
@@ -42,38 +78,46 @@ sum_up (gpointer data,
 /* Check that expanding an array with g_array_set_size() clears the new elements
  * if @clear_ was specified during construction. */
 static void
-array_new_cleared (void)
+array_set_size (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gsize i;
 
-  garray = g_array_new (FALSE, TRUE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   g_assert_cmpuint (garray->len, ==, 0);
+  assert_int_array_zero_terminated (config, garray);
 
   g_array_set_size (garray, 5);
   g_assert_cmpuint (garray->len, ==, 5);
+  assert_int_array_zero_terminated (config, garray);
 
-  for (i = 0; i < 5; i++)
-    g_assert_cmpint (g_array_index (garray, gint, i), ==, 0);
+  if (config->clear_)
+    for (i = 0; i < 5; i++)
+      g_assert_cmpint (g_array_index (garray, gint, i), ==, 0);
 
   g_array_unref (garray);
 }
 
-/* As with array_new_cleared(), but with a sized array. */
+/* As with array_set_size(), but with a sized array. */
 static void
-array_new_sized_cleared (void)
+array_set_size_sized (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gsize i;
 
-  garray = g_array_sized_new (FALSE, TRUE, sizeof (gint), 10);
+  garray = g_array_sized_new (config->zero_terminated, config->clear_, sizeof (gint), 10);
   g_assert_cmpuint (garray->len, ==, 0);
+  assert_int_array_zero_terminated (config, garray);
 
   g_array_set_size (garray, 5);
   g_assert_cmpuint (garray->len, ==, 5);
+  assert_int_array_zero_terminated (config, garray);
 
-  for (i = 0; i < 5; i++)
-    g_assert_cmpint (g_array_index (garray, gint, i), ==, 0);
+  if (config->clear_)
+    for (i = 0; i < 5; i++)
+      g_assert_cmpint (g_array_index (garray, gint, i), ==, 0);
 
   g_array_unref (garray);
 }
@@ -97,16 +141,20 @@ array_new_zero_terminated (void)
   g_free (out_str);
 }
 
+/* Check that g_array_append_val() works correctly for various #GArray
+ * configurations. */
 static void
-array_append (void)
+array_append_val (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
   gint *segment;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 10000; i++)
     g_array_append_val (garray, i);
+  assert_int_array_zero_terminated (config, garray);
 
   for (i = 0; i < 10000; i++)
     g_assert_cmpint (g_array_index (garray, gint, i), ==, i);
@@ -114,18 +162,25 @@ array_append (void)
   segment = (gint*)g_array_free (garray, FALSE);
   for (i = 0; i < 10000; i++)
     g_assert_cmpint (segment[i], ==, i);
+  if (config->zero_terminated)
+    g_assert_cmpint (segment[10000], ==, 0);
+
   g_free (segment);
 }
 
+/* Check that g_array_prepend_val() works correctly for various #GArray
+ * configurations. */
 static void
-array_prepend (void)
+array_prepend_val (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 100; i++)
     g_array_prepend_val (garray, i);
+  assert_int_array_zero_terminated (config, garray);
 
   for (i = 0; i < 100; i++)
     g_assert_cmpint (g_array_index (garray, gint, i), ==, (100 - i - 1));
@@ -133,16 +188,141 @@ array_prepend (void)
   g_array_free (garray, TRUE);
 }
 
+/* Test that g_array_prepend_vals() works correctly with various array
+ * configurations. */
+static void
+array_prepend_vals (gconstpointer test_data)
+{
+  const ArrayTestData *config = test_data;
+  GArray *garray, *garray_out;
+  const gint vals[] = { 0, 1, 2, 3, 4 };
+  const gint expected_vals1[] = { 0, 1 };
+  const gint expected_vals2[] = { 2, 0, 1 };
+  const gint expected_vals3[] = { 3, 4, 2, 0, 1 };
+
+  /* Set up an array. */
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Prepend several values to an empty array. */
+  garray_out = g_array_prepend_vals (garray, vals, 2);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals1, G_N_ELEMENTS (expected_vals1));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Prepend a single value. */
+  garray_out = g_array_prepend_vals (garray, vals + 2, 1);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals2, G_N_ELEMENTS (expected_vals2));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Prepend several values to a non-empty array. */
+  garray_out = g_array_prepend_vals (garray, vals + 3, 2);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals3, G_N_ELEMENTS (expected_vals3));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Prepend no values. */
+  garray_out = g_array_prepend_vals (garray, vals, 0);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals3, G_N_ELEMENTS (expected_vals3));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Prepend no values with %NULL data. */
+  garray_out = g_array_prepend_vals (garray, NULL, 0);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals3, G_N_ELEMENTS (expected_vals3));
+  assert_int_array_zero_terminated (config, garray);
+
+  g_array_free (garray, TRUE);
+}
+
+/* Test that g_array_insert_vals() works correctly with various array
+ * configurations. */
+static void
+array_insert_vals (gconstpointer test_data)
+{
+  const ArrayTestData *config = test_data;
+  GArray *garray, *garray_out;
+  gsize i;
+  const gint vals[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+  const gint expected_vals1[] = { 0, 1 };
+  const gint expected_vals2[] = { 0, 2, 3, 1 };
+  const gint expected_vals3[] = { 0, 2, 3, 1, 4 };
+  const gint expected_vals4[] = { 5, 0, 2, 3, 1, 4 };
+  const gint expected_vals5[] = { 5, 0, 2, 3, 1, 4, 0, 0, 0, 0, 6, 7 };
+
+  /* Set up an array. */
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Insert several values at the beginning. */
+  garray_out = g_array_insert_vals (garray, 0, vals, 2);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals1, G_N_ELEMENTS (expected_vals1));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Insert some more part-way through. */
+  garray_out = g_array_insert_vals (garray, 1, vals + 2, 2);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals2, G_N_ELEMENTS (expected_vals2));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* And at the end. */
+  garray_out = g_array_insert_vals (garray, garray->len, vals + 4, 1);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals3, G_N_ELEMENTS (expected_vals3));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Then back at the beginning again. */
+  garray_out = g_array_insert_vals (garray, 0, vals + 5, 1);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals4, G_N_ELEMENTS (expected_vals4));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Insert zero elements. */
+  garray_out = g_array_insert_vals (garray, 0, vals, 0);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals4, G_N_ELEMENTS (expected_vals4));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Insert zero elements with a %NULL pointer. */
+  garray_out = g_array_insert_vals (garray, 0, NULL, 0);
+  g_assert_true (garray == garray_out);
+  assert_int_array_equal (garray, expected_vals4, G_N_ELEMENTS (expected_vals4));
+  assert_int_array_zero_terminated (config, garray);
+
+  /* Insert some elements off the end of the array. The behaviour here depends
+   * on whether the array clears entries. */
+  garray_out = g_array_insert_vals (garray, garray->len + 4, vals + 6, 2);
+  g_assert_true (garray == garray_out);
+
+  g_assert_cmpuint (garray->len, ==, G_N_ELEMENTS (expected_vals5));
+  for (i = 0; i < G_N_ELEMENTS (expected_vals5); i++)
+    {
+      if (config->clear_ || i < 6 || i > 9)
+        g_assert_cmpint (g_array_index (garray, gint, i), ==, expected_vals5[i]);
+    }
+
+  assert_int_array_zero_terminated (config, garray);
+
+  g_array_free (garray, TRUE);
+}
+
+/* Check that g_array_remove_index() works correctly for various #GArray
+ * configurations. */
 static void
-array_remove (void)
+array_remove_index (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
   gint prev, cur;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 100; i++)
     g_array_append_val (garray, i);
+  assert_int_array_zero_terminated (config, garray);
 
   g_assert_cmpint (garray->len, ==, 100);
 
@@ -152,6 +332,7 @@ array_remove (void)
   g_array_remove_index (garray, 57);
 
   g_assert_cmpint (garray->len, ==, 96);
+  assert_int_array_zero_terminated (config, garray);
 
   prev = -1;
   for (i = 0; i < garray->len; i++)
@@ -165,18 +346,22 @@ array_remove (void)
   g_array_free (garray, TRUE);
 }
 
+/* Check that g_array_remove_index_fast() works correctly for various #GArray
+ * configurations. */
 static void
-array_remove_fast (void)
+array_remove_index_fast (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
   gint prev, cur;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 100; i++)
     g_array_append_val (garray, i);
 
   g_assert_cmpint (garray->len, ==, 100);
+  assert_int_array_zero_terminated (config, garray);
 
   g_array_remove_index_fast (garray, 1);
   g_array_remove_index_fast (garray, 3);
@@ -184,6 +369,7 @@ array_remove_fast (void)
   g_array_remove_index_fast (garray, 57);
 
   g_assert_cmpint (garray->len, ==, 96);
+  assert_int_array_zero_terminated (config, garray);
 
   prev = -1;
   for (i = 0; i < garray->len; i++)
@@ -200,22 +386,27 @@ array_remove_fast (void)
   g_array_free (garray, TRUE);
 }
 
+/* Check that g_array_remove_range() works correctly for various #GArray
+ * configurations. */
 static void
-array_remove_range (void)
+array_remove_range (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
   gint prev, cur;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 100; i++)
     g_array_append_val (garray, i);
 
   g_assert_cmpint (garray->len, ==, 100);
+  assert_int_array_zero_terminated (config, garray);
 
   g_array_remove_range (garray, 31, 4);
 
   g_assert_cmpint (garray->len, ==, 96);
+  assert_int_array_zero_terminated (config, garray);
 
   prev = -1;
   for (i = 0; i < garray->len; i++)
@@ -228,8 +419,15 @@ array_remove_range (void)
 
   /* Ensure the entire array can be cleared, even when empty. */
   g_array_remove_range (garray, 0, garray->len);
+
+  g_assert_cmpint (garray->len, ==, 0);
+  assert_int_array_zero_terminated (config, garray);
+
   g_array_remove_range (garray, 0, garray->len);
 
+  g_assert_cmpint (garray->len, ==, 0);
+  assert_int_array_zero_terminated (config, garray);
+
   g_array_free (garray, TRUE);
 }
 
@@ -277,20 +475,27 @@ int_compare_data (gconstpointer p1, gconstpointer p2, gpointer data)
 
   return *i1 - *i2;
 }
+
+/* Check that g_array_sort() works correctly for various #GArray
+ * configurations. */
 static void
-array_sort (void)
+array_sort (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
   gint prev, cur;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 10000; i++)
     {
       cur = g_random_int_range (0, 10000);
       g_array_append_val (garray, cur);
     }
-  g_array_sort (garray,  int_compare);
+  assert_int_array_zero_terminated (config, garray);
+
+  g_array_sort (garray, int_compare);
+  assert_int_array_zero_terminated (config, garray);
 
   prev = -1;
   for (i = 0; i < garray->len; i++)
@@ -303,20 +508,26 @@ array_sort (void)
   g_array_free (garray, TRUE);
 }
 
+/* Check that g_array_sort_with_data() works correctly for various #GArray
+ * configurations. */
 static void
-array_sort_with_data (void)
+array_sort_with_data (gconstpointer test_data)
 {
+  const ArrayTestData *config = test_data;
   GArray *garray;
   gint i;
   gint prev, cur;
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
   for (i = 0; i < 10000; i++)
     {
       cur = g_random_int_range (0, 10000);
       g_array_append_val (garray, cur);
     }
+  assert_int_array_zero_terminated (config, garray);
+
   g_array_sort_with_data (garray, int_compare_data, NULL);
+  assert_int_array_zero_terminated (config, garray);
 
   prev = -1;
   for (i = 0; i < garray->len; i++)
@@ -993,27 +1204,59 @@ byte_array_free_to_bytes (void)
 
   g_bytes_unref (bytes);
 }
+
+static void
+add_array_test (const gchar         *test_path,
+                const ArrayTestData *config,
+                GTestDataFunc        test_func)
+{
+  gchar *test_name = NULL;
+
+  test_name = g_strdup_printf ("%s/%s-%s",
+                               test_path,
+                               config->zero_terminated ? "zero-terminated" : "non-zero-terminated",
+                               config->clear_ ? "clear" : "no-clear");
+  g_test_add_data_func (test_name, config, test_func);
+  g_free (test_name);
+}
+
 int
 main (int argc, char *argv[])
 {
+  /* Test all possible combinations of g_array_new() parameters. */
+  const ArrayTestData array_configurations[] =
+    {
+      { FALSE, FALSE },
+      { FALSE, TRUE },
+      { TRUE, FALSE },
+      { TRUE, TRUE },
+    };
+  gsize i;
+
   g_test_init (&argc, &argv, NULL);
 
   g_test_bug_base ("https://bugzilla.gnome.org/");
 
   /* array tests */
-  g_test_add_func ("/array/new/cleared", array_new_cleared);
-  g_test_add_func ("/array/new/sized-cleared", array_new_sized_cleared);
   g_test_add_func ("/array/new/zero-terminated", array_new_zero_terminated);
-  g_test_add_func ("/array/append", array_append);
-  g_test_add_func ("/array/prepend", array_prepend);
-  g_test_add_func ("/array/remove", array_remove);
-  g_test_add_func ("/array/remove-fast", array_remove_fast);
-  g_test_add_func ("/array/remove-range", array_remove_range);
   g_test_add_func ("/array/ref-count", array_ref_count);
-  g_test_add_func ("/array/sort", array_sort);
-  g_test_add_func ("/array/sort-with-data", array_sort_with_data);
   g_test_add_func ("/array/clear-func", array_clear_func);
 
+  for (i = 0; i < G_N_ELEMENTS (array_configurations); i++)
+    {
+      add_array_test ("/array/set-size", &array_configurations[i], array_set_size);
+      add_array_test ("/array/set-size/sized", &array_configurations[i], array_set_size_sized);
+      add_array_test ("/array/append-val", &array_configurations[i], array_append_val);
+      add_array_test ("/array/prepend-val", &array_configurations[i], array_prepend_val);
+      add_array_test ("/array/prepend-vals", &array_configurations[i], array_prepend_vals);
+      add_array_test ("/array/insert-vals", &array_configurations[i], array_insert_vals);
+      add_array_test ("/array/remove-index", &array_configurations[i], array_remove_index);
+      add_array_test ("/array/remove-index-fast", &array_configurations[i], array_remove_index_fast);
+      add_array_test ("/array/remove-range", &array_configurations[i], array_remove_range);
+      add_array_test ("/array/sort", &array_configurations[i], array_sort);
+      add_array_test ("/array/sort-with-data", &array_configurations[i], array_sort_with_data);
+    }
+
   /* pointer arrays */
   g_test_add_func ("/pointerarray/add", pointer_array_add);
   g_test_add_func ("/pointerarray/insert", pointer_array_insert);
diff --git a/glib/tests/atomic.c b/glib/tests/atomic.c
index 35fa705a4..2aafe869f 100644
--- a/glib/tests/atomic.c
+++ b/glib/tests/atomic.c
@@ -11,6 +11,11 @@
 
 #include <glib.h>
 
+/* We want the g_atomic_pointer_get() macros to work when compiling third party
+ * projects with -Wbad-function-cast.
+ * See https://gitlab.gnome.org/GNOME/glib/issues/1041. */
+#pragma GCC diagnostic error "-Wbad-function-cast"
+
 static void
 test_types (void)
 {
@@ -191,7 +196,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   g_assert (ip == 0);
 
   g_atomic_pointer_set (&gs, 0);
-  gs2 = (gsize) g_atomic_pointer_get (&gs);
+  vp = g_atomic_pointer_get (&gs);
+  gs2 = (gsize) vp;
   g_assert (gs2 == 0);
   res = g_atomic_pointer_compare_and_exchange (&gs, 0, 0);
   g_assert (res);
diff --git a/glib/tests/autoptr.c b/glib/tests/autoptr.c
index 408f14b6c..5b3bce71c 100644
--- a/glib/tests/autoptr.c
+++ b/glib/tests/autoptr.c
@@ -1,6 +1,12 @@
 #include <glib.h>
 #include <string.h>
 
+typedef struct _HNVC HasNonVoidCleanup;
+HasNonVoidCleanup * non_void_cleanup (HasNonVoidCleanup *);
+
+/* Should not cause any warnings with -Wextra */
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(HasNonVoidCleanup, non_void_cleanup)
+
 static void
 test_autofree (void)
 {
@@ -417,6 +423,13 @@ test_strv (void)
 }
 
 static void
+test_refstring (void)
+{
+  g_autoptr(GRefString) str = g_ref_string_new ("hello, world");
+  g_assert_nonnull (str);
+}
+
+static void
 mark_freed (gpointer ptr)
 {
   gboolean *freed = ptr;
@@ -533,6 +546,7 @@ main (int argc, gchar *argv[])
   g_test_add_func ("/autoptr/g_variant_dict", test_g_variant_dict);
   g_test_add_func ("/autoptr/g_variant_type", test_g_variant_type);
   g_test_add_func ("/autoptr/strv", test_strv);
+  g_test_add_func ("/autoptr/refstring", test_refstring);
   g_test_add_func ("/autoptr/autolist", test_autolist);
   g_test_add_func ("/autoptr/autoslist", test_autoslist);
 
diff --git a/glib/tests/bookmarks/fail-18.xbel b/glib/tests/bookmarks/fail-18.xbel
new file mode 100644
index 000000000..10f3d80fb
--- /dev/null
+++ b/glib/tests/bookmarks/fail-18.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><bookmark:application c=""/><bookmark:application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-19.xbel b/glib/tests/bookmarks/fail-19.xbel
new file mode 100644
index 000000000..ab4edbb8d
--- /dev/null
+++ b/glib/tests/bookmarks/fail-19.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><mime:mime-type></mime:mime-type><bookmark:applications><bookmark:application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-20.xbel b/glib/tests/bookmarks/fail-20.xbel
new file mode 100644
index 000000000..a00e154d8
--- /dev/null
+++ b/glib/tests/bookmarks/fail-20.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<<><>>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-21.xbel b/glib/tests/bookmarks/fail-21.xbel
new file mode 100644
index 000000000..cf7fbf441
--- /dev/null
+++ b/glib/tests/bookmarks/fail-21.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><bookmark:application e=""/><bookmark:application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-22.xbel b/glib/tests/bookmarks/fail-22.xbel
new file mode 100644
index 000000000..abc4cebfe
--- /dev/null
+++ b/glib/tests/bookmarks/fail-22.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><bookmark:application e=""/><bookmark:application name=""exec="">
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-23.xbel b/glib/tests/bookmarks/fail-23.xbel
new file mode 100644
index 000000000..35324addd
--- /dev/null
+++ b/glib/tests/bookmarks/fail-23.xbel
@@ -0,0 +1 @@
+</
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-24.xbel b/glib/tests/bookmarks/fail-24.xbel
new file mode 100644
index 000000000..a8726e66e
--- /dev/null
+++ b/glib/tests/bookmarks/fail-24.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><bookmark:application n=""/><bookmark:application name=""exec="">
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-25.xbel b/glib/tests/bookmarks/fail-25.xbel
new file mode 100644
index 000000000..e9bc439e9
--- /dev/null
+++ b/glib/tests/bookmarks/fail-25.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><bookmark:applications></bookmark:applications><bookmark:groups><bookmark:group><
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-26.xbel b/glib/tests/bookmarks/fail-26.xbel
new file mode 100644
index 000000000..739aca215
--- /dev/null
+++ b/glib/tests/bookmarks/fail-26.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<><>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-27.xbel b/glib/tests/bookmarks/fail-27.xbel
new file mode 100644
index 000000000..e40209515
--- /dev/null
+++ b/glib/tests/bookmarks/fail-27.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"f=""><title><bookmark:application e=""/><bookmark:application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-28.xbel b/glib/tests/bookmarks/fail-28.xbel
new file mode 100644
index 000000000..131a97a40
--- /dev/null
+++ b/glib/tests/bookmarks/fail-28.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<><><>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-29.xbel b/glib/tests/bookmarks/fail-29.xbel
new file mode 100644
index 000000000..2cdcf9f1f
--- /dev/null
+++ b/glib/tests/bookmarks/fail-29.xbel
@@ -0,0 +1 @@
+<?></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-30.xbel b/glib/tests/bookmarks/fail-30.xbel
new file mode 100644
index 000000000..982ea1049
--- /dev/null
+++ b/glib/tests/bookmarks/fail-30.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<><<>><>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-31.xbel b/glib/tests/bookmarks/fail-31.xbel
new file mode 100644
index 000000000..4b46cbafd
--- /dev/null
+++ b/glib/tests/bookmarks/fail-31.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<><<>>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-32.xbel b/glib/tests/bookmarks/fail-32.xbel
new file mode 100644
index 000000000..d6de333d1
--- /dev/null
+++ b/glib/tests/bookmarks/fail-32.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-33.xbel b/glib/tests/bookmarks/fail-33.xbel
new file mode 100644
index 000000000..a72c6ff33
--- /dev/null
+++ b/glib/tests/bookmarks/fail-33.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<><><><>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-34.xbel b/glib/tests/bookmarks/fail-34.xbel
new file mode 100644
index 000000000..88214d94e
--- /dev/null
+++ b/glib/tests/bookmarks/fail-34.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE<<>>></
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-35.xbel b/glib/tests/bookmarks/fail-35.xbel
new file mode 100644
index 000000000..2f8fd1091
--- /dev/null
+++ b/glib/tests/bookmarks/fail-35.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"m=""><title><mime:mime-type></mime:mime-type><mime:mime-type>
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-36.xbel b/glib/tests/bookmarks/fail-36.xbel
new file mode 100644
index 000000000..7949a3b95
--- /dev/null
+++ b/glib/tests/bookmarks/fail-36.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><mime:mime-type></mime:mime-type><bookmark:applications><application name=""exec="">
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-37.xbel b/glib/tests/bookmarks/fail-37.xbel
new file mode 100644
index 000000000..785f3b104
--- /dev/null
+++ b/glib/tests/bookmarks/fail-37.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel version="1.0"xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><title><mime:mime-type></mime:mime-type><bookmark:applications><bookmark:application name=""exec="">
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-38.xbel b/glib/tests/bookmarks/fail-38.xbel
new file mode 100644
index 000000000..9ef34f3ee
--- /dev/null
+++ b/glib/tests/bookmarks/fail-38.xbel
@@ -0,0 +1 @@
+<?><!DOCTYPE><xbel x=""/><o xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"><bookmark:application e=""/><bookmark:application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/date.c b/glib/tests/date.c
index e2e1f7fb9..d65aab7e8 100644
--- a/glib/tests/date.c
+++ b/glib/tests/date.c
@@ -17,6 +17,10 @@
 #ifdef G_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+/* mingw defines it while msvc doesn't */
+#ifndef SUBLANG_LITHUANIAN_LITHUANIA
+#define SUBLANG_LITHUANIAN_LITHUANIA 0x01
+#endif
 #endif
 
 static void
@@ -85,11 +89,14 @@ test_dates (void)
 {
   GDate *d;
   GTimeVal tv;
+  time_t now;
 
   d = g_date_new ();
 
   /* today */
-  g_date_set_time (d, time (NULL));
+  now = time (NULL);
+  g_assert_cmpint (now, !=, (time_t) -1);
+  g_date_set_time (d, now);
   g_assert (g_date_valid (d));
 
   /* Unix epoch */
@@ -189,6 +196,17 @@ test_month_names (void)
 
   g_test_bug ("749206");
 
+  /* If running uninstalled (G_TEST_BUILDDIR is set), skip this test, since we
+   * need the translations to be installed. We can’t mess around with
+   * bindtextdomain() here, as the compiled .gmo files in po/ are not in the
+   * right installed directory hierarchy to be successfully loaded by gettext. */
+  if (g_getenv ("G_TEST_BUILDDIR") != NULL)
+    {
+      g_test_skip ("Skipping due to running uninstalled. "
+                   "This test can only be run when the translations are installed.");
+      return;
+    }
+
   /* This test can only work (on non-Windows platforms) if libc supports
    * the %OB (etc.) format placeholders. If it doesn’t, strftime() (and hence
    * g_date_strftime()) will return the placeholder unsubstituted.
@@ -205,15 +223,21 @@ test_month_names (void)
   g_test_skip ("libc doesn’t support all alternative month names");
 #else
 
-#define TEST_DATE(d,m,y,f,o)                                    \
+#define TEST_DATE(d,m,y,f,o)                     G_STMT_START { \
+  gchar *o_casefold, *buf_casefold;                             \
   g_date_set_dmy (gdate, d, m, y);                              \
   g_date_strftime (buf, 100, f, gdate);                         \
-  g_assert_cmpstr (buf, ==, (o));                               \
+  buf_casefold = g_utf8_casefold (buf, -1);                     \
+  o_casefold = g_utf8_casefold ((o), -1);                       \
+  g_assert_cmpstr (buf_casefold, ==, o_casefold);               \
+  g_free (buf_casefold);                                        \
+  g_free (o_casefold);                                          \
   g_date_set_parse (gdate, buf);                                \
   g_assert (g_date_valid (gdate));                              \
   g_assert_cmpint (g_date_get_day (gdate), ==, d);              \
   g_assert_cmpint (g_date_get_month (gdate), ==, m);            \
-  g_assert_cmpint (g_date_get_year (gdate), ==, y);
+  g_assert_cmpint (g_date_get_year (gdate), ==, y);             \
+} G_STMT_END
 
   oldlocale = g_strdup (setlocale (LC_ALL, NULL));
 #ifdef G_OS_WIN32
diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c
index c08249650..4772540c3 100644
--- a/glib/tests/fileutils.c
+++ b/glib/tests/fileutils.c
@@ -36,11 +36,19 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <utime.h>
 #endif
 #include <fcntl.h>
-#include <utime.h>
 #ifdef G_OS_WIN32
 #include <windows.h>
+#include <sys/utime.h>
+#include <io.h>
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+#endif
+#ifndef F_OK
+#define F_OK 0
+#endif
 #endif
 
 #define S G_DIR_SEPARATOR_S
@@ -879,6 +887,7 @@ test_stdio_wrappers (void)
   gint ret;
   struct utimbuf ut;
   GError *error = NULL;
+  GStatBuf path_statbuf, cwd_statbuf;
 
   /* The permissions tests here don’t work when running as root. */
 #ifdef G_OS_UNIX
@@ -912,7 +921,13 @@ test_stdio_wrappers (void)
   ret = g_chdir (path);
   g_assert_cmpint (ret, ==, 0);
   cwd = g_get_current_dir ();
-  g_assert_true (g_str_equal (cwd, path));
+  /* We essentially want to check that cwd == path, but we can’t compare the
+   * paths directly since the tests might be running under a symlink (for
+   * example, /tmp is sometimes a symlink). Compare the inode numbers instead. */
+  g_assert_cmpint (g_stat (cwd, &cwd_statbuf), ==, 0);
+  g_assert_cmpint (g_stat (path, &path_statbuf), ==, 0);
+  g_assert_true (cwd_statbuf.st_dev == path_statbuf.st_dev &&
+                 cwd_statbuf.st_ino == path_statbuf.st_ino);
   g_free (cwd);
   g_free (path);
 
@@ -944,6 +959,56 @@ test_stdio_wrappers (void)
   g_rmdir ("mkdir-test");
 }
 
+/* Win32 does not support "wb+", but g_fopen() should automatically
+ * translate this mode to its alias "w+b".
+ * Also check various other file open modes for correct support accross
+ * platforms.
+ * See: https://gitlab.gnome.org/GNOME/glib/merge_requests/119
+ */
+static void
+test_fopen_modes (void)
+{
+  char        *path = g_build_filename ("temp-fopen", NULL);
+  gsize        i;
+  const gchar *modes[] =
+    {
+      "w",
+      "r",
+      "a",
+      "w+",
+      "r+",
+      "a+",
+      "wb",
+      "rb",
+      "ab",
+      "w+b",
+      "r+b",
+      "a+b",
+      "wb+",
+      "rb+",
+      "ab+"
+    };
+
+  g_test_bug ("119");
+
+  if (g_file_test (path, G_FILE_TEST_EXISTS))
+    g_error ("failed, %s exists, cannot test g_fopen()", path);
+
+  for (i = 0; i < G_N_ELEMENTS (modes); i++)
+    {
+      FILE *f;
+
+      g_test_message ("Testing fopen() mode '%s'", modes[i]);
+
+      f = g_fopen (path, modes[i]);
+      g_assert_nonnull (f);
+      fclose (f);
+    }
+
+  g_remove (path);
+  g_free (path);
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -951,6 +1016,8 @@ main (int   argc,
   g_setenv ("LC_ALL", "C", TRUE);
   g_test_init (&argc, &argv, NULL);
 
+  g_test_bug_base ("https://gitlab.gnome.org/GNOME/glib/merge_requests/");
+
   g_test_add_func ("/fileutils/build-path", test_build_path);
   g_test_add_func ("/fileutils/build-pathv", test_build_pathv);
   g_test_add_func ("/fileutils/build-filename", test_build_filename);
@@ -966,6 +1033,7 @@ main (int   argc,
   g_test_add_func ("/fileutils/set-contents", test_set_contents);
   g_test_add_func ("/fileutils/read-link", test_read_link);
   g_test_add_func ("/fileutils/stdio-wrappers", test_stdio_wrappers);
+  g_test_add_func ("/fileutils/fopen-modes", test_fopen_modes);
 
   return g_test_run ();
 }
diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
index 79a131ab5..c6837fcce 100644
--- a/glib/tests/gdatetime.c
+++ b/glib/tests/gdatetime.c
@@ -112,6 +112,7 @@ test_GDateTime_new_from_unix (void)
 
   memset (&tm, 0, sizeof (tm));
   t = time (NULL);
+  g_assert_cmpint (t, !=, (time_t) -1);
   get_localtime_tm (t, &tm);
 
   dt = g_date_time_new_from_unix_local (t);
@@ -787,6 +788,7 @@ test_GDateTime_to_unix (void)
   time_t     t;
 
   t = time (NULL);
+  g_assert_cmpint (t, !=, (time_t) -1);
   dt = g_date_time_new_from_unix_local (t);
   g_assert_cmpint (g_date_time_to_unix (dt), ==, t);
   g_date_time_unref (dt);
@@ -1283,6 +1285,7 @@ test_GDateTime_to_utc (void)
   struct tm  tm;
 
   t = time (NULL);
+  g_assert_cmpint (t, !=, (time_t) -1);
 #ifdef HAVE_GMTIME_R
   gmtime_r (&t, &tm);
 #else
@@ -1362,6 +1365,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
    * that of the generated timezone.
    */
   t = time (NULL);
+  g_assert_cmpint (t, !=, (time_t) -1);
   memset (&tt, 0, sizeof(tt));
   get_localtime_tm (t, &tt);
   tt.tm_year = 2009 - 1900;
@@ -1437,6 +1441,17 @@ test_non_utf8_printf (void)
 {
   gchar *oldlocale;
 
+  /* If running uninstalled (G_TEST_BUILDDIR is set), skip this test, since we
+   * need the translations to be installed. We can’t mess around with
+   * bindtextdomain() here, as the compiled .gmo files in po/ are not in the
+   * right installed directory hierarchy to be successfully loaded by gettext. */
+  if (g_getenv ("G_TEST_BUILDDIR") != NULL)
+    {
+      g_test_skip ("Skipping due to running uninstalled. "
+                   "This test can only be run when the translations are installed.");
+      return;
+    }
+
   oldlocale = g_strdup (setlocale (LC_ALL, NULL));
   setlocale (LC_ALL, "ja_JP.eucjp");
   if (strstr (setlocale (LC_ALL, NULL), "ja_JP") == NULL)
diff --git a/glib/tests/logging.c b/glib/tests/logging.c
index da41d82f0..3ab34f58e 100644
--- a/glib/tests/logging.c
+++ b/glib/tests/logging.c
@@ -428,15 +428,22 @@ test_structured_logging_roundtrip1 (void)
 {
   gpointer some_pointer = GUINT_TO_POINTER (0x100);
   gint some_integer = 123;
-  const GLogField fields[] = {
+  gchar message[200];
+  GLogField fields[] = {
     { "GLIB_DOMAIN", "some-domain", -1 },
     { "PRIORITY", "5", -1 },
-    { "MESSAGE", "This is a debug message about pointer 0x100 and integer 123.", -1 },
+    { "MESSAGE", "String assigned using g_snprintf() below", -1 },
     { "MESSAGE_ID", "fcfb2e1e65c3494386b74878f1abf893", -1 },
     { "MY_APPLICATION_CUSTOM_FIELD", "some debug string", -1 }
   };
   ExpectedMessage expected = { fields, 5 };
 
+  /* %p format is implementation defined and depends on the platform */
+  g_snprintf (message, sizeof (message),
+              "This is a debug message about pointer %p and integer %u.",
+              some_pointer, some_integer);
+  fields[2].value = message;
+
   expected_messages = g_slist_append (NULL, &expected);
   g_log_set_writer_func (expect_log_writer, NULL, NULL);
 
diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
index 6b0074011..cf114fd40 100644
--- a/glib/tests/mainloop.c
+++ b/glib/tests/mainloop.c
@@ -1306,7 +1306,21 @@ test_unix_fd_source (void)
 
   out = in = FALSE;
   out_source = g_unix_fd_source_new (fds[1], G_IO_OUT);
-  g_source_set_callback (out_source, (GSourceFunc) flag_bool, &out, NULL);
+  /* -Wcast-function-type complains about casting 'flag_bool' to GSourceFunc.
+   * GCC has no way of knowing that it will be cast back to GUnixFDSourceFunc
+   * before being called. Although GLib itself is not compiled with
+   * -Wcast-function-type, applications that use GLib may well be (since
+   * -Wextra includes it), so we provide a G_SOURCE_FUNC() macro to suppress
+   * the warning. We check that it works here.
+   */
+#if G_GNUC_CHECK_VERSION(8, 0)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic error "-Wcast-function-type"
+#endif
+  g_source_set_callback (out_source, G_SOURCE_FUNC (flag_bool), &out, NULL);
+#if G_GNUC_CHECK_VERSION(8, 0)
+#pragma GCC diagnostic pop
+#endif
   g_source_attach (out_source, NULL);
   assert_main_context_state (1,
                              fds[1], G_IO_OUT, 0);
diff --git a/glib/tests/markups/fail-10.expected b/glib/tests/markups/fail-10.expected
index 7761a2262..6462cdf8c 100644
--- a/glib/tests/markups/fail-10.expected
+++ b/glib/tests/markups/fail-10.expected
@@ -1,4 +1,4 @@
 ELEMENT 'foo'
   TEXT '
 '
-ERROR Error on line 2 char 8: Element '|foo' was closed, but the currently open element is 'foo'
+ERROR Error on line 2 char 8: Element “|foo� was closed, but the currently open element is “foo�
diff --git a/glib/tests/markups/fail-11.expected b/glib/tests/markups/fail-11.expected
index 3a7173d37..f2331b796 100644
--- a/glib/tests/markups/fail-11.expected
+++ b/glib/tests/markups/fail-11.expected
@@ -4,4 +4,4 @@ ELEMENT 'foo'
   ELEMENT 'bar'
     TEXT '
 '
-ERROR Error on line 3 char 7: Element 'foo' was closed, but the currently open element is 'bar'
+ERROR Error on line 3 char 7: Element “foo� was closed, but the currently open element is “bar�
diff --git a/glib/tests/markups/fail-12.expected b/glib/tests/markups/fail-12.expected
index 0aab7b5f1..c4176b08a 100644
--- a/glib/tests/markups/fail-12.expected
+++ b/glib/tests/markups/fail-12.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 6: Element 'foo' was closed, no element is currently open
+ERROR Error on line 1 char 6: Element “foo� was closed, no element is currently open
diff --git a/glib/tests/markups/fail-13.expected b/glib/tests/markups/fail-13.expected
index 60157fa4a..b2cdf9f46 100644
--- a/glib/tests/markups/fail-13.expected
+++ b/glib/tests/markups/fail-13.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 7: Element 'foo|' was closed, no element is currently open
+ERROR Error on line 1 char 7: Element “foo|� was closed, no element is currently open
diff --git a/glib/tests/markups/fail-14.expected b/glib/tests/markups/fail-14.expected
index 47e6847cc..2f0d64140 100644
--- a/glib/tests/markups/fail-14.expected
+++ b/glib/tests/markups/fail-14.expected
@@ -1,4 +1,4 @@
 ELEMENT 'foo'
   TEXT '
 '
-ERROR Error on line 2 char 3: Document ended unexpectedly just after an open angle bracket '<'
+ERROR Error on line 2 char 3: Document ended unexpectedly just after an open angle bracket “<�
diff --git a/glib/tests/markups/fail-15.expected b/glib/tests/markups/fail-15.expected
index 380ab74d8..5b31870d4 100644
--- a/glib/tests/markups/fail-15.expected
+++ b/glib/tests/markups/fail-15.expected
@@ -5,4 +5,4 @@ ELEMENT 'foo'
     TEXT '
 '
   END 'bar'
-ERROR Error on line 3 char 8: Document ended unexpectedly with elements still open - 'foo' was the last element opened
+ERROR Error on line 3 char 8: Document ended unexpectedly with elements still open — “foo� was the last element opened
diff --git a/glib/tests/markups/fail-22.expected b/glib/tests/markups/fail-22.expected
index b9585de18..a238253d0 100644
--- a/glib/tests/markups/fail-22.expected
+++ b/glib/tests/markups/fail-22.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1 char 6: Document ended unexpectedly with elements still open - 'foo' was the last element opened
+ERROR Error on line 1 char 6: Document ended unexpectedly with elements still open — “foo� was the last element opened
diff --git a/glib/tests/markups/fail-26.expected b/glib/tests/markups/fail-26.expected
index 99ab934bb..69392f093 100644
--- a/glib/tests/markups/fail-26.expected
+++ b/glib/tests/markups/fail-26.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;
+ERROR Error on line 1: Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;
diff --git a/glib/tests/markups/fail-27.expected b/glib/tests/markups/fail-27.expected
index 3090f33f9..8d70804ed 100644
--- a/glib/tests/markups/fail-27.expected
+++ b/glib/tests/markups/fail-27.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity name '|' is not known
+ERROR Error on line 1: Entity name “|� is not known
diff --git a/glib/tests/markups/fail-28.expected b/glib/tests/markups/fail-28.expected
index e54ab6615..fa1171c66 100644
--- a/glib/tests/markups/fail-28.expected
+++ b/glib/tests/markups/fail-28.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity name 'am|' is not known
+ERROR Error on line 1: Entity name “am|� is not known
diff --git a/glib/tests/markups/fail-29.expected b/glib/tests/markups/fail-29.expected
index ddc0090cc..d41596143 100644
--- a/glib/tests/markups/fail-29.expected
+++ b/glib/tests/markups/fail-29.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity name 'bar' is not known
+ERROR Error on line 1: Entity name “bar� is not known
diff --git a/glib/tests/markups/fail-3.expected b/glib/tests/markups/fail-3.expected
index e39f81c9a..dcb2a02a4 100644
--- a/glib/tests/markups/fail-3.expected
+++ b/glib/tests/markups/fail-3.expected
@@ -1,5 +1,5 @@
 ELEMENT 'foobar'
-ERROR Error on line 49 char 2: Invalid UTF-8 encoded text in name - not valid '
+ERROR Error on line 49 char 2: Invalid UTF-8 encoded text in name — not valid “
 Παν語
 
 This is a list of ways to say hello in various languages. Its purpose is to illustrate a number of scripts.
@@ -47,4 +47,4 @@ Difference among chinese characters in GB, JIS, KSC, BIG5:‎
  BIG5	--	元氣	開發
 
 
-'
+�
diff --git a/glib/tests/markups/fail-30.expected b/glib/tests/markups/fail-30.expected
index 15169e35f..fc8c6eb74 100644
--- a/glib/tests/markups/fail-30.expected
+++ b/glib/tests/markups/fail-30.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-31.expected b/glib/tests/markups/fail-31.expected
index a17ae976c..67c0190d5 100644
--- a/glib/tests/markups/fail-31.expected
+++ b/glib/tests/markups/fail-31.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Failed to parse '34592348345343453453455645765736575865767', which should have been a digit inside a character reference (&#234; for example) - perhaps the digit is too large
+ERROR Error on line 1: Failed to parse “34592348345343453453455645765736575865767�, which should have been a digit inside a character reference (&#234; for example) — perhaps the digit is too large
diff --git a/glib/tests/markups/fail-32.expected b/glib/tests/markups/fail-32.expected
index c3d9c45af..564dd41d5 100644
--- a/glib/tests/markups/fail-32.expected
+++ b/glib/tests/markups/fail-32.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Character reference '0' does not encode a permitted character
+ERROR Error on line 1: Character reference “0� does not encode a permitted character
diff --git a/glib/tests/markups/fail-33.expected b/glib/tests/markups/fail-33.expected
index c4854633c..e84ed71d1 100644
--- a/glib/tests/markups/fail-33.expected
+++ b/glib/tests/markups/fail-33.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Failed to parse '', which should have been a digit inside a character reference (&#234; for example) - perhaps the digit is too large
+ERROR Error on line 1: Failed to parse “�, which should have been a digit inside a character reference (&#234; for example) — perhaps the digit is too large
diff --git a/glib/tests/markups/fail-34.expected b/glib/tests/markups/fail-34.expected
index 7fac38c00..4cb1363c8 100644
--- a/glib/tests/markups/fail-34.expected
+++ b/glib/tests/markups/fail-34.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Character reference did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 1: Character reference did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-35.expected b/glib/tests/markups/fail-35.expected
index 15169e35f..fc8c6eb74 100644
--- a/glib/tests/markups/fail-35.expected
+++ b/glib/tests/markups/fail-35.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-36.expected b/glib/tests/markups/fail-36.expected
index 2bd9fbb7f..3f806dcf3 100644
--- a/glib/tests/markups/fail-36.expected
+++ b/glib/tests/markups/fail-36.expected
@@ -1,4 +1,4 @@
 ELEMENT 'foo'
   TEXT '�'
 END 'foo'
-ERROR Error on line 2 char 1: '^$non-carriage-null-fail|' is not a valid name
+ERROR Error on line 2 char 1: “^$non-carriage-null-fail|� is not a valid name
diff --git a/glib/tests/markups/fail-37.expected b/glib/tests/markups/fail-37.expected
index f04ec3556..edc683ecc 100644
--- a/glib/tests/markups/fail-37.expected
+++ b/glib/tests/markups/fail-37.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 2: ' ' is not a valid character following a '<' character; it may not begin an element name
+ERROR Error on line 1 char 2: “ � is not a valid character following a “<� character; it may not begin an element name
diff --git a/glib/tests/markups/fail-38.expected b/glib/tests/markups/fail-38.expected
index f25b4cdd2..3a5f86509 100644
--- a/glib/tests/markups/fail-38.expected
+++ b/glib/tests/markups/fail-38.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT 'data'
-ERROR Error on line 1 char 11: ' ' is not a valid character following a '<' character; it may not begin an element name
+ERROR Error on line 1 char 11: “ � is not a valid character following a “<� character; it may not begin an element name
diff --git a/glib/tests/markups/fail-39.expected b/glib/tests/markups/fail-39.expected
index de0e4b8db..1b5d234a3 100644
--- a/glib/tests/markups/fail-39.expected
+++ b/glib/tests/markups/fail-39.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT 'data'
-ERROR Error on line 1 char 12: ' ' is not a valid character following the characters '</'; ' ' may not begin an element name
+ERROR Error on line 1 char 12: “ � is not a valid character following the characters “</�; “ � may not begin an element name
diff --git a/glib/tests/markups/fail-40.expected b/glib/tests/markups/fail-40.expected
index a2b5cbcb8..144c89ceb 100644
--- a/glib/tests/markups/fail-40.expected
+++ b/glib/tests/markups/fail-40.expected
@@ -1,2 +1,2 @@
 ELEMENT 'bla'
-ERROR Error on line 1: Entity name 'unknownentityname' is not known
+ERROR Error on line 1: Entity name “unknownentityname� is not known
diff --git a/glib/tests/markups/fail-41.expected b/glib/tests/markups/fail-41.expected
index ab476eff2..33ca9fbe4 100644
--- a/glib/tests/markups/fail-41.expected
+++ b/glib/tests/markups/fail-41.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 1: Invalid UTF-8 encoded text in name - not valid 'abcäöü'
+ERROR Error on line 2 char 1: Invalid UTF-8 encoded text in name — not valid “abcäöüâ€�
diff --git a/glib/tests/markups/fail-42.expected b/glib/tests/markups/fail-42.expected
index 4fbf6858c..dbdc09f13 100644
--- a/glib/tests/markups/fail-42.expected
+++ b/glib/tests/markups/fail-42.expected
@@ -1 +1 @@
-ERROR Error on line 3: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 3: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-43.expected b/glib/tests/markups/fail-43.expected
index 57a7b02c3..64b42c24c 100644
--- a/glib/tests/markups/fail-43.expected
+++ b/glib/tests/markups/fail-43.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 10: Odd character '≈', expected a '=' after attribute name 'bar' of element 'foo'
+ERROR Error on line 1 char 10: Odd character “≈�, expected a “=� after attribute name “bar� of element “foo�
diff --git a/glib/tests/markups/fail-44.expected b/glib/tests/markups/fail-44.expected
index 533eef7fb..0cddd72e8 100644
--- a/glib/tests/markups/fail-44.expected
+++ b/glib/tests/markups/fail-44.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1 char 6: Odd character '≻', expected a '>' character to end the empty-element tag 'foo'
+ERROR Error on line 1 char 6: Odd character “≻�, expected a “>� character to end the empty-element tag “foo�
diff --git a/glib/tests/markups/fail-45.expected b/glib/tests/markups/fail-45.expected
index 866b75133..1899cdf5d 100644
--- a/glib/tests/markups/fail-45.expected
+++ b/glib/tests/markups/fail-45.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT ''
-ERROR Error on line 1 char 12: '≻' is not a valid character following the close element name 'foo'; the allowed character is '>'
+ERROR Error on line 1 char 12: “≻� is not a valid character following the close element name “foo�; the allowed character is “>�
diff --git a/glib/tests/markups/fail-46.expected b/glib/tests/markups/fail-46.expected
index f3ab8ca90..7124919a2 100644
--- a/glib/tests/markups/fail-46.expected
+++ b/glib/tests/markups/fail-46.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 3 char 2: Document ended unexpectedly with elements still open - 'foo' was the last element opened
+ERROR Error on line 3 char 2: Document ended unexpectedly with elements still open — “foo� was the last element opened
diff --git a/glib/tests/markups/fail-47.expected b/glib/tests/markups/fail-47.expected
index 89dc4b400..1083489f8 100644
--- a/glib/tests/markups/fail-47.expected
+++ b/glib/tests/markups/fail-47.expected
@@ -1 +1 @@
-ERROR Error on line 1: Failed to parse '', which should have been a digit inside a character reference (&#234; for example) - perhaps the digit is too large
+ERROR Error on line 1: Failed to parse “�, which should have been a digit inside a character reference (&#234; for example) — perhaps the digit is too large
diff --git a/glib/tests/markups/fail-48.expected b/glib/tests/markups/fail-48.expected
index e5fa74004..ed546bf70 100644
--- a/glib/tests/markups/fail-48.expected
+++ b/glib/tests/markups/fail-48.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 2: Odd character '>', expected a '=' after attribute name 'bar' of element 'fail'
+ERROR Error on line 2 char 2: Odd character “>�, expected a “=� after attribute name “bar� of element “fail�
diff --git a/glib/tests/markups/fail-49.expected b/glib/tests/markups/fail-49.expected
index fc3bacb57..386e1a415 100644
--- a/glib/tests/markups/fail-49.expected
+++ b/glib/tests/markups/fail-49.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT ''
-ERROR Error on line 2 char 2: Document ended unexpectedly inside the close tag for element 'foo'
+ERROR Error on line 2 char 2: Document ended unexpectedly inside the close tag for element “foo�
diff --git a/glib/tests/markups/fail-5.expected b/glib/tests/markups/fail-5.expected
index e519015d5..0105827f0 100644
--- a/glib/tests/markups/fail-5.expected
+++ b/glib/tests/markups/fail-5.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 1: '|foo' is not a valid name
+ERROR Error on line 2 char 1: “|foo� is not a valid name
diff --git a/glib/tests/markups/fail-50.expected b/glib/tests/markups/fail-50.expected
new file mode 100644
index 000000000..70d44988f
--- /dev/null
+++ b/glib/tests/markups/fail-50.expected
@@ -0,0 +1 @@
+ERROR Error on line 1 char 5: Odd character “\xfc�, expected an open quote mark after the equals sign when giving value for attribute “r� of element “�
diff --git a/glib/tests/markups/fail-50.gmarkup b/glib/tests/markups/fail-50.gmarkup
new file mode 100644
index 000000000..f110f1564
--- /dev/null
+++ b/glib/tests/markups/fail-50.gmarkup
@@ -0,0 +1 @@
+<	r=ü
\ No newline at end of file
diff --git a/glib/tests/markups/fail-51.expected b/glib/tests/markups/fail-51.expected
new file mode 100644
index 000000000..1c7e8d47a
--- /dev/null
+++ b/glib/tests/markups/fail-51.expected
@@ -0,0 +1 @@
+ERROR Error on line 1 char 5: Document ended unexpectedly inside the close tag for an unopened element
diff --git a/glib/tests/markups/fail-51.gmarkup b/glib/tests/markups/fail-51.gmarkup
new file mode 100644
index 000000000..860e1e6b5
--- /dev/null
+++ b/glib/tests/markups/fail-51.gmarkup
@@ -0,0 +1 @@
+</0<
\ No newline at end of file
diff --git a/glib/tests/markups/fail-6.expected b/glib/tests/markups/fail-6.expected
index b72246888..d41f00e74 100644
--- a/glib/tests/markups/fail-6.expected
+++ b/glib/tests/markups/fail-6.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 1: 'foo|' is not a valid name: '|'
+ERROR Error on line 2 char 1: “foo|� is not a valid name: “|�
diff --git a/glib/tests/markups/fail-7.expected b/glib/tests/markups/fail-7.expected
index 40b61c152..a2843cd72 100644
--- a/glib/tests/markups/fail-7.expected
+++ b/glib/tests/markups/fail-7.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 15: 'bar}"baz"' is not a valid name: '}'
+ERROR Error on line 1 char 15: “bar}"baz"� is not a valid name: “}�
diff --git a/glib/tests/markups/fail-8.expected b/glib/tests/markups/fail-8.expected
index 31651aa6b..121163d8e 100644
--- a/glib/tests/markups/fail-8.expected
+++ b/glib/tests/markups/fail-8.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1 char 6: Odd character '}', expected a '>' character to end the empty-element tag 'foo'
+ERROR Error on line 1 char 6: Odd character “}�, expected a “>� character to end the empty-element tag “foo�
diff --git a/glib/tests/markups/fail-9.expected b/glib/tests/markups/fail-9.expected
index 9994eb345..f2d77cca6 100644
--- a/glib/tests/markups/fail-9.expected
+++ b/glib/tests/markups/fail-9.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 10: Odd character '{', expected an open quote mark after the equals sign when giving value for attribute 'bar' of element 'foo'
+ERROR Error on line 1 char 10: Odd character “{�, expected an open quote mark after the equals sign when giving value for attribute “bar� of element “foo�
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index c32e7768f..f5c0fbecb 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -1,187 +1,186 @@
-glib_tests = [
-  'array-test',
-  'asyncqueue',
-  'base64',
-  'bitlock',
-  'bookmarkfile',
-  'bytes',
-  'cache',
-  'charset',
-  'checksum',
-  'collate',
-  'cond',
-  'convert',
-  'dataset',
-  'date',
-  'dir',
-  'environment',
-  'error',
-  'fileutils',
-  'gdatetime',
-  'gvariant',
-  'hash',
-  'hmac',
-  'hook',
-  'hostutils',
-  'keyfile',
-  'list',
-  'logging',
-  'mainloop',
-  'mappedfile',
-  'markup',
-  'markup-parse',
-  'markup-collect',
-  'markup-escape',
-  'markup-subparser',
-  'mem-overflow',
-  'mutex',
-  'node',
-  'once',
-  'option-context',
-  'option-argv0',
-  'overflow',
-  # overflow-fallback handled separately below
-  'pattern',
-  'private',
-  'protocol',
-  'queue',
-  'rand',
-  'rec-mutex',
-  'regex',
-  'rwlock',
-  'scannerapi',
-  'search-utils',
-  'sequence',
-  'shell',
-  'slice',
-  'slist',
-  'sort',
-  'spawn-multithreaded',
-  'spawn-singlethread',
-  'strfuncs',
-  'string',
-  'testing',
-  'test-printf',
-  'thread',
-  'timeout',
-  'timer',
-  'tree',
-  'utf8-performance',
-  'utf8-pointer',
-  'utf8-validate',
-  'utf8-misc',
-  'utils',
-  'unicode',
-  'uri',
-  '1bit-mutex',
-  '642026',
-]
+glib_tests = {
+  'array-test' : {},
+  'asyncqueue' : {},
+  'atomic' : {
+    'c_args' : cc.get_id() == 'gcc' ? ['-Wstrict-aliasing=2'] : [],
+  },
+  'autoptr' : {
+    'skip' : cc.get_id() == 'msvc',
+  },
+  'base64' : {},
+  'bitlock' : {},
+  'bookmarkfile' : {},
+  'bytes' : {},
+  'cache' : {},
+  'charset' : {},
+  'checksum' : {},
+  'collate' : {},
+  'cond' : {},
+  'convert' : {},
+  'dataset' : {},
+  'date' : {},
+  'dir' : {},
+  'environment' : {},
+  'error' : {},
+  'fileutils' : {},
+  'gdatetime' : {},
+  'guuid' : {},
+  'gvariant' : {
+    'suite' : ['slow'],
+  },
+  'gwakeup' : {
+    'source' : ['gwakeuptest.c', '../gwakeup.c'],
+    'install' : false,
+  },
+  'gwakeup-fallback' : {
+    'skip' : not glib_conf.has('HAVE_EVENTFD'),
+    'source' : ['gwakeuptest.c', '../gwakeup.c'],
+    'c_args' : ['-DTEST_EVENTFD_FALLBACK'],
+    'install' : false,
+  },
+  'hash' : {},
+  'hmac' : {},
+  'hook' : {},
+  'hostutils' : {},
+  'include' : {
+    'skip' : host_machine.system() == 'windows',
+  },
+  'keyfile' : {},
+  'list' : {},
+  'logging' : {},
+  'mainloop' : {},
+  'mappedfile' : {},
+  'markup' : {},
+  'markup-parse' : {},
+  'markup-collect' : {},
+  'markup-escape' : {},
+  'markup-subparser' : {},
+  'mem-overflow' : {},
+  'mutex' : {},
+  'node' : {},
+  'once' : {},
+  'option-context' : {},
+  'option-argv0' : {},
+  'overflow' : {},
+  'overflow-fallback' : {
+    'source' : 'overflow.c',
+    'c_args' : ['-D_GLIB_TEST_OVERFLOW_FALLBACK'],
+  },
+  'pattern' : {},
+  'private' : {},
+  'protocol' : {},
+  'queue' : {},
+  'rand' : {},
+  'rcbox' : {},
+  'rec-mutex' : {},
+  'refcount' : {},
+  'refcount-macro' : {
+    'source' : 'refcount.c',
+    'c_args' : ['-DG_DISABLE_CHECKS'],
+  },
+  'refstring' : {},
+  'regex' : {
+    'dependencies' : [pcre],
+    'c_args' : use_pcre_static_flag ? ['-DPCRE_STATIC'] : [],
+  },
+  'rwlock' : {},
+  'scannerapi' : {},
+  'search-utils' : {},
+  'sequence' : {
+    'suite' : ['slow'],
+  },
+  'shell' : {},
+  'slice' : {},
+  'slist' : {},
+  'sort' : {},
+  'spawn-multithreaded' : {},
+  'spawn-singlethread' : {},
+  'strfuncs' : {},
+  'string' : {},
+  'testing' : {},
+  'test-printf' : {},
+  'thread' : {},
+  'timeout' : {},
+  'timer' : {},
+  'tree' : {},
+  'utf8-performance' : {},
+  'utf8-pointer' : {},
+  'utf8-validate' : {},
+  'utf8-misc' : {},
+  'utils' : {},
+  'unicode' : {},
+  'unix' : {
+    'skip' : host_machine.system() == 'windows',
+  },
+  'uri' : {},
+  '1bit-mutex' : {},
+  '1bit-emufutex' : {
+    'source' : '1bit-mutex.c',
+    'c_args' : ['-DTEST_EMULATED_FUTEX'],
+    'install' : false,
+  },
+  '642026' : {
+    'suite' : ['slow'],
+  },
+  '642026-ec' : {
+    'source' : '642026.c',
+    'c_args' : ['-DG_ERRORCHECK_MUTEXES'],
+    'suite' : ['slow'],
+  },
+}
 
-if host_machine.system() != 'windows'
-  glib_tests += [ 'unix', 'include' ]
-endif
-
-if cc.get_id() != 'msvc'
-  glib_tests += [ 'autoptr' ]
-endif
-
-# FIXME: use new environment() object
 # Not entirely random of course, but at least it changes over time
 random_number = minor_version + meson.version().split('.').get(1).to_int()
 
-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_env = environment()
+test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+test_env.set('G_DEBUG', 'gc-friendly')
+test_env.set('MALLOC_CHECK_', '2')
+test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 
+test_deps = [libm, thread_dep, libglib_dep]
 test_cargs = ['-DG_LOG_DOMAIN="GLib"']
 
-# Tests that consistently time out on the CI infrastructure
-slow_tests = [
-  'gvariant',
-  'sequence',
-  '642026',
-]
-
-foreach test_name : glib_tests
-  deps = [libm, thread_dep, libglib_dep]
-  if test_name == 'regex'
-    deps += [pcre]
-  endif
-  if test_name == 'gdatetime'
-    deps += [libintl]
-  endif
-  exe = executable(test_name, '@0@.c'.format(test_name),
-    c_args : ['-DPCRE_STATIC'] + test_cargs,
-    dependencies : deps,
-    install : false,
-  )
-  # These tests may take more than 30 seconds to run on the CI infrastructure
-  if slow_tests.contains(test_name)
-    test(test_name, exe, env : test_env, timeout : 90)
-  else
-    test(test_name, exe, env : test_env)
+foreach test_name, extra_args : glib_tests
+  # FIXME: This condition is ugly, meson should either have 'continue'
+  # keyword (https://github.com/mesonbuild/meson/issues/3601), or support
+  # mutable to dictionaries (https://github.com/mesonbuild/meson/pull/3820).
+  if not extra_args.get('skip', false)
+    source = extra_args.get('source', test_name + '.c')
+    install = installed_tests_enabled and extra_args.get('install', true)
+
+    if install
+      test_conf = configuration_data()
+      test_conf.set('installed_tests_dir', installed_tests_execdir)
+      test_conf.set('program', test_name)
+      configure_file(
+        input: installed_tests_template,
+        output: test_name + '.test',
+        install_dir: installed_tests_metadir,
+        configuration: test_conf
+      )
+    endif
+
+    exe = executable(test_name, source,
+      c_args : test_cargs + extra_args.get('c_args', []),
+      dependencies : test_deps + extra_args.get('dependencies', []),
+      install_dir: installed_tests_execdir,
+      install: install,
+    )
+
+    suite = ['glib'] + extra_args.get('suite', [])
+    timeout = suite.contains('slow') ? 120 : 30
+    test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
   endif
 endforeach
 
-c_args_atomic = []
-if cc.get_id() == 'gcc'
-  c_args_atomic += ['-Wstrict-aliasing=2']
-endif
-
-deps = [libm, thread_dep, libglib_dep]
-
-exe = executable('atomic', 'atomic.c',
-  c_args : test_cargs + c_args_atomic,
-  dependencies : deps,
-)
-test('atomic', exe, env : test_env)
-
-# FIXME: consolidate all of these into the array
-exe = executable('overflow-fallback', 'overflow.c',
-  c_args : test_cargs + ['-D_GLIB_TEST_OVERFLOW_FALLBACK'],
-  dependencies : deps,
-  install : false,
-)
-test('overflow-fallback', exe, env : test_env)
-
-exe = executable('642026-ec', '642026.c',
-  c_args : test_cargs + ['-DG_ERRORCHECK_MUTEXES'],
-  dependencies : deps,
-  install : false,
-)
-test('642026-ec', exe, env : test_env, timeout : 90)
-
-exe = executable('1bit-emufutex', '1bit-mutex.c',
-  c_args : test_cargs + ['-DTEST_EMULATED_FUTEX'],
-  dependencies : deps,
-  install : false,
-)
-test('1bit-emufutex', exe, env : test_env)
-
-exe = executable('gwakeup', 'gwakeuptest.c', '../gwakeup.c',
-  c_args : test_cargs,
-  dependencies : deps,
-  install : false)
-test('gwakeup', exe, env : test_env)
-
-if glib_conf.has('HAVE_EVENTFD')
-  exe = executable('gwakeup-fallback', 'gwakeuptest.c', '../gwakeup.c',
-    c_args : test_cargs + ['-DTEST_EVENTFD_FALLBACK'],
-    dependencies : deps,
-    install : false,
-  )
-  test('gwakeup-fallback', exe, env : test_env)
-endif
-
 # test-spawn-echo helper binary required by the spawn tests above
 executable('test-spawn-echo', 'test-spawn-echo.c',
   c_args : test_cargs,
-  dependencies : deps,
-  install : false,
+  dependencies : test_deps,
+  install_dir: installed_tests_execdir,
+  install: installed_tests_enabled,
 )
 
 # some testing of gtester functionality
@@ -190,12 +189,13 @@ if not meson.is_cross_build() and host_system != 'windows'
   if xmllint.found()
     tmpsample_xml = custom_target('tmpsample.xml',
       output : 'tmpsample.xml',
-      build_by_default : true, # hack around meson bug, see PR #1335
       command : [ gtester, '-k', '--quiet', '-o', '@OUTPUT@',
                   '--test-arg=--gtester-selftest', gtester])
 
     test('gtester-xmllint-check', xmllint,
       args : ['--noout', tmpsample_xml],
-      env : test_env)
+      env : test_env,
+      suite : ['glib'],
+    )
   endif
 endif
diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c
index a1e7b051c..34ebfaaf6 100644
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -1822,6 +1822,49 @@ lonely_dash_test (void)
   g_option_context_free (context);
 }
 
+/* test that three dashes are treated as non-options */
+static void
+triple_dash_test (void)
+{
+  GOptionContext *context;
+  GOptionGroup *group;
+  gboolean retval;
+  GError *error = NULL;
+  gchar **argv;
+  gchar **argv_copy;
+  int argc;
+  gint arg1, arg2;
+  GOptionEntry entries [] =
+    { { "foo", 0, 0, G_OPTION_ARG_INT, &arg1, NULL, NULL},
+      { NULL }
+    };
+  GOptionEntry group_entries [] =
+    { { "test", 0, 0, G_OPTION_ARG_INT, &arg2, NULL, NULL},
+      { NULL }
+    };
+
+  context = g_option_context_new (NULL);
+  g_option_context_add_main_entries (context, entries, NULL);
+
+  group = g_option_group_new ("group", "Group description", "Group help", NULL, NULL);
+  g_option_group_add_entries (group, group_entries);
+
+  g_option_context_add_group (context, group);
+
+  /* Now try parsing */
+  argv = split_string ("program ---test 42", &argc);
+  argv_copy = copy_stringv (argv, argc);
+
+  retval = g_option_context_parse (context, &argc, &argv, &error);
+  g_assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_UNKNOWN_OPTION);
+  g_assert (retval == FALSE);
+
+  g_option_context_free (context);
+  g_clear_error (&error);
+  g_strfreev (argv_copy);
+  g_free (argv);
+}
+
 static void
 missing_arg_test (void)
 {
@@ -2507,6 +2550,7 @@ double_free (void)
 
   g_option_context_free (context);
   g_clear_error (&error);
+  g_strfreev (argv);
 
 }
 
@@ -2619,6 +2663,7 @@ main (int   argc,
   /* regression tests for individual bugs */
   g_test_add_func ("/option/bug/unknown-short", unknown_short_test);
   g_test_add_func ("/option/bug/lonely-dash", lonely_dash_test);
+  g_test_add_func ("/option/bug/triple-dash", triple_dash_test);
   g_test_add_func ("/option/bug/missing-arg", missing_arg_test);
   g_test_add_func ("/option/bug/dash-arg", dash_arg_test);
   g_test_add_func ("/option/bug/short-remaining", short_remaining);
diff --git a/glib/tests/rcbox.c b/glib/tests/rcbox.c
new file mode 100644
index 000000000..b1a1342bb
--- /dev/null
+++ b/glib/tests/rcbox.c
@@ -0,0 +1,238 @@
+/* rcbox.c: Reference counted data
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+
+typedef struct {
+  float x, y;
+} Point;
+
+static Point *global_point;
+
+/* test_rcbox_new: Test g_rc_box_new() */
+static void
+test_rcbox_new (void)
+{
+  Point *a = g_rc_box_new (Point);
+
+  g_assert_nonnull (a);
+  g_assert_cmpuint (g_rc_box_get_size (a), ==, sizeof (Point));
+
+  g_rc_box_release (a);
+
+  a = g_rc_box_new0 (Point);
+  g_assert_nonnull (a);
+  g_assert_cmpfloat (a->x, ==, 0.f);
+  g_assert_cmpfloat (a->y, ==, 0.f);
+
+  g_rc_box_release (a);
+}
+
+/* test_atomic_rcbox_new: Test g_atomic_rc_box_new() */
+static void
+test_atomic_rcbox_new (void)
+{
+  Point *a = g_atomic_rc_box_new (Point);
+
+  g_assert_nonnull (a);
+  g_assert_cmpuint (g_atomic_rc_box_get_size (a), ==, sizeof (Point));
+
+  g_atomic_rc_box_release (a);
+
+  a = g_atomic_rc_box_new0 (Point);
+  g_assert_nonnull (a);
+  g_assert_cmpfloat (a->x, ==, 0.f);
+  g_assert_cmpfloat (a->y, ==, 0.f);
+
+  g_atomic_rc_box_release (a);
+}
+
+static void
+point_clear (Point *p)
+{
+  g_assert_nonnull (p);
+  g_assert_true (global_point == p);
+
+  g_assert_cmpfloat (p->x, ==, 42.0f);
+  g_assert_cmpfloat (p->y, ==, 47.0f);
+
+  g_test_message ("global_point = %p", p);
+  global_point = NULL;
+}
+
+/* test_rcbox_release_full: Verify that g_rc_box_release_full() calls
+ * the clear function only when the last reference is released
+ */
+static void
+test_rcbox_release_full (void)
+{
+  Point *p = g_rc_box_new (Point);
+
+  g_assert_nonnull (p);
+  global_point = p;
+
+  p->x = 42.0f;
+  p->y = 47.0f;
+
+  g_assert_true (g_rc_box_acquire (p) == p);
+
+  g_rc_box_release_full (p, (GDestroyNotify) point_clear);
+  g_assert_nonnull (global_point);
+  g_assert_true (p == global_point);
+
+  g_rc_box_release_full (p, (GDestroyNotify) point_clear);
+  g_assert_null (global_point);
+}
+
+/* test_atomic_rcbox_release_full: Verify that g_atomic_rc_box_release_full()
+ * calls the clear function only when the last reference is released
+ */
+static void
+test_atomic_rcbox_release_full (void)
+{
+  Point *p = g_atomic_rc_box_new (Point);
+
+  g_assert_nonnull (p);
+  global_point = p;
+
+  p->x = 42.0f;
+  p->y = 47.0f;
+
+  g_assert_true (g_atomic_rc_box_acquire (p) == p);
+
+  g_atomic_rc_box_release_full (p, (GDestroyNotify) point_clear);
+  g_assert_nonnull (global_point);
+  g_assert_true (p == global_point);
+
+  g_atomic_rc_box_release_full (p, (GDestroyNotify) point_clear);
+  g_assert_null (global_point);
+}
+
+static Point *global_point_a;
+static Point *global_point_b;
+
+static void
+point_clear_dup_a (Point *a)
+{
+  g_assert_true (a == global_point_a);
+
+  g_test_message ("global_point_a = %p", a);
+  global_point_a = NULL;
+}
+
+static void
+point_clear_dup_b (Point *b)
+{
+  g_assert_true (b == global_point_b);
+
+  g_test_message ("global_point_b = %p", b);
+  global_point_b = NULL;
+}
+
+/* test_rcbox_dup: Verify that g_rc_box_dup() copies only the
+ * data and does not change the reference count of the original
+ */
+static void
+test_rcbox_dup (void)
+{
+  Point *a, *b;
+
+  a = g_rc_box_new (Point);
+  a->x = 10.f;
+  a->y = 5.f;
+
+  b = g_rc_box_dup (sizeof (Point), a);
+  g_assert_true (a != b);
+  g_assert_cmpfloat (a->x, ==, b->x);
+  g_assert_cmpfloat (a->y, ==, b->y);
+
+  global_point_a = a;
+  global_point_b = b;
+
+  a->x = 1.f;
+  a->y = 1.f;
+  g_assert_cmpfloat (a->x, !=, b->x);
+  g_assert_cmpfloat (a->y, !=, b->y);
+
+  b->x = 5.f;
+  b->y = 10.f;
+  g_assert_cmpfloat (a->x, !=, b->x);
+  g_assert_cmpfloat (a->y, !=, b->y);
+
+  g_rc_box_release_full (a, (GDestroyNotify) point_clear_dup_a);
+  g_assert_null (global_point_a);
+  g_assert_nonnull (global_point_b);
+
+  g_rc_box_release_full (b, (GDestroyNotify) point_clear_dup_b);
+  g_assert_null (global_point_b);
+}
+
+/* test_atomic_rcbox_dup: Verify that g_atomic_rc_box_dup() copies
+ * only the data and does not change the reference count of the original
+ */
+static void
+test_atomic_rcbox_dup (void)
+{
+  Point *a, *b;
+
+  a = g_atomic_rc_box_new (Point);
+  a->x = 10.f;
+  a->y = 5.f;
+
+  b = g_atomic_rc_box_dup (sizeof (Point), a);
+  g_assert_true (a != b);
+  g_assert_cmpfloat (a->x, ==, b->x);
+  g_assert_cmpfloat (a->y, ==, b->y);
+
+  global_point_a = a;
+  global_point_b = b;
+
+  a->x = 1.f;
+  a->y = 1.f;
+  g_assert_cmpfloat (a->x, !=, b->x);
+  g_assert_cmpfloat (a->y, !=, b->y);
+
+  b->x = 5.f;
+  b->y = 10.f;
+  g_assert_cmpfloat (a->x, !=, b->x);
+  g_assert_cmpfloat (a->y, !=, b->y);
+
+  g_atomic_rc_box_release_full (a, (GDestroyNotify) point_clear_dup_a);
+  g_assert_null (global_point_a);
+  g_assert_nonnull (global_point_b);
+
+  g_atomic_rc_box_release_full (b, (GDestroyNotify) point_clear_dup_b);
+  g_assert_null (global_point_b);
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/rcbox/new", test_rcbox_new);
+  g_test_add_func ("/rcbox/release-full", test_rcbox_release_full);
+  g_test_add_func ("/rcbox/dup", test_rcbox_dup);
+
+  g_test_add_func ("/atomic-rcbox/new", test_atomic_rcbox_new);
+  g_test_add_func ("/atomic-rcbox/release-full", test_atomic_rcbox_release_full);
+  g_test_add_func ("/atomic-rcbox/dup", test_atomic_rcbox_dup);
+
+  return g_test_run ();
+}
diff --git a/glib/tests/refcount.c b/glib/tests/refcount.c
new file mode 100644
index 000000000..dfccc92c7
--- /dev/null
+++ b/glib/tests/refcount.c
@@ -0,0 +1,221 @@
+/* refcount.c: Tests for reference counting types
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <glib.h>
+
+/* test_grefcount: test the behavior of the grefcount API */
+static void
+test_grefcount (void)
+{
+  grefcount a, b;
+
+  /* init(a): 1 */
+  g_ref_count_init (&a);
+  if (g_test_verbose ())
+    g_test_message ("init(a) := %d\n", (int) a);
+  g_assert_true (g_ref_count_compare (&a, 1));
+
+  /* inc(a): 2 */
+  g_ref_count_inc (&a);
+  if (g_test_verbose ())
+    g_test_message ("inc(a) := %d\n", (int) a);
+  g_assert_false (g_ref_count_compare (&a, 1));
+  g_assert_false (g_ref_count_compare (&a, G_MAXINT));
+
+  /* b = a = 2 */
+  b = a;
+  if (g_test_verbose ())
+    g_test_message ("a := %d, b := %d\n", (int) a, (int) b);
+
+  /* inc(a): 3 */
+  g_ref_count_inc (&a);
+  if (g_test_verbose ())
+    g_test_message ("inc(a) := %d\n", (int) a);
+
+  /* dec(b) = 1 */
+  if (g_test_verbose ())
+    g_test_message ("dec(b) := %d + 1\n", (int) b);
+  g_assert_false (g_ref_count_dec (&b));
+
+  /* dec(a) = 2 */
+  if (g_test_verbose ())
+    g_test_message ("dec(a) := %d + 1\n", (int) a);
+  g_assert_false (g_ref_count_dec (&a));
+
+  /* dec(b) = 0 */
+  if (g_test_verbose ())
+    g_test_message ("dec(b) := %d + 1\n", (int) b);
+  g_assert_true (g_ref_count_dec (&b));
+
+  /* dec(a) = 1 */
+  if (g_test_verbose ())
+    g_test_message ("dec(a) := %d + 1\n", (int) a);
+  g_assert_false (g_ref_count_dec (&a));
+
+  /* dec(a) = 0 */
+  if (g_test_verbose ())
+    g_test_message ("dec(a) := %d + 1\n", (int) a);
+  g_assert_true (g_ref_count_dec (&a));
+}
+
+/* test_grefcount_saturation: Saturating a grefcount counter
+ * does not cause an overflow; additionally, if we're building
+ * with checks enabled, it'll cause a warning
+ */
+static void
+test_grefcount_saturation (void)
+{
+  if (g_test_subprocess ())
+    {
+      grefcount a;
+
+      /* We're breaking abstraction here for convenience */
+      a = G_MININT + 1;
+
+      g_ref_count_inc (&a);
+      g_assert_true (a == G_MININT);
+
+      g_ref_count_inc (&a);
+      g_assert_true (a == G_MININT);
+
+      exit (0);
+    }
+
+  g_test_trap_subprocess (NULL, 0, 0);
+
+#ifndef G_DISABLE_CHECKS
+  /* Ensure that we got a warning when building with checks; the
+   * test will fail because of the critical warning being caught
+   * by GTest
+   */
+  g_test_trap_assert_failed ();
+  g_test_trap_assert_stderr ("*saturation*");
+#else
+  /* With checks disabled we don't get any warning */
+  g_test_trap_assert_passed ();
+#endif
+}
+
+/* test_gatomicrefcount: test the behavior of the gatomicrefcount API */
+static void
+test_gatomicrefcount (void)
+{
+  gatomicrefcount a, b;
+
+  /* init(a): 1 */
+  g_atomic_ref_count_init (&a);
+  if (g_test_verbose ())
+    g_test_message ("init(a) := %d\n", (int) a);
+  g_assert_true (g_atomic_ref_count_compare (&a, 1));
+
+  /* inc(a): 2 */
+  g_atomic_ref_count_inc (&a);
+  if (g_test_verbose ())
+    g_test_message ("inc(a) := %d\n", (int) a);
+  g_assert_false (g_atomic_ref_count_compare (&a, 1));
+  g_assert_false (g_atomic_ref_count_compare (&a, G_MAXINT));
+
+  /* b = a = 2 */
+  b = a;
+  if (g_test_verbose ())
+    g_test_message ("a := %d, b := %d\n", (int) a, (int) b);
+
+  /* inc(a): 3 */
+  g_atomic_ref_count_inc (&a);
+  if (g_test_verbose ())
+    g_test_message ("inc(a) := %d\n", (int) a);
+
+  /* dec(b) = 1 */
+  if (g_test_verbose ())
+    g_test_message ("dec(b) := %d + 1\n", (int) b);
+  g_assert_false (g_atomic_ref_count_dec (&b));
+
+  /* dec(a) = 2 */
+  if (g_test_verbose ())
+    g_test_message ("dec(a) := %d + 1\n", (int) a);
+  g_assert_false (g_atomic_ref_count_dec (&a));
+
+  /* dec(b) = 0 */
+  if (g_test_verbose ())
+    g_test_message ("dec(b) := %d + 1\n", (int) b);
+  g_assert_true (g_atomic_ref_count_dec (&b));
+
+  /* dec(a) = 1 */
+  if (g_test_verbose ())
+    g_test_message ("dec(a) := %d + 1\n", (int) a);
+  g_assert_false (g_atomic_ref_count_dec (&a));
+
+  /* dec(a) = 0 */
+  if (g_test_verbose ())
+    g_test_message ("dec(a) := %d + 1\n", (int) a);
+  g_assert_true (g_atomic_ref_count_dec (&a));
+}
+
+/* test_grefcount_saturation: Saturating a gatomicrefcount counter
+ * does not cause an overflow; additionally, if we're building
+ * with checks enabled, it'll cause a warning
+ */
+static void
+test_gatomicrefcount_saturation (void)
+{
+  if (g_test_subprocess ())
+    {
+      gatomicrefcount a;
+
+      /* We're breaking abstraction here for convenience */
+      a = G_MAXINT - 1;
+
+      g_atomic_ref_count_inc (&a);
+      g_assert_true (a == G_MAXINT);
+
+      g_atomic_ref_count_inc (&a);
+      g_assert_true (a == G_MAXINT);
+
+      exit (0);
+    }
+
+  g_test_trap_subprocess (NULL, 0, 0);
+
+#ifndef G_DISABLE_CHECKS
+  /* Ensure that we got a warning when building with checks; the
+   * test will fail because of the critical warning being caught
+   * by GTest
+   */
+  g_test_trap_assert_failed ();
+  g_test_trap_assert_stderr ("*saturation*");
+#else
+  /* With checks disabled we don't get any warning */
+  g_test_trap_assert_passed ();
+#endif
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/refcount/grefcount", test_grefcount);
+  g_test_add_func ("/refcount/grefcount/saturation", test_grefcount_saturation);
+
+  g_test_add_func ("/refcount/gatomicrefcount", test_gatomicrefcount);
+  g_test_add_func ("/refcount/gatomicrefcount/saturation", test_gatomicrefcount_saturation);
+
+  return g_test_run ();
+}
diff --git a/glib/tests/refstring.c b/glib/tests/refstring.c
new file mode 100644
index 000000000..41ab0c05c
--- /dev/null
+++ b/glib/tests/refstring.c
@@ -0,0 +1,122 @@
+/* refstring.c: Reference counted strings
+ *
+ * Copyright 2018  Emmanuele Bassi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+#include <string.h>
+
+/* test_refstring_base: Test the base API of GRefString */
+static void
+test_refstring_base (void)
+{
+  char *s = g_ref_string_new ("hello, world");
+
+  g_test_message ("s = '%s' (%p)", s, s);
+  g_assert_cmpint (strcmp (s, "hello, world"), ==, 0);
+  g_assert_cmpint (strlen (s), ==, strlen ("hello, world"));
+  g_assert_cmpuint (g_ref_string_length (s), ==, strlen ("hello, world"));
+
+  g_assert_true (g_ref_string_acquire (s) == s);
+  g_ref_string_release (s);
+
+  g_ref_string_release (s);
+}
+
+/* test_refstring_length: Test the _len variant */
+static void
+test_refstring_length (void)
+{
+  char buf[] = {'h', 'e', 'l', 'l', 'o'}; /* no NUL */
+  char *s = g_ref_string_new_len (buf, 5);
+
+  g_assert_cmpstr (s, ==, "hello");
+  g_assert_cmpint (strlen (s), ==, strlen ("hello"));
+  g_assert_cmpuint (g_ref_string_length (s), ==, strlen ("hello"));
+  g_ref_string_release (s);
+}
+
+/* test_refstring_length: Test the _len variant with no size set */
+static void
+test_refstring_length_auto (void)
+{
+  char *s = g_ref_string_new_len ("hello", -1);
+  g_assert_cmpstr (s, ==, "hello");
+  g_assert_cmpuint (g_ref_string_length (s), ==, strlen ("hello"));
+  g_ref_string_release (s);
+}
+
+/* test_refstring_length_nuls: Test the _len variant */
+static void
+test_refstring_length_nuls (void)
+{
+  char buf[] = {'h', 'e', '\0', 'l', 'o'}; /* no NUL */
+  char *s = g_ref_string_new_len (buf, 5);
+
+  g_assert_cmpstr (s, ==, "he");
+  g_assert_cmpint (memcmp (s, "he\0lo", 5), ==, 0);
+  g_assert_cmpuint (g_ref_string_length (s), ==, 5);
+  g_ref_string_release (s);
+}
+
+/* test_refstring_intern: Test the interning API of GRefString */
+static void
+test_refstring_intern (void)
+{
+  char *s = g_ref_string_new_intern ("hello, world");
+  char *p;
+
+  g_test_message ("s = '%s' (%p)", s, s);
+  g_assert_cmpstr (s, ==, "hello, world");
+
+  p = g_ref_string_new_intern ("hello, world");
+  g_test_message ("p = s = '%s' (%p)", p, p);
+  g_assert_true (s == p);
+
+  g_test_message ("releasing p[%p] ('%s')", p, p);
+  g_ref_string_release (p);
+
+  p = g_ref_string_new_intern ("goodbye, world");
+  g_test_message ("p = '%s' (%p)", p, p);
+  g_assert_false (s == p);
+
+  g_test_message ("releasing p[%p] ('%s')", p, p);
+  g_ref_string_release (p);
+
+  g_test_message ("releasing s[%p] ('%s')", s, s);
+  g_ref_string_release (s);
+
+  p = g_ref_string_new_intern ("hello, world");
+  g_test_message ("p[%p] ('%s') != s[%p]", p, p, s);
+  g_assert_false (s == p);
+  g_ref_string_release (p);
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/refstring/base", test_refstring_base);
+  g_test_add_func ("/refstring/length", test_refstring_length);
+  g_test_add_func ("/refstring/length-auto", test_refstring_length_auto);
+  g_test_add_func ("/refstring/length-nuls", test_refstring_length_nuls);
+  g_test_add_func ("/refstring/intern", test_refstring_intern);
+
+  return g_test_run ();
+}
+
diff --git a/glib/tests/sequence.c b/glib/tests/sequence.c
index f01738f7f..8e74d090a 100644
--- a/glib/tests/sequence.c
+++ b/glib/tests/sequence.c
@@ -1379,6 +1379,8 @@ test_empty (void)
     }
 
   g_assert_true (g_sequence_is_empty (seq));
+
+  g_sequence_free (seq);
 }
 
 int
diff --git a/glib/tests/spawn-singlethread.c b/glib/tests/spawn-singlethread.c
index 7985eef7f..909f702fc 100644
--- a/glib/tests/spawn-singlethread.c
+++ b/glib/tests/spawn-singlethread.c
@@ -25,8 +25,14 @@
 
 #include <glib.h>
 #include <string.h>
+#include <fcntl.h>
+
+#ifdef G_OS_UNIX
+#include <glib-unix.h>
+#endif
 
 #ifdef G_OS_WIN32
+#include <io.h>
 #define LINEEND "\r\n"
 #else
 #define LINEEND "\n"
@@ -156,6 +162,151 @@ test_spawn_async (void)
   g_free (arg);
 }
 
+/* Windows close() causes failure through the Invalid Parameter Handler
+ * Routine if the file descriptor does not exist.
+ */
+static void
+sane_close (int fd)
+{
+  if (fd >= 0)
+    close (fd);
+}
+
+/* Test g_spawn_async_with_fds() with a variety of different inputs */
+static void
+test_spawn_async_with_fds (void)
+{
+  int tnum = 1;
+  GPtrArray *argv;
+  char *arg;
+  int i;
+
+  /* Each test has 3 variable parameters: stdin, stdout, stderr */
+  enum fd_type {
+    NO_FD,        /* pass fd -1 (unset) */
+    FD_NEGATIVE,  /* pass fd of negative value (equivalent to unset) */
+    PIPE,         /* pass fd of new/unique pipe */
+    STDOUT_PIPE,  /* pass the same pipe as stdout */
+  } tests[][3] = {
+    { NO_FD, NO_FD, NO_FD },       /* Test with no fds passed */
+    { NO_FD, FD_NEGATIVE, NO_FD }, /* Test another negative fd value */
+    { PIPE, PIPE, PIPE },          /* Test with unique fds passed */
+    { NO_FD, PIPE, STDOUT_PIPE },  /* Test the same fd for stdout + stderr */
+  };
+
+  arg = g_strdup_printf ("thread %d", tnum);
+
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, echo_prog_path);
+  g_ptr_array_add (argv, arg);
+  g_ptr_array_add (argv, NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (tests); i++)
+    {
+      GError *error = NULL;
+      GPid pid;
+      GMainContext *context;
+      GMainLoop *loop;
+      GIOChannel *channel = NULL;
+      GSource *source;
+      SpawnAsyncMultithreadedData data;
+      enum fd_type *fd_info = tests[i];
+      gint test_pipe[3][2];
+      int j;
+
+      for (j = 0; j < 3; j++)
+        {
+          switch (fd_info[j])
+            {
+            case NO_FD:
+              test_pipe[j][0] = -1;
+              test_pipe[j][1] = -1;
+              break;
+            case FD_NEGATIVE:
+              test_pipe[j][0] = -5;
+              test_pipe[j][1] = -5;
+              break;
+            case PIPE:
+#ifdef G_OS_UNIX
+              g_unix_open_pipe (test_pipe[j], FD_CLOEXEC, &error);
+              g_assert_no_error (error);
+#else
+              g_assert_cmpint (_pipe (test_pipe[j], 4096, _O_BINARY), >=, 0);
+#endif
+              break;
+            case STDOUT_PIPE:
+              g_assert_cmpint (j, ==, 2); /* only works for stderr */
+              test_pipe[j][0] = test_pipe[1][0];
+              test_pipe[j][1] = test_pipe[1][1];
+              break;
+            default:
+              g_assert_not_reached ();
+            }
+        }
+
+      context = g_main_context_new ();
+      loop = g_main_loop_new (context, TRUE);
+
+      g_spawn_async_with_fds (NULL, (char**)argv->pdata, NULL,
+			      G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid,
+			      test_pipe[0][0], test_pipe[1][1], test_pipe[2][1],
+			      &error);
+      g_assert_no_error (error);
+      sane_close (test_pipe[0][0]);
+      sane_close (test_pipe[1][1]);
+      if (fd_info[2] != STDOUT_PIPE)
+        sane_close (test_pipe[2][1]);
+
+      data.loop = loop;
+      data.stdout_done = FALSE;
+      data.child_exited = FALSE;
+      data.stdout_buf = g_string_new (0);
+
+      source = g_child_watch_source_new (pid);
+      g_source_set_callback (source, (GSourceFunc)on_child_exited, &data, NULL);
+      g_source_attach (source, context);
+      g_source_unref (source);
+
+      if (test_pipe[1][0] >= 0)
+        {
+          channel = g_io_channel_unix_new (test_pipe[1][0]);
+          source = g_io_create_watch (channel, G_IO_IN | G_IO_HUP | G_IO_ERR);
+          g_source_set_callback (source, (GSourceFunc)on_child_stdout,
+                                 &data, NULL);
+          g_source_attach (source, context);
+          g_source_unref (source);
+        }
+      else
+        {
+          /* Don't check stdout data if we didn't pass a fd */
+          data.stdout_done = TRUE;
+        }
+
+      g_main_loop_run (loop);
+
+      g_assert_true (data.child_exited);
+
+      if (test_pipe[1][0] >= 0)
+        {
+          /* Check for echo on stdout */
+          g_assert_true (data.stdout_done);
+          g_assert_cmpstr (data.stdout_buf->str, ==, arg);
+          g_io_channel_unref (channel);
+        }
+      g_string_free (data.stdout_buf, TRUE);
+
+      g_main_context_unref (context);
+      g_main_loop_unref (loop);
+      sane_close (test_pipe[0][1]);
+      sane_close (test_pipe[1][0]);
+      if (fd_info[2] != STDOUT_PIPE)
+        sane_close (test_pipe[2][0]);
+    }
+
+  g_ptr_array_free (argv, TRUE);
+  g_free (arg);
+}
+
 static void
 test_spawn_sync (void)
 {
@@ -181,6 +332,35 @@ test_spawn_sync (void)
   g_ptr_array_free (argv, TRUE);
 }
 
+/* Like test_spawn_sync but uses spawn flags that trigger the optimized
+ * posix_spawn codepath.
+ */
+static void
+test_posix_spawn (void)
+{
+  int tnum = 1;
+  GError *error = NULL;
+  GPtrArray *argv;
+  char *arg;
+  char *stdout_str;
+  int estatus;
+  GSpawnFlags flags = G_SPAWN_CLOEXEC_PIPES | G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
+
+  arg = g_strdup_printf ("thread %d", tnum);
+
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, echo_prog_path);
+  g_ptr_array_add (argv, arg);
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char**)argv->pdata, NULL, flags, NULL, NULL, &stdout_str, NULL, &estatus, &error);
+  g_assert_no_error (error);
+  g_assert_cmpstr (arg, ==, stdout_str);
+  g_free (arg);
+  g_free (stdout_str);
+  g_ptr_array_free (argv, TRUE);
+}
+
 static void
 test_spawn_script (void)
 {
@@ -200,6 +380,30 @@ test_spawn_script (void)
   g_ptr_array_free (argv, TRUE);
 }
 
+/* Test that spawning a non-existent executable returns %G_SPAWN_ERROR_NOENT. */
+static void
+test_spawn_nonexistent (void)
+{
+  GError *error = NULL;
+  GPtrArray *argv = NULL;
+  gchar *stdout_str = NULL;
+  gint exit_status = -1;
+
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, "this does not exist");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char**) argv->pdata, NULL, 0, NULL, NULL, &stdout_str,
+                NULL, &exit_status, &error);
+  g_assert_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT);
+  g_assert_null (stdout_str);
+  g_assert_cmpint (exit_status, ==, -1);
+
+  g_ptr_array_free (argv, TRUE);
+
+  g_clear_error (&error);
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -229,7 +433,10 @@ main (int   argc,
 
   g_test_add_func ("/gthread/spawn-single-sync", test_spawn_sync);
   g_test_add_func ("/gthread/spawn-single-async", test_spawn_async);
+  g_test_add_func ("/gthread/spawn-single-async-with-fds", test_spawn_async_with_fds);
   g_test_add_func ("/gthread/spawn-script", test_spawn_script);
+  g_test_add_func ("/gthread/spawn/nonexistent", test_spawn_nonexistent);
+  g_test_add_func ("/gthread/spawn-posix-spawn", test_posix_spawn);
 
   ret = g_test_run();
 
diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c
index 7e031bdb1..d974ad436 100644
--- a/glib/tests/strfuncs.c
+++ b/glib/tests/strfuncs.c
@@ -1037,7 +1037,11 @@ test_strtod (void)
   check_strtod_number (0.75, "%5.2f", " 0.75");
   check_strtod_number (-0.75, "%0.2f", "-0.75");
   check_strtod_number (-0.75, "%5.2f", "-0.75");
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
+  /* FIXME: The included gnulib and the mingw-w64 implementation
+   * currently don't follow C99 and print 3 digits for the exponent.
+   * In case of mingw-w64 this was fixed but not released yet:
+   * https://sourceforge.net/p/mingw-w64/bugs/732/ */
   check_strtod_number (1e99, "%0.e", "1e+099");
 #else
   check_strtod_number (1e99, "%.0e", "1e+99");
@@ -1324,30 +1328,31 @@ test_strip_context (void)
   g_assert (s == msgval + 7);
 }
 
+/* Test the strings returned by g_strerror() are valid and unique. On Windows,
+ * fewer than 200 error numbers are used, so we expect some strings to
+ * return a generic ‘unknown error code’ message. */
 static void
 test_strerror (void)
 {
   GHashTable *strs;
   gint i;
-  const gchar *str;
-  GHashTableIter iter;
+  const gchar *str, *unknown_str;
 
   setlocale (LC_ALL, "C");
 
+  unknown_str = g_strerror (-1);
   strs = g_hash_table_new (g_str_hash, g_str_equal);
   for (i = 1; i < 200; i++)
     {
+      gboolean is_unknown;
       str = g_strerror (i);
+      is_unknown = (strcmp (str, unknown_str) == 0);
       g_assert (str != NULL);
       g_assert (g_utf8_validate (str, -1, NULL));
-      g_assert_false (g_hash_table_contains (strs, str));
+      g_assert_true (!g_hash_table_contains (strs, str) || is_unknown);
       g_hash_table_add (strs, (char *)str);
     }
 
-  g_hash_table_iter_init (&iter, strs);
-  while (g_hash_table_iter_next (&iter, (gpointer *)&str, NULL))
-    g_assert (g_utf8_validate (str, -1, NULL));
-
   g_hash_table_unref (strs);
 }
 
diff --git a/glib/tests/test-printf.c b/glib/tests/test-printf.c
index 377e3b5e7..486ae6d4f 100644
--- a/glib/tests/test-printf.c
+++ b/glib/tests/test-printf.c
@@ -24,6 +24,10 @@
 #include <string.h>
 #include "glib.h"
 #include "gstdio.h"
+#ifdef G_OS_WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
 
 static void
 test_retval_and_trunc (void)
@@ -637,11 +641,7 @@ test_positional_params2 (void)
     }
   g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_passed ();
-#ifndef G_OS_WIN32
   g_test_trap_assert_stdout ("a b\n   ab\nabcabc\n");
-#else
-  g_test_trap_assert_stdout ("a b\r\n   ab\r\nabcabc\r\n");
-#endif
 }
 
 static void
@@ -858,25 +858,17 @@ _Pragma ("GCC diagnostic pop")
 static void
 test_64bit2 (void)
 {
-#ifndef G_OS_WIN32
   g_test_trap_subprocess ("/printf/test-64bit/subprocess/base", 0, 0);
   g_test_trap_assert_passed ();
   g_test_trap_assert_stdout ("123456\n-123456\n123456\n"
                              "361100\n0361100\n1e240\n"
                              "0x1e240\n1E240\n");
-
-#else
-  g_test_trap_subprocess ("/printf/test-64bit/subprocess/base", 0, 0);
-  g_test_trap_assert_passed ();
-  g_test_trap_assert_stdout ("123456\r\n-123456\r\n123456\r\n"
-                             "361100\r\n0361100\r\n1e240\r\n"
-                             "0x1e240\r\n1E240\r\n");
-
+#ifdef G_OS_WIN32
   g_test_trap_subprocess ("/printf/test-64bit/subprocess/win32", 0, 0);
   g_test_trap_assert_passed ();
-  g_test_trap_assert_stdout ("123456\r\n-123456\r\n123456\r\n"
-                             "361100\r\n0361100\r\n1e240\r\n"
-                             "0x1e240\r\n1E240\r\n");
+  g_test_trap_assert_stdout ("123456\n-123456\n123456\n"
+                             "361100\n0361100\n1e240\n"
+                             "0x1e240\n1E240\n");
 #endif
 }
 
@@ -907,6 +899,13 @@ int
 main (int   argc,
       char *argv[])
 {
+#ifdef G_OS_WIN32
+  /* Ensure binary mode for stdout, this way
+   * tests produce \n line endings on Windows instead of the
+   * default \r\n.
+   */
+  _setmode (fileno (stdout), _O_BINARY);
+#endif
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/snprintf/retval-and-trunc", test_retval_and_trunc);
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index 391350614..de95f2635 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -61,6 +61,13 @@ test_assertions_bad_cmpmem_data (void)
 }
 
 static void
+test_assertions_bad_cmpfloat_epsilon (void)
+{
+  g_assert_cmpfloat_with_epsilon (3.14, 3.15, 0.001);
+  exit (0);
+}
+
+static void
 test_assertions (void)
 {
   gchar *fuu;
@@ -68,6 +75,8 @@ test_assertions (void)
   g_assert_cmphex (2, ==, 2);
   g_assert_cmpfloat (3.3, !=, 7);
   g_assert_cmpfloat (7, <=, 3 + 4);
+  g_assert_cmpfloat_with_epsilon (3.14, 3.15, 0.01);
+  g_assert_cmpfloat_with_epsilon (3.14159, 3.1416, 0.0001);
   g_assert (TRUE);
   g_assert_cmpstr ("foo", !=, "faa");
   fuu = g_strdup_printf ("f%s", "uu");
@@ -98,6 +107,10 @@ test_assertions (void)
   g_test_trap_assert_failed ();
   g_test_trap_assert_stderr ("*assertion failed*");
   g_test_trap_assert_stderr_unmatched ("*assertion failed*len*");
+
+  g_test_trap_subprocess ("/misc/assertions/subprocess/bad_cmpfloat_epsilon", 0, 0);
+  g_test_trap_assert_failed ();
+  g_test_trap_assert_stderr ("*assertion failed*");
 }
 
 /* test g_test_timer* API */
@@ -740,6 +753,7 @@ main (int   argc,
   g_test_add_func ("/misc/assertions/subprocess/bad_cmpint", test_assertions_bad_cmpint);
   g_test_add_func ("/misc/assertions/subprocess/bad_cmpmem_len", test_assertions_bad_cmpmem_len);
   g_test_add_func ("/misc/assertions/subprocess/bad_cmpmem_data", test_assertions_bad_cmpmem_data);
+  g_test_add_func ("/misc/assertions/subprocess/bad_cmpfloat_epsilon", test_assertions_bad_cmpfloat_epsilon);
   g_test_add_data_func ("/misc/test-data", (void*) 0xc0c0baba, test_data_test);
   g_test_add ("/misc/primetoul", Fixturetest, (void*) 0xc0cac01a, fixturetest_setup, fixturetest_test, fixturetest_teardown);
   if (g_test_perf())
diff --git a/glib/tests/thread.c b/glib/tests/thread.c
index b80019009..b9f87967b 100644
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <errno.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -146,8 +147,8 @@ test_thread4 (void)
   getrlimit (RLIMIT_NPROC, &nl);
   nl.rlim_cur = 1;
 
-  if ((ret = prlimit (getpid(), RLIMIT_NPROC, &nl, &ol)) != 0)
-    g_error ("prlimit failed: %s", g_strerror (ret));
+  if ((ret = prlimit (getpid (), RLIMIT_NPROC, &nl, &ol)) != 0)
+    g_error ("prlimit failed: %s", g_strerror (errno));
 
   error = NULL;
   thread = g_thread_try_new ("a", thread1_func, NULL, &error);
@@ -156,7 +157,7 @@ test_thread4 (void)
   g_error_free (error);
 
   if ((ret = prlimit (getpid (), RLIMIT_NPROC, &ol, NULL)) != 0)
-    g_error ("resetting RLIMIT_NPROC failed: %s", g_strerror (ret));
+    g_error ("resetting RLIMIT_NPROC failed: %s", g_strerror (errno));
 #endif
 }
 
diff --git a/glib/tests/unicode.c b/glib/tests/unicode.c
index c81c9b8e8..34c697150 100644
--- a/glib/tests/unicode.c
+++ b/glib/tests/unicode.c
@@ -297,6 +297,13 @@ test_unichar_script (void)
     { G_UNICODE_SCRIPT_NUSHU,                  0x1B170 },
     { G_UNICODE_SCRIPT_SOYOMBO,                0x11A50 },
     { G_UNICODE_SCRIPT_ZANABAZAR_SQUARE,       0x11A00 },
+    { G_UNICODE_SCRIPT_DOGRA,                  0x11800 },
+    { G_UNICODE_SCRIPT_GUNJALA_GONDI,          0x11D60 },
+    { G_UNICODE_SCRIPT_HANIFI_ROHINGYA,        0x10D00 },
+    { G_UNICODE_SCRIPT_MAKASAR,                0x11EE0 },
+    { G_UNICODE_SCRIPT_MEDEFAIDRIN,            0x16E40 },
+    { G_UNICODE_SCRIPT_OLD_SOGDIAN,            0x10F00 },
+    { G_UNICODE_SCRIPT_SOGDIAN,                0x10F30 },
   };
   for (i = 0; i < G_N_ELEMENTS (examples); i++)
     g_assert_cmpint (g_unichar_get_script (examples[i].c), ==, examples[i].script);
@@ -895,6 +902,15 @@ test_iso15924 (void)
     { G_UNICODE_SCRIPT_NUSHU,                  "Nshu" },
     { G_UNICODE_SCRIPT_SOYOMBO,                "Soyo" },
     { G_UNICODE_SCRIPT_ZANABAZAR_SQUARE,       "Zanb" },
+
+    /* Unicode 11.0 additions */
+    { G_UNICODE_SCRIPT_DOGRA,                  "Dogr" },
+    { G_UNICODE_SCRIPT_GUNJALA_GONDI,          "Gong" },
+    { G_UNICODE_SCRIPT_HANIFI_ROHINGYA,        "Rohg" },
+    { G_UNICODE_SCRIPT_MAKASAR,                "Maka" },
+    { G_UNICODE_SCRIPT_MEDEFAIDRIN,            "Medf" },
+    { G_UNICODE_SCRIPT_OLD_SOGDIAN,            "Sogo" },
+    { G_UNICODE_SCRIPT_SOGDIAN,                "Sogd" },
   };
   guint i;
 
diff --git a/glib/tests/utils.c b/glib/tests/utils.c
index 7f8edd8da..95c6138e4 100644
--- a/glib/tests/utils.c
+++ b/glib/tests/utils.c
@@ -517,6 +517,22 @@ test_clear_pointer (void)
   g_assert (a == NULL);
 }
 
+/* Test that g_clear_pointer() works with a GDestroyNotify which contains a cast.
+ * See https://gitlab.gnome.org/GNOME/glib/issues/1425 */
+static void
+test_clear_pointer_cast (void)
+{
+  GHashTable *hash_table = NULL;
+
+  hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+
+  g_assert_nonnull (hash_table);
+
+  g_clear_pointer (&hash_table, (void (*) (GHashTable *)) g_hash_table_destroy);
+
+  g_assert_null (hash_table);
+}
+
 static int obj_count;
 
 static void
@@ -656,6 +672,7 @@ main (int   argc,
   g_test_add_func ("/utils/specialdir", test_special_dir);
   g_test_add_func ("/utils/specialdir/desktop", test_desktop_special_dir);
   g_test_add_func ("/utils/clear-pointer", test_clear_pointer);
+  g_test_add_func ("/utils/clear-pointer-cast", test_clear_pointer_cast);
   g_test_add_func ("/utils/take-pointer", test_take_pointer);
   g_test_add_func ("/utils/clear-source", test_clear_source);
   g_test_add_func ("/utils/misc-mem", test_misc_mem);
diff --git a/glib/update-gtranslit.py b/glib/update-gtranslit.py
index 01f7c7f84..159876b6c 100755
--- a/glib/update-gtranslit.py
+++ b/glib/update-gtranslit.py
@@ -104,7 +104,7 @@ class Mapping:
         return [self]
 
     def serialise(self, serialiser):
-        if self.serialised == None:
+        if self.serialised is None:
             self.serialised = serialiser.add_mapping(self.mapping)
 
         return self.serialised
@@ -193,7 +193,7 @@ class Chain:
             return [self]
 
     def serialise(self, serialiser):
-        if self.serialised == None:
+        if self.serialised is None:
             # Before we serialise, see if we can optimise a bit
             self.chain = sum((item.get_flattened() for item in self.chain), [])
 
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 00e0e68d4..26578dd0c 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -15,7 +15,6 @@ EXTRA_DIST +=				\
 		gmodule-dyld.c		\
 		gmodule-win32.c		\
 		gmodule-ar.c		\
-		gmoduleconf.h.win32 	\
 		gmodule.rc.in
 
 BUILT_EXTRA_DIST += \
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 37aac0737..3ac47863f 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -218,19 +218,7 @@ gobject.def: libgobject-2.0.la
 gobject-2.0.lib: libgobject-2.0.la gobject.def
 	$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gobject.def -out:$@
 
-# ------ MSVC Project File Generation ------
-MSVCPROJS = gobject
-
-gobject_FILES = $(libgobject_2_0_la_SOURCES)
-gobject_EXCLUDES = dummy
-
-gobject_HEADERS_DIR = $(libgobjectincludedir)
-gobject_HEADERS_INST = $(gobject_public_h_sources)
-gobject_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/gobject.vcproj $(top_builddir)/win32/vs9/gobject.headers
+dist-hook: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)'; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/gobject/gbinding.c b/gobject/gbinding.c
index 899dc84fd..6872b9662 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.c
@@ -748,7 +748,7 @@ g_binding_get_target_property (GBinding *binding)
 
 /**
  * g_binding_unbind:
- * @binding: a #GBinding
+ * @binding: (transfer full): a #GBinding
  *
  * Explicitly releases the binding between the source and the target
  * property expressed by @binding.
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index b42af60bb..188c74ad8 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "../glib/valgrind.h"
+#include "../glib/gvalgrind.h"
 #include <string.h>
 
 #include <ffi.h>
@@ -200,6 +200,7 @@ g_closure_new_simple (guint           sizeof_closure,
 
   private_size = sizeof (GRealClosure) - sizeof (GClosure);
 
+#ifdef ENABLE_VALGRIND
   /* See comments in gtype.c about what's going on here... */
   if (RUNNING_ON_VALGRIND)
     {
@@ -213,6 +214,7 @@ g_closure_new_simple (guint           sizeof_closure,
       VALGRIND_MALLOCLIKE_BLOCK (allocated + sizeof (gpointer), private_size - sizeof (gpointer), 0, TRUE);
     }
   else
+#endif
     allocated = g_malloc0 (private_size + sizeof_closure);
 
   closure = (GClosure *) (allocated + private_size);
@@ -613,6 +615,7 @@ g_closure_unref (GClosure *closure)
       closure_invoke_notifiers (closure, FNOTIFY);
       g_free (closure->notifiers);
 
+#ifdef ENABLE_VALGRIND
       /* See comments in gtype.c about what's going on here... */
       if (RUNNING_ON_VALGRIND)
         {
@@ -627,6 +630,7 @@ g_closure_unref (GClosure *closure)
           VALGRIND_FREELIKE_BLOCK (closure, 0);
         }
       else
+#endif
         g_free (G_REAL_CLOSURE (closure));
     }
 }
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index fe9a10756..de05232ce 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -218,7 +218,7 @@ def parse_entries(file, file_name):
             if options is not None:
                 options = parse_trigraph(options)
                 if 'skip' not in options:
-                    entries.append((name, value, options['nick']))
+                    entries.append((name, value, options.get('nick')))
             else:
                 entries.append((name, value))
         elif re.match(r's*\#', line):
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 555ca3fae..534b4fb5c 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -498,7 +498,7 @@ g_object_do_class_init (GObjectClass *class)
    *                   text_view)
    * ]|
    * It is important to note that you must use
-   * [canonical][canonical-parameter-name] parameter names as
+   * [canonical parameter names][canonical-parameter-names] as
    * detail strings for the notify signal.
    */
   gobject_signals[NOTIFY] =
@@ -3378,7 +3378,7 @@ g_object_unref (gpointer _object)
  **/
 #undef g_clear_object
 void
-g_clear_object (volatile GObject **object_ptr)
+g_clear_object (GObject **object_ptr)
 {
   g_clear_pointer (object_ptr, g_object_unref);
 }
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 838046fe0..b5648f137 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -507,7 +507,7 @@ GLIB_AVAILABLE_IN_ALL
 void        g_object_remove_weak_pointer      (GObject        *object, 
                                                gpointer       *weak_pointer_location);
 
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
+#if defined(g_has_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
 /* Make reference APIs type safe with macros */
 #define g_object_ref(Obj)      ((__typeof__(Obj)) (g_object_ref) (Obj))
 #define g_object_ref_sink(Obj) ((__typeof__(Obj)) (g_object_ref_sink) (Obj))
@@ -668,7 +668,7 @@ G_STMT_START { \
     G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
 
 GLIB_AVAILABLE_IN_ALL
-void    g_clear_object (volatile GObject **object_ptr);
+void    g_clear_object (GObject **object_ptr);
 #define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref)
 
 /**
diff --git a/gobject/gobject_gdb.py b/gobject/gobject_gdb.py
index 1746576fd..263ac78b6 100644
--- a/gobject/gobject_gdb.py
+++ b/gobject/gobject_gdb.py
@@ -26,7 +26,7 @@ def g_type_to_typenode (gtype):
         if typenode == 0:
             return None
         val = read_global_var ("static_fundamental_type_nodes")
-        if val == None:
+        if val is None:
             return None
         return val[typenode >> 2].address
 
@@ -132,7 +132,7 @@ def pretty_printer_lookup (val):
     return None
 
 def get_signal_name (id):
-    if id == None:
+    if id is None:
         return None
     id = long(id)
     if id == 0:
@@ -163,7 +163,7 @@ class SignalFrame(FrameDecorator):
     def read_var (self, frame, name, array = None):
         try:
             v = frame_var (frame, name)
-            if v == None or v.is_optimized_out:
+            if v is None or v.is_optimized_out:
                 return None
             if array != None:
                 array.append (v)
@@ -174,7 +174,7 @@ class SignalFrame(FrameDecorator):
     def read_object (self, frame, name, array = None):
         try:
             v = frame_var (frame, name)
-            if v == None or v.is_optimized_out:
+            if v is None or v.is_optimized_out:
                 return None
             v = v.cast (gdb.lookup_type("GObject").pointer())
             # Ensure this is a somewhat correct object pointer
@@ -323,7 +323,7 @@ class GFrameFilter(object):
         return GFrameDecorator(iterator)
 
 def register (obj):
-    if obj == None:
+    if obj is None:
         obj = gdb
 
     if HAVE_GDB_FRAMEDECORATOR:
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 275a8b60b..1acc0a075 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "../glib/valgrind.h"
+#include "../glib/gvalgrind.h"
 #include <string.h>
 
 #include "gtype.h"
@@ -76,7 +76,7 @@
  *
  * Type instance and class structs are limited to a total of 64 KiB,
  * including all parent types. Similarly, type instances' private data
- * (as created by g_type_class_add_private()) are limited to a total of
+ * (as created by G_ADD_PRIVATE()) are limited to a total of
  * 64 KiB. If a type instance needs a large static buffer, allocate it
  * separately (typically by using #GArray or #GPtrArray) and put a pointer
  * to the buffer in the structure.
@@ -1132,11 +1132,7 @@ type_data_make_W (TypeNode              *node,
       data->instance.class_private_size = 0;
       if (pnode)
         data->instance.class_private_size = pnode->data->instance.class_private_size;
-#ifdef	DISABLE_MEM_POOLS
-      data->instance.n_preallocs = 0;
-#else	/* !DISABLE_MEM_POOLS */
       data->instance.n_preallocs = MIN (info->n_preallocs, 1024);
-#endif	/* !DISABLE_MEM_POOLS */
       data->instance.instance_init = info->instance_init;
     }
   else if (node->is_classed) /* only classed */
@@ -1831,6 +1827,7 @@ g_type_create_instance (GType type)
   private_size = node->data->instance.private_size;
   ivar_size = node->data->instance.instance_size;
 
+#ifdef ENABLE_VALGRIND
   if (private_size && RUNNING_ON_VALGRIND)
     {
       private_size += ALIGN_STRUCT (1);
@@ -1845,6 +1842,7 @@ g_type_create_instance (GType type)
       VALGRIND_MALLOCLIKE_BLOCK (allocated + ALIGN_STRUCT (1), private_size - ALIGN_STRUCT (1), 0, TRUE);
     }
   else
+#endif
     allocated = g_slice_alloc0 (private_size + ivar_size);
 
   instance = (GTypeInstance *) (allocated + private_size);
@@ -1923,6 +1921,7 @@ g_type_free_instance (GTypeInstance *instance)
   memset (allocated, 0xaa, ivar_size + private_size);
 #endif
 
+#ifdef ENABLE_VALGRIND
   /* See comment in g_type_create_instance() about what's going on here.
    * We're basically unwinding what we put into motion there.
    */
@@ -1940,6 +1939,7 @@ g_type_free_instance (GTypeInstance *instance)
       VALGRIND_FREELIKE_BLOCK (instance, 0);
     }
   else
+#endif
     g_slice_free1 (private_size + ivar_size, allocated);
 
 #ifdef	G_ENABLE_DEBUG
@@ -4562,6 +4562,8 @@ gobject_init_ctor (void)
  * ]|
  *
  * Since: 2.4
+ * Deprecated: 2.58: Use the G_ADD_PRIVATE() macro with the `G_DEFINE_*`
+ *   family of macros to add instance private data to a type
  */
 void
 g_type_class_add_private (gpointer g_class,
diff --git a/gobject/gtype.h b/gobject/gtype.h
index cf7770322..77e22a0a9 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -634,6 +634,8 @@ struct _GTypeQuery
  * This macro should only be used in type implementations.
  * 
  * Since: 2.4
+ * Deprecated: 2.58: Use %G_ADD_PRIVATE and the generated
+ *   `your_type_get_instance_private()` function instead
  * Returns: (not nullable): a pointer to the private data structure
  */
 #define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type)   ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type)))
@@ -1297,7 +1299,7 @@ void  g_type_interface_add_prerequisite (GType			     interface_type,
 GLIB_AVAILABLE_IN_ALL
 GType*g_type_interface_prerequisites    (GType                       interface_type,
 					 guint                      *n_prerequisites);
-GLIB_AVAILABLE_IN_ALL
+GLIB_DEPRECATED_IN_2_58
 void     g_type_class_add_private       (gpointer                    g_class,
                                          gsize                       private_size);
 GLIB_AVAILABLE_IN_2_38
diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c
index 6648c7318..553152d5a 100644
--- a/gobject/gvaluearray.c
+++ b/gobject/gvaluearray.c
@@ -57,12 +57,7 @@
  * ]|
  */
 
-
-#ifdef	DISABLE_MEM_POOLS
-#  define	GROUP_N_VALUES	(1)	/* power of 2 !! */
-#else
-#  define	GROUP_N_VALUES	(8)	/* power of 2 !! */
-#endif
+#define	GROUP_N_VALUES	(8)	/* power of 2 !! */
 
 
 /* --- functions --- */
@@ -108,18 +103,6 @@ value_array_grow (GValueArray *value_array,
     }
 }
 
-static inline void
-value_array_shrink (GValueArray *value_array)
-{
-#ifdef  DISABLE_MEM_POOLS
-  if (value_array->n_prealloced >= value_array->n_values + GROUP_N_VALUES)
-    {
-      value_array->n_prealloced = (value_array->n_values + GROUP_N_VALUES - 1) & ~(GROUP_N_VALUES - 1);
-      value_array->values = g_renew (GValue, value_array->values, value_array->n_prealloced);
-    }
-#endif
-}
-
 /**
  * g_value_array_new:
  * @n_prealloced: number of values to preallocate space for
@@ -316,7 +299,6 @@ g_value_array_remove (GValueArray *value_array,
   if (index < value_array->n_values)
     memmove (value_array->values + index, value_array->values + index + 1,
              (value_array->n_values - index) * sizeof (value_array->values[0]));
-  value_array_shrink (value_array);
   if (value_array->n_prealloced > value_array->n_values)
     memset (value_array->values + value_array->n_values, 0, sizeof (value_array->values[0]));
 
diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index d083084f1..177aa3dfa 100644
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -87,43 +87,43 @@ union _GTypeCValue
  */
 #define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error)		\
 G_STMT_START {										\
-  GValue *_val = (value);								\
-  guint _flags = (flags);								\
-  GTypeValueTable *_vtab = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtab->collect_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
+  GValue *g_vci_val = (value);								\
+  guint g_vci_flags = (flags);								\
+  GTypeValueTable *g_vci_vtab = g_type_value_table_peek (_value_type);			\
+  const gchar *g_vci_collect_format = g_vci_vtab->collect_format;					\
+  GTypeCValue g_vci_cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
+  guint g_vci_n_values = 0;									\
                                                                                         \
-  _val->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
-  while (*_collect_format)								\
+  g_vci_val->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
+  while (*g_vci_collect_format)								\
     {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
+      GTypeCValue *g_vci_cvalue = g_vci_cvalues + g_vci_n_values++;					\
                                                                                         \
-      switch (*_collect_format++)							\
+      switch (*g_vci_collect_format++)							\
 	{										\
 	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
+	  g_vci_cvalue->v_int = va_arg ((var_args), gint);					\
 	  break;									\
 	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
+	  g_vci_cvalue->v_long = va_arg ((var_args), glong);					\
 	  break;									\
 	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
+	  g_vci_cvalue->v_int64 = va_arg ((var_args), gint64);				\
 	  break;									\
 	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
+	  g_vci_cvalue->v_double = va_arg ((var_args), gdouble);				\
 	  break;									\
 	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
+	  g_vci_cvalue->v_pointer = va_arg ((var_args), gpointer);				\
 	  break;									\
 	default:									\
 	  g_assert_not_reached ();							\
 	}										\
     }											\
-  *(__error) = _vtab->collect_value (_val,						\
-				       _n_values,					\
-				       _cvalues,					\
-				       _flags);						\
+  *(__error) = g_vci_vtab->collect_value (g_vci_val,						\
+				       g_vci_n_values,					\
+				       g_vci_cvalues,					\
+				       g_vci_flags);						\
 } G_STMT_END
 
 /**
@@ -145,15 +145,15 @@ G_STMT_START {										\
  * #GValue. That variant is faster than #G_VALUE_COLLECT.
  */
 #define G_VALUE_COLLECT(value, var_args, flags, __error) G_STMT_START {			\
-  GValue *_value = (value);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
+  GValue *g_vc_value = (value);								\
+  GType g_vc_value_type = G_VALUE_TYPE (g_vc_value);						\
+  GTypeValueTable *g_vc_vtable = g_type_value_table_peek (g_vc_value_type);			\
 											\
-  if (_vtable->value_free)								\
-    _vtable->value_free (_value);							\
-  memset (_value->data, 0, sizeof (_value->data));					\
+  if (g_vc_vtable->value_free)								\
+    g_vc_vtable->value_free (g_vc_value);							\
+  memset (g_vc_value->data, 0, sizeof (g_vc_value->data));					\
 											\
-  G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error);			\
+  G_VALUE_COLLECT_INIT(value, g_vc_value_type, var_args, flags, __error);			\
 } G_STMT_END
 
 /**
@@ -165,12 +165,12 @@ G_STMT_START {										\
  */
 #define G_VALUE_COLLECT_SKIP(_value_type, var_args)					\
 G_STMT_START {										\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtable->collect_format;				\
+  GTypeValueTable *g_vcs_vtable = g_type_value_table_peek (_value_type);			\
+  const gchar *g_vcs_collect_format = g_vcs_vtable->collect_format;				\
                                                                                         \
-  while (*_collect_format)								\
+  while (*g_vcs_collect_format)								\
     {											\
-      switch (*_collect_format++)							\
+      switch (*g_vcs_collect_format++)							\
 	{										\
 	case G_VALUE_COLLECT_INT:							\
 	  va_arg ((var_args), gint);							\
@@ -208,43 +208,43 @@ G_STMT_START {										\
  */
 #define G_VALUE_LCOPY(value, var_args, flags, __error)					\
 G_STMT_START {										\
-  const GValue *_value = (value);							\
-  guint _flags = (flags);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_lcopy_format = _vtable->lcopy_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
+  const GValue *g_vl_value = (value);							\
+  guint g_vl_flags = (flags);								\
+  GType g_vl_value_type = G_VALUE_TYPE (g_vl_value);						\
+  GTypeValueTable *g_vl_vtable = g_type_value_table_peek (g_vl_value_type);			\
+  const gchar *g_vl_lcopy_format = g_vl_vtable->lcopy_format;					\
+  GTypeCValue g_vl_cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
+  guint g_vl_n_values = 0;									\
                                                                                         \
-  while (*_lcopy_format)								\
+  while (*g_vl_lcopy_format)								\
     {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
+      GTypeCValue *g_vl_cvalue = g_vl_cvalues + g_vl_n_values++;					\
                                                                                         \
-      switch (*_lcopy_format++)								\
+      switch (*g_vl_lcopy_format++)								\
 	{										\
 	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
+	  g_vl_cvalue->v_int = va_arg ((var_args), gint);					\
 	  break;									\
 	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
+	  g_vl_cvalue->v_long = va_arg ((var_args), glong);					\
 	  break;									\
 	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
+	  g_vl_cvalue->v_int64 = va_arg ((var_args), gint64);				\
 	  break;									\
 	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
+	  g_vl_cvalue->v_double = va_arg ((var_args), gdouble);				\
 	  break;									\
 	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
+	  g_vl_cvalue->v_pointer = va_arg ((var_args), gpointer);				\
 	  break;									\
 	default:									\
 	  g_assert_not_reached ();							\
 	}										\
     }											\
-  *(__error) = _vtable->lcopy_value (_value,						\
-				     _n_values,						\
-				     _cvalues,						\
-				     _flags);						\
+  *(__error) = g_vl_vtable->lcopy_value (g_vl_value,						\
+				     g_vl_n_values,						\
+				     g_vl_cvalues,						\
+				     g_vl_flags);						\
 } G_STMT_END
 
 
diff --git a/gobject/meson.build b/gobject/meson.build
index d34a897a7..d8d421df8 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -92,7 +92,7 @@ python_tools = [
 
 python_tools_conf = configuration_data()
 python_tools_conf.set('VERSION', glib_version)
-python_tools_conf.set('PYTHON', python.path())
+python_tools_conf.set('PYTHON', python_name)
 
 foreach tool: python_tools
   tool_bin = configure_file(
@@ -105,6 +105,8 @@ foreach tool: python_tools
 
   # Set variables for later use
   set_variable(tool.underscorify(), tool_bin)
+  # Provide tools for others when we're a subproject and they use the Meson GNOME module
+  meson.override_find_program(tool, tool_bin)
 endforeach
 
 executable('gobject-query', 'gobject-query.c',
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 88eba19ae..88515006c 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -17,18 +17,16 @@ gobject_tests = [
   'ifaceproperties',
 ]
 
-# FIXME: use new environment() object
 # FIXME: put common bits of test environment() in one location
 # Not entirely random of course, but at least it changes over time
 random_number = minor_version + meson.version().split('.').get(1).to_int()
 
-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_env = environment()
+test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+test_env.set('G_DEBUG', 'gc-friendly')
+test_env.set('MALLOC_CHECK_', '2')
+test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 
 foreach test_name : gobject_tests
   deps = [libm, thread_dep, libglib_dep, libgobject_dep]
@@ -41,7 +39,7 @@ foreach test_name : gobject_tests
       c_args : ['-DG_LOG_DOMAIN="GLib-GObject"'],
       dependencies : deps,
   )
-  test(test_name, exe, env : test_env)
+  test(test_name, exe, env : test_env, suite : ['gobject'])
 endforeach
 
 marshalers_h = custom_target('marshalers_h',
@@ -77,4 +75,12 @@ exe = executable('signals',
     c_args : ['-DG_LOG_DOMAIN="GLib-GObject"'],
     dependencies : deps,
 )
-test('signals', exe, env : test_env)
+test('signals', exe, env : test_env, suite : ['gobject'])
+
+test(
+  'mkenums.py',
+  python,
+  args: files('mkenums.py'),
+  env: test_env,
+  suite: ['gobject'],
+)
diff --git a/gobject/tests/mkenums.py b/gobject/tests/mkenums.py
new file mode 100644
index 000000000..431453d01
--- /dev/null
+++ b/gobject/tests/mkenums.py
@@ -0,0 +1,378 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2018 Endless Mobile, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301  USA
+
+"""Integration tests for glib-mkenums utility."""
+
+import os
+import subprocess
+import tempfile
+import unittest
+
+import taptestrunner
+
+
+class TestMkenums(unittest.TestCase):
+    """Integration test for running glib-mkenums.
+
+    This can be run when installed or uninstalled. When uninstalled, it
+    requires G_TEST_BUILDDIR and G_TEST_SRCDIR to be set.
+
+    The idea with this test harness is to test the glib-mkenums utility, its
+    handling of command line arguments, its exit statuses, and its handling of
+    various C source codes. In future we could split the core glib-mkenums
+    parsing and generation code out into a library and unit test that, and
+    convert this test to just check command line behaviour.
+    """
+
+    def setUp(self):
+        self.timeout_seconds = 10  # seconds per test
+        self.tmpdir = tempfile.TemporaryDirectory()
+        os.chdir(self.tmpdir.name)
+        print('tmpdir:', self.tmpdir.name)
+        if 'G_TEST_BUILDDIR' in os.environ:
+            self.__mkenums = \
+                os.path.join(os.environ['G_TEST_BUILDDIR'], '..',
+                             'glib-mkenums')
+        else:
+            self.__mkenums = os.path.join('/', 'usr', 'bin', 'glib-mkenums')
+        print('mkenums:', self.__mkenums)
+
+    def tearDown(self):
+        self.tmpdir.cleanup()
+
+    def runMkenums(self, *args):
+        argv = [self.__mkenums]
+        argv.extend(args)
+        print('Running:', argv)
+
+        env = os.environ.copy()
+        env['LC_ALL'] = 'C.UTF-8'
+        print('Environment:', env)
+
+        info = subprocess.run(argv, timeout=self.timeout_seconds,
+                              stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE,
+                              env=env)
+        print('Output:', info.stdout.decode('utf-8'))
+        return info
+
+    def runMkenumsWithHeader(self, h_contents, encoding='utf-8', *args):
+        template_contents = '''
+/*** BEGIN file-header ***/
+file-header
+filename: @filename@
+basename: @basename@
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+file-production
+filename: @filename@
+basename: @basename@
+/*** END file-production ***/
+
+/*** BEGIN enumeration-production ***/
+enumeration-production
+EnumName: @EnumName@
+enum_name: @enum_name@
+ENUMNAME: @ENUMNAME@
+ENUMSHORT: @ENUMSHORT@
+ENUMPREFIX: @ENUMPREFIX@
+type: @type@
+Type: @Type@
+TYPE: @TYPE@
+/*** END enumeration-production ***/
+
+/*** BEGIN value-header ***/
+value-header
+EnumName: @EnumName@
+enum_name: @enum_name@
+ENUMNAME: @ENUMNAME@
+ENUMSHORT: @ENUMSHORT@
+ENUMPREFIX: @ENUMPREFIX@
+type: @type@
+Type: @Type@
+TYPE: @TYPE@
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+value-production
+VALUENAME: @VALUENAME@
+valuenick: @valuenick@
+valuenum: @valuenum@
+type: @type@
+Type: @Type@
+TYPE: @TYPE@
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+value-tail
+EnumName: @EnumName@
+enum_name: @enum_name@
+ENUMNAME: @ENUMNAME@
+ENUMSHORT: @ENUMSHORT@
+ENUMPREFIX: @ENUMPREFIX@
+type: @type@
+Type: @Type@
+TYPE: @TYPE@
+/*** END value-tail ***/
+
+/*** BEGIN comment ***/
+comment
+comment: @comment@
+/*** END comment ***/
+
+/*** BEGIN file-tail ***/
+file-tail
+filename: @filename@
+basename: @basename@
+/*** END file-tail ***/
+'''
+
+        with tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='.template') as template_file, \
+             tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='.h') as h_file:
+            # Write out the template.
+            template_file.write(template_contents.encode('utf-8'))
+            print(template_file.name + ':', template_contents)
+
+            # Write out the header to be scanned.
+            h_file.write(h_contents.encode(encoding))
+            print(h_file.name + ':', h_contents)
+
+            template_file.flush()
+            h_file.flush()
+
+            # Run glib-mkenums with a template which outputs all substitutions.
+            info = self.runMkenums('--template', template_file.name,
+                                   h_file.name)
+            info.check_returncode()
+            out = info.stdout.decode('utf-8').strip()
+            err = info.stderr.decode('utf-8').strip()
+
+            # Known substitutions for generated filenames.
+            subs = {
+                'filename': h_file.name,
+                'basename': os.path.basename(h_file.name),
+                'standard_top_comment':
+                    'This file is generated by glib-mkenums, do not modify '
+                    'it. This code is licensed under the same license as the '
+                    'containing project. Note that it links to GLib, so must '
+                    'comply with the LGPL linking clauses.',
+                'standard_bottom_comment': 'Generated data ends here'
+            }
+
+            return (info, out, err, subs)
+
+    def assertSingleEnum(self, out, subs, enum_name_camel, enum_name_lower,
+                         enum_name_upper, enum_name_short, enum_prefix,
+                         type_lower, type_camel, type_upper,
+                         value_name, value_nick, value_num):
+        """Assert that out (from runMkenumsWithHeader()) contains a single
+           enum and value matching the given arguments."""
+        subs = dict({
+            'enum_name_camel': enum_name_camel,
+            'enum_name_lower': enum_name_lower,
+            'enum_name_upper': enum_name_upper,
+            'enum_name_short': enum_name_short,
+            'enum_prefix': enum_prefix,
+            'type_lower': type_lower,
+            'type_camel': type_camel,
+            'type_upper': type_upper,
+            'value_name': value_name,
+            'value_nick': value_nick,
+            'value_num': value_num,
+        }, **subs)
+
+        self.assertEqual('''
+comment
+comment: {standard_top_comment}
+
+
+file-header
+filename: {filename}
+basename: {basename}
+file-production
+filename: {filename}
+basename: {basename}
+enumeration-production
+EnumName: {enum_name_camel}
+enum_name: {enum_name_lower}
+ENUMNAME: {enum_name_upper}
+ENUMSHORT: {enum_name_short}
+ENUMPREFIX: {enum_prefix}
+type: {type_lower}
+Type: {type_camel}
+TYPE: {type_upper}
+value-header
+EnumName: {enum_name_camel}
+enum_name: {enum_name_lower}
+ENUMNAME: {enum_name_upper}
+ENUMSHORT: {enum_name_short}
+ENUMPREFIX: {enum_prefix}
+type: {type_lower}
+Type: {type_camel}
+TYPE: {type_upper}
+value-production
+VALUENAME: {value_name}
+valuenick: {value_nick}
+valuenum: {value_num}
+type: {type_lower}
+Type: {type_camel}
+TYPE: {type_upper}
+value-tail
+EnumName: {enum_name_camel}
+enum_name: {enum_name_lower}
+ENUMNAME: {enum_name_upper}
+ENUMSHORT: {enum_name_short}
+ENUMPREFIX: {enum_prefix}
+type: {type_lower}
+Type: {type_camel}
+TYPE: {type_upper}
+file-tail
+filename: ARGV
+basename: {basename}
+
+comment
+comment: {standard_bottom_comment}
+'''.format(**subs).strip(), out)
+
+    def test_help(self):
+        """Test the --help argument."""
+        info = self.runMkenums('--help')
+        info.check_returncode()
+
+        out = info.stdout.decode('utf-8').strip()
+        self.assertIn('usage: glib-mkenums', out)
+
+    def test_empty_header(self):
+        """Test an empty header."""
+        (info, out, err, subs) = self.runMkenumsWithHeader('')
+        self.assertEqual('', err)
+        self.assertEqual('''
+comment
+comment: {standard_top_comment}
+
+
+file-header
+filename: {filename}
+basename: {basename}
+file-tail
+filename: ARGV
+basename: {basename}
+
+comment
+comment: {standard_bottom_comment}
+'''.format(**subs).strip(), out)
+
+    def test_enum_name(self):
+        """Test typedefs with an enum and a typedef name. Bug #794506."""
+        h_contents = '''
+        typedef enum _SomeEnumIdentifier {
+          ENUM_VALUE
+        } SomeEnumIdentifier;
+        '''
+        (info, out, err, subs) = self.runMkenumsWithHeader(h_contents)
+        self.assertEqual('', err)
+        self.assertSingleEnum(out, subs, 'SomeEnumIdentifier',
+                              'some_enum_identifier', 'SOME_ENUM_IDENTIFIER',
+                              'ENUM_IDENTIFIER', 'SOME', 'enum', 'Enum',
+                              'ENUM', 'ENUM_VALUE', 'value', '0')
+
+    def test_non_utf8_encoding(self):
+        """Test source files with non-UTF-8 encoding. Bug #785113."""
+        h_contents = '''
+        /* Copyright © La Peña */
+        typedef enum {
+          ENUM_VALUE
+        } SomeEnumIdentifier;
+        '''
+        (info, out, err, subs) = \
+            self.runMkenumsWithHeader(h_contents, encoding='iso-8859-1')
+        self.assertIn('WARNING: UnicodeWarning: ', err)
+        self.assertSingleEnum(out, subs, 'SomeEnumIdentifier',
+                              'some_enum_identifier', 'SOME_ENUM_IDENTIFIER',
+                              'ENUM_IDENTIFIER', 'SOME', 'enum', 'Enum',
+                              'ENUM', 'ENUM_VALUE', 'value', '0')
+
+    def test_reproducible(self):
+        """Test builds are reproducible regardless of file ordering.
+        Bug #691436."""
+        h_contents1 = '''
+        typedef enum {
+          FIRST,
+        } Header1;
+        '''
+
+        h_contents2 = '''
+        typedef enum {
+          SECOND,
+        } Header2;
+        '''
+
+        with tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='.template') as template_file, \
+             tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='1.h') as h_file1, \
+             tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='2.h') as h_file2:
+            # Write out the template and headers.
+            template_file.write('template'.encode('utf-8'))
+            h_file1.write(h_contents1.encode('utf-8'))
+            h_file2.write(h_contents2.encode('utf-8'))
+
+            template_file.flush()
+            h_file1.flush()
+            h_file2.flush()
+
+            # Run glib-mkenums with the headers in one order, and then again
+            # in another order.
+            info1 = self.runMkenums('--template', template_file.name,
+                                    h_file1.name, h_file2.name)
+            info1.check_returncode()
+            out1 = info1.stdout.decode('utf-8').strip()
+            self.assertEqual('', info1.stderr.decode('utf-8').strip())
+
+            info2 = self.runMkenums('--template', template_file.name,
+                                    h_file2.name, h_file1.name)
+            info2.check_returncode()
+            out2 = info2.stdout.decode('utf-8').strip()
+            self.assertEqual('', info2.stderr.decode('utf-8').strip())
+
+            # The output should be the same.
+            self.assertEqual(out1, out2)
+
+    def test_no_nick(self):
+        """Test trigraphs with a desc but no nick. Issue #1360."""
+        h_contents = '''
+        typedef enum {
+          GEGL_SAMPLER_NEAREST = 0,   /*< desc="nearest"      >*/
+        } GeglSamplerType;
+        '''
+        (info, out, err, subs) = self.runMkenumsWithHeader(h_contents)
+        self.assertEqual('', err)
+        self.assertSingleEnum(out, subs, 'GeglSamplerType',
+                              'gegl_sampler_type', 'GEGL_SAMPLER_TYPE',
+                              'SAMPLER_TYPE', 'GEGL', 'enum', 'Enum',
+                              'ENUM', 'GEGL_SAMPLER_NEAREST', 'nearest', '0')
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner=taptestrunner.TAPTestRunner())
diff --git a/gobject/tests/private.c b/gobject/tests/private.c
index ecf5e7b71..678222190 100644
--- a/gobject/tests/private.c
+++ b/gobject/tests/private.c
@@ -128,7 +128,9 @@ G_DEFINE_TYPE (TestMixed, test_mixed, test_object_get_type ())
 static void
 test_mixed_class_init (TestMixedClass *klass)
 {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   g_type_class_add_private (klass, sizeof (TestMixedPrivate));
+G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
diff --git a/gobject/tests/properties.c b/gobject/tests/properties.c
index a1af3f8ba..0aa325a74 100644
--- a/gobject/tests/properties.c
+++ b/gobject/tests/properties.c
@@ -80,7 +80,10 @@ test_object_set_quux (TestObject  *obj,
 static void
 test_object_finalize (GObject *gobject)
 {
-  g_free (((TestObject *) gobject)->baz);
+  TestObject *self = (TestObject *) gobject;
+
+  g_free (self->baz);
+  g_free (self->quux);
 
   /* When the ref_count of an object is zero it is still
    * possible to notify the property, but it should do
@@ -412,6 +415,9 @@ properties_testv_with_valid_properties (void)
   g_assert_cmpstr (g_value_get_string (&values_out[2]), ==, "pigs");
   g_assert_cmpstr (g_value_get_string (&values_out[3]), ==, "fly");
 
+  for (i = 0; i < G_N_ELEMENTS (values_out); i++)
+    g_value_unset (&values_out[i]);
+
   /* Test newv2 && getv */
   g_value_set_string (&(values_in[2]), "Elmo knows");
   g_value_set_string (&(values_in[3]), "where you live");
@@ -425,12 +431,10 @@ properties_testv_with_valid_properties (void)
   g_assert_cmpstr (g_value_get_string (&values_out[2]), ==, "Elmo knows");
   g_assert_cmpstr (g_value_get_string (&values_out[3]), ==, "where you live");
 
-
-  for (i = 0; i < 4; i++)
-    {
-      g_value_unset (&values_in[i]);
-      g_value_unset (&values_out[i]);
-    }
+  for (i = 0; i < G_N_ELEMENTS (values_in); i++)
+    g_value_unset (&values_in[i]);
+  for (i = 0; i < G_N_ELEMENTS (values_out); i++)
+    g_value_unset (&values_out[i]);
 
   g_object_unref (test_obj);
 }
diff --git a/gobject/tests/reference.c b/gobject/tests/reference.c
index e3f86315c..9508ee741 100644
--- a/gobject/tests/reference.c
+++ b/gobject/tests/reference.c
@@ -132,7 +132,7 @@ test_clear (void)
 static void
 test_clear_function (void)
 {
-  volatile GObject *o = NULL;
+  GObject *o = NULL;
   GObject *tmp;
 
   (g_clear_object) (&o);
@@ -156,11 +156,14 @@ test_set (void)
 {
   GObject *o = NULL;
   GObject *tmp;
+  gpointer tmp_weak = NULL;
 
   g_assert (!g_set_object (&o, NULL));
   g_assert (o == NULL);
 
   tmp = g_object_new (G_TYPE_OBJECT, NULL);
+  tmp_weak = tmp;
+  g_object_add_weak_pointer (tmp, &tmp_weak);
   g_assert_cmpint (tmp->ref_count, ==, 1);
 
   g_assert (g_set_object (&o, tmp));
@@ -174,10 +177,11 @@ test_set (void)
   g_assert (!g_set_object (&o, tmp));
   g_assert (o == tmp);
   g_assert_cmpint (tmp->ref_count, ==, 1);
+  g_assert_nonnull (tmp_weak);
 
   g_assert (g_set_object (&o, NULL));
   g_assert (o == NULL);
-  g_assert (!G_IS_OBJECT (tmp));  /* finalised */
+  g_assert_null (tmp_weak);
 }
 
 static void
@@ -185,11 +189,14 @@ test_set_function (void)
 {
   GObject *o = NULL;
   GObject *tmp;
+  gpointer tmp_weak = NULL;
 
   g_assert (!(g_set_object) (&o, NULL));
   g_assert (o == NULL);
 
   tmp = g_object_new (G_TYPE_OBJECT, NULL);
+  tmp_weak = tmp;
+  g_object_add_weak_pointer (tmp, &tmp_weak);
   g_assert_cmpint (tmp->ref_count, ==, 1);
 
   g_assert ((g_set_object) (&o, tmp));
@@ -203,10 +210,11 @@ test_set_function (void)
   g_assert (!(g_set_object) (&o, tmp));
   g_assert (o == tmp);
   g_assert_cmpint (tmp->ref_count, ==, 1);
+  g_assert_nonnull (tmp_weak);
 
   g_assert ((g_set_object) (&o, NULL));
   g_assert (o == NULL);
-  g_assert (!G_IS_OBJECT (tmp));  /* finalised */
+  g_assert_null (tmp_weak);
 }
 
 static void
diff --git a/gobject/tests/taptestrunner.py b/gobject/tests/taptestrunner.py
new file mode 100644
index 000000000..efd41dd25
--- /dev/null
+++ b/gobject/tests/taptestrunner.py
@@ -0,0 +1,176 @@
+#!/usr/bin/env python
+# coding=utf-8
+
+# Copyright (c) 2015 Remko Tronçon (https://el-tramo.be)
+# Copied from https://github.com/remko/pycotap/
+#
+# Released under the MIT license
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+import unittest
+import sys
+import base64
+if sys.hexversion >= 0x03000000:
+  from io import StringIO
+else:
+  from StringIO import StringIO
+
+# Log modes
+class LogMode(object) :
+  LogToError, LogToDiagnostics, LogToYAML, LogToAttachment = range(4)
+
+
+class TAPTestResult(unittest.TestResult):
+  def __init__(self, output_stream, error_stream, message_log, test_output_log):
+    super(TAPTestResult, self).__init__(self, output_stream)
+    self.output_stream = output_stream
+    self.error_stream = error_stream
+    self.orig_stdout = None
+    self.orig_stderr = None
+    self.message = None
+    self.test_output = None
+    self.message_log = message_log
+    self.test_output_log = test_output_log
+    self.output_stream.write("TAP version 13\n")
+    self._set_streams()
+
+  def printErrors(self):
+    self.print_raw("1..%d\n" % self.testsRun)
+    self._reset_streams()
+
+  def _set_streams(self):
+    self.orig_stdout = sys.stdout
+    self.orig_stderr = sys.stderr
+    if self.message_log == LogMode.LogToError:
+      self.message = self.error_stream
+    else:
+      self.message = StringIO()
+    if self.test_output_log == LogMode.LogToError:
+      self.test_output = self.error_stream
+    else:
+      self.test_output = StringIO()
+
+    if self.message_log == self.test_output_log:
+      self.test_output = self.message
+    sys.stdout = sys.stderr = self.test_output
+
+  def _reset_streams(self):
+    sys.stdout = self.orig_stdout
+    sys.stderr = self.orig_stderr
+
+
+  def print_raw(self, text):
+    self.output_stream.write(text)
+    self.output_stream.flush()
+
+  def print_result(self, result, test, directive = None):
+    self.output_stream.write("%s %d %s" % (result, self.testsRun, test.id()))
+    if directive:
+      self.output_stream.write(" # " + directive)
+    self.output_stream.write("\n")
+    self.output_stream.flush()
+
+  def ok(self, test, directive = None):
+    self.print_result("ok", test, directive)
+
+  def not_ok(self, test):
+    self.print_result("not ok", test)
+
+  def startTest(self, test):
+    super(TAPTestResult, self).startTest(test)
+
+  def stopTest(self, test):
+    super(TAPTestResult, self).stopTest(test)
+    if self.message_log == self.test_output_log:
+      logs = [(self.message_log, self.message, "output")]
+    else:
+      logs = [
+          (self.test_output_log, self.test_output, "test_output"),
+          (self.message_log, self.message, "message")
+      ]
+    for log_mode, log, log_name in logs:
+      if log_mode != LogMode.LogToError:
+        output = log.getvalue()
+        if len(output):
+          if log_mode == LogMode.LogToYAML:
+            self.print_raw("  ---\n")
+            self.print_raw("    " + log_name + ": |\n")
+            self.print_raw("      " + output.rstrip().replace("\n", "\n      ") + "\n")
+            self.print_raw("  ...\n")
+          elif log_mode == LogMode.LogToAttachment:
+            self.print_raw("  ---\n")
+            self.print_raw("    " + log_name + ":\n")
+            self.print_raw("      File-Name: " + log_name + ".txt\n")
+            self.print_raw("      File-Type: text/plain\n")
+            self.print_raw("      File-Content: " + base64.b64encode(output) + "\n")
+            self.print_raw("  ...\n")
+          else:
+            self.print_raw("# " + output.rstrip().replace("\n", "\n# ") + "\n")
+        log.truncate(0)
+
+  def addSuccess(self, test):
+    super(TAPTestResult, self).addSuccess(test)
+    self.ok(test)
+
+  def addError(self, test, err):
+    super(TAPTestResult, self).addError(test, err)
+    self.message.write(self.errors[-1][1] + "\n")
+    self.not_ok(test)
+
+  def addFailure(self, test, err):
+    super(TAPTestResult, self).addFailure(test, err)
+    self.message.write(self.failures[-1][1] + "\n")
+    self.not_ok(test)
+
+  def addSkip(self, test, reason):
+    super(TAPTestResult, self).addSkip(test, reason)
+    self.ok(test, "SKIP " + reason)
+
+  def addExpectedFailure(self, test, err):
+    super(TAPTestResult, self).addExpectedFailure(test, err)
+    self.ok(test)
+
+  def addUnexpectedSuccess(self, test):
+    super(TAPTestResult, self).addUnexpectedSuccess(test)
+    self.message.write("Unexpected success" + "\n")
+    self.not_ok(test)
+
+
+class TAPTestRunner(object):
+  def __init__(self,
+      message_log = LogMode.LogToYAML,
+      test_output_log = LogMode.LogToDiagnostics,
+      output_stream = sys.stdout, error_stream = sys.stderr):
+    self.output_stream = output_stream
+    self.error_stream = error_stream
+    self.message_log = message_log
+    self.test_output_log = test_output_log
+
+  def run(self, test):
+    result = TAPTestResult(
+        self.output_stream,
+        self.error_stream,
+        self.message_log,
+        self.test_output_log)
+    test(result)
+    result.printErrors()
+
+    return result
diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
index b623e8ba4..bb57bd4a8 100644
--- a/gobject/tests/threadtests.c
+++ b/gobject/tests/threadtests.c
@@ -247,6 +247,12 @@ test_threaded_weak_ref (void)
   else
     n = NUM_COUNTER_INCREMENTS / 20;
 
+#ifdef G_OS_WIN32
+  /* On Windows usleep has millisecond resolution and gets rounded up
+   * leading to the test running for a long time. */
+  n /= 10;
+#endif
+
   for (i = 0; i < n; i++)
     {
       UnrefInThreadData data;
diff --git a/meson.build b/meson.build
index 9f498d7ab..f758365f3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('glib', 'c', 'cpp',
-  version : '2.57.1',
-  meson_version : '>= 0.46.0',
+  version : '2.57.2',
+  meson_version : '>= 0.47.0',
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=1',
@@ -23,6 +23,8 @@ if cc.get_id() == 'msvc'
   # Disable SAFESEH with MSVC for plugins and libs that use external deps that
   # are built with MinGW
   noseh_link_args = ['/SAFESEH:NO']
+  # Set the input and exec encoding to utf-8, like is the default with GCC
+  add_project_arguments(cc.get_supported_arguments(['/utf-8']), language: 'c')
 else
   noseh_link_args = []
   # -mms-bitfields vs -fnative-struct ?
@@ -54,6 +56,7 @@ gioinc = include_directories('gio')
 glib_prefix = get_option('prefix')
 glib_bindir = join_paths(glib_prefix, get_option('bindir'))
 glib_libdir = join_paths(glib_prefix, get_option('libdir'))
+glib_libexecdir = join_paths(glib_prefix, get_option('libexecdir'))
 glib_datadir = join_paths(glib_prefix, get_option('datadir'))
 glib_pkgdatadir = join_paths(glib_datadir, 'glib-2.0')
 glib_includedir = join_paths(glib_prefix, get_option('includedir'))
@@ -64,6 +67,11 @@ endif
 
 glib_pkgconfigreldir = join_paths(glib_libdir, 'pkgconfig')
 
+installed_tests_metadir = join_paths(glib_datadir, 'installed-tests', meson.project_name())
+installed_tests_execdir = join_paths(glib_libexecdir, 'installed-tests', meson.project_name())
+installed_tests_enabled = get_option('installed_tests')
+installed_tests_template = files('template.test.in')
+
 add_project_arguments('-D_GNU_SOURCE', language: 'c')
 
 # Disable strict aliasing;
@@ -82,14 +90,13 @@ glibconfig_conf = configuration_data()
 # use them later in test programs (autoconf does this automatically)
 glib_conf_prefix = ''
 
-glib_conf.set('GLIB_VERSION', glib_version)
 glib_conf.set('GLIB_MAJOR_VERSION', major_version)
 glib_conf.set('GLIB_MINOR_VERSION', minor_version)
 glib_conf.set('GLIB_MICRO_VERSION', micro_version)
 glib_conf.set('GLIB_INTERFACE_AGE', interface_age)
 glib_conf.set('GLIB_BINARY_AGE', binary_age)
 glib_conf.set_quoted('GETTEXT_PACKAGE', 'glib20')
-glib_conf.set_quoted('PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+glib_conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
 glib_conf.set_quoted('PACKAGE_NAME', 'glib')
 glib_conf.set_quoted('PACKAGE_STRING', 'glib @0@'.format(meson.project_version()))
 glib_conf.set_quoted('PACKAGE_TARNAME', 'glib')
@@ -97,16 +104,8 @@ glib_conf.set_quoted('PACKAGE_URL', '')
 glib_conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 glib_conf.set('ENABLE_NLS', 1)
 
-# Variables used in glib-gettextize and pkg-config files
-# These should not contain " quotes around the values
-glib_conf.set('PACKAGE', 'glib')
-glib_conf.set('VERSION', meson.project_version())
-glib_conf.set('prefix', glib_prefix)
-glib_conf.set('exec_prefix', glib_prefix)
-glib_conf.set('libdir', glib_libdir)
-glib_conf.set('includedir', glib_includedir)
-glib_conf.set('datadir', glib_datadir)
-glib_conf.set('datarootdir', glib_datadir)
+# used by the .rc.in files
+glibconfig_conf.set('LT_CURRENT_MINUS_AGE', soversion)
 
 glib_conf.set('_GNU_SOURCE', 1)
 
@@ -203,54 +202,53 @@ add_project_arguments(glib_debug_cflags, language: 'c')
 # check for header files
 
 headers = [
-  'stdlib.h',
-  'string.h',
-  'strings.h',
-  'memory.h',
   'alloca.h',
-  'locale.h',
-  'xlocale.h',
+  'crt_externs.h',
+  'dirent.h', # MSC does not come with this by default
   'float.h',
-  'limits.h',
-  'pwd.h',
+  'fstab.h',
   'grp.h',
+  'inttypes.h',
+  'limits.h',
+  'linux/magic.h',
+  'locale.h',
+  'mach/mach_time.h',
+  'memory.h',
+  'mntent.h',
   'poll.h',
-  'termios.h',
+  'pwd.h',
+  'sched.h',
+  'stdint.h',
+  'stdlib.h',
+  'string.h',
+  'strings.h',
+  'sys/auxv.h',
+  'sys/event.h',
+  'sys/filio.h',
+  'sys/inotify.h',
+  'sys/mkdev.h',
+  'sys/mntctl.h',
+  'sys/mnttab.h',
+  'sys/mount.h',
   'sys/param.h',
   'sys/resource.h',
-  'mach/mach_time.h',
   'sys/select.h',
-  'stdint.h',
-  'inttypes.h',
-  'sched.h',
-  'malloc.h',
-  'sys/vfs.h',
-  'sys/vmount.h',
   'sys/statfs.h',
+  'sys/stat.h',
   'sys/statvfs.h',
-  'sys/filio.h',
-  'mntent.h',
-  'sys/mnttab.h',
-  'sys/vfstab.h',
-  'sys/mntctl.h',
-  'fstab.h',
-  'linux/magic.h',
-  'termios.h',
-  'dirent.h', # MSC does not come with this by default
+  'sys/sysctl.h',
   'sys/time.h', # MSC does not come with this by default
   'sys/times.h',
+  'sys/types.h',
+  'sys/uio.h',
+  'sys/vfs.h',
+  'sys/vfstab.h',
+  'sys/vmount.h',
   'sys/wait.h',
+  'termios.h',
   'unistd.h',
   'values.h',
-  'sys/types.h',
-  'sys/uio.h',
-  'sys/mkdev.h',
-  'sys/mount.h',
-  'sys/sysctl.h',
-  'crt_externs.h',
-  'sys/inotify.h',
-  'sys/event.h',
-  'sys/stat.h',
+  'xlocale.h',
 ]
 
 foreach h : headers
@@ -261,6 +259,13 @@ foreach h : headers
   endif
 endforeach
 
+# FIXME: Use cc.check_header from Meson 0.47.
+# FreeBSD includes a malloc.h which always throw compilation error.
+if cc.compiles('#include <malloc.h>', name : 'malloc.h')
+  glib_conf.set('HAVE_MALLOC_H', 1)
+  glib_conf_prefix = glib_conf_prefix + '#define HAVE_MALLOC_H 1\n'
+endif
+
 if cc.has_header('linux/netlink.h')
   glib_conf.set('HAVE_NETLINK', 1)
 endif
@@ -305,6 +310,10 @@ struct_members = [
   [ 'statfs', 'f_bavail', struct_stat_blkprefix ],
   [ 'dirent', 'd_type', '''#include <sys/types.h>
                            #include <dirent.h>''' ],
+  [ 'statvfs', 'f_basetype', '#include <sys/statvfs.h>' ],
+  [ 'statvfs', 'f_fstypename', '#include <sys/statvfs.h>' ],
+  [ 'tm', 'tm_gmtoff', '#include <time.h>' ],
+  [ 'tm', '__tm_gmtoff', '#include <time.h>' ],
 ]
 
 foreach m : struct_members
@@ -327,7 +336,12 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
   test_c_args = [
     '-Wall',
     '-Wduplicated-branches',
+    '-Wmisleading-indentation',
     '-Wstrict-prototypes',
+    '-Wunused',
+    # Due to pervasive use of things like GPOINTER_TO_UINT(), we do not support
+    # building with -Wbad-function-cast.
+    '-Wno-bad-function-cast',
     '-Werror=declaration-after-statement',
     '-Werror=format=2',
     '-Werror=format-security',
@@ -358,68 +372,69 @@ add_project_arguments(cc.get_supported_arguments(test_c_args), language: 'c')
 # improve this.
 glib_link_flags = cc.get_supported_link_arguments(test_c_link_args)
 
-# Windows Support (Vista+)
+# Windows Support (7+)
 if host_system == 'windows'
   glib_conf.set('_WIN32_WINNT', '0x0601')
 endif
 
 functions = [
   'alloca',
-  'mmap',
-  'memalign',
-  'valloc',
-  'fsync',
-  'pipe2',
-  'issetugid',
-  'timegm',
-  'gmtime_r',
-  'strerror_r',
-  'lstat',
-  'strsignal',
-  'vsnprintf',
-  'poll',
-  'vasprintf',
-  'setenv',
-  'unsetenv',
-  'getc_unlocked',
-  'readlink',
-  'symlink',
-  'fdwalk',
-  'lchmod',
-  'lchown',
+  'endmntent',
+  'endservent',
+  'fallocate',
   'fchmod',
   'fchown',
-  'utimes',
-  'getresuid',
-  'getmntent_r',
-  'setmntent',
-  'endmntent',
-  'hasmntopt',
+  'fdwalk',
+  'fsync',
+  'getc_unlocked',
   'getfsstat',
+  'getgrgid_r',
+  'getmntent_r',
+  'getpwuid_r',
+  'getresuid',
   'getvfsstat',
-  'fallocate',
-  'localtime_r',
   'gmtime_r',
-  'getpwuid_r',
-  'getgrgid_r',
-  'prlimit',
-  'strnlen',
-  'wcslen',
-  'wcsnlen',
+  'hasmntopt',
+  'inotify_init1',
+  'issetugid',
+  'kevent',
+  'kqueue',
+  'lchmod',
+  'lchown',
+  'link',
+  'localtime_r',
+  'lstat',
   'mbrtowc',
-  'wcrtomb',
+  'memalign',
+  'mmap',
   'newlocale',
-  'uselocale',
+  'pipe2',
+  'poll',
+  'prlimit',
+  'readlink',
+  'recvmmsg',
+  'sendmmsg',
+  'setenv',
+  'setmntent',
+  'strerror_r',
+  'strnlen',
+  'strsignal',
   'strtod_l',
   'strtoll_l',
   'strtoull_l',
-  'inotify_init1',
-  'kqueue',
-  'kevent',
-  'endservent',
-  'sendmmsg',
-  'recvmmsg',
-  'link',
+  'symlink',
+  'timegm',
+  'unsetenv',
+  'uselocale',
+  'utimes',
+  'valloc',
+  'vasprintf',
+  'vsnprintf',
+  'wcrtomb',
+  'wcslen',
+  'wcsnlen',
+  'sysctlbyname',
+  '_NSGetEnviron',
 ]
 
 if glib_conf.has('HAVE_SYS_STATVFS_H')
@@ -437,8 +452,11 @@ if host_system == 'windows'
   iphlpapi_dep = cc.find_library('iphlpapi')
   iphlpapi_funcs = ['if_nametoindex', 'if_indextoname']
   foreach ifunc : iphlpapi_funcs
+    iphl_prefix =  '''#define _WIN32_WINNT @0@
+      #include <winsock2.h>
+      #include <iphlpapi.h>'''.format(glib_conf.get('_WIN32_WINNT'))
     if cc.has_function(ifunc,
-                       prefix : '#define _WIN32_WINNT 0x0601\n#include <winsock2.h>\n#include <iphlpapi.h>',
+                       prefix : iphl_prefix,
                        dependencies : iphlpapi_dep)
       idefine = 'HAVE_' + ifunc.underscorify().to_upper()
       glib_conf.set(idefine, 1)
@@ -478,6 +496,11 @@ if cc.has_function('posix_memalign', prefix : '#include <stdlib.h>')
   glib_conf.set('HAVE_POSIX_MEMALIGN', 1)
 endif
 
+# Check that posix_spawn() is usable; must use header
+if cc.has_function('posix_spawn', prefix : '#include <spawn.h>')
+  glib_conf.set('HAVE_POSIX_SPAWN', 1)
+endif
+
 # Check whether strerror_r returns char *
 if have_func_strerror_r
   if cc.compiles('''#define _GNU_SOURCE
@@ -527,6 +550,8 @@ if cc.has_header_symbol('sys/sysmacros.h', 'major')
   glib_conf.set('MAJOR_IN_SYSMACROS', 1)
 elif cc.has_header_symbol('sys/mkdev.h', 'major')
   glib_conf.set('MAJOR_IN_MKDEV', 1)
+elif cc.has_header_symbol('sys/types.h', 'major')
+  glib_conf.set('MAJOR_IN_TYPES', 1)
 endif
 
 if cc.has_header_symbol('dlfcn.h', 'RTLD_LAZY')
@@ -572,36 +597,47 @@ if host_system == 'linux'
 endif
 
 osx_ldflags = []
+glib_have_os_x_9_or_later = false
+glib_have_carbon = false
+glib_have_cocoa = false
+if host_system == 'darwin'
+  add_languages('objc')
+  objcc = meson.get_compiler('objc')
 
-# Mac OS X Carbon support
-glib_have_carbon = cc.compiles('''#include <Carbon/Carbon.h>
-                                  #include <CoreServices/CoreServices.h>''',
-                               name : 'Mac OS X Carbon support')
+  osx_ldflags += ['-Wl,-framework,CoreFoundation']
 
-glib_have_os_x_9_or_later = false
+  # Mac OS X Carbon support
+  glib_have_carbon = objcc.compiles('''#include <Carbon/Carbon.h>
+                                       #include <CoreServices/CoreServices.h>''',
+                                    name : 'Mac OS X Carbon support')
 
-if glib_have_carbon
-  glib_conf.set('HAVE_CARBON', true)
-  osx_ldflags += '-Wl,-framework,Carbon'
-  glib_have_os_x_9_or_later = cc.compiles('''#include <AvailabilityMacros.h>
-                                             #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-                                             #error Compiling for minimum OS X version before 10.9
-                                             #endif''', name : 'OS X 9 or later')
-endif
+  if glib_have_carbon
+    glib_conf.set('HAVE_CARBON', true)
+    osx_ldflags += '-Wl,-framework,Carbon'
+    glib_have_os_x_9_or_later = objcc.compiles('''#include <AvailabilityMacros.h>
+                                                  #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+                                                  #error Compiling for minimum OS X version before 10.9
+                                                  #endif''',
+                                               name : 'OS X 9 or later')
+  endif
 
-# Mac OS X Cocoa support
-glib_have_cocoa = cc.compiles('''#include <Cocoa/Cocoa.h>
-                                 #ifdef GNUSTEP_BASE_VERSION
-                                 #error "Detected GNUstep, not Cocoa"
-                                 #endif''',
-                              name : 'Mac OS X Cocoa support')
+  # Mac OS X Cocoa support
+  glib_have_cocoa = objcc.compiles('''#include <Cocoa/Cocoa.h>
+                                      #ifdef GNUSTEP_BASE_VERSION
+                                      #error "Detected GNUstep, not Cocoa"
+                                      #endif''',
+                                   name : 'Mac OS X Cocoa support')
 
-if glib_have_cocoa
-  glib_conf.set('HAVE_COCOA', true)
-  osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-endif
+  if glib_have_cocoa
+    glib_conf.set('HAVE_COCOA', true)
+    osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
+  endif
 
-add_project_link_arguments(osx_ldflags, language : 'c')
+  # FIXME: libgio mix C and objC source files and there is no way to reliably
+  # know which language flags it's going to use to link. Add to both languages
+  # for now. See https://github.com/mesonbuild/meson/issues/3585.
+  add_project_link_arguments(osx_ldflags, language : ['objc', 'c'])
+endif
 
 # Check for futex(2)
 if cc.links('''#include <linux/futex.h>
@@ -941,9 +977,8 @@ if cc.links('''#include <signal.h>
   glib_conf.set('HAVE_SIG_ATOMIC_T', 1)
 endif
 
-# Check if 'long long' works and what format can be used to print it
+# Check if 'long long' works
 # jm_AC_TYPE_LONG_LONG
-# Nothing uses HAVE_LONG_LONG_FORMAT and HAVE_INT64_AND_I64
 if cc.compiles('''long long ll = 1LL;
                   int i = 63;
                   int some_func (void) {
@@ -1363,8 +1398,8 @@ if has_syspoll and has_systypes
       #include<sys/types.h>'''
 elif has_winsock2
   poll_includes = '''
-      #define _WIN32_WINNT 0x0600
-      #include <winsock2.h>'''
+      #define _WIN32_WINNT @0@
+      #include <winsock2.h>'''.format(glib_conf.get('_WIN32_WINNT'))
 else
   # FIXME?
   error('FIX POLL* defines')
@@ -1492,7 +1527,6 @@ if host_system == 'windows' and not get_option('force_posix_threads')
   glibconfig_conf.set('g_threads_impl_def', 'WIN32')
   glib_conf.set('THREADS_WIN32', 1)
 else
-  # FIXME: probably needs more tweaking in meson for things like -D_REENTRANT etc.
   thread_dep = dependency('threads')
   threads_implementation = 'posix'
   pthread_prefix = '''
@@ -1607,7 +1641,7 @@ if get_option('internal_pcre')
   pcre = []
   use_system_pcre = false
 else
-  pcre = dependency('libpcre', required : false) # Should check for Unicode support, too. FIXME
+  pcre = dependency('libpcre', version: '>= 8.31', required : false) # Should check for Unicode support, too. FIXME
   if not pcre.found()
     if cc.get_id() == 'msvc'
     # MSVC: Search for the PCRE library by the configuration, which corresponds
@@ -1647,7 +1681,6 @@ endif
 
 libm = cc.find_library('m', required : false)
 libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
-zlib_libname = '-lz'
 if cc.get_id() != 'msvc'
   libz_dep = dependency('zlib', fallback : ['zlib', 'zlib_dep'])
 else
@@ -1659,30 +1692,32 @@ else
   # of using ZLib's win32/makefile.msc.
   if not libz_dep.found()
     libz_dep = cc.find_library('zlib1', required : false)
-    if libz_dep.found()
-      zlib_libname = '-lzlib1'
-    else
+    if not libz_dep.found()
       libz_dep = cc.find_library('zlib', required : false)
-      if libz_dep.found()
-        zlib_libname = '-lzlib'
-      else
+      if not libz_dep.found()
         libz_dep = subproject('zlib').get_variable('zlib_dep')
       endif
     endif
   endif
 endif
 
-# Only used on non-glibc targets
-libintl = cc.find_library('intl', required : false)
-if host_system == 'windows' and not libintl.found()
-  # Used only when the gettext library is not available (MSVC, not MinGW)
-  libintl = subproject('proxy-libintl').get_variable('intl_dep')
-  glib_conf.set('HAVE_DCGETTEXT', 1)
+# First check in libc, fallback to libintl, and as last chance build
+# proxy-libintl subproject.
+# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
+# implementations. This could be extended if issues are found in some platforms.
+if cc.has_function('ngettext')
+  libintl = []
 else
-  glib_conf.set('HAVE_DCGETTEXT', cc.has_header_symbol('libintl.h', 'dcgettext'))
+  libintl = cc.find_library('intl', required : false)
+  if not libintl.found()
+    libintl = subproject('proxy-libintl').get_variable('intl_dep')
+  endif
 endif
+
 # We require gettext to always be present
+glib_conf.set('HAVE_DCGETTEXT', 1)
 glib_conf.set('HAVE_GETTEXT', 1)
+
 glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale'))
 # xgettext is optional (on Windows for instance)
 xgettext = find_program('xgettext', required : false)
@@ -1745,7 +1780,29 @@ if host_system != 'windows' and get_option('xattr')
   endif
 endif
 
-python = import('python3').find_python()
+# Test if we have strlcpy/strlcat with a compatible implementation:
+# https://bugzilla.gnome.org/show_bug.cgi?id=53933
+if cc_can_run
+  rres = cc.run('''#include <stdlib.h>
+                   #include <string.h>
+                   int main() {
+                     char p[10];
+                     (void) strlcpy (p, "hi", 10);
+                     if (strlcat (p, "bye", 0) != 3)
+                       return 1;
+                     return 0;
+                   }''',
+                name : 'OpenBSD strlcpy/strlcat')
+  if rres.compiled() and rres.returncode() == 0
+    glib_conf.set('HAVE_STRLCPY', 1)
+  endif
+elif meson.get_cross_property('have_strlcpy', false)
+  glib_conf.set('HAVE_STRLCPY', 1)
+endif
+
+python = import('python').find_installation('python3')
+# used for '#!/usr/bin/env <name>'
+python_name = 'python3'
 
 # Determine which user environment-dependent files that we want to install
 have_bash = find_program('bash', required : false).found() # For completion scripts
@@ -1755,12 +1812,15 @@ 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)
-glib_conf.set('__EXTENSIONS__', 1)
 glib_conf.set('STDC_HEADERS', 1)
-# THREADS_NONE
 glib_conf.set('SIZEOF___INT64', 8)
 
-glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir)
+# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
+if host_system == 'sunos'
+  glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)
+  glib_conf.set('_XOPEN_SOURCE', 2)
+  glib_conf.set('__EXTENSIONS__',1)
+endif
 
 # Sadly Meson does not expose this value:
 # https://github.com/mesonbuild/meson/pull/3460
@@ -1848,15 +1908,20 @@ if xgettext.found()
 endif
 subdir('tests')
 
-# NOTE: We skip glib-zip.in because the filenames it assumes don't match ours
-
 # Install glib-gettextize executable, if a UNIX-style shell is found
 if have_sh
+  # These should not contain " quotes around the values
+  gettexize_conf = configuration_data()
+  gettexize_conf.set('PACKAGE', 'glib')
+  gettexize_conf.set('VERSION', meson.project_version())
+  gettexize_conf.set('prefix', glib_prefix)
+  gettexize_conf.set('datarootdir', glib_datadir)
+  gettexize_conf.set('datadir', glib_datadir)
   configure_file(input : 'glib-gettextize.in',
     install : true,
     install_dir : 'bin',
     output : 'glib-gettextize',
-    configuration : glib_conf)
+    configuration : gettexize_conf)
 endif
 
 if have_m4
@@ -1872,9 +1937,7 @@ if host_system != 'windows'
     install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'valgrind'))
 endif
 
-configure_file(input : 'config.h.meson',
-  output : 'config.h',
-  configuration : glib_conf)
+configure_file(output : 'config.h', configuration : glib_conf)
 
 if host_system == 'windows'
   install_headers([ 'msvc_recommended_pragmas.h' ], subdir : 'glib-2.0')
diff --git a/meson_options.txt b/meson_options.txt
index 3d816d365..64accf68b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -73,3 +73,13 @@ option('force_posix_threads',
        type : 'boolean',
        value : false,
        description : 'Also use posix threads in case the platform defaults to another implementation (on Windows for example)')
+
+option('fam',
+       type : 'boolean',
+       value : false,
+       description : 'Use fam for file system monitoring')
+
+option('installed_tests',
+       type : 'boolean',
+       value : false,
+       description : 'enable installed tests')
diff --git a/po/cs.po b/po/cs.po
index c52d475b9..5d9203d4e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,10 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-04-26 14:46+0000\n"
-"PO-Revision-Date: 2018-05-04 00:37+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-06-05 15:11+0000\n"
+"PO-Revision-Date: 2018-06-06 11:01+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: �eština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -169,7 +168,7 @@ msgstr "Použití:\n"
 msgid "Arguments:\n"
 msgstr "Argumenty:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGUMENTY…]"
 
@@ -1249,38 +1248,38 @@ msgstr "Chyba: Příliš mnoho argumentů.\n"
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Chyba: %s není platným oficiálně známým názvem sběrnice.\n"
 
-#: ../gio/gdesktopappinfo.c:2021 ../gio/gdesktopappinfo.c:4588
+#: ../gio/gdesktopappinfo.c:2022 ../gio/gdesktopappinfo.c:4589
 msgid "Unnamed"
 msgstr "Bez názvu"
 
-#: ../gio/gdesktopappinfo.c:2431
+#: ../gio/gdesktopappinfo.c:2432
 msgid "Desktop file didn’t specify Exec field"
 msgstr "V souboru .desktop není ur�eno pole Exec"
 
-#: ../gio/gdesktopappinfo.c:2721
+#: ../gio/gdesktopappinfo.c:2722
 msgid "Unable to find terminal required for application"
 msgstr "Nezdařilo se najít  terminál vyžadovaný pro aplikaci"
 
-#: ../gio/gdesktopappinfo.c:3157
+#: ../gio/gdesktopappinfo.c:3158
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr "Nezdařilo se vytvořit složku %s s uživatelským nastavením aplikace: %s"
 
-#: ../gio/gdesktopappinfo.c:3161
+#: ../gio/gdesktopappinfo.c:3162
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Nezdařilo se vytvořit složku %s s uživatelským nastavením MIME: %s"
 
-#: ../gio/gdesktopappinfo.c:3401 ../gio/gdesktopappinfo.c:3425
+#: ../gio/gdesktopappinfo.c:3402 ../gio/gdesktopappinfo.c:3426
 msgid "Application information lacks an identifier"
 msgstr "Informace o aplikaci postrádá identifikátor"
 
-#: ../gio/gdesktopappinfo.c:3659
+#: ../gio/gdesktopappinfo.c:3660
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Nezdařilo se vytvořit uživatelský soubor .desktop %s"
 
-#: ../gio/gdesktopappinfo.c:3793
+#: ../gio/gdesktopappinfo.c:3794
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Vlastní definice %s"
@@ -1300,11 +1299,11 @@ msgstr "mechanika neumí vysouvací funkce eject nebo eject_with_operation"
 msgid "drive doesn’t implement polling for media"
 msgstr "mechanika neumí dotazování na média"
 
-#: ../gio/gdrive.c:776
+#: ../gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "mechanika neumí spuštění"
 
-#: ../gio/gdrive.c:878
+#: ../gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "mechanika neumí zastavení"
 
@@ -1361,7 +1360,7 @@ msgstr "Operace není podporována"
 msgid "Containing mount does not exist"
 msgstr "Obsahující připojené neexistuje"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2347
 msgid "Can’t copy over directory"
 msgstr "Nelze kopírovat nad složku"
 
@@ -1416,7 +1415,7 @@ msgstr "Zahozené není podporováno"
 msgid "File names cannot contain “%c�"
 msgstr "Názvy souborů nemohou obsahovat „%c“"
 
-#: ../gio/gfile.c:6768 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6768 ../gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "svazek neumí připojení"
 
@@ -1591,10 +1590,6 @@ msgstr "Použití:"
 msgid "Print version information and exit."
 msgstr "Vypsat informace o verzi a skon�it."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGUMENTY...]"
-
 #: ../gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Příkazy:"
@@ -1677,7 +1672,7 @@ msgstr "Chyba při zápisu do standardního výstupu"
 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1219
 #: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
@@ -1700,7 +1695,8 @@ msgstr ""
 
 #: ../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:139 ../gio/gio-tool-remove.c:72
+#: ../gio/gio-tool-mount.c:1269 ../gio/gio-tool-open.c:139
+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Nebylo zadáno žádné umístění"
 
@@ -1998,71 +1994,79 @@ msgstr "Sledovat události připojení"
 
 #: ../gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
-msgstr "Sledovat soubory nebo složky ohledně změn."
+msgstr "Sledovat soubory nebo složky ohledně změn"
 
-#: ../gio/gio-tool-mount.c:58
+#: ../gio/gio-tool-mount.c:59
 msgid "Mount as mountable"
 msgstr "Připojit jako připojitelný"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:60
 msgid "Mount volume with device file"
-msgstr "Připojit svazek pomocí souboru zařízení"
+msgstr "Připojit svazek odpovídající souboru zařízení"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:60 ../gio/gio-tool-mount.c:63
 msgid "DEVICE"
 msgstr "ZA�ZEN�"
 
-#: ../gio/gio-tool-mount.c:60
+#: ../gio/gio-tool-mount.c:61
 msgid "Unmount"
 msgstr "Odpojit"
 
-#: ../gio/gio-tool-mount.c:61
+#: ../gio/gio-tool-mount.c:62
 msgid "Eject"
 msgstr "Vysunout"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:63
+msgid "Stop drive with device file"
+msgstr "Zastavit médium odpovídající souboru zařízení"
+
+#: ../gio/gio-tool-mount.c:64
 msgid "Unmount all mounts with the given scheme"
 msgstr "Odpojit všechna připojení se zadaným schématem"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:64
 msgid "SCHEME"
 msgstr "SCHÉMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: ../gio/gio-tool-mount.c:65
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr "Při odpojování nebo vysouvání ignorovat nedokon�ené operace se soubory"
 
-#: ../gio/gio-tool-mount.c:64
+#: ../gio/gio-tool-mount.c:66
 msgid "Use an anonymous user when authenticating"
 msgstr "Při ověřování použít anonymního uživatele"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: ../gio/gio-tool-mount.c:68
 msgid "List"
 msgstr "Vypsat"
 
-#: ../gio/gio-tool-mount.c:67
+#: ../gio/gio-tool-mount.c:69
 msgid "Monitor events"
 msgstr "Sledovat události"
 
-#: ../gio/gio-tool-mount.c:68
+#: ../gio/gio-tool-mount.c:70
 msgid "Show extra information"
 msgstr "Zobrazit doplňující informace"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:280
 msgid "Anonymous access denied"
 msgstr "Anonymní přístup byl zamítnut"
 
-#: ../gio/gio-tool-mount.c:897
+#: ../gio/gio-tool-mount.c:508
+msgid "No drive for device file"
+msgstr "Pro soubor zařízení není žádné médium"
+
+#: ../gio/gio-tool-mount.c:973
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Připojeno %s do %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: ../gio/gio-tool-mount.c:1028
 msgid "No volume for device file"
 msgstr "Pro soubor zařízení není žádný svazek"
 
-#: ../gio/gio-tool-mount.c:1145
+#: ../gio/gio-tool-mount.c:1223
 msgid "Mount or unmount the locations."
 msgstr "Připojit nebo odpojit umístění."
 
@@ -2804,12 +2808,12 @@ msgstr "nedělá se nic.\n"
 msgid "removed existing output file.\n"
 msgstr "odstraněn existující výstupní soubor.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:544 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Neplatný název souboru %s"
 
-#: ../gio/glocalfile.c:1105
+#: ../gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Chyba při získávání informace o souborovém systému pro %s: %s"
@@ -2818,123 +2822,123 @@ msgstr "Chyba při získávání informace o souborovém systému pro %s: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: ../gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "Přípojení obsahující soubor %s nebylo nalezen"
 
-#: ../gio/glocalfile.c:1267
+#: ../gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Nelze přejmenovat kořenovou složku"
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Chyba při přejmenovávání souboru %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: ../gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Soubor nelze přejmenovat, název souboru již existuje"
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: ../gio/glocalfile.c:1206 ../gio/glocalfile.c:2223 ../gio/glocalfile.c:2251
+#: ../gio/glocalfile.c:2408 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Neplatný název souboru"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: ../gio/glocalfile.c:1374 ../gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Chyba při otevírání souboru %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: ../gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Chyba při odstraňování souboru %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: ../gio/glocalfile.c:1898
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Chyba při zahazování souboru %s do koše: %s"
 
-#: ../gio/glocalfile.c:2020
+#: ../gio/glocalfile.c:1921
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Nelze vytvořit složku koše %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: ../gio/glocalfile.c:1941
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Nelze nalézt složku nejvyšší úrovně pro vyhození %s"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: ../gio/glocalfile.c:2020 ../gio/glocalfile.c:2040
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Nelze nalézt nebo vytvořit složku koše pro %s"
 
-#: ../gio/glocalfile.c:2174
+#: ../gio/glocalfile.c:2075
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Nelze vytvořit informa�ní soubor o koši pro %s: %s"
 
-#: ../gio/glocalfile.c:2233
+#: ../gio/glocalfile.c:2134
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr "Nelze zahodit soubor %s do koše mimo hranice souborového systému"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2138 ../gio/glocalfile.c:2194
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Nelze zahodit soubor %s do koše: %s"
 
-#: ../gio/glocalfile.c:2299
+#: ../gio/glocalfile.c:2200
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Nelze zahodit soubor %s do koše"
 
-#: ../gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2226
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Chyba při vytváření složky %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: ../gio/glocalfile.c:2255
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Systém souborů nepodporuje symbolické odkazy"
 
-#: ../gio/glocalfile.c:2357
+#: ../gio/glocalfile.c:2258
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Chyba při vytváření symbolického odkazu %s: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: ../gio/glocalfile.c:2264 ../glib/gfileutils.c:2127
 msgid "Symbolic links not supported"
 msgstr "Symbolické odkazy nejsou podporovány"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: ../gio/glocalfile.c:2319 ../gio/glocalfile.c:2354 ../gio/glocalfile.c:2411
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Chyba při přesunování souboru %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: ../gio/glocalfile.c:2342
 msgid "Can’t move directory over directory"
 msgstr "Složku nelze přesunout nad složku"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
+#: ../gio/glocalfile.c:2368 ../gio/glocalfileoutputstream.c:935
 #: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
 #: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Vytvoření záložního souboru selhalo"
 
-#: ../gio/glocalfile.c:2486
+#: ../gio/glocalfile.c:2387
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Chyba při odstraňování cílového souboru: %s"
 
-#: ../gio/glocalfile.c:2500
+#: ../gio/glocalfile.c:2401
 msgid "Move between mounts not supported"
 msgstr "Přesunování mezi připojeními není podporováno"
 
-#: ../gio/glocalfile.c:2691
+#: ../gio/glocalfile.c:2592
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Nelze zjistit využití disku %s: %s"
@@ -2960,76 +2964,76 @@ msgstr "Chyba při nastavování rozšířeného atributu „%s“: %s"
 msgid " (invalid encoding)"
 msgstr " (neplatné kódování)"
 
-#: ../gio/glocalfileinfo.c:1778 ../gio/glocalfileoutputstream.c:813
+#: ../gio/glocalfileinfo.c:1773 ../gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr "Chyba při získávání informací pro soubor „%s“: %s"
 
-#: ../gio/glocalfileinfo.c:2040
+#: ../gio/glocalfileinfo.c:2035
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Chyba při získávání informací pro popisova�e souboru: %s"
 
-#: ../gio/glocalfileinfo.c:2085
+#: ../gio/glocalfileinfo.c:2080
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Neplatný typ atributu (o�ekáván uint32)"
 
-#: ../gio/glocalfileinfo.c:2103
+#: ../gio/glocalfileinfo.c:2098
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Neplatný typ atributu (o�ekáván uint64)"
 
-#: ../gio/glocalfileinfo.c:2122 ../gio/glocalfileinfo.c:2141
+#: ../gio/glocalfileinfo.c:2117 ../gio/glocalfileinfo.c:2136
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Neplatný typ atributu (o�ekáván bajtový řetězec)"
 
-#: ../gio/glocalfileinfo.c:2186
+#: ../gio/glocalfileinfo.c:2181
 msgid "Cannot set permissions on symlinks"
 msgstr "Nelze nastavit oprávnění na symbolických odkazech"
 
-#: ../gio/glocalfileinfo.c:2202
+#: ../gio/glocalfileinfo.c:2197
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Chyba při nastavování oprávnění: %s"
 
-#: ../gio/glocalfileinfo.c:2253
+#: ../gio/glocalfileinfo.c:2248
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Chyba při nastavování vlastníka: %s"
 
-#: ../gio/glocalfileinfo.c:2276
+#: ../gio/glocalfileinfo.c:2271
 msgid "symlink must be non-NULL"
 msgstr "symbolický odkaz nesmí být prázdný"
 
-#: ../gio/glocalfileinfo.c:2286 ../gio/glocalfileinfo.c:2305
-#: ../gio/glocalfileinfo.c:2316
+#: ../gio/glocalfileinfo.c:2281 ../gio/glocalfileinfo.c:2300
+#: ../gio/glocalfileinfo.c:2311
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Chyba při nastavování symbolického odkazu: %s"
 
-#: ../gio/glocalfileinfo.c:2295
+#: ../gio/glocalfileinfo.c:2290
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Chyba při nastavování symbolického odkazu: soubor není symbolickým odkazem"
 
-#: ../gio/glocalfileinfo.c:2421
+#: ../gio/glocalfileinfo.c:2416
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Chyba při nastavování změny nebo �asu přístupu: %s"
 
-#: ../gio/glocalfileinfo.c:2444
+#: ../gio/glocalfileinfo.c:2439
 msgid "SELinux context must be non-NULL"
 msgstr "Kontext SELinux nesmí být prázdný"
 
-#: ../gio/glocalfileinfo.c:2459
+#: ../gio/glocalfileinfo.c:2454
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Chyba při nastavování kontextu SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2466
+#: ../gio/glocalfileinfo.c:2461
 msgid "SELinux is not enabled on this system"
 msgstr "V tomto systému není SELinux povolen"
 
-#: ../gio/glocalfileinfo.c:2558
+#: ../gio/glocalfileinfo.c:2553
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Nastavení atributu %s není podporováno"
@@ -3144,21 +3148,21 @@ msgstr "Požadováno hledání za ukon�ením proudu"
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: ../gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr "připojené neprovádí odpojovací operaci „unmount“"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: ../gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 msgstr "připojené neumí vysouvací operaci „eject“"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:550
+#: ../gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 msgstr ""
 "připojené neumí odpojovací operaci „unmount“ nebo „unmount_with_operation“"
@@ -3166,28 +3170,28 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:635
+#: ../gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 msgstr "připojené neumí vysouvací operaci „eject“ nebo „eject_with_operation“"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:723
+#: ../gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 msgstr "připojené neumí operaci opakovaného připojení „remount“"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:805
+#: ../gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "připojené neumí odhad typu obsahu"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: ../gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "připojené neumí synchronní odhad typu obsahu"
 
@@ -4058,7 +4062,7 @@ msgstr "Chyba při �tení z popisova�e souboru: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Chyba při zavírání popisova�e souboru: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: ../gio/gunixmounts.c:2593 ../gio/gunixmounts.c:2646
 msgid "Filesystem root"
 msgstr "Kořen systému souborů"
 
@@ -4071,14 +4075,14 @@ msgstr "Chyba při zápisu do popisova�e souboru: %s"
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr "V tomto systému nejsou podporovány abstraktní adresy soketů domén UNIX"
 
-#: ../gio/gvolume.c:437
+#: ../gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "svazek neumí vysouvací operaci eject"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gvolume.c:514
+#: ../gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "svazek neumí vysouvací operaci eject nebo eject_with_operation"
 
@@ -5465,7 +5469,7 @@ msgstr "název je příliš dlouhý v (*MARK), (*PRUNE), (*SKIP) nebo (*THEN)"
 msgid "character value in \\u.... sequence is too large"
 msgstr "znaková hodnota v posloupnosti \\u.... je příliš vysoká"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Chyba při porovnávání regulárního výrazu %s: %s"
@@ -5492,43 +5496,43 @@ msgstr "Chyba při optimalizaci regulárního výrazu %s: %s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Chyba při kompilaci regulárního výrazu %s na znaku %d: %s"
 
-#: ../glib/gregex.c:2413
+#: ../glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr "o�ekávána šestnáctková �íslice nebo „}“"
 
-#: ../glib/gregex.c:2429
+#: ../glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "o�ekávána šestnáctková �íslice"
 
-#: ../glib/gregex.c:2469
+#: ../glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr "v symbolickém odkazu chybí „<“"
 
-#: ../glib/gregex.c:2478
+#: ../glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "neukon�ený symbolický odkaz"
 
-#: ../glib/gregex.c:2485
+#: ../glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "symbolický odkaz o nulové délce"
 
-#: ../glib/gregex.c:2496
+#: ../glib/gregex.c:2502
 msgid "digit expected"
 msgstr "o�ekávána �íslice"
 
-#: ../glib/gregex.c:2514
+#: ../glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "nedovolený symbolický odkaz"
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr "osamocené koncové „\\“"
 
-#: ../glib/gregex.c:2580
+#: ../glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "neznámá úniková sekvence"
 
-#: ../glib/gregex.c:2590
+#: ../glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr "Chyba při zpracování náhradního textu „%s“ na znaku %lu: %s"
@@ -5715,127 +5719,127 @@ msgstr "Neplatná posloupnost na vstupu převodu"
 msgid "Character out of range for UTF-16"
 msgstr "Znak je mimo rozsah UTF-16"
 
-#: ../glib/gutils.c:2241
+#: ../glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2242 ../glib/gutils.c:2448
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2243 ../glib/gutils.c:2453
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2244 ../glib/gutils.c:2458
+#: ../glib/gutils.c:2247 ../glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2245 ../glib/gutils.c:2463
+#: ../glib/gutils.c:2248 ../glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2246 ../glib/gutils.c:2468
+#: ../glib/gutils.c:2249 ../glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2249
+#: ../glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2250
+#: ../glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2251
+#: ../glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2252
+#: ../glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2253
+#: ../glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2254
+#: ../glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2257
+#: ../glib/gutils.c:2260
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
-#: ../glib/gutils.c:2258
+#: ../glib/gutils.c:2261
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
-#: ../glib/gutils.c:2259
+#: ../glib/gutils.c:2262
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
-#: ../glib/gutils.c:2260
+#: ../glib/gutils.c:2263
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
-#: ../glib/gutils.c:2261
+#: ../glib/gutils.c:2264
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
-#: ../glib/gutils.c:2262
+#: ../glib/gutils.c:2265
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
-#: ../glib/gutils.c:2265
+#: ../glib/gutils.c:2268
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
-#: ../glib/gutils.c:2266
+#: ../glib/gutils.c:2269
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
-#: ../glib/gutils.c:2267
+#: ../glib/gutils.c:2270
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
-#: ../glib/gutils.c:2268
+#: ../glib/gutils.c:2271
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
-#: ../glib/gutils.c:2269
+#: ../glib/gutils.c:2272
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
-#: ../glib/gutils.c:2270
+#: ../glib/gutils.c:2273
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: ../glib/gutils.c:2304 ../glib/gutils.c:2430
+#: ../glib/gutils.c:2307 ../glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -5843,7 +5847,7 @@ msgstr[0] "%u bajt"
 msgstr[1] "%u bajty"
 msgstr[2] "%u bajtů"
 
-#: ../glib/gutils.c:2308
+#: ../glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5852,7 +5856,7 @@ msgstr[1] "%u bity"
 msgstr[2] "%u bitů"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2375
+#: ../glib/gutils.c:2378
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -5861,7 +5865,7 @@ msgstr[1] "%s bajty"
 msgstr[2] "%s bajtů"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2380
+#: ../glib/gutils.c:2383
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -5874,10 +5878,7 @@ msgstr[2] "%s bitů"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2443
+#: ../glib/gutils.c:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
-
-#~ msgid "Failed to create temp file: %s"
-#~ msgstr "Nelze vytvořit do�asný soubor „%s“"
diff --git a/po/de.po b/po/de.po
index b192428f9..8efc69e81 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,10 +15,9 @@
 msgid ""
 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: 2018-02-16 20:43+0000\n"
-"PO-Revision-Date: 2018-02-18 14:17+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-06-21 17:12+0000\n"
+"PO-Revision-Date: 2018-06-23 12:35+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -26,21 +25,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
 
-#: ../gio/gapplication.c:495
+#: ../gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Optionen für GApplication"
 
-#: ../gio/gapplication.c:495
+#: ../gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Optionen für GApplication anzeigen"
 
-#: ../gio/gapplication.c:540
+#: ../gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr "GApplication Dienstmodus starten (aus D-Bus Dienstdateien verwenden)"
 
-#: ../gio/gapplication.c:552
+#: ../gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Anwendungskennung überschreiben"
 
@@ -121,8 +120,8 @@ msgstr "Der Befehl, für den eine detaillierte Hilfe ausgegeben wird"
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "Anwendungsbezeichnung im D-Bus-Format (z.B: org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
-#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:737
+#: ../gio/glib-compile-resources.c:743 ../gio/glib-compile-resources.c:770
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "DATEI"
@@ -167,7 +166,7 @@ msgstr "Aufruf:\n"
 msgid "Arguments:\n"
 msgstr "Argumente:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGUMENTE …]"
 
@@ -351,19 +350,19 @@ msgstr "Unbekannter Typ"
 msgid "%s filetype"
 msgstr "%s-Dateityp"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: ../gio/gcredentials.c:315 ../gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
 msgstr "GCredentials ist in diesem Betriebssystem nicht implementiert"
 
-#: ../gio/gcredentials.c:467
+#: ../gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Es gibt auf Ihrer Plattform keine Unterstützung für GCredentials"
 
-#: ../gio/gcredentials.c:513
+#: ../gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "GCredentials enthält in diesem Betriebssystem keine Prozesskennung"
 
-#: ../gio/gcredentials.c:565
+#: ../gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr ""
 "Fälschen von Anmeldedaten ist unter diesem Betriebssystem nicht möglich"
@@ -401,12 +400,17 @@ msgstr "Fehler in Adresse »%s« – Das Port-Attribut ist nicht korrekt"
 msgid "Error in address “%s� — the family attribute is malformed"
 msgstr "Fehler in Adresse »%s« – Das Familien-Attribut ist nicht korrekt"
 
-#: ../gio/gdbusaddress.c:463
+#: ../gio/gdbusaddress.c:423 ../gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s� for address “%s�"
+msgstr "Unbekannter oder nicht unterstützter Transport »%s« für Adresse »%s«"
+
+#: ../gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s� does not contain a colon (:)"
 msgstr "Adresselement »%s« enthält keinen Doppelpunkt"
 
-#: ../gio/gdbusaddress.c:484
+#: ../gio/gdbusaddress.c:488
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s�, in address element “%s� does not contain an equal "
@@ -415,7 +419,7 @@ msgstr ""
 "Schlüssel-Wert-Paar %d, »%s«, in Adresselement »%s« enthält kein "
 "Gleichheitszeichen"
 
-#: ../gio/gdbusaddress.c:498
+#: ../gio/gdbusaddress.c:502
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s�, in address element "
@@ -424,7 +428,7 @@ msgstr ""
 "Fehler beim Entfernen von Escape-Zeichen im Schlüssel-Wert-Paar %d, »%s«, im "
 "Adresselement »%s«"
 
-#: ../gio/gdbusaddress.c:576
+#: ../gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s� — the unix transport requires exactly one of the keys "
@@ -433,99 +437,94 @@ msgstr ""
 "Fehler in Adresse »%s« - für den Unix-Transport muss genau einer der "
 "Schlüssel »path« oder »abstract« gesetzt sein"
 
-#: ../gio/gdbusaddress.c:612
+#: ../gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s� — the host attribute is missing or malformed"
 msgstr ""
 "Fehler in Adresse »%s« – Das Host-Attribut fehlt oder ist nicht korrekt"
 
-#: ../gio/gdbusaddress.c:626
+#: ../gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s� — the port attribute is missing or malformed"
 msgstr ""
 "Fehler in Adresse »%s« – Das Port-Attribut fehlt oder ist nicht korrekt"
 
-#: ../gio/gdbusaddress.c:640
+#: ../gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s� — the noncefile attribute is missing or malformed"
 msgstr ""
 "Fehler in Adresse »%s« – Das noncefile-Attribut fehlt oder ist nicht korrekt"
 
-#: ../gio/gdbusaddress.c:661
+#: ../gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Fehler beim automatischen Starten: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s� for address “%s�"
-msgstr "Unbekannter oder nicht unterstützter Transport »%s« für Adresse »%s«"
-
-#: ../gio/gdbusaddress.c:714
+#: ../gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s�: %s"
 msgstr "Fehler beim Öffnen der Nonce-Datei »%s«: %s"
 
-#: ../gio/gdbusaddress.c:733
+#: ../gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s�: %s"
 msgstr "Fehler beim Lesen der Nonce-Datei »%s«: %s"
 
-#: ../gio/gdbusaddress.c:742
+#: ../gio/gdbusaddress.c:746
 #, c-format
 msgid "Error reading from nonce file “%s�, expected 16 bytes, got %d"
 msgstr ""
 "Fehler beim Lesen der Nonce-Datei »%s«, erwartet wurden 16 Bytes, jedoch %d "
 "erhalten"
 
-#: ../gio/gdbusaddress.c:760
+#: ../gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s� to stream:"
 msgstr ""
 "Fehler beim Schreiben des Inhalts der Nonce-Datei »%s« in den Datenstrom:"
 
-#: ../gio/gdbusaddress.c:969
+#: ../gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "Die angegebene Adresse ist leer"
 
-#: ../gio/gdbusaddress.c:1082
+#: ../gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "Ein Nachrichtenbus kann nicht mit setuid erzeugt werden"
 
-#: ../gio/gdbusaddress.c:1089
+#: ../gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr ""
 "Ein Nachrichtenbus kann nicht ohne eine Rechner-Kennung erzeugt werden: "
 
-#: ../gio/gdbusaddress.c:1096
+#: ../gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "D-Bus kann nicht automatisch ohne X11 $DISPLAY gestartet werden"
 
-#: ../gio/gdbusaddress.c:1138
+#: ../gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s�: "
 msgstr "Fehler beim Erzeugen der Befehlszeile »%s«: "
 
-#: ../gio/gdbusaddress.c:1355
+#: ../gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr ""
 "(Geben Sie ein beliebiges Zeichen ein, um dieses Fenster zu schließen)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: ../gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "Der Sitzungs-dbus läuft nicht und automatisches Starten schlug fehl"
 
-#: ../gio/gdbusaddress.c:1520
+#: ../gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Adresse des Sitzungsbus konnte nicht ermittelt werden (für dieses "
 "Betriebssystem nicht implementiert)"
 
-#: ../gio/gdbusaddress.c:1658
+#: ../gio/gdbusaddress.c:1662 ../gio/gdbusconnection.c:7151
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -534,7 +533,7 @@ msgstr ""
 "Bus-Adresse konnte nicht über die Umgebungsvariable DBUS_STARTER_BUS_TYPE "
 "ermittelt werden – unbekannter Wert »%s«"
 
-#: ../gio/gdbusaddress.c:1667 ../gio/gdbusconnection.c:7160
+#: ../gio/gdbusaddress.c:1671 ../gio/gdbusconnection.c:7160
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -542,7 +541,7 @@ msgstr ""
 "Bus-Adresse konnte nicht ermittelt werden, da die Umgebungsvariable "
 "DBUS_STARTER_BUS_TYPE nicht gesetzt ist"
 
-#: ../gio/gdbusaddress.c:1677
+#: ../gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Unbekannter Bus-Typ %d"
@@ -556,7 +555,7 @@ msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr ""
 "Unerwarteter Mangel an Inhalt beim Versuch, eine Zeile (sicher) zu lesen"
 
-#: ../gio/gdbusauth.c:508
+#: ../gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -564,7 +563,7 @@ msgstr ""
 "Alle verfügbaren Legitimierungsmechanismen sind ausgeschöpft (%s Versuche) "
 "(verfügbar: %s)"
 
-#: ../gio/gdbusauth.c:1171
+#: ../gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Abgebrochen durch GDBusAuthObserver::authorize-authenticated-peer"
 
@@ -581,22 +580,22 @@ msgstr ""
 "Zugriffsrechte des Ordners »%s« sind inkorrekt. Erwarteter Modus ist 0700, "
 "0%o wurde erhalten"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: ../gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s�: %s"
 msgstr "Fehler beim Erstellen des Ordners »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: ../gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s� for reading: "
 msgstr "Fehler beim Öffnen des Schlüsselbundes »%s« zum Lesen: "
 
-#: ../gio/gdbusauthmechanismsha1.c:402 ../gio/gdbusauthmechanismsha1.c:720
+#: ../gio/gdbusauthmechanismsha1.c:369 ../gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr "Zeile %d des Schlüsselbundes auf »%s« mit Inhalt »%s« ist inkorrekt"
 
-#: ../gio/gdbusauthmechanismsha1.c:416 ../gio/gdbusauthmechanismsha1.c:734
+#: ../gio/gdbusauthmechanismsha1.c:383 ../gio/gdbusauthmechanismsha1.c:701
 #, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -604,7 +603,7 @@ msgstr ""
 "Der erste Token in Zeile %d des Schlüsselbundes bei »%s« mit dem Inhalt »%s« "
 "ist inkorrekt"
 
-#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:748
+#: ../gio/gdbusauthmechanismsha1.c:397 ../gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -612,38 +611,38 @@ msgstr ""
 "Der zweite Token in Zeile %d des Schlüsselbundes bei »%s« mit dem Inhalt "
 "»%s« ist inkorrekt"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: ../gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
 msgstr ""
 "Cookie mit Kennung %d konnte im Schlüsselbund auf »%s« nicht gefunden werden"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: ../gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Fehler beim Löschen der alten Sperrdatei »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: ../gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s�: %s"
 msgstr "Fehler beim Erstellen der Sperrdatei »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: ../gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
 msgstr "Fehler beim Schließen der entknüpften Sperrdatei »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: ../gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s�: %s"
 msgstr "Fehler beim Entknüpfen der Sperrdatei »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: ../gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s� for writing: "
 msgstr "Fehler beim Öffnen des Schlüsselbundes »%s« zum Schreiben: "
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: ../gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
 msgstr "(Außerdem schlug das Entsperren von »%s« ebenso fehl: %s) "
@@ -666,53 +665,57 @@ msgstr ""
 #: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
 #, c-format
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
+"No such interface “org.freedesktop.DBus.Properties� on object at path %s"
 msgstr ""
 "Keine derartige Schnittstelle »org.freedesktop.DBus.Properties« des Objekts "
 "im Pfad %s"
 
 #: ../gio/gdbusconnection.c:4266
 #, c-format
-msgid "No such property '%s'"
+msgid "No such property “%s�"
 msgstr "Keine derartige Eigenschaft »%s«"
 
 #: ../gio/gdbusconnection.c:4278
 #, c-format
-msgid "Property '%s' is not readable"
+msgid "Property “%s� is not readable"
 msgstr "Eigenschaft »%s« ist nicht lesbar"
 
 #: ../gio/gdbusconnection.c:4289
 #, c-format
-msgid "Property '%s' is not writable"
+msgid "Property “%s� is not writable"
 msgstr "Eigenschaft »%s« ist nicht schreibbar"
 
 #: ../gio/gdbusconnection.c:4309
 #, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+msgid "Error setting property “%s�: Expected type “%s� but got “%s�"
 msgstr ""
 "Fehler beim Setzen der Eigenschaft »%s«: Erwarteter Typ war »%s«, aber »%s« "
 "wurde erhalten"
 
-#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
-#: ../gio/gdbusconnection.c:6591
+#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:6591
+#, c-format
+msgid "No such interface “%s�"
+msgstr "Keine derartige Schnittstelle »%s«"
+
+#: ../gio/gdbusconnection.c:4622
 #, c-format
 msgid "No such interface '%s'"
 msgstr "Keine derartige Schnittstelle »%s«"
 
 #: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7100
 #, c-format
-msgid "No such interface '%s' on object at path %s"
+msgid "No such interface “%s� on object at path %s"
 msgstr "Keine derartige Schnittstelle »%s« des Objekts im Pfad %s"
 
 #: ../gio/gdbusconnection.c:4938
 #, c-format
-msgid "No such method '%s'"
+msgid "No such method “%s�"
 msgstr "Keine derartige Methode »%s«"
 
 #: ../gio/gdbusconnection.c:4969
 #, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
-msgstr "Der Nachrichtentyp »%s« entspricht nicht dem erwarteten Wert »%s«"
+msgid "Type of message, “%s�, does not match expected type “%s�"
+msgstr "Der Nachrichtentyp »%s« entspricht nicht dem erwarteten Typ »%s«"
 
 #: ../gio/gdbusconnection.c:5167
 #, c-format
@@ -731,12 +734,12 @@ msgstr "Eigenschaft kann nicht gesetzt werden: %s.%s"
 
 #: ../gio/gdbusconnection.c:5627
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Method “%s� returned type “%s�, but expected “%s�"
 msgstr "Methode »%s« gab Typ »%s« zurück, aber »%s« wurde erwartet"
 
 #: ../gio/gdbusconnection.c:6702
 #, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgid "Method “%s� on interface “%s� with signature “%s� does not exist"
 msgstr "Methode »%s« in Schnittstelle »%s« mit Signatur »%s« existiert nicht"
 
 #: ../gio/gdbusconnection.c:6823
@@ -744,36 +747,27 @@ msgstr "Methode »%s« in Schnittstelle »%s« mit Signatur »%s« existiert nic
 msgid "A subtree is already exported for %s"
 msgstr "Ein Unterbaum wurde bereits für %s exportiert"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Bus-Adresse konnte nicht über die Umgebungsvariable DBUS_STARTER_BUS_TYPE "
-"ermittelt werden, unbekannter Wert »%s«"
-
-#: ../gio/gdbusmessage.c:1246
+#: ../gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "Typ ist UNGÃœLTIG"
 
-#: ../gio/gdbusmessage.c:1257
+#: ../gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "METHOD_CALL-Meldung: Kopfzeilenfeld PATH oder MEMBER fehlt"
 
-#: ../gio/gdbusmessage.c:1268
+#: ../gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "METHOD_RETURN-Meldung: Kopfzeilenfeld REPLY_SERIAL fehlt"
 
-#: ../gio/gdbusmessage.c:1280
+#: ../gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "ERROR-Meldung: Kopfzeilenfeld REPLY_SERIAL oder ERROR_NAME fehlt"
 
-#: ../gio/gdbusmessage.c:1293
+#: ../gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "SIGNAL-Meldung: Kopfzeilenfeld PATH, INTERFACE oder MEMBER fehlt"
 
-#: ../gio/gdbusmessage.c:1301
+#: ../gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -781,7 +775,7 @@ msgstr ""
 "SIGNAL-Meldung: Das Kopfzeilenfeld PATH verwendet den reservierten Wert /org/"
 "freedesktop/DBus/Local"
 
-#: ../gio/gdbusmessage.c:1309
+#: ../gio/gdbusmessage.c:1311
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
@@ -789,21 +783,21 @@ msgstr ""
 "SIGNAL-Meldung: Das Kopfzeilenfeld INTERFACE verwendet den reservierten Wert "
 "org.freedesktop.DBus.Local"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
+#: ../gio/gdbusmessage.c:1359 ../gio/gdbusmessage.c:1419
 #, c-format
 msgid "Wanted to read %lu byte but only got %lu"
 msgid_plural "Wanted to read %lu bytes but only got %lu"
 msgstr[0] "%lu Byte sollte gelesen werden, aber nur %lu erhalten"
 msgstr[1] "%lu Bytes sollten gelesen werden, aber nur %lu erhalten"
 
-#: ../gio/gdbusmessage.c:1371
+#: ../gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s� but found byte %d"
 msgstr ""
 "Ein NUL-Byte wurde nach der Zeichenkette »%s« erwartet, aber es wurde Byte "
 "%d gefunden"
 
-#: ../gio/gdbusmessage.c:1390
+#: ../gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -813,17 +807,17 @@ msgstr ""
 "Position %d gefunden (Länge der Zeichenkette ist %d). Die gültige UTF-8-"
 "Zeichenkette bis zu diesem Punkt war »%s«."
 
-#: ../gio/gdbusmessage.c:1593
+#: ../gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus object path"
 msgstr "Verarbeiteter Wert »%s« ist kein gültiger D-Bus-Objektpfad"
 
-#: ../gio/gdbusmessage.c:1615
+#: ../gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature"
 msgstr "Verarbeiteter Wert »%s« ist keine gültige D-Bus-Signatur"
 
-#: ../gio/gdbusmessage.c:1662
+#: ../gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -836,7 +830,7 @@ msgstr[1] ""
 "Array der Länge %u Bytes wurde erkannt. Maximale Länge ist 2<<26 Bytes (64 "
 "MiB)."
 
-#: ../gio/gdbusmessage.c:1682
+#: ../gio/gdbusmessage.c:1684
 #, c-format
 msgid ""
 "Encountered array of type “a%c�, expected to have a length a multiple of %u "
@@ -845,12 +839,12 @@ msgstr ""
 "Es wurde ein Feld des Typs »a%c« gefunden. Erwartet wurde als Länge ein "
 "Vielfaches von %u Byte, aber es waren %u Byte Länge"
 
-#: ../gio/gdbusmessage.c:1849
+#: ../gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s� for variant is not a valid D-Bus signature"
 msgstr "Verarbeiteter Wert »%s« für Variante ist keine gültige D-Bus-Signatur"
 
-#: ../gio/gdbusmessage.c:1873
+#: ../gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s� from the D-Bus wire format"
@@ -858,7 +852,7 @@ msgstr ""
 "Fehler beim Deserialisieren von GVariant mit der Typenzeichenkette »%s« aus "
 "dem D-Bus Wire-Format"
 
-#: ../gio/gdbusmessage.c:2055
+#: ../gio/gdbusmessage.c:2057
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l�) or 0x42 (“B�) but found value "
@@ -867,25 +861,25 @@ msgstr ""
 "Ungültiger Wert für die Speicherreihenfolge. Es wird entweder 0x6c (»l«) "
 "oder 0x42 (»B«) erwartet, aber der Wert 0x%02x gefunden"
 
-#: ../gio/gdbusmessage.c:2068
+#: ../gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr ""
 "Ungültige Version des Hauptprotokolls. Erwartet wurde 1, jedoch %d gefunden"
 
-#: ../gio/gdbusmessage.c:2124
+#: ../gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s� found but message body is empty"
 msgstr ""
 "Signatur-Kopfzeilenfeld mit Signatur »%s« gefunden, aber Nachrichtenrumpf "
 "ist leer"
 
-#: ../gio/gdbusmessage.c:2138
+#: ../gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature (for body)"
 msgstr "Verarbeiteter Wert »%s« ist keine gültige D-Bus-Signatur (für Rumpf)"
 
-#: ../gio/gdbusmessage.c:2168
+#: ../gio/gdbusmessage.c:2170
 #, c-format
 msgid "No signature header in message but the message body is %u byte"
 msgid_plural "No signature header in message but the message body is %u bytes"
@@ -896,11 +890,11 @@ msgstr[1] ""
 "Kein Signatur-Kopfzeilenfeld in der Nachricht, aber der Nachrichtenrumpf ist "
 "%u Bytes groß"
 
-#: ../gio/gdbusmessage.c:2178
+#: ../gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "Meldung kann nicht deserialisiert werden: "
 
-#: ../gio/gdbusmessage.c:2519
+#: ../gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s� to the D-Bus wire format"
@@ -908,7 +902,7 @@ msgstr ""
 "Fehler beim Deserialisieren von GVariant mit der Typenzeichenkette »%s« in "
 "das D-Bus Wire-Format"
 
-#: ../gio/gdbusmessage.c:2656
+#: ../gio/gdbusmessage.c:2658
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
@@ -916,18 +910,18 @@ msgstr ""
 "Anzahl der Dateideskriptoren in Meldung (%d) und Kopfzeilenfeld (%d) ist "
 "unterschiedlich"
 
-#: ../gio/gdbusmessage.c:2664
+#: ../gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "Meldung kann nicht serialisiert werden: "
 
-#: ../gio/gdbusmessage.c:2708
+#: ../gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s� but there is no signature header"
 msgstr ""
 "Nachrichtenrumpf hat den Signaturtyp »%s«, aber es gibt keine Signatur im "
 "Kopfzeilenfeld"
 
-#: ../gio/gdbusmessage.c:2718
+#: ../gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s� but signature in the header field is "
@@ -936,18 +930,18 @@ msgstr ""
 "Nachrichtenrumpf hat den Signaturtyp »%s«, aber die Signatur im "
 "Kopfzeilenfeld ist »%s«"
 
-#: ../gio/gdbusmessage.c:2734
+#: ../gio/gdbusmessage.c:2736
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)�"
 msgstr ""
 "Nachrichtenrumpf ist leer, aber die Signatur im Kopfzeilenfeld ist »(%s)«"
 
-#: ../gio/gdbusmessage.c:3287
+#: ../gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s�"
 msgstr "Fehlerrückmeldung mit Inhalt des Typs »%s«"
 
-#: ../gio/gdbusmessage.c:3295
+#: ../gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Fehlerrückmeldung mit leerem Inhalt"
 
@@ -1026,54 +1020,54 @@ msgstr ""
 "\n"
 "Mit »%s BEFEHL --help« erhalten Sie Hilfe zu jedem der Befehle.\n"
 
-#: ../gio/gdbus-tool.c:167 ../gio/gdbus-tool.c:234 ../gio/gdbus-tool.c:306
-#: ../gio/gdbus-tool.c:330 ../gio/gdbus-tool.c:811 ../gio/gdbus-tool.c:1150
-#: ../gio/gdbus-tool.c:1592
+#: ../gio/gdbus-tool.c:185 ../gio/gdbus-tool.c:252 ../gio/gdbus-tool.c:324
+#: ../gio/gdbus-tool.c:348 ../gio/gdbus-tool.c:834 ../gio/gdbus-tool.c:1171
+#: ../gio/gdbus-tool.c:1613
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: ../gio/gdbus-tool.c:178 ../gio/gdbus-tool.c:247 ../gio/gdbus-tool.c:1608
+#: ../gio/gdbus-tool.c:196 ../gio/gdbus-tool.c:265 ../gio/gdbus-tool.c:1629
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Fehler beim Verarbeiten des XML-Codes der Inspektion: %s\n"
 
-#: ../gio/gdbus-tool.c:216
+#: ../gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Fehler: %s ist kein gültiger Name\n"
 
-#: ../gio/gdbus-tool.c:364
+#: ../gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Zum Systembus verbinden"
 
-#: ../gio/gdbus-tool.c:365
+#: ../gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Zum Sitzungsbus verbinden"
 
-#: ../gio/gdbus-tool.c:366
+#: ../gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Zur angegebenen D-Bus-Adresse verbinden"
 
-#: ../gio/gdbus-tool.c:376
+#: ../gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Optionen für Gegenstelle der Verbindung:"
 
-#: ../gio/gdbus-tool.c:377
+#: ../gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Optionen zur Gegenstelle der Verbindung"
 
-#: ../gio/gdbus-tool.c:399
+#: ../gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Keine Gegenstelle der Verbindung angegeben"
 
-#: ../gio/gdbus-tool.c:409
+#: ../gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Mehrere Gegenstellen der Verbindung angegeben"
 
-#: ../gio/gdbus-tool.c:479
+#: ../gio/gdbus-tool.c:497
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s� does not exist\n"
@@ -1081,7 +1075,7 @@ msgstr ""
 "Warnung: Entsprechend den Inspektionsdaten existiert die Schnittstelle »%s« "
 "nicht\n"
 
-#: ../gio/gdbus-tool.c:488
+#: ../gio/gdbus-tool.c:506
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s� does not exist on "
@@ -1090,170 +1084,169 @@ msgstr ""
 "Warnung: Entsprechend den Inspektionsdaten existiert die Methode »%s« nicht "
 "in der Schnittstelle »%s«\n"
 
-#: ../gio/gdbus-tool.c:550
+#: ../gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Optionales Ziel des Signals (eindeutiger Name)"
 
-#: ../gio/gdbus-tool.c:551
+#: ../gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Objektpfad, auf den das Signal ausgegeben werden soll"
 
-#: ../gio/gdbus-tool.c:552
+#: ../gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Signal und Schnittstellenname"
 
-#: ../gio/gdbus-tool.c:587
+#: ../gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Ein Signal ausgeben."
 
-#: ../gio/gdbus-tool.c:642 ../gio/gdbus-tool.c:944 ../gio/gdbus-tool.c:1698
-#: ../gio/gdbus-tool.c:1931 ../gio/gdbus-tool.c:2152
+#: ../gio/gdbus-tool.c:658 ../gio/gdbus-tool.c:965 ../gio/gdbus-tool.c:1715
+#: ../gio/gdbus-tool.c:1944 ../gio/gdbus-tool.c:2164
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Fehler beim Verbinden: %s\n"
 
-#: ../gio/gdbus-tool.c:659 ../gio/gdbus-tool.c:961 ../gio/gdbus-tool.c:1715
-#: ../gio/gdbus-tool.c:1956
-#, c-format
-msgid "Error: Destination is not specified\n"
-msgstr "Fehler: Ziel wurde nicht angegeben\n"
-
-#: ../gio/gdbus-tool.c:670
+#: ../gio/gdbus-tool.c:678
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "Fehler: %s ist kein gültiger eindeutiger Bus-Name.\n"
 
-#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
+#: ../gio/gdbus-tool.c:697 ../gio/gdbus-tool.c:1008 ../gio/gdbus-tool.c:1758
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "Fehler: Objektpfad wurde nicht angegeben\n"
 
-#: ../gio/gdbus-tool.c:705 ../gio/gdbus-tool.c:1007 ../gio/gdbus-tool.c:1761
-#: ../gio/gdbus-tool.c:2002
+#: ../gio/gdbus-tool.c:720 ../gio/gdbus-tool.c:1028 ../gio/gdbus-tool.c:1778
+#: ../gio/gdbus-tool.c:2015
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Fehler: %s ist kein gültiger Objektpfad\n"
 
-#: ../gio/gdbus-tool.c:720
+#: ../gio/gdbus-tool.c:740
 #, c-format
 msgid "Error: Signal name is not specified\n"
 msgstr "Fehler: Signalname wurde nicht angegeben\n"
 
-#: ../gio/gdbus-tool.c:731
+#: ../gio/gdbus-tool.c:754
 #, c-format
 msgid "Error: Signal name “%s� is invalid\n"
 msgstr "Fehler: Signalname »%s« ist ungültig\n"
 
-#: ../gio/gdbus-tool.c:743
+#: ../gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Fehler: %s ist kein gültiger Schnittstellenname\n"
 
-#: ../gio/gdbus-tool.c:749
+#: ../gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Fehler: %s ist kein gültiger Mitgliedsname\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:786 ../gio/gdbus-tool.c:1119
+#: ../gio/gdbus-tool.c:809 ../gio/gdbus-tool.c:1140
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Fehler bei der Verarbeitung des Parameters %d: %s\n"
 
-#: ../gio/gdbus-tool.c:818
+#: ../gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Fehler beim Löschen der Verbindung: %s\n"
 
-#: ../gio/gdbus-tool.c:845
+#: ../gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Name des Ziels, für das die Methode aufgerufen werden soll"
 
-#: ../gio/gdbus-tool.c:846
+#: ../gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Objektpfad, für den die Methode aufgerufen werden soll"
 
-#: ../gio/gdbus-tool.c:847
+#: ../gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Methode und Schnittstellenname"
 
-#: ../gio/gdbus-tool.c:848
+#: ../gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Zeitablauf in Sekunden"
 
-#: ../gio/gdbus-tool.c:889
+#: ../gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Eine Methode für ein entferntes Objekt aufrufen."
 
-#: ../gio/gdbus-tool.c:972 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1967
+#: ../gio/gdbus-tool.c:982 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1969
+#, c-format
+msgid "Error: Destination is not specified\n"
+msgstr "Fehler: Ziel wurde nicht angegeben\n"
+
+#: ../gio/gdbus-tool.c:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Fehler: %s ist kein gültiger Bus-Name\n"
 
-#: ../gio/gdbus-tool.c:1022
+#: ../gio/gdbus-tool.c:1043
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "Fehler: Name der Methode wurde nicht angegeben\n"
 
-#: ../gio/gdbus-tool.c:1033
+#: ../gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s� is invalid\n"
 msgstr "Fehler: Name der Methode »%s« ist ungültig\n"
 
-#: ../gio/gdbus-tool.c:1111
+#: ../gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s�: %s\n"
 msgstr "Fehler bei der Verarbeitung des Parameters %d vom Typ »%s«: %s\n"
 
-#: ../gio/gdbus-tool.c:1555
+#: ../gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Name des Ziels der Inspektion"
 
-#: ../gio/gdbus-tool.c:1556
+#: ../gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "Zu inspizierender Objektpfad"
 
-#: ../gio/gdbus-tool.c:1557
+#: ../gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "XML drucken"
 
-#: ../gio/gdbus-tool.c:1558
+#: ../gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "Unterelemente inspizieren"
 
-#: ../gio/gdbus-tool.c:1559
+#: ../gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Nur Eigenschaften ausgeben"
 
-#: ../gio/gdbus-tool.c:1650
+#: ../gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Ein entferntes Objekt inspizieren."
 
-#: ../gio/gdbus-tool.c:1853
+#: ../gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Name des zu überwachenden Ziels"
 
-#: ../gio/gdbus-tool.c:1854
+#: ../gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Zu überwachender Objektpfad"
 
-#: ../gio/gdbus-tool.c:1883
+#: ../gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Ein entferntes Objekt überwachen."
 
-#: ../gio/gdbus-tool.c:1941
+#: ../gio/gdbus-tool.c:1954
 #, c-format
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr ""
 "Fehler: eine Nicht-Message-Bus-Verbindung kann nicht überwacht werden\n"
 
-#: ../gio/gdbus-tool.c:2065
+#: ../gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr ""
 "Zu aktivierender Dienst, bevor auf den anderen gewartet wird (allgemein "
 "bekannter Name)"
 
-#: ../gio/gdbus-tool.c:2068
+#: ../gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1261,71 +1254,71 @@ msgstr ""
 "Zeitspanne, die gewartet werden soll, bis mit einer Fehlermeldung "
 "abgebrochen wird (Sekunden); 0 für keine Zeitspanne (Voreinstellung)"
 
-#: ../gio/gdbus-tool.c:2116
+#: ../gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPTION …] BUS-NAME"
 
-#: ../gio/gdbus-tool.c:2118
+#: ../gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Name eines Busses, auf dessen Verfügbarkeit gewartet werden soll."
 
-#: ../gio/gdbus-tool.c:2194
+#: ../gio/gdbus-tool.c:2206
 #, c-format
 msgid "Error: A service to activate for must be specified.\n"
 msgstr ""
 "Fehler: Es muss ein Dienst angegeben werden, der gestartet werden soll.\n"
 
-#: ../gio/gdbus-tool.c:2199
+#: ../gio/gdbus-tool.c:2211
 #, c-format
 msgid "Error: A service to wait for must be specified.\n"
 msgstr ""
 "Fehler: Es muss ein Dienst angegeben werden, auf den gewartet werden soll.\n"
 
-#: ../gio/gdbus-tool.c:2204
+#: ../gio/gdbus-tool.c:2216
 #, c-format
 msgid "Error: Too many arguments.\n"
 msgstr "Fehler: Zu viele Argumente.\n"
 
-#: ../gio/gdbus-tool.c:2212 ../gio/gdbus-tool.c:2219
+#: ../gio/gdbus-tool.c:2224 ../gio/gdbus-tool.c:2231
 #, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Fehler: %s ist kein gültiger, bekannter Bus-Name\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: ../gio/gdesktopappinfo.c:2023 ../gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Unbenannt"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: ../gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Desktop-Datei hat kein Exec-Feld angegeben"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Für die Anwendung benötigtes Terminal konnte nicht gefunden werden"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: ../gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "Konfigurationsordner %s für Benutzeranwendungen konnte nicht erstellt "
 "werden: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: ../gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr ""
 "MIME-Konfigurationsordner %s des Benutzers konnte nicht erstellt werden: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: ../gio/gdesktopappinfo.c:3446 ../gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "Den Anwendungsinformationen fehlt ein Bezeichner"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: ../gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Benutzer-Desktop-Datei %s kann nicht erstellt werden"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: ../gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Benutzerdefinition für %s"
@@ -1345,11 +1338,11 @@ msgstr "Laufwerk unterstützt weder ein Auswerfen noch »eject_with_operation«"
 msgid "drive doesn’t implement polling for media"
 msgstr "Laufwerk unterstützt Prüfen auf Datenträger nicht"
 
-#: ../gio/gdrive.c:776
+#: ../gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "Laufwerk unterstützt keinen Startvorgang"
 
-#: ../gio/gdrive.c:878
+#: ../gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "Laufwerk unterstützt keinen Stoppvorgang"
 
@@ -1386,14 +1379,14 @@ msgstr "Ungültige Symbolanzahl (%d) in GEmblemedIcon-Kodierung"
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Es wurde ein GEmblem für GEmblemedIcon erwartet"
 
-#: ../gio/gfile.c:1071 ../gio/gfile.c:1309 ../gio/gfile.c:1447
-#: ../gio/gfile.c:1685 ../gio/gfile.c:1740 ../gio/gfile.c:1798
-#: ../gio/gfile.c:1882 ../gio/gfile.c:1939 ../gio/gfile.c:2003
-#: ../gio/gfile.c:2058 ../gio/gfile.c:3725 ../gio/gfile.c:3780
-#: ../gio/gfile.c:4016 ../gio/gfile.c:4058 ../gio/gfile.c:4526
-#: ../gio/gfile.c:4937 ../gio/gfile.c:5022 ../gio/gfile.c:5112
-#: ../gio/gfile.c:5209 ../gio/gfile.c:5296 ../gio/gfile.c:5397
-#: ../gio/gfile.c:7975 ../gio/gfile.c:8065 ../gio/gfile.c:8149
+#: ../gio/gfile.c:1076 ../gio/gfile.c:1314 ../gio/gfile.c:1452
+#: ../gio/gfile.c:1690 ../gio/gfile.c:1745 ../gio/gfile.c:1803
+#: ../gio/gfile.c:1887 ../gio/gfile.c:1944 ../gio/gfile.c:2008
+#: ../gio/gfile.c:2063 ../gio/gfile.c:3738 ../gio/gfile.c:3793
+#: ../gio/gfile.c:4029 ../gio/gfile.c:4071 ../gio/gfile.c:4539
+#: ../gio/gfile.c:4950 ../gio/gfile.c:5035 ../gio/gfile.c:5125
+#: ../gio/gfile.c:5222 ../gio/gfile.c:5309 ../gio/gfile.c:5410
+#: ../gio/gfile.c:7988 ../gio/gfile.c:8078 ../gio/gfile.c:8162
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Vorgang wird nicht unterstützt"
@@ -1402,70 +1395,70 @@ msgstr "Vorgang wird nicht unterstützt"
 #. * trying to find the enclosing (user visible)
 #. * mount of a file, but none exists.
 #.
-#: ../gio/gfile.c:1570
+#: ../gio/gfile.c:1575
 msgid "Containing mount does not exist"
 msgstr "Enthaltender Einhängepunkt existiert nicht"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: ../gio/gfile.c:2622 ../gio/glocalfile.c:2389
 msgid "Can’t copy over directory"
 msgstr "Es kann nicht über den Ordner kopiert werden"
 
-#: ../gio/gfile.c:2677
+#: ../gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Ordner kann nicht über Ordner kopiert werden"
 
-#: ../gio/gfile.c:2685
+#: ../gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Zieldatei existiert"
 
-#: ../gio/gfile.c:2704
+#: ../gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Ordner kann nicht rekursiv kopiert werden"
 
-#: ../gio/gfile.c:2979
+#: ../gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "Zusammenfügen wird nicht unterstützt"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: ../gio/gfile.c:2988 ../gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Fehler beim Zusammenfügen der Datei: %s"
 
-#: ../gio/gfile.c:3136
+#: ../gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "Kopieren (reflink/clone) zwischen Einhängepunkten nicht unterstützt"
 
-#: ../gio/gfile.c:3140
+#: ../gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopieren (reflink/clone) wird nicht unterstützt oder ist ungültig"
 
-#: ../gio/gfile.c:3145
+#: ../gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr ""
 "Kopieren (reflink/clone) wird nicht unterstützt oder funktioniert nicht"
 
-#: ../gio/gfile.c:3208
+#: ../gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Spezielle Datei kann nicht kopiert werden"
 
-#: ../gio/gfile.c:4006
+#: ../gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Ungültiger Wert für symbolische Verknüpfung angegeben"
 
-#: ../gio/gfile.c:4167
+#: ../gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Papierkorb nicht unterstützt"
 
-#: ../gio/gfile.c:4279
+#: ../gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c�"
 msgstr "Dateinamen dürfen kein »%c« enthalten"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6773 ../gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "Datenträger unterstützt Einhängen nicht"
 
-#: ../gio/gfile.c:6869
+#: ../gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "Es wurde keine Anwendung gefunden, die diese Datei verarbeiten kann"
 
@@ -1593,7 +1586,7 @@ msgid "Could not parse “%s� as IP address mask"
 msgstr "»%s« konnte nicht als IP-Adressmaske verarbeitet werden"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:218
+#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:220
 msgid "Not enough space for socket address"
 msgstr "Nicht genug Platz für eine Socket-Adresse"
 
@@ -1636,10 +1629,6 @@ msgstr "Aufruf:"
 msgid "Print version information and exit."
 msgstr "Versionsinformationen ausgeben und beenden."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGUMENTE …]"
-
 #: ../gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Befehle:"
@@ -1722,7 +1711,7 @@ msgstr "Fehler beim Schreiben in die Standardausgabe"
 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1235
 #: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
@@ -1745,7 +1734,8 @@ msgstr ""
 
 #: ../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:139 ../gio/gio-tool-remove.c:72
+#: ../gio/gio-tool-mount.c:1285 ../gio/gio-tool-open.c:139
+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Keine Orte angegeben"
 
@@ -2053,71 +2043,97 @@ msgstr "Auf Einhängevorgänge überwachen"
 msgid "Monitor files or directories for changes."
 msgstr "Dateien und Ordner auf Änderungen überwachen."
 
-#: ../gio/gio-tool-mount.c:58
+#: ../gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr "Als einhängbar einbinden"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
 msgstr "Datenträger über Gerätedatei einhängen"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:63 ../gio/gio-tool-mount.c:66
 msgid "DEVICE"
 msgstr "GERÄT"
 
-#: ../gio/gio-tool-mount.c:60
+#: ../gio/gio-tool-mount.c:64
 msgid "Unmount"
 msgstr "Aushängen"
 
-#: ../gio/gio-tool-mount.c:61
+#: ../gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "Auswerfen"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:66
+msgid "Stop drive with device file"
+msgstr "Datenträger über Gerätedatei stoppen"
+
+#: ../gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
 msgstr "Alle Einhängepunkte passend zum Namensschema aushängen"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:67
 msgid "SCHEME"
 msgstr "SCHEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: ../gio/gio-tool-mount.c:68
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr ""
 "Ausstehende Dateioperationen ignorieren, wenn ausgehängt oder ausgeworfen "
 "wird"
 
-#: ../gio/gio-tool-mount.c:64
+#: ../gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
 msgstr "Nutzen Sie einen anonymen Nutzer bei der Legitimierung"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: ../gio/gio-tool-mount.c:71
 msgid "List"
 msgstr "Auflisten"
 
-#: ../gio/gio-tool-mount.c:67
+#: ../gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr "Ereignisse überwachen"
 
-#: ../gio/gio-tool-mount.c:68
+#: ../gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr "Zusätzliche Informationen anzeigen"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: ../gio/gio-tool-mount.c:74
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "Die numerische PIM beim Entsperren eines VeraCrypt-Datenträgers"
+
+#: ../gio/gio-tool-mount.c:74
+#| msgctxt "GDateTime"
+#| msgid "PM"
+msgid "PIM"
+msgstr "PIM"
+
+#: ../gio/gio-tool-mount.c:75
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Einen verborgenen TCRYPT-Datenträger einhängen"
+
+#: ../gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr "Einen TCRYPT-Systemdatenträger einhängen"
+
+#: ../gio/gio-tool-mount.c:264 ../gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
 msgstr "Der anonyme Zugriff wurde verwehrt"
 
-#: ../gio/gio-tool-mount.c:897
+#: ../gio/gio-tool-mount.c:524
+msgid "No drive for device file"
+msgstr "Kein Laufwerk für Gerätedatei"
+
+#: ../gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "»%s« wurde unter »%s« eingehängt\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: ../gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
 msgstr "Kein Datenträger für Gerätedatei"
 
-#: ../gio/gio-tool-mount.c:1145
+#: ../gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
 msgstr "Die Orte ein- oder aushängen."
 
@@ -2284,12 +2300,12 @@ msgstr ""
 msgid "List contents of directories in a tree-like format."
 msgstr "Den Inhalt von Ordnern in einer Baumstruktur auflisten."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: ../gio/glib-compile-resources.c:143 ../gio/glib-compile-schemas.c:1505
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Element <%s> ist innerhalb <%s> nicht erlaubt"
 
-#: ../gio/glib-compile-resources.c:146
+#: ../gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Element <%s> ist in der obersten Ebene nicht erlaubt"
@@ -2309,92 +2325,99 @@ msgstr "»%s« konnte in keinem Quellordner gefunden werden"
 msgid "Failed to locate “%s� in current directory"
 msgstr "»%s« konnte im aktuellen Ordner nicht gefunden werden"
 
-#: ../gio/glib-compile-resources.c:290
+#: ../gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s�"
 msgstr "Unbekannte Verarbeitungsoption »%s«"
 
-#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
+#. Translators: the first %s is a gresource XML attribute,
+#. * the second %s is an environment variable, and the third
+#. * %s is a command line tool
+#.
+#: ../gio/glib-compile-resources.c:313 ../gio/glib-compile-resources.c:370
+#: ../gio/glib-compile-resources.c:427
 #, c-format
-msgid "Failed to create temp file: %s"
-msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr ""
+"%s-Vorverarbeitung wurde angefordert, aber %s ist nicht gesetzt und %s ist "
+"nicht in PATH enthalten"
 
-#: ../gio/glib-compile-resources.c:382
+#: ../gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Fehler beim Lesen der Datei »%s«: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: ../gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Fehler beim Komprimieren der Datei %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: ../gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "Text könnte nicht innerhalb von <%s> erscheinen"
 
-#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
+#: ../gio/glib-compile-resources.c:736 ../gio/glib-compile-schemas.c:2071
 msgid "Show program version and exit"
 msgstr "Programm-Version anzeigen und beenden"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
+#: ../gio/glib-compile-resources.c:737
+msgid "Name of the output file"
 msgstr "Name der Ausgabedatei"
 
-#: ../gio/glib-compile-resources.c:666
+#: ../gio/glib-compile-resources.c:738
 msgid ""
-"The directories where files are to be read from (default to current "
+"The directories to load files referenced in FILE from (default: current "
 "directory)"
 msgstr ""
-"Die Ordner, aus denen Dateien gelesen werden sollen (Vorgabe ist der "
-"aktuelle Ordner)"
+"Die Ordner, aus denen in FILE referenzierte Dateien gelesen werden sollen "
+"(Vorgabe ist der aktuelle Ordner)"
 
-#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: ../gio/glib-compile-resources.c:738 ../gio/glib-compile-schemas.c:2072
+#: ../gio/glib-compile-schemas.c:2100
 msgid "DIRECTORY"
 msgstr "ORDNER"
 
-#: ../gio/glib-compile-resources.c:667
+#: ../gio/glib-compile-resources.c:739
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr ""
 "Ausgabe in dem Format generieren, welches durch die Dateiendung der "
 "Zieldatei vorgegeben wird"
 
-#: ../gio/glib-compile-resources.c:668
+#: ../gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Quellcode-Header generieren"
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
+#: ../gio/glib-compile-resources.c:741
+msgid "Generate source code used to link in the resource file into your code"
 msgstr "Quellcode zum Verlinken der Ressourcendatei in Ihren Code verwenden"
 
-#: ../gio/glib-compile-resources.c:670
+#: ../gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Abhängigkeitsliste generieren"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
+#: ../gio/glib-compile-resources.c:743
+msgid "Name of the dependency file to generate"
 msgstr "Name der zu erzeugenden Abhängigkeitsdatei"
 
-#: ../gio/glib-compile-resources.c:672
+#: ../gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Phony-Ziele in der erzeugten Abhängigkeitsdatei einschließen"
 
-#: ../gio/glib-compile-resources.c:673
+#: ../gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "Die Ressource nicht automatisch anlegen und registrieren"
 
-#: ../gio/glib-compile-resources.c:674
+#: ../gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Keine Funktionen exportieren; als G_GNUC_INTERNAL deklarieren"
 
-#: ../gio/glib-compile-resources.c:675
+#: ../gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
 msgstr "C-Bezeichnername für den generierten Quellcode"
 
-#: ../gio/glib-compile-resources.c:701
+#: ../gio/glib-compile-resources.c:773
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2405,7 +2428,7 @@ msgstr ""
 "haben,\n"
 "die Ressourcendateien die Erweiterung .gresource."
 
-#: ../gio/glib-compile-resources.c:723
+#: ../gio/glib-compile-resources.c:795
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Sie sollten genau einen Dateinamen angeben\n"
@@ -2569,16 +2592,16 @@ msgstr "Alias-Ziel »%s« ist nicht in <choices>"
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> muss mindestens einen <alias> enthalten"
 
-#: ../gio/glib-compile-schemas.c:786
+#: ../gio/glib-compile-schemas.c:788
 msgid "Empty names are not permitted"
 msgstr "Leere Namen sind nicht zulässig"
 
-#: ../gio/glib-compile-schemas.c:796
+#: ../gio/glib-compile-schemas.c:798
 #, c-format
 msgid "Invalid name “%s�: names must begin with a lowercase letter"
 msgstr "Ungültiger Name »%s«: Namen müssen mit einem Kleinbuchstaben beginnen"
 
-#: ../gio/glib-compile-schemas.c:808
+#: ../gio/glib-compile-schemas.c:810
 #, c-format
 msgid ""
 "Invalid name “%s�: invalid character “%c�; only lowercase letters, numbers "
@@ -2587,39 +2610,39 @@ msgstr ""
 "Ungültiger Name »%s«: ungültiges Zeichen »%c«; nur Kleinbuchstaben, Ziffern "
 "und Bindestriche »-« sind zulässig"
 
-#: ../gio/glib-compile-schemas.c:817
+#: ../gio/glib-compile-schemas.c:819
 #, c-format
 msgid "Invalid name “%s�: two successive hyphens (“--�) are not permitted"
 msgstr ""
 "Ungültiger Name »%s«: Zwei aufeinander folgende Bindestriche »--« sind nicht "
 "zulässig."
 
-#: ../gio/glib-compile-schemas.c:826
+#: ../gio/glib-compile-schemas.c:828
 #, c-format
 msgid "Invalid name “%s�: the last character may not be a hyphen (“-�)"
 msgstr ""
 "Ungültiger Name »%s«: das letzte Zeichen darf kein Bindestrich »-« sein."
 
-#: ../gio/glib-compile-schemas.c:834
+#: ../gio/glib-compile-schemas.c:836
 #, c-format
 msgid "Invalid name “%s�: maximum length is 1024"
 msgstr "Ungültiger Name »%s«: maximale Länge ist 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: ../gio/glib-compile-schemas.c:908
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> wurde bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:930
+#: ../gio/glib-compile-schemas.c:934
 msgid "Cannot add keys to a “list-of� schema"
 msgstr "Schlüssel können nicht zum Schema »list-of« hinzugefügt werden"
 
-#: ../gio/glib-compile-schemas.c:941
+#: ../gio/glib-compile-schemas.c:945
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> wurde bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:959
+#: ../gio/glib-compile-schemas.c:963
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2628,7 +2651,7 @@ msgstr ""
 "<key name='%s'> verdeckt <key name='%s'> in <schema id='%s'>; verwenden Sie "
 "<override>, um den Wert anzupassen"
 
-#: ../gio/glib-compile-schemas.c:970
+#: ../gio/glib-compile-schemas.c:974
 #, c-format
 msgid ""
 "Exactly one of “type�, “enum� or “flags� must be specified as an attribute "
@@ -2637,57 +2660,57 @@ msgstr ""
 "Genau eines von »type«, »enum« oder »flags« muss als Attribut für <key> "
 "angegeben werden"
 
-#: ../gio/glib-compile-schemas.c:989
+#: ../gio/glib-compile-schemas.c:993
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> (noch) nicht definiert."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: ../gio/glib-compile-schemas.c:1008
 #, c-format
 msgid "Invalid GVariant type string “%s�"
 msgstr "Ungültige GVariant-Typzeichenkette »%s«"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: ../gio/glib-compile-schemas.c:1038
 msgid "<override> given but schema isn’t extending anything"
 msgstr "<override> angegeben, aber das Schema erweitert nichts"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: ../gio/glib-compile-schemas.c:1051
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Kein <key name='%s'> zum Ãœberschreiben"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: ../gio/glib-compile-schemas.c:1059
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> wurde bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: ../gio/glib-compile-schemas.c:1132
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> wurde bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:1140
+#: ../gio/glib-compile-schemas.c:1144
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s�"
 msgstr "<schema id='%s'> erweitert noch nicht vorhandenes Schema »%s«"
 
-#: ../gio/glib-compile-schemas.c:1156
+#: ../gio/glib-compile-schemas.c:1160
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s�"
 msgstr ""
 "<schema id='%s'> ist eine Liste des noch nicht vorhandenen Schemas »%s«"
 
-#: ../gio/glib-compile-schemas.c:1164
+#: ../gio/glib-compile-schemas.c:1168
 #, c-format
 msgid "Cannot be a list of a schema with a path"
 msgstr "Darf keine Liste von Schemata mit einem Pfad sein"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: ../gio/glib-compile-schemas.c:1178
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Ein Schema darf nicht um einen Pfad erweitert werden"
 
-#: ../gio/glib-compile-schemas.c:1184
+#: ../gio/glib-compile-schemas.c:1188
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2695,7 +2718,7 @@ msgstr ""
 "<schema id='%s'> ist eine Liste, welche <schema id='%s'> erweitert, das "
 "keine Liste ist"
 
-#: ../gio/glib-compile-schemas.c:1194
+#: ../gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s� "
@@ -2704,18 +2727,18 @@ msgstr ""
 "<schema id='%s' list-of='%s'> erweitert <schema id='%s' list-of='%s'>, aber "
 "»%s« erweitert »%s« nicht"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: ../gio/glib-compile-schemas.c:1215
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr ""
 "Ein Pfad, falls angegeben, muss mit einem Schrägstrich beginnen und enden"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: ../gio/glib-compile-schemas.c:1222
 #, c-format
 msgid "The path of a list must end with “:/�"
 msgstr "Der Pfad einer Liste muss mit »:/« enden"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: ../gio/glib-compile-schemas.c:1231
 #, c-format
 msgid ""
 "Warning: Schema “%s� has path “%s�.  Paths starting with “/apps/�, “/"
@@ -2724,119 +2747,119 @@ msgstr ""
 "Warnung: Schema »%s« hat den Pfad »%s«. Mit »/apps/«, »/desktop/« oder »/"
 "system/« beginnende Pfade gelten jecoh als veraltet."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: ../gio/glib-compile-schemas.c:1261
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
+#: ../gio/glib-compile-schemas.c:1411 ../gio/glib-compile-schemas.c:1427
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
 msgstr "Nur ein <%s>-Element ist innerhalb von <%s> erlaubt"
 
-#: ../gio/glib-compile-schemas.c:1505
+#: ../gio/glib-compile-schemas.c:1509
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr "Element <%s> ist in der obersten Ebene nicht erlaubt"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: ../gio/glib-compile-schemas.c:1527
 msgid "Element <default> is required in <key>"
 msgstr "Element <default> wird in <key> benötigt"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: ../gio/glib-compile-schemas.c:1617
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "Text darf nicht innerhalb von <%s> erscheinen"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: ../gio/glib-compile-schemas.c:1685
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Warnung: nicht definierte Referenz zu <schema id='%s'/>"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: ../gio/glib-compile-schemas.c:1824 ../gio/glib-compile-schemas.c:1898
+#: ../gio/glib-compile-schemas.c:1974
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict wurde angegeben; Abbruch.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: ../gio/glib-compile-schemas.c:1834
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Die gesamte Datei wurde ignoriert.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: ../gio/glib-compile-schemas.c:1894
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Diese Datei wird ignoriert.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: ../gio/glib-compile-schemas.c:1934
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+msgid "No such key “%s� in schema “%s� as specified in override file “%s�"
 msgstr ""
 "Kein Schlüssel »%s« in Schema »%s« wie angegeben in überschreibender Datei "
 "»%s«"
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
+#: ../gio/glib-compile-schemas.c:2026
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; Überschreiben dieses Schlüssels wird ignoriert.\n"
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: ../gio/glib-compile-schemas.c:1944 ../gio/glib-compile-schemas.c:2002
+#: ../gio/glib-compile-schemas.c:2030
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " und --strict wurde angegeben; Abbruch.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+#: ../gio/glib-compile-schemas.c:1960
 #, c-format
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
+"error parsing key “%s� in schema “%s� as specified in override file “%s�: %s."
 msgstr ""
 "Fehler beim Verarbeiten des Schlüssels »%s« in Schema »%s« wie angegeben in "
 "überschreibender Datei »%s«: %s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: ../gio/glib-compile-schemas.c:1970
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Überschreiben dieses Schlüssels wird ignoriert.\n"
 
-#: ../gio/glib-compile-schemas.c:1984
+#: ../gio/glib-compile-schemas.c:1988
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is outside the "
+"override for key “%s� in schema “%s� in override file “%s� is outside the "
 "range given in the schema"
 msgstr ""
 "Überschreiben für Schlüssel »%s« in Schema »%s« in überschreibender Datei "
 "»%s« liegt außerhalb des im Schema angegebenen Bereichs"
 
-#: ../gio/glib-compile-schemas.c:2012
+#: ../gio/glib-compile-schemas.c:2016
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is not in the "
+"override for key “%s� in schema “%s� in override file “%s� is not in the "
 "list of valid choices"
 msgstr ""
 "Überschreiben für Schlüssel »%s« in Schema »%s« in überschreibender Datei "
 "»%s« befindet sich nicht in der Liste gültiger Auswahlmöglichkeiten"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2072
 msgid "where to store the gschemas.compiled file"
 msgstr "Speicherort der Datei »gschemas.compiled«"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: ../gio/glib-compile-schemas.c:2073
 msgid "Abort on any errors in schemas"
 msgstr "Abbruch wegen einiger Fehler in Schemata"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: ../gio/glib-compile-schemas.c:2074
 msgid "Do not write the gschema.compiled file"
 msgstr "Die Datei »gschema.compiled« nicht schreiben"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: ../gio/glib-compile-schemas.c:2075
 msgid "Do not enforce key name restrictions"
 msgstr "Keine Einschränkungen für Schlüsselnamen erzwingen"
 
-#: ../gio/glib-compile-schemas.c:2099
+#: ../gio/glib-compile-schemas.c:2103
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2846,32 +2869,32 @@ msgstr ""
 "Schemadateien müssen die Erweiterung .gschema.xml haben,\n"
 "die Zwischenspeicherdatei die Erweiterung gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: ../gio/glib-compile-schemas.c:2124
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Sie sollten genau einen Ordnernamen angeben\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: ../gio/glib-compile-schemas.c:2166
 #, c-format
 msgid "No schema files found: "
 msgstr "Keine Schema-Dateien gefunden: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: ../gio/glib-compile-schemas.c:2169
 #, c-format
 msgid "doing nothing.\n"
 msgstr "Nichts wird getan.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: ../gio/glib-compile-schemas.c:2172
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "Vorhandene Ausgabedatei wurde entfernt.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:544 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Ungültiger Dateiname %s"
 
-#: ../gio/glocalfile.c:1105
+#: ../gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Fehler beim Einlesen der Dateisystem-Information für %s: %s"
@@ -2880,127 +2903,134 @@ msgstr "Fehler beim Einlesen der Dateisystem-Information für %s: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: ../gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "Enthaltender Einhängepunkt für Datei %s wurde nicht gefunden"
 
-#: ../gio/glocalfile.c:1267
+#: ../gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Wurzelordner kann nicht umbenannt werden"
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Fehler beim Umbenennen der Datei %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: ../gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Datei kann nicht umbenannt werden, da der Dateiname bereits existiert"
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: ../gio/glocalfile.c:1206 ../gio/glocalfile.c:2265 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2450 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Ungültiger Dateiname"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: ../gio/glocalfile.c:1374 ../gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Fehler beim Öffnen der Datei »%s«: %s"
 
-#: ../gio/glocalfile.c:1613
+#: ../gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Fehler beim Entfernen der Datei »%s«: %s"
 
-#: ../gio/glocalfile.c:1997
+#: ../gio/glocalfile.c:1924
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Fehler beim Verschieben der Datei %s in den Papierkorb: %s"
 
-#: ../gio/glocalfile.c:2020
+#: ../gio/glocalfile.c:1947
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Papierkorb-Ordner %s konnte nicht angelegt werden: %s"
 
-#: ../gio/glocalfile.c:2040
+#: ../gio/glocalfile.c:1969
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr ""
 "Oberster Ordner konnte zum Verschieben von %s in den Papierkorb nicht "
 "gefunden werden"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: ../gio/glocalfile.c:1978
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr ""
+"Papierkorbaktionen zwischen systeminternen Einhängepunkten werden nicht "
+"unterstützt"
+
+#: ../gio/glocalfile.c:2062 ../gio/glocalfile.c:2082
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Papierkorb-Ordner konnte für %s nicht gefunden oder angelegt werden"
 
-#: ../gio/glocalfile.c:2174
+#: ../gio/glocalfile.c:2117
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Löschprotokoll-Datei für %s konnte nicht angelegt werden: %s"
 
-#: ../gio/glocalfile.c:2233
+#: ../gio/glocalfile.c:2176
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 "Datei %s kann nicht über Dateisystemgrenzen hinweg in den Papierkorb "
 "verschoben werden"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2180 ../gio/glocalfile.c:2236
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Datei %s kann nicht in den Papierkorb verschoben werden: %s"
 
-#: ../gio/glocalfile.c:2299
+#: ../gio/glocalfile.c:2242
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Datei %s kann nicht in den Papierkorb verschoben werden"
 
-#: ../gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2268
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Fehler beim Erstellen des Ordners »%s«: %s"
 
-#: ../gio/glocalfile.c:2354
+#: ../gio/glocalfile.c:2297
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Das Dateisystem unterstützt keine symbolische Verknüpfungen"
 
-#: ../gio/glocalfile.c:2357
+#: ../gio/glocalfile.c:2300
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Fehler beim Erstellen der symbolischen Verknüpfung %s: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: ../gio/glocalfile.c:2306 ../glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "Symbolische Verknüpfungen nicht unterstützt"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: ../gio/glocalfile.c:2361 ../gio/glocalfile.c:2396 ../gio/glocalfile.c:2453
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Fehler beim Verschieben der Datei %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: ../gio/glocalfile.c:2384
 msgid "Can’t move directory over directory"
 msgstr "Ordner kann nicht über Ordner verschoben werden"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
+#: ../gio/glocalfile.c:2410 ../gio/glocalfileoutputstream.c:935
 #: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
 #: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Erstellen der Sicherungsdatei gescheitert"
 
-#: ../gio/glocalfile.c:2486
+#: ../gio/glocalfile.c:2429
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Fehler beim Entfernen der Zieldatei: %s"
 
-#: ../gio/glocalfile.c:2500
+#: ../gio/glocalfile.c:2443
 msgid "Move between mounts not supported"
 msgstr "Verschieben zwischen Einhängepunkten nicht unterstützt"
 
-#: ../gio/glocalfile.c:2691
+#: ../gio/glocalfile.c:2634
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Konnte die Festplattenbelegung von %s nicht bestimmen: %s"
@@ -3022,82 +3052,82 @@ msgstr "Ungültiger erweiterter Attributname"
 msgid "Error setting extended attribute “%s�: %s"
 msgstr "Fehler beim Setzen des erweiterten Attributs »%s«: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: ../gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (ungültige Kodierung)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: ../gio/glocalfileinfo.c:1783 ../gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr "Fehler beim Holen der Informationen für Datei »%s«: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: ../gio/glocalfileinfo.c:2045
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Fehler beim Holen der Informationen für Dateideskriptor: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: ../gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Ungültiger Attributtyp (»uint32« erwartet)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: ../gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Ungültiger Attributtyp (»uint64« erwartet)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: ../gio/glocalfileinfo.c:2127 ../gio/glocalfileinfo.c:2146
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Ungültiger Attributtyp (»byte string« erwartet)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: ../gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr ""
 "Zugriffsrechte für symbolische Verknüpfungen können nicht gesetzt werden"
 
-#: ../gio/glocalfileinfo.c:2200
+#: ../gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Fehler beim Setzen der Zugriffsrechte: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: ../gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Fehler beim Setzen des Besitzers: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: ../gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "Symbolische Verknüpfung darf nicht NULL sein"
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: ../gio/glocalfileinfo.c:2291 ../gio/glocalfileinfo.c:2310
+#: ../gio/glocalfileinfo.c:2321
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Fehler beim Setzen der symbolischen Verknüpfung: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: ../gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Fehler beim Setzen der symbolischen Verknüpfung: Datei ist keine symbolische "
 "Verknüpfung"
 
-#: ../gio/glocalfileinfo.c:2419
+#: ../gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Fehler beim Setzen der Zugriffsrechte oder der Zugriffszeit: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: ../gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux-Kontext darf nicht NULL sein"
 
-#: ../gio/glocalfileinfo.c:2457
+#: ../gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Fehler beim Setzen des SELinux-Kontexts: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: ../gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux ist auf diesem System nicht aktiviert"
 
-#: ../gio/glocalfileinfo.c:2556
+#: ../gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Setzen des Attributs %s nicht unterstützt"
@@ -3120,7 +3150,7 @@ msgstr "Fehler beim Suchen in Datei: %s"
 msgid "Error closing file: %s"
 msgstr "Fehler beim Schließen der Datei: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: ../gio/glocalfilemonitor.c:852
 msgid "Unable to find default local file monitor type"
 msgstr ""
 "Vorgegebener Überwachungstyp für lokale Dateien konnte nicht gefunden werden"
@@ -3213,21 +3243,21 @@ msgstr "Angeforderte Suche nach dem Ende des Datenstroms"
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: ../gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr "Einhängepunkt unterstützt Aushängen nicht"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: ../gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 msgstr "Einhängepunkt unterstützt Auswerfen nicht"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:550
+#: ../gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 msgstr ""
 "Einhängepunkt unterstützt nicht das Aushängen oder »unmount_with_operation«"
@@ -3235,28 +3265,28 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:635
+#: ../gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 msgstr "Einhängepunkt unterstützt Auswerfen oder »eject_with_operation« nicht"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:723
+#: ../gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 msgstr "Einhängepunkt unterstützt erneutes Einhängen nicht"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:805
+#: ../gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "Einhängepunkt unterstützt Erraten des Inhaltstyps nicht"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: ../gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "Einhängepunkt unterstützt synchrones Erraten des Inhaltstyps nicht"
 
@@ -3265,29 +3295,29 @@ msgstr "Einhängepunkt unterstützt synchrones Erraten des Inhaltstyps nicht"
 msgid "Hostname “%s� contains “[� but not “]�"
 msgstr "Rechnername »%s« enthält »[«, aber nicht »]«"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: ../gio/gnetworkmonitorbase.c:211 ../gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Das Netzwerk ist nicht erreichbar"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: ../gio/gnetworkmonitorbase.c:249 ../gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Rechner ist nicht erreichbar"
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
+#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
+#: ../gio/gnetworkmonitornetlink.c:128
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "Netzwerkmonitor konnte nicht erstellt werden: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: ../gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "Netzwerkmonitor konnte nicht erstellt werden: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: ../gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Netzwerkstatus konnte nicht ermittelt werden: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: ../gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Die Version von NetworkManager ist zu alt"
@@ -3712,8 +3742,8 @@ msgstr "Ungültiger Socket, Initialisierung schlug fehl wegen: %s"
 msgid "Socket is already closed"
 msgstr "Der Socket ist bereits geschlossen"
 
-#: ../gio/gsocket.c:414 ../gio/gsocket.c:3010 ../gio/gsocket.c:4220
-#: ../gio/gsocket.c:4278
+#: ../gio/gsocket.c:414 ../gio/gsocket.c:3034 ../gio/gsocket.c:4244
+#: ../gio/gsocket.c:4302
 msgid "Socket I/O timed out"
 msgstr "Zeitüberschreitung bei Ein-/Ausgabeoperation des Sockets"
 
@@ -3770,15 +3800,15 @@ msgid "Error binding to address: %s"
 msgstr "Fehler beim Binden an Adresse: %s"
 
 #: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
-#: ../gio/gsocket.c:2391 ../gio/gsocket.c:2461 ../gio/gsocket.c:2519
-#: ../gio/gsocket.c:2537
+#: ../gio/gsocket.c:2398 ../gio/gsocket.c:2471 ../gio/gsocket.c:2529
+#: ../gio/gsocket.c:2547
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Fehler beim Beitreten zur Multicast-Gruppe: %s"
 
 #: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
-#: ../gio/gsocket.c:2392 ../gio/gsocket.c:2462 ../gio/gsocket.c:2520
-#: ../gio/gsocket.c:2538
+#: ../gio/gsocket.c:2399 ../gio/gsocket.c:2472 ../gio/gsocket.c:2530
+#: ../gio/gsocket.c:2548
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Fehler beim Verlassen der Multicast-Gruppe: %s"
@@ -3791,86 +3821,86 @@ msgstr "Quellen-spezifisches Multicast wird nicht unterstützt"
 msgid "Unsupported socket family"
 msgstr "Nicht unterstützte Socket-Familie"
 
-#: ../gio/gsocket.c:2393
+#: ../gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "Quellen-spezifisch ist keine IPv4-Adresse"
 
-#: ../gio/gsocket.c:2411 ../gio/gsocket.c:2440 ../gio/gsocket.c:2487
+#: ../gio/gsocket.c:2418 ../gio/gsocket.c:2447 ../gio/gsocket.c:2497
 #, c-format
 msgid "Interface not found: %s"
 msgstr "Schnittstelle nicht gefunden: %s"
 
-#: ../gio/gsocket.c:2427
+#: ../gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Schnittstellenname ist zu lang"
 
-#: ../gio/gsocket.c:2463
+#: ../gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "Quellen-spezifisches IPv4-Multicast wird nicht unterstützt"
 
-#: ../gio/gsocket.c:2521
+#: ../gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "Quellen-spezifisches IPv6-Multicast wird nicht unterstützt"
 
-#: ../gio/gsocket.c:2730
+#: ../gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fehler bei Annahme der Verbindung: %s"
 
-#: ../gio/gsocket.c:2854
+#: ../gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Verbindungsvorgang läuft"
 
-#: ../gio/gsocket.c:2903
+#: ../gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Ausstehender Fehler konnte nicht erhalten werden: "
 
-#: ../gio/gsocket.c:3073
+#: ../gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Fehler beim Erhalt von Daten: %s"
 
-#: ../gio/gsocket.c:3268
+#: ../gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Fehler beim Senden von Daten: %s"
 
-#: ../gio/gsocket.c:3455
+#: ../gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Socket kann nicht heruntergefahren werden: %s"
 
-#: ../gio/gsocket.c:3536
+#: ../gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Fehler beim Schließen des Sockets: %s"
 
-#: ../gio/gsocket.c:4213
+#: ../gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Es wird auf eine Socket-Bedingung gewartet: %s"
 
-#: ../gio/gsocket.c:4687 ../gio/gsocket.c:4767 ../gio/gsocket.c:4945
+#: ../gio/gsocket.c:4711 ../gio/gsocket.c:4791 ../gio/gsocket.c:4969
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fehler beim Senden der Nachricht: %s"
 
-#: ../gio/gsocket.c:4711
+#: ../gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage wird unter Windows nicht unterstützt"
 
-#: ../gio/gsocket.c:5164 ../gio/gsocket.c:5237 ../gio/gsocket.c:5463
+#: ../gio/gsocket.c:5188 ../gio/gsocket.c:5261 ../gio/gsocket.c:5487
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Fehler beim Empfang der Nachricht: %s"
 
-#: ../gio/gsocket.c:5735
+#: ../gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Socket-Berechtigungen konnten nicht gelesen werden: %s"
 
-#: ../gio/gsocket.c:5744
+#: ../gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials ist für dieses Betriebssystem nicht implementiert"
@@ -3902,11 +3932,11 @@ msgstr "Nicht-TCP-Verbindung über Proxy wird nicht unterstützt."
 msgid "Proxy protocol “%s� is not supported."
 msgstr "Proxy-Protokoll »%s« wird nicht unterstützt."
 
-#: ../gio/gsocketlistener.c:218
+#: ../gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Lauscher ist bereits geschlossen"
 
-#: ../gio/gsocketlistener.c:264
+#: ../gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Der hinzugefügte Socket ist geschlossen"
 
@@ -4026,7 +4056,7 @@ msgid "Temporarily unable to resolve “%s�"
 msgstr "»%s« kann vorübergehend nicht aufgelöst werden"
 
 #: ../gio/gthreadedresolver.c:559 ../gio/gthreadedresolver.c:736
-#: ../gio/gthreadedresolver.c:842
+#: ../gio/gthreadedresolver.c:844
 #, c-format
 msgid "Error resolving “%s�"
 msgstr "Fehler beim Auflösen von »%s«"
@@ -4138,7 +4168,7 @@ msgstr "Fehler beim Lesen aus dem Dateideskriptor: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Fehler beim Schließen des Dateideskriptors: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: ../gio/gunixmounts.c:2593 ../gio/gunixmounts.c:2646
 msgid "Filesystem root"
 msgstr "Wurzelordner des Dateisystems"
 
@@ -4147,20 +4177,20 @@ msgstr "Wurzelordner des Dateisystems"
 msgid "Error writing to file descriptor: %s"
 msgstr "Fehler beim Schreiben in den Dateideskriptor: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: ../gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Abstrakte Unix Domänen-Socket-Adresse wird auf diesem System nicht "
 "unterstützt"
 
-#: ../gio/gvolume.c:437
+#: ../gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "Datenträger unterstützt Auswerfen nicht"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gvolume.c:514
+#: ../gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "Datenträger unterstützt weder Auswerfen noch »eject_with_operation«"
 
@@ -4352,25 +4382,25 @@ msgid "The pathname “%s� is not an absolute path"
 msgstr "Der Pfadname »%s« ist kein absoluter Pfad"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:207
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e. %b %Y %T %Z"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:210
+#: ../glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:213
+#: ../glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:216
+#: ../glib/gdatetime.c:222
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S"
@@ -4391,62 +4421,62 @@ msgstr "%I:%M:%S"
 #. * non-European) there is no difference between the standalone and
 #. * complete date form.
 #.
-#: ../glib/gdatetime.c:251
+#: ../glib/gdatetime.c:261
 msgctxt "full month name"
 msgid "January"
 msgstr "Januar"
 
-#: ../glib/gdatetime.c:253
+#: ../glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "Februar"
 
-#: ../glib/gdatetime.c:255
+#: ../glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "März"
 
-#: ../glib/gdatetime.c:257
+#: ../glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "April"
 
-#: ../glib/gdatetime.c:259
+#: ../glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:261
+#: ../glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "Juni"
 
-#: ../glib/gdatetime.c:263
+#: ../glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "Juli"
 
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "August"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "September"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "Oktober"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "November"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "Dezember"
@@ -4468,132 +4498,132 @@ msgstr "Dezember"
 #. * other platform.  Here are abbreviated month names in a form
 #. * appropriate when they are used standalone.
 #.
-#: ../glib/gdatetime.c:305
+#: ../glib/gdatetime.c:315
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../glib/gdatetime.c:307
+#: ../glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../glib/gdatetime.c:309
+#: ../glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Mär"
 
-#: ../glib/gdatetime.c:311
+#: ../glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../glib/gdatetime.c:313
+#: ../glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:315
+#: ../glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../glib/gdatetime.c:317
+#: ../glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../glib/gdatetime.c:319
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "Aug"
 
-#: ../glib/gdatetime.c:321
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../glib/gdatetime.c:323
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Okt"
 
-#: ../glib/gdatetime.c:325
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../glib/gdatetime.c:327
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Dez"
 
-#: ../glib/gdatetime.c:342
+#: ../glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Montag"
 
-#: ../glib/gdatetime.c:344
+#: ../glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../glib/gdatetime.c:346
+#: ../glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../glib/gdatetime.c:348
+#: ../glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../glib/gdatetime.c:350
+#: ../glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../glib/gdatetime.c:352
+#: ../glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../glib/gdatetime.c:354
+#: ../glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../glib/gdatetime.c:369
+#: ../glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Mo"
 
-#: ../glib/gdatetime.c:371
+#: ../glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Di"
 
-#: ../glib/gdatetime.c:373
+#: ../glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Mi"
 
-#: ../glib/gdatetime.c:375
+#: ../glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Do"
 
-#: ../glib/gdatetime.c:377
+#: ../glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Fr"
 
-#: ../glib/gdatetime.c:379
+#: ../glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Sa"
 
-#: ../glib/gdatetime.c:381
+#: ../glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "So"
@@ -4615,62 +4645,62 @@ msgstr "So"
 #. * (western European, non-European) there is no difference between the
 #. * standalone and complete date form.
 #.
-#: ../glib/gdatetime.c:441
+#: ../glib/gdatetime.c:455
 msgctxt "full month name with day"
 msgid "January"
 msgstr "Januar"
 
-#: ../glib/gdatetime.c:443
+#: ../glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "Februar"
 
-#: ../glib/gdatetime.c:445
+#: ../glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "März"
 
-#: ../glib/gdatetime.c:447
+#: ../glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "April"
 
-#: ../glib/gdatetime.c:449
+#: ../glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:451
+#: ../glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "Juni"
 
-#: ../glib/gdatetime.c:453
+#: ../glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "Juli"
 
-#: ../glib/gdatetime.c:455
+#: ../glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "August"
 
-#: ../glib/gdatetime.c:457
+#: ../glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "September"
 
-#: ../glib/gdatetime.c:459
+#: ../glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "Oktober"
 
-#: ../glib/gdatetime.c:461
+#: ../glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "November"
 
-#: ../glib/gdatetime.c:463
+#: ../glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "Dezember"
@@ -4692,74 +4722,74 @@ msgstr "Dezember"
 #. * month names almost ready to copy and paste here.  In other systems
 #. * due to a bug the result is incorrect in some languages.
 #.
-#: ../glib/gdatetime.c:524
+#: ../glib/gdatetime.c:542
 msgctxt "abbreviated month name with day"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../glib/gdatetime.c:526
+#: ../glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../glib/gdatetime.c:528
+#: ../glib/gdatetime.c:546
 msgctxt "abbreviated month name with day"
 msgid "Mar"
 msgstr "Mär"
 
-#: ../glib/gdatetime.c:530
+#: ../glib/gdatetime.c:548
 msgctxt "abbreviated month name with day"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../glib/gdatetime.c:532
+#: ../glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:534
+#: ../glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../glib/gdatetime.c:536
+#: ../glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../glib/gdatetime.c:538
+#: ../glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "Aug"
 
-#: ../glib/gdatetime.c:540
+#: ../glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../glib/gdatetime.c:542
+#: ../glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "Okt"
 
-#: ../glib/gdatetime.c:544
+#: ../glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../glib/gdatetime.c:546
+#: ../glib/gdatetime.c:564
 msgctxt "abbreviated month name with day"
 msgid "Dec"
 msgstr "Dez"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:563
+#: ../glib/gdatetime.c:581
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "a. m."
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:566
+#: ../glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "p. m."
@@ -4815,7 +4845,7 @@ msgstr ""
 "Datei »%s« konnte nicht in »%s« umbenannt werden: g_rename() ist "
 "gescheitert: %s"
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s�: %s"
 msgstr "Datei »%s« konnte nicht angelegt werden: %s"
@@ -4831,24 +4861,24 @@ msgid "Failed to write file “%s�: fsync() failed: %s"
 msgstr ""
 "Datei »%s« konnte nicht geschrieben werden: fsync() ist gescheitert: %s"
 
-#: ../glib/gfileutils.c:1251
+#: ../glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s� could not be removed: g_unlink() failed: %s"
 msgstr ""
 "Die vorhandene Datei »%s« konnte nicht entfernt werden: g_unlink() ist "
 "gescheitert: %s"
 
-#: ../glib/gfileutils.c:1530
+#: ../glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s� invalid, should not contain a “%s�"
 msgstr "Vorlage »%s« ungültig, sollte kein »%s« enthalten"
 
-#: ../glib/gfileutils.c:1543
+#: ../glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s� doesn’t contain XXXXXX"
 msgstr "Vorlage »%s« enthält nicht XXXXXX"
 
-#: ../glib/gfileutils.c:2105
+#: ../glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s�: %s"
 msgstr "Die symbolische Verknüpfung »%s« konnte nicht gelesen werden: %s"
@@ -5008,17 +5038,17 @@ msgstr "Fehler in Zeile %d, Zeichen %d: "
 
 #: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
-msgstr "Ungültiger UTF-8-kodierter Text im Namen - »%s« ist nicht gültig"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s�"
+msgstr "Ungültiger UTF-8-kodierter Text im Namen – »%s« ist nicht gültig"
 
 #: ../glib/gmarkup.c:472
 #, c-format
-msgid "'%s' is not a valid name"
+msgid "“%s� is not a valid name"
 msgstr "»%s« ist kein gültiger Name"
 
 #: ../glib/gmarkup.c:488
 #, c-format
-msgid "'%s' is not a valid name: '%c'"
+msgid "“%s� is not a valid name: “%c�"
 msgstr "»%s« ist kein gültiger Name: »%c«"
 
 #: ../glib/gmarkup.c:598
@@ -5029,46 +5059,46 @@ msgstr "Fehler in Zeile %d: %s"
 #: ../glib/gmarkup.c:675
 #, c-format
 msgid ""
-"Failed to parse '%-.*s', which should have been a digit inside a character "
-"reference (&#234; for example) - perhaps the digit is too large"
+"Failed to parse “%-.*s�, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
 msgstr ""
 "»%-.*s«, was eine Zahl in einer Zeichenreferenz (wie &#234;) sein sollte, "
-"konnte nicht analysiert werden - vielleicht ist die Zahl zu groß"
+"konnte nicht analysiert werden – vielleicht ist die Zahl zu groß"
 
 #: ../glib/gmarkup.c:687
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
 msgstr ""
 "Zeichenangabe endete nicht mit einem Semikolon; wahrscheinlich haben Sie ein "
-"&-Zeichen benutzt, ohne eine Entität beginnen zu wollen - umschreiben Sie "
+"&-Zeichen benutzt, ohne eine Entität beginnen zu wollen – umschreiben Sie "
 "das »&« als &amp;"
 
 #: ../glib/gmarkup.c:713
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
+msgid "Character reference “%-.*s� does not encode a permitted character"
 msgstr "Zeichenreferenz »%-.*s« kodiert kein zulässiges Zeichen"
 
 #: ../glib/gmarkup.c:751
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
 "Leere Entität »&;« gefunden; gültige Entitäten sind &amp; &quot; &lt; &gt; "
 "&apos;"
 
 #: ../glib/gmarkup.c:759
 #, c-format
-msgid "Entity name '%-.*s' is not known"
+msgid "Entity name “%-.*s� is not known"
 msgstr "Entitätenname »%-.*s« ist unbekannt"
 
 #: ../glib/gmarkup.c:764
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
+"character without intending to start an entity — escape ampersand as &amp;"
 msgstr ""
 "Entität endete nicht mit einem Semikolon; wahrscheinlich haben Sie ein &-"
-"Zeichen benutzt, ohne eine Entität beginnen zu wollen - umschreiben Sie das "
+"Zeichen benutzt, ohne eine Entität beginnen zu wollen – umschreiben Sie das "
 "»&« als &amp;"
 
 #: ../glib/gmarkup.c:1170
@@ -5078,7 +5108,7 @@ msgstr "Dokument muss mit einem Element beginnen (e.g. <book>)"
 #: ../glib/gmarkup.c:1210
 #, c-format
 msgid ""
-"'%s' is not a valid character following a '<' character; it may not begin an "
+"“%s� is not a valid character following a “<� character; it may not begin an "
 "element name"
 msgstr ""
 "»%s« ist kein gültiges Zeichen nach einem »<«-Zeichen; es darf keinen "
@@ -5087,8 +5117,8 @@ msgstr ""
 #: ../glib/gmarkup.c:1252
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
+"Odd character “%s�, expected a “>� character to end the empty-element tag "
+"“%s�"
 msgstr ""
 "Seltsames Zeichen »%s«, »>« erwartet um Start-Tag des leeren Elements »%s« "
 "abzuschließen"
@@ -5096,7 +5126,7 @@ msgstr ""
 #: ../glib/gmarkup.c:1333
 #, c-format
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+"Odd character “%s�, expected a “=� after attribute name “%s� of element “%s�"
 msgstr ""
 "Seltsames Zeichen »%s«, »=« wird nach dem Attributnamen »%s« des Elements "
 "»%s« erwartet"
@@ -5104,8 +5134,8 @@ msgstr ""
 #: ../glib/gmarkup.c:1374
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s�, expected a “>� or “/� character to end the start tag of "
+"element “%s�, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
 "Seltsames Zeichen »%s«, es wurde entweder ein Attribut oder aber »>« oder "
@@ -5115,8 +5145,8 @@ msgstr ""
 #: ../glib/gmarkup.c:1418
 #, c-format
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
+"Odd character “%s�, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s� of element “%s�"
 msgstr ""
 "Seltsames Zeichen »%s«; bei der Wertangabe für das Attribut »%s« des "
 "Elements »%s« wurde ein Anführungszeichen nach dem Gleichheitszeichen "
@@ -5125,7 +5155,7 @@ msgstr ""
 #: ../glib/gmarkup.c:1551
 #, c-format
 msgid ""
-"'%s' is not a valid character following the characters '</'; '%s' may not "
+"“%s� is not a valid character following the characters “</�; “%s� may not "
 "begin an element name"
 msgstr ""
 "»%s« ist kein gültiges Zeichen, wenn es auf die Zeichen »</« folgt; »%s« "
@@ -5134,20 +5164,20 @@ msgstr ""
 #: ../glib/gmarkup.c:1587
 #, c-format
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
+"“%s� is not a valid character following the close element name “%s�; the "
+"allowed character is “>�"
 msgstr ""
 "»%s« ist kein gültiges Zeichen, wenn es auf den schließenden Elementnamen "
 "»%s« folgt; das erlaubte Zeichen ist »>«"
 
 #: ../glib/gmarkup.c:1598
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
+msgid "Element “%s� was closed, no element is currently open"
 msgstr "Element »%s« wurde geschlossen, kein Element ist derzeit offen"
 
 #: ../glib/gmarkup.c:1607
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
+msgid "Element “%s� was closed, but the currently open element is “%s�"
 msgstr ""
 "Element »%s« wurde geschlossen, aber das derzeit offene Element ist »%s«"
 
@@ -5156,16 +5186,16 @@ msgid "Document was empty or contained only whitespace"
 msgstr "Dokument ist leer oder enthält nur Leerraum"
 
 #: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
+msgid "Document ended unexpectedly just after an open angle bracket “<�"
 msgstr "Dokument endete unerwartet nach einer offenen spitzen Klammer »<«"
 
 #: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
 #, c-format
 msgid ""
-"Document ended unexpectedly with elements still open - '%s' was the last "
+"Document ended unexpectedly with elements still open — “%s� was the last "
 "element opened"
 msgstr ""
-"Dokument endete unerwartet mit noch offenen Elementen - »%s« war das letzte "
+"Dokument endete unerwartet mit noch offenen Elementen – »%s« war das letzte "
 "offene Element"
 
 #: ../glib/gmarkup.c:1790
@@ -5203,7 +5233,7 @@ msgstr "Dokument endete unerwartet innerhalb eines Attributwertes"
 
 #: ../glib/gmarkup.c:1836
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgid "Document ended unexpectedly inside the close tag for element “%s�"
 msgstr ""
 "Dokument endete unerwartet innerhalb eines schließenden Tags für das Element "
 "»%s«"
@@ -5583,7 +5613,7 @@ msgstr "Name ist zu lang in (*MARK), (*PRUNE), (*SKIP), oder (*THEN)"
 msgid "character value in \\u.... sequence is too large"
 msgstr "Zeichenwert in \\u....-Sequenz ist zu groß"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Fehler beim Anwenden des regulären Ausdrucks %s: %s"
@@ -5613,43 +5643,43 @@ msgstr "Fehler beim Optimieren des regulären Ausdrucks %s: %s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Fehler beim Kompilieren des regulären Ausdrucks %s an Zeichen %d: %s"
 
-#: ../glib/gregex.c:2413
+#: ../glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr "Hexadezimalzahl oder »}« erwartet"
 
-#: ../glib/gregex.c:2429
+#: ../glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "Hexadezimalzahl erwartet"
 
-#: ../glib/gregex.c:2469
+#: ../glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr "Fehlendes »<» in symbolischer Referenz"
 
-#: ../glib/gregex.c:2478
+#: ../glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "Unvollendete symbolische Referenz"
 
-#: ../glib/gregex.c:2485
+#: ../glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "Symbolische Referenz der Länge 0"
 
-#: ../glib/gregex.c:2496
+#: ../glib/gregex.c:2502
 msgid "digit expected"
 msgstr "Ziffer erwartet"
 
-#: ../glib/gregex.c:2514
+#: ../glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "Illegale symbolische Referenz"
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr "Verirrtes abschließendes »\\«"
 
-#: ../glib/gregex.c:2580
+#: ../glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "Unbekannte Escape-Sequenz"
 
-#: ../glib/gregex.c:2590
+#: ../glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr "Fehler beim Verarbeiten des Ersetzungstextes »%s« an Zeichen %lu: %s"
@@ -5680,126 +5710,132 @@ msgstr ""
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Text war leer (oder enthielt nur Leerraum)"
 
-#: ../glib/gspawn.c:253
+#: ../glib/gspawn.c:292
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Daten vom Kindprozess konnten nicht gelesen werden (%s)"
 
-#: ../glib/gspawn.c:401
+#: ../glib/gspawn.c:440
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Unerwarteter Fehler in select() beim Lesen von Daten eines Kindprozesses (%s)"
 
-#: ../glib/gspawn.c:486
+#: ../glib/gspawn.c:525
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Unerwarteter Fehler in waitpid() (%s)"
 
-#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
+#: ../glib/gspawn.c:1033 ../glib/gspawn-win32.c:1318
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Der Kindprozess wurde mit Status %ld beendet"
 
-#: ../glib/gspawn.c:905
+#: ../glib/gspawn.c:1041
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Der Kindprozess wurde mit Signal %ld beendet"
 
-#: ../glib/gspawn.c:912
+#: ../glib/gspawn.c:1048
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Der Kindprozess wurde mit Signal %ld beendet"
 
-#: ../glib/gspawn.c:919
+#: ../glib/gspawn.c:1055
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Der Kindprozess wurde gewaltsam beendet"
 
-#: ../glib/gspawn.c:1324 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
+#: ../glib/gspawn.c:1350 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Lesen aus Weiterleitung zum Kind (%s) gescheitert"
 
-#: ../glib/gspawn.c:1394
+#: ../glib/gspawn.c:1586
+#, c-format
+msgid "Failed to spawn child process \"%s\" (%s)"
+msgstr "Abspalten des Kindprozesses »%s« gescheitert (%s)"
+
+#: ../glib/gspawn.c:1625
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Abspalten gescheitert (%s)"
 
-#: ../glib/gspawn.c:1543 ../glib/gspawn-win32.c:368
+#: ../glib/gspawn.c:1774 ../glib/gspawn-win32.c:370
 #, c-format
 msgid "Failed to change to directory “%s� (%s)"
 msgstr "In Ordner »%s« (%s) konnte nicht gewechselt werden"
 
-#: ../glib/gspawn.c:1553
+#: ../glib/gspawn.c:1784
 #, c-format
 msgid "Failed to execute child process “%s� (%s)"
 msgstr "Kindprozess »%s« konnte nicht ausgeführt werden (%s)"
 
-#: ../glib/gspawn.c:1563
+#: ../glib/gspawn.c:1794
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Umleiten der Ausgabe oder Eingabe des Kindprozesses (%s) gescheitert"
 
-#: ../glib/gspawn.c:1572
+#: ../glib/gspawn.c:1803
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Abspalten des Kindprozesses gescheitert (%s)"
 
-#: ../glib/gspawn.c:1580
+#: ../glib/gspawn.c:1811
 #, c-format
 msgid "Unknown error executing child process “%s�"
 msgstr "Unbekannter Fehler beim Ausführen des Kindprozesses »%s«"
 
-#: ../glib/gspawn.c:1604
+#: ../glib/gspawn.c:1835
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Es konnten nicht genug Daten von Kind-Programmkennungsweiterleitung (%s) "
 "gelesen werden"
 
-#: ../glib/gspawn-win32.c:281
+#: ../glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Daten konnten nicht vom Kindprozess gelesen werden"
 
-#: ../glib/gspawn-win32.c:298
+#: ../glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "Weiterleitung für Kommunikation mit Kindprozess (%s) konnte nicht erzeugt "
 "werden"
 
-#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
+#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:381
+#: ../glib/gspawn-win32.c:500
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Kindprozess konnte nicht ausgeführt werden (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: ../glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Ungültiger Programmname: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:460 ../glib/gspawn-win32.c:714
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Ungültige Zeichenkette im Argumentsvektor bei %d: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:471 ../glib/gspawn-win32.c:729
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Ungültige Zeichenkette in der Umgebung: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: ../glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Ungültiger Arbeitsordner: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: ../glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Hilfsprogramm (%s) konnte nicht ausgeführt werden"
 
-#: ../glib/gspawn-win32.c:995
+#: ../glib/gspawn-win32.c:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5843,134 +5879,134 @@ msgstr "Ungültige Folge in Umwandlungseingabe"
 msgid "Character out of range for UTF-16"
 msgstr "Zeichen außerhalb des Bereiches für UTF-16"
 
-#: ../glib/gutils.c:2229
+#: ../glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: ../glib/gutils.c:2247 ../glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: ../glib/gutils.c:2248 ../glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: ../glib/gutils.c:2249 ../glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2237
+#: ../glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f kiB"
 
-#: ../glib/gutils.c:2238
+#: ../glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2239
+#: ../glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2240
+#: ../glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2241
+#: ../glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2242
+#: ../glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2245
+#: ../glib/gutils.c:2260
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kbit"
 
-#: ../glib/gutils.c:2246
+#: ../glib/gutils.c:2261
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mbit"
 
-#: ../glib/gutils.c:2247
+#: ../glib/gutils.c:2262
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gbit"
 
-#: ../glib/gutils.c:2248
+#: ../glib/gutils.c:2263
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tbit"
 
-#: ../glib/gutils.c:2249
+#: ../glib/gutils.c:2264
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pbit"
 
-#: ../glib/gutils.c:2250
+#: ../glib/gutils.c:2265
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Ebit"
 
-#: ../glib/gutils.c:2253
+#: ../glib/gutils.c:2268
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kibit"
 
-#: ../glib/gutils.c:2254
+#: ../glib/gutils.c:2269
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mibit"
 
-#: ../glib/gutils.c:2255
+#: ../glib/gutils.c:2270
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gibit"
 
-#: ../glib/gutils.c:2256
+#: ../glib/gutils.c:2271
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tibit"
 
-#: ../glib/gutils.c:2257
+#: ../glib/gutils.c:2272
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pibit"
 
-#: ../glib/gutils.c:2258
+#: ../glib/gutils.c:2273
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eibit"
 
-#: ../glib/gutils.c:2292 ../glib/gutils.c:2418
+#: ../glib/gutils.c:2307 ../glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u Byte"
 msgstr[1] "%u Bytes"
 
-#: ../glib/gutils.c:2296
+#: ../glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5978,7 +6014,7 @@ msgstr[0] "%u bit"
 msgstr[1] "%u bits"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2363
+#: ../glib/gutils.c:2378
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -5986,7 +6022,7 @@ msgstr[0] "%s Byte"
 msgstr[1] "%s Bytes"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2368
+#: ../glib/gutils.c:2383
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -5998,7 +6034,7 @@ msgstr[1] "%s bits"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2431
+#: ../glib/gutils.c:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
diff --git a/po/es.po b/po/es.po
index 213bed15b..ff9efcd26 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,10 +13,9 @@
 msgid ""
 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: 2018-03-26 14:56+0000\n"
-"PO-Revision-Date: 2018-04-25 12:42+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-07-30 18:46+0000\n"
+"PO-Revision-Date: 2018-07-31 11:42+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -24,134 +23,131 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: ../gio/gapplication.c:496
+#: gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Opciones de GApplication"
 
-#: ../gio/gapplication.c:496
+#: gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Mostrar las opciones de GApplication"
 
-#: ../gio/gapplication.c:541
+#: gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr ""
 "Entrar en modo de servicio de GApplication (usar desde archivos de servicio "
 "de D-Bus)"
 
-#: ../gio/gapplication.c:553
+#: gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Omitir el ID de la aplicación"
 
-#: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
-#: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:488
-#: ../gio/gsettings-tool.c:569
+#: gio/gapplication-tool.c:45 gio/gapplication-tool.c:46 gio/gio-tool.c:227
+#: gio/gresource-tool.c:488 gio/gsettings-tool.c:569
 msgid "Print help"
 msgstr "Imprimir ayuda"
 
-#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489
-#: ../gio/gresource-tool.c:557
+#: gio/gapplication-tool.c:47 gio/gresource-tool.c:489 gio/gresource-tool.c:557
 msgid "[COMMAND]"
 msgstr "[COMANDO]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
 msgstr "Imprimir versión"
 
-#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:575
+#: gio/gapplication-tool.c:50 gio/gsettings-tool.c:575
 msgid "Print version information and exit"
 msgstr "Mostrar informacio�n de la versio�n y salir"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Listar aplicaciones"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Listar las aplicaciones instalas activables por D-Bus (por archivos .desktop)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Lanzar como aplicación"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Lanzar la aplicación (con archivos opcionales que abrir)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "APPID [ARCHIVO...]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Activar una acción"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Invocar una acción en la aplicación"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "APPID ACCION [PAR�METRO]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Listar las acciones disponibles"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr ""
 "Listar las acciones estáticas para una aplicación (desde el archivo .desktop)"
 
-#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:65 gio/gapplication-tool.c:71
 msgid "APPID"
 msgstr "APPID"
 
-#: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133
-#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:224
+#: gio/gapplication-tool.c:70 gio/gapplication-tool.c:133 gio/gdbus-tool.c:90
+#: gio/gio-tool.c:224
 msgid "COMMAND"
 msgstr "COMANDO"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "El comando para el que mostrar ayuda detallada"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr ""
 "Identificador de la aplicación en formato D-Bus (ej. org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:737
-#: ../gio/glib-compile-resources.c:743 ../gio/glib-compile-resources.c:770
-#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
+#: gio/gapplication-tool.c:72 gio/glib-compile-resources.c:737
+#: gio/glib-compile-resources.c:743 gio/glib-compile-resources.c:770
+#: gio/gresource-tool.c:495 gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "ARCHIVO"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr "Nombres de archivos relativos o absolutos, o URI que abrir"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "ACCIÓN"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "El nombre de la acción a la que invocar"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARA�METRO"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr ""
 "Parámetro opcionales para la invocación de la acción, en formato GVariant"
 
-#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:661
+#: gio/gapplication-tool.c:96 gio/gresource-tool.c:526 gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -160,26 +156,26 @@ msgstr ""
 "Comando «%s» desconocido\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:696
+#: gio/gapplication-tool.c:114 gio/gresource-tool.c:551
+#: gio/gsettings-tool.c:696
 msgid "Arguments:\n"
 msgstr "Argumentos:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: gio/gapplication-tool.c:133 gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGS…]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
 #. Translators: do not translate 'help', but please translate 'COMMAND'.
-#: ../gio/gapplication-tool.c:146
+#: gio/gapplication-tool.c:146
 #, c-format
 msgid ""
 "Use “%s help COMMAND� to get detailed help.\n"
@@ -188,7 +184,7 @@ msgstr ""
 "Use «%s help COMANDO» para obtener ayuda detallada.\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:165
+#: gio/gapplication-tool.c:165
 #, c-format
 msgid ""
 "%s command requires an application id to directly follow\n"
@@ -197,13 +193,13 @@ msgstr ""
 "el comando %s requiere un ID de aplicación para seguir directamente\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s�\n"
 msgstr "ID de aplicación no válido: «%s»\n"
 
 #. Translators: %s is replaced with a command name like 'list-actions'
-#: ../gio/gapplication-tool.c:182
+#: gio/gapplication-tool.c:182
 #, c-format
 msgid ""
 "“%s� takes no arguments\n"
@@ -212,23 +208,22 @@ msgstr ""
 "«%s» no lleva ningún argumento\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "no se pudo conectar a D-Bus: %s\n"
 
-#: ../gio/gapplication-tool.c:286
+#: gio/gapplication-tool.c:286
 #, c-format
 msgid "error sending %s message to application: %s\n"
 msgstr "error al enviar el mensaje %s a la aplicación: %s\n"
 
-#: ../gio/gapplication-tool.c:317
-#, c-format
+#: gio/gapplication-tool.c:317
 msgid "action name must be given after application id\n"
 msgstr ""
 "se debe indicar el nombre de la acción después del ID de la aplicación\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s�\n"
@@ -238,27 +233,25 @@ msgstr ""
 "los nombres de las acciones sólo pueden tener caracteres alfanuméricos «-» y "
 "«.»\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "error al analizar el parámetro de la acción: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "las acciones aceptan un máximo de un parámetro\n"
 
-#: ../gio/gapplication-tool.c:411
-#, c-format
+#: gio/gapplication-tool.c:411
 msgid "list-actions command takes only the application id"
 msgstr "el comando «list-actions» sólo toma el ID de la aplicación"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "no se puede encontrar un archivo .desktop para la aplicación %s\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -267,122 +260,118 @@ msgstr ""
 "comando desconocido: %s\n"
 "\n"
 
-#: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498
-#: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379
-#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019
-#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834
-#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:209
+#: gio/gbufferedinputstream.c:420 gio/gbufferedinputstream.c:498
+#: gio/ginputstream.c:179 gio/ginputstream.c:379 gio/ginputstream.c:617
+#: gio/ginputstream.c:1019 gio/goutputstream.c:203 gio/goutputstream.c:834
+#: gio/gpollableinputstream.c:205 gio/gpollableoutputstream.c:209
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "El valor de conteo pasado a %s es demasiado largo"
 
-#: ../gio/gbufferedinputstream.c:891 ../gio/gbufferedoutputstream.c:575
-#: ../gio/gdataoutputstream.c:562
+#: gio/gbufferedinputstream.c:891 gio/gbufferedoutputstream.c:575
+#: gio/gdataoutputstream.c:562
 msgid "Seek not supported on base stream"
 msgstr "No se permite buscar en el flujo base"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "No se puede truncar GBufferedInputStream"
 
-#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208
-#: ../gio/giostream.c:300 ../gio/goutputstream.c:1661
+#: gio/gbufferedinputstream.c:982 gio/ginputstream.c:1208 gio/giostream.c:300
+#: gio/goutputstream.c:1661
 msgid "Stream is already closed"
 msgstr "El flujo ya se cerró"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "No se soporta el truncado en el flujo base"
 
-#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
-#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:871
-#: ../gio/gsimpleasyncresult.c:897
+#: gio/gcancellable.c:317 gio/gdbusconnection.c:1840 gio/gdbusprivate.c:1402
+#: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897
 #, c-format
 msgid "Operation was cancelled"
 msgstr "Se canceló la operación"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Objeto no válido, no inicializado"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Secuencia multibyte incompleta en la entrada"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "No hay suficiente espacio en el destino"
 
-#: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
-#: ../gio/gdatainputstream.c:1261 ../glib/gconvert.c:454
-#: ../glib/gconvert.c:883 ../glib/giochannel.c:1557 ../glib/giochannel.c:1599
-#: ../glib/giochannel.c:2443 ../glib/gutf8.c:869 ../glib/gutf8.c:1322
+#: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848
+#: gio/gdatainputstream.c:1261 glib/gconvert.c:454 glib/gconvert.c:883
+#: glib/giochannel.c:1557 glib/giochannel.c:1599 glib/giochannel.c:2443
+#: glib/gutf8.c:869 glib/gutf8.c:1322
 msgid "Invalid byte sequence in conversion input"
 msgstr "Hay una secuencia de bytes no válida en la entrada de conversión"
 
-#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:462
-#: ../glib/gconvert.c:797 ../glib/giochannel.c:1564 ../glib/giochannel.c:2455
+#: gio/gcharsetconverter.c:347 glib/gconvert.c:462 glib/gconvert.c:797
+#: glib/giochannel.c:1564 glib/giochannel.c:2455
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Falló durante la conversión: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "La inicialización cancelable no eestá soportada"
 
-#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:327
-#: ../glib/giochannel.c:1385
+#: gio/gcharsetconverter.c:456 glib/gconvert.c:327 glib/giochannel.c:1385
 #, c-format
 msgid "Conversion from character set “%s� to “%s� is not supported"
 msgstr ""
 "La conversión desde el conjunto de caracteres «%s» a «%s» no está soportada"
 
-#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:331
+#: gio/gcharsetconverter.c:460 glib/gconvert.c:331
 #, c-format
 msgid "Could not open converter from “%s� to “%s�"
 msgstr "No se pudo abrir el conversor de «%s» a «%s»"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:358
 #, c-format
 msgid "%s type"
 msgstr "tipo %s"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Tipo desconocido"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 msgid "%s filetype"
 msgstr "tipo de archivo %s"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: gio/gcredentials.c:315 gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
 msgstr "GCredentials no está implementado en este SO"
 
-#: ../gio/gcredentials.c:467
+#: gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "No existe soporte de GCredentials para su plataforma"
 
-#: ../gio/gcredentials.c:513
+#: gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "GCredentials no contiene un ID de proceso en este SO"
 
-#: ../gio/gcredentials.c:565
+#: gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr "No se soporta la burla de credenciales en este SO"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Final de flujo inesperadamente prematuro"
 
-#: ../gio/gdbusaddress.c:158 ../gio/gdbusaddress.c:246
-#: ../gio/gdbusaddress.c:327
+#: gio/gdbusaddress.c:158 gio/gdbusaddress.c:246 gio/gdbusaddress.c:327
 #, c-format
 msgid "Unsupported key “%s� in address entry “%s�"
 msgstr "Clave «%s» no soportada en la entrada de dirección «%s»"
 
-#: ../gio/gdbusaddress.c:185
+#: gio/gdbusaddress.c:185
 #, c-format
 msgid ""
 "Address “%s� is invalid (need exactly one of path, tmpdir or abstract keys)"
@@ -390,28 +379,33 @@ msgstr ""
 "La dirección «%s» no es válida (se necesita exactamente una ruta, carpeta "
 "temporal o claves abstractas)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s�"
 msgstr ""
 "Combinación del par clave/valor sin sentido en la entrada de dirección «%s»"
 
-#: ../gio/gdbusaddress.c:261 ../gio/gdbusaddress.c:342
+#: gio/gdbusaddress.c:261 gio/gdbusaddress.c:342
 #, c-format
 msgid "Error in address “%s� — the port attribute is malformed"
 msgstr "Error en la direccio�n «%s»; el atributo de puerto esta� mal formado"
 
-#: ../gio/gdbusaddress.c:272 ../gio/gdbusaddress.c:353
+#: gio/gdbusaddress.c:272 gio/gdbusaddress.c:353
 #, c-format
 msgid "Error in address “%s� — the family attribute is malformed"
 msgstr "Error en la dirección «%s»; el atributo de familia está mal formado"
 
-#: ../gio/gdbusaddress.c:463
+#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s� for address “%s�"
+msgstr "Transporte «%s» desconocido o no soportado para la dirección «%s»"
+
+#: gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s� does not contain a colon (:)"
 msgstr "El elemento de dirección «%s» no contiene dos puntos (:)"
 
-#: ../gio/gdbusaddress.c:484
+#: gio/gdbusaddress.c:488
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s�, in address element “%s� does not contain an equal "
@@ -420,7 +414,7 @@ msgstr ""
 "El par clave/valor %d, «%s», en el elemento de dirección «%s», no contiene "
 "un signo de igual"
 
-#: ../gio/gdbusaddress.c:498
+#: gio/gdbusaddress.c:502
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s�, in address element "
@@ -429,7 +423,7 @@ msgstr ""
 "Error al desescapar la clave o el valor en el par clave/valor %d, «%s», en "
 "el elemento de dirección «%s»"
 
-#: ../gio/gdbusaddress.c:576
+#: gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s� — the unix transport requires exactly one of the keys "
@@ -438,102 +432,97 @@ msgstr ""
 "Error en la dirección «%s»: el transporte UNIX requiere exactamente que una "
 "de las claves «path» o «abstract» esté establecida"
 
-#: ../gio/gdbusaddress.c:612
+#: gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s� — the host attribute is missing or malformed"
 msgstr ""
 "Error en la dirección «%s»: falta o está mal formado el atributo para el "
 "servidor"
 
-#: ../gio/gdbusaddress.c:626
+#: gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s� — the port attribute is missing or malformed"
 msgstr ""
 "Error en la direccio�n «%s»: falta o esta� mal formado el atributo para el "
 "puerto"
 
-#: ../gio/gdbusaddress.c:640
+#: gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s� — the noncefile attribute is missing or malformed"
 msgstr ""
 "Error en la dirección «%s»: falta o está mal formado el atributo para el "
 "archivo de número usado una sola vez"
 
-#: ../gio/gdbusaddress.c:661
+#: gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Error al autolanzar: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s� for address “%s�"
-msgstr "Transporte «%s» desconocido o no soportado para la dirección «%s»"
-
-#: ../gio/gdbusaddress.c:714
+#: gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s�: %s"
 msgstr "Error al abrir el archivo de número usado una sola vez «%s»: %s"
 
-#: ../gio/gdbusaddress.c:733
+#: gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s�: %s"
 msgstr "Error al leer el archivo de número usado una sola vez «%s»: %s"
 
-#: ../gio/gdbusaddress.c:742
+#: gio/gdbusaddress.c:746
 #, c-format
 msgid "Error reading from nonce file “%s�, expected 16 bytes, got %d"
 msgstr ""
 "Error al leer el archivo de número usado una sola vez «%s», se esperaban 16 "
 "bytes, se obtuvieron %d"
 
-#: ../gio/gdbusaddress.c:760
+#: gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s� to stream:"
 msgstr ""
 "Error al escribir el contenido del archivo de número usado una sola vez «%s» "
 "al flujo:"
 
-#: ../gio/gdbusaddress.c:969
+#: gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "La dirección proporcionada está vacía"
 
-#: ../gio/gdbusaddress.c:1082
+#: gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "No se puede lanzar («spawn») un mensaje al bus con setuid"
 
-#: ../gio/gdbusaddress.c:1089
+#: gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "No se puede lanzar («spawn») un mensaje al bus sin un ID de máquina: "
 
-#: ../gio/gdbusaddress.c:1096
+#: gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "No se puede lanzar D-Bus automáticamente sin X11 $DISPLAY"
 
-#: ../gio/gdbusaddress.c:1138
+#: gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s�: "
 msgstr "Error al lanzar («spawn») el comando «%s»: "
 
-#: ../gio/gdbusaddress.c:1355
+#: gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Escriba un cara�cter cualquiera para cerrar esta ventana)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr ""
 "La sesión de dbus no está en ejecución, y falló el lanzamiento automático"
 
-#: ../gio/gdbusaddress.c:1520
+#: gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "No se puede determinar la dirección del bus de sesión (no implementado para "
 "este SO)"
 
-#: ../gio/gdbusaddress.c:1658
+#: gio/gdbusaddress.c:1662 gio/gdbusconnection.c:7142
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -542,7 +531,7 @@ msgstr ""
 "No se puede determinar la dirección del bus desde la variable de entorno "
 "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida"
 
-#: ../gio/gdbusaddress.c:1667 ../gio/gdbusconnection.c:7160
+#: gio/gdbusaddress.c:1671 gio/gdbusconnection.c:7151
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -550,21 +539,21 @@ msgstr ""
 "No se puede determinar la dirección del bus porque la variable de entorno "
 "DBUS_STARTER_BUS_TYPE no está establecida"
 
-#: ../gio/gdbusaddress.c:1677
+#: gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Tipo de bus %d desconocido"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Falta de contenido inesperada al intentar leer una línea"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr ""
 "Falta de contenido inesperada al intentar leer (de forma segura) una línea"
 
-#: ../gio/gdbusauth.c:481
+#: gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -572,16 +561,16 @@ msgstr ""
 "Se agotaron todos los mecanismos de autenticación (intentados: %s) "
 "(disponibles: %s)"
 
-#: ../gio/gdbusauth.c:1144
+#: gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Cancelado a través de GDBusAuthObserver::authorize-authenticated-peer"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s�: %s"
 msgstr "Error al obtener la información de la carpeta «%s»: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:274
+#: gio/gdbusauthmechanismsha1.c:274
 #, c-format
 msgid ""
 "Permissions on directory “%s� are malformed. Expected mode 0700, got 0%o"
@@ -589,24 +578,24 @@ msgstr ""
 "Los permisos de la carpeta «%s» están mal formados. Se esperaba el modo "
 "0700, se obtuvo 0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s�: %s"
 msgstr "Error al crear la carpeta %s: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:343
+#: gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s� for reading: "
 msgstr "Error al abrir el depósito de claves «%s» para su lectura: "
 
-#: ../gio/gdbusauthmechanismsha1.c:366 ../gio/gdbusauthmechanismsha1.c:684
+#: gio/gdbusauthmechanismsha1.c:369 gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr ""
 "La línea %d del depósito de claves en «%s» con contenido «%s» está mal "
 "formada"
 
-#: ../gio/gdbusauthmechanismsha1.c:380 ../gio/gdbusauthmechanismsha1.c:698
+#: gio/gdbusauthmechanismsha1.c:383 gio/gdbusauthmechanismsha1.c:701
 #, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -614,7 +603,7 @@ msgstr ""
 "El primer token de la línea %d del depósito de claves en «%s» con contenido "
 "«%s» está mal formado"
 
-#: ../gio/gdbusauthmechanismsha1.c:394 ../gio/gdbusauthmechanismsha1.c:712
+#: gio/gdbusauthmechanismsha1.c:397 gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -622,169 +611,160 @@ msgstr ""
 "El segundo token de la li�nea %d del depo�sito de claves en «%s» con contenido "
 "«%s» esta� mal formado"
 
-#: ../gio/gdbusauthmechanismsha1.c:418
+#: gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
 msgstr "No se encontró la «cookie» con ID %d en el depósito de claves en «%s»"
 
-#: ../gio/gdbusauthmechanismsha1.c:500
+#: gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Error al eliminar el archivo de bloqueo antiguo «%s»: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:532
+#: gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s�: %s"
 msgstr "Error al crear el archivo de bloqueo «%s»: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:563
+#: gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
 msgstr "Error al cerrar (desenlazar) el archivo de bloqueo «%s»: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:574
+#: gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s�: %s"
 msgstr "Error al desenlazar el archivo de bloqueo «%s»: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:651
+#: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s� for writing: "
 msgstr "Error al abrir el depósito de claves «%s» para su escritura:"
 
-#: ../gio/gdbusauthmechanismsha1.c:847
+#: gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
 msgstr ""
 "(Adicionalmente, también falló la liberación del bloqueo para «%s»: %s)"
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "La conexión está cerrada"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "Se alcanzó el tiempo de expiración"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "Se encontraron opciones no soportadas al construir la conexión del lado del "
 "cliente"
 
-#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
+#: gio/gdbusconnection.c:4115 gio/gdbusconnection.c:4462
 #, c-format
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
+"No such interface “org.freedesktop.DBus.Properties� on object at path %s"
 msgstr ""
 "No existe la interfaz «org.freedesktop.DBus.Properties» en el objeto en la "
 "ruta %s"
 
-#: ../gio/gdbusconnection.c:4266
+#: gio/gdbusconnection.c:4257
 #, c-format
-msgid "No such property '%s'"
+msgid "No such property “%s�"
 msgstr "No existe la propiedad «%s»"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
-msgstr "No se puede leer la clave «%s»"
+msgid "Property “%s� is not readable"
+msgstr "No se puede leer la propiedad «%s»"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
-msgstr "No se puede escribir la clave «%s»"
+msgid "Property “%s� is not writable"
+msgstr "No se puede escribir la propiedad «%s»"
 
-#: ../gio/gdbusconnection.c:4309
+#: gio/gdbusconnection.c:4300
 #, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+msgid "Error setting property “%s�: Expected type “%s� but got “%s�"
 msgstr ""
 "Error al establecer la propiedad «%s». Se esperaba el tipo «%s» pero se "
 "obtuvo «%s»."
 
-#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
-#: ../gio/gdbusconnection.c:6591
+#: gio/gdbusconnection.c:4405 gio/gdbusconnection.c:4613
+#: gio/gdbusconnection.c:6582
 #, c-format
-msgid "No such interface '%s'"
+msgid "No such interface “%s�"
 msgstr "La interfaz «%s» no existe"
 
-#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7100
+#: gio/gdbusconnection.c:4831 gio/gdbusconnection.c:7091
 #, c-format
-msgid "No such interface '%s' on object at path %s"
+msgid "No such interface “%s� on object at path %s"
 msgstr "No existe la interfaz «%s» en el objeto en la ruta %s"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
+msgid "No such method “%s�"
 msgstr "No existe el método «%s»"
 
-#: ../gio/gdbusconnection.c:4969
+#: gio/gdbusconnection.c:4960
 #, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
-msgstr "El tipo de mensaje, «%s», no concide con el tipo esperado «%s»"
+msgid "Type of message, “%s�, does not match expected type “%s�"
+msgstr "El tipo de mensaje, «%s», no coincide con el tipo esperado «%s»"
 
-#: ../gio/gdbusconnection.c:5167
+#: gio/gdbusconnection.c:5158
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Ya existe un objeto exportado para la interfaz %s en %s"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "No se pudo obtener la propiedad %s.%s"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "No se pudo establecer la propiedad %s.%s"
 
-#: ../gio/gdbusconnection.c:5627
+#: gio/gdbusconnection.c:5618
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Method “%s� returned type “%s�, but expected “%s�"
 msgstr "El método «%s» devolvió el tipo «%s» pero se esperaba «%s»"
 
-#: ../gio/gdbusconnection.c:6702
+#: gio/gdbusconnection.c:6693
 #, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgid "Method “%s� on interface “%s� with signature “%s� does not exist"
 msgstr "El método «%s» con interfaz «%s» y firma «%s» no existe"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Ya se ha exportado un subárbol para %s"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"No se puede determinar la dirección del bus desde la variable de entorno "
-"DBUS_STARTER_BUS_TYPE; variable «%s» desconocida"
-
-#: ../gio/gdbusmessage.c:1246
+#: gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "el tipo no es válido («INVALID»)"
 
-#: ../gio/gdbusmessage.c:1257
+#: gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "Mensaje de METHOD_CALL: falta el campo de cabecera PATH o MEMEBER"
 
-#: ../gio/gdbusmessage.c:1268
+#: gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "Mensaje de METHOD_RETURN: falta el campo de cabecera REPLY_SERIAL"
 
-#: ../gio/gdbusmessage.c:1280
+#: gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr ""
 "Mensaje de ERROR: falta el campo de cabecera REPLY_SERRIAL o ERROR_NAME"
 
-#: ../gio/gdbusmessage.c:1293
+#: gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "Mensaje de SIGNAL: falta el campo de cabecera PATH, INTERFACE o MEMBER"
 
-#: ../gio/gdbusmessage.c:1301
+#: gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -792,7 +772,7 @@ msgstr ""
 "Mensaje de SIGNAL: el campo de cabecera PATH está usando el valor reservado /"
 "org/freedesktop/DBus/Local"
 
-#: ../gio/gdbusmessage.c:1309
+#: gio/gdbusmessage.c:1311
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
@@ -800,21 +780,21 @@ msgstr ""
 "Mensaje de SIGNAL: el campo de cabecera INTERFACE esta� usando el valor "
 "reservado org.freedesktop.DBus.Local"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
+#: gio/gdbusmessage.c:1359 gio/gdbusmessage.c:1419
 #, c-format
 msgid "Wanted to read %lu byte but only got %lu"
 msgid_plural "Wanted to read %lu bytes but only got %lu"
 msgstr[0] "Se quería leer %lu byte pero sólo se obtuvo %lu"
 msgstr[1] "Se querían leer %lu bytes pero sólo se obtuvo %lu"
 
-#: ../gio/gdbusmessage.c:1371
+#: gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s� but found byte %d"
 msgstr ""
 "Se esperaba el byte NULL después de la cadena «%s» pero se encontró el byte "
 "%d"
 
-#: ../gio/gdbusmessage.c:1390
+#: gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -824,17 +804,17 @@ msgstr ""
 "en el byte desplazado %d (la longitud de la cadena es %d). La cadena UTF-8 "
 "válida hasta ese punto era «%s»."
 
-#: ../gio/gdbusmessage.c:1593
+#: gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus object path"
 msgstr "El valor analizado «%s» no es un objeto de ruta D-Bus válido"
 
-#: ../gio/gdbusmessage.c:1615
+#: gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature"
 msgstr "El valor analizado «%s» no es una firma de D-Bus válida"
 
-#: ../gio/gdbusmessage.c:1662
+#: gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -847,7 +827,7 @@ msgstr[1] ""
 "Se encontró un array de longitud %u bytes. La longitud máxima es 2<<26 bytes "
 "(64 MiB)."
 
-#: ../gio/gdbusmessage.c:1682
+#: gio/gdbusmessage.c:1684
 #, c-format
 msgid ""
 "Encountered array of type “a%c�, expected to have a length a multiple of %u "
@@ -856,13 +836,13 @@ msgstr ""
 "Encontrado un vector de tipo «a%c», esperando que su longitud fuese múltiplo "
 "de %u bytes, pero su longitud es de %u"
 
-#: ../gio/gdbusmessage.c:1849
+#: gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s� for variant is not a valid D-Bus signature"
 msgstr ""
 "El valor analizado «%s» para la variante no es una firma de D-Bus válida"
 
-#: ../gio/gdbusmessage.c:1873
+#: gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s� from the D-Bus wire format"
@@ -870,7 +850,7 @@ msgstr ""
 "Error al deserializar GVariant con el tipo de cadena «%s» al formato de "
 "mensaje de D-Bus"
 
-#: ../gio/gdbusmessage.c:2055
+#: gio/gdbusmessage.c:2057
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l�) or 0x42 (“B�) but found value "
@@ -879,27 +859,27 @@ msgstr ""
 "Valor endian no válido. Se esperaba 0x6c («l») o 0x42 («B»)» pero se obtuvo "
 "el valor 0x%02x"
 
-#: ../gio/gdbusmessage.c:2068
+#: gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr ""
 "La versión principal del protocolo no es válida. Se esperaba 1 pero se "
 "encontró %d."
 
-#: ../gio/gdbusmessage.c:2124
+#: gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s� found but message body is empty"
 msgstr ""
 "Se encontró la cabecera de firma con firma «%s» pero el cuerpo del mensaje "
 "está vacío"
 
-#: ../gio/gdbusmessage.c:2138
+#: gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature (for body)"
 msgstr ""
 "El valor analizado «%s» no es una firma de D-Bus válida (para el cuerpo)"
 
-#: ../gio/gdbusmessage.c:2168
+#: gio/gdbusmessage.c:2170
 #, c-format
 msgid "No signature header in message but the message body is %u byte"
 msgid_plural "No signature header in message but the message body is %u bytes"
@@ -910,11 +890,11 @@ msgstr[1] ""
 "No existe la cabecera de firma en el mensaje pero el cuerpo del mensaje "
 "tiene %u bytes"
 
-#: ../gio/gdbusmessage.c:2178
+#: gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "No se puede deserializar el mensaje: "
 
-#: ../gio/gdbusmessage.c:2519
+#: gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s� to the D-Bus wire format"
@@ -922,7 +902,7 @@ msgstr ""
 "Error al serializar GVariant con el tipo de cadena «%s» al formato de "
 "mensaje de D-Bus"
 
-#: ../gio/gdbusmessage.c:2656
+#: gio/gdbusmessage.c:2658
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
@@ -930,17 +910,17 @@ msgstr ""
 "El número de descriptores de archivos en el mensaje (%d) es distinto del "
 "campo de cabecera (%d)"
 
-#: ../gio/gdbusmessage.c:2664
+#: gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "No se puede serializar el mensaje: "
 
-#: ../gio/gdbusmessage.c:2708
+#: gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s� but there is no signature header"
 msgstr ""
 "El cuerpo del mensaje tiene la firma «%s» pero no existe la cabecera de firma"
 
-#: ../gio/gdbusmessage.c:2718
+#: gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s� but signature in the header field is "
@@ -949,42 +929,42 @@ msgstr ""
 "El cuerpo del mensaje tiene un tipo de firma «%s» pero la firma en el campo "
 "de cabecera es «%s»"
 
-#: ../gio/gdbusmessage.c:2734
+#: gio/gdbusmessage.c:2736
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)�"
 msgstr ""
 "El cuerpo del mensaje está vacío pero la firma en el campo de cabecera es "
 "«(%s)»"
 
-#: ../gio/gdbusmessage.c:3287
+#: gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s�"
 msgstr "Error al devolver el cuerpo de tipo «%s»"
 
-#: ../gio/gdbusmessage.c:3295
+#: gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Error al devolver un cuepro vacío"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "No se pudo obtener el perfil de hardware: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "No se puede cargar /var/lib/dbus/machine-id o /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1612
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Error al llamar StartSereviceByName para %s: "
 
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Respuesta %d no esperada del método StartServiceByName(«%s»)"
 
-#: ../gio/gdbusproxy.c:2726 ../gio/gdbusproxy.c:2860
+#: gio/gdbusproxy.c:2726 gio/gdbusproxy.c:2860
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -993,32 +973,32 @@ msgstr ""
 "conocido y el proxy se construyó con la opción "
 "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "No se soporta el espacio de nombres abstracto"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr ""
 "No se puede especificar el archivo de número usado una sola vez al crear un "
 "servidor"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s�: %s"
 msgstr "Error al escribir el archivo de número usado una sola vez en «%s»: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s� is not a valid D-Bus GUID"
 msgstr "La cadena «%s» no es un GUID válido de D-Bus"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s�"
 msgstr "No se puede escuchar en un transporte no soportado «%s»"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1041,54 +1021,54 @@ msgstr ""
 "\n"
 "Use «%s COMANDO --help» para obtener ayuda de cada comando.\n"
 
-#: ../gio/gdbus-tool.c:185 ../gio/gdbus-tool.c:252 ../gio/gdbus-tool.c:324
-#: ../gio/gdbus-tool.c:348 ../gio/gdbus-tool.c:834 ../gio/gdbus-tool.c:1171
-#: ../gio/gdbus-tool.c:1613
+#: gio/gdbus-tool.c:185 gio/gdbus-tool.c:252 gio/gdbus-tool.c:324
+#: gio/gdbus-tool.c:348 gio/gdbus-tool.c:834 gio/gdbus-tool.c:1171
+#: gio/gdbus-tool.c:1613
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: ../gio/gdbus-tool.c:196 ../gio/gdbus-tool.c:265 ../gio/gdbus-tool.c:1629
+#: gio/gdbus-tool.c:196 gio/gdbus-tool.c:265 gio/gdbus-tool.c:1629
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Error al analizar la introspección XML: %s\n"
 
-#: ../gio/gdbus-tool.c:234
+#: gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Error: %s no es un nombre válido\n"
 
-#: ../gio/gdbus-tool.c:382
+#: gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Conectar con el bus del sistema"
 
-#: ../gio/gdbus-tool.c:383
+#: gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Conectar con el bus de sesión"
 
-#: ../gio/gdbus-tool.c:384
+#: gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Conectar con la dirección de D-Bus proporcionada"
 
-#: ../gio/gdbus-tool.c:394
+#: gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Opciones de conexión del extremo:"
 
-#: ../gio/gdbus-tool.c:395
+#: gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Opciones para especificar la conexión del extremo:"
 
-#: ../gio/gdbus-tool.c:417
+#: gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "No se especificó ningún punto de conexión extremo"
 
-#: ../gio/gdbus-tool.c:427
+#: gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Se especificaron varios puntos de conexión extremos"
 
-#: ../gio/gdbus-tool.c:497
+#: gio/gdbus-tool.c:497
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s� does not exist\n"
@@ -1096,7 +1076,7 @@ msgstr ""
 "Advertencia: según la introspección de los datos, la interfaz «%s» no "
 "existe\n"
 
-#: ../gio/gdbus-tool.c:506
+#: gio/gdbus-tool.c:506
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s� does not exist on "
@@ -1105,167 +1085,162 @@ msgstr ""
 "Advertencia: según la introspección de los datos, el método «%s» no existe "
 "en la interfaz «%s»\n"
 
-#: ../gio/gdbus-tool.c:568
+#: gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Destino opcional para la señal (nombre único)"
 
-#: ../gio/gdbus-tool.c:569
+#: gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Ruta del objeto sobre el que emitir la señal"
 
-#: ../gio/gdbus-tool.c:570
+#: gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Nombres de la interfaz y señal"
 
-#: ../gio/gdbus-tool.c:603
+#: gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Emitir una señal."
 
-#: ../gio/gdbus-tool.c:658 ../gio/gdbus-tool.c:965 ../gio/gdbus-tool.c:1715
-#: ../gio/gdbus-tool.c:1944 ../gio/gdbus-tool.c:2164
+#: gio/gdbus-tool.c:658 gio/gdbus-tool.c:965 gio/gdbus-tool.c:1715
+#: gio/gdbus-tool.c:1944 gio/gdbus-tool.c:2164
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Error al conectar: %s\n"
 
-#: ../gio/gdbus-tool.c:678
+#: gio/gdbus-tool.c:678
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "Error: %s no es un nombre de bus único válido.\n"
 
-#: ../gio/gdbus-tool.c:697 ../gio/gdbus-tool.c:1008 ../gio/gdbus-tool.c:1758
-#, c-format
+#: gio/gdbus-tool.c:697 gio/gdbus-tool.c:1008 gio/gdbus-tool.c:1758
 msgid "Error: Object path is not specified\n"
 msgstr "Error: no se especificó la ruta del objeto\n"
 
-#: ../gio/gdbus-tool.c:720 ../gio/gdbus-tool.c:1028 ../gio/gdbus-tool.c:1778
-#: ../gio/gdbus-tool.c:2015
+#: gio/gdbus-tool.c:720 gio/gdbus-tool.c:1028 gio/gdbus-tool.c:1778
+#: gio/gdbus-tool.c:2015
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Error: %s no es una ruta de objeto válida\n"
 
-#: ../gio/gdbus-tool.c:740
-#, c-format
+#: gio/gdbus-tool.c:740
 msgid "Error: Signal name is not specified\n"
 msgstr "Error: no se especificó el nombre de la señal\n"
 
-#: ../gio/gdbus-tool.c:754
+#: gio/gdbus-tool.c:754
 #, c-format
 msgid "Error: Signal name “%s� is invalid\n"
 msgstr "Error: el nombre de la señal «%s» no es válido\n"
 
-#: ../gio/gdbus-tool.c:766
+#: gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Error: %s no es un nombre de interfaz válida\n"
 
-#: ../gio/gdbus-tool.c:772
+#: gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Error: %s no es un nombre de miembro válido\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:809 ../gio/gdbus-tool.c:1140
+#: gio/gdbus-tool.c:809 gio/gdbus-tool.c:1140
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Error al analizar el parámetro %d: %s\n"
 
-#: ../gio/gdbus-tool.c:841
+#: gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Error al limpiar la conexión: %s\n"
 
-#: ../gio/gdbus-tool.c:868
+#: gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Nombre del detino sobre el que invocar elmétodo"
 
-#: ../gio/gdbus-tool.c:869
+#: gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Ruta del objeto sobre la que invocar el método"
 
-#: ../gio/gdbus-tool.c:870
+#: gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Nombre de la interfaz y método"
 
-#: ../gio/gdbus-tool.c:871
+#: gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Tiempo de expiración en segundos"
 
-#: ../gio/gdbus-tool.c:910
+#: gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Invocar un método en un objeto remoto."
 
-#: ../gio/gdbus-tool.c:982 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1969
-#, c-format
+#: gio/gdbus-tool.c:982 gio/gdbus-tool.c:1732 gio/gdbus-tool.c:1969
 msgid "Error: Destination is not specified\n"
 msgstr "Error: el destino no está especificado\n"
 
-#: ../gio/gdbus-tool.c:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
+#: gio/gdbus-tool.c:993 gio/gdbus-tool.c:1749 gio/gdbus-tool.c:1980
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Error: %s no es un nombre de bus válido\n"
 
-#: ../gio/gdbus-tool.c:1043
-#, c-format
+#: gio/gdbus-tool.c:1043
 msgid "Error: Method name is not specified\n"
 msgstr "Error: no se especificó el nombre del método\n"
 
-#: ../gio/gdbus-tool.c:1054
+#: gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s� is invalid\n"
 msgstr "Error: el nombre del método «%s» no es válido\n"
 
-#: ../gio/gdbus-tool.c:1132
+#: gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s�: %s\n"
 msgstr "Error al analizar el parámetro %d del tipo «%s»: %s\n"
 
-#: ../gio/gdbus-tool.c:1576
+#: gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Nombre de destino que introspeccionar"
 
-#: ../gio/gdbus-tool.c:1577
+#: gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "Ruta del objeto que introspeccionar"
 
-#: ../gio/gdbus-tool.c:1578
+#: gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Imprimir XML"
 
-#: ../gio/gdbus-tool.c:1579
+#: gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "Introspeccionar hijo"
 
-#: ../gio/gdbus-tool.c:1580
+#: gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Solo mostrar propiedades"
 
-#: ../gio/gdbus-tool.c:1667
+#: gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Introspeccionar un objeto remoto."
 
-#: ../gio/gdbus-tool.c:1870
+#: gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Nombre de destino para monitorizar"
 
-#: ../gio/gdbus-tool.c:1871
+#: gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Ruta objeto para monitorizar"
 
-#: ../gio/gdbus-tool.c:1896
+#: gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Monitorizar un objeto remoto."
 
-#: ../gio/gdbus-tool.c:1954
-#, c-format
+#: gio/gdbus-tool.c:1954
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr ""
 "Error: no se puede monitorizar una conexión que no sea de mensajes del bus\n"
 
-#: ../gio/gdbus-tool.c:2078
+#: gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Servicio que activar antes de esperar a otro (nombre conocido)"
 
-#: ../gio/gdbus-tool.c:2081
+#: gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1273,137 +1248,132 @@ msgstr ""
 "Tiempo que esperar antes de salir con un error (en segundos); 0 para que no "
 "haya tiempo de expiración (predeterminado)"
 
-#: ../gio/gdbus-tool.c:2129
+#: gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPCIÓN…] NOMBRE-BUS"
 
-#: ../gio/gdbus-tool.c:2130
+#: gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Esperar a que aparezca el nombre del bus."
 
-#: ../gio/gdbus-tool.c:2206
-#, c-format
+#: gio/gdbus-tool.c:2206
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Error: se debe especificar un servicio que activar.\n"
 
-#: ../gio/gdbus-tool.c:2211
-#, c-format
+#: gio/gdbus-tool.c:2211
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Error: se debe especificar un servicio al que esperar.\n"
 
-#: ../gio/gdbus-tool.c:2216
-#, c-format
+#: gio/gdbus-tool.c:2216
 msgid "Error: Too many arguments.\n"
 msgstr "Demasiados argumentos.\n"
 
-#: ../gio/gdbus-tool.c:2224 ../gio/gdbus-tool.c:2231
+#: gio/gdbus-tool.c:2224 gio/gdbus-tool.c:2231
 #, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Error: %s no es un nombre de bus conocido válido\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: gio/gdesktopappinfo.c:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "El archivo de escritorio no especificó el campo Exec"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Imposible encontrar el terminal requerido por la aplicación"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "No se puede crear la carpeta de configuración de la aplicación %s del "
 "usuario: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "No se puede crear la carpeta de configuración MIME %s del usuario: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: gio/gdesktopappinfo.c:3446 gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "La información de la aplicación carece de un identificador"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "No se puede crear el archivo de escritorio %s del usuario"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Definición personalizada para %s"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "la unidad no implementa la expulsión"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gdrive.c:495
+#: gio/gdrive.c:495
 msgid "drive doesn’t implement eject or eject_with_operation"
 msgstr "la unidad no implementa la expulsión o expulsión con operación"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 msgid "drive doesn’t implement polling for media"
 msgstr "la unidad no implementa el sondeo para medios"
 
-#: ../gio/gdrive.c:776
+#: gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "la unidad no implementa reproducir"
 
-#: ../gio/gdrive.c:878
+#: gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "la unidad no implementa detener"
 
-#: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
-#: ../gio/gdummytlsbackend.c:509
+#: gio/gdummytlsbackend.c:195 gio/gdummytlsbackend.c:317
+#: gio/gdummytlsbackend.c:509
 msgid "TLS support is not available"
 msgstr "El soporte de TSL no está disponible"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "Soporte de DTSL no disponible"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "No se puede manejar la versión %d de la codificación GEmblem"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Número de tokens (%d) mal formados en la codificación GEmblem"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "No se puede manejar la versión %d de la codificación GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Número de tokens (%d) mal formados en la codificación GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Se esperaba un GEmblem para GEmblemedIconjo"
 
-#: ../gio/gfile.c:1071 ../gio/gfile.c:1309 ../gio/gfile.c:1447
-#: ../gio/gfile.c:1685 ../gio/gfile.c:1740 ../gio/gfile.c:1798
-#: ../gio/gfile.c:1882 ../gio/gfile.c:1939 ../gio/gfile.c:2003
-#: ../gio/gfile.c:2058 ../gio/gfile.c:3725 ../gio/gfile.c:3780
-#: ../gio/gfile.c:4016 ../gio/gfile.c:4058 ../gio/gfile.c:4526
-#: ../gio/gfile.c:4937 ../gio/gfile.c:5022 ../gio/gfile.c:5112
-#: ../gio/gfile.c:5209 ../gio/gfile.c:5296 ../gio/gfile.c:5397
-#: ../gio/gfile.c:7975 ../gio/gfile.c:8065 ../gio/gfile.c:8149
-#: ../gio/win32/gwinhttpfile.c:437
+#: gio/gfile.c:1076 gio/gfile.c:1314 gio/gfile.c:1452 gio/gfile.c:1690
+#: gio/gfile.c:1745 gio/gfile.c:1803 gio/gfile.c:1887 gio/gfile.c:1944
+#: gio/gfile.c:2008 gio/gfile.c:2063 gio/gfile.c:3738 gio/gfile.c:3793
+#: gio/gfile.c:4029 gio/gfile.c:4071 gio/gfile.c:4539 gio/gfile.c:4950
+#: gio/gfile.c:5035 gio/gfile.c:5125 gio/gfile.c:5222 gio/gfile.c:5309
+#: gio/gfile.c:5410 gio/gfile.c:7988 gio/gfile.c:8078 gio/gfile.c:8162
+#: gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Operación no soportada"
 
@@ -1411,206 +1381,206 @@ msgstr "Operación no soportada"
 #. * trying to find the enclosing (user visible)
 #. * mount of a file, but none exists.
 #.
-#: ../gio/gfile.c:1570
+#: gio/gfile.c:1575
 msgid "Containing mount does not exist"
 msgstr "El punto de montaje contenido no existe"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: gio/gfile.c:2622 gio/glocalfile.c:2391
 msgid "Can’t copy over directory"
 msgstr "No se puede copiar sobre la carpeta"
 
-#: ../gio/gfile.c:2677
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "No se puede copiar una carpeta sobre otra"
 
-#: ../gio/gfile.c:2685
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "El archivo destino ya existe"
 
-#: ../gio/gfile.c:2704
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "No se puede copiar la carpeta recursivamente"
 
-#: ../gio/gfile.c:2979
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "La unión no  está soportada"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Error al unir el archivo: %s"
 
-#: ../gio/gfile.c:3136
+#: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "Copiar (reflink/clone) entre puntos de montaje no está soportado"
 
-#: ../gio/gfile.c:3140
+#: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Copiar (reflink/clone) no está soportado o no es válido"
 
-#: ../gio/gfile.c:3145
+#: gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Copiar (reflink/clone) no está soportado o no ha funcionado"
 
-#: ../gio/gfile.c:3208
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "No se puede copiar el archivo especial"
 
-#: ../gio/gfile.c:4006
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "El valor del enlace simbólico dado no es válido"
 
-#: ../gio/gfile.c:4167
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "No se soporta mover a la papelera"
 
-#: ../gio/gfile.c:4279
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c�"
 msgstr "Los nombres de archivo no pueden contener «%c»"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "el volumen no implementa el montaje"
 
-#: ../gio/gfile.c:6869
+#: gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "No hay ninguna aplicación registrada para manejar este archivo"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "El enumerador está cerrado"
 
-#: ../gio/gfileenumerator.c:219 ../gio/gfileenumerator.c:278
-#: ../gio/gfileenumerator.c:377 ../gio/gfileenumerator.c:476
+#: gio/gfileenumerator.c:219 gio/gfileenumerator.c:278
+#: gio/gfileenumerator.c:377 gio/gfileenumerator.c:476
 msgid "File enumerator has outstanding operation"
 msgstr "El enumerador del archivo tiene una operación excepcional"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "El enumerador del archivo ya está cerrado"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "No se puede manejar la versión %d de la codificación GFileIcon"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Datos de entrada mal formados para GFileIcon"
 
-#: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394
-#: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164
-#: ../gio/gfileoutputstream.c:497
+#: gio/gfileinputstream.c:149 gio/gfileinputstream.c:394
+#: gio/gfileiostream.c:167 gio/gfileoutputstream.c:164
+#: gio/gfileoutputstream.c:497
 msgid "Stream doesn’t support query_info"
 msgstr "El flujo no soporta query_info"
 
-#: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
-#: ../gio/gfileoutputstream.c:371
+#: gio/gfileinputstream.c:325 gio/gfileiostream.c:379
+#: gio/gfileoutputstream.c:371
 msgid "Seek not supported on stream"
 msgstr "No se permite buscar en el flujo"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "No se permite truncar en el flujo de entrada"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "No se soporta el truncamiento en el flujo"
 
-#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
-#: ../glib/gconvert.c:1786
+#: gio/ghttpproxy.c:91 gio/gresolver.c:410 gio/gresolver.c:476
+#: glib/gconvert.c:1786
 msgid "Invalid hostname"
 msgstr "El nombre del host no es válido"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Respuesta del proxy HTTP incorrecta"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Conexión al proxy HTTP no permitida"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Falló la autenticación en el proxy HTTP"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Autenticación requerida en el proxy HTTP"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Falló la conexión al proxy HTTP: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "El servidor proxy HTTP cerró la conexión inesperadamente."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Número de tokens (%d) incorrecto"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "No existe el tipo para la clase de nombre %s"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "El tipo %s no implementa la interfaz GIcon"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
 msgstr "El tipo %s no tiene clase"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Número de versión mal formado: %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "El tipo %s no implementa from_tokens() en la interfaz GIcon"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr ""
 "No se puede manejar la versión proporcionada de la codificación de icono"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "No se especificó ninguna dirección"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "La longitud de %u es demasiado larga para una dirección"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "La dirección tiene bits más allá de la longitud del prefijo"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s� as IP address mask"
 msgstr "No se pudo analizar «%s» como una máscara de una dirección IP"
 
-#: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:218
+#: gio/ginetsocketaddress.c:203 gio/ginetsocketaddress.c:220
+#: gio/gnativesocketaddress.c:109 gio/gunixsocketaddress.c:220
 msgid "Not enough space for socket address"
 msgstr "No hay suficiente espacio para la dirección del socket"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Dirección del socket no soportada"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "El flujo de entrada no implementa la lectura"
 
@@ -1620,131 +1590,124 @@ msgstr "El flujo de entrada no implementa la lectura"
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: ../gio/ginputstream.c:1218 ../gio/giostream.c:310
-#: ../gio/goutputstream.c:1671
+#: gio/ginputstream.c:1218 gio/giostream.c:310 gio/goutputstream.c:1671
 msgid "Stream has outstanding operation"
 msgstr "El flujo tiene una operación excepcional"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Copiar con archivo"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Mantener con archivo cuando se mueva"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version� takes no arguments"
 msgstr "«version» no lleva ningún argumento"
 
-#: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:857
+#: gio/gio-tool.c:207 gio/gio-tool.c:223 glib/goption.c:857
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 msgid "Print version information and exit."
 msgstr "Mostrar informacio�n de la versio�n y salir."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGS...]"
-
-#: ../gio/gio-tool.c:226
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Comandos:"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Concatenar archivos en la salida estándar"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Copiar uno o más archivos"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Mostrar información sobre las ubicaciones"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Listar el contenido de las ubicaciones"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
-msgstr "Obtener o establecer el manejador para un tipo MIME"
+msgstr "Obtener o establecer el gestor para un tipo MIME"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Crear carpetas"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Monitorizar cambios en archivos y claves"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Montar o desmontar las ubicaciones"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Mover uno o más archivos"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Abrir archivos con la aplicación predeterminada"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Renombrar un archivo"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Eliminar uno o más archivos"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Leer de la entrada estándar y guardar"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Establecer el atributo de un archivo"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Mover archivos o carpetas a la papelera"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Listar el contenido de las ubicaciones en un árbol"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr ""
 "Use %s para obtener ayuda detallada.\n"
 "\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Error al escribir en la salida estándar"
 
 #. Translators: commandline placeholder
-#: ../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
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
-#: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
-#: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
-#: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
+#: 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
+#: gio/gio-tool-monitor.c:203 gio/gio-tool-mount.c:1235 gio/gio-tool-open.c:113
+#: gio/gio-tool-remove.c:48 gio/gio-tool-rename.c:45 gio/gio-tool-set.c:89
+#: gio/gio-tool-trash.c:81 gio/gio-tool-tree.c:239
 msgid "LOCATION"
 msgstr "UBICACIÓN"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Concatenar archivos e imprimir por la salida estándar."
 
-#: ../gio/gio-tool-cat.c:140
+#: 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"
@@ -1754,58 +1717,56 @@ msgstr ""
 "ubicaciones GIO en lugar de archivos locales: por ejemplo, puede\n"
 "usar algo como smb://servidor/recurso/archivo.txt como ubicación."
 
-#: ../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:139 ../gio/gio-tool-remove.c:72
+#: 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-mount.c:1285 gio/gio-tool-open.c:139
+#: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "No se han proporcionado ubicaciones"
 
-#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38
+#: gio/gio-tool-copy.c:42 gio/gio-tool-move.c:38
 msgid "No target directory"
 msgstr "No hay carpeta de destino"
 
-#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39
+#: gio/gio-tool-copy.c:43 gio/gio-tool-move.c:39
 msgid "Show progress"
 msgstr "Mostrar progreso"
 
-#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40
+#: gio/gio-tool-copy.c:44 gio/gio-tool-move.c:40
 msgid "Prompt before overwrite"
 msgstr "Preguntar antes de sobrescribir"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Conservar todos los atributos"
 
-#: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
-#: ../gio/gio-tool-save.c:49
+#: gio/gio-tool-copy.c:46 gio/gio-tool-move.c:41 gio/gio-tool-save.c:49
 msgid "Backup existing destination files"
 msgstr "Respaldar los archivos de destino existentes"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "No seguir nunca enlaces simbólicos"
 
-#: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67
+#: gio/gio-tool-copy.c:72 gio/gio-tool-move.c:67
 #, c-format
 msgid "Transferred %s out of %s (%s/s)"
 msgstr "Transferido %s de %s (%s/s)"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
+#: gio/gio-tool-copy.c:98 gio/gio-tool-move.c:94
 msgid "SOURCE"
 msgstr "ORIGEN"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
-#: ../gio/gio-tool-save.c:160
+#: gio/gio-tool-copy.c:98 gio/gio-tool-move.c:94 gio/gio-tool-save.c:160
 msgid "DESTINATION"
 msgstr "DESTINO"
 
-#: ../gio/gio-tool-copy.c:103
+#: gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
 msgstr "Copiar uno o más archivos desde el ORIGEN al DESTINO."
 
-#: ../gio/gio-tool-copy.c:105
+#: gio/gio-tool-copy.c:105
 msgid ""
 "gio copy is similar to the traditional cp utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -1815,94 +1776,88 @@ msgstr ""
 "ubicaciones GIO en lugar de archivos locales: por ejemplo, puede\n"
 "usar algo como smb://servidor/recurso/archivo.txt como ubicación."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "El destino %s no es una carpeta"
 
-#: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185
+#: gio/gio-tool-copy.c:192 gio/gio-tool-move.c:186
 #, c-format
 msgid "%s: overwrite “%s�? "
 msgstr "%s: ¿sobrescribir «%s» ? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Listar los atributos que se pueden escribir"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Obtener información del sistema de archivos"
 
-#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+#: gio/gio-tool-info.c:36 gio/gio-tool-list.c:35
 msgid "The attributes to get"
 msgstr "Los atributos que obtener"
 
-#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+#: gio/gio-tool-info.c:36 gio/gio-tool-list.c:35
 msgid "ATTRIBUTES"
 msgstr "ATRIBUTOS"
 
-#: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38
-#: ../gio/gio-tool-set.c:34
+#: gio/gio-tool-info.c:37 gio/gio-tool-list.c:38 gio/gio-tool-set.c:34
 msgid "Don’t follow symbolic links"
 msgstr "No seguir enlaces simbólicos"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "atributos:\n"
 
 #. Translators: This is a noun and represents and attribute of a file
-#: ../gio/gio-tool-info.c:127
+#: gio/gio-tool-info.c:127
 #, c-format
 msgid "display name: %s\n"
 msgstr "nombre que mostrar: %s\n"
 
 #. Translators: This is a noun and represents and attribute of a file
-#: ../gio/gio-tool-info.c:132
+#: gio/gio-tool-info.c:132
 #, c-format
 msgid "edit name: %s\n"
 msgstr "nombre editado: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "nombre: %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "tipo: %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
 msgstr "tamaño: "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "oculto\n"
 
-#: ../gio/gio-tool-info.c:159
+#: gio/gio-tool-info.c:159
 #, c-format
 msgid "uri: %s\n"
 msgstr "URI: %s\n"
 
-#: ../gio/gio-tool-info.c:228
-#, c-format
+#: gio/gio-tool-info.c:228
 msgid "Settable attributes:\n"
 msgstr "Atributos que se pueden establecer:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Espacios de nombres de atributos que se pueden escribir:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Mostrar información sobre las ubicaciones."
 
-#: ../gio/gio-tool-info.c:289
+#: gio/gio-tool-info.c:289
 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"
@@ -1917,23 +1872,23 @@ msgstr ""
 "o simplemente por su espacio de nombres, ej. unix o con «*», que obtiene "
 "todos los atributos"
 
-#: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
+#: gio/gio-tool-list.c:36 gio/gio-tool-tree.c:32
 msgid "Show hidden files"
 msgstr "Mostrar archivos ocultos"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Usar un formato de listado largo"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Imprimir URI completos"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Listar el contenido de las ubicaciones."
 
-#: ../gio/gio-tool-list.c:172
+#: gio/gio-tool-list.c:172
 msgid ""
 "gio list is similar to the traditional ls utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -1947,84 +1902,78 @@ msgstr ""
 "icon"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "TIPOMIME"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
-msgstr "MANEJADOR"
+msgstr "GESTOR"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
-msgstr "Obtener o establecer el manejador para un tipo MIME."
+msgstr "Obtener o establecer el gestor para un tipo MIME."
 
-#: ../gio/gio-tool-mime.c:78
+#: gio/gio-tool-mime.c:78
 msgid ""
 "If no handler is given, lists registered and recommended applications\n"
 "for the mimetype. If a handler is given, it is set as the default\n"
 "handler for the mimetype."
 msgstr ""
-"Si no se indica un manejador, lista las aplicaciones registradas y "
+"Si no se indica un gestor, lista las aplicaciones registradas y "
 "recomendadas\n"
-"para el tipo MIME. Si se indica un manejador, se establece como el "
-"manejador\n"
+"para el tipo MIME. Si se indica un gestor, se establece como el gestor\n"
 "predeterminado para el tipo MIME."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
-msgstr "Debe especificar un único tipo MIME, y tal vez un manejador"
+msgstr "Debe especificar un único tipo MIME, y tal vez un gestor"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s�\n"
 msgstr "No hay aplicación predeterminada para «%s»\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s�: %s\n"
 msgstr "Aplicación predeterminada para «%s»: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Aplicaciones registradas:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "No hay aplicaciones registradas\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Aplicaciones recomendadas:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "No hay aplicaciones recomendadas\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s�"
-msgstr "Falló al cargar la información para el manejador «%s»"
+msgstr "Falló al cargar la información para el gestor «%s»"
 
-#: ../gio/gio-tool-mime.c:168
+#: gio/gio-tool-mime.c:168
 #, c-format
 msgid "Failed to set “%s� as the default handler for “%s�: %s\n"
-msgstr ""
-"Falló al establecer el manejador «%s» como predeterminado para «%s»: %s\n"
+msgstr "Falló al establecer el gestor «%s» como predeterminado para «%s»: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Crear carpetas padre"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Crear carpetas."
 
-#: ../gio/gio-tool-mkdir.c:54
+#: gio/gio-tool-mkdir.c:54
 msgid ""
 "gio mkdir is similar to the traditional mkdir utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -2034,113 +1983,137 @@ msgstr ""
 "ubicaciones GIO en lugar de archivos locales: por ejemplo, puede\n"
 "usar algo como smb://servidor/recurso/archivo.txt como ubicación."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Monitorizar una carpeta (predeterminado: depende del tipo)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Monitorizar un archivo (predeterminado: depende del tipo)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 "Monitorizar un archivo directamente (se notifican los cambios mediante "
 "enlaces duros)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Monitoriza un archivo directamente, pero no informa de los cambios"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "Informar de movimientos y renombrados como simples eventos de eliminación/"
 "creación"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Vigilar eventos de montaje"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
 msgstr "Monitorizar cambios en archivos o carpetas."
 
-#: ../gio/gio-tool-mount.c:58
+#: gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr "Montar como montable"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
 msgstr "Montar volumen con archivo de dispositivo"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63 gio/gio-tool-mount.c:66
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:64
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "Expulsar"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:66
+msgid "Stop drive with device file"
+msgstr "Detener unidad con archivo de dispositivo"
+
+#: gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
 msgstr "Desmontar todos los puntos de montaje con el esquema dado"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
 msgid "SCHEME"
 msgstr "ESQUEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:68
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr "Ignorar operaciones de archivos pendientes al desmontar o expulsar"
 
-#: ../gio/gio-tool-mount.c:64
+#: gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
 msgstr "Usar un usuario anónimo al autenticar"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: gio/gio-tool-mount.c:71
 msgid "List"
 msgstr "Listar"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr "Monitorizar eventos"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr "Mostrar información adicional"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: gio/gio-tool-mount.c:74
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "El PIM numérico al desbloquear un volumen VeraCrypt"
+
+#: gio/gio-tool-mount.c:74
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:75
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Montar un volumen TCRYPT oculto"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr "Montar un volumen de sistema TCRYPT"
+
+#: gio/gio-tool-mount.c:264 gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
 msgstr "Acceso anónimo denegado"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:524
+msgid "No drive for device file"
+msgstr "No hay unidad para el archivo de dispositivo"
+
+#: gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s montado en %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
 msgstr "No hay volumen para el archivo de dispositivo"
 
-#: ../gio/gio-tool-mount.c:1145
+#: gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
 msgstr "Montar o desmontar las ubicaciones."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "No usar copia y eliminación de reserva"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Mover uno o más archivos de ORIGEN a DESTINO."
 
-#: ../gio/gio-tool-move.c:101
+#: gio/gio-tool-move.c:101
 msgid ""
 "gio move is similar to the traditional mv utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -2150,12 +2123,12 @@ msgstr ""
 "ubicaciones GIO en lugar de archivos locales: por ejemplo, puede\n"
 "usar algo como smb://servidor/recurso/archivo.txt como ubicación"
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "El destino %s no es una carpeta"
 
-#: ../gio/gio-tool-open.c:118
+#: gio/gio-tool-open.c:118
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
@@ -2163,163 +2136,161 @@ msgstr ""
 "Abrir archivos con la aplicación predeterminada que\n"
 "esté registrada para manejar archivos de este tipo."
 
-#: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
+#: gio/gio-tool-remove.c:31 gio/gio-tool-trash.c:31
 msgid "Ignore nonexistent files, never prompt"
 msgstr "Ignorar archivos no existentes, nunca preguntar"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Eliminar los archivos dados."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "NOMBRE"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Renombrar un archivo."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Falta el argumento"
 
-#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:190
-#: ../gio/gio-tool-set.c:137
+#: gio/gio-tool-rename.c:76 gio/gio-tool-save.c:190 gio/gio-tool-set.c:137
 msgid "Too many arguments"
 msgstr "Demasiados argumentos"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Renombrado correcto. Nuevo URI: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Crear sólo si no existe"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "Añadir al final de un archivo"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Al crear, restringir el acceso al usuario actual"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr "Al reemplazar, hacerlo como si el destino no existiera"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:55
+#: gio/gio-tool-save.c:55
 msgid "Print new etag at end"
 msgstr "Imprimir nueva etag al final"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:57
+#: gio/gio-tool-save.c:57
 msgid "The etag of the file being overwritten"
 msgstr "La etag del archivo que se está sobrescribiendo"
 
-#: ../gio/gio-tool-save.c:57
+#: gio/gio-tool-save.c:57
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../gio/gio-tool-save.c:113
+#: gio/gio-tool-save.c:113
 msgid "Error reading from standard input"
 msgstr "Error al leer de la entrada estándar"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:139
-#, c-format
+#: gio/gio-tool-save.c:139
 msgid "Etag not available\n"
 msgstr "Etag no disponible\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Leer de la entrada estándar y guardar en DESTINO."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "No se ha indicado el destino"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Tipo del atributo"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "TYPE"
 msgstr "TIPO"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
 msgstr "ATRIBUTO"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "VALOR"
 
-#: ../gio/gio-tool-set.c:93
+#: gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr "Establecer el atributo UBICACIÓN de un archivo."
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Ubicación no encontrada"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Atributo no especificado"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Valor no especificado"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s�"
 msgstr "Tipo de atributo «%s» no válido"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Vaciar la papelera"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Mover archivos o carpetas a la papelera."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Seguir enlaces simbólicos, puntos de montaje y atajos"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
 msgstr "Listar el contenido de las carpetas en forma de árbol."
 
-#: ../gio/glib-compile-resources.c:143 ../gio/glib-compile-schemas.c:1501
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1515
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "No se permite el elemento <%s> dentro de <%s>"
 
-#: ../gio/glib-compile-resources.c:147
+#: gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "No se permite el elemento <%s> en el nivel superior"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "El archivo %s aparece varias veces en el recurso"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s� in any source directory"
 msgstr "Falló al buscar «%s» en cualquier carpeta fuente"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s� in current directory"
 msgstr "Falló al buscar «%s» en la carpeta actual"
 
-#: ../gio/glib-compile-resources.c:293
+#: gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s�"
 msgstr "Opción de procesado desconocida «%s»"
@@ -2328,92 +2299,92 @@ msgstr "Opción de procesado desconocida «%s»"
 #. * the second %s is an environment variable, and the third
 #. * %s is a command line tool
 #.
-#: ../gio/glib-compile-resources.c:313 ../gio/glib-compile-resources.c:370
-#: ../gio/glib-compile-resources.c:427
+#: gio/glib-compile-resources.c:313 gio/glib-compile-resources.c:370
+#: gio/glib-compile-resources.c:427
 #, c-format
 msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
 msgstr ""
 "solicitado preprocesar %s, pero %s no está establecido y %s no está en el "
 "PATH"
 
-#: ../gio/glib-compile-resources.c:460
+#: gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Error al leer el archivo %s: %s"
 
-#: ../gio/glib-compile-resources.c:480
+#: gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Error al comprimir el archivo %s"
 
-#: ../gio/glib-compile-resources.c:541
+#: gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "El texto no debe aparecer dentro de <%s>"
 
-#: ../gio/glib-compile-resources.c:736 ../gio/glib-compile-schemas.c:2067
+#: gio/glib-compile-resources.c:736 gio/glib-compile-schemas.c:2138
 msgid "Show program version and exit"
 msgstr "Mostrar la versión del programa y salir"
 
-#: ../gio/glib-compile-resources.c:737
-msgid "name of the output file"
-msgstr "nombre del archivo de salida"
+#: gio/glib-compile-resources.c:737
+msgid "Name of the output file"
+msgstr "Nombre del archivo de salida"
 
-#: ../gio/glib-compile-resources.c:738
+#: gio/glib-compile-resources.c:738
 msgid ""
-"The directories where files are to be read from (default to current "
+"The directories to load files referenced in FILE from (default: current "
 "directory)"
 msgstr ""
-"La carpeta de la que se tienen que leer los archivos (la predeterminada es "
-"la carpeta actual)"
+"La carpeta de la que se tienen que leer los archivos indicados en ARCHIVO "
+"(la predeterminada es la carpeta actual)"
 
-#: ../gio/glib-compile-resources.c:738 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: gio/glib-compile-resources.c:738 gio/glib-compile-schemas.c:2139
+#: gio/glib-compile-schemas.c:2168
 msgid "DIRECTORY"
 msgstr "CARPETA"
 
-#: ../gio/glib-compile-resources.c:739
+#: gio/glib-compile-resources.c:739
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr ""
 "Generar salida en el formato seleccionado por la extensión del nombre del "
 "archivo objetivo"
 
-#: ../gio/glib-compile-resources.c:740
+#: gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Generar cabecera fuente"
 
-#: ../gio/glib-compile-resources.c:741
-msgid "Generate sourcecode used to link in the resource file into your code"
+#: gio/glib-compile-resources.c:741
+msgid "Generate source code used to link in the resource file into your code"
 msgstr ""
 "Generar el código fuente usado para enlazar el archivo del recurso en su "
 "código fuente"
 
-#: ../gio/glib-compile-resources.c:742
+#: gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Generar lista de dependencias"
 
-#: ../gio/glib-compile-resources.c:743
-msgid "name of the dependency file to generate"
-msgstr "nombre del archivo de dependencias que generar"
+#: gio/glib-compile-resources.c:743
+msgid "Name of the dependency file to generate"
+msgstr "Nombre del archivo de dependencias que generar"
 
-#: ../gio/glib-compile-resources.c:744
+#: gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Incluir objetivos falsos en el archivo de dependencias generado"
 
-#: ../gio/glib-compile-resources.c:745
+#: gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "No crear y registrar automáticamente un recurso"
 
-#: ../gio/glib-compile-resources.c:746
+#: gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "No exportar funciones; declararlas como G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:747
+#: gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
 msgstr "Nombre del identificador C usado para el código fuente generado"
 
-#: ../gio/glib-compile-resources.c:773
+#: gio/glib-compile-resources.c:773
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2424,125 +2395,124 @@ msgstr ""
 "gresource.xml,\n"
 "y el archivo del recurso debe tener la extensión se llama .gresource."
 
-#: ../gio/glib-compile-resources.c:795
-#, c-format
+#: gio/glib-compile-resources.c:795
 msgid "You should give exactly one file name\n"
 msgstr "Deberá proporcionar exactamente un nombre de archivo\n"
 
-#: ../gio/glib-compile-schemas.c:95
+#: gio/glib-compile-schemas.c:95
 #, c-format
 msgid "nick must be a minimum of 2 characters"
 msgstr "«nick» debe tener al menos dos caracteres"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Valor numérico no válido"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'/> ya especificado"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "value='%s' ya especificado"
 
-#: ../gio/glib-compile-schemas.c:136
+#: gio/glib-compile-schemas.c:136
 #, c-format
 msgid "flags values must have at most 1 bit set"
 msgstr "los valores de las opciones deben tener al menos 1 bit establecido"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s> debe contener al menos un <value>"
 
-#: ../gio/glib-compile-schemas.c:315
+#: gio/glib-compile-schemas.c:317
 #, c-format
 msgid "<%s> is not contained in the specified range"
 msgstr "<%s> no está dentro del rango especificado"
 
-#: ../gio/glib-compile-schemas.c:327
+#: gio/glib-compile-schemas.c:329
 #, c-format
 msgid "<%s> is not a valid member of the specified enumerated type"
 msgstr "<%s> no es un miembro válido del tipo enumerado especificado"
 
-#: ../gio/glib-compile-schemas.c:333
+#: gio/glib-compile-schemas.c:335
 #, c-format
 msgid "<%s> contains string not in the specified flags type"
 msgstr ""
 "<%s> contiene una cadena que no está especificada en los tipos de opciones"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s> contiene una cadena que no está en <choices>"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> ya especificada para esta clave"
 
-#: ../gio/glib-compile-schemas.c:391
+#: gio/glib-compile-schemas.c:393
 #, c-format
 msgid "<range> not allowed for keys of type “%s�"
 msgstr "<range> no permitido para las claves de tipo «%s»"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "<range> mínimo especificado es mayor que el máximo"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "categoría l10n no soportada: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n solicitado, pero no se ha dado el dominio de gettext"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "contexto de traducción especificado sin tener l10n activado"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s�: "
 msgstr "Falló al analizar el valor <default> del tipo «%s»: "
 
-#: ../gio/glib-compile-schemas.c:492
+#: gio/glib-compile-schemas.c:494
 msgid ""
 "<choices> cannot be specified for keys tagged as having an enumerated type"
 msgstr ""
 "<choices> no se puede especificar para tipos etiquetados como que tienen un "
 "tipo enumerado"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> ya especificado para esta clave"
 
-#: ../gio/glib-compile-schemas.c:513
+#: gio/glib-compile-schemas.c:515
 #, c-format
 msgid "<choices> not allowed for keys of type “%s�"
 msgstr "<choices> no permitido para las claves de tipo «%s»"
 
-#: ../gio/glib-compile-schemas.c:529
+#: gio/glib-compile-schemas.c:531
 #, c-format
 msgid "<choice value='%s'/> already given"
 msgstr "<choice value='%s'/> ya especificado"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices> debe contener al menos un <choice>"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> ya especificado por esta clave"
 
-#: ../gio/glib-compile-schemas.c:562
+#: gio/glib-compile-schemas.c:564
 msgid ""
 "<aliases> can only be specified for keys with enumerated or flags types or "
 "after <choices>"
@@ -2550,7 +2520,7 @@ msgstr ""
 "<aliases> sólo se puede especificar para claves con tipos enumerados, de "
 "opciones o después de <choices>"
 
-#: ../gio/glib-compile-schemas.c:581
+#: gio/glib-compile-schemas.c:583
 #, c-format
 msgid ""
 "<alias value='%s'/> given when “%s� is already a member of the enumerated "
@@ -2558,42 +2528,42 @@ msgid ""
 msgstr ""
 "<alias value='%s'/> dado cuando «%s» ya es un miembro del tipo enumerado"
 
-#: ../gio/glib-compile-schemas.c:587
+#: gio/glib-compile-schemas.c:589
 #, c-format
 msgid "<alias value='%s'/> given when <choice value='%s'/> was already given"
 msgstr "<alias value='%s'/> dado cuando ya se había dado <choice value='%s'/>"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'/> ya especificado"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s� is not in enumerated type"
 msgstr "el alias del objetivo «%s» no está en el tipo enumerado"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s� is not in <choices>"
 msgstr "el alias del objetivo «%s» no está en <choices>"
 
-#: ../gio/glib-compile-schemas.c:621
+#: gio/glib-compile-schemas.c:623
 #, c-format
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> debe contener al menos un <alias>"
 
-#: ../gio/glib-compile-schemas.c:786
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "No se permiten nombres vacíos"
 
-#: ../gio/glib-compile-schemas.c:796
+#: gio/glib-compile-schemas.c:808
 #, c-format
 msgid "Invalid name “%s�: names must begin with a lowercase letter"
 msgstr ""
 "Nombre «%s» no válido: los nombres deben comenzar por una letra minúscula"
 
-#: ../gio/glib-compile-schemas.c:808
+#: gio/glib-compile-schemas.c:820
 #, c-format
 msgid ""
 "Invalid name “%s�: invalid character “%c�; only lowercase letters, numbers "
@@ -2602,36 +2572,36 @@ msgstr ""
 "Nombre «%s» no válido: el carácter «%c» no es válido; sólo se permiten "
 "nombres en minúscula, números y guión («-»)"
 
-#: ../gio/glib-compile-schemas.c:817
+#: gio/glib-compile-schemas.c:829
 #, c-format
 msgid "Invalid name “%s�: two successive hyphens (“--�) are not permitted"
 msgstr "Nombre «%s» no válido: no se permiten dos guiones seguidos («--»)"
 
-#: ../gio/glib-compile-schemas.c:826
+#: gio/glib-compile-schemas.c:838
 #, c-format
 msgid "Invalid name “%s�: the last character may not be a hyphen (“-�)"
 msgstr "Nombre «%s» no válido: el último carácter no puede ser un guión («-»)"
 
-#: ../gio/glib-compile-schemas.c:834
+#: gio/glib-compile-schemas.c:846
 #, c-format
 msgid "Invalid name “%s�: maximum length is 1024"
 msgstr "Nombre «%s» no válido: la longitud máxima es 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> ya especificado"
 
-#: ../gio/glib-compile-schemas.c:930
+#: gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of� schema"
 msgstr "no se pueden añadir claves a un esquema «list-of»"
 
-#: ../gio/glib-compile-schemas.c:941
+#: gio/glib-compile-schemas.c:955
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> ya especificada"
 
-#: ../gio/glib-compile-schemas.c:959
+#: gio/glib-compile-schemas.c:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2640,7 +2610,7 @@ msgstr ""
 "<key name='%s'> eclipsa a <key name='%s'> en <schema id='%s'>; use "
 "<override> para modificar el valor"
 
-#: ../gio/glib-compile-schemas.c:970
+#: gio/glib-compile-schemas.c:984
 #, c-format
 msgid ""
 "Exactly one of “type�, “enum� or “flags� must be specified as an attribute "
@@ -2649,56 +2619,56 @@ msgstr ""
 "Se debe especificar exactamente uno de «type», «enum» o «flags» como "
 "atributo para <key>"
 
-#: ../gio/glib-compile-schemas.c:989
+#: gio/glib-compile-schemas.c:1003
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> aún no especificado."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1018
 #, c-format
 msgid "Invalid GVariant type string “%s�"
 msgstr "Tipo de cadena GVariant «%s» no válida"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
 msgstr "Se proporcionó <override> pero el esquema no extiende nada"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: gio/glib-compile-schemas.c:1061
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "No existe <key name='%s'> para sobrescribir"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> ya especificada"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> ya especificado"
 
-#: ../gio/glib-compile-schemas.c:1140
+#: gio/glib-compile-schemas.c:1154
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s�"
 msgstr "<schema id='%s'> extiende el esquema «%s» que aún no existe"
 
-#: ../gio/glib-compile-schemas.c:1156
+#: gio/glib-compile-schemas.c:1170
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s�"
 msgstr "<schema id='%s'> es una lista del esquema «%s» que aún no existe"
 
-#: ../gio/glib-compile-schemas.c:1164
+#: gio/glib-compile-schemas.c:1178
 #, c-format
 msgid "Cannot be a list of a schema with a path"
 msgstr "No puede ser una lista de un esquema con una ruta"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: gio/glib-compile-schemas.c:1188
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "No se puede extender un esquema con una ruta"
 
-#: ../gio/glib-compile-schemas.c:1184
+#: gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2706,7 +2676,7 @@ msgstr ""
 "<schema id='%s'> es una lista, extendiendo <schema id='%s'> que no es una "
 "lista"
 
-#: ../gio/glib-compile-schemas.c:1194
+#: gio/glib-compile-schemas.c:1208
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s� "
@@ -2715,17 +2685,17 @@ msgstr ""
 "<schema id='%s' list-of='%s'> extiende <schema id='%s' list-of='%s'> pero "
 "«%s» no extiende «%s»"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: gio/glib-compile-schemas.c:1225
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr "Si se especifica una ruta, debe comenzar y terminar con una barra"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: gio/glib-compile-schemas.c:1232
 #, c-format
 msgid "The path of a list must end with “:/�"
 msgstr "La ruta de la lista debe terminar con «:/»"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s� has path “%s�.  Paths starting with “/apps/�, “/"
@@ -2734,119 +2704,128 @@ msgstr ""
 "Advertencia: el esquema «%s» tiene la ruta «%s».  Las rutas que empiezan por "
 "«/apps/», «/desktop/» o «/system/» están obsoletas."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> ya especificado"
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
+#: gio/glib-compile-schemas.c:1421 gio/glib-compile-schemas.c:1437
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
 msgstr "Sólo se permite un elemento <%s> dentro de <%s>"
 
-#: ../gio/glib-compile-schemas.c:1505
+#: gio/glib-compile-schemas.c:1519
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr "No se permite el elemento <%s> en el nivel superior"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
 msgstr "Se requiere el elemento <default> en <key>"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: gio/glib-compile-schemas.c:1627
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "El texto no debe aparecer dentro de <%s>"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: gio/glib-compile-schemas.c:1695
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Advertencia: referencia a <schema id='%s'/> no definida"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: gio/glib-compile-schemas.c:1834 gio/glib-compile-schemas.c:1910
+#: gio/glib-compile-schemas.c:2025
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "se especifico� --strict; saliendo.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Se ha ignorado este archivo completamente.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ignorando este archivo.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: gio/glib-compile-schemas.c:1959
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+msgid "No such key “%s� in schema “%s� as specified in override file “%s�"
 msgstr ""
 "No existe la clave «%s» en el esquema «%s» como se especificó en el archivo "
 "de sobrescritura «%s»"
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: gio/glib-compile-schemas.c:1965 gio/glib-compile-schemas.c:1990
+#: gio/glib-compile-schemas.c:2050 gio/glib-compile-schemas.c:2079
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; ignorando la sobrescritura para esta clave.\n"
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: gio/glib-compile-schemas.c:1969 gio/glib-compile-schemas.c:1994
+#: gio/glib-compile-schemas.c:2054 gio/glib-compile-schemas.c:2083
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr "y se especifico� --strict; saliendo.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+#: gio/glib-compile-schemas.c:1984
 #, c-format
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
+"cannot provide per-desktop overrides for localised key “%s� in schema "
+"“%s� (override file “%s�)"
+msgstr ""
+"no se pueden proporcionar las alternativas para la clave «%s» traducida en "
+"el esquema «%s» (sobrescribe el archivo %s)"
+
+#: gio/glib-compile-schemas.c:2011
+#, c-format
+msgid ""
+"error parsing key “%s� in schema “%s� as specified in override file “%s�: %s."
 msgstr ""
 "error al analizar la clave «%s» en el esquema «%s» como se especifico� en el "
 "archivo de sobrescritura «%s»: %s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: gio/glib-compile-schemas.c:2021
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Ignorando la sobrescritura para esta clave.\n"
 
-#: ../gio/glib-compile-schemas.c:1984
+#: gio/glib-compile-schemas.c:2040
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is outside the "
+"override for key “%s� in schema “%s� in override file “%s� is outside the "
 "range given in the schema"
 msgstr ""
 "la clave de sobrescritura «%s» en el esquema «%s» en el archivo de "
 "sobrescritura «%s» está fuera del rango proporcionado en el esquema"
 
-#: ../gio/glib-compile-schemas.c:2012
+#: gio/glib-compile-schemas.c:2069
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is not in the "
+"override for key “%s� in schema “%s� in override file “%s� is not in the "
 "list of valid choices"
 msgstr ""
 "la clave de sobrescritura «%s» en el esquema «%s» en el archivo de "
 "sobrescritura «%s» no está en la lista de opciones válidas"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr "dónde almacenar el archivo gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr "Abortar ante cualquier error en los esquemas"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr "No escribir el archivo gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr "No forzar las restricciones de nombre de las claves"
 
-#: ../gio/glib-compile-schemas.c:2099
+#: gio/glib-compile-schemas.c:2171
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2857,32 +2836,32 @@ msgstr ""
 "Los archivos de esquema deben tener la extensión .gschema.xml,\n"
 "y el archivo de caché se llama gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: gio/glib-compile-schemas.c:2192
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Deberá proporcionar exactamente un nombre de carpeta\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "No se encontró ningún archivo de esquemas: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "sin hacer nada.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "se quitó el archivo de salida existente.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: gio/glocalfile.c:544 gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Nombre de archivo no válido %s"
 
-#: ../gio/glocalfile.c:1105
+#: gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Error al obtener la información del sistema de archivos para %s: %s"
@@ -2891,317 +2870,322 @@ msgstr "Error al obtener la información del sistema de archivos para %s: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "No se ha encontrado el punto de montaje para el archivo %s"
 
-#: ../gio/glocalfile.c:1267
+#: gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "No se puede renombrar la carpeta raíz"
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: gio/glocalfile.c:1186 gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Error al leer el archivo %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "No se puede renombrar el archivo, el nombre de archivo ya existe"
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: gio/glocalfile.c:1206 gio/glocalfile.c:2267 gio/glocalfile.c:2295
+#: gio/glocalfile.c:2452 gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Nombre de archivo no válido"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: gio/glocalfile.c:1374 gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Error al abrir el archivo %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Error al eliminar el archivo %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: gio/glocalfile.c:1925
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Error al mover a la papelera el archivo %s: %s"
 
-#: ../gio/glocalfile.c:2020
+#: gio/glocalfile.c:1948
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "No se pudo crear la carpeta de papelera %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: gio/glocalfile.c:1970
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "No se pudo encontrar la carpeta de nivel superior para la papelera %s"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: gio/glocalfile.c:1979
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr "Copiar (reflink/clone) entre puntos de montaje no está soportado"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "No se pudo encontrar o crear la carpeta de la papelera para %s"
 
-#: ../gio/glocalfile.c:2174
+#: gio/glocalfile.c:2118
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "No se pudo crear la información de papelera para el archivo %s: %s"
 
-#: ../gio/glocalfile.c:2233
+#: gio/glocalfile.c:2178
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 "No se pudo enviar a la papelera el archivo %s entre sistemas de archivos"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: gio/glocalfile.c:2182 gio/glocalfile.c:2238
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "No se pudo enviar a la papelera el archivo %s: %s"
 
-#: ../gio/glocalfile.c:2299
+#: gio/glocalfile.c:2244
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "No se pudo enviar a la papelera el archivo %s"
 
-#: ../gio/glocalfile.c:2325
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Error al crear la carpeta %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "El sistema de archivos no soporta enlaces simbólicos"
 
-#: ../gio/glocalfile.c:2357
+#: gio/glocalfile.c:2302
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Error al crear el enlace simbólico %s: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: gio/glocalfile.c:2308 glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "Enlaces simbólicos no soportados"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: gio/glocalfile.c:2363 gio/glocalfile.c:2398 gio/glocalfile.c:2455
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Error al mover el archivo %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "No se puede mover una carpeta sobre una carpeta"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
-#: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
-#: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
+#: gio/glocalfile.c:2412 gio/glocalfileoutputstream.c:935
+#: gio/glocalfileoutputstream.c:949 gio/glocalfileoutputstream.c:964
+#: gio/glocalfileoutputstream.c:981 gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Falló la creación del archivo de respaldo"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Error al eliminar el archivo destino: %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "No se soporta mover archivos entre puntos de montaje"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "No se pudo determinar el uso de disco de %s: %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "El valor del atributo de ser no nulo"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Tipo de atributo no válido (se esperaba una cadena)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Nombre extendido del atributo no válido"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s�: %s"
 msgstr "Error al establecer el atributo extendido «%s»: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (codificación no válida)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: gio/glocalfileinfo.c:1783 gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr "Error al obtener la información del archivo «%s»: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: gio/glocalfileinfo.c:2045
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Error al obtener la información del descriptor del archivo: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Tipo de atributo no válido (se esperaba uint32)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Tipo de atributo no válido (se esperaba uint64)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: gio/glocalfileinfo.c:2127 gio/glocalfileinfo.c:2146
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Tipo de atributo no válido (se esperaba una cadena byte)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "No se pueden establecer permisos en enlaces simbólicos"
 
-#: ../gio/glocalfileinfo.c:2200
+#: gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Error al establecer permisos: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Error al establecer el propietario: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "el enlace simbólico debe ser no nulo"
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: gio/glocalfileinfo.c:2291 gio/glocalfileinfo.c:2310
+#: gio/glocalfileinfo.c:2321
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Error al establecer el enlace simbólico: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Error al establecer el enlace simbólico: el archivo no es un enlace simbólico"
 
-#: ../gio/glocalfileinfo.c:2419
+#: gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Error al establecer o modificar el tiempo de acceso: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "El contexto SELinux debe ser no nulo"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Error al establecer el contexto SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux no está activado en este sistema"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Establecer el atributo %s no está soportado"
 
-#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:696
+#: gio/glocalfileinputstream.c:168 gio/glocalfileoutputstream.c:696
 #, c-format
 msgid "Error reading from file: %s"
 msgstr "Error al leer del archivo: %s"
 
-#: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211
-#: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333
-#: ../gio/glocalfileoutputstream.c:458 ../gio/glocalfileoutputstream.c:1013
+#: gio/glocalfileinputstream.c:199 gio/glocalfileinputstream.c:211
+#: gio/glocalfileinputstream.c:225 gio/glocalfileinputstream.c:333
+#: gio/glocalfileoutputstream.c:458 gio/glocalfileoutputstream.c:1013
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "Error al buscar en el archivo: %s"
 
-#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:248
-#: ../gio/glocalfileoutputstream.c:342
+#: gio/glocalfileinputstream.c:255 gio/glocalfileoutputstream.c:248
+#: gio/glocalfileoutputstream.c:342
 #, c-format
 msgid "Error closing file: %s"
 msgstr "Error al cerrar el archivo: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr ""
 "No se pudo encontrar el tipo de monitorización del archivo local "
 "predeterminado"
 
-#: ../gio/glocalfileoutputstream.c:196 ../gio/glocalfileoutputstream.c:228
-#: ../gio/glocalfileoutputstream.c:717
+#: gio/glocalfileoutputstream.c:196 gio/glocalfileoutputstream.c:228
+#: gio/glocalfileoutputstream.c:717
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "Error al escribir en el archivo: %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Error al eliminar el enlace de respaldo antiguo: %s"
 
-#: ../gio/glocalfileoutputstream.c:289 ../gio/glocalfileoutputstream.c:302
+#: gio/glocalfileoutputstream.c:289 gio/glocalfileoutputstream.c:302
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "Error al crear una copia de respaldo: %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Error al renombrar el archivo temporal: %s"
 
-#: ../gio/glocalfileoutputstream.c:504 ../gio/glocalfileoutputstream.c:1064
+#: gio/glocalfileoutputstream.c:504 gio/glocalfileoutputstream.c:1064
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "Error al truncar el archivo: %s"
 
-#: ../gio/glocalfileoutputstream.c:557 ../gio/glocalfileoutputstream.c:795
-#: ../gio/glocalfileoutputstream.c:1045 ../gio/gsubprocess.c:380
+#: gio/glocalfileoutputstream.c:557 gio/glocalfileoutputstream.c:795
+#: gio/glocalfileoutputstream.c:1045 gio/gsubprocess.c:380
 #, c-format
 msgid "Error opening file “%s�: %s"
 msgstr "Error al abrir el archivo %s: %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "El archivo destino es una carpeta"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "El archivo destino no es un archivo regular"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "El archivo se modificó externamente"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Error al eliminar el archivo antiguo: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Se proporcionó un GSeekType no válido"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Petición de búsqueda no válida"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "No se puede truncar GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "El flujo de salida de la memoria no es redimensionable"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Falló al redimensionar el flujo de salida de la memoria"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3209,32 +3193,32 @@ msgstr ""
 "La cantidad de memoria necesaria para procesar el escrito es mayor que el "
 "espacio de direcciones libre disponible"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "La búsqueda solicitada antes del inicio del flujo"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "La búsqueda solicitada después del final del flujo"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr "el punto de montaje no implementa el desmontado («unmount»)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 msgstr "el punto de montaje no implementa la expulsión («eject»)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:550
+#: gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 msgstr ""
 "el punto de montaje no implementa desmontado («umount») o desmontado con "
@@ -3243,7 +3227,7 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:635
+#: gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 msgstr ""
 "el punto de montaje no implementa la expulsión («eject») o expulsión con "
@@ -3252,102 +3236,101 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:723
+#: gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 msgstr "el punto de montaje no implementa el remontado («remount»)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:805
+#: gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "el punto de montaje no implementa averiguación del tipo de contenido"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr ""
 "el punto de montaje no implementa averiguación síncrona del tipo de contenido"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 msgid "Hostname “%s� contains “[� but not “]�"
 msgstr "El nombre del equipo «%s» contiene «[» pero no «]»"
 
-#: ../gio/gnetworkmonitorbase.c:212 ../gio/gnetworkmonitorbase.c:316
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Red no alcanzable"
 
-#: ../gio/gnetworkmonitorbase.c:250 ../gio/gnetworkmonitorbase.c:280
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Equipo no alcanzable"
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
+#: gio/gnetworkmonitornetlink.c:97 gio/gnetworkmonitornetlink.c:109
+#: gio/gnetworkmonitornetlink.c:128
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "No se pudo crear el monitor de red: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "No se pudo crear el monitor de red: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "No se pudo obtener el estado de la red: "
 
-#: ../gio/gnetworkmonitornm.c:322
+#: gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Versión de NetworkManager demasiado antigua"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "El flujo de salida no implementa la escritura"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "El flujo de origen ya está cerrado"
 
-#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
-#: ../gio/gthreadedresolver.c:126
+#: gio/gresolver.c:342 gio/gthreadedresolver.c:116 gio/gthreadedresolver.c:126
 #, c-format
 msgid "Error resolving “%s�: %s"
 msgstr "Error al resolver «%s»: %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Dominio no válido"
 
-#: ../gio/gresource.c:621 ../gio/gresource.c:880 ../gio/gresource.c:919
-#: ../gio/gresource.c:1043 ../gio/gresource.c:1115 ../gio/gresource.c:1188
-#: ../gio/gresource.c:1258 ../gio/gresourcefile.c:476
-#: ../gio/gresourcefile.c:599 ../gio/gresourcefile.c:736
+#: gio/gresource.c:622 gio/gresource.c:881 gio/gresource.c:920
+#: gio/gresource.c:1044 gio/gresource.c:1116 gio/gresource.c:1189
+#: gio/gresource.c:1259 gio/gresourcefile.c:476 gio/gresourcefile.c:599
+#: gio/gresourcefile.c:736
 #, c-format
 msgid "The resource at “%s� does not exist"
 msgstr "El recurso en «%s» no existe"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s� failed to decompress"
 msgstr "El recurso en «%s» falló al descomprimir"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s� is not a directory"
 msgstr "El recurso en «%s» no es una carpeta"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "El flujo de entrada no implementa la búsqueda"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
 msgstr "Listar secciones que contengan recursos en un ARCHIVO elf"
 
-#: ../gio/gresource-tool.c:500
+#: gio/gresource-tool.c:500
 msgid ""
 "List resources\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3357,16 +3340,15 @@ msgstr ""
 "Si se da la SECCIÓN, listar solo los recursos de esta sección.\n"
 "Si se da la RUTA, listar solo los recursos que coincidan"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:503 gio/gresource-tool.c:513
 msgid "FILE [PATH]"
 msgstr "ARCHIVO [RUTA]"
 
-#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514
-#: ../gio/gresource-tool.c:521
+#: gio/gresource-tool.c:504 gio/gresource-tool.c:514 gio/gresource-tool.c:521
 msgid "SECTION"
 msgstr "SECCIO�N"
 
-#: ../gio/gresource-tool.c:509
+#: gio/gresource-tool.c:509
 msgid ""
 "List resources with details\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3378,15 +3360,15 @@ msgstr ""
 "Si se da la RUTA, listar solo los recursos que coincidan\n"
 "Los detalles incluyen la sección, el tamaño y la compresión"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:519
 msgid "Extract a resource file to stdout"
 msgstr "Extraer un archivo de recursos a stdout"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:520
 msgid "FILE PATH"
 msgstr "ARCHIVO RUTA"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:534
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3414,7 +3396,7 @@ msgstr ""
 "Use «gresource help COMANDO» para obtener ayuda detallada.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:548
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3429,20 +3411,20 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:555
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SECCIÓN   El nombre de sección (opcional) de un elf\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:703
+#: gio/gresource-tool.c:559 gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMANDO   El comando (opcional) que explicar\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:565
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr ""
 "  ARCHIVO      Un archivo elf (un binario o una biblioteca compartida)\n"
 
-#: ../gio/gresource-tool.c:568
+#: gio/gresource-tool.c:568
 msgid ""
 "  FILE      An elf file (a binary or a shared library)\n"
 "            or a compiled resource file\n"
@@ -3450,90 +3432,82 @@ msgstr ""
 "  ARCHIVO      Un archivo elf (un binario o una biblioteca compartida)\n"
 "            o un archivo de recursos compilado\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:572
 msgid "[PATH]"
 msgstr "[RUTA]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:574
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr "  RUTA      La ruta (opcional) de un recurso (puede ser parcial)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:575
 msgid "PATH"
 msgstr "RUTA"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:577
 msgid "  PATH      A resource path\n"
 msgstr "  RUTA      La ruta de un recurso\n"
 
-#: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:908
+#: gio/gsettings-tool.c:51 gio/gsettings-tool.c:72 gio/gsettings-tool.c:908
 #, c-format
 msgid "No such schema “%s�\n"
 msgstr "No existe el esquema «%s»\n"
 
-#: ../gio/gsettings-tool.c:57
+#: gio/gsettings-tool.c:57
 #, c-format
 msgid "Schema “%s� is not relocatable (path must not be specified)\n"
 msgstr "El esquema «%s» no es reubicable (no se debe especificar la ruta)\n"
 
-#: ../gio/gsettings-tool.c:78
+#: gio/gsettings-tool.c:78
 #, c-format
 msgid "Schema “%s� is relocatable (path must be specified)\n"
 msgstr "El esquema «%s» es reubicable (se debe especificar la ruta)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Se proporcionó una ruta vacía.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "La ruta debe comenzar con una barra (/)\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "La ruta debe terminar con una barra (/)\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "La ruta no debe contener dos barras adyacentes (//)\n"
 
-#: ../gio/gsettings-tool.c:538
-#, c-format
+#: gio/gsettings-tool.c:538
 msgid "The provided value is outside of the valid range\n"
 msgstr "El valor proporcionado está fuera del rango válido\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "No se puede escribir la clave\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Listar los esquemas instalados (no reubicables)"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Listar los esquemas reubicables instalados"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Listar las claves en el ESQUEMA"
 
-#: ../gio/gsettings-tool.c:594 ../gio/gsettings-tool.c:600
-#: ../gio/gsettings-tool.c:643
+#: gio/gsettings-tool.c:594 gio/gsettings-tool.c:600 gio/gsettings-tool.c:643
 msgid "SCHEMA[:PATH]"
 msgstr "ESQUEMA[:RUTA]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Listar los hijos del ESQUEMA"
 
-#: ../gio/gsettings-tool.c:605
+#: gio/gsettings-tool.c:605
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -3541,50 +3515,49 @@ msgstr ""
 "Listar las claves y valores recursivamente\n"
 "Si no se proporciona un ESQUEMA, listar todas las claves\n"
 
-#: ../gio/gsettings-tool.c:607
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[ESQUEMA[:RUTA]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Obtener el valor de la CLAVE"
 
-#: ../gio/gsettings-tool.c:613 ../gio/gsettings-tool.c:619
-#: ../gio/gsettings-tool.c:625 ../gio/gsettings-tool.c:637
-#: ../gio/gsettings-tool.c:649
+#: gio/gsettings-tool.c:613 gio/gsettings-tool.c:619 gio/gsettings-tool.c:625
+#: gio/gsettings-tool.c:637 gio/gsettings-tool.c:649
 msgid "SCHEMA[:PATH] KEY"
 msgstr "ESQUEMA[:RUTA] CLAVE"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Consultar el rango de valores válidos para la CLAVE"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Consultar la descripción para la CLAVE"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Establecer el valor de la CLAVE a VALOR"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "ESQUEMA[:RUTA] CLAVE VALOR"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Restablecer la CLAVE a su valor predeterminado"
 
-#: ../gio/gsettings-tool.c:642
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr ""
 "Restablecer todas las claves en un ESQUEMA a sus valores predeterminados"
 
-#: ../gio/gsettings-tool.c:648
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Comprobar si la CLAVE se puede escribir"
 
-#: ../gio/gsettings-tool.c:654
+#: gio/gsettings-tool.c:654
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -3594,11 +3567,11 @@ msgstr ""
 "Si no se especifica una CLAVE, monitorizar todas las claves en el ESQUEMA.\n"
 "Use ^C para detener la monitorización.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "ESQUEMA[:RUTA] [CLAVE]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3647,7 +3620,7 @@ msgstr ""
 "Use «gsettings help COMANDO» para obtener una ayuda detallada.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3662,11 +3635,11 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  CARPETA_ESQUEMA: una carpeta para buscar esquemas adicionales\n"
 
-#: ../gio/gsettings-tool.c:707
+#: gio/gsettings-tool.c:707
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -3674,393 +3647,387 @@ msgstr ""
 "  SCHEMA      El nombre del esquema\n"
 "  RUTA        La ruta, para esquemas reubicables\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  CLAVE      La clave (opcional) para el esquema\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  CLAVE      La clave para el esquema\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  VALOR     El valor para establecer\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "No se pudieron cargar los esquemas de %s: %s\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "No hay esquemas instalados\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Se proporcionó un nombre de esquema vacío\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s�\n"
 msgstr "No existe la clave «%s»\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Socket no válido, no inicializado"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket no válido, falló la instalación debido a: %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 msgid "Socket is already closed"
 msgstr "El socket ya está cerrado"
 
-#: ../gio/gsocket.c:414 ../gio/gsocket.c:3010 ../gio/gsocket.c:4220
-#: ../gio/gsocket.c:4278
+#: gio/gsocket.c:414 gio/gsocket.c:3034 gio/gsocket.c:4244 gio/gsocket.c:4302
 msgid "Socket I/O timed out"
 msgstr "Expiró la E/S del socket"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creando el GSocket desde fd: %s"
 
-#: ../gio/gsocket.c:578 ../gio/gsocket.c:632 ../gio/gsocket.c:639
+#: gio/gsocket.c:578 gio/gsocket.c:632 gio/gsocket.c:639
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "No se pudo crear el socket: %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Se especificó una familia desconocida"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Se especificó un protocolo desconocido"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr ""
 "No se pueden usar operaciones de datagrama en un zócalo que no es de "
 "datagrama."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "No se pueden usar operaciones de datagrama en un zócalo sin un tiempo de "
 "expiración establecido."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "no se pudo obtener la dirección local: %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "no se pudo obtener la dirección remota: %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "no se pudo escuchar: %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Error al vincular con la dirección: %s"
 
-#: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
-#: ../gio/gsocket.c:2391 ../gio/gsocket.c:2461 ../gio/gsocket.c:2519
-#: ../gio/gsocket.c:2537
+#: gio/gsocket.c:2226 gio/gsocket.c:2263 gio/gsocket.c:2373 gio/gsocket.c:2398
+#: gio/gsocket.c:2471 gio/gsocket.c:2529 gio/gsocket.c:2547
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Error al unirse al grupo de multicast: %s"
 
-#: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
-#: ../gio/gsocket.c:2392 ../gio/gsocket.c:2462 ../gio/gsocket.c:2520
-#: ../gio/gsocket.c:2538
+#: gio/gsocket.c:2227 gio/gsocket.c:2264 gio/gsocket.c:2374 gio/gsocket.c:2399
+#: gio/gsocket.c:2472 gio/gsocket.c:2530 gio/gsocket.c:2548
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Error al abandonar al grupo de multicast: %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
 msgstr "No se soporta el multicast específico de la fuente"
 
-#: ../gio/gsocket.c:2375
+#: gio/gsocket.c:2375
 msgid "Unsupported socket family"
 msgstr "Familia del socket no soportada"
 
-#: ../gio/gsocket.c:2393
+#: gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "la fuente específica no es una dirección IPv4"
 
-#: ../gio/gsocket.c:2411 ../gio/gsocket.c:2440 ../gio/gsocket.c:2487
+#: gio/gsocket.c:2418 gio/gsocket.c:2447 gio/gsocket.c:2497
 #, c-format
 msgid "Interface not found: %s"
 msgstr "Interfaz no encontrada: %s"
 
-#: ../gio/gsocket.c:2427
+#: gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "El nombre de la interfaz es demasiado largo"
 
-#: ../gio/gsocket.c:2463
+#: gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "No se soporta el multicast específico de la fuente para IPv4"
 
-#: ../gio/gsocket.c:2521
+#: gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "No se soporta el multicast específico de la fuente para IPv6"
 
-#: ../gio/gsocket.c:2730
+#: gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error al aceptar la conexión: %s"
 
-#: ../gio/gsocket.c:2854
+#: gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Conexión en progreso"
 
-#: ../gio/gsocket.c:2903
+#: gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "No se pudo obtener el error pendiente: "
 
-#: ../gio/gsocket.c:3073
+#: gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Error al recibir los datos: %s"
 
-#: ../gio/gsocket.c:3268
+#: gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Error al enviar los datos: %s"
 
-#: ../gio/gsocket.c:3455
+#: gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "No se pudo desconectar el socket: %s"
 
-#: ../gio/gsocket.c:3536
+#: gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Error al cerrar el socket: %s"
 
-#: ../gio/gsocket.c:4213
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Esperando la condición del socket: %s"
 
-#: ../gio/gsocket.c:4687 ../gio/gsocket.c:4767 ../gio/gsocket.c:4945
+#: gio/gsocket.c:4711 gio/gsocket.c:4791 gio/gsocket.c:4969
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
-#: ../gio/gsocket.c:4711
+#: gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage no está soportado en Windows"
 
-#: ../gio/gsocket.c:5164 ../gio/gsocket.c:5237 ../gio/gsocket.c:5463
+#: gio/gsocket.c:5188 gio/gsocket.c:5261 gio/gsocket.c:5487
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Error al recibir el mensaje: %s"
 
-#: ../gio/gsocket.c:5735
+#: gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "No se pudieron leer las credenciales del socket: %s"
 
-#: ../gio/gsocket.c:5744
+#: gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials no está implementado en este SO"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "No se pudo conectar al servidor proxy %s: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "No se pudo conectar a %s: "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "No se pudo conectar: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Error desconocido al conectar"
 
-#: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535
+#: gio/gsocketclient.c:1081 gio/gsocketclient.c:1535
 msgid "Proxying over a non-TCP connection is not supported."
 msgstr ""
 "No se soporta intentar hacer de proxy sobre una conexión que no es TCP."
 
-#: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
+#: gio/gsocketclient.c:1110 gio/gsocketclient.c:1561
 #, c-format
 msgid "Proxy protocol “%s� is not supported."
 msgstr "El protocolo del proxy «%s» no está soportado."
 
-#: ../gio/gsocketlistener.c:225
+#: gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "El «listener» ya está cerrado"
 
-#: ../gio/gsocketlistener.c:271
+#: gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "El socket añadido está cerrado"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s�"
 msgstr "SOCKSv4 no soporta la dirección de IPv6 «%s»"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "El nombre de usuario es demasiado largo para el protocolo SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s� is too long for SOCKSv4 protocol"
 msgstr ""
 "El nombre de equipo «%s» es demasiado largo para el protocolo SOCKSv4\t"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "El servidor no es un servidor proxy SOCKSv4."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "Se rechazó la conexión a través del servidor SOCKSv4"
 
-#: ../gio/gsocks5proxy.c:153 ../gio/gsocks5proxy.c:324
-#: ../gio/gsocks5proxy.c:334
+#: gio/gsocks5proxy.c:153 gio/gsocks5proxy.c:324 gio/gsocks5proxy.c:334
 msgid "The server is not a SOCKSv5 proxy server."
 msgstr "El servidor no es un servidor proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "El servidor proxy SOCKSv5 requiere autenticación."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
 msgstr ""
 "El servidor SOCKSv5 requiere un método de autenticación que GLib no soporta."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr ""
 "El nombre de usuario o la contraseña son demasiado largos para el protocolo "
 "SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "Falló la autenticación SOCKSv5 debido a un nombre de usuario o contraseña "
 "incorrecta."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s� is too long for SOCKSv5 protocol"
 msgstr "El nombre de equipo «%s» es demasiado largo para el protocolo SOCKSv5"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "El servidor proxy SOCKSv5 usa un tipo de dirección desconocido."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "Error interno de SOCKSv5 del servidor proxy."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "El conjunto de reglas no permite la conexión SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "El servidor no es alcanzable a trave�s del servidor SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "La red no es alcanzable a través del proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Se rechazó la conexión a través del proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect� command."
 msgstr "El proxy SOCKSv5 no soporta el comando «connect»."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "El proxy SOCKSv5 no soporta el tipo de dirección proporcionado."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Error desconocido del proxy SOCKSv5."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "No se puede manejar la versión %d de la codificación GThemedIcon"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "No se han encontrado direcciones válidas"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s�: %s"
 msgstr "Error al resolver «%s» de forma inversa: %s"
 
-#: ../gio/gthreadedresolver.c:549 ../gio/gthreadedresolver.c:628
-#: ../gio/gthreadedresolver.c:726 ../gio/gthreadedresolver.c:776
+#: gio/gthreadedresolver.c:549 gio/gthreadedresolver.c:628
+#: gio/gthreadedresolver.c:726 gio/gthreadedresolver.c:776
 #, c-format
 msgid "No DNS record of the requested type for “%s�"
 msgstr "No hay un registro de DNS del tipo solicitado para «%s»"
 
-#: ../gio/gthreadedresolver.c:554 ../gio/gthreadedresolver.c:731
+#: gio/gthreadedresolver.c:554 gio/gthreadedresolver.c:731
 #, c-format
 msgid "Temporarily unable to resolve “%s�"
 msgstr "No se puede resolver «%s» temporalmente"
 
-#: ../gio/gthreadedresolver.c:559 ../gio/gthreadedresolver.c:736
-#: ../gio/gthreadedresolver.c:842
+#: gio/gthreadedresolver.c:559 gio/gthreadedresolver.c:736
+#: gio/gthreadedresolver.c:844
 #, c-format
 msgid "Error resolving “%s�"
 msgstr "Error al resolver «%s»"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "No se pudo descifrar la clave privada codificada con PEM"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "No se encontró ninguna clave privada codificada con PEM"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "No se pudo analizar la clave privada codificada con PEM"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "No se encontró ningún certificado codificado con PEM"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "No se pudo analizar el certificado codificado con PEM"
 
-#: ../gio/gtlspassword.c:111
+#: gio/gtlspassword.c:111
 msgid ""
 "This is the last chance to enter the password correctly before your access "
 "is locked out."
@@ -4070,7 +4037,7 @@ msgstr ""
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4078,300 +4045,299 @@ msgstr ""
 "Se han introducido varias contraseñas incorrectas, y su acceso se bloqueará "
 "después de más fallos."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "La contraseña introducida no es correcta."
 
-#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:563
+#: gio/gunixconnection.c:166 gio/gunixconnection.c:563
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgid_plural "Expecting 1 control message, got %d"
 msgstr[0] "Se esperaba un mensaje de control, se obtuvo %d"
 msgstr[1] "Se esperaba un mensaje de control, se obtuvieron %d"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Tipos de datos complementarios inesperados"
 
-#: ../gio/gunixconnection.c:200
+#: gio/gunixconnection.c:200
 #, c-format
 msgid "Expecting one fd, but got %d\n"
 msgid_plural "Expecting one fd, but got %d\n"
 msgstr[0] "Se esperaba un fd pero se obtuvo %d\n"
 msgstr[1] "Se esperaba un fd pero se obtuvieron %d\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Se recibió un fd no válido"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Error al enviar las credenciales: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Error al comprobar si SO_PASSCRED está activada para el socket: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Error al activar SO_PASSCRED: %s"
 
-#: ../gio/gunixconnection.c:549
+#: gio/gunixconnection.c:549
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
 msgstr ""
 "Se esperaba leer un solo byte para recibir las credenciales pero se leyeron "
 "cero bytes"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "No se esperaba un mensaje de control, pero se obtuvo %d"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Error al desactivar SO_PASSCRED: %s"
 
-#: ../gio/gunixinputstream.c:372 ../gio/gunixinputstream.c:393
+#: gio/gunixinputstream.c:372 gio/gunixinputstream.c:393
 #, c-format
 msgid "Error reading from file descriptor: %s"
 msgstr "Error al leer del descriptor del archivo: %s"
 
-#: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:411
-#: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204
+#: gio/gunixinputstream.c:426 gio/gunixoutputstream.c:411
+#: gio/gwin32inputstream.c:217 gio/gwin32outputstream.c:204
 #, c-format
 msgid "Error closing file descriptor: %s"
 msgstr "Error al cerrar el descriptor del archivo: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Sistema de archivos raíz"
 
-#: ../gio/gunixoutputstream.c:358 ../gio/gunixoutputstream.c:378
+#: gio/gunixoutputstream.c:358 gio/gunixoutputstream.c:378
 #, c-format
 msgid "Error writing to file descriptor: %s"
 msgstr "Error al escribir en el descriptor del archivo: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Este sistema no soporta direcciones de socket de dominio UNIX abstracto"
 
-#: ../gio/gvolume.c:437
+#: gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "el volumen no implementa la expulsión"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gvolume.c:514
+#: gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "el volumen no implementa la expulsión o expulsión con operación"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
-msgstr "Error al leer del manejador: %s"
+msgstr "Error al leer del gestor: %s"
 
-#: ../gio/gwin32inputstream.c:232 ../gio/gwin32outputstream.c:219
+#: gio/gwin32inputstream.c:232 gio/gwin32outputstream.c:219
 #, c-format
 msgid "Error closing handle: %s"
-msgstr "Error al cerrar el manejador: %s"
+msgstr "Error al cerrar el gestor: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
-msgstr "Error al escribir en el manejador: %s"
+msgstr "Error al escribir en el gestor: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "No hay suficiente memoria"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "Error interno: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Se necesita más entrada"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Datos comprimidos no válidos"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Dirección en la que escuchar"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Se ignora, por compatibilidad con GTestDbus"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Imprimir dirección"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Imprimir dirección en modo consola"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Ejecutar un servicio dbus"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Argumentos incorrectos\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s� for element “%s�"
 msgstr "Atributo inesperado «%s» para el elemento «%s»"
 
-#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836
-#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953
+#: glib/gbookmarkfile.c:765 glib/gbookmarkfile.c:836 glib/gbookmarkfile.c:846
+#: glib/gbookmarkfile.c:953
 #, c-format
 msgid "Attribute “%s� of element “%s� not found"
 msgstr "El atributo «%s» del elemento «%s» no se ha encontrado"
 
-#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
-#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
+#: glib/gbookmarkfile.c:1123 glib/gbookmarkfile.c:1188
+#: glib/gbookmarkfile.c:1252 glib/gbookmarkfile.c:1262
 #, c-format
 msgid "Unexpected tag “%s�, tag “%s� expected"
 msgstr "Etiqueta «%s» inesperada, se esperaba la etiqueta «%s»"
 
-#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
-#: ../glib/gbookmarkfile.c:1230
+#: glib/gbookmarkfile.c:1148 glib/gbookmarkfile.c:1162
+#: glib/gbookmarkfile.c:1230
 #, c-format
 msgid "Unexpected tag “%s� inside “%s�"
 msgstr "Etiqueta «%s» inesperada dentro de «%s»"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr ""
 "No se pudo encontrar ningún archivo de marcadores válido en las carpetas de "
 "datos"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:1958
 #, c-format
 msgid "A bookmark for URI “%s� already exists"
 msgstr "Ya existe un marcador para el URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
-#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
-#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
-#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
-#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
-#: ../glib/gbookmarkfile.c:2912 ../glib/gbookmarkfile.c:3102
-#: ../glib/gbookmarkfile.c:3178 ../glib/gbookmarkfile.c:3346
-#: ../glib/gbookmarkfile.c:3435 ../glib/gbookmarkfile.c:3524
-#: ../glib/gbookmarkfile.c:3640
+#: glib/gbookmarkfile.c:2004 glib/gbookmarkfile.c:2162
+#: glib/gbookmarkfile.c:2247 glib/gbookmarkfile.c:2327
+#: glib/gbookmarkfile.c:2412 glib/gbookmarkfile.c:2495
+#: glib/gbookmarkfile.c:2573 glib/gbookmarkfile.c:2652
+#: glib/gbookmarkfile.c:2694 glib/gbookmarkfile.c:2791
+#: glib/gbookmarkfile.c:2912 glib/gbookmarkfile.c:3102
+#: glib/gbookmarkfile.c:3178 glib/gbookmarkfile.c:3346
+#: glib/gbookmarkfile.c:3435 glib/gbookmarkfile.c:3524
+#: glib/gbookmarkfile.c:3640
 #, c-format
 msgid "No bookmark found for URI “%s�"
 msgstr "No se encontró un marcador para el URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2336
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s�"
 msgstr "Ningún tipo MIME definido en el marcador para la URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2421
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s�"
 msgstr "No se ha definido ningún flag privado en el marcador para el URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2800
 #, c-format
 msgid "No groups set in bookmark for URI “%s�"
 msgstr "No se ha establecido ningún grupo en el marcador para el URI «%s»"
 
-#: ../glib/gbookmarkfile.c:3199 ../glib/gbookmarkfile.c:3356
+#: glib/gbookmarkfile.c:3199 glib/gbookmarkfile.c:3356
 #, c-format
 msgid "No application with name “%s� registered a bookmark for “%s�"
 msgstr "Ninguna aplicación con nombre «%s» registró un marcador para «%s»"
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3379
 #, c-format
 msgid "Failed to expand exec line “%s� with URI “%s�"
 msgstr "Falló la expansión de lalinea ejecutable «%s» con el URI «%s»"
 
-#: ../glib/gconvert.c:473
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "Carácter no representable en entrada de conversión"
 
-#: ../glib/gconvert.c:500 ../glib/gutf8.c:865 ../glib/gutf8.c:1077
-#: ../glib/gutf8.c:1214 ../glib/gutf8.c:1318
+#: glib/gconvert.c:500 glib/gutf8.c:865 glib/gutf8.c:1077 glib/gutf8.c:1214
+#: glib/gutf8.c:1318
 msgid "Partial character sequence at end of input"
 msgstr "Hay una secuencia parcial de caracteres en el final de la entrada"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s� to codeset “%s�"
 msgstr "No se puede convertir el fallback «%s» al conjunto de códigos «%s»"
 
-#: ../glib/gconvert.c:940
+#: glib/gconvert.c:940
 msgid "Embedded NUL byte in conversion input"
 msgstr "Tipo NUL empotrado en la entrada de conversión"
 
-#: ../glib/gconvert.c:961
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "Tipo NUL empotrado en la salida de conversión"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s� is not an absolute URI using the “file� scheme"
 msgstr "El URI «%s» no es una URI absoluta utilizando el esquema «file»"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s� may not include a “#�"
 msgstr "El archivo local en la URI «%s» no debe incluir un «#»"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s� is invalid"
 msgstr "El URI «%s» no es válido"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s� is invalid"
 msgstr "El nombre del host de la URI «%s» no es válido"
 
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s� contains invalidly escaped characters"
 msgstr "El URI «%s» contiene caracteres de escape no válidos"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 msgid "The pathname “%s� is not an absolute path"
 msgstr "El nombre de la ruta «%s» no es una ruta absoluta"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:213
+#: glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %H:%M:%S, %e de %B de %Y"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:216
+#: glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:219
+#: glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:222
+#: glib/gdatetime.c:222
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
@@ -4392,62 +4358,62 @@ msgstr "%I:%M:%S %p"
 #. * non-European) there is no difference between the standalone and
 #. * complete date form.
 #.
-#: ../glib/gdatetime.c:261
+#: glib/gdatetime.c:261
 msgctxt "full month name"
 msgid "January"
 msgstr "enero"
 
-#: ../glib/gdatetime.c:263
+#: glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "febrero"
 
-#: ../glib/gdatetime.c:265
+#: glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "marzo"
 
-#: ../glib/gdatetime.c:267
+#: glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "abril"
 
-#: ../glib/gdatetime.c:269
+#: glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "mayo"
 
-#: ../glib/gdatetime.c:271
+#: glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "junio"
 
-#: ../glib/gdatetime.c:273
+#: glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "julio"
 
-#: ../glib/gdatetime.c:275
+#: glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "agosto"
 
-#: ../glib/gdatetime.c:277
+#: glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "septiembre"
 
-#: ../glib/gdatetime.c:279
+#: glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "octubre"
 
-#: ../glib/gdatetime.c:281
+#: glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "noviembre"
 
-#: ../glib/gdatetime.c:283
+#: glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "diciembre"
@@ -4469,132 +4435,132 @@ msgstr "diciembre"
 #. * other platform.  Here are abbreviated month names in a form
 #. * appropriate when they are used standalone.
 #.
-#: ../glib/gdatetime.c:315
+#: glib/gdatetime.c:315
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "ene"
 
-#: ../glib/gdatetime.c:317
+#: glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "feb"
 
-#: ../glib/gdatetime.c:319
+#: glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "mar"
 
-#: ../glib/gdatetime.c:321
+#: glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "abr"
 
-#: ../glib/gdatetime.c:323
+#: glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "may"
 
-#: ../glib/gdatetime.c:325
+#: glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "jun"
 
-#: ../glib/gdatetime.c:327
+#: glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "jul"
 
-#: ../glib/gdatetime.c:329
+#: glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "ago"
 
-#: ../glib/gdatetime.c:331
+#: glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "sep"
 
-#: ../glib/gdatetime.c:333
+#: glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "oct"
 
-#: ../glib/gdatetime.c:335
+#: glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "nov"
 
-#: ../glib/gdatetime.c:337
+#: glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "dic"
 
-#: ../glib/gdatetime.c:352
+#: glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Lunes"
 
-#: ../glib/gdatetime.c:354
+#: glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../glib/gdatetime.c:356
+#: glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Mie�rcoles"
 
-#: ../glib/gdatetime.c:358
+#: glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: ../glib/gdatetime.c:360
+#: glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Viernes"
 
-#: ../glib/gdatetime.c:362
+#: glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Sa�bado"
 
-#: ../glib/gdatetime.c:364
+#: glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../glib/gdatetime.c:379
+#: glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Lun"
 
-#: ../glib/gdatetime.c:381
+#: glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:383
+#: glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Mié"
 
-#: ../glib/gdatetime.c:385
+#: glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Jue"
 
-#: ../glib/gdatetime.c:387
+#: glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Vie"
 
-#: ../glib/gdatetime.c:389
+#: glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../glib/gdatetime.c:391
+#: glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Dom"
@@ -4616,62 +4582,62 @@ msgstr "Dom"
 #. * (western European, non-European) there is no difference between the
 #. * standalone and complete date form.
 #.
-#: ../glib/gdatetime.c:455
+#: glib/gdatetime.c:455
 msgctxt "full month name with day"
 msgid "January"
 msgstr "enero"
 
-#: ../glib/gdatetime.c:457
+#: glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "febrero"
 
-#: ../glib/gdatetime.c:459
+#: glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "marzo"
 
-#: ../glib/gdatetime.c:461
+#: glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "abril"
 
-#: ../glib/gdatetime.c:463
+#: glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "mayo"
 
-#: ../glib/gdatetime.c:465
+#: glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "junio"
 
-#: ../glib/gdatetime.c:467
+#: glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "julio"
 
-#: ../glib/gdatetime.c:469
+#: glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "agosto"
 
-#: ../glib/gdatetime.c:471
+#: glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "septiembre"
 
-#: ../glib/gdatetime.c:473
+#: glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "octubre"
 
-#: ../glib/gdatetime.c:475
+#: glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "noviembre"
 
-#: ../glib/gdatetime.c:477
+#: glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "diciembre"
@@ -4693,194 +4659,193 @@ msgstr "diciembre"
 #. * month names almost ready to copy and paste here.  In other systems
 #. * due to a bug the result is incorrect in some languages.
 #.
-#: ../glib/gdatetime.c:542
+#: glib/gdatetime.c:542
 msgctxt "abbreviated month name with day"
 msgid "Jan"
 msgstr "ene"
 
-#: ../glib/gdatetime.c:544
+#: glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "feb"
 
-#: ../glib/gdatetime.c:546
+#: glib/gdatetime.c:546
 msgctxt "abbreviated month name with day"
 msgid "Mar"
 msgstr "mar"
 
-#: ../glib/gdatetime.c:548
+#: glib/gdatetime.c:548
 msgctxt "abbreviated month name with day"
 msgid "Apr"
 msgstr "abr"
 
-#: ../glib/gdatetime.c:550
+#: glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "may"
 
-#: ../glib/gdatetime.c:552
+#: glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "jun"
 
-#: ../glib/gdatetime.c:554
+#: glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "jul"
 
-#: ../glib/gdatetime.c:556
+#: glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "ago"
 
-#: ../glib/gdatetime.c:558
+#: glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "sep"
 
-#: ../glib/gdatetime.c:560
+#: glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "oct"
 
-#: ../glib/gdatetime.c:562
+#: glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "nov"
 
-#: ../glib/gdatetime.c:564
+#: glib/gdatetime.c:564
 msgctxt "abbreviated month name with day"
 msgid "Dec"
 msgstr "dic"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:581
+#: glib/gdatetime.c:581
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:584
+#: glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
-#: ../glib/gdir.c:155
+#: glib/gdir.c:155
 #, c-format
 msgid "Error opening directory “%s�: %s"
 msgstr "Falló al abrir la carpeta «%s»: %s"
 
-#: ../glib/gfileutils.c:716 ../glib/gfileutils.c:808
+#: glib/gfileutils.c:716 glib/gfileutils.c:808
 #, 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] "No se pudo asignar %lu byte para leer el archivo «%s»"
 msgstr[1] "No se pudieron asignar %lu bytes para leer el archivo «%s»"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s�: %s"
 msgstr "Error al leer el archivo %s: %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s� is too large"
 msgstr "El archivo «%s» es demasiado grande"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s�: %s"
 msgstr "Falló al leer del archivo «%s»: %s"
 
-#: ../glib/gfileutils.c:881 ../glib/gfileutils.c:953
+#: glib/gfileutils.c:881 glib/gfileutils.c:953
 #, c-format
 msgid "Failed to open file “%s�: %s"
 msgstr "Falló al abrir el archivo «%s»: %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s�: fstat() failed: %s"
 msgstr "Falló al obtener los atributos del archivo «%s»: fstat() falló: %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s�: fdopen() failed: %s"
 msgstr "Falló al abrir el archivo «%s»: fdopen() falló: %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s� to “%s�: g_rename() failed: %s"
 msgstr "Falló al renombrar el archivo «%s» a «%s»: g_rename() falló: %s"
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: glib/gfileutils.c:1057 glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s�: %s"
 msgstr "Falló al crear el archivo «%s»: %s"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s�: write() failed: %s"
 msgstr "Falló al escribir el archivo «%s»: falló write(): %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s�: fsync() failed: %s"
 msgstr "Falló al escribir el archivo «%s»: falló fsync(): %s"
 
-#: ../glib/gfileutils.c:1251
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s� could not be removed: g_unlink() failed: %s"
 msgstr "El archivo existente «%s» no se pudo eliminar: g_unlink() falló: %s"
 
-#: ../glib/gfileutils.c:1530
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s� invalid, should not contain a “%s�"
 msgstr "La plantilla «%s» no es válida, no debería contener un «%s»"
 
-#: ../glib/gfileutils.c:1543
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s� doesn’t contain XXXXXX"
 msgstr "La plantilla «%s» no contiene XXXXXX"
 
-#: ../glib/gfileutils.c:2105
+#: glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s�: %s"
 msgstr "Falló al leer el enlace simbólico «%s»: %s"
 
-#: ../glib/giochannel.c:1389
+#: glib/giochannel.c:1389
 #, c-format
 msgid "Could not open converter from “%s� to “%s�: %s"
 msgstr "No se pudo abrir el conversor de «%s» a «%s»: %s"
 
-#: ../glib/giochannel.c:1734
+#: glib/giochannel.c:1734
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr ""
 "No se puede hacer una lectura en bruto (raw) en g_io_channel_read_line_string"
 
-#: ../glib/giochannel.c:1781 ../glib/giochannel.c:2039
-#: ../glib/giochannel.c:2126
+#: glib/giochannel.c:1781 glib/giochannel.c:2039 glib/giochannel.c:2126
 msgid "Leftover unconverted data in read buffer"
 msgstr "Se han dejado datos no convertidos en el búfer de lectura"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "El canal termina en un carácter parcial"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr ""
 "No se puede hacer una lectura en bruto (raw) en g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:788
+#: glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr ""
 "No se pudo encontrar la clave de archivo válida en las carpetas de búsqueda"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "No es un archivo regular"
 
-#: ../glib/gkeyfile.c:1270
+#: glib/gkeyfile.c:1270
 #, c-format
 msgid ""
 "Key file contains line “%s� which is not a key-value pair, group, or comment"
@@ -4888,45 +4853,45 @@ msgstr ""
 "El archivo de claves contiene la línea «%s» que no es un par valor-clave, "
 "grupo o comentario"
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Nombre de grupo no válido: %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "El archivo de claves no empieza por un grupo"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Nombre de clave no válida: %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s�"
 msgstr "El archivo de claves contiene una codificación «%s» no soportada"
 
-#: ../glib/gkeyfile.c:1645 ../glib/gkeyfile.c:1818 ../glib/gkeyfile.c:3271
-#: ../glib/gkeyfile.c:3334 ../glib/gkeyfile.c:3464 ../glib/gkeyfile.c:3594
-#: ../glib/gkeyfile.c:3738 ../glib/gkeyfile.c:3967 ../glib/gkeyfile.c:4034
+#: glib/gkeyfile.c:1645 glib/gkeyfile.c:1818 glib/gkeyfile.c:3271
+#: glib/gkeyfile.c:3334 glib/gkeyfile.c:3464 glib/gkeyfile.c:3594
+#: glib/gkeyfile.c:3738 glib/gkeyfile.c:3967 glib/gkeyfile.c:4034
 #, c-format
 msgid "Key file does not have group “%s�"
 msgstr "El archivo de claves no tiene el grupo «%s»"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s� in group “%s�"
 msgstr "El archivo de claves no tiene la clave «%s» en el grupo «%s»"
 
-#: ../glib/gkeyfile.c:1935 ../glib/gkeyfile.c:2051
+#: glib/gkeyfile.c:1935 glib/gkeyfile.c:2051
 #, c-format
 msgid "Key file contains key “%s� with value “%s� which is not UTF-8"
 msgstr ""
 "El archivo de claves contiene la clave  «%s» con el valor «%s» el cual no es "
 "UTF-8"
 
-#: ../glib/gkeyfile.c:1955 ../glib/gkeyfile.c:2071 ../glib/gkeyfile.c:2513
+#: glib/gkeyfile.c:1955 glib/gkeyfile.c:2071 glib/gkeyfile.c:2513
 #, c-format
 msgid ""
 "Key file contains key “%s� which has a value that cannot be interpreted."
@@ -4934,7 +4899,7 @@ msgstr ""
 "El archivo de claves contiene la clave «%s» que tiene un valor que no se "
 "puede interpretar."
 
-#: ../glib/gkeyfile.c:2731 ../glib/gkeyfile.c:3100
+#: glib/gkeyfile.c:2731 glib/gkeyfile.c:3100
 #, c-format
 msgid ""
 "Key file contains key “%s� in group “%s� which has a value that cannot be "
@@ -4943,227 +4908,227 @@ msgstr ""
 "El archivo de claves contiene la clave «%s» en el grupo «%s» que tiene un "
 "valor que no puede interpretarse."
 
-#: ../glib/gkeyfile.c:2809 ../glib/gkeyfile.c:2886
+#: glib/gkeyfile.c:2809 glib/gkeyfile.c:2886
 #, c-format
 msgid "Key “%s� in group “%s� has value “%s� where %s was expected"
 msgstr ""
 "La clave «%s» en el grupo «%s» tiene el valor «%s», pero se esperaba %s"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr ""
 "El archivo de claves contiene un carácter de escape al final de la línea"
 
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s�"
 msgstr "El archivo de claves contiene la secuencia de escape no válida «%s»"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s� cannot be interpreted as a number."
 msgstr "El valor «%s» no puede interpretarse como un número."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s� out of range"
 msgstr "El valor entero «%s» está fuera de rango"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s� cannot be interpreted as a float number."
 msgstr "El valor «%s» no puede interpretarse como un número de coma flotante."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s� cannot be interpreted as a boolean."
 msgstr "El valor «%s» no puede interpretarse como un booleano."
 
-#: ../glib/gmappedfile.c:129
+#: glib/gmappedfile.c:129
 #, c-format
 msgid "Failed to get attributes of file “%s%s%s%s�: fstat() failed: %s"
 msgstr ""
 "Falló al obtener los atributos del archivo «%s%s%s%s»: fstat() falló: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "Falló al mapear el archivo «%s%s%s%s»: mmap() falló: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s�: open() failed: %s"
 msgstr "Falló al abrir el archivo «%s»: open() falló: %s"
 
-#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
+#: glib/gmarkup.c:397 glib/gmarkup.c:439
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "Error en la línea %d, carácter %d: "
 
-#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
+#: glib/gmarkup.c:461 glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s�"
 msgstr "Texto codificado como UTF-8 en el nombre no válido; «%s» no es válido"
 
-#: ../glib/gmarkup.c:472
+#: glib/gmarkup.c:472
 #, c-format
-msgid "'%s' is not a valid name"
+msgid "“%s� is not a valid name"
 msgstr "«%s» no es un nombre válido"
 
-#: ../glib/gmarkup.c:488
+#: glib/gmarkup.c:488
 #, c-format
-msgid "'%s' is not a valid name: '%c'"
+msgid "“%s� is not a valid name: “%c�"
 msgstr "«%s» no es un nombre válido: «%c»"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Error en la línea %d: %s"
 
-#: ../glib/gmarkup.c:675
+#: glib/gmarkup.c:687
 #, c-format
 msgid ""
-"Failed to parse '%-.*s', which should have been a digit inside a character "
-"reference (&#234; for example) - perhaps the digit is too large"
+"Failed to parse “%-.*s�, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
 msgstr ""
 "Falló al analizar «%-.*s», el cual debería tener un dígito dentro de un "
 "carácter de referencia( por ejemplo &#234;) - tal vez el dígito es demasiado "
 "grande"
 
-#: ../glib/gmarkup.c:687
+#: glib/gmarkup.c:699
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
 msgstr ""
 "El carácter de referencia no termina con punto y coma; probablemente utilizó "
-"un carácter «&» sin pretender iniciar una entidad, escape el carácter \"&\" "
+"un carácter «&» sin pretender iniciar una entidad; escape el carácter \"&\" "
 "como &amp;"
 
-#: ../glib/gmarkup.c:713
+#: glib/gmarkup.c:725
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
+msgid "Character reference “%-.*s� does not encode a permitted character"
 msgstr "El carácter de referencia «%-.*s» no codifica un carácter permitido"
 
-#: ../glib/gmarkup.c:751
+#: glib/gmarkup.c:763
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
-"La entidad '&;' está vacía; las entidades válidas son: &amp; &quot; &lt; "
+"La entidad «&;» está vacía; las entidades válidas son: &amp; &quot; &lt; "
 "&gt; &apos;"
 
-#: ../glib/gmarkup.c:759
+#: glib/gmarkup.c:771
 #, c-format
-msgid "Entity name '%-.*s' is not known"
+msgid "Entity name “%-.*s� is not known"
 msgstr "El nombre de la entidad «%-.*s» es desconocido"
 
-#: ../glib/gmarkup.c:764
+#: glib/gmarkup.c:776
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
+"character without intending to start an entity — escape ampersand as &amp;"
 msgstr ""
 "La entidad no termina con un punto y coma; probablemente utilizó el carácter "
 "\"&\" sin la intención de indicar una entidad, escape el signo \"&\" como "
 "&amp;"
 
-#: ../glib/gmarkup.c:1170
+#: glib/gmarkup.c:1182
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "El documento debe comenzar con un elemento (por ejemplo: <book>)"
 
-#: ../glib/gmarkup.c:1210
+#: glib/gmarkup.c:1222
 #, c-format
 msgid ""
-"'%s' is not a valid character following a '<' character; it may not begin an "
+"“%s� is not a valid character following a “<� character; it may not begin an "
 "element name"
 msgstr ""
 "«%s» no es un carácter válido a continuación del carácter '<'; no debe "
 "iniciar un nombre de elemento"
 
-#: ../glib/gmarkup.c:1252
+#: glib/gmarkup.c:1264
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
+"Odd character “%s�, expected a “>� character to end the empty-element tag "
+"“%s�"
 msgstr ""
 "Carácter «%s» impropio, se esperaba un carácter «>» para terminar la "
 "etiqueta vacía del elemento «%s»"
 
-#: ../glib/gmarkup.c:1333
+#: glib/gmarkup.c:1345
 #, c-format
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+"Odd character “%s�, expected a “=� after attribute name “%s� of element “%s�"
 msgstr ""
 "Carácter «%s» impropio, se esperaba el carácter '=' después del nombre de "
 "atributo «%s» del elemento «%s»"
 
-#: ../glib/gmarkup.c:1374
+#: glib/gmarkup.c:1386
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s�, expected a “>� or “/� character to end the start tag of "
+"element “%s�, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
 "Carácter «%s» impropio, se esperaba un carácter '>' o '/' para finalizar la "
 "etiqueta de inicio del elemento «%s» u opcionalmente un atributo; tal vez "
 "utilizó un carácter que no es válido en un nombre de atributo"
 
-#: ../glib/gmarkup.c:1418
+#: glib/gmarkup.c:1430
 #, c-format
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
+"Odd character “%s�, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s� of element “%s�"
 msgstr ""
 "Carácter «%s» impropio, se esperaba una marca de apertura de comillas "
 "después del signo igual al darle valor al atributo «%s» del elemento «%s»"
 
-#: ../glib/gmarkup.c:1551
+#: glib/gmarkup.c:1563
 #, c-format
 msgid ""
-"'%s' is not a valid character following the characters '</'; '%s' may not "
+"“%s� is not a valid character following the characters “</�; “%s� may not "
 "begin an element name"
 msgstr ""
 "«%s» no es un carácter válido a continuación de los caracteres '</'; «%s»  "
 "no debe iniciar un nombre de elemento"
 
-#: ../glib/gmarkup.c:1587
+#: glib/gmarkup.c:1599
 #, c-format
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
+"“%s� is not a valid character following the close element name “%s�; the "
+"allowed character is “>�"
 msgstr ""
 "«%s» no es un carácter válido a continuación del nombre del elemento de "
 "cierre «%s»; el carácter permitido es '>'"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
-msgstr "El elemento «%s» fue cerrado, no existe ningún elemento abierto"
+msgid "Element “%s� was closed, no element is currently open"
+msgstr "Se cerró el elemento «%s», no existe ningún elemento abierto"
 
-#: ../glib/gmarkup.c:1607
+#: glib/gmarkup.c:1619
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
+msgid "Element “%s� was closed, but the currently open element is “%s�"
 msgstr ""
 "Se cerró el elemento «%s», pero el elemento que está abierto actualmente es "
 "«%s»"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 msgid "Document was empty or contained only whitespace"
 msgstr "El documento estaba vacío o sólo contenía espacios en blanco"
 
-#: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
+#: glib/gmarkup.c:1786
+msgid "Document ended unexpectedly just after an open angle bracket “<�"
 msgstr "El documento termina inesperadamente justo después de un '<'"
 
-#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
+#: glib/gmarkup.c:1794 glib/gmarkup.c:1839
 #, c-format
 msgid ""
-"Document ended unexpectedly with elements still open - '%s' was the last "
+"Document ended unexpectedly with elements still open — “%s� was the last "
 "element opened"
 msgstr ""
 "El documento termina inesperadamente con elementos todavía abiertos - «%s» "
 "fue el último elemento abierto"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5172,21 +5137,21 @@ msgstr ""
 "El documento termina inesperadamente, se esperaba un carácter '>' "
 "finalizando la etiqueta <%s/>"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr "El documento termina inesperadamente dentro de un nombre de elemento"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "El documento termina inesperadamente dentro de un nombre de atributo"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr ""
 "El documento terminó inesperadamente dentro de una etiqueta de apertura de "
 "elemento."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1825
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5194,319 +5159,327 @@ msgstr ""
 "El documento termina inesperadamente después de los signos igual que siguen "
 "al nombre de atributo; sin valor de atributo"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "El documento termina inesperadamente dentro del valor de un atributo"
 
-#: ../glib/gmarkup.c:1836
+#: glib/gmarkup.c:1849
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgid "Document ended unexpectedly inside the close tag for element “%s�"
 msgstr ""
 "El documento termina inesperadamente dentro de la etiqueta de cierre del "
 "elemento «%s»"
 
-#: ../glib/gmarkup.c:1842
+#: glib/gmarkup.c:1853
+#| msgid "Document ended unexpectedly inside the close tag for element “%s�"
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
+msgstr ""
+"El documento termina inesperadamente dentro de la etiqueta de cierre para un "
+"elemento no abierto"
+
+#: glib/gmarkup.c:1859
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "El documento termina inesperadamente dentro de un comentario o instrucción "
 "de proceso"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[OPCIÓN…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Opciones de ayuda:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Mostrar opciones de ayuda"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Muestra todas las opciones de ayuda"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Opciones de la aplicación:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Opciones:"
 
-#: ../glib/goption.c:1113 ../glib/goption.c:1183
+#: glib/goption.c:1113 glib/goption.c:1183
 #, c-format
 msgid "Cannot parse integer value “%s� for %s"
 msgstr "No se puede analizar el valor entero «%s» para %s"
 
-#: ../glib/goption.c:1123 ../glib/goption.c:1191
+#: glib/goption.c:1123 glib/goption.c:1191
 #, c-format
 msgid "Integer value “%s� for %s out of range"
 msgstr "El valor entero «%s» para %s está fuera de rango"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s� for %s"
 msgstr "No se puede analizar el valor doble «%s» para %s"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s� for %s out of range"
 msgstr "El valor doble «%s» para %s está fuera de rango"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Error al analizar la opción: %s"
 
-#: ../glib/goption.c:1558 ../glib/goption.c:1671
+#: glib/goption.c:1558 glib/goption.c:1671
 #, c-format
 msgid "Missing argument for %s"
 msgstr "Falta un argumento para %s"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Opción desconocida %s"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "objeto corrupto"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "error interno u objeto corrupto"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "sin memoria"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "se alcanzó el límite de «backtracking»"
 
-#: ../glib/gregex.c:278 ../glib/gregex.c:286
+#: glib/gregex.c:278 glib/gregex.c:286
 msgid "the pattern contains items not supported for partial matching"
 msgstr ""
 "el patrón contiene elementos no soportados para una coincidencia parcial"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "error interno"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "no se soportan referencias anteriores como condiciones para coincidencias "
 "parciales"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "se alcanzó el límite de recursividad"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "combinación de banderas de nueva línea no válidas"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "desplazamiento erróneo"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "UTF8 corto"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "bucle de repetición"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ al final del patrón"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c al final del patrón"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "carácter no reconocido después de \\"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "números fuera de rango en el cuantificador {}"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "número demasiado grande en el cuantificador {}"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "falta la terminación ] para la clase de carácter"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "secuencia de escape no válida en la clase de carácter"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "rango fuera de orden en la clase de carácter"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "nada que repetir"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "repetición inesperada"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "carácter no reconocido después de (? o (?-"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "Sólo se soportan las clases con nombres POSIX dentro de una clase"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "falta el ) de terminación"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "referencia a un subpatrón no existente"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "falta ) después del comentario"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "la expresión regular es demasiado larga"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "falló al obtener memoria"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") sin ( que lo abriera"
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "desbordamiento de código"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "carácter no reconocido después de (?<"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "la comprobación «lookbehind» no tiene una longitud fija"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "número o nombre mal formado después de (?("
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "el grupo condicional contiene más de dos ramas"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "se esperaba una comprobación después de (?("
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: ../glib/gregex.c:409
+#: glib/gregex.c:409
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "(?R o los dígitos (?[+-] deben estar seguidos por )"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "nombre de clase POSIX desconocido"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "los elementos POSIX recopilados no están soportados"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "el valor del carácter en la secuencia \\x{…} es demasiado largo"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "condición no válida (?(0)"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "no se permite \\C en comprobaciones «lookbehind»"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr ""
 "las secuencias de escape \\L, \\l, \\N{nombre}, \\U, y \\u no están "
 "soportadas"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "una llamada recursiva podrá crear un bucle infinito"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "carácter no reconocido después de (?P"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "falta el terminador en el nombre del subpatrón"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "dos subpatrones tienen el mismo nombre"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "secuencia \\P o \\p mal formada"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "nombre de propiedad desconocido después de \\P o \\p"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "el nombre del subpatrón es demasiado largo (máximo 32 caracteres)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "demasiados subpatrones con nombre (máximo 10.000)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "el valor octal es mayor que \\377"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "se desbordó el espacio de trabajo de compilación"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "no se encontró el subpatrón referenciado anteriormente comprobado"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "el grupo DEFINE contiene más de una rama"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "opciones NEWLINE inconsistentes"
 
-#: ../glib/gregex.c:476
+#: glib/gregex.c:476
 msgid ""
 "\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
 "or by a plain number"
@@ -5514,283 +5487,288 @@ msgstr ""
 "\\g no está seguido por un nombre entre llaves, corchetes angulares o número "
 "o entre comillas, o por un número simple"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "una referencia con número no puede ser cero"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "no se permite un argumento para (*ACCEPT), (*FAIL), o (*COMMIT)"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) no reconocido"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "el número es demasiado grande"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "falta elnombre del subpatrón después de (?&"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "se esperaba un dígito después de (?+"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
 "] es un carácter de datos no válido en el modo de compatibilidad de "
 "JavaScript"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "no se permiten diferentes nombres para subpatrones del mismo número"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) debe tener un argumento"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "\\c debe estar seguido de un carácter ASCII"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "\\k no está seguido por un nombre entre llaves, corchetes angulares o entre "
 "comillas"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N no está soportado en una clase"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "demasiadas referencias hacia adelante"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "el nombre es demasiado largo en (*MARK), (*PRUNE), (*SKIP), o (*THEN)"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "el valor del carácter en la secuencia \\u{…} es demasiado largo"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: glib/gregex.c:745 glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Error al coincidir con la expresión regular %s: %s"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "La biblioteca PCRE está compilada sin soporte para UTF8"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr ""
 "La biblioteca PCRE está compilada sin soporte para las propiedades de UTF8"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "La biblioteca PCRE está compilada con opciones incompatibles"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Error al optimizar la expresión regular %s: %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Error al compilar la expresión regular %s en el carácter %d: %s"
 
-#: ../glib/gregex.c:2413
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr "se esperaba un dígito hexadecimal o «}»"
 
-#: ../glib/gregex.c:2429
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "se esperaba un dígito hexadecimal"
 
-#: ../glib/gregex.c:2469
+#: glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr "falta «<» en la referencia simbólica"
 
-#: ../glib/gregex.c:2478
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "referencia de símbolo sin terminar"
 
-#: ../glib/gregex.c:2485
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "referencia simbólica de longitud cero"
 
-#: ../glib/gregex.c:2496
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "se esperaba un dígito"
 
-#: ../glib/gregex.c:2514
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "referencia simbólica ilegal"
 
-#: ../glib/gregex.c:2576
+#: glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr "«\\» al final de la cadena"
 
-#: ../glib/gregex.c:2580
+#: glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "secuencia de escape desconocida"
 
-#: ../glib/gregex.c:2590
+#: glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr "Error al analizar el texto de reemplazo «%s» en el carácter %lu: %s"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "El texto entrecomillado no empieza por un signo de comilla"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Falta una comilla en la línea de comandos o en otro texto con comillas tipo "
 "shell"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\� character. (The text was “%s�)"
 msgstr ""
 "El texto termina justo después de un carácter '\\'. (El texto era «%s»)"
 
-#: ../glib/gshell.c:587
+#: glib/gshell.c:587
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was “%s�)"
 msgstr ""
 "El texto terminó antes de que se encontrase la comilla correspondiente con "
 "%c. (El texto era «%s»)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "El texto está vacío (o sólo contiene espacios en blanco)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Falló en la lectura de datos desde el proceso hijo (%s)"
 
-#: ../glib/gspawn.c:401
+#: glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Falló inesperado en select() leyendo datos desde el proceso hijo (%s)"
 
-#: ../glib/gspawn.c:486
+#: glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Falló inesperado en waitpid() (%s)"
 
-#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
+#: glib/gspawn.c:1043 glib/gspawn-win32.c:1318
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "El proceso hijo terminó con el código %ld"
 
-#: ../glib/gspawn.c:905
+#: glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "El proceso hijo terminado por la señal %ld"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "El proceso hijo se detuvo por la señal %ld"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "El proceso hijo terminó de forma anormal"
 
-#: ../glib/gspawn.c:1324 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
+#: glib/gspawn.c:1360 glib/gspawn-win32.c:339 glib/gspawn-win32.c:347
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Falló al leer desde el conducto hijo (%s)"
 
-#: ../glib/gspawn.c:1394
+#: glib/gspawn.c:1596
+#, c-format
+msgid "Failed to spawn child process “%s� (%s)"
+msgstr "Falló al ejecutar el proceso hijo «%s» (%s)"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Falló al bifurcar (fork) (%s)"
 
-#: ../glib/gspawn.c:1543 ../glib/gspawn-win32.c:368
+#: glib/gspawn.c:1784 glib/gspawn-win32.c:370
 #, c-format
 msgid "Failed to change to directory “%s� (%s)"
 msgstr "Falló al cambiar a la carpeta «%s» (%s)"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s� (%s)"
 msgstr "Falló al ejecutar el proceso hijo «%s» (%s)"
 
-#: ../glib/gspawn.c:1563
+#: glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Falló al redirigir la salida o la entrada del proceso hijo (%s)"
 
-#: ../glib/gspawn.c:1572
+#: glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Falló al bifurcar el proceso hijo (%s)"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s�"
 msgstr "Error desconocido al ejecutar el proceso hijo «%s»"
 
-#: ../glib/gspawn.c:1604
+#: glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Falló al leer suficientes datos desde el conducto del pid hijo (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Falló al leer los datos desde un proceso hijo"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "Falló en la creación de un conducto (pipe) para comunicarse con el proceso "
 "hijo (%s)"
 
-#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
+#: glib/gspawn-win32.c:376 glib/gspawn-win32.c:381 glib/gspawn-win32.c:500
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Falló al ejecutar el proceso hijo (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Nombre de programa no válido: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: glib/gspawn-win32.c:460 glib/gspawn-win32.c:714
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Cadena no válida en el vector del argumento en %d: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: glib/gspawn-win32.c:471 glib/gspawn-win32.c:729
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Cadena no válida en el entorno: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Carpeta de trabajo no válido: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Falló al ejecutar el programa auxiliar (%s)"
 
-#: ../glib/gspawn-win32.c:995
+#: glib/gspawn-win32.c:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5798,170 +5776,170 @@ msgstr ""
 "Falló inesperado en g_io_channel_win32_poll() al leer datos desde un proceso "
 "hijo"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "Una cadena vacía no es un número"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s� is not a signed number"
 msgstr "«%s» no es un número con signo"
 
-#: ../glib/gstrfuncs.c:3281 ../glib/gstrfuncs.c:3384
+#: glib/gstrfuncs.c:3281 glib/gstrfuncs.c:3384
 #, c-format
 msgid "Number “%s� is out of bounds [%s, %s]"
 msgstr "El número «%s» está fuera de los límites [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s� is not an unsigned number"
 msgstr "«%s» no es un número sin signo"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Falló al obtener memoria"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "El carácter se sale del rango para UTF-8"
 
-#: ../glib/gutf8.c:1045 ../glib/gutf8.c:1054 ../glib/gutf8.c:1184
-#: ../glib/gutf8.c:1193 ../glib/gutf8.c:1332 ../glib/gutf8.c:1429
+#: glib/gutf8.c:1045 glib/gutf8.c:1054 glib/gutf8.c:1184 glib/gutf8.c:1193
+#: glib/gutf8.c:1332 glib/gutf8.c:1429
 msgid "Invalid sequence in conversion input"
 msgstr "Secuencia no válida en la entrada de conversión"
 
-#: ../glib/gutf8.c:1343 ../glib/gutf8.c:1440
+#: glib/gutf8.c:1343 glib/gutf8.c:1440
 msgid "Character out of range for UTF-16"
 msgstr "El carácter se sale del rango para UTF-16"
 
-#: ../glib/gutils.c:2229
+#: glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: glib/gutils.c:2245 glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: glib/gutils.c:2246 glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: glib/gutils.c:2247 glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: glib/gutils.c:2248 glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: glib/gutils.c:2249 glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2237
+#: glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2238
+#: glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2239
+#: glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2240
+#: glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2241
+#: glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2242
+#: glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2245
+#: glib/gutils.c:2260
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
-#: ../glib/gutils.c:2246
+#: glib/gutils.c:2261
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
-#: ../glib/gutils.c:2247
+#: glib/gutils.c:2262
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
-#: ../glib/gutils.c:2248
+#: glib/gutils.c:2263
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
-#: ../glib/gutils.c:2249
+#: glib/gutils.c:2264
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
-#: ../glib/gutils.c:2250
+#: glib/gutils.c:2265
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
-#: ../glib/gutils.c:2253
+#: glib/gutils.c:2268
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
-#: ../glib/gutils.c:2254
+#: glib/gutils.c:2269
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
-#: ../glib/gutils.c:2255
+#: glib/gutils.c:2270
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
-#: ../glib/gutils.c:2256
+#: glib/gutils.c:2271
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
-#: ../glib/gutils.c:2257
+#: glib/gutils.c:2272
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
-#: ../glib/gutils.c:2258
+#: glib/gutils.c:2273
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: ../glib/gutils.c:2292 ../glib/gutils.c:2418
+#: glib/gutils.c:2307 glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
-#: ../glib/gutils.c:2296
+#: glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5969,7 +5947,7 @@ msgstr[0] "%u bit"
 msgstr[1] "%u bits"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2363
+#: glib/gutils.c:2378
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -5977,7 +5955,7 @@ msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2368
+#: glib/gutils.c:2383
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -5989,11 +5967,27 @@ msgstr[1] "%s bits"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2431
+#: glib/gutils.c:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
+#~ msgid "No such interface '%s'"
+#~ msgstr "La interfaz «%s» no existe"
+
+#~ msgid "No such method '%s'"
+#~ msgstr "No existe el método «%s»"
+
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable - unknown value '%s'"
+#~ msgstr ""
+#~ "No se puede determinar la dirección del bus desde la variable de entorno "
+#~ "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida"
+
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGS...]"
+
 #~ msgid "Failed to create temp file: %s"
 #~ msgstr "Fallo� al crear el archivo temporal: %s"
 
diff --git a/po/fur.po b/po/fur.po
index 4c2b027d4..68c080f17 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,10 +6,9 @@
 msgid ""
 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: 2018-02-16 15:50+0000\n"
-"PO-Revision-Date: 2018-02-16 21:42+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-06-25 15:14+0000\n"
+"PO-Revision-Date: 2018-06-28 12:19+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
@@ -17,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.8\n"
 
-#: ../gio/gapplication.c:495
+#: ../gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Opzions GApplication"
 
-#: ../gio/gapplication.c:495
+#: ../gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Mostre lis opzions di GApplication"
 
-#: ../gio/gapplication.c:540
+#: ../gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr ""
 "Jentre in modalitât servizi GApplication (doprâ dai file di servizi D-Bus)"
 
-#: ../gio/gapplication.c:552
+#: ../gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Passe sore al ID de aplicazion"
 
@@ -115,8 +114,8 @@ msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr ""
 "Identificadôr aplicazion tal formât D-Bus (p.e. org.esempli.visualizadôr)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
-#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:737
+#: ../gio/glib-compile-resources.c:743 ../gio/glib-compile-resources.c:770
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FILE"
@@ -160,7 +159,7 @@ msgstr "Ûs:\n"
 msgid "Arguments:\n"
 msgstr "Argoments:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGS…]"
 
@@ -344,19 +343,19 @@ msgstr "Gjenar no cognossût"
 msgid "%s filetype"
 msgstr "gjenar di file %s"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: ../gio/gcredentials.c:315 ../gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
 msgstr "GCredentials nol è implementât in chest SO"
 
-#: ../gio/gcredentials.c:467
+#: ../gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Nol esist il supuart par GCredentials pe tô plateforme"
 
-#: ../gio/gcredentials.c:513
+#: ../gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "GCredentials nol conten un ID  di procès su chest SO"
 
-#: ../gio/gcredentials.c:565
+#: ../gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr ""
 
@@ -394,12 +393,17 @@ msgstr "Erôr inte direzion “%s� — l'atribût puarte al è malformât"
 msgid "Error in address “%s� — the family attribute is malformed"
 msgstr "Erôr inte direzion “%s� — l'atribût famee al è malformât"
 
-#: ../gio/gdbusaddress.c:463
+#: ../gio/gdbusaddress.c:423 ../gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s� for address “%s�"
+msgstr "Traspuart “%s� no cognossût o no supuartât pe direzion “%s�"
+
+#: ../gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s� does not contain a colon (:)"
 msgstr "L'element direzion “%s� nol conten un doi ponts (:)"
 
-#: ../gio/gdbusaddress.c:484
+#: ../gio/gdbusaddress.c:488
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s�, in address element “%s� does not contain an equal "
@@ -408,14 +412,14 @@ msgstr ""
 "Cubie clâf/valôr %d, “%s�, intal element direzion “%s� no conten un segn "
 "uguâl"
 
-#: ../gio/gdbusaddress.c:498
+#: ../gio/gdbusaddress.c:502
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s�, in address element "
 "“%s�"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:576
+#: ../gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s� — the unix transport requires exactly one of the keys "
@@ -424,91 +428,86 @@ msgstr ""
 "Erôr inte direzion “%s� — il traspuart unix al domande di stabilî juste une "
 "des clâfs tra “path� o “abstract�"
 
-#: ../gio/gdbusaddress.c:612
+#: ../gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s� — the host attribute is missing or malformed"
 msgstr "Erôr inte direzion “%s� — l'atribût host al mancje o al è malformât"
 
-#: ../gio/gdbusaddress.c:626
+#: ../gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s� — the port attribute is missing or malformed"
 msgstr "Erôr inte direzion “%s� — l'atribût puarte al mancje o al è malformât"
 
-#: ../gio/gdbusaddress.c:640
+#: ../gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s� — the noncefile attribute is missing or malformed"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:661
+#: ../gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Erôr tal inviâ in automatic: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s� for address “%s�"
-msgstr "Traspuart “%s� no cognossût o no supuartât pe direzion “%s�"
-
-#: ../gio/gdbusaddress.c:714
+#: ../gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s�: %s"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:733
+#: ../gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s�: %s"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:742
+#: ../gio/gdbusaddress.c:746
 #, c-format
 msgid "Error reading from nonce file “%s�, expected 16 bytes, got %d"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:760
+#: ../gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s� to stream:"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:969
+#: ../gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "La direzion furnide e je vueide"
 
-#: ../gio/gdbusaddress.c:1082
+#: ../gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr ""
 
-#: ../gio/gdbusaddress.c:1089
+#: ../gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr ""
 
-#: ../gio/gdbusaddress.c:1096
+#: ../gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "Impussibil inviâ in automatic D-Bus cence $DISPLAY X11"
 
-#: ../gio/gdbusaddress.c:1138
+#: ../gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s�: "
 msgstr ""
 
-#: ../gio/gdbusaddress.c:1355
+#: ../gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Scrîf cualsisei caratar par sierâ chest barcon)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: ../gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "Session dbus no je in esecuzion e l'inviament automatic al è falît"
 
-#: ../gio/gdbusaddress.c:1520
+#: ../gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Impussibil determinâ la direzion dal bus di session (no implementade par "
 "chest SO)"
 
-#: ../gio/gdbusaddress.c:1658
+#: ../gio/gdbusaddress.c:1662 ../gio/gdbusconnection.c:7151
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -517,7 +516,7 @@ msgstr ""
 "Impussibil determinâ la direzion dal bus de variabile di ambient "
 "DBUS_STARTER_BUS_TYPE — valôr “%s� no cognossût"
 
-#: ../gio/gdbusaddress.c:1667 ../gio/gdbusconnection.c:7160
+#: ../gio/gdbusaddress.c:1671 ../gio/gdbusconnection.c:7160
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -525,7 +524,7 @@ msgstr ""
 "Impussibil determinâ la direzion dal bus parcè che la variabile di ambient "
 "DBUS_STARTER_BUS_TYPE no je stabilide"
 
-#: ../gio/gdbusaddress.c:1677
+#: ../gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Gjenar di bus %d no cognossût"
@@ -538,7 +537,7 @@ msgstr "Mancjance di contignût inspietade cirint di lei une rie"
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr "Mancjance di contignût inspietade cirint di lei (in sigurece) une rie"
 
-#: ../gio/gdbusauth.c:508
+#: ../gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -546,7 +545,7 @@ msgstr ""
 "Esaurîts ducj i mecanisims di autenticazion disponibii (provâts: %s) "
 "(disponibii: %s)"
 
-#: ../gio/gdbusauth.c:1171
+#: ../gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Anulât vie GDBusAuthObserver::authorize-authenticated-peer"
 
@@ -563,22 +562,22 @@ msgstr ""
 "I permès su pe cartele “%s� no son valits. Si spietave modalitât 0700, vût "
 "0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: ../gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s�: %s"
 msgstr "Erôr tal creâ la cartele “%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: ../gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s� for reading: "
 msgstr "Erôr tal lei il puarteclâfs “%s� pe leture: "
 
-#: ../gio/gdbusauthmechanismsha1.c:402 ../gio/gdbusauthmechanismsha1.c:720
+#: ../gio/gdbusauthmechanismsha1.c:369 ../gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr "Rie %d dal puarteclâfs su “%s� cun contignût “%s� e je malformade "
 
-#: ../gio/gdbusauthmechanismsha1.c:416 ../gio/gdbusauthmechanismsha1.c:734
+#: ../gio/gdbusauthmechanismsha1.c:383 ../gio/gdbusauthmechanismsha1.c:701
 #, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -586,7 +585,7 @@ msgstr ""
 "Il prin token de rie %d dal puarteclâfs su “%s� cul contignût “%s� al è "
 "malformât"
 
-#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:748
+#: ../gio/gdbusauthmechanismsha1.c:397 ../gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -594,37 +593,37 @@ msgstr ""
 "Il secont token de rie %d dal puarteclâfs su “%s� cul contignût “%s� al è "
 "malformât"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: ../gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
 msgstr "No si à cjatât il cookie cul id %d intal puarteclâfs su “%s�"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: ../gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Erôr tal eliminâ il file di bloc passât “%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: ../gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s�: %s"
 msgstr "Erôr tal creâ il file di bloc “%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: ../gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
 msgstr "Erôr tal sierâ il file di bloc (cence colegament) “%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: ../gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s�: %s"
 msgstr "Erôr tal discolegâ il file di bloc “%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: ../gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s� for writing: "
 msgstr "Erôr tal vierzi il puarteclâfs “%s� pe scriture:"
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: ../gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
 msgstr "(In plui no si è rivâts ancje a molâ il bloc par “%s�: %s) "
@@ -643,54 +642,64 @@ msgid ""
 msgstr ""
 
 #: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
+"No such interface “org.freedesktop.DBus.Properties� on object at path %s"
 msgstr ""
 "Interface 'org.freedesktop.DBus.Properties' inesistente sul ogjet tal "
 "percors %s"
 
 #: ../gio/gdbusconnection.c:4266
-#, c-format
-msgid "No such property '%s'"
+#, fuzzy, c-format
+#| msgid "No such property '%s'"
+msgid "No such property “%s�"
 msgstr "Proprietât '%s' inesistente"
 
 #: ../gio/gdbusconnection.c:4278
-#, c-format
-msgid "Property '%s' is not readable"
+#, fuzzy, c-format
+#| msgid "Property '%s' is not readable"
+msgid "Property “%s� is not readable"
 msgstr "La proprietât '%s' no je leibile"
 
 #: ../gio/gdbusconnection.c:4289
-#, c-format
-msgid "Property '%s' is not writable"
+#, fuzzy, c-format
+#| msgid "Property '%s' is not writable"
+msgid "Property “%s� is not writable"
 msgstr "La proprietât '%s' no je scrivibile"
 
 #: ../gio/gdbusconnection.c:4309
-#, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+#, fuzzy, c-format
+#| msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+msgid "Error setting property “%s�: Expected type “%s� but got “%s�"
 msgstr ""
 "Erôr tal configurâ la proprietât '%s': si spietave gjenar '%s' ma si à vût "
 "'%s'"
 
 #: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
 #: ../gio/gdbusconnection.c:6591
-#, c-format
-msgid "No such interface '%s'"
+#, fuzzy, c-format
+#| msgid "No such interface '%s'"
+msgid "No such interface “%s�"
 msgstr "Interface '%s' inesistente"
 
 #: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7100
-#, c-format
-msgid "No such interface '%s' on object at path %s"
+#, fuzzy, c-format
+#| msgid "No such interface '%s' on object at path %s"
+msgid "No such interface “%s� on object at path %s"
 msgstr "Interface '%s' inesistente sul ogjet tal percors %s"
 
 #: ../gio/gdbusconnection.c:4938
-#, c-format
-msgid "No such method '%s'"
+#, fuzzy, c-format
+#| msgid "No such method '%s'"
+msgid "No such method “%s�"
 msgstr "Metodi '%s' inesistent"
 
 #: ../gio/gdbusconnection.c:4969
-#, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
+#, fuzzy, c-format
+#| msgid "Type of message, '%s', does not match expected type '%s'"
+msgid "Type of message, “%s�, does not match expected type “%s�"
 msgstr "Il gjenar di messaç, '%s', nol corispuint il gjenar spietât '%s'"
 
 #: ../gio/gdbusconnection.c:5167
@@ -709,52 +718,45 @@ msgid "Unable to set property %s.%s"
 msgstr "Impussibil stabilî la proprietât %s.%s"
 
 #: ../gio/gdbusconnection.c:5627
-#, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
+#, fuzzy, c-format
+#| msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Method “%s� returned type “%s�, but expected “%s�"
 msgstr "Il metodi '%s' al à tornât il gjenar '%s', ma si spietave '%s'"
 
 #: ../gio/gdbusconnection.c:6702
-#, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+#, fuzzy, c-format
+#| msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgid "Method “%s� on interface “%s� with signature “%s� does not exist"
 msgstr "Il metodi '%s' su la interface '%s' cun firme '%s' nol esist"
 
 #: ../gio/gdbusconnection.c:6823
 #, c-format
 msgid "A subtree is already exported for %s"
-msgstr ""
-
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Impussibil determinâ la direzion dal bus de variabile di ambient "
-"DBUS_STARTER_BUS_TYPE — valôr '%s' no cognossût"
+msgstr "Un sot-arbul al è za espuartât par %s"
 
-#: ../gio/gdbusmessage.c:1246
+#: ../gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "il gjenar al è NO VALIT"
 
-#: ../gio/gdbusmessage.c:1257
+#: ../gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "Messaç METHOD_CALL: il cjamp di intestazion PATH o MEMBER al mancje"
 
-#: ../gio/gdbusmessage.c:1268
+#: ../gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "Messaç METHOD_RETURN: il cjamp di intestazion REPLY_SERIAL al mancje"
 
-#: ../gio/gdbusmessage.c:1280
+#: ../gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr ""
 "Messaç di ERÔR: il cjamp di intestazion REPLY_SERIAL o ERROR_NAME al mancje"
 
-#: ../gio/gdbusmessage.c:1293
+#: ../gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr ""
 "Messaç SIGNAL: il cjamp di intestazion PATH, INTERFACE o MEMBER al mancje"
 
-#: ../gio/gdbusmessage.c:1301
+#: ../gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -762,7 +764,7 @@ msgstr ""
 "Messaç SIGNAL: il cjamp di intestazion PATH al sta doprant il valôr "
 "riservât /org/freedesktop/DBus/Local"
 
-#: ../gio/gdbusmessage.c:1309
+#: ../gio/gdbusmessage.c:1311
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
@@ -770,19 +772,20 @@ msgstr ""
 "Messaç SIGNAL: il cjamp di intestazion INTERFACE al sta doprant il valôr "
 "riservât org.freedesktop.DBus.Local"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
+#: ../gio/gdbusmessage.c:1359 ../gio/gdbusmessage.c:1419
 #, c-format
 msgid "Wanted to read %lu byte but only got %lu"
 msgid_plural "Wanted to read %lu bytes but only got %lu"
 msgstr[0] "Si voleve lei %lu byte, ma si à vût dome %lu"
 msgstr[1] "Si voleve lei %lu byte, ma si à vût dome %lu"
 
-#: ../gio/gdbusmessage.c:1371
+#: ../gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s� but found byte %d"
 msgstr ""
+"Si spietave un byte NUL dopo de stringhe “%s� ma si à cjatât il byte %d"
 
-#: ../gio/gdbusmessage.c:1390
+#: ../gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -792,17 +795,17 @@ msgstr ""
 "offset %d (la lungjece de stringhe e je %d). La stringhe UTF-8 valide fin "
 "chel pont e jere “%s�"
 
-#: ../gio/gdbusmessage.c:1593
+#: ../gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus object path"
 msgstr "Il valôr “%s� analizât nol è un percors di ogjet D-Bus valit"
 
-#: ../gio/gdbusmessage.c:1615
+#: ../gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature"
 msgstr "Il valôr “%s� analizât no je une firme D-Bus valide"
 
-#: ../gio/gdbusmessage.c:1662
+#: ../gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -811,25 +814,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gio/gdbusmessage.c:1682
+#: ../gio/gdbusmessage.c:1684
 #, c-format
 msgid ""
 "Encountered array of type “a%c�, expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
 msgstr ""
 
-#: ../gio/gdbusmessage.c:1849
+#: ../gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s� for variant is not a valid D-Bus signature"
 msgstr "Il valôr “%s� analizât pal variant no je une firme D-Bus valide"
 
-#: ../gio/gdbusmessage.c:1873
+#: ../gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s� from the D-Bus wire format"
 msgstr ""
 
-#: ../gio/gdbusmessage.c:2055
+#: ../gio/gdbusmessage.c:2057
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l�) or 0x42 (“B�) but found value "
@@ -838,23 +841,23 @@ msgstr ""
 "Valôr di endian no valit. Si spietave 0x6c (“l�) o 0x42 (“B�) ma si à cjatât "
 "il valôr 0x%02x"
 
-#: ../gio/gdbusmessage.c:2068
+#: ../gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "Version maiôr dal protocol no valide. Si spietave 1 ma si à cjatât %d"
 
-#: ../gio/gdbusmessage.c:2124
+#: ../gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s� found but message body is empty"
 msgstr ""
 "Cjatade intestazion di firme cun firme “%s� ma il cuarp dal messaç al è vueit"
 
-#: ../gio/gdbusmessage.c:2138
+#: ../gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature (for body)"
 msgstr "Il valôr “%s� analizât no je une firme D-Bus valide (pal cuarp)"
 
-#: ../gio/gdbusmessage.c:2168
+#: ../gio/gdbusmessage.c:2170
 #, c-format
 msgid "No signature header in message but the message body is %u byte"
 msgid_plural "No signature header in message but the message body is %u bytes"
@@ -865,32 +868,34 @@ msgstr[1] ""
 "Nissune intestazion di firme tal messaç, ma il cuarp dal messaç al è di %u "
 "byte"
 
-#: ../gio/gdbusmessage.c:2178
+#: ../gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "Impussibil deserializâ il messaç: "
 
-#: ../gio/gdbusmessage.c:2519
+#: ../gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s� to the D-Bus wire format"
 msgstr ""
 
-#: ../gio/gdbusmessage.c:2656
+#: ../gio/gdbusmessage.c:2658
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
 msgstr ""
+"Il numar dai descritôrs di file tal messaç (%d) al è diviers dal cjamp di "
+"intestazion (%d)"
 
-#: ../gio/gdbusmessage.c:2664
+#: ../gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "Impussibil serializâ il messaç: "
 
-#: ../gio/gdbusmessage.c:2708
+#: ../gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s� but there is no signature header"
 msgstr "Il cuarp dal messaç al à firme “%s� ma no je la intestazion de firme"
 
-#: ../gio/gdbusmessage.c:2718
+#: ../gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s� but signature in the header field is "
@@ -899,19 +904,19 @@ msgstr ""
 "Il cuarp dal messaç al à une firme di gjenar “%s�, ma la firme tal cjamp de "
 "intestazion e je “%s�"
 
-#: ../gio/gdbusmessage.c:2734
+#: ../gio/gdbusmessage.c:2736
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)�"
 msgstr ""
 "Il cuarp dal messaç al è vueit ma la firme tal cjamp de intestazion e je "
 "“(%s)�"
 
-#: ../gio/gdbusmessage.c:3287
+#: ../gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s�"
 msgstr ""
 
-#: ../gio/gdbusmessage.c:3295
+#: ../gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr ""
 
@@ -942,7 +947,7 @@ msgstr ""
 
 #: ../gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
-msgstr ""
+msgstr "Spazi di non astrat no supuartât"
 
 #: ../gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
@@ -986,61 +991,61 @@ msgstr ""
 "\n"
 "Dopre “%s COMANT --help� par vê jutori su ogni comant.\n"
 
-#: ../gio/gdbus-tool.c:167 ../gio/gdbus-tool.c:234 ../gio/gdbus-tool.c:306
-#: ../gio/gdbus-tool.c:330 ../gio/gdbus-tool.c:811 ../gio/gdbus-tool.c:1150
-#: ../gio/gdbus-tool.c:1592
+#: ../gio/gdbus-tool.c:185 ../gio/gdbus-tool.c:252 ../gio/gdbus-tool.c:324
+#: ../gio/gdbus-tool.c:348 ../gio/gdbus-tool.c:834 ../gio/gdbus-tool.c:1171
+#: ../gio/gdbus-tool.c:1613
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erôr: %s\n"
 
-#: ../gio/gdbus-tool.c:178 ../gio/gdbus-tool.c:247 ../gio/gdbus-tool.c:1608
+#: ../gio/gdbus-tool.c:196 ../gio/gdbus-tool.c:265 ../gio/gdbus-tool.c:1629
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:216
+#: ../gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Erôr: %s nol è un non valit\n"
 
-#: ../gio/gdbus-tool.c:364
+#: ../gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Conet al bus di sisteme"
 
-#: ../gio/gdbus-tool.c:365
+#: ../gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Conet al bus di session"
 
-#: ../gio/gdbus-tool.c:366
+#: ../gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Conet ae direzion D-Bus furnide"
 
-#: ../gio/gdbus-tool.c:376
+#: ../gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:377
+#: ../gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
-msgstr ""
+msgstr "Opzions che a specifichin il pont finâl (endpoint) de conession"
 
-#: ../gio/gdbus-tool.c:399
+#: ../gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
-msgstr ""
+msgstr "Nissun pont finâl (endpoint) di conession specificât"
 
-#: ../gio/gdbus-tool.c:409
+#: ../gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
-msgstr ""
+msgstr "Plui ponts finâi (endpoint) di conession specificâts"
 
-#: ../gio/gdbus-tool.c:479
+#: ../gio/gdbus-tool.c:497
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s� does not exist\n"
 msgstr ""
 "Avertiment: In acuardi cui dâts di introspezion, la interface “%s� no esist\n"
 
-#: ../gio/gdbus-tool.c:488
+#: ../gio/gdbus-tool.c:506
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s� does not exist on "
@@ -1049,167 +1054,166 @@ msgstr ""
 "Avertiment: In acuardi cui dâts di introspezion, il metodi “%s� nol esist su "
 "pe interface “%s�\n"
 
-#: ../gio/gdbus-tool.c:550
+#: ../gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Destinazion opzionâl pal segnâl (non univoc)"
 
-#: ../gio/gdbus-tool.c:551
+#: ../gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Percors ogjet dulà emeti il segnâl"
 
-#: ../gio/gdbus-tool.c:552
+#: ../gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Segnâl e non interface"
 
-#: ../gio/gdbus-tool.c:587
+#: ../gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Emet un segnâl."
 
-#: ../gio/gdbus-tool.c:642 ../gio/gdbus-tool.c:944 ../gio/gdbus-tool.c:1698
-#: ../gio/gdbus-tool.c:1931 ../gio/gdbus-tool.c:2152
+#: ../gio/gdbus-tool.c:658 ../gio/gdbus-tool.c:965 ../gio/gdbus-tool.c:1715
+#: ../gio/gdbus-tool.c:1944 ../gio/gdbus-tool.c:2164
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Erôr tal coneti: %s\n"
 
-#: ../gio/gdbus-tool.c:659 ../gio/gdbus-tool.c:961 ../gio/gdbus-tool.c:1715
-#: ../gio/gdbus-tool.c:1956
-#, c-format
-msgid "Error: Destination is not specified\n"
-msgstr "Erôr: Destinazion no specificade\n"
-
-#: ../gio/gdbus-tool.c:670
+#: ../gio/gdbus-tool.c:678
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "Erôr: %s nol è un non bus univoc valit.\n"
 
-#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
+#: ../gio/gdbus-tool.c:697 ../gio/gdbus-tool.c:1008 ../gio/gdbus-tool.c:1758
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "Erôr: il percors ogjet nol è specificât\n"
 
-#: ../gio/gdbus-tool.c:705 ../gio/gdbus-tool.c:1007 ../gio/gdbus-tool.c:1761
-#: ../gio/gdbus-tool.c:2002
+#: ../gio/gdbus-tool.c:720 ../gio/gdbus-tool.c:1028 ../gio/gdbus-tool.c:1778
+#: ../gio/gdbus-tool.c:2015
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Erôr: %s nol è un percors ogjet valit\n"
 
-#: ../gio/gdbus-tool.c:720
+#: ../gio/gdbus-tool.c:740
 #, c-format
 msgid "Error: Signal name is not specified\n"
 msgstr "Erôr: il non dal segnâl nol è specificât\n"
 
-#: ../gio/gdbus-tool.c:731
+#: ../gio/gdbus-tool.c:754
 #, c-format
 msgid "Error: Signal name “%s� is invalid\n"
 msgstr "Erôr: il non segnâl “%s� nol è valit\n"
 
-#: ../gio/gdbus-tool.c:743
+#: ../gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Erôr: %s nol è un non interface valit\n"
 
-#: ../gio/gdbus-tool.c:749
+#: ../gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Erôr: %s nol è un non membri valit\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:786 ../gio/gdbus-tool.c:1119
+#: ../gio/gdbus-tool.c:809 ../gio/gdbus-tool.c:1140
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Erôr tal analizâ il parametri %d: %s\n"
 
-#: ../gio/gdbus-tool.c:818
+#: ../gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:845
+#: ../gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:846
+#: ../gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:847
+#: ../gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Metodi e non interface"
 
-#: ../gio/gdbus-tool.c:848
+#: ../gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Timp massim in seconts"
 
-#: ../gio/gdbus-tool.c:889
+#: ../gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
-msgstr ""
+msgstr "Invoche un metodi suntun ogjet rimot."
+
+#: ../gio/gdbus-tool.c:982 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1969
+#, c-format
+msgid "Error: Destination is not specified\n"
+msgstr "Erôr: Destinazion no specificade\n"
 
-#: ../gio/gdbus-tool.c:972 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1967
+#: ../gio/gdbus-tool.c:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Erôr: %s nol è un non bus valit\n"
 
-#: ../gio/gdbus-tool.c:1022
+#: ../gio/gdbus-tool.c:1043
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "Erôr: il non dal metodi nol è specificât\n"
 
-#: ../gio/gdbus-tool.c:1033
+#: ../gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s� is invalid\n"
 msgstr "Erôr: il non dal metodi “%s� nol è valit\n"
 
-#: ../gio/gdbus-tool.c:1111
+#: ../gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s�: %s\n"
 msgstr "Erôr tal analizâ il parametri %d di gjenar “%s�: %s\n"
 
-#: ../gio/gdbus-tool.c:1555
+#: ../gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:1556
+#: ../gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:1557
+#: ../gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Stampe XML"
 
-#: ../gio/gdbus-tool.c:1558
+#: ../gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr ""
 
-#: ../gio/gdbus-tool.c:1559
+#: ../gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Dome stampe proprietâts"
 
-#: ../gio/gdbus-tool.c:1650
+#: ../gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr ""
 
-#: ../gio/gdbus-tool.c:1853
+#: ../gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Non di destinazion di monitorâ"
 
-#: ../gio/gdbus-tool.c:1854
+#: ../gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Percors dal ogjet di monitorâ"
 
-#: ../gio/gdbus-tool.c:1883
+#: ../gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Monitore un ogjet rimot."
 
-#: ../gio/gdbus-tool.c:1941
+#: ../gio/gdbus-tool.c:1954
 #, c-format
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr "Erôr: impussibil monitorâ une conession non-message-bus\n"
 
-#: ../gio/gdbus-tool.c:2065
+#: ../gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Servizi di ativâ prime di spietâ par chel altri (non ben-cognossût)"
 
-#: ../gio/gdbus-tool.c:2068
+#: ../gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1217,69 +1221,69 @@ msgstr ""
 "Timp di spietâ prime di jessi cuntun erôr (seconts); 0 par no vê scjadince "
 "(predefinît)"
 
-#: ../gio/gdbus-tool.c:2116
+#: ../gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPZION…] NON-BUS"
 
-#: ../gio/gdbus-tool.c:2118
+#: ../gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Spiete che al vegni fûr un non di bus."
 
-#: ../gio/gdbus-tool.c:2194
+#: ../gio/gdbus-tool.c:2206
 #, fuzzy, c-format
 #| msgid "Error: object path not specified.\n"
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Erôr: percors ogjet no specificât.\n"
 
-#: ../gio/gdbus-tool.c:2199
+#: ../gio/gdbus-tool.c:2211
 #, fuzzy, c-format
 #| msgid "Error: object path not specified.\n"
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Erôr: percors ogjet no specificât.\n"
 
-#: ../gio/gdbus-tool.c:2204
+#: ../gio/gdbus-tool.c:2216
 #, c-format
 msgid "Error: Too many arguments.\n"
 msgstr "Erôr: masse argoments.\n"
 
-#: ../gio/gdbus-tool.c:2212 ../gio/gdbus-tool.c:2219
+#: ../gio/gdbus-tool.c:2224 ../gio/gdbus-tool.c:2231
 #, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Erôr: %s nol è un non di bus ben-cognossût valit\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: ../gio/gdesktopappinfo.c:2023 ../gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Cence non"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: ../gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Il file .desktop nol specifiche il cjamp Exec"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Impussibil cjatâ il terminâl necessari pe aplicazion"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: ../gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "Impussibil creâ la cartele dal utent pe configurazion de aplicazion %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: ../gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Impussibil creâ la cartele dal utent pe configurazion MIME %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: ../gio/gdesktopappinfo.c:3446 ../gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "La informazion de aplicazion e mancje di un identificadôr"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: ../gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Impussibil creâ il file .desktop %s dal utent"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: ../gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Definizion personalizade par %s"
@@ -1299,11 +1303,11 @@ msgstr "la unitât no implemente eject o eject_with_operation"
 msgid "drive doesn’t implement polling for media"
 msgstr "la unitât no implemente il control sistematic dai supuarts"
 
-#: ../gio/gdrive.c:776
+#: ../gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "la unitât no implemente la azion start"
 
-#: ../gio/gdrive.c:878
+#: ../gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "la unitât no implemente la azion stop"
 
@@ -1340,14 +1344,14 @@ msgstr "Numar di token malformât (%d) inte codifiche GEmblemedIcon"
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Si spietave un GEmblem par GEmblemedIcon"
 
-#: ../gio/gfile.c:1071 ../gio/gfile.c:1309 ../gio/gfile.c:1447
-#: ../gio/gfile.c:1685 ../gio/gfile.c:1740 ../gio/gfile.c:1798
-#: ../gio/gfile.c:1882 ../gio/gfile.c:1939 ../gio/gfile.c:2003
-#: ../gio/gfile.c:2058 ../gio/gfile.c:3725 ../gio/gfile.c:3780
-#: ../gio/gfile.c:4016 ../gio/gfile.c:4058 ../gio/gfile.c:4526
-#: ../gio/gfile.c:4937 ../gio/gfile.c:5022 ../gio/gfile.c:5112
-#: ../gio/gfile.c:5209 ../gio/gfile.c:5296 ../gio/gfile.c:5397
-#: ../gio/gfile.c:7975 ../gio/gfile.c:8065 ../gio/gfile.c:8149
+#: ../gio/gfile.c:1076 ../gio/gfile.c:1314 ../gio/gfile.c:1452
+#: ../gio/gfile.c:1690 ../gio/gfile.c:1745 ../gio/gfile.c:1803
+#: ../gio/gfile.c:1887 ../gio/gfile.c:1944 ../gio/gfile.c:2008
+#: ../gio/gfile.c:2063 ../gio/gfile.c:3738 ../gio/gfile.c:3793
+#: ../gio/gfile.c:4029 ../gio/gfile.c:4071 ../gio/gfile.c:4539
+#: ../gio/gfile.c:4950 ../gio/gfile.c:5035 ../gio/gfile.c:5125
+#: ../gio/gfile.c:5222 ../gio/gfile.c:5309 ../gio/gfile.c:5410
+#: ../gio/gfile.c:7988 ../gio/gfile.c:8078 ../gio/gfile.c:8162
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Operazion no supuartade"
@@ -1356,75 +1360,75 @@ msgstr "Operazion no supuartade"
 #. * trying to find the enclosing (user visible)
 #. * mount of a file, but none exists.
 #.
-#: ../gio/gfile.c:1570
+#: ../gio/gfile.c:1575
 msgid "Containing mount does not exist"
 msgstr "Il montaç contignût nol esist"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: ../gio/gfile.c:2622 ../gio/glocalfile.c:2389
 msgid "Can’t copy over directory"
 msgstr "Impussibil copiâ sore de cartele"
 
-#: ../gio/gfile.c:2677
+#: ../gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Impussibil copiâ la cartele sore de cartele"
 
-#: ../gio/gfile.c:2685
+#: ../gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Il file di destinazion al esist"
 
-#: ../gio/gfile.c:2704
+#: ../gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Impussibil copiâ in maniere ricorsive la cartele"
 
-#: ../gio/gfile.c:2979
+#: ../gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr ""
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: ../gio/gfile.c:2988 ../gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr ""
 
-#: ../gio/gfile.c:3136
+#: ../gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "La copie (reflink/clone) tra i montaçs no je supuartade"
 
-#: ../gio/gfile.c:3140
+#: ../gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "La copie (reflink/clone) no je supuartade o no je valide"
 
-#: ../gio/gfile.c:3145
+#: ../gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "La copie (reflink/clone) no je supuartade o no à funzionât"
 
-#: ../gio/gfile.c:3208
+#: ../gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Impussibil copiâ il file speciâl"
 
-#: ../gio/gfile.c:4006
+#: ../gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Furnît valôr di colegament simbolic no valit"
 
-#: ../gio/gfile.c:4167
+#: ../gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Scovacere no supuartade"
 
-#: ../gio/gfile.c:4279
+#: ../gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c�"
 msgstr "I nons dai file no puedin contignî “%c�"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6773 ../gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "il volum nol implemente la azion mount"
 
-#: ../gio/gfile.c:6869
+#: ../gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "No je regjistrade nissune aplicazion par gjestî chest file"
 
 #: ../gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
-msgstr ""
+msgstr "L'enumeradôr al è sierât"
 
 #: ../gio/gfileenumerator.c:219 ../gio/gfileenumerator.c:278
 #: ../gio/gfileenumerator.c:377 ../gio/gfileenumerator.c:476
@@ -1433,7 +1437,7 @@ msgstr ""
 
 #: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
-msgstr ""
+msgstr "L'enumeradôr dal file al è za sierât"
 
 #: ../gio/gfileicon.c:236
 #, c-format
@@ -1546,7 +1550,7 @@ msgid "Could not parse “%s� as IP address mask"
 msgstr "Impussibil analizâ “%s� come mascare de direzion IP"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:218
+#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:220
 msgid "Not enough space for socket address"
 msgstr "No vonde spazi pe direzion dal socket"
 
@@ -1589,17 +1593,13 @@ msgstr "Ûs:"
 msgid "Print version information and exit."
 msgstr "Stampe informazions su la version e jes."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGS...]"
-
 #: ../gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Comants:"
 
 #: ../gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
-msgstr ""
+msgstr "Met dongje i file su la jessude standard (standard output)"
 
 #: ../gio/gio-tool.c:230
 msgid "Copy one or more files"
@@ -1647,7 +1647,7 @@ msgstr "Elimine un o plui file"
 
 #: ../gio/gio-tool.c:241
 msgid "Read from standard input and save"
-msgstr ""
+msgstr "Lei de jentrade standard (standard input) e salve"
 
 #: ../gio/gio-tool.c:242
 msgid "Set a file attribute"
@@ -1675,7 +1675,7 @@ msgstr "Erôr tal scrivi su stdout"
 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1235
 #: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
@@ -1695,7 +1695,8 @@ msgstr ""
 
 #: ../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:139 ../gio/gio-tool-remove.c:72
+#: ../gio/gio-tool-mount.c:1285 ../gio/gio-tool-open.c:139
+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Nissune posizion furnide"
 
@@ -1713,7 +1714,7 @@ msgstr "Domande prime di sorescrivi"
 
 #: ../gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
-msgstr ""
+msgstr "Preserve ducj i atribûts"
 
 #: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
 #: ../gio/gio-tool-save.c:49
@@ -1826,7 +1827,7 @@ msgstr "uri: %s\n"
 #: ../gio/gio-tool-info.c:228
 #, c-format
 msgid "Settable attributes:\n"
-msgstr ""
+msgstr "Atribûts che si pues configurâ:\n"
 
 #: ../gio/gio-tool-info.c:252
 #, c-format
@@ -1984,69 +1985,96 @@ msgstr ""
 msgid "Monitor files or directories for changes."
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:58
+#: ../gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:63 ../gio/gio-tool-mount.c:66
 msgid "DEVICE"
 msgstr "DISPOSITÃŽF"
 
-#: ../gio/gio-tool-mount.c:60
+#: ../gio/gio-tool-mount.c:64
 msgid "Unmount"
 msgstr "Dismonte"
 
-#: ../gio/gio-tool-mount.c:61
+#: ../gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "Pare fûr"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:66
+msgid "Stop drive with device file"
+msgstr ""
+
+#: ../gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:67
 msgid "SCHEME"
 msgstr "SCHEME"
 
-#: ../gio/gio-tool-mount.c:63
+#: ../gio/gio-tool-mount.c:68
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:64
+#: ../gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
 msgstr ""
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: ../gio/gio-tool-mount.c:71
 msgid "List"
 msgstr "Liste"
 
-#: ../gio/gio-tool-mount.c:67
+#: ../gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:68
+#: ../gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: ../gio/gio-tool-mount.c:74
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr ""
+
+#: ../gio/gio-tool-mount.c:74
+#, fuzzy
+#| msgctxt "GDateTime"
+#| msgid "PM"
+msgid "PIM"
+msgstr "PM"
+
+#: ../gio/gio-tool-mount.c:75
+msgid "Mount a TCRYPT hidden volume"
+msgstr ""
+
+#: ../gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr ""
+
+#: ../gio/gio-tool-mount.c:264 ../gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:897
+#: ../gio/gio-tool-mount.c:524
+msgid "No drive for device file"
+msgstr ""
+
+#: ../gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:950
+#: ../gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
 msgstr ""
 
-#: ../gio/gio-tool-mount.c:1145
+#: ../gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
 msgstr ""
 
@@ -2078,11 +2106,11 @@ msgstr ""
 
 #: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
 msgid "Ignore nonexistent files, never prompt"
-msgstr ""
+msgstr "Ignore i file inesistents, no sta domandâ mai"
 
 #: ../gio/gio-tool-remove.c:52
 msgid "Delete the given files."
-msgstr ""
+msgstr "Elimine i file furnîts."
 
 #: ../gio/gio-tool-rename.c:45
 msgid "NAME"
@@ -2104,15 +2132,15 @@ msgstr "Masse argoments"
 #: ../gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
-msgstr ""
+msgstr "Cambiâ di non lât ben. Gnûf uri: %s\n"
 
 #: ../gio/gio-tool-save.c:50
 msgid "Only create if not existing"
-msgstr ""
+msgstr "Cree dome se nol esist"
 
 #: ../gio/gio-tool-save.c:51
 msgid "Append to end of file"
-msgstr ""
+msgstr "Zonte ae fin dal file"
 
 #: ../gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
@@ -2124,17 +2152,18 @@ msgstr ""
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../gio/gio-tool-save.c:55
+#, fuzzy
 msgid "Print new etag at end"
-msgstr ""
+msgstr "Stampe gnûf etag ae fin"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../gio/gio-tool-save.c:57
 msgid "The etag of the file being overwritten"
-msgstr ""
+msgstr "Il etag dal file che si sta par sorescrivi"
 
 #: ../gio/gio-tool-save.c:57
 msgid "ETAG"
-msgstr ""
+msgstr "ETAG"
 
 #: ../gio/gio-tool-save.c:113
 msgid "Error reading from standard input"
@@ -2144,7 +2173,7 @@ msgstr "Erôr tal lei dal standard input"
 #: ../gio/gio-tool-save.c:139
 #, c-format
 msgid "Etag not available\n"
-msgstr ""
+msgstr "Etag no disponibil\n"
 
 #: ../gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
@@ -2207,12 +2236,12 @@ msgstr "Seguìs i colegaments simbolics, i montaçs e lis scurtis"
 msgid "List contents of directories in a tree-like format."
 msgstr "Liste i contignûts des cartelis intun formât a arbul."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: ../gio/glib-compile-resources.c:143 ../gio/glib-compile-schemas.c:1515
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "L'element <%s> nol è permetût dentri di <%s>"
 
-#: ../gio/glib-compile-resources.c:146
+#: ../gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "L'element <%s> nol è permetût a nivel primari"
@@ -2232,98 +2261,105 @@ msgstr "No si è rivâts a localizâ “%s� in nissune cartele sorzint"
 msgid "Failed to locate “%s� in current directory"
 msgstr "No si è rivâts a localizâ “%s� inte cartele atuâl"
 
-#: ../gio/glib-compile-resources.c:290
+#: ../gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s�"
 msgstr "Opzion di elaborazion “%s� no cognossude"
 
-#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
+#. Translators: the first %s is a gresource XML attribute,
+#. * the second %s is an environment variable, and the third
+#. * %s is a command line tool
+#.
+#: ../gio/glib-compile-resources.c:313 ../gio/glib-compile-resources.c:370
+#: ../gio/glib-compile-resources.c:427
 #, c-format
-msgid "Failed to create temp file: %s"
-msgstr "No si è rivâts a creâ il file temp: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr ""
 
-#: ../gio/glib-compile-resources.c:382
+#: ../gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Erôr tal lei il file %s: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: ../gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Erôr tal comprimi il file %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: ../gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
+#: ../gio/glib-compile-resources.c:736 ../gio/glib-compile-schemas.c:2138
 msgid "Show program version and exit"
 msgstr "Mostre la version dal program e jes"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
+#: ../gio/glib-compile-resources.c:737
+#, fuzzy
+#| msgid "name of the output file"
+msgid "Name of the output file"
 msgstr "non dal file di jessude"
 
-#: ../gio/glib-compile-resources.c:666
+#: ../gio/glib-compile-resources.c:738
 msgid ""
-"The directories where files are to be read from (default to current "
+"The directories to load files referenced in FILE from (default: current "
 "directory)"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: ../gio/glib-compile-resources.c:738 ../gio/glib-compile-schemas.c:2139
+#: ../gio/glib-compile-schemas.c:2168
 msgid "DIRECTORY"
 msgstr "CARTELE"
 
-#: ../gio/glib-compile-resources.c:667
+#: ../gio/glib-compile-resources.c:739
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:668
+#: ../gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
+#: ../gio/glib-compile-resources.c:741
+msgid "Generate source code used to link in the resource file into your code"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:670
+#: ../gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
-msgstr ""
+msgstr "Gjenere la liste des dipendencis"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr ""
+#: ../gio/glib-compile-resources.c:743
+msgid "Name of the dependency file to generate"
+msgstr "Non dal file des dipendencis di gjenerâ"
 
-#: ../gio/glib-compile-resources.c:672
+#: ../gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:673
+#: ../gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:674
+#: ../gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:675
+#: ../gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:701
+#: ../gio/glib-compile-resources.c:773
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
 "and the resource file have the extension called .gresource."
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:723
+#: ../gio/glib-compile-resources.c:795
 #, c-format
 msgid "You should give exactly one file name\n"
-msgstr ""
+msgstr "Si scugne dâ juste un non di file\n"
 
 #: ../gio/glib-compile-schemas.c:95
 #, c-format
@@ -2343,7 +2379,7 @@ msgstr ""
 #: ../gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
-msgstr ""
+msgstr "valôr='%s' za specificât"
 
 #: ../gio/glib-compile-schemas.c:136
 #, c-format
@@ -2355,399 +2391,406 @@ msgstr ""
 msgid "<%s> must contain at least one <value>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:315
+#: ../gio/glib-compile-schemas.c:317
 #, c-format
 msgid "<%s> is not contained in the specified range"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:327
+#: ../gio/glib-compile-schemas.c:329
 #, c-format
 msgid "<%s> is not a valid member of the specified enumerated type"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:333
+#: ../gio/glib-compile-schemas.c:335
 #, c-format
 msgid "<%s> contains string not in the specified flags type"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:339
+#: ../gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:373
+#: ../gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:391
+#: ../gio/glib-compile-schemas.c:393
 #, c-format
 msgid "<range> not allowed for keys of type “%s�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:408
+#: ../gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:433
+#: ../gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "categorie l10n no supuartade: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: ../gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n domandât, ma nissun domini gettext furnît"
 
-#: ../gio/glib-compile-schemas.c:453
+#: ../gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:475
+#: ../gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s�: "
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:492
+#: ../gio/glib-compile-schemas.c:494
 msgid ""
 "<choices> cannot be specified for keys tagged as having an enumerated type"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:501
+#: ../gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:513
+#: ../gio/glib-compile-schemas.c:515
 #, c-format
 msgid "<choices> not allowed for keys of type “%s�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:529
+#: ../gio/glib-compile-schemas.c:531
 #, c-format
 msgid "<choice value='%s'/> already given"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:544
+#: ../gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:558
+#: ../gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:562
+#: ../gio/glib-compile-schemas.c:564
 msgid ""
 "<aliases> can only be specified for keys with enumerated or flags types or "
 "after <choices>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:581
+#: ../gio/glib-compile-schemas.c:583
 #, c-format
 msgid ""
 "<alias value='%s'/> given when “%s� is already a member of the enumerated "
 "type"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:587
+#: ../gio/glib-compile-schemas.c:589
 #, c-format
 msgid "<alias value='%s'/> given when <choice value='%s'/> was already given"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:595
+#: ../gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:605
+#: ../gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s� is not in enumerated type"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:606
+#: ../gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s� is not in <choices>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:621
+#: ../gio/glib-compile-schemas.c:623
 #, c-format
 msgid "<aliases> must contain at least one <alias>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:786
+#: ../gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:796
+#: ../gio/glib-compile-schemas.c:808
 #, c-format
 msgid "Invalid name “%s�: names must begin with a lowercase letter"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:808
+#: ../gio/glib-compile-schemas.c:820
 #, c-format
 msgid ""
 "Invalid name “%s�: invalid character “%c�; only lowercase letters, numbers "
 "and hyphen (“-�) are permitted"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:817
+#: ../gio/glib-compile-schemas.c:829
 #, c-format
 msgid "Invalid name “%s�: two successive hyphens (“--�) are not permitted"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:826
+#: ../gio/glib-compile-schemas.c:838
 #, c-format
 msgid "Invalid name “%s�: the last character may not be a hyphen (“-�)"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:834
+#: ../gio/glib-compile-schemas.c:846
 #, c-format
 msgid "Invalid name “%s�: maximum length is 1024"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:904
+#: ../gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:930
+#: ../gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of� schema"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:941
+#: ../gio/glib-compile-schemas.c:955
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:959
+#: ../gio/glib-compile-schemas.c:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
 "to modify value"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:970
+#: ../gio/glib-compile-schemas.c:984
 #, c-format
 msgid ""
 "Exactly one of “type�, “enum� or “flags� must be specified as an attribute "
 "to <key>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:989
+#: ../gio/glib-compile-schemas.c:1003
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1004
+#: ../gio/glib-compile-schemas.c:1018
 #, c-format
 msgid "Invalid GVariant type string “%s�"
 msgstr "Stringhe di gjenar GVariant “%s� no valide"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: ../gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1047
+#: ../gio/glib-compile-schemas.c:1061
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1055
+#: ../gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1128
+#: ../gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1140
+#: ../gio/glib-compile-schemas.c:1154
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1156
+#: ../gio/glib-compile-schemas.c:1170
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1164
+#: ../gio/glib-compile-schemas.c:1178
 #, c-format
 msgid "Cannot be a list of a schema with a path"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1174
+#: ../gio/glib-compile-schemas.c:1188
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1184
+#: ../gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1194
+#: ../gio/glib-compile-schemas.c:1208
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s� "
 "does not extend “%s�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1211
+#: ../gio/glib-compile-schemas.c:1225
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1218
+#: ../gio/glib-compile-schemas.c:1232
 #, c-format
 msgid "The path of a list must end with “:/�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1227
+#: ../gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s� has path “%s�.  Paths starting with “/apps/�, “/"
 "desktop/� or “/system/� are deprecated."
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1257
+#: ../gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
+#: ../gio/glib-compile-schemas.c:1421 ../gio/glib-compile-schemas.c:1437
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
-msgstr ""
+msgstr "Al è permetût dome un element <%s> dentri <%s>"
 
-#: ../gio/glib-compile-schemas.c:1505
+#: ../gio/glib-compile-schemas.c:1519
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1523
+#: ../gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1613
+#: ../gio/glib-compile-schemas.c:1627
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1681
+#: ../gio/glib-compile-schemas.c:1695
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr ""
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: ../gio/glib-compile-schemas.c:1834 ../gio/glib-compile-schemas.c:1910
+#: ../gio/glib-compile-schemas.c:2025
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict al jere specificât; si jes.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: ../gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Chest file intîr al è stât ignorât.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: ../gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Si ignore chest file.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: ../gio/glib-compile-schemas.c:1959
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+msgid "No such key “%s� in schema “%s� as specified in override file “%s�"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: ../gio/glib-compile-schemas.c:1965 ../gio/glib-compile-schemas.c:1990
+#: ../gio/glib-compile-schemas.c:2050 ../gio/glib-compile-schemas.c:2079
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: ../gio/glib-compile-schemas.c:1969 ../gio/glib-compile-schemas.c:1994
+#: ../gio/glib-compile-schemas.c:2054 ../gio/glib-compile-schemas.c:2083
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " e --strict al jere specificât; si jes.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+#: ../gio/glib-compile-schemas.c:1984
+#, c-format
+msgid ""
+"cannot provide per-desktop overrides for localised key “%s� in schema "
+"“%s� (override file “%s�)"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:2011
 #, c-format
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
+"error parsing key “%s� in schema “%s� as specified in override file “%s�: %s."
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1966
+#: ../gio/glib-compile-schemas.c:2021
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:1984
+#: ../gio/glib-compile-schemas.c:2040
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is outside the "
+"override for key “%s� in schema “%s� in override file “%s� is outside the "
 "range given in the schema"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2012
+#: ../gio/glib-compile-schemas.c:2069
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is not in the "
+"override for key “%s� in schema “%s� in override file “%s� is not in the "
 "list of valid choices"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2069
+#: ../gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2070
+#: ../gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2071
+#: ../gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2099
+#: ../gio/glib-compile-schemas.c:2171
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
 "and the cache file is called gschemas.compiled."
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2120
+#: ../gio/glib-compile-schemas.c:2192
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr ""
 
-#: ../gio/glib-compile-schemas.c:2162
+#: ../gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Nissun file di scheme cjatât: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: ../gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "no si fâs nuie.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: ../gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "file di jessude esistent gjavât.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:544 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Non file %s no valit"
 
-#: ../gio/glocalfile.c:1105
+#: ../gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr ""
@@ -2756,123 +2799,129 @@ msgstr ""
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: ../gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr ""
 
-#: ../gio/glocalfile.c:1267
+#: ../gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr ""
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:1292
+#: ../gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr ""
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: ../gio/glocalfile.c:1206 ../gio/glocalfile.c:2265 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2450 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
-msgstr ""
+msgstr "Non file no valit"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: ../gio/glocalfile.c:1374 ../gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Erôr tal vierzi il file %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: ../gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Erôr tal gjavâ il file %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: ../gio/glocalfile.c:1924
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Erôr tal butâ te scovacere il file %s: %s"
 
-#: ../gio/glocalfile.c:2020
+#: ../gio/glocalfile.c:1947
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Impussibil creâ la cartele scovacere %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: ../gio/glocalfile.c:1969
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: ../gio/glocalfile.c:1978
+#, fuzzy, c-format
+#| msgid "Copy (reflink/clone) between mounts is not supported"
+msgid "Trashing on system internal mounts is not supported"
+msgstr "La copie (reflink/clone) tra i montaçs no je supuartade"
+
+#: ../gio/glocalfile.c:2062 ../gio/glocalfile.c:2082
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:2174
+#: ../gio/glocalfile.c:2117
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:2233
+#: ../gio/glocalfile.c:2176
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2180 ../gio/glocalfile.c:2236
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:2299
+#: ../gio/glocalfile.c:2242
 #, c-format
 msgid "Unable to trash file %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2268
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Erôr tal creâ la cartele %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: ../gio/glocalfile.c:2297
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Il filesystem nol supuarte i colegaments simbolics"
 
-#: ../gio/glocalfile.c:2357
+#: ../gio/glocalfile.c:2300
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr ""
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: ../gio/glocalfile.c:2306 ../glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "Colegaments simbolics no supuartâts"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: ../gio/glocalfile.c:2361 ../gio/glocalfile.c:2396 ../gio/glocalfile.c:2453
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Erôr tal spostâ il file %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: ../gio/glocalfile.c:2384
 msgid "Can’t move directory over directory"
 msgstr "Impussibil spostâ la cartele sore de cartele"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
+#: ../gio/glocalfile.c:2410 ../gio/glocalfileoutputstream.c:935
 #: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
 #: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr ""
 
-#: ../gio/glocalfile.c:2486
+#: ../gio/glocalfile.c:2429
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Erôr tal gjavâ il file di destinazion: %s"
 
-#: ../gio/glocalfile.c:2500
+#: ../gio/glocalfile.c:2443
 msgid "Move between mounts not supported"
 msgstr ""
 
-#: ../gio/glocalfile.c:2691
+#: ../gio/glocalfile.c:2634
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr ""
@@ -2894,79 +2943,79 @@ msgstr ""
 msgid "Error setting extended attribute “%s�: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:1607
+#: ../gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (codifiche no valide)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: ../gio/glocalfileinfo.c:1783 ../gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2038
+#: ../gio/glocalfileinfo.c:2045
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2083
+#: ../gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Gjenar di atribût no valit (si spietave uint32)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: ../gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Gjenar di atribût no valit (si spietave uint64)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: ../gio/glocalfileinfo.c:2127 ../gio/glocalfileinfo.c:2146
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Gjenar di atribût no valit (si spietave une stringhe di byte)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: ../gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2200
+#: ../gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2251
+#: ../gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2274
+#: ../gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: ../gio/glocalfileinfo.c:2291 ../gio/glocalfileinfo.c:2310
+#: ../gio/glocalfileinfo.c:2321
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2293
+#: ../gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2419
+#: ../gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2442
+#: ../gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "Il contest SELinux al scugne jessi diviers di NULL"
 
-#: ../gio/glocalfileinfo.c:2457
+#: ../gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr ""
 
-#: ../gio/glocalfileinfo.c:2464
+#: ../gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux nol è abilitât su chest sisteme"
 
-#: ../gio/glocalfileinfo.c:2556
+#: ../gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr ""
@@ -2989,7 +3038,7 @@ msgstr "Erôr tal cirî tal file: %s"
 msgid "Error closing file: %s"
 msgstr "Erôr tal sierâ il file: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: ../gio/glocalfilemonitor.c:852
 msgid "Unable to find default local file monitor type"
 msgstr ""
 
@@ -3079,49 +3128,49 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: ../gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: ../gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:550
+#: ../gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:635
+#: ../gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:723
+#: ../gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:805
+#: ../gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: ../gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr ""
 
@@ -3130,29 +3179,29 @@ msgstr ""
 msgid "Hostname “%s� contains “[� but not “]�"
 msgstr "Il non host “%s� al conten “[� ma no “]�"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: ../gio/gnetworkmonitorbase.c:211 ../gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr ""
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: ../gio/gnetworkmonitorbase.c:249 ../gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr ""
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
+#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
+#: ../gio/gnetworkmonitornetlink.c:128
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr ""
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: ../gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr ""
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: ../gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Impussibil otignî il stât de rêt: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: ../gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Version di NetworkManager masse vecje"
@@ -3485,12 +3534,12 @@ msgstr ""
 #: ../gio/gsettings-tool.c:787
 #, c-format
 msgid "No schemas installed\n"
-msgstr ""
+msgstr "Nissun scheme instalât\n"
 
 #: ../gio/gsettings-tool.c:866
 #, c-format
 msgid "Empty schema name given\n"
-msgstr ""
+msgstr "Furnît non di scheme vueit\n"
 
 #: ../gio/gsettings-tool.c:921
 #, c-format
@@ -3508,10 +3557,10 @@ msgstr ""
 
 #: ../gio/gsocket.c:399
 msgid "Socket is already closed"
-msgstr ""
+msgstr "Il socket al è za sierât"
 
-#: ../gio/gsocket.c:414 ../gio/gsocket.c:3010 ../gio/gsocket.c:4220
-#: ../gio/gsocket.c:4278
+#: ../gio/gsocket.c:414 ../gio/gsocket.c:3034 ../gio/gsocket.c:4244
+#: ../gio/gsocket.c:4302
 msgid "Socket I/O timed out"
 msgstr ""
 
@@ -3527,11 +3576,11 @@ msgstr ""
 
 #: ../gio/gsocket.c:632
 msgid "Unknown family was specified"
-msgstr ""
+msgstr "E je stade specificade une famee no cognossude"
 
 #: ../gio/gsocket.c:639
 msgid "Unknown protocol was specified"
-msgstr ""
+msgstr "Al è stât specificât un protocol no cognossût"
 
 #: ../gio/gsocket.c:1130
 #, c-format
@@ -3556,7 +3605,7 @@ msgstr ""
 #: ../gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
-msgstr ""
+msgstr "impussibil scoltâ: %s"
 
 #: ../gio/gsocket.c:2168
 #, c-format
@@ -3564,15 +3613,15 @@ msgid "Error binding to address: %s"
 msgstr ""
 
 #: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
-#: ../gio/gsocket.c:2391 ../gio/gsocket.c:2461 ../gio/gsocket.c:2519
-#: ../gio/gsocket.c:2537
+#: ../gio/gsocket.c:2398 ../gio/gsocket.c:2471 ../gio/gsocket.c:2529
+#: ../gio/gsocket.c:2547
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr ""
 
 #: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
-#: ../gio/gsocket.c:2392 ../gio/gsocket.c:2462 ../gio/gsocket.c:2520
-#: ../gio/gsocket.c:2538
+#: ../gio/gsocket.c:2399 ../gio/gsocket.c:2472 ../gio/gsocket.c:2530
+#: ../gio/gsocket.c:2548
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr ""
@@ -3585,86 +3634,86 @@ msgstr ""
 msgid "Unsupported socket family"
 msgstr "Famee dal socket no supuartade"
 
-#: ../gio/gsocket.c:2393
+#: ../gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr ""
 
-#: ../gio/gsocket.c:2411 ../gio/gsocket.c:2440 ../gio/gsocket.c:2487
+#: ../gio/gsocket.c:2418 ../gio/gsocket.c:2447 ../gio/gsocket.c:2497
 #, c-format
 msgid "Interface not found: %s"
-msgstr ""
+msgstr "Interface no cjatade: %s"
 
-#: ../gio/gsocket.c:2427
+#: ../gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
-msgstr ""
+msgstr "Non interface masse lunc"
 
-#: ../gio/gsocket.c:2463
+#: ../gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr ""
 
-#: ../gio/gsocket.c:2521
+#: ../gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr ""
 
-#: ../gio/gsocket.c:2730
+#: ../gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
-msgstr ""
+msgstr "Erôr tal acetâ la conession: %s"
 
-#: ../gio/gsocket.c:2854
+#: ../gio/gsocket.c:2864
 msgid "Connection in progress"
-msgstr ""
+msgstr "Conession in vore"
 
-#: ../gio/gsocket.c:2903
+#: ../gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr ""
 
-#: ../gio/gsocket.c:3073
+#: ../gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
-msgstr ""
+msgstr "Erôr tal ricevi dâts: %s"
 
-#: ../gio/gsocket.c:3268
+#: ../gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
-msgstr ""
+msgstr "Erôr tal inviâ dâts: %s"
 
-#: ../gio/gsocket.c:3455
+#: ../gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
-msgstr ""
+msgstr "Impussibil distudâ il socket: %s"
 
-#: ../gio/gsocket.c:3536
+#: ../gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
-msgstr ""
+msgstr "Erôr tal sierâ il socket: %s"
 
-#: ../gio/gsocket.c:4213
+#: ../gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: ../gio/gsocket.c:4687 ../gio/gsocket.c:4767 ../gio/gsocket.c:4945
+#: ../gio/gsocket.c:4711 ../gio/gsocket.c:4791 ../gio/gsocket.c:4969
 #, c-format
 msgid "Error sending message: %s"
-msgstr ""
+msgstr "Erôr tal inviâ il messaç: %s"
 
-#: ../gio/gsocket.c:4711
+#: ../gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr ""
 
-#: ../gio/gsocket.c:5164 ../gio/gsocket.c:5237 ../gio/gsocket.c:5463
+#: ../gio/gsocket.c:5188 ../gio/gsocket.c:5261 ../gio/gsocket.c:5487
 #, c-format
 msgid "Error receiving message: %s"
-msgstr ""
+msgstr "Erôr tal ricevi il messaç: %s"
 
-#: ../gio/gsocket.c:5735
+#: ../gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr ""
 
-#: ../gio/gsocket.c:5744
+#: ../gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 
@@ -3676,15 +3725,15 @@ msgstr ""
 #: ../gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
-msgstr ""
+msgstr "Impussibil conetisi a %s: "
 
 #: ../gio/gsocketclient.c:192
 msgid "Could not connect: "
-msgstr ""
+msgstr "Impussibil conetisi: "
 
 #: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
-msgstr ""
+msgstr "Erôr no cognossût tal coneti"
 
 #: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535
 msgid "Proxying over a non-TCP connection is not supported."
@@ -3695,11 +3744,11 @@ msgstr ""
 msgid "Proxy protocol “%s� is not supported."
 msgstr ""
 
-#: ../gio/gsocketlistener.c:218
+#: ../gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr ""
 
-#: ../gio/gsocketlistener.c:264
+#: ../gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr ""
 
@@ -3710,16 +3759,16 @@ msgstr ""
 
 #: ../gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
-msgstr ""
+msgstr "Non utent masse lunc pal protocol SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s� is too long for SOCKSv4 protocol"
-msgstr ""
+msgstr "Il non host “%s�al è masse lunc pal protocol SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
-msgstr ""
+msgstr "Il servidôr nol è un servidôr proxy SOCKSv4."
 
 #: ../gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
@@ -3728,7 +3777,7 @@ msgstr ""
 #: ../gio/gsocks5proxy.c:153 ../gio/gsocks5proxy.c:324
 #: ../gio/gsocks5proxy.c:334
 msgid "The server is not a SOCKSv5 proxy server."
-msgstr ""
+msgstr "Il servidôr nol è un servidôr proxy SOCKSv5."
 
 #: ../gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
@@ -3742,7 +3791,7 @@ msgstr ""
 
 #: ../gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
-msgstr ""
+msgstr "Non utent o password masse luncs pal protocol SOCKSv5."
 
 #: ../gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
@@ -3815,7 +3864,7 @@ msgid "Temporarily unable to resolve “%s�"
 msgstr ""
 
 #: ../gio/gthreadedresolver.c:559 ../gio/gthreadedresolver.c:736
-#: ../gio/gthreadedresolver.c:842
+#: ../gio/gthreadedresolver.c:844
 #, c-format
 msgid "Error resolving “%s�"
 msgstr ""
@@ -3920,7 +3969,7 @@ msgstr ""
 msgid "Error closing file descriptor: %s"
 msgstr ""
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: ../gio/gunixmounts.c:2593 ../gio/gunixmounts.c:2646
 msgid "Filesystem root"
 msgstr ""
 
@@ -3929,18 +3978,18 @@ msgstr ""
 msgid "Error writing to file descriptor: %s"
 msgstr ""
 
-#: ../gio/gunixsocketaddress.c:241
+#: ../gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 
-#: ../gio/gvolume.c:437
+#: ../gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gvolume.c:514
+#: ../gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr ""
 
@@ -4130,25 +4179,25 @@ msgid "The pathname “%s� is not an absolute path"
 msgstr ""
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:207
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %H:%M:%S, %e di %B dal %Y"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:210
+#: ../glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:213
+#: ../glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:216
+#: ../glib/gdatetime.c:222
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
@@ -4169,62 +4218,62 @@ msgstr "%I:%M:%S %p"
 #. * non-European) there is no difference between the standalone and
 #. * complete date form.
 #.
-#: ../glib/gdatetime.c:251
+#: ../glib/gdatetime.c:261
 msgctxt "full month name"
 msgid "January"
 msgstr "Zenâr"
 
-#: ../glib/gdatetime.c:253
+#: ../glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "Fevrâr"
 
-#: ../glib/gdatetime.c:255
+#: ../glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "Març"
 
-#: ../glib/gdatetime.c:257
+#: ../glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "Avrîl"
 
-#: ../glib/gdatetime.c:259
+#: ../glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:261
+#: ../glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "Jugn"
 
-#: ../glib/gdatetime.c:263
+#: ../glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "Lui"
 
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "Avost"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "Setembar"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "Otubar"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "Novembar"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "Dicembar"
@@ -4246,132 +4295,132 @@ msgstr "Dicembar"
 #. * other platform.  Here are abbreviated month names in a form
 #. * appropriate when they are used standalone.
 #.
-#: ../glib/gdatetime.c:305
+#: ../glib/gdatetime.c:315
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Zen"
 
-#: ../glib/gdatetime.c:307
+#: ../glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Fev"
 
-#: ../glib/gdatetime.c:309
+#: ../glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:311
+#: ../glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Avr"
 
-#: ../glib/gdatetime.c:313
+#: ../glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:315
+#: ../glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Jug"
 
-#: ../glib/gdatetime.c:317
+#: ../glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Lui"
 
-#: ../glib/gdatetime.c:319
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "Avo"
 
-#: ../glib/gdatetime.c:321
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Set"
 
-#: ../glib/gdatetime.c:323
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Otu"
 
-#: ../glib/gdatetime.c:325
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../glib/gdatetime.c:327
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Dic"
 
-#: ../glib/gdatetime.c:342
+#: ../glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Lunis"
 
-#: ../glib/gdatetime.c:344
+#: ../glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Martars"
 
-#: ../glib/gdatetime.c:346
+#: ../glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Miercus"
 
-#: ../glib/gdatetime.c:348
+#: ../glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Joibe"
 
-#: ../glib/gdatetime.c:350
+#: ../glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Vinars"
 
-#: ../glib/gdatetime.c:352
+#: ../glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Sabide"
 
-#: ../glib/gdatetime.c:354
+#: ../glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Domenie"
 
-#: ../glib/gdatetime.c:369
+#: ../glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Lun"
 
-#: ../glib/gdatetime.c:371
+#: ../glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:373
+#: ../glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Mie"
 
-#: ../glib/gdatetime.c:375
+#: ../glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Joi"
 
-#: ../glib/gdatetime.c:377
+#: ../glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Vin"
 
-#: ../glib/gdatetime.c:379
+#: ../glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Sab"
 
-#: ../glib/gdatetime.c:381
+#: ../glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Dom"
@@ -4393,62 +4442,62 @@ msgstr "Dom"
 #. * (western European, non-European) there is no difference between the
 #. * standalone and complete date form.
 #.
-#: ../glib/gdatetime.c:441
+#: ../glib/gdatetime.c:455
 msgctxt "full month name with day"
 msgid "January"
 msgstr "Zenâr"
 
-#: ../glib/gdatetime.c:443
+#: ../glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "Fevrâr"
 
-#: ../glib/gdatetime.c:445
+#: ../glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "Març"
 
-#: ../glib/gdatetime.c:447
+#: ../glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "Avrîl"
 
-#: ../glib/gdatetime.c:449
+#: ../glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:451
+#: ../glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "Jugn"
 
-#: ../glib/gdatetime.c:453
+#: ../glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "Lui"
 
-#: ../glib/gdatetime.c:455
+#: ../glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "Avost"
 
-#: ../glib/gdatetime.c:457
+#: ../glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "Setembar"
 
-#: ../glib/gdatetime.c:459
+#: ../glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "Otubar"
 
-#: ../glib/gdatetime.c:461
+#: ../glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "Novembar"
 
-#: ../glib/gdatetime.c:463
+#: ../glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "Dicembar"
@@ -4470,74 +4519,74 @@ msgstr "Dicembar"
 #. * month names almost ready to copy and paste here.  In other systems
 #. * due to a bug the result is incorrect in some languages.
 #.
-#: ../glib/gdatetime.c:524
+#: ../glib/gdatetime.c:542
 msgctxt "abbreviated month name with day"
 msgid "Jan"
 msgstr "Zen"
 
-#: ../glib/gdatetime.c:526
+#: ../glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "Fev"
 
-#: ../glib/gdatetime.c:528
+#: ../glib/gdatetime.c:546
 msgctxt "abbreviated month name with day"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:530
+#: ../glib/gdatetime.c:548
 msgctxt "abbreviated month name with day"
 msgid "Apr"
 msgstr "Avr"
 
-#: ../glib/gdatetime.c:532
+#: ../glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:534
+#: ../glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "Jug"
 
-#: ../glib/gdatetime.c:536
+#: ../glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "Lui"
 
-#: ../glib/gdatetime.c:538
+#: ../glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "Avo"
 
-#: ../glib/gdatetime.c:540
+#: ../glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "Set"
 
-#: ../glib/gdatetime.c:542
+#: ../glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "Otu"
 
-#: ../glib/gdatetime.c:544
+#: ../glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../glib/gdatetime.c:546
+#: ../glib/gdatetime.c:564
 msgctxt "abbreviated month name with day"
 msgid "Dec"
 msgstr "Dic"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:563
+#: ../glib/gdatetime.c:581
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:566
+#: ../glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
@@ -4589,7 +4638,7 @@ msgstr ""
 msgid "Failed to rename file “%s� to “%s�: g_rename() failed: %s"
 msgstr ""
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s�: %s"
 msgstr ""
@@ -4604,22 +4653,22 @@ msgstr ""
 msgid "Failed to write file “%s�: fsync() failed: %s"
 msgstr ""
 
-#: ../glib/gfileutils.c:1251
+#: ../glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s� could not be removed: g_unlink() failed: %s"
 msgstr ""
 
-#: ../glib/gfileutils.c:1530
+#: ../glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s� invalid, should not contain a “%s�"
 msgstr ""
 
-#: ../glib/gfileutils.c:1543
+#: ../glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s� doesn’t contain XXXXXX"
 msgstr ""
 
-#: ../glib/gfileutils.c:2105
+#: ../glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s�: %s"
 msgstr ""
@@ -4765,18 +4814,20 @@ msgstr ""
 
 #: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s�"
 msgstr ""
 
 #: ../glib/gmarkup.c:472
-#, c-format
-msgid "'%s' is not a valid name"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "“%s� is not a signed number"
+msgid "“%s� is not a valid name"
+msgstr "“%s� nol è un numar cun segn"
 
 #: ../glib/gmarkup.c:488
-#, c-format
-msgid "'%s' is not a valid name: '%c'"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "“%s� is not a signed number"
+msgid "“%s� is not a valid name: “%c�"
+msgstr "“%s� nol è un numar cun segn"
 
 #: ../glib/gmarkup.c:598
 #, c-format
@@ -4786,36 +4837,36 @@ msgstr ""
 #: ../glib/gmarkup.c:675
 #, c-format
 msgid ""
-"Failed to parse '%-.*s', which should have been a digit inside a character "
-"reference (&#234; for example) - perhaps the digit is too large"
+"Failed to parse “%-.*s�, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
 msgstr ""
 
 #: ../glib/gmarkup.c:687
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
 msgstr ""
 
 #: ../glib/gmarkup.c:713
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
+msgid "Character reference “%-.*s� does not encode a permitted character"
 msgstr ""
 
 #: ../glib/gmarkup.c:751
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
 
 #: ../glib/gmarkup.c:759
 #, c-format
-msgid "Entity name '%-.*s' is not known"
+msgid "Entity name “%-.*s� is not known"
 msgstr ""
 
 #: ../glib/gmarkup.c:764
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
+"character without intending to start an entity — escape ampersand as &amp;"
 msgstr ""
 
 #: ../glib/gmarkup.c:1170
@@ -4825,60 +4876,60 @@ msgstr ""
 #: ../glib/gmarkup.c:1210
 #, c-format
 msgid ""
-"'%s' is not a valid character following a '<' character; it may not begin an "
+"“%s� is not a valid character following a “<� character; it may not begin an "
 "element name"
 msgstr ""
 
 #: ../glib/gmarkup.c:1252
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
+"Odd character “%s�, expected a “>� character to end the empty-element tag "
+"“%s�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1333
 #, c-format
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+"Odd character “%s�, expected a “=� after attribute name “%s� of element “%s�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1374
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s�, expected a “>� or “/� character to end the start tag of "
+"element “%s�, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
 
 #: ../glib/gmarkup.c:1418
 #, c-format
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
+"Odd character “%s�, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s� of element “%s�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1551
 #, c-format
 msgid ""
-"'%s' is not a valid character following the characters '</'; '%s' may not "
+"“%s� is not a valid character following the characters “</�; “%s� may not "
 "begin an element name"
 msgstr ""
 
 #: ../glib/gmarkup.c:1587
 #, c-format
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
+"“%s� is not a valid character following the close element name “%s�; the "
+"allowed character is “>�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1598
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
+msgid "Element “%s� was closed, no element is currently open"
 msgstr ""
 
 #: ../glib/gmarkup.c:1607
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
+msgid "Element “%s� was closed, but the currently open element is “%s�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1760
@@ -4886,13 +4937,13 @@ msgid "Document was empty or contained only whitespace"
 msgstr ""
 
 #: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
+msgid "Document ended unexpectedly just after an open angle bracket “<�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
 #, c-format
 msgid ""
-"Document ended unexpectedly with elements still open - '%s' was the last "
+"Document ended unexpectedly with elements still open — “%s� was the last "
 "element opened"
 msgstr ""
 
@@ -4927,7 +4978,7 @@ msgstr ""
 
 #: ../glib/gmarkup.c:1836
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgid "Document ended unexpectedly inside the close tag for element “%s�"
 msgstr ""
 
 #: ../glib/gmarkup.c:1842
@@ -5290,7 +5341,7 @@ msgstr ""
 msgid "character value in \\u.... sequence is too large"
 msgstr ""
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr ""
@@ -5317,43 +5368,43 @@ msgstr ""
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr ""
 
-#: ../glib/gregex.c:2413
+#: ../glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr ""
 
-#: ../glib/gregex.c:2429
+#: ../glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr ""
 
-#: ../glib/gregex.c:2469
+#: ../glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr ""
 
-#: ../glib/gregex.c:2478
+#: ../glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr ""
 
-#: ../glib/gregex.c:2485
+#: ../glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr ""
 
-#: ../glib/gregex.c:2496
+#: ../glib/gregex.c:2502
 msgid "digit expected"
 msgstr ""
 
-#: ../glib/gregex.c:2514
+#: ../glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr ""
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr ""
 
-#: ../glib/gregex.c:2580
+#: ../glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr ""
 
-#: ../glib/gregex.c:2590
+#: ../glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr ""
@@ -5380,121 +5431,128 @@ msgstr ""
 msgid "Text was empty (or contained only whitespace)"
 msgstr ""
 
-#: ../glib/gspawn.c:253
+#: ../glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:401
+#: ../glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:486
+#: ../glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
+#: ../glib/gspawn.c:1043 ../glib/gspawn-win32.c:1318
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr ""
 
-#: ../glib/gspawn.c:905
+#: ../glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr ""
 
-#: ../glib/gspawn.c:912
+#: ../glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr ""
 
-#: ../glib/gspawn.c:919
+#: ../glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr ""
 
-#: ../glib/gspawn.c:1324 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
+#: ../glib/gspawn.c:1360 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:1394
+#: ../glib/gspawn.c:1596
+#, fuzzy, c-format
+#| msgid "Failed to load info for handler “%s�"
+msgid "Failed to spawn child process “%s� (%s)"
+msgstr "No si è rivâts a cjariâ lis informazion pal gjestôr “%s�"
+
+#: ../glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:1543 ../glib/gspawn-win32.c:368
+#: ../glib/gspawn.c:1784 ../glib/gspawn-win32.c:370
 #, c-format
 msgid "Failed to change to directory “%s� (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:1553
+#: ../glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s� (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:1563
+#: ../glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:1572
+#: ../glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr ""
 
-#: ../glib/gspawn.c:1580
+#: ../glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s�"
 msgstr ""
 
-#: ../glib/gspawn.c:1604
+#: ../glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:281
+#: ../glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:298
+#: ../glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
+#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:381
+#: ../glib/gspawn-win32.c:500
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:443
+#: ../glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:460 ../glib/gspawn-win32.c:714
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:471 ../glib/gspawn-win32.c:729
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:716
+#: ../glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:781
+#: ../glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr ""
 
-#: ../glib/gspawn-win32.c:995
+#: ../glib/gspawn-win32.c:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5536,134 +5594,134 @@ msgstr ""
 msgid "Character out of range for UTF-16"
 msgstr ""
 
-#: ../glib/gutils.c:2229
+#: ../glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: ../glib/gutils.c:2247 ../glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: ../glib/gutils.c:2248 ../glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: ../glib/gutils.c:2249 ../glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2237
+#: ../glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2238
+#: ../glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2239
+#: ../glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2240
+#: ../glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2241
+#: ../glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2242
+#: ../glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2245
+#: ../glib/gutils.c:2260
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
-#: ../glib/gutils.c:2246
+#: ../glib/gutils.c:2261
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
-#: ../glib/gutils.c:2247
+#: ../glib/gutils.c:2262
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
-#: ../glib/gutils.c:2248
+#: ../glib/gutils.c:2263
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
-#: ../glib/gutils.c:2249
+#: ../glib/gutils.c:2264
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
-#: ../glib/gutils.c:2250
+#: ../glib/gutils.c:2265
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
-#: ../glib/gutils.c:2253
+#: ../glib/gutils.c:2268
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
-#: ../glib/gutils.c:2254
+#: ../glib/gutils.c:2269
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
-#: ../glib/gutils.c:2255
+#: ../glib/gutils.c:2270
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
-#: ../glib/gutils.c:2256
+#: ../glib/gutils.c:2271
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
-#: ../glib/gutils.c:2257
+#: ../glib/gutils.c:2272
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
-#: ../glib/gutils.c:2258
+#: ../glib/gutils.c:2273
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: ../glib/gutils.c:2292 ../glib/gutils.c:2418
+#: ../glib/gutils.c:2307 ../glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u byte"
 
-#: ../glib/gutils.c:2296
+#: ../glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5671,7 +5729,7 @@ msgstr[0] "%u bit"
 msgstr[1] "%u bit"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2363
+#: ../glib/gutils.c:2378
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -5679,7 +5737,7 @@ msgstr[0] "%s byte"
 msgstr[1] "%s byte"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2368
+#: ../glib/gutils.c:2383
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -5691,11 +5749,24 @@ msgstr[1] "%s bit"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2431
+#: ../glib/gutils.c:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable - unknown value '%s'"
+#~ msgstr ""
+#~ "Impussibil determinâ la direzion dal bus de variabile di ambient "
+#~ "DBUS_STARTER_BUS_TYPE — valôr '%s' no cognossût"
+
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGS...]"
+
+#~ msgid "Failed to create temp file: %s"
+#~ msgstr "No si è rivâts a creâ il file temp: %s"
+
 #~ msgid "Error: object path not specified.\n"
 #~ msgstr "Erôr: percors ogjet no specificât.\n"
 
diff --git a/po/lt.po b/po/lt.po
index afbff7238..659b0251f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -12,10 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-03-03 11:23+0000\n"
-"PO-Revision-Date: 2018-03-05 22:56+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-07-20 07:02+0000\n"
+"PO-Revision-Date: 2018-07-28 17:26+0300\n"
 "Last-Translator: Aurimas ÄŒernius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -27,129 +26,126 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "GApplication parametrai"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Rodyti GApplication parametrus"
 
-#: ../gio/gapplication.c:540
+#: gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr ""
 "Įveskite GApplication tarnybos veikseną (naudoti iš D-Bus tarnybų failų)"
 
-#: ../gio/gapplication.c:552
+#: gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Pakeisti programos ID"
 
-#: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
-#: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:488
-#: ../gio/gsettings-tool.c:569
+#: gio/gapplication-tool.c:45 gio/gapplication-tool.c:46 gio/gio-tool.c:227
+#: gio/gresource-tool.c:488 gio/gsettings-tool.c:569
 msgid "Print help"
 msgstr "Spausdinti pagalbÄ…"
 
-#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489
-#: ../gio/gresource-tool.c:557
+#: gio/gapplication-tool.c:47 gio/gresource-tool.c:489 gio/gresource-tool.c:557
 msgid "[COMMAND]"
 msgstr "[KOMANDA]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
 msgstr "Atspausdinti versijÄ…"
 
-#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:575
+#: gio/gapplication-tool.c:50 gio/gsettings-tool.c:575
 msgid "Print version information and exit"
 msgstr "Atspausdinti versijos informaciją ir išeiti"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "IÅ¡vardinti programas"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Išvardinti įdiegtas per D-Bus aktyvuojamas programas (pagal .desktop failus)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Paleisti programÄ…"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Paleisti programą (su nebūtinais failais atvėrimui)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "APPID [FAILAS...]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Aktyvuoti veiksmÄ…"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "IÅ¡kviesti veiksmÄ… programoje"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "APPID veiksmas [PARAMETRAS]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "IÅ¡vardinti prieinamus veiksmus"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr "IÅ¡vardinti statinius programos veiksmus (pagal .desktop failÄ…)"
 
-#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:65 gio/gapplication-tool.c:71
 msgid "APPID"
 msgstr "APPID"
 
-#: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133
-#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:224
+#: gio/gapplication-tool.c:70 gio/gapplication-tool.c:133 gio/gdbus-tool.c:90
+#: gio/gio-tool.c:224
 msgid "COMMAND"
 msgstr "KOMANDA"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "KomandÄ…, kuriai atspausdinti detaliÄ… pagalbÄ…"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "Programos identifikatorius D-Bus formatu (pvz.: org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
-#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
-#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
+#: gio/gapplication-tool.c:72 gio/glib-compile-resources.c:737
+#: gio/glib-compile-resources.c:743 gio/glib-compile-resources.c:770
+#: gio/gresource-tool.c:495 gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FAILAS"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr ""
 "Nebūtini absoliutūs arba santykiniai failų pavadinimai ar URI atvėrimui"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "VEIKSMAS"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "Veiksmo pavadinimas iškvietimui"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARAMETRAS"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "Nebūtinas parametras veiksmo iškvietimui, GVariant formatu"
 
-#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:661
+#: gio/gapplication-tool.c:96 gio/gresource-tool.c:526 gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -158,68 +154,67 @@ msgstr ""
 "Nežinoma komanda „%s“\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Naudojimas:\n"
 
-#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:696
+#: gio/gapplication-tool.c:114 gio/gresource-tool.c:551
+#: gio/gsettings-tool.c:696
 msgid "Arguments:\n"
 msgstr "Argumentai:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: gio/gapplication-tool.c:133 gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARG...]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Komandos:\n"
 
 #. Translators: do not translate 'help', but please translate 'COMMAND'.
-#: ../gio/gapplication-tool.c:146
+#: gio/gapplication-tool.c:146
 #, c-format
 msgid ""
 "Use “%s help COMMAND� to get detailed help.\n"
 "\n"
 msgstr "Naudokite „%s help KOMANDA“ detaliai pagalbai.\n"
 
-#: ../gio/gapplication-tool.c:165
+#: gio/gapplication-tool.c:165
 #, c-format
 msgid ""
 "%s command requires an application id to directly follow\n"
 "\n"
 msgstr "%s komanda reikalauja iš karto pateikti programos id\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s�\n"
 msgstr "netinkamas programos id: „%s“\n"
 
 #. Translators: %s is replaced with a command name like 'list-actions'
-#: ../gio/gapplication-tool.c:182
+#: gio/gapplication-tool.c:182
 #, c-format
 msgid ""
 "“%s� takes no arguments\n"
 "\n"
 msgstr "„%s“ nepriima argumentų\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "nepavyko prisijungti prie D-Bus: %s\n"
 
-#: ../gio/gapplication-tool.c:286
+#: gio/gapplication-tool.c:286
 #, c-format
 msgid "error sending %s message to application: %s\n"
 msgstr "klaida siun�iant %s pranešimą programai: %s\n"
 
-#: ../gio/gapplication-tool.c:317
-#, c-format
+#: gio/gapplication-tool.c:317
 msgid "action name must be given after application id\n"
 msgstr "veiksmo pavadinimas turi būti pateiktas po programos id\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s�\n"
@@ -228,27 +223,25 @@ msgstr ""
 "netinkamas veiksmo pavadinimas: „%s“\n"
 "veiksmų pavadinimai turi susidėti tik iš alfaskaitmenų, „-“ ir „.“\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "klaida skaitant veiksmo parametrÄ…: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "veiksmai priima ne daugiau kaip vienÄ… parametrÄ…\n"
 
-#: ../gio/gapplication-tool.c:411
-#, c-format
+#: gio/gapplication-tool.c:411
 msgid "list-actions command takes only the application id"
 msgstr "list-actions komanda priima tik programos id"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "nepavyksta rasti desktop failo programai %s\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -257,121 +250,117 @@ msgstr ""
 "nežinoma komanda: %s\n"
 "\n"
 
-#: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498
-#: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379
-#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019
-#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834
-#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:209
+#: gio/gbufferedinputstream.c:420 gio/gbufferedinputstream.c:498
+#: gio/ginputstream.c:179 gio/ginputstream.c:379 gio/ginputstream.c:617
+#: gio/ginputstream.c:1019 gio/goutputstream.c:203 gio/goutputstream.c:834
+#: gio/gpollableinputstream.c:205 gio/gpollableoutputstream.c:209
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "Per didelė skai�iavimo reikšmė perduota %s"
 
-#: ../gio/gbufferedinputstream.c:891 ../gio/gbufferedoutputstream.c:575
-#: ../gio/gdataoutputstream.c:562
+#: gio/gbufferedinputstream.c:891 gio/gbufferedoutputstream.c:575
+#: gio/gdataoutputstream.c:562
 msgid "Seek not supported on base stream"
 msgstr "Pozicijos perkÄ—limas sraute nepalaikomas"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "Nepavyko sutrumpinti GBufferedInputStream"
 
-#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208
-#: ../gio/giostream.c:300 ../gio/goutputstream.c:1661
+#: gio/gbufferedinputstream.c:982 gio/ginputstream.c:1208 gio/giostream.c:300
+#: gio/goutputstream.c:1661
 msgid "Stream is already closed"
 msgstr "Srautas jau užvertas"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "Trumpinimas sraute nepalaikomas"
 
-#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
-#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:871
-#: ../gio/gsimpleasyncresult.c:897
+#: gio/gcancellable.c:317 gio/gdbusconnection.c:1840 gio/gdbusprivate.c:1402
+#: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897
 #, c-format
 msgid "Operation was cancelled"
 msgstr "Operacija nutraukta"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Netinkamas objektas, nepavyko inicijuoti"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Klaidinga baitų seka įvestyje"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Nepakanka paskirties vietos"
 
-#: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
-#: ../gio/gdatainputstream.c:1261 ../glib/gconvert.c:454 ../glib/gconvert.c:883
-#: ../glib/giochannel.c:1557 ../glib/giochannel.c:1599
-#: ../glib/giochannel.c:2443 ../glib/gutf8.c:869 ../glib/gutf8.c:1322
+#: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848
+#: gio/gdatainputstream.c:1261 glib/gconvert.c:454 glib/gconvert.c:883
+#: glib/giochannel.c:1557 glib/giochannel.c:1599 glib/giochannel.c:2443
+#: glib/gutf8.c:869 glib/gutf8.c:1322
 msgid "Invalid byte sequence in conversion input"
 msgstr "Klaidinga baitų seka keitimo įvedime"
 
-#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:462 ../glib/gconvert.c:797
-#: ../glib/giochannel.c:1564 ../glib/giochannel.c:2455
+#: gio/gcharsetconverter.c:347 glib/gconvert.c:462 glib/gconvert.c:797
+#: glib/giochannel.c:1564 glib/giochannel.c:2455
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Klaida keitimo metu: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "Atšaukiamas inicijavimas nepalaikomas"
 
-#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:327
-#: ../glib/giochannel.c:1385
+#: gio/gcharsetconverter.c:456 glib/gconvert.c:327 glib/giochannel.c:1385
 #, c-format
 msgid "Conversion from character set “%s� to “%s� is not supported"
 msgstr "Keitimas iš koduotės „%s“ į koduotę „%s“ nepalaikomas"
 
-#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:331
+#: gio/gcharsetconverter.c:460 glib/gconvert.c:331
 #, c-format
 msgid "Could not open converter from “%s� to “%s�"
 msgstr "Nepavyko atverti keitiklio iš „%s“ į „%s“"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:358
 #, c-format
 msgid "%s type"
 msgstr "%s tipas"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Nežinomas tipas"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 msgid "%s filetype"
 msgstr "%s failo tipos"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: gio/gcredentials.c:315 gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
 msgstr "GCredentials nerealizuota Å¡ioje operacinÄ—je sistemoje"
 
-#: ../gio/gcredentials.c:467
+#: gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Jūsų platformoje nėra GCredentials palaikymo"
 
-#: ../gio/gcredentials.c:513
+#: gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "GCredentials neturi proceso ID Å¡ioje OS"
 
-#: ../gio/gcredentials.c:565
+#: gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr "Įgaliojimų apgavimas neįmanomas šioje operacinėje sistemoje"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "NetikÄ—ta ankstyva srauto pabaiga"
 
-#: ../gio/gdbusaddress.c:158 ../gio/gdbusaddress.c:246
-#: ../gio/gdbusaddress.c:327
+#: gio/gdbusaddress.c:158 gio/gdbusaddress.c:246 gio/gdbusaddress.c:327
 #, c-format
 msgid "Unsupported key “%s� in address entry “%s�"
 msgstr "Nepalaikomas raktas „%s“ adreso įvestyje „%s“"
 
-#: ../gio/gdbusaddress.c:185
+#: gio/gdbusaddress.c:185
 #, c-format
 msgid ""
 "Address “%s� is invalid (need exactly one of path, tmpdir or abstract keys)"
@@ -379,27 +368,32 @@ msgstr ""
 "Adresas „%s“ nėra tinkamas (reikia įvesti vienintelį raktą path, tmpdir arba "
 "abstract)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s�"
 msgstr "Beprasmė rakto/reikšmės poros kombinacija adreso įvestyje „%s“"
 
-#: ../gio/gdbusaddress.c:261 ../gio/gdbusaddress.c:342
+#: gio/gdbusaddress.c:261 gio/gdbusaddress.c:342
 #, c-format
 msgid "Error in address “%s� — the port attribute is malformed"
 msgstr "Klaida adrese „%s“ - neteisingai suformuotas prievado atributas"
 
-#: ../gio/gdbusaddress.c:272 ../gio/gdbusaddress.c:353
+#: gio/gdbusaddress.c:272 gio/gdbusaddress.c:353
 #, c-format
 msgid "Error in address “%s� — the family attribute is malformed"
 msgstr "Klaida adrese „%s“ - neteisingai suformuotas šeimos atributas"
 
-#: ../gio/gdbusaddress.c:463
+#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s� for address “%s�"
+msgstr "Nežinomas arba nepalaikomas duomenų perdavimas „%s“ adresui „%s“"
+
+#: gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s� does not contain a colon (:)"
 msgstr "Adreso elementas „%s“ neturi dvitaškio (:)"
 
-#: ../gio/gdbusaddress.c:484
+#: gio/gdbusaddress.c:488
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s�, in address element “%s� does not contain an equal "
@@ -407,7 +401,7 @@ msgid ""
 msgstr ""
 "Rakto/reikšmės pora %d, „%s“, adreso elementas „%s“ neturi lygybės ženklo"
 
-#: ../gio/gdbusaddress.c:498
+#: gio/gdbusaddress.c:502
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s�, in address element "
@@ -416,7 +410,7 @@ msgstr ""
 "Klaida šalinant kaitą rakte ar reikšmėje rakto/reikšmės poroje %d, „%s“ "
 "adreso elemente „%s“"
 
-#: ../gio/gdbusaddress.c:576
+#: gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s� — the unix transport requires exactly one of the keys "
@@ -425,97 +419,92 @@ msgstr ""
 "Klaida adrese „%s“ - unix duomenų perdavimas reikalauja nustatyti vienintelį "
 "iš raktų 'path' arba 'abstract'"
 
-#: ../gio/gdbusaddress.c:612
+#: gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s� — the host attribute is missing or malformed"
 msgstr ""
 "Klaida adrese „%s“ - pagrindinio kompiuterio atributas neįvestas arba blogai "
 "suformuotas"
 
-#: ../gio/gdbusaddress.c:626
+#: gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s� — the port attribute is missing or malformed"
 msgstr ""
 "Klaida adrese „%s“ - prievado atributas neįvestas arba blogai suformuotas"
 
-#: ../gio/gdbusaddress.c:640
+#: gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s� — the noncefile attribute is missing or malformed"
 msgstr ""
 "Klaida adrese „%s“ - laikino failo atributas neįvestas arba blogai "
 "suformuotas"
 
-#: ../gio/gdbusaddress.c:661
+#: gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Klaida automatiškai paleidžiant: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s� for address “%s�"
-msgstr "Nežinomas arba nepalaikomas duomenų perdavimas „%s“ adresui „%s“"
-
-#: ../gio/gdbusaddress.c:714
+#: gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s�: %s"
 msgstr "Klaida atveriant vienkartinio kodo failą „%s“: %s"
 
-#: ../gio/gdbusaddress.c:733
+#: gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s�: %s"
 msgstr "Klaida skaitant iš vienkartinio kodo failo „%s“: %s"
 
-#: ../gio/gdbusaddress.c:742
+#: gio/gdbusaddress.c:746
 #, c-format
 msgid "Error reading from nonce file “%s�, expected 16 bytes, got %d"
 msgstr ""
 "Klaida skaitant iš vienkartinio kodo failo „%s“, tikėtasi 16 baitų, gauta %d"
 
-#: ../gio/gdbusaddress.c:760
+#: gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s� to stream:"
 msgstr "Klaida rašant vienkartinio kodo failo turinį „%s“ į srautą:"
 
-#: ../gio/gdbusaddress.c:969
+#: gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "Pateiktasis adresas yra tuš�ias"
 
-#: ../gio/gdbusaddress.c:1082
+#: gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "Negalima paleisti pranešimų magistralės kai vyksta setuid"
 
-#: ../gio/gdbusaddress.c:1089
+#: gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "Negalima paleisti pranešimų magistralės be mašinos id: "
 
-#: ../gio/gdbusaddress.c:1096
+#: gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "Negalima automatiškai paleisti D-Bus be X11 $DISPLAY"
 
-#: ../gio/gdbusaddress.c:1138
+#: gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s�: "
 msgstr "Klaida paleidžiant komandų eilutę „%s“: "
 
-#: ../gio/gdbusaddress.c:1355
+#: gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Spauskite bet kurį klavišą šiam langui užverti)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "Seanso dbus neveikia, automatinis paleidimas nepavyko"
 
-#: ../gio/gdbusaddress.c:1520
+#: gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Nepavyko nustatyti sesijos magistralÄ—s adreso (nerealizuota Å¡iai operacinei "
 "sistemai)"
 
-#: ../gio/gdbusaddress.c:1658
+#: gio/gdbusaddress.c:1662 gio/gdbusconnection.c:7142
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -524,7 +513,7 @@ msgstr ""
 "Nepavyko nustatyti magistralės adreso iš DBUS_STARTER_BUS_TYPE aplinkos "
 "kintamojo - nežinoma reikšmė „%s“"
 
-#: ../gio/gdbusaddress.c:1667 ../gio/gdbusconnection.c:7160
+#: gio/gdbusaddress.c:1671 gio/gdbusconnection.c:7151
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -532,20 +521,20 @@ msgstr ""
 "Nepavyko nustatyti magistralÄ—s adreso, kadangi DBUS_STARTER_BUS_TYPE "
 "aplinkos kintamasis nenustatytas"
 
-#: ../gio/gdbusaddress.c:1677
+#: gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Nežinomas magistralės tipas %d"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Netikėtas turinio trūkumas bandant nuskaityti eilutę"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr "Netikėtas turinio trūkumas bandant (saugiai) nuskaityti eilutę"
 
-#: ../gio/gdbusauth.c:508
+#: gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -553,16 +542,16 @@ msgstr ""
 "BaigÄ—si visi turimi tapatybÄ—s patvirtinimo mechanizmai (bandyta: %s) "
 "(turimi: %s)"
 
-#: ../gio/gdbusauth.c:1171
+#: gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Atšaukta per GDBusAuthObserver::authorize-authenticated-peer"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s�: %s"
 msgstr "Klaida gaunant informaciją apie katalogą „%s“: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:274
+#: gio/gdbusauthmechanismsha1.c:274
 #, c-format
 msgid ""
 "Permissions on directory “%s� are malformed. Expected mode 0700, got 0%o"
@@ -570,23 +559,23 @@ msgstr ""
 "Katalogo „%s“ leidimai yra suformuoti neteisingai. Tikėtasi mode 0700, gauta "
 "0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s�: %s"
 msgstr "Klaida kuriant katalogÄ… %s: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s� for reading: "
 msgstr "Klaida atveriant raktinę „%s“ skaitymui: "
 
-#: ../gio/gdbusauthmechanismsha1.c:402 ../gio/gdbusauthmechanismsha1.c:720
+#: gio/gdbusauthmechanismsha1.c:369 gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr ""
 "%d eilutė raktinės vietoje „%s“ su turiniu „%s“ yra suformuota neteisingai"
 
-#: ../gio/gdbusauthmechanismsha1.c:416 ../gio/gdbusauthmechanismsha1.c:734
+#: gio/gdbusauthmechanismsha1.c:383 gio/gdbusauthmechanismsha1.c:701
 #, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -594,7 +583,7 @@ msgstr ""
 "Pirmoji leksema raktinės %d eilutės vietoje „%s“ su turiniu „%s“ yra "
 "suformuota neteisingai"
 
-#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:748
+#: gio/gdbusauthmechanismsha1.c:397 gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -602,162 +591,164 @@ msgstr ""
 "Antroji leksema raktinės %d eilutės vietoje „%s“ su turiniu „%s“ yra "
 "suformuota neteisingai"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
 msgstr "Nerastas slapukas su id %d raktinės vietoje „%s“"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Klaida trinant nebegaliojantį rakinimo failą „%s“: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s�: %s"
 msgstr "Klaida kuriant rakinimo failą „%s“: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
 msgstr "Klaida užveriant (nesusietą) rakinimo failą „%s“: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s�: %s"
 msgstr "Klaida atsiejant rakinimo failą „%s“: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s� for writing: "
 msgstr "Klaida atveriant raktinę „%s“ rašymui: "
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
 msgstr "(Papildomai, užrakto atlaisvinimas „%s“ taip pat nepavyko: %s) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "Ryšys yra užvertas"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "BaigÄ—si laikas"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr "Nepalaikomi požymiai aptikti konstruojant kliento pusės ryšį"
 
-#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
+#: gio/gdbusconnection.c:4115 gio/gdbusconnection.c:4462
 #, c-format
+#| msgid ""
+#| "No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
+"No such interface “org.freedesktop.DBus.Properties� on object at path %s"
 msgstr ""
 "Nėra sąsajos „org.freedesktop.DBus.Properties“ objektui, kurio kelias %s"
 
-#: ../gio/gdbusconnection.c:4266
+#: gio/gdbusconnection.c:4257
 #, c-format
-msgid "No such property '%s'"
+#| msgid "No such property '%s'"
+msgid "No such property “%s�"
 msgstr "Nėra savybės „%s“"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
+#| msgid "Property '%s' is not readable"
+msgid "Property “%s� is not readable"
 msgstr "Savybė „%s“ yra neskaitoma"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
+#| msgid "Property '%s' is not writable"
+msgid "Property “%s� is not writable"
 msgstr "Savybė „%s“ nėra rašoma"
 
-#: ../gio/gdbusconnection.c:4309
+#: gio/gdbusconnection.c:4300
 #, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+#| msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+msgid "Error setting property “%s�: Expected type “%s� but got “%s�"
 msgstr "Klaida nustatant savybę „%s“: tikėtasi tipo „%s“, bet gauta „%s“"
 
-#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
-#: ../gio/gdbusconnection.c:6591
+#: gio/gdbusconnection.c:4405 gio/gdbusconnection.c:4613
+#: gio/gdbusconnection.c:6582
 #, c-format
-msgid "No such interface '%s'"
+msgid "No such interface “%s�"
 msgstr "Nėra sąsajos „%s“"
 
-#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7100
+#: gio/gdbusconnection.c:4831 gio/gdbusconnection.c:7091
 #, c-format
-msgid "No such interface '%s' on object at path %s"
+#| msgid "No such interface '%s' on object at path %s"
+msgid "No such interface “%s� on object at path %s"
 msgstr "Nėra sąsajos „%s“ objektui, kurio kelias %s"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
+#| msgid "No such key “%s�\n"
+msgid "No such method “%s�"
 msgstr "Nėra metodo „%s“"
 
-#: ../gio/gdbusconnection.c:4969
+#: gio/gdbusconnection.c:4960
 #, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
+#| msgid "Type of message, '%s', does not match expected type '%s'"
+msgid "Type of message, “%s�, does not match expected type “%s�"
 msgstr "Pranešimo tipas „%s“ neatitinka laukiamo tipo „%s“"
 
-#: ../gio/gdbusconnection.c:5167
+#: gio/gdbusconnection.c:5158
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Jau yra eksportuotas objektas sÄ…sajai %s vietoje %s"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "Nepavyko gauti savybÄ—s: %s.%s"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "Nepavyko nustatyti savybÄ—s: %s.%s"
 
-#: ../gio/gdbusconnection.c:5627
+#: gio/gdbusconnection.c:5618
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
+#| msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Method “%s� returned type “%s�, but expected “%s�"
 msgstr "Metodas „%s“ grąžino tipą „%s“, bet laukta „%s“"
 
-#: ../gio/gdbusconnection.c:6702
+#: gio/gdbusconnection.c:6693
 #, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+#| msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgid "Method “%s� on interface “%s� with signature “%s� does not exist"
 msgstr "Metodas „%s“ sąsajoje „%s“ su signatūra „%s“ neegzistuoja"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Pomedis %s jau yra eksportuotas"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Nepavyko nustatyti magistralės adreso iš DBUS_STARTER_BUS_TYPE aplinkos "
-"kintamojo - nežinoma reikšmė „%s“"
-
-#: ../gio/gdbusmessage.c:1246
+#: gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "tipas yra NETINKAMAS"
 
-#: ../gio/gdbusmessage.c:1257
+#: gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "METHOD_CALL pranešimas: trūksta antraštės lauko PATH arba MEMBER"
 
-#: ../gio/gdbusmessage.c:1268
+#: gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "METHOD_RETURN pranešimas: trūksta REPLY_SERIAL antraštės"
 
-#: ../gio/gdbusmessage.c:1280
+#: gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "ERROR pranešimas: antraštės lauke trūksta REPLY_SERIAL arba ERROR_NAME"
 
-#: ../gio/gdbusmessage.c:1293
+#: gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "SIGNAL pranešimas: trūksta antraštės lauko PATH, INTERFACE arba MEMBER"
 
-#: ../gio/gdbusmessage.c:1301
+#: gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -765,7 +756,7 @@ msgstr ""
 "SIGNAL pranešimas: antraštės laukas PATH naudoja rezervuotą reikšmę /org/"
 "freedesktop/DBus/Local"
 
-#: ../gio/gdbusmessage.c:1309
+#: gio/gdbusmessage.c:1311
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
@@ -773,7 +764,7 @@ msgstr ""
 "SIGNAL pranešimas: antraštės laukas INTERFACE naudoja rezervuotą reikšmę org."
 "freedesktop.DBus.Local"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
+#: gio/gdbusmessage.c:1359 gio/gdbusmessage.c:1419
 #, c-format
 msgid "Wanted to read %lu byte but only got %lu"
 msgid_plural "Wanted to read %lu bytes but only got %lu"
@@ -781,12 +772,12 @@ msgstr[0] "NorÄ—ta nuskaityti %lu baitÄ…, bet gauta tik %lu"
 msgstr[1] "NorÄ—ta nuskaityti %lu baitus, bet gauta tik %lu"
 msgstr[2] "Norėta nuskaityti %lu baitų, bet gauta tik %lu"
 
-#: ../gio/gdbusmessage.c:1371
+#: gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s� but found byte %d"
 msgstr "Tikėtasi NUL baito po simbolių eilutės „%s“, bet rastas baitas %d"
 
-#: ../gio/gdbusmessage.c:1390
+#: gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -795,17 +786,17 @@ msgstr ""
 "Tikėtasi teisingos UTF-8 eilutės, bet rasta neteisingų baitų poslinkiu %d "
 "(eilutės ilgis yra %d). Teisinga UTF-8 eilutė iki tos vietos buvo „%s“"
 
-#: ../gio/gdbusmessage.c:1593
+#: gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus object path"
 msgstr "Perskaityta reikšmė „%s“ nėra tinkamas D-Bus objekto kelias"
 
-#: ../gio/gdbusmessage.c:1615
+#: gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature"
 msgstr "Perskaityta reikšmė „%s“ nėra tinkama D-Bus signatūra"
 
-#: ../gio/gdbusmessage.c:1662
+#: gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -818,7 +809,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Aptiktas %u baitų ilgio masyvas. Maksimalus ilgis yra 2<<26 baitų (64 MiB)."
 
-#: ../gio/gdbusmessage.c:1682
+#: gio/gdbusmessage.c:1684
 #, c-format
 msgid ""
 "Encountered array of type “a%c�, expected to have a length a multiple of %u "
@@ -827,19 +818,19 @@ msgstr ""
 "Aptiktas „a%c“ tipo masyvas, tikėtasi %u kartotinio baitų ilgio, bet rasta "
 "%u baitų ilgyje"
 
-#: ../gio/gdbusmessage.c:1849
+#: gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s� for variant is not a valid D-Bus signature"
 msgstr "Perskaityta reikšmė „%s“ variantui nėra tinkama D-Bus signatūra"
 
-#: ../gio/gdbusmessage.c:1873
+#: gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s� from the D-Bus wire format"
 msgstr ""
 "Klaida atstatant GVariant su tipo eilute „%s“ iš D-Bus telegramos formato"
 
-#: ../gio/gdbusmessage.c:2055
+#: gio/gdbusmessage.c:2057
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l�) or 0x42 (“B�) but found value "
@@ -848,25 +839,25 @@ msgstr ""
 "Netinkama baitų eiliškumo reikšmė. Tikėtasi 0x6c („l“) arba 0x42 („B“), bet "
 "rasta 0x%02x"
 
-#: ../gio/gdbusmessage.c:2068
+#: gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "Netinkama pagrindinÄ— protokolo versija. TikÄ—tasi 1, bet rasta %d"
 
-#: ../gio/gdbusmessage.c:2124
+#: gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s� found but message body is empty"
 msgstr ""
 "Signatūros antraštė su signatūra „%s“ rasta, bet pranešimo pagrindinė dalis "
 "tuš�ia"
 
-#: ../gio/gdbusmessage.c:2138
+#: gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature (for body)"
 msgstr ""
 "Perskaityta reikšmė „%s“ nėra tinkama D-Bus signatūra (pagrindinei daliai)"
 
-#: ../gio/gdbusmessage.c:2168
+#: gio/gdbusmessage.c:2170
 #, c-format
 msgid "No signature header in message but the message body is %u byte"
 msgid_plural "No signature header in message but the message body is %u bytes"
@@ -880,35 +871,35 @@ msgstr[2] ""
 "Nėra signatūros antraštės pranešime, bet pranešimo pagrindinė dalis yra %u "
 "baitų"
 
-#: ../gio/gdbusmessage.c:2178
+#: gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "Nepavyko atstatyti pranešimo: "
 
-#: ../gio/gdbusmessage.c:2519
+#: gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s� to the D-Bus wire format"
 msgstr ""
 "Klaida paver�iant GVariant su tipo eilute „%s“ į D-Bus telegramos formatą"
 
-#: ../gio/gdbusmessage.c:2656
+#: gio/gdbusmessage.c:2658
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
 msgstr ""
 "Failo deskriptorių skai�ius žinutėje (%d) skiriasi nuo antraštės lauko (%d)"
 
-#: ../gio/gdbusmessage.c:2664
+#: gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "Nepavyko išsaugoti pranešimo: "
 
-#: ../gio/gdbusmessage.c:2708
+#: gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s� but there is no signature header"
 msgstr ""
 "Pranešimo pagrindinė dalis turi signatūrą „%s“, bet nėra signatūros antraštės"
 
-#: ../gio/gdbusmessage.c:2718
+#: gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s� but signature in the header field is "
@@ -917,42 +908,42 @@ msgstr ""
 "Pranešimo pagrindinė dalis turi tipo signatūrą „%s“, bet signatūra antraštės "
 "lauke yra „%s“"
 
-#: ../gio/gdbusmessage.c:2734
+#: gio/gdbusmessage.c:2736
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)�"
 msgstr ""
 "Pranešimo pagrindinė dalis yra tuš�ia, bet signatūra antraštės lauke yra "
 "„(%s)“"
 
-#: ../gio/gdbusmessage.c:3287
+#: gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s�"
 msgstr "Klaidos grąžinimas su pagrindinės dalies tipu „%s“"
 
-#: ../gio/gdbusmessage.c:3295
+#: gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Klaidos grąžinimas su tuš�ia pagrindine dalimi"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Nepavyko gauti aparatūros profilio: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "Nepavyko įkelti /var/lib/dbus/machine-id or /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1612
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Klaida kvie�iant StartServiceByName elementui %s: "
 
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Nelauktas atsakas %d iš StartServiceByName(\"%s\") metodo"
 
-#: ../gio/gdbusproxy.c:2726 ../gio/gdbusproxy.c:2860
+#: gio/gdbusproxy.c:2726 gio/gdbusproxy.c:2860
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -960,30 +951,30 @@ msgstr ""
 "Nepavyko iškviesti metodo; proxy nėra gerai žinoma pavadinimas be savininko "
 "ir proxy buvo sukonstruotas su G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START požymiu"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "Abstrakti vardų sritis nepalaikoma"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr "Negalima nurodyti laikino failo kuriant serverį"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s�: %s"
 msgstr "Klaida rašant vienkartinio kodo failą vietoje „%s“: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s� is not a valid D-Bus GUID"
 msgstr "Eilutė „%s“ nėra tinkamas D-Bus GUID"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s�"
 msgstr "Negalima laukti duomenų iš nepalaikomo perdavimo „%s“"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1006,60 +997,60 @@ msgstr ""
 "\n"
 "Naudokite „%s KOMANDA --help“ kiekvienos komandos pagalbos gavimui.\n"
 
-#: ../gio/gdbus-tool.c:185 ../gio/gdbus-tool.c:252 ../gio/gdbus-tool.c:324
-#: ../gio/gdbus-tool.c:348 ../gio/gdbus-tool.c:834 ../gio/gdbus-tool.c:1171
-#: ../gio/gdbus-tool.c:1613
+#: gio/gdbus-tool.c:185 gio/gdbus-tool.c:252 gio/gdbus-tool.c:324
+#: gio/gdbus-tool.c:348 gio/gdbus-tool.c:834 gio/gdbus-tool.c:1171
+#: gio/gdbus-tool.c:1613
 #, c-format
 msgid "Error: %s\n"
 msgstr "Klaida: %s\n"
 
-#: ../gio/gdbus-tool.c:196 ../gio/gdbus-tool.c:265 ../gio/gdbus-tool.c:1629
+#: gio/gdbus-tool.c:196 gio/gdbus-tool.c:265 gio/gdbus-tool.c:1629
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Klaida skaitant introspekcijos XML: %s\n"
 
-#: ../gio/gdbus-tool.c:234
+#: gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Klaida: %s nÄ—ra tinkamas vardas\n"
 
-#: ../gio/gdbus-tool.c:382
+#: gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Prisijungti prie sistemos magistralÄ—s"
 
-#: ../gio/gdbus-tool.c:383
+#: gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Prisijungti prie sesijos magistralÄ—s"
 
-#: ../gio/gdbus-tool.c:384
+#: gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Prisijungti prie pateikto D-Bus adreso"
 
-#: ../gio/gdbus-tool.c:394
+#: gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Ryšio pabaigos parametrai:"
 
-#: ../gio/gdbus-tool.c:395
+#: gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Parametrai, nurodantys ryšio pabaigą"
 
-#: ../gio/gdbus-tool.c:417
+#: gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Nėra nurodytos ryšio pabaigos"
 
-#: ../gio/gdbus-tool.c:427
+#: gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Nurodytos kelio ryšio pabaigos"
 
-#: ../gio/gdbus-tool.c:497
+#: gio/gdbus-tool.c:497
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s� does not exist\n"
 msgstr "Perspėjimas: pagal introspekcijos duomenis, sąsaja „%s“ neegzistuoja\n"
 
-#: ../gio/gdbus-tool.c:506
+#: gio/gdbus-tool.c:506
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s� does not exist on "
@@ -1068,166 +1059,161 @@ msgstr ""
 "Perspėjimas: pagal introspekcijos duomenis, metodas „%s“ neegzistuoja "
 "sąsajoje „%s“\n"
 
-#: ../gio/gdbus-tool.c:568
+#: gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Nebūtinas signalo tikslas (unikalus vardas)"
 
-#: ../gio/gdbus-tool.c:569
+#: gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Objekto, kuriame siun�iamas signalas, kelias"
 
-#: ../gio/gdbus-tool.c:570
+#: gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Signalo ir sÄ…sajos vardai"
 
-#: ../gio/gdbus-tool.c:603
+#: gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Siųsti signalą."
 
-#: ../gio/gdbus-tool.c:658 ../gio/gdbus-tool.c:965 ../gio/gdbus-tool.c:1715
-#: ../gio/gdbus-tool.c:1944 ../gio/gdbus-tool.c:2164
+#: gio/gdbus-tool.c:658 gio/gdbus-tool.c:965 gio/gdbus-tool.c:1715
+#: gio/gdbus-tool.c:1944 gio/gdbus-tool.c:2164
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Klaida prisijungiant: %s\n"
 
-#: ../gio/gdbus-tool.c:678
+#: gio/gdbus-tool.c:678
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "Klaida: %s nÄ—ra tinkamas unikalus magistralÄ—s pavadinimas.\n"
 
-#: ../gio/gdbus-tool.c:697 ../gio/gdbus-tool.c:1008 ../gio/gdbus-tool.c:1758
-#, c-format
+#: gio/gdbus-tool.c:697 gio/gdbus-tool.c:1008 gio/gdbus-tool.c:1758
 msgid "Error: Object path is not specified\n"
 msgstr "Klaida: nenurodytas objekto kelias\n"
 
-#: ../gio/gdbus-tool.c:720 ../gio/gdbus-tool.c:1028 ../gio/gdbus-tool.c:1778
-#: ../gio/gdbus-tool.c:2015
+#: gio/gdbus-tool.c:720 gio/gdbus-tool.c:1028 gio/gdbus-tool.c:1778
+#: gio/gdbus-tool.c:2015
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Klaida: %s nÄ—ra tinkamas objekto kelias\n"
 
-#: ../gio/gdbus-tool.c:740
-#, c-format
+#: gio/gdbus-tool.c:740
 msgid "Error: Signal name is not specified\n"
 msgstr "Klaida: nenurodytas signalo pavadinimas\n"
 
-#: ../gio/gdbus-tool.c:754
+#: gio/gdbus-tool.c:754
 #, c-format
 msgid "Error: Signal name “%s� is invalid\n"
 msgstr "Klaida: signalo pavadinimas „%s“ yra netinkamas\n"
 
-#: ../gio/gdbus-tool.c:766
+#: gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Klaida: %s nÄ—ra tinkamas sÄ…sajos pavadinimas\n"
 
-#: ../gio/gdbus-tool.c:772
+#: gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Klaida: %s nÄ—ra tinkamas nario pavadinimas\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:809 ../gio/gdbus-tool.c:1140
+#: gio/gdbus-tool.c:809 gio/gdbus-tool.c:1140
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Klaida skaitant parametrÄ… %d: %s\n"
 
-#: ../gio/gdbus-tool.c:841
+#: gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Klaida išsiun�iant ryšį: %s\n"
 
-#: ../gio/gdbus-tool.c:868
+#: gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Tikslo pavadinimas metodo iškvietimui"
 
-#: ../gio/gdbus-tool.c:869
+#: gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Objekto kelias metodo iškvietimui"
 
-#: ../gio/gdbus-tool.c:870
+#: gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Metodo ir sÄ…sajos pavadinimai"
 
-#: ../gio/gdbus-tool.c:871
+#: gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Laiko limitas sekundÄ—mis"
 
-#: ../gio/gdbus-tool.c:910
+#: gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "IÅ¡kviesti metodÄ… nutolusiame objekte."
 
-#: ../gio/gdbus-tool.c:982 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1969
-#, c-format
+#: gio/gdbus-tool.c:982 gio/gdbus-tool.c:1732 gio/gdbus-tool.c:1969
 msgid "Error: Destination is not specified\n"
 msgstr "Klaida: nenurodytas tikslas\n"
 
-#: ../gio/gdbus-tool.c:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
+#: gio/gdbus-tool.c:993 gio/gdbus-tool.c:1749 gio/gdbus-tool.c:1980
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Klaida: %s nÄ—ra tinkamas magistralÄ—s pavadinimas\n"
 
-#: ../gio/gdbus-tool.c:1043
-#, c-format
+#: gio/gdbus-tool.c:1043
 msgid "Error: Method name is not specified\n"
 msgstr "Klaida: nenurodytas metodo vardas\n"
 
-#: ../gio/gdbus-tool.c:1054
+#: gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s� is invalid\n"
 msgstr "Klaida: metodo vardas „%s“ yra netinkamas\n"
 
-#: ../gio/gdbus-tool.c:1132
+#: gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s�: %s\n"
 msgstr "Klaida skaitant parametrą %d, kurio tipas „%s“: %s\n"
 
-#: ../gio/gdbus-tool.c:1576
+#: gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Tikslo vardas introspekcijai"
 
-#: ../gio/gdbus-tool.c:1577
+#: gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "Objekto kelias introspekcijai"
 
-#: ../gio/gdbus-tool.c:1578
+#: gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Spausdinti XML"
 
-#: ../gio/gdbus-tool.c:1579
+#: gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "NagrinÄ—ti vaikÄ…"
 
-#: ../gio/gdbus-tool.c:1580
+#: gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Spausdinti tik savybes"
 
-#: ../gio/gdbus-tool.c:1667
+#: gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Introspekcija nutolusiam objektui."
 
-#: ../gio/gdbus-tool.c:1870
+#: gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Tikslo vardas stebÄ—jimui"
 
-#: ../gio/gdbus-tool.c:1871
+#: gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Objekto kelias stebÄ—jimui"
 
-#: ../gio/gdbus-tool.c:1896
+#: gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Stebėti nutolusį objektą."
 
-#: ../gio/gdbus-tool.c:1954
-#, c-format
+#: gio/gdbus-tool.c:1954
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr "Klaida: nepavyksta stebėti ne žinu�ių magistralės ryšio\n"
 
-#: ../gio/gdbus-tool.c:2078
+#: gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Aktyvuotina tarnyba prieš laukiant kitos (gerai žinomas pavadinimas)"
 
-#: ../gio/gdbus-tool.c:2081
+#: gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1235,138 +1221,133 @@ msgstr ""
 "Kiek laiko laukti prieš išeinant su klaida (sekundėmis); 0 reiškia neribotai "
 "(numatyta)"
 
-#: ../gio/gdbus-tool.c:2129
+#: gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[PARAMETRAS…] MAGISTRALĖS-PAVADINIMAS"
 
-#: ../gio/gdbus-tool.c:2130
+#: gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Laukti, kol pasirodys magistralÄ—s pavadinimas."
 
-#: ../gio/gdbus-tool.c:2206
-#, c-format
+#: gio/gdbus-tool.c:2206
 msgid "Error: A service to activate for must be specified.\n"
 msgstr ""
 "Klaida: reikia nurodyti aktyvuojamÄ… tarnybÄ….\n"
 "\n"
 
-#: ../gio/gdbus-tool.c:2211
-#, c-format
+#: gio/gdbus-tool.c:2211
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Klaida: turi būti nurodyta tarnyba, kurios laukti.\n"
 
-#: ../gio/gdbus-tool.c:2216
-#, c-format
+#: gio/gdbus-tool.c:2216
 msgid "Error: Too many arguments.\n"
 msgstr "Klaida: per daug argumentų.\n"
 
-#: ../gio/gdbus-tool.c:2224 ../gio/gdbus-tool.c:2231
+#: gio/gdbus-tool.c:2224 gio/gdbus-tool.c:2231
 #, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Klaida: %s nėra tinkamas gerai žinomas magistralės pavadinimas.\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: gio/gdesktopappinfo.c:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Nepavadinta"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Darbalaukio failas nenurodÄ— Exec lauko"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Nerastas terminalas, reikalingas programai"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr "Nepavyko sukurti naudotojo nustatymų aplanko %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Nepavyko sukurti naudotojo MIME nustatymų aplanko %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: gio/gdesktopappinfo.c:3446 gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "Programos informacijai trūksta identifikatoriaus"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Nepavyko sukurti naudotojo darbalaukio failo %s"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Specialus apibrėžimas %s"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "įrenginys nerealizuoja išstūmimo"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gdrive.c:495
+#: gio/gdrive.c:495
 msgid "drive doesn’t implement eject or eject_with_operation"
 msgstr ""
 "įrenginys nerealizuoja išstūmimo nei su papildoma operacija, nei be jos"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 msgid "drive doesn’t implement polling for media"
 msgstr "įrenginys nerealizuoja laikmenos tikrinimo užklausimo"
 
-#: ../gio/gdrive.c:776
+#: gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "įrenginys nerealizuoja startavimo"
 
-#: ../gio/gdrive.c:878
+#: gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "įrenginys nerealizuoja stabdymo"
 
-#: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
-#: ../gio/gdummytlsbackend.c:509
+#: gio/gdummytlsbackend.c:195 gio/gdummytlsbackend.c:317
+#: gio/gdummytlsbackend.c:509
 msgid "TLS support is not available"
 msgstr "NÄ—ra TLS palaikymo"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "NÄ—ra DTLS palaikymo"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Nepavyko apdoroti GEmblem koduotÄ—s versijos %d"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Netinkamas leksemų skai�ius (%d) GEmblem koduotėje"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Nepavyko apdoroti GEmblemedIcon koduotÄ—s versijos %d"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Netinkamas leksemų skai�ius (%d) GEmblemedIcon koduotėje"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "TikÄ—tasi GEmblem skirto GEmblemedIcon"
 
-#: ../gio/gfile.c:1071 ../gio/gfile.c:1309 ../gio/gfile.c:1447
-#: ../gio/gfile.c:1685 ../gio/gfile.c:1740 ../gio/gfile.c:1798
-#: ../gio/gfile.c:1882 ../gio/gfile.c:1939 ../gio/gfile.c:2003
-#: ../gio/gfile.c:2058 ../gio/gfile.c:3725 ../gio/gfile.c:3780
-#: ../gio/gfile.c:4016 ../gio/gfile.c:4058 ../gio/gfile.c:4526
-#: ../gio/gfile.c:4937 ../gio/gfile.c:5022 ../gio/gfile.c:5112
-#: ../gio/gfile.c:5209 ../gio/gfile.c:5296 ../gio/gfile.c:5397
-#: ../gio/gfile.c:7975 ../gio/gfile.c:8065 ../gio/gfile.c:8149
-#: ../gio/win32/gwinhttpfile.c:437
+#: gio/gfile.c:1076 gio/gfile.c:1314 gio/gfile.c:1452 gio/gfile.c:1690
+#: gio/gfile.c:1745 gio/gfile.c:1803 gio/gfile.c:1887 gio/gfile.c:1944
+#: gio/gfile.c:2008 gio/gfile.c:2063 gio/gfile.c:3738 gio/gfile.c:3793
+#: gio/gfile.c:4029 gio/gfile.c:4071 gio/gfile.c:4539 gio/gfile.c:4950
+#: gio/gfile.c:5035 gio/gfile.c:5125 gio/gfile.c:5222 gio/gfile.c:5309
+#: gio/gfile.c:5410 gio/gfile.c:7988 gio/gfile.c:8078 gio/gfile.c:8162
+#: gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Operacija nepalaikoma"
 
@@ -1374,205 +1355,205 @@ msgstr "Operacija nepalaikoma"
 #. * trying to find the enclosing (user visible)
 #. * mount of a file, but none exists.
 #.
-#: ../gio/gfile.c:1570
+#: gio/gfile.c:1575
 msgid "Containing mount does not exist"
 msgstr "Tėvinis prijungimo taškas neegzistuoja"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: gio/gfile.c:2622 gio/glocalfile.c:2391
 msgid "Can’t copy over directory"
 msgstr "Negalima kopijuoti ant aplanko viršaus"
 
-#: ../gio/gfile.c:2677
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Negalima kopijuoti aplanko ant aplanko"
 
-#: ../gio/gfile.c:2685
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Nurodytas failas jau egzistuoja"
 
-#: ../gio/gfile.c:2704
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Negalima rekursyviai kopijuoti aplanko"
 
-#: ../gio/gfile.c:2979
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "Skaidymas nepalaikomas"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Klaida skaidant failÄ…: %s"
 
-#: ../gio/gfile.c:3136
+#: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "Kopijavimas (reflink/clone) tarp prijungimo taškų nepalaikomas"
 
-#: ../gio/gfile.c:3140
+#: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopijavimas (reflink/clone) nepalaikomas arba netinkamas"
 
-#: ../gio/gfile.c:3145
+#: gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Kopijavimas (reflink/clone) nepalaikomas arba nesuveikÄ—"
 
-#: ../gio/gfile.c:3208
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Negalima kopijuoti specialaus failo"
 
-#: ../gio/gfile.c:4006
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Netaisyklinga simbolinės nuorodos reikšmė"
 
-#: ../gio/gfile.c:4167
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Šiukšlės nepalaikomos"
 
-#: ../gio/gfile.c:4279
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c�"
 msgstr "Failų pavadinimuose negali būti '%c'"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "tomas nepalaiko prijungimo"
 
-#: ../gio/gfile.c:6869
+#: gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "Nėra programos, priregistruotos kaip skaitan�ios šį failą"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "Enumeratorius užvartas"
 
-#: ../gio/gfileenumerator.c:219 ../gio/gfileenumerator.c:278
-#: ../gio/gfileenumerator.c:377 ../gio/gfileenumerator.c:476
+#: gio/gfileenumerator.c:219 gio/gfileenumerator.c:278
+#: gio/gfileenumerator.c:377 gio/gfileenumerator.c:476
 msgid "File enumerator has outstanding operation"
 msgstr "Failų enumeratoriui liko neatlikta operacija"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "Failų enumeratorius jau užvertas"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Nepavyko apdoroti GFileIcon koduotÄ—s versijos %d"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Netinkami GFileIcon įvesties duomenys"
 
-#: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394
-#: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164
-#: ../gio/gfileoutputstream.c:497
+#: gio/gfileinputstream.c:149 gio/gfileinputstream.c:394
+#: gio/gfileiostream.c:167 gio/gfileoutputstream.c:164
+#: gio/gfileoutputstream.c:497
 msgid "Stream doesn’t support query_info"
 msgstr "Srautas nepalaiko query_info"
 
-#: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
-#: ../gio/gfileoutputstream.c:371
+#: gio/gfileinputstream.c:325 gio/gfileiostream.c:379
+#: gio/gfileoutputstream.c:371
 msgid "Seek not supported on stream"
 msgstr "Pozicijos perkÄ—limas sraute nepalaikomas"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "Trumpinimas įėjimo srauto nepalaikomas"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "Trumpinimas srauto nepalaikomas"
 
-#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
-#: ../glib/gconvert.c:1786
+#: gio/ghttpproxy.c:91 gio/gresolver.c:410 gio/gresolver.c:476
+#: glib/gconvert.c:1786
 msgid "Invalid hostname"
 msgstr "Klaidingas kompiuterio vardas"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Blogas HTTP tarpinio serverio atsakas"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Prisijungimas prie HTTP tarpinio serverio neleidžiamas"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Nepavyko patvirtinti tapatybÄ—s HTTP tarpiniame serveryje"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "HTTP tarpiniam serveriui reikia patvirtinti tapatybÄ™"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Nepavyko prisijungti prie HTTP tarpinio serverio: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "Ryšys su HTTP tarpiniu serveriu netikėtai užvertas."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Neteisingas leksemų skai�ius (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "NÄ—ra tipo klasÄ—s pavadinimui %s"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "Tipas %s nerealizuoja GIcon sÄ…sajos"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
 msgstr "Tipas %s neklasifikuotas"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Netinkamas versijos numeris: %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Tipas %s nerealizuoja from_tokens() GIcon sÄ…sajoje"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Nepavyko apdoroti pateiktosios piktogramos koduotÄ—s versijos"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Nenurodytas adresas"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "%u yra per didelis ilgis adresui"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "Adresas turi nustatytus bitus už priešdėlio ilgio"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s� as IP address mask"
 msgstr "Nepavyko perskaityti „%s“ kaip IP adreso kaukės"
 
-#: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:218
+#: gio/ginetsocketaddress.c:203 gio/ginetsocketaddress.c:220
+#: gio/gnativesocketaddress.c:109 gio/gunixsocketaddress.c:220
 msgid "Not enough space for socket address"
 msgstr "Nepakanka vietos lizdo adresui"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Nepalaikomas lizdo adresas"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "Å altinio srautas nerealizuoja skaitymo"
 
@@ -1582,129 +1563,122 @@ msgstr "Å altinio srautas nerealizuoja skaitymo"
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: ../gio/ginputstream.c:1218 ../gio/giostream.c:310
-#: ../gio/goutputstream.c:1671
+#: gio/ginputstream.c:1218 gio/giostream.c:310 gio/goutputstream.c:1671
 msgid "Stream has outstanding operation"
 msgstr "Srautui liko neįvykdyta operacija"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Kopijuoti kartu su failu"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Palikti kartu su failu kai perkeliama"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version� takes no arguments"
 msgstr "„version“ nepriima argumentų"
 
-#: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:857
+#: gio/gio-tool.c:207 gio/gio-tool.c:223 glib/goption.c:857
 msgid "Usage:"
 msgstr "Naudojimas:"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 msgid "Print version information and exit."
 msgstr "Atspausdinti versijos informaciją ir išeiti."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGUMENTAI...]"
-
-#: ../gio/gio-tool.c:226
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Komandos:"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Išvesti failus į standartinę išvestį"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Kopijuoti vieną ar daugiau failų"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Rodyti informacijÄ… apie vietas"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Išvardinti vietų turinį"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "Gauti arba nustatyti MIME tipo doroklÄ™"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Sukurti katalogus"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Stebėti failų bei katalogų pasikeitimus"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Prijungti ar atjungti vietas"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Perkelti vieną ar daugiau failų"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Atverti failus naudojant numatytÄ…jÄ… programÄ…"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Pervadinti failÄ…"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Ištrinti vieną ar daugiau failų"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Skaityti iš standartinės įvesties ir įrašyti"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Nustatyti failo atributÄ…"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Perkelti failus ar katalogus į šiukšlinę"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Išvardina vietų turinį medžio pavidalu"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "Naudokite %s detaliai pagalbai.\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Klaida rašant į standartinę išvestį"
 
 #. Translators: commandline placeholder
-#: ../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
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
-#: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
-#: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
-#: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
+#: 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
+#: gio/gio-tool-monitor.c:203 gio/gio-tool-mount.c:1235 gio/gio-tool-open.c:113
+#: gio/gio-tool-remove.c:48 gio/gio-tool-rename.c:45 gio/gio-tool-set.c:89
+#: gio/gio-tool-trash.c:81 gio/gio-tool-tree.c:239
 msgid "LOCATION"
 msgstr "VIETA"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Sujungti failus ir išspausdinti standartinėje išvestyje."
 
-#: ../gio/gio-tool-cat.c:140
+#: 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"
@@ -1714,58 +1688,56 @@ msgstr ""
 "GIO vietas vietoj vietinių failų: pavyzdžiui, galite kaip vietą naudoti\n"
 "smb://serveris/išteklius/failas.txt."
 
-#: ../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:139 ../gio/gio-tool-remove.c:72
+#: 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-mount.c:1285 gio/gio-tool-open.c:139
+#: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Nepateikta vietų"
 
-#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38
+#: gio/gio-tool-copy.c:42 gio/gio-tool-move.c:38
 msgid "No target directory"
 msgstr "NÄ—ra paskirties katalogo"
 
-#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39
+#: gio/gio-tool-copy.c:43 gio/gio-tool-move.c:39
 msgid "Show progress"
 msgstr "Rodyti eigÄ…"
 
-#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40
+#: gio/gio-tool-copy.c:44 gio/gio-tool-move.c:40
 msgid "Prompt before overwrite"
 msgstr "Klausti prieš perrašant"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "IÅ¡laikyti visus atributus"
 
-#: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
-#: ../gio/gio-tool-save.c:49
+#: gio/gio-tool-copy.c:46 gio/gio-tool-move.c:41 gio/gio-tool-save.c:49
 msgid "Backup existing destination files"
 msgstr "Padaryti esamų paskirties failų atsargines kopijas"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Niekada neleisti simbolinių nuorodų"
 
-#: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67
+#: gio/gio-tool-copy.c:72 gio/gio-tool-move.c:67
 #, c-format
 msgid "Transferred %s out of %s (%s/s)"
 msgstr "Perduota %s iš %s (%s/s)"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
+#: gio/gio-tool-copy.c:98 gio/gio-tool-move.c:94
 msgid "SOURCE"
 msgstr "Å ALTINIS"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
-#: ../gio/gio-tool-save.c:160
+#: gio/gio-tool-copy.c:98 gio/gio-tool-move.c:94 gio/gio-tool-save.c:160
 msgid "DESTINATION"
 msgstr "PASKIRTIS"
 
-#: ../gio/gio-tool-copy.c:103
+#: gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
 msgstr "Kopijuoti vieną ar daugiau failų iš ŠALTINIO į PASKIRTĮ."
 
-#: ../gio/gio-tool-copy.c:105
+#: gio/gio-tool-copy.c:105
 msgid ""
 "gio copy is similar to the traditional cp utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -1775,93 +1747,88 @@ msgstr ""
 "vietas vietoj vietinių failų: pavyzdžiui galite naudoti kaip vietą\n"
 "smb://serveris/išteklius/failas.txt."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "Paskirtis %s nÄ—ra katalogas"
 
-#: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185
+#: gio/gio-tool-copy.c:192 gio/gio-tool-move.c:186
 #, c-format
 msgid "%s: overwrite “%s�? "
 msgstr "%s: perrašyti „%s“? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Išvardinti kei�iamus atributus"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Gauti failų sistemos informaciją"
 
-#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+#: gio/gio-tool-info.c:36 gio/gio-tool-list.c:35
 msgid "The attributes to get"
 msgstr "Kuriuos atributus gauti"
 
-#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+#: gio/gio-tool-info.c:36 gio/gio-tool-list.c:35
 msgid "ATTRIBUTES"
 msgstr "ATRIBUTAI"
 
-#: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
+#: gio/gio-tool-info.c:37 gio/gio-tool-list.c:38 gio/gio-tool-set.c:34
 msgid "Don’t follow symbolic links"
 msgstr "Nesekti simbolinÄ—mis nuorodomis"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "atributai:\n"
 
 #. Translators: This is a noun and represents and attribute of a file
-#: ../gio/gio-tool-info.c:127
+#: gio/gio-tool-info.c:127
 #, c-format
 msgid "display name: %s\n"
 msgstr "rodomas pavadinimas: %s\n"
 
 #. Translators: This is a noun and represents and attribute of a file
-#: ../gio/gio-tool-info.c:132
+#: gio/gio-tool-info.c:132
 #, c-format
 msgid "edit name: %s\n"
 msgstr "kei�iamas pavadinimas: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "pavadinimas: %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "tipas: %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
 msgstr "dydis: "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "paslÄ—ptas\n"
 
-#: ../gio/gio-tool-info.c:159
+#: gio/gio-tool-info.c:159
 #, c-format
 msgid "uri: %s\n"
 msgstr "uri: %s\n"
 
-#: ../gio/gio-tool-info.c:228
-#, c-format
+#: gio/gio-tool-info.c:228
 msgid "Settable attributes:\n"
 msgstr "Nustatomi atributai:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Rašomų atributų vardų sritys:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Rodyti informacijÄ… apie vietas."
 
-#: ../gio/gio-tool-info.c:289
+#: gio/gio-tool-info.c:289
 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"
@@ -1875,23 +1842,23 @@ msgstr ""
 "nurodyti jų GIO pavadinimais, pvz. standard::icon, arba tiesiog\n"
 "pagal vardų sritį, pvz. unix, arba „*“, kuri atitinka visus atributus"
 
-#: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
+#: gio/gio-tool-list.c:36 gio/gio-tool-tree.c:32
 msgid "Show hidden files"
 msgstr "Rodyti paslÄ—ptus failus"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Naudoti ilgą išvardinimo formatą"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Spausdinti pilnus URI"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Išvardinti vietų turinį."
 
-#: ../gio/gio-tool-list.c:172
+#: gio/gio-tool-list.c:172
 msgid ""
 "gio list is similar to the traditional ls utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -1904,19 +1871,19 @@ msgstr ""
 "jų GIO pavadinimu, pvz. standard::icon"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "MIMETIPAS"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "DOROKLÄ–"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
 msgstr "Gauti arba nustatyti doroklÄ™ MIME tipui."
 
-#: ../gio/gio-tool-mime.c:78
+#: gio/gio-tool-mime.c:78
 msgid ""
 "If no handler is given, lists registered and recommended applications\n"
 "for the mimetype. If a handler is given, it is set as the default\n"
@@ -1926,59 +1893,55 @@ msgstr ""
 "programas MIME tipui. Jei pateikta doroklÄ—, ji nustatoma kaip\n"
 "numatytoji doroklÄ— MIME tipui."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
 msgstr "Reikia nurodyti vienÄ… MIME tipÄ… arba doroklÄ™"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s�\n"
 msgstr "Nėra „%s“ numatytų programų\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s�: %s\n"
 msgstr "Numatyta „%s“ programa: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Registruotos programos:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Nėra registruotų programų\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Rekomenduojamos programos:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Nėra rekomenduojamų programų:\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s�"
 msgstr "Nepavyko įkelti „%s“ doroklės informacijos"
 
-#: ../gio/gio-tool-mime.c:168
+#: gio/gio-tool-mime.c:168
 #, c-format
 msgid "Failed to set “%s� as the default handler for “%s�: %s\n"
 msgstr "Nepavyko nustatyti „%s“ kaip numatytosios „%s“ doroklės: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Sukurti tÄ—vinius katalogus"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Sukurti aplankus."
 
-#: ../gio/gio-tool-mkdir.c:54
+#: gio/gio-tool-mkdir.c:54
 msgid ""
 "gio mkdir is similar to the traditional mkdir utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -1988,113 +1951,141 @@ msgstr ""
 "vietoj vietinių failų: pavyzdžiui galite naudoti kaip vietą\n"
 "smb://serveris/išteklius/failas.txt."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "StebÄ—ti katalogÄ… (numatyta: priklauso nuo tipo)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "StebÄ—ti failÄ… (numatyta: priklauso nuo tipo)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 "StebÄ—ti failÄ… tiesiogiai (pastebi per tiesiogines nuorodas atliktus "
 "pakeitimus)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Stebi failą tiesiogiai, bet nepraneša apie pasikeitimus"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "Pranešti apie perkėlimus bei pervadinimus kaip paprastus trynimo ir sukūrimo "
 "įvykius"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Stebėti prijungimo įvykius"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
 msgstr "Stebėti failų bei katalogų pasikeitimus."
 
-#: ../gio/gio-tool-mount.c:58
+#: gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr "Prijungti kaip prijungiamÄ…"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
 msgstr "Prijungti laikmeną su įrenginio failu"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63 gio/gio-tool-mount.c:66
 msgid "DEVICE"
 msgstr "ĮRENGINYS"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:64
 msgid "Unmount"
 msgstr "Atjungti"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "IÅ¡stumti"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:66
+#| msgid "Mount volume with device file"
+msgid "Stop drive with device file"
+msgstr "Sustabdyti laikmeną su įrenginio failu"
+
+#: gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
 msgstr "Atjungti visus prijungimus su pateikta schema"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
 msgid "SCHEME"
 msgstr "SCHEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:68
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr "Nepaisyti vykdomų veiksmų su failas atjungiant ar išstumiant"
 
-#: ../gio/gio-tool-mount.c:64
+#: gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
 msgstr "Naudoti anonimÄ… patvirtinant tapatybÄ™"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: gio/gio-tool-mount.c:71
 msgid "List"
 msgstr "IÅ¡vardinti"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr "Stebėti įvykius"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr "Rodyti papildomÄ… informacijÄ…"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: gio/gio-tool-mount.c:74
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "Skaitmeninis PIM atrakinant VeraCrypt tomÄ…"
+
+#: gio/gio-tool-mount.c:74
+#| msgctxt "GDateTime"
+#| msgid "PM"
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:75
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Prijungti TCRYPT paslÄ—ptÄ… tomÄ…"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr "Prijungti TCRYPT sisteminį tomą"
+
+#: gio/gio-tool-mount.c:264 gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
 msgstr "Neleidžiama anoniminė prieiga"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:524
+#| msgid "No volume for device file"
+msgid "No drive for device file"
+msgstr "Nėra laikmenos ar įrenginio failo"
+
+#: gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s prijungta kelyje %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
 msgstr "Nėra laikmenos ar įrenginio failo"
 
-#: ../gio/gio-tool-mount.c:1145
+#: gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
 msgstr "Prijungti ar atjungti vietas."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Nenaudoti kopijavimo ir trynimo atsarginÄ—s veiksenos"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Perkelti vieną ar daugiau failų iš ŠALTINIO į PASKIRTĮ."
 
-#: ../gio/gio-tool-move.c:101
+#: gio/gio-tool-move.c:101
 msgid ""
 "gio move is similar to the traditional mv utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -2104,12 +2095,12 @@ msgstr ""
 "vietoj vietinių failų: pavyzdžiui galite naudoti kaip vietą\n"
 "smb://serveris/išteklius/failas.txt"
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "Paskirtis %s nÄ—ra katalogas"
 
-#: ../gio/gio-tool-open.c:118
+#: gio/gio-tool-open.c:118
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
@@ -2117,244 +2108,255 @@ msgstr ""
 "Atverti failus numatytÄ…ja programa kuri yra\n"
 "priregistruota darbui su Å¡io tipo failais."
 
-#: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
+#: gio/gio-tool-remove.c:31 gio/gio-tool-trash.c:31
 msgid "Ignore nonexistent files, never prompt"
 msgstr "Nepaisyti neegzistuojan�ių failų, niekada nepranešti"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "IÅ¡trinti pateiktus failus."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "PAVADINIMAS"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Pervadinti failÄ…."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Trūksta argumento"
 
-#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:190
-#: ../gio/gio-tool-set.c:137
+#: gio/gio-tool-rename.c:76 gio/gio-tool-save.c:190 gio/gio-tool-set.c:137
 msgid "Too many arguments"
 msgstr "Per daug argumentų"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "SÄ—kmingai pervadinta. Naujas uri: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Sukurti tik jei neegzistuoja"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "PridÄ—ti prie failo pabaigos"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Sukuriant riboti prieiga tik esamam naudotojui"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr "Kei�iant pakeisti taip, lyg paskirtis neegzistuotų"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:55
+#: gio/gio-tool-save.c:55
 msgid "Print new etag at end"
 msgstr "Atspausdinti naujÄ… etag pabaigoje"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:57
+#: gio/gio-tool-save.c:57
 msgid "The etag of the file being overwritten"
 msgstr "Perrašomo failo etag"
 
-#: ../gio/gio-tool-save.c:57
+#: gio/gio-tool-save.c:57
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../gio/gio-tool-save.c:113
+#: gio/gio-tool-save.c:113
 msgid "Error reading from standard input"
 msgstr "Klaida skaitant iš standartinės įvesties"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:139
-#, c-format
+#: gio/gio-tool-save.c:139
 msgid "Etag not available\n"
 msgstr "NÄ—ra etag\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Skaityti iš standartinės įvesties ir įrašyti PASKIRTYJE."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Nepateikta paskirtis"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Atributo tipas"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "TYPE"
 msgstr "TYPE"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
 msgstr "ATRIBUTAS"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "VERTÄ–"
 
-#: ../gio/gio-tool-set.c:93
+#: gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr "Nustatyti VIETOS failo atributÄ…."
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Nenurodyta vieta"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Nenurodytas atributas"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Nenurodyta vieta"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s�"
 msgstr "Netinkamas atributo tipas „%s“"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Perkelti failus ar katalogus į šiukšlinę."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Sekti simbolinÄ—mis nuorodomis, prijungimais bei trumpiniais"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
 msgstr "Išvardinti katalogų turinį medžio pavidalo formatu."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1515
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Elementas <%s> neleidžiamas viduje <%s>"
 
-#: ../gio/glib-compile-resources.c:146
+#: gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Elementas <%s> neleidžiamas aukš�iausiame lygyje"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "Failas %s ištekliuje aptinkamas kelis kartus"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s� in any source directory"
 msgstr "Nepavyko rasti „%s“ jokiame šaltinio kataloge"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s� in current directory"
 msgstr "Nepavyko rasti „%s“ esamame kataloge"
 
-#: ../gio/glib-compile-resources.c:290
+#: gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s�"
 msgstr "Nežinomas apdorojimo parametras „%s“"
 
-#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
+#. Translators: the first %s is a gresource XML attribute,
+#. * the second %s is an environment variable, and the third
+#. * %s is a command line tool
+#.
+#: gio/glib-compile-resources.c:313 gio/glib-compile-resources.c:370
+#: gio/glib-compile-resources.c:427
 #, c-format
-msgid "Failed to create temp file: %s"
-msgstr "Nepavyko sukurti laikino failo: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr "Prašomas %s apdorojimas, bet %s nenustatytas, o PATH nėra %s"
 
-#: ../gio/glib-compile-resources.c:382
+#: gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Klaida skaitant failÄ… %s: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Klaida spaudžiant failą: %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "tekstas negali būti viduje <%s>"
 
-#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
+#: gio/glib-compile-resources.c:736 gio/glib-compile-schemas.c:2138
 msgid "Show program version and exit"
 msgstr "Parodyti programos versiją ir išeiti"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
-msgstr "išvesties failo pavadinimas"
+#: gio/glib-compile-resources.c:737
+#| msgid "name of the output file"
+msgid "Name of the output file"
+msgstr "IÅ¡vesties failo pavadinimas"
 
-#: ../gio/glib-compile-resources.c:666
+#: gio/glib-compile-resources.c:738
+#| msgid ""
+#| "The directories where files are to be read from (default to current "
+#| "directory)"
 msgid ""
-"The directories where files are to be read from (default to current "
+"The directories to load files referenced in FILE from (default: current "
 "directory)"
-msgstr "Katalogai, iš kurių skaityti failus (numatyta iš esamo katalogo)"
+msgstr ""
+"Katalogai, iš kurių skaityti faile nurodytus failus (numatyta iš esamo "
+"katalogo)"
 
-#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: gio/glib-compile-resources.c:738 gio/glib-compile-schemas.c:2139
+#: gio/glib-compile-schemas.c:2168
 msgid "DIRECTORY"
 msgstr "KATALOGAS"
 
-#: ../gio/glib-compile-resources.c:667
+#: gio/glib-compile-resources.c:739
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Generuoti išvestį formatu pagal pasirinkto tikslo failo plėtinį"
 
-#: ../gio/glib-compile-resources.c:668
+#: gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Generuoti šaltinio antraštę"
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
+#: gio/glib-compile-resources.c:741
+#| msgid "Generate sourcecode used to link in the resource file into your code"
+msgid "Generate source code used to link in the resource file into your code"
 msgstr "Generuoti kodą, naudojamą išteklių failo įrišimui į jūsų kodą"
 
-#: ../gio/glib-compile-resources.c:670
+#: gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Generuoti priklausomybių sąrašą"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr "generuojamo priklausomybių failo pavadinimas"
+#: gio/glib-compile-resources.c:743
+#| msgid "name of the dependency file to generate"
+msgid "Name of the dependency file to generate"
+msgstr "Generuojamo priklausomybių failo pavadinimas"
 
-#: ../gio/glib-compile-resources.c:672
+#: gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Įtraukti į sugeneruotą priklausomybių failą netikras paskirtis"
 
-#: ../gio/glib-compile-resources.c:673
+#: gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "Automatiškai negeneruoti ir neregistruoti ištekliaus"
 
-#: ../gio/glib-compile-resources.c:674
+#: gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Neeksportuoti funkcijų; deklaruoti jas G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:675
+#: gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
 msgstr "C identifikatoriaus vardas, naudojamas generuojamame kode"
 
-#: ../gio/glib-compile-resources.c:701
+#: gio/glib-compile-resources.c:773
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2364,124 +2366,123 @@ msgstr ""
 "Resursų specifikacijos failai turi turėti plėtinį .gresource.xml,\n"
 "o resurso failas turi plėtinį gresource."
 
-#: ../gio/glib-compile-resources.c:723
-#, c-format
+#: gio/glib-compile-resources.c:795
 msgid "You should give exactly one file name\n"
 msgstr "Turite nurodyti vienintelį failo pavadinimą\n"
 
-#: ../gio/glib-compile-schemas.c:95
+#: gio/glib-compile-schemas.c:95
 #, c-format
 msgid "nick must be a minimum of 2 characters"
 msgstr "slapyvardis turi būti bent 2 simbolių ilgio"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Neteisinga skaitinÄ— vertÄ—"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "value='%s' jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:136
+#: gio/glib-compile-schemas.c:136
 #, c-format
 msgid "flags values must have at most 1 bit set"
 msgstr "požymių vertės turi turėti nustatytą vienintelį bitą"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s> turi turÄ—ti bent vienÄ… <value>"
 
-#: ../gio/glib-compile-schemas.c:315
+#: gio/glib-compile-schemas.c:317
 #, c-format
 msgid "<%s> is not contained in the specified range"
 msgstr "<%s> nėra nurodytuose rėžiuose"
 
-#: ../gio/glib-compile-schemas.c:327
+#: gio/glib-compile-schemas.c:329
 #, c-format
 msgid "<%s> is not a valid member of the specified enumerated type"
 msgstr "<%s> nėra tinkamas nurodyti išvardinimo tipo narys"
 
-#: ../gio/glib-compile-schemas.c:333
+#: gio/glib-compile-schemas.c:335
 #, c-format
 msgid "<%s> contains string not in the specified flags type"
 msgstr "<%s> turi simbolių eilutę, kuri nėra nurodytų požymių tipo"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s> turi simbolių eilutę, kurios nėra <choices>"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> jau nurodytas Å¡iam raktui"
 
-#: ../gio/glib-compile-schemas.c:391
+#: gio/glib-compile-schemas.c:393
 #, c-format
 msgid "<range> not allowed for keys of type “%s�"
 msgstr "<range> neleidžiamas „%s“ tipo raktams"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "<range> nurodyta mažiausia vertė yra didesnė už didžiausią"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "nepalaikoma l10n kategorija: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n prašoma, bet nepateikta gettext sritis"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "vertei pateiktas vertimo kontekstas, bet l10n neįjungta"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s�: "
 msgstr "Nepavyko perskaityti <default> vertės tipui „%s“: "
 
-#: ../gio/glib-compile-schemas.c:492
+#: gio/glib-compile-schemas.c:494
 msgid ""
 "<choices> cannot be specified for keys tagged as having an enumerated type"
 msgstr ""
 "<choices> negali būti nurodyta raktams, pažymėtiems turin�iais išvardinamą "
 "tipÄ…"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> jau nurodytas Å¡iam raktui"
 
-#: ../gio/glib-compile-schemas.c:513
+#: gio/glib-compile-schemas.c:515
 #, c-format
 msgid "<choices> not allowed for keys of type “%s�"
 msgstr "<choices> neleidžiamas „%s“ tipo raktams"
 
-#: ../gio/glib-compile-schemas.c:529
+#: gio/glib-compile-schemas.c:531
 #, c-format
 msgid "<choice value='%s'/> already given"
 msgstr "<choice value='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices> turi turÄ—ti bent vienÄ… <choice>"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> jau nurodytas Å¡iam raktui"
 
-#: ../gio/glib-compile-schemas.c:562
+#: gio/glib-compile-schemas.c:564
 msgid ""
 "<aliases> can only be specified for keys with enumerated or flags types or "
 "after <choices>"
@@ -2489,50 +2490,50 @@ msgstr ""
 "<aliases> gali būti nurodytas tik raktams su išvardinamais arba požymių "
 "tipais, arba po <choices>"
 
-#: ../gio/glib-compile-schemas.c:581
+#: gio/glib-compile-schemas.c:583
 #, c-format
 msgid ""
 "<alias value='%s'/> given when “%s� is already a member of the enumerated "
 "type"
 msgstr "<alias value='%s'/> pateiktas, kai „%s“ jau yra išvardinto tipo narys"
 
-#: ../gio/glib-compile-schemas.c:587
+#: gio/glib-compile-schemas.c:589
 #, c-format
 msgid "<alias value='%s'/> given when <choice value='%s'/> was already given"
 msgstr ""
 "<alias value='%s'/> pateiktas, kai <choice value='%s'/> jau yra pateiktas"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s� is not in enumerated type"
 msgstr "Alt. pavadinimo paskirtis „%s“ nėra išvardinamame tipe"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s� is not in <choices>"
 msgstr "Alt. pavadinimo paskirties „%s“ nėra <choices>"
 
-#: ../gio/glib-compile-schemas.c:621
+#: gio/glib-compile-schemas.c:623
 #, c-format
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> turi turÄ—ti bent vienÄ… <alias>"
 
-#: ../gio/glib-compile-schemas.c:786
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "Neleidžiami tušti pavadinimai"
 
-#: ../gio/glib-compile-schemas.c:796
+#: gio/glib-compile-schemas.c:808
 #, c-format
 msgid "Invalid name “%s�: names must begin with a lowercase letter"
 msgstr ""
 "Netinkamas pavadinimas „%s“: pavadinimai turi prasidėti mažosiomis raidėmis"
 
-#: ../gio/glib-compile-schemas.c:808
+#: gio/glib-compile-schemas.c:820
 #, c-format
 msgid ""
 "Invalid name “%s�: invalid character “%c�; only lowercase letters, numbers "
@@ -2541,38 +2542,38 @@ msgstr ""
 "Netinkamas pavadinimas „%s“: netinkamas simbolis „%c“; leidžiamos tik "
 "mažosios raidės, skaitmenys ir brūkšniai („-“)"
 
-#: ../gio/glib-compile-schemas.c:817
+#: gio/glib-compile-schemas.c:829
 #, c-format
 msgid "Invalid name “%s�: two successive hyphens (“--�) are not permitted"
 msgstr ""
 "Netinkamas pavadinimas „%s“: du brūkšniai („--“) vienos po kito neleidžiami."
 
-#: ../gio/glib-compile-schemas.c:826
+#: gio/glib-compile-schemas.c:838
 #, c-format
 msgid "Invalid name “%s�: the last character may not be a hyphen (“-�)"
 msgstr ""
 "Netinkamas pavadinimas „%s“: paskutinis simbolis negali būti brūkšnys („-“)."
 
-#: ../gio/glib-compile-schemas.c:834
+#: gio/glib-compile-schemas.c:846
 #, c-format
 msgid "Invalid name “%s�: maximum length is 1024"
 msgstr "Netinkamas pavadinimas „%s“: didžiausias leistinas ilgis yra 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> jau nurodyta"
 
-#: ../gio/glib-compile-schemas.c:930
+#: gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of� schema"
 msgstr "Nepavyko pridėti raktų į „list-of“ schemą"
 
-#: ../gio/glib-compile-schemas.c:941
+#: gio/glib-compile-schemas.c:955
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:959
+#: gio/glib-compile-schemas.c:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2581,7 +2582,7 @@ msgstr ""
 "<key name='%s'> paslÄ—pia <key name='%s'> elemente <schema id='%s'>; "
 "naudokite <override> reikšmei pakeisti"
 
-#: ../gio/glib-compile-schemas.c:970
+#: gio/glib-compile-schemas.c:984
 #, c-format
 msgid ""
 "Exactly one of “type�, “enum� or “flags� must be specified as an attribute "
@@ -2590,56 +2591,56 @@ msgstr ""
 "Kaip atributas elementui <key> turi būti nurodytas vienintelis iš „type“, "
 "„enum“ arba „flags“"
 
-#: ../gio/glib-compile-schemas.c:989
+#: gio/glib-compile-schemas.c:1003
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> (dar) neapibrėžta."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1018
 #, c-format
 msgid "Invalid GVariant type string “%s�"
 msgstr "Netinkama GVariant tipo eilutė „%s“"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
 msgstr "<override> nurodytas, bet schema nieko neišple�ia"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: gio/glib-compile-schemas.c:1061
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Nėra perrašomo <key name='%s'>"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:1140
+#: gio/glib-compile-schemas.c:1154
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s�"
 msgstr "<schema id='%s'> išple�ia dar neegzistuojan�ią schemą „%s“"
 
-#: ../gio/glib-compile-schemas.c:1156
+#: gio/glib-compile-schemas.c:1170
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s�"
 msgstr "<schema id='%s'> yra sąrašas iš dar neegzistuojan�ios schemos „%s“"
 
-#: ../gio/glib-compile-schemas.c:1164
+#: gio/glib-compile-schemas.c:1178
 #, c-format
 msgid "Cannot be a list of a schema with a path"
 msgstr "Negali būti schemos sąrašas su keliu"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: gio/glib-compile-schemas.c:1188
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Negalima išplėsti schemos su keliu"
 
-#: ../gio/glib-compile-schemas.c:1184
+#: gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2647,7 +2648,7 @@ msgstr ""
 "<schema id='%s'> yra sąrašas, išple�iantis <schema id='%s'>, kuris nėra "
 "sąrašas"
 
-#: ../gio/glib-compile-schemas.c:1194
+#: gio/glib-compile-schemas.c:1208
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s� "
@@ -2656,17 +2657,17 @@ msgstr ""
 "<schema id='%s' list-of='%s'> išple�ia <schema id='%s' list-of='%s'>, bet "
 "„%s“ neišple�ia „%s“"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: gio/glib-compile-schemas.c:1225
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr "Kelias, jei pateiktas, turi prasidėti ir baigtis pasviruoju brūkšniu"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: gio/glib-compile-schemas.c:1232
 #, c-format
 msgid "The path of a list must end with “:/�"
 msgstr "Sąrašo kelias turi baigtis „:/“"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s� has path “%s�.  Paths starting with “/apps/�, “/"
@@ -2675,117 +2676,136 @@ msgstr ""
 "Įspėjimas: schema „%s“ turi kelią „%s“.  Keliai, prasidedantys „/apps/“, „/"
 "desktop/“ ar „/system“ yra pasenę."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> jau nurodytas"
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
+#: gio/glib-compile-schemas.c:1421 gio/glib-compile-schemas.c:1437
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
 msgstr "Tik vienas elementas <%s> leidžiamas <%s> viduje"
 
-#: ../gio/glib-compile-schemas.c:1505
+#: gio/glib-compile-schemas.c:1519
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr "Elementas <%s> neleidžiamas aukš�iausiame lygyje"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
 msgstr "Elementas <default> yra būtinas elemente <key>"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: gio/glib-compile-schemas.c:1627
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "Tekstas negali būti viduje <%s>"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: gio/glib-compile-schemas.c:1695
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Įspėjimas: neapibrėžta nuoroda į <schema id='%s'/>"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: gio/glib-compile-schemas.c:1834 gio/glib-compile-schemas.c:1910
+#: gio/glib-compile-schemas.c:2025
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict buvo nurodyta; išeinama.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Visas failas nepaisomas.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Nepaisoma Å¡io failo.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: gio/glib-compile-schemas.c:1959
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+#| msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+msgid "No such key “%s� in schema “%s� as specified in override file “%s�"
 msgstr "Nėra rakto „%s“ schemoje „%s“ kaip nurodyta perrašan�iame faile „%s“"
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: gio/glib-compile-schemas.c:1965 gio/glib-compile-schemas.c:1990
+#: gio/glib-compile-schemas.c:2050 gio/glib-compile-schemas.c:2079
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; nepaisoma šio rakto perrašymo.\n"
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: gio/glib-compile-schemas.c:1969 gio/glib-compile-schemas.c:1994
+#: gio/glib-compile-schemas.c:2054 gio/glib-compile-schemas.c:2083
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " ir --strict nurodyta; išeinama.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+#: gio/glib-compile-schemas.c:1984
 #, c-format
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
+"cannot provide per-desktop overrides for localised key “%s� in schema "
+"“%s� (override file “%s�)"
 msgstr ""
-"klaida skaitant raktą „%s“ schemoje „%s“ kaip nurodyta perrašan�iame faile "
+"negalima pateikti darbalaukio pakeitimų lokalizuotam raktui „%s“ schemoje "
+"„%s“ (perrašomas failas „%s“)"
+
+#: gio/glib-compile-schemas.c:2011
+#, c-format
+#| msgid ""
+#| "error parsing key '%s' in schema '%s' as specified in override file '%s': "
+#| "%s."
+msgid ""
+"error parsing key “%s� in schema “%s� as specified in override file “%s�: %s."
+msgstr ""
+"klaida skaitant raktą „%s“ schemoje „%s“, kaip nurodyta perrašan�iame faile "
 "„%s“: %s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: gio/glib-compile-schemas.c:2021
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Nepaisoma šio rakto perrašymo.\n"
 
-#: ../gio/glib-compile-schemas.c:1984
+#: gio/glib-compile-schemas.c:2040
 #, c-format
+#| msgid ""
+#| "override for key '%s' in schema '%s' in override file '%s' is outside the "
+#| "range given in the schema"
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is outside the "
+"override for key “%s� in schema “%s� in override file “%s� is outside the "
 "range given in the schema"
 msgstr ""
 "rakto „%s“ perrašymas schemoje „%s“ perrašan�iame faile „%s“ yra už schemoje "
 "nurodytų ribų"
 
-#: ../gio/glib-compile-schemas.c:2012
+#: gio/glib-compile-schemas.c:2069
 #, c-format
+#| msgid ""
+#| "override for key '%s' in schema '%s' in override file '%s' is not in the "
+#| "list of valid choices"
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is not in the "
+"override for key “%s� in schema “%s� in override file “%s� is not in the "
 "list of valid choices"
 msgstr ""
 "rakto „%s“ perrašymas schemoje „%s“ perrašan�iame faile „%s“ nėra iš "
 "leistinų pasirinkimų"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr "kur saugoti gschemas.compiled failÄ…"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr "Nutraukti darbÄ… esant bet kokiai klaidai schemoje"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr "Nerašyti gschema.compiled failo"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr "Nereikalauti raktų vardų apribojimų"
 
-#: ../gio/glib-compile-schemas.c:2099
+#: gio/glib-compile-schemas.c:2171
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2795,32 +2815,32 @@ msgstr ""
 "Schemų failai turi turėti plėtinį .gschema.xml,\n"
 "o podÄ—lio failas yra vadinamas gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: gio/glib-compile-schemas.c:2192
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Turite nurodyti vienintelį katalogo vardą\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Nerasti schemų failai: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "nedaro nieko.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "pašalintas egzistuojanti išvesties failas.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: gio/glocalfile.c:544 gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Netaisyklingas failo vardas %s"
 
-#: ../gio/glocalfile.c:1105
+#: gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Klaida gaunant %s failų sistemos informaciją: %s"
@@ -2829,313 +2849,319 @@ msgstr "Klaida gaunant %s failų sistemos informaciją: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "Nerastas tėvinis prijungimo taškas %s"
 
-#: ../gio/glocalfile.c:1267
+#: gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Negalima pervadinti Å¡akninio aplanko"
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: gio/glocalfile.c:1186 gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Klaida pervadinant failÄ… %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Nepavyko pervadinti failo, failo vardas jau užimtas"
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: gio/glocalfile.c:1206 gio/glocalfile.c:2267 gio/glocalfile.c:2295
+#: gio/glocalfile.c:2452 gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Netaisyklingas failo vardas"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: gio/glocalfile.c:1374 gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Klaida atveriant failÄ… %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Klaida trinant failÄ… %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: gio/glocalfile.c:1925
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Klaida perkeliant failą %s į šiukšlinę: %s"
 
-#: ../gio/glocalfile.c:2020
+#: gio/glocalfile.c:1948
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Nepavyko sukurti šiukšlių aplanko %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: gio/glocalfile.c:1970
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Nepavyko rasti šakninio aplanko %s išmesti"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: gio/glocalfile.c:1979
+#, c-format
+#| msgid "Copy (reflink/clone) between mounts is not supported"
+msgid "Trashing on system internal mounts is not supported"
+msgstr "Išmetimas tarp sistemos vidinių prijungimo taškų nepalaikomas"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Nepavyko rasti ar sukurti šiukšlių aplanko %s"
 
-#: ../gio/glocalfile.c:2174
+#: gio/glocalfile.c:2118
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Nepavyko sukurti šiukšlinės informacijos failo %s: %s"
 
-#: ../gio/glocalfile.c:2233
+#: gio/glocalfile.c:2178
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr "Nepavyko perkelti failo %s į šiukšlinę per failų sistemos ribas"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: gio/glocalfile.c:2182 gio/glocalfile.c:2238
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Nepavyko failo %s išmesti į šiukšlinę: %s"
 
-#: ../gio/glocalfile.c:2299
+#: gio/glocalfile.c:2244
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Nepavyko išmesti į šiukšlinę failo %s"
 
-#: ../gio/glocalfile.c:2325
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Klaida kuriant katalogÄ… %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Failų sistema nepalaiko simbolinių nuorodų"
 
-#: ../gio/glocalfile.c:2357
+#: gio/glocalfile.c:2302
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Klaida kuriant simbolinÄ™ nuorodÄ… %s: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: gio/glocalfile.c:2308 glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "SimbolinÄ—s nuorodos nepalaikomos"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: gio/glocalfile.c:2363 gio/glocalfile.c:2398 gio/glocalfile.c:2455
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Klaida perkeliant failÄ… %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "Negalima perkelti aplanko ant aplanko"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
-#: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
-#: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
+#: gio/glocalfile.c:2412 gio/glocalfileoutputstream.c:935
+#: gio/glocalfileoutputstream.c:949 gio/glocalfileoutputstream.c:964
+#: gio/glocalfileoutputstream.c:981 gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Atsarginės kopijos sukūrimas nesėkmingas"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Klaida trinant nurodytÄ… failÄ…: %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "Perkėlimas tarp prijungimo taškų nepalaikomas"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Nepavyko nustatyti %s disko naudojimo: %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "Atributo reikšmė turi būti netuš�ia"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "netaisyklingas atributo tipas (tikimasi simbolių sekos)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "netaisyklingas išplėstinio atributo pavadinimas"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s�: %s"
 msgstr "Klaida nustatant išplėstinį atributą „%s“: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (netaisyklinga koduotÄ—)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: gio/glocalfileinfo.c:1783 gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr "Klaida gaunant informaciją apie failą „%s“: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: gio/glocalfileinfo.c:2045
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Klaida gaunant informaciją failo aprašymui: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Klaidingas atributo tipas (tikimasi uint32)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Klaidingas atributo tipas (tikimasi uint64)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: gio/glocalfileinfo.c:2127 gio/glocalfileinfo.c:2146
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Klaidingas atributo tipas (tikimasi baitų sekos)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "Simbolinėms nuorodoms teisių nustatyti negalima"
 
-#: ../gio/glocalfileinfo.c:2200
+#: gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Klaida nustatant teises: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Klaida nustatant savininkÄ…: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "simbolinė nuoroda turi būti netuš�ia"
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: gio/glocalfileinfo.c:2291 gio/glocalfileinfo.c:2310
+#: gio/glocalfileinfo.c:2321
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Klaida nustatant simbolinÄ™ nuorodÄ…: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr "Klaida, nustatant simbolinÄ™ nuorodÄ…: failas nÄ—ra simbolinÄ— nuoroda"
 
-#: ../gio/glocalfileinfo.c:2419
+#: gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Klaida nustatant pakeitimo arba prieigos laikÄ…: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux kontekstas būti nelygus NULL"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Klaida nustatant SELinux kontekstÄ…: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux šioje sistemoje neįjungtas"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Atributo %s nustatymas nepalaikomas"
 
-#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:696
+#: gio/glocalfileinputstream.c:168 gio/glocalfileoutputstream.c:696
 #, c-format
 msgid "Error reading from file: %s"
 msgstr "Klaida skaitant failÄ…: %s"
 
-#: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211
-#: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333
-#: ../gio/glocalfileoutputstream.c:458 ../gio/glocalfileoutputstream.c:1013
+#: gio/glocalfileinputstream.c:199 gio/glocalfileinputstream.c:211
+#: gio/glocalfileinputstream.c:225 gio/glocalfileinputstream.c:333
+#: gio/glocalfileoutputstream.c:458 gio/glocalfileoutputstream.c:1013
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "Klaida kei�iant poziciją faile: %s"
 
-#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:248
-#: ../gio/glocalfileoutputstream.c:342
+#: gio/glocalfileinputstream.c:255 gio/glocalfileoutputstream.c:248
+#: gio/glocalfileoutputstream.c:342
 #, c-format
 msgid "Error closing file: %s"
 msgstr "Klaida užveriant failą: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr "Nepavyko rasti numatytojo vietinių failų stebyklės tipo"
 
-#: ../gio/glocalfileoutputstream.c:196 ../gio/glocalfileoutputstream.c:228
-#: ../gio/glocalfileoutputstream.c:717
+#: gio/glocalfileoutputstream.c:196 gio/glocalfileoutputstream.c:228
+#: gio/glocalfileoutputstream.c:717
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "Klaida rašant į failą: %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Klaida Å¡alinant senos atsarginÄ—s kopijos nuorodÄ…: %s"
 
-#: ../gio/glocalfileoutputstream.c:289 ../gio/glocalfileoutputstream.c:302
+#: gio/glocalfileoutputstream.c:289 gio/glocalfileoutputstream.c:302
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "Klaida kuriant atsarginÄ™ kopijÄ…: %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Klaida pervadinant laikinąjį failą: %s"
 
-#: ../gio/glocalfileoutputstream.c:504 ../gio/glocalfileoutputstream.c:1064
+#: gio/glocalfileoutputstream.c:504 gio/glocalfileoutputstream.c:1064
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "Klaida trumpinant failÄ…: %s"
 
-#: ../gio/glocalfileoutputstream.c:557 ../gio/glocalfileoutputstream.c:795
-#: ../gio/glocalfileoutputstream.c:1045 ../gio/gsubprocess.c:380
+#: gio/glocalfileoutputstream.c:557 gio/glocalfileoutputstream.c:795
+#: gio/glocalfileoutputstream.c:1045 gio/gsubprocess.c:380
 #, c-format
 msgid "Error opening file “%s�: %s"
 msgstr "Klaida atveriant failÄ… %s: %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Paskirties failas yra aplankas"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Paskirties failas nÄ—ra paprastas failas"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "Failas buvo pakeistas kitos programos"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Klaida ištrinant senąjį failą: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Netaisyklingas GSeekType"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Netinkama pozicijos keitimo užklausa"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "Nepavyko sutrumpinti GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Atminties išvedimo srauto dydis nekei�iamas"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Nepavyko pakeisti atminties išvedimo srauto dydžio"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3143,32 +3169,32 @@ msgstr ""
 "Atminties kiekis, reikalingas įrašymui apdoroti, netelpa į prieinamą adresų "
 "erdvÄ™"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "Prašoma perkelti poziciją dar prieš srauto pradžią"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "Prašoma perkelti poziciją jau už srauto pabaigos"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr "prijungtasis objektas nepalaiko atjungimo"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 msgstr "prijungtasis objektas nepalaiko išstūmimo"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:550
+#: gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 msgstr ""
 "prijungtasis objektas nepalaiko atjungimo nei su papildoma operacija, nei be "
@@ -3177,7 +3203,7 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:635
+#: gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 msgstr ""
 "prijungtasis objektas nepalaiko išstūmimo nei su papildoma operacija, nei be "
@@ -3186,101 +3212,100 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:723
+#: gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 msgstr "prijungtasis objektas nepalaiko pakartotinio prijungimo"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:805
+#: gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "prijungimo taškas nepalaiko turinio tipo spėjimo"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "prijungimo taškas nepalaiko sinchroninio turinio tipo spėjimo"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 msgid "Hostname “%s� contains “[� but not “]�"
 msgstr "Mazgo varde „%s“ yra ženklas „[“, bet nėra „]“"
 
-#: ../gio/gnetworkmonitorbase.c:212 ../gio/gnetworkmonitorbase.c:316
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Tinklas nepasiekiamas"
 
-#: ../gio/gnetworkmonitorbase.c:250 ../gio/gnetworkmonitorbase.c:280
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Serveris nepasiekiamas"
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
+#: gio/gnetworkmonitornetlink.c:97 gio/gnetworkmonitornetlink.c:109
+#: gio/gnetworkmonitornetlink.c:128
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "Nepavyko sukurti tinklo stebyklÄ—s: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "Nepavyko sukurti tiklo stebÄ—tojo: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Nepavyko gauti tinklo būsenos: "
 
-#: ../gio/gnetworkmonitornm.c:322
+#: gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Per sena NetworkManager versija"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "Išvedimo srautas nepalaiko rašymo"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Šaltinio srautas jau užvertas"
 
-#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
-#: ../gio/gthreadedresolver.c:126
+#: gio/gresolver.c:342 gio/gthreadedresolver.c:116 gio/gthreadedresolver.c:126
 #, c-format
 msgid "Error resolving “%s�: %s"
 msgstr "Klaida surandant „%s“: %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Neteisinga sritis"
 
-#: ../gio/gresource.c:621 ../gio/gresource.c:880 ../gio/gresource.c:919
-#: ../gio/gresource.c:1043 ../gio/gresource.c:1115 ../gio/gresource.c:1188
-#: ../gio/gresource.c:1258 ../gio/gresourcefile.c:476
-#: ../gio/gresourcefile.c:599 ../gio/gresourcefile.c:736
+#: gio/gresource.c:622 gio/gresource.c:881 gio/gresource.c:920
+#: gio/gresource.c:1044 gio/gresource.c:1116 gio/gresource.c:1189
+#: gio/gresource.c:1259 gio/gresourcefile.c:476 gio/gresourcefile.c:599
+#: gio/gresourcefile.c:736
 #, c-format
 msgid "The resource at “%s� does not exist"
 msgstr "Ištekliaus ties „%s“ nėra"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s� failed to decompress"
 msgstr "Ištekliaus ties „%s“ nepavyko išskleisti"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s� is not a directory"
 msgstr "Išteklius ties „%s“ nėra katalogas"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Įvesties srautas nerealizuoja nenuoseklaus skaitymo"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
 msgstr "Išvardinti sekcijas, turin�ias išteklius elf FAILE"
 
-#: ../gio/gresource-tool.c:500
+#: gio/gresource-tool.c:500
 msgid ""
 "List resources\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3290,16 +3315,15 @@ msgstr ""
 "Jei SEKCIJA pateikta, išvardinti tik išteklius šioje sekcijoje\n"
 "Jei KELIAS yra pateiktas, išvardinti tik atitinkan�ius išteklius"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:503 gio/gresource-tool.c:513
 msgid "FILE [PATH]"
 msgstr "FAILAS [KELIAS]"
 
-#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514
-#: ../gio/gresource-tool.c:521
+#: gio/gresource-tool.c:504 gio/gresource-tool.c:514 gio/gresource-tool.c:521
 msgid "SECTION"
 msgstr "SEKCIJA"
 
-#: ../gio/gresource-tool.c:509
+#: gio/gresource-tool.c:509
 msgid ""
 "List resources with details\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3311,15 +3335,15 @@ msgstr ""
 "Jei KELIAS pateiktas, išvardinti tik atitinkamus išteklius\n"
 "Į detalės įeina sekcija, dydis ir glaudinimas"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:519
 msgid "Extract a resource file to stdout"
 msgstr "Išgauti ištekliaus failą į standartinę išvestį"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:520
 msgid "FILE PATH"
 msgstr "FAILO KELIAS"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:534
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3347,7 +3371,7 @@ msgstr ""
 "Naudokite „gresource help KOMANDA“ detalesnei pagalbai.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:548
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3362,20 +3386,20 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:555
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SEKCIJA   (Nebūtinas) elf sekcijos pavadinimas\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:703
+#: gio/gresource-tool.c:559 gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  KOMANDA   Komanda (nebūtina) paaiškinimui\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:565
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr ""
 "  FAILAS    elf failas (dvejetainis arba bendro naudojimo biblioteka)\n"
 
-#: ../gio/gresource-tool.c:568
+#: gio/gresource-tool.c:568
 msgid ""
 "  FILE      An elf file (a binary or a shared library)\n"
 "            or a compiled resource file\n"
@@ -3383,90 +3407,82 @@ msgstr ""
 "  FAILAS    elf failas (dvejetainis arba bendro naudojimo biblioteka)\n"
 "            arba kompiliuotas ištekliaus failas\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:572
 msgid "[PATH]"
 msgstr "[KELIAS]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:574
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr "  KELIAS    (Nebūtinas) ištekliaus kelias (gali būti dalinis)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:575
 msgid "PATH"
 msgstr "KELIAS"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:577
 msgid "  PATH      A resource path\n"
 msgstr "  KELIAS    IÅ¡tekliaus kelias\n"
 
-#: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:908
+#: gio/gsettings-tool.c:51 gio/gsettings-tool.c:72 gio/gsettings-tool.c:908
 #, c-format
 msgid "No such schema “%s�\n"
 msgstr "Nėra schemos „%s“\n"
 
-#: ../gio/gsettings-tool.c:57
+#: gio/gsettings-tool.c:57
 #, c-format
 msgid "Schema “%s� is not relocatable (path must not be specified)\n"
 msgstr "Schema „%s“ yra neperkeliama (kelias neturi būti nurodomas)\n"
 
-#: ../gio/gsettings-tool.c:78
+#: gio/gsettings-tool.c:78
 #, c-format
 msgid "Schema “%s� is relocatable (path must be specified)\n"
 msgstr "Schema „%s“ yra perkeliama (kelias turi būti nurodytas)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Pateiktas tuš�ias kelias.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "Kelias turi prasidėti pasviruoju brūkšniu (/)\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "Kelias turi baigtis pasviruoju brūkšniu (/)\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Kelias neturi turėti dviejų gretimų pasvirųjų brūkšnių (//)\n"
 
-#: ../gio/gsettings-tool.c:538
-#, c-format
+#: gio/gsettings-tool.c:538
 msgid "The provided value is outside of the valid range\n"
 msgstr "Pateikta reikšmė yra už leistinų ribų\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "Raktas nėra rašomas\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Išvardinti įdiegtas (neperkeliamas) schemas"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Išvardinti įdiegtas perkeliamas schemas"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "IÅ¡vardinti raktus SCHEMOJE"
 
-#: ../gio/gsettings-tool.c:594 ../gio/gsettings-tool.c:600
-#: ../gio/gsettings-tool.c:643
+#: gio/gsettings-tool.c:594 gio/gsettings-tool.c:600 gio/gsettings-tool.c:643
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMA[:KELIAS]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "IÅ¡vardina vaikus SCHEMOJE"
 
-#: ../gio/gsettings-tool.c:605
+#: gio/gsettings-tool.c:605
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -3474,49 +3490,48 @@ msgstr ""
 "Rekursyviai išvardinti raktus ir reikšmes\n"
 "Jei SCHEMA nepateikta, išvardinti visus raktus\n"
 
-#: ../gio/gsettings-tool.c:607
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHEMA[:KELIAS]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Gauti RAKTO reikšmę"
 
-#: ../gio/gsettings-tool.c:613 ../gio/gsettings-tool.c:619
-#: ../gio/gsettings-tool.c:625 ../gio/gsettings-tool.c:637
-#: ../gio/gsettings-tool.c:649
+#: gio/gsettings-tool.c:613 gio/gsettings-tool.c:619 gio/gsettings-tool.c:625
+#: gio/gsettings-tool.c:637 gio/gsettings-tool.c:649
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMOS[:KELIO] RAKTAS"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Užklausti galimų reikšmių rėžių RAKTUI"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Užklausti aprašymo RAKTUI"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Nustatyti RAKTO REIKŠMĘ"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMOS[:KELIO] RAKTO REIKÅ MÄ–"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Nustatyti RAKTĄ į jo numatytąją reikšmę"
 
-#: ../gio/gsettings-tool.c:642
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Atstatyti visus SCHEMOS raktus į jų numatytasias reikšmes"
 
-#: ../gio/gsettings-tool.c:648
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Patikrinti, ar RAKTAS yra rašomas"
 
-#: ../gio/gsettings-tool.c:654
+#: gio/gsettings-tool.c:654
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -3526,11 +3541,11 @@ msgstr ""
 "Jei RAKTAS nenurodytas, stebÄ—ti visus raktus SCHEMOJE.\n"
 "Naudoti ^C stebÄ—jimo nutraukimui.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:KELIAS] [RAKTAS]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3578,7 +3593,7 @@ msgstr ""
 "Naudokite 'gsettings help KOMANDA' išsamesnei pagalbai gauti.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3593,11 +3608,11 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr " SCHEMOSKAT Katalogas, kur ieškoti papildomų schemų\n"
 
-#: ../gio/gsettings-tool.c:707
+#: gio/gsettings-tool.c:707
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -3605,386 +3620,380 @@ msgstr ""
 "  SCHEMA    Schemos pavadinimas\n"
 "  KELIAS    Kelias perkeliamoms schemoms\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  RAKTAS    Raktas schemoje (nebūtinas)\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  RAKTAS    Raktas schemoje\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  REIKŠMĖ   Reikšmė, kurią nustatyti\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "Nepavyko atverti schemų iš „%s“: „%s“\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Nėra įdiegtų schemų\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Pateiktas tuš�ias schemos pavadinimas\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s�\n"
 msgstr "Nėra rakto „%s“\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Netinkamas lizdas, nepavyko inicijuoti"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Netinkamas lizdas, nepavyko inicijuoti: %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 msgid "Socket is already closed"
 msgstr "Lizdas jau užvertas"
 
-#: ../gio/gsocket.c:414 ../gio/gsocket.c:3010 ../gio/gsocket.c:4220
-#: ../gio/gsocket.c:4278
+#: gio/gsocket.c:414 gio/gsocket.c:3034 gio/gsocket.c:4244 gio/gsocket.c:4302
 msgid "Socket I/O timed out"
 msgstr "Lizdo I/O baigÄ—si laikas"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "iš fd kuriamas GSocket: %s"
 
-#: ../gio/gsocket.c:578 ../gio/gsocket.c:632 ../gio/gsocket.c:639
+#: gio/gsocket.c:578 gio/gsocket.c:632 gio/gsocket.c:639
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nepavyko sukurti lizdo: %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Nurodyta nežinoma šeima"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Nurodytas nežinomas protokolas"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr "Negalima naudoti duomenų paketo operacijų ne duomenų paketo lizdui."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Negalima naudoti duomenų paketo operacijų lizdui su laiko limito rinkiniu."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nepavyko gauto lokalaus adreso: %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nepavyko gauti nuotolinio adreso: %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "nepavyko klausytis: %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Susiejimo su adresu klaida: %s"
 
-#: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
-#: ../gio/gsocket.c:2391 ../gio/gsocket.c:2461 ../gio/gsocket.c:2519
-#: ../gio/gsocket.c:2537
+#: gio/gsocket.c:2226 gio/gsocket.c:2263 gio/gsocket.c:2373 gio/gsocket.c:2398
+#: gio/gsocket.c:2471 gio/gsocket.c:2529 gio/gsocket.c:2547
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Klaida prisijungian prie transliavimo grupÄ—s: %s"
 
-#: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
-#: ../gio/gsocket.c:2392 ../gio/gsocket.c:2462 ../gio/gsocket.c:2520
-#: ../gio/gsocket.c:2538
+#: gio/gsocket.c:2227 gio/gsocket.c:2264 gio/gsocket.c:2374 gio/gsocket.c:2399
+#: gio/gsocket.c:2472 gio/gsocket.c:2530 gio/gsocket.c:2548
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Klaida paliekant transliavimo grupÄ™: %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
 msgstr "NÄ—ra resursams specifinio transliavimo palaikymo"
 
-#: ../gio/gsocket.c:2375
+#: gio/gsocket.c:2375
 msgid "Unsupported socket family"
 msgstr "Nepalaikoma lizdo Å¡eima"
 
-#: ../gio/gsocket.c:2393
+#: gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "ištekliams specifinis nėra IPv4 adresas"
 
-#: ../gio/gsocket.c:2411 ../gio/gsocket.c:2440 ../gio/gsocket.c:2487
+#: gio/gsocket.c:2418 gio/gsocket.c:2447 gio/gsocket.c:2497
 #, c-format
 msgid "Interface not found: %s"
 msgstr "SÄ…saja nerasta: %s"
 
-#: ../gio/gsocket.c:2427
+#: gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Per ilgas sÄ…sajos pavadinimas"
 
-#: ../gio/gsocket.c:2463
+#: gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "Nėra IPv4 ištekliams specifinio transliavimo palaikymo"
 
-#: ../gio/gsocket.c:2521
+#: gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "Nėra palaikymo, skirto IPv4 ištekliams specifiniam transliavimui"
 
-#: ../gio/gsocket.c:2730
+#: gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Klaida priimant ryšį: %s"
 
-#: ../gio/gsocket.c:2854
+#: gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Prisijungiama"
 
-#: ../gio/gsocket.c:2903
+#: gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Nepavyko gauti laukian�ios klaidos: "
 
-#: ../gio/gsocket.c:3073
+#: gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Klaida priimant duomenis: %s"
 
-#: ../gio/gsocket.c:3268
+#: gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Klaida siun�iant duomenis: %s"
 
-#: ../gio/gsocket.c:3455
+#: gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Nepavyko išjungti lizdo: %s"
 
-#: ../gio/gsocket.c:3536
+#: gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Klaida užveriant lizdą: %s"
 
-#: ../gio/gsocket.c:4213
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Laukiama lizdo būsenos: %s"
 
-#: ../gio/gsocket.c:4687 ../gio/gsocket.c:4767 ../gio/gsocket.c:4945
+#: gio/gsocket.c:4711 gio/gsocket.c:4791 gio/gsocket.c:4969
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Klaida siun�iant pranešimą: %s"
 
-#: ../gio/gsocket.c:4711
+#: gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "„Windows“ sistemoje „GSocketControlMessage“ nepalaikoma"
 
-#: ../gio/gsocket.c:5164 ../gio/gsocket.c:5237 ../gio/gsocket.c:5463
+#: gio/gsocket.c:5188 gio/gsocket.c:5261 gio/gsocket.c:5487
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Klaida priimant pranešimą: %s"
 
-#: ../gio/gsocket.c:5735
+#: gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Nepavyko perskaityti lizdo įgaliojimų: %s"
 
-#: ../gio/gsocket.c:5744
+#: gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials nerealizuota Å¡iai operacinei sistemai"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Nepavyko prisijungti prie tarpinio serverio %s: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Nepavyko prisijungti prie %s: "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "Nepavyko prisijungti: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Nežinoma klaida prisijungiant"
 
-#: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535
+#: gio/gsocketclient.c:1081 gio/gsocketclient.c:1535
 msgid "Proxying over a non-TCP connection is not supported."
 msgstr "Bandymas naudoti proxy ne per TCP ryšį nepalaikomas."
 
-#: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
+#: gio/gsocketclient.c:1110 gio/gsocketclient.c:1561
 #, c-format
 msgid "Proxy protocol “%s� is not supported."
 msgstr "Tarpinio serverio protokolas „%s“ nepalaikomas."
 
-#: ../gio/gsocketlistener.c:218
+#: gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Gavėjas jau užvertas"
 
-#: ../gio/gsocketlistener.c:264
+#: gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Pridėtasis lizdas yra užvertas"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s�"
 msgstr "SOCKSv4 nepalaiko IPv6 adreso „%s“"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "Naudotojo vardas yra per ilgas SOCKSv4 protokolui"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s� is too long for SOCKSv4 protocol"
 msgstr "Kompiuterio vardas „%s“ yra per ilgas SOCKSv4 protokolui"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "Serveris nÄ—ra SOCKSv4 proxy serveris."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "Ryšys per SOCKSv4 serverį buvo atmestas"
 
-#: ../gio/gsocks5proxy.c:153 ../gio/gsocks5proxy.c:324
-#: ../gio/gsocks5proxy.c:334
+#: gio/gsocks5proxy.c:153 gio/gsocks5proxy.c:324 gio/gsocks5proxy.c:334
 msgid "The server is not a SOCKSv5 proxy server."
 msgstr "Serveris nÄ—ra SOCKSv5 proxy serveris."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "SOCKSv5 proxy reikalauja tapatybÄ—s patvirtinimo."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
 msgstr ""
 "SOCKSv5 reikalauja tapatybÄ—s patvirtinimo metodo, kurio GLib nepalaiko."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr "Naudotojo vardas arba slaptažodis yra per ilgas SOCKSv5 protokolui."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "SOCKSv5 tapatybÄ—s patvirtinimas nepavyko dÄ—l neteisingo naudotojo vardo arba "
 "slaptažodžio."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s� is too long for SOCKSv5 protocol"
 msgstr "Kompiuterio vardas „%s“ yra per ilgas SOCKSv5 protokolui"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "SOCKSv5 proxy serveris naudoja nežinomą adresų tipą."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "VidinÄ— SOCKSv5 proxy serverio klaida."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "SOCKSv5 ryšys neleidžiamas pagal taisykles."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "Kompiuteris nepasiekiamas per SOCKSv5 serverį."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "Tinklas nepasiekiamas per SOCKSv5 proxy."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Ryšys per SOCKSv5 proxy atmestas."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect� command."
 msgstr "SOCKSv5 proxy nepalaiko „connect“ komandos."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "SOCKSv5 proxy nepalaiko pateikto adreso tipo."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Nežinoma SOCKSv5 proxy klaida."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Nepavyko apdoroti GThemedIcon koduotÄ—s versijos %d"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "Nerasta tinkamų adresų"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s�: %s"
 msgstr "Klaida atvirkš�iai surandant „%s“: %s"
 
-#: ../gio/gthreadedresolver.c:549 ../gio/gthreadedresolver.c:628
-#: ../gio/gthreadedresolver.c:726 ../gio/gthreadedresolver.c:776
+#: gio/gthreadedresolver.c:549 gio/gthreadedresolver.c:628
+#: gio/gthreadedresolver.c:726 gio/gthreadedresolver.c:776
 #, c-format
 msgid "No DNS record of the requested type for “%s�"
 msgstr "Nėra DNS įrašo prašomam tipui „%s“"
 
-#: ../gio/gthreadedresolver.c:554 ../gio/gthreadedresolver.c:731
+#: gio/gthreadedresolver.c:554 gio/gthreadedresolver.c:731
 #, c-format
 msgid "Temporarily unable to resolve “%s�"
 msgstr "Laikinai nepavyko surasti „%s“"
 
-#: ../gio/gthreadedresolver.c:559 ../gio/gthreadedresolver.c:736
-#: ../gio/gthreadedresolver.c:842
+#: gio/gthreadedresolver.c:559 gio/gthreadedresolver.c:736
+#: gio/gthreadedresolver.c:844
 #, c-format
 msgid "Error resolving “%s�"
 msgstr "Klaida surandant „%s“"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "Nepavyko perskaityti PEM užkoduoto privataus rakto"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "Nerastas PEM užkoduotas privatus raktas"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "Nepavyko perskaityti PEM užkoduoto privataus rakto"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "Nerastas PEM užkoduotas sertifikatas"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "Nepavyko perskaityti PEM užkoduoto sertifikato"
 
-#: ../gio/gtlspassword.c:111
+#: gio/gtlspassword.c:111
 msgid ""
 "This is the last chance to enter the password correctly before your access "
 "is locked out."
@@ -3994,7 +4003,7 @@ msgstr ""
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4002,11 +4011,11 @@ msgstr ""
 "Keli įvesti slaptažodžiai buvo neteisingi ir jūsų prieiga bus užblokuota po "
 "tolesnių nesėkmių."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Įvestas slaptažodis yra neteisingas."
 
-#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:563
+#: gio/gunixconnection.c:166 gio/gunixconnection.c:563
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgid_plural "Expecting 1 control message, got %d"
@@ -4014,11 +4023,11 @@ msgstr[0] "Tikėtasi 1 kontrolinio pranešimo, bet sulaukta %d"
 msgstr[1] "Tikėtasi 1 kontrolinio pranešimo, bet sulaukta %d"
 msgstr[2] "Tikėtasi 1 kontrolinio pranešimo, bet sulaukta %d"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Netikėtas tarnybinių duomenų tipas"
 
-#: ../gio/gunixconnection.c:200
+#: gio/gunixconnection.c:200
 #, c-format
 msgid "Expecting one fd, but got %d\n"
 msgid_plural "Expecting one fd, but got %d\n"
@@ -4026,275 +4035,274 @@ msgstr[0] "TikÄ—tasi vieno fd, bet sulaukta %d\n"
 msgstr[1] "TikÄ—tasi vieno fd, bet sulaukta %d\n"
 msgstr[2] "TikÄ—tasi vieno fd, bet sulaukta %d\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Gautas netinkamas fd"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Klaida siun�iant įgaliojimus: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Klaida tikrinant, ar SO_PASSCRED įjungta lizdui: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Klaida leidžiant SO_PASSCRED: %s"
 
-#: ../gio/gunixconnection.c:549
+#: gio/gunixconnection.c:549
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
 msgstr ""
 "Tikimasi nustatyti vienintelį baitą įgaliojimų gavimui, bet nuskaityta nulis "
 "baitų"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Nesitikėta kontrolinio pranešimo, bet sulaukta %d"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Klaida išjungiant SO_PASSCRED: %s"
 
-#: ../gio/gunixinputstream.c:372 ../gio/gunixinputstream.c:393
+#: gio/gunixinputstream.c:372 gio/gunixinputstream.c:393
 #, c-format
 msgid "Error reading from file descriptor: %s"
 msgstr "Klaida skaitant failÄ…: %s"
 
-#: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:411
-#: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204
+#: gio/gunixinputstream.c:426 gio/gunixoutputstream.c:411
+#: gio/gwin32inputstream.c:217 gio/gwin32outputstream.c:204
 #, c-format
 msgid "Error closing file descriptor: %s"
 msgstr "Klaida užveriant failą: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Failų sistemos šaknis"
 
-#: ../gio/gunixoutputstream.c:358 ../gio/gunixoutputstream.c:378
+#: gio/gunixoutputstream.c:358 gio/gunixoutputstream.c:378
 #, c-format
 msgid "Error writing to file descriptor: %s"
 msgstr "Klaida rašant į failą: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr "Abstrak�iųjų UNIX srities lizdų adresai šioje sistemoje nepalaikomi"
 
-#: ../gio/gvolume.c:437
+#: gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "tomas nerealizuoja išstūmimo"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gvolume.c:514
+#: gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "tomas nerealizuoja išstūmimo nei su papildoma operacija,nei be jos"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Klaida skaitant iš rankenėlės: %s"
 
-#: ../gio/gwin32inputstream.c:232 ../gio/gwin32outputstream.c:219
+#: gio/gwin32inputstream.c:232 gio/gwin32outputstream.c:219
 #, c-format
 msgid "Error closing handle: %s"
 msgstr "Klaida užveriant rankenėlę: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Klaida rašant į rankenėlę: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Nepakanka atminties"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "VidinÄ— klaida: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Reikia daugiau įvesties"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Netinkami suspausti duomenys"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Adresas, kurio klausytis"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Nepaisoma, suderinamumui su GTestDbus"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Spausdinti adresÄ…"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Spausdinti adresÄ… apvalkalo veiksenoje"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Paleisti dbus tarnybÄ…"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Blogi argumentai\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s� for element “%s�"
 msgstr "Netikėtas atributas „%s“ elementui „%s“"
 
-#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836
-#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953
+#: glib/gbookmarkfile.c:765 glib/gbookmarkfile.c:836 glib/gbookmarkfile.c:846
+#: glib/gbookmarkfile.c:953
 #, c-format
 msgid "Attribute “%s� of element “%s� not found"
 msgstr "Nerastas elemento „%2$s“ atributas „%1$s“"
 
-#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
-#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
+#: glib/gbookmarkfile.c:1123 glib/gbookmarkfile.c:1188
+#: glib/gbookmarkfile.c:1252 glib/gbookmarkfile.c:1262
 #, c-format
 msgid "Unexpected tag “%s�, tag “%s� expected"
 msgstr "Netikėta žyma „%s“, tikėtasi žymos „%s“"
 
-#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
-#: ../glib/gbookmarkfile.c:1230
+#: glib/gbookmarkfile.c:1148 glib/gbookmarkfile.c:1162
+#: glib/gbookmarkfile.c:1230
 #, c-format
 msgid "Unexpected tag “%s� inside “%s�"
 msgstr "Netikėta žyma „%s“ „%s“ viduje"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr "Duomenų aplankuose nerasta tinkamo žymelių failo"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:1958
 #, c-format
 msgid "A bookmark for URI “%s� already exists"
 msgstr "URI „%s“ žymelė jau yra"
 
-#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
-#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
-#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
-#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
-#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
-#: ../glib/gbookmarkfile.c:2912 ../glib/gbookmarkfile.c:3102
-#: ../glib/gbookmarkfile.c:3178 ../glib/gbookmarkfile.c:3346
-#: ../glib/gbookmarkfile.c:3435 ../glib/gbookmarkfile.c:3524
-#: ../glib/gbookmarkfile.c:3640
+#: glib/gbookmarkfile.c:2004 glib/gbookmarkfile.c:2162
+#: glib/gbookmarkfile.c:2247 glib/gbookmarkfile.c:2327
+#: glib/gbookmarkfile.c:2412 glib/gbookmarkfile.c:2495
+#: glib/gbookmarkfile.c:2573 glib/gbookmarkfile.c:2652
+#: glib/gbookmarkfile.c:2694 glib/gbookmarkfile.c:2791
+#: glib/gbookmarkfile.c:2912 glib/gbookmarkfile.c:3102
+#: glib/gbookmarkfile.c:3178 glib/gbookmarkfile.c:3346
+#: glib/gbookmarkfile.c:3435 glib/gbookmarkfile.c:3524
+#: glib/gbookmarkfile.c:3640
 #, c-format
 msgid "No bookmark found for URI “%s�"
 msgstr "Nerasta žymelė URI „%s“"
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2336
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s�"
 msgstr "URI „%s“ žymelėje neapibrėžtas MIME tipas"
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2421
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s�"
 msgstr "URI „%s“ žymelėje neapibrėžta privati vėliavėlė"
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2800
 #, c-format
 msgid "No groups set in bookmark for URI “%s�"
 msgstr "URI „%s“ žymelėje nenurodyta jokia grupė"
 
-#: ../glib/gbookmarkfile.c:3199 ../glib/gbookmarkfile.c:3356
+#: glib/gbookmarkfile.c:3199 glib/gbookmarkfile.c:3356
 #, c-format
 msgid "No application with name “%s� registered a bookmark for “%s�"
 msgstr "Nėra programos pavadinimu „%s“ registravusios „%s“ žymelę"
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3379
 #, c-format
 msgid "Failed to expand exec line “%s� with URI “%s�"
 msgstr "Nepavyko išskleisti vykdomosios eilutės „%s“ su URI „%s“"
 
-#: ../glib/gconvert.c:473
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "Neatvaizduojamas simbolis keitimo įvestyje"
 
-#: ../glib/gconvert.c:500 ../glib/gutf8.c:865 ../glib/gutf8.c:1077
-#: ../glib/gutf8.c:1214 ../glib/gutf8.c:1318
+#: glib/gconvert.c:500 glib/gutf8.c:865 glib/gutf8.c:1077 glib/gutf8.c:1214
+#: glib/gutf8.c:1318
 msgid "Partial character sequence at end of input"
 msgstr "Nepilna simbolio seka įvedimo pabaigoje"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s� to codeset “%s�"
 msgstr "Negalima keisti atgalinio varianto „%s“ į koduotę „%s“"
 
-#: ../glib/gconvert.c:940
+#: glib/gconvert.c:940
 msgid "Embedded NUL byte in conversion input"
 msgstr "Įtaisytas NUL baitas keitimo įvestyje"
 
-#: ../glib/gconvert.c:961
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "Įtaisytas NUL baitas keitimo išvestyje"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s� is not an absolute URI using the “file� scheme"
 msgstr "Adresas „%s“ nėra absoliutus adresas naudojantis „file“ schemą"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s� may not include a “#�"
 msgstr "Vietinio failo adresas „%s“ negali turėti simbolio „#“"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s� is invalid"
 msgstr "URI „%s“ yra klaidingas"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s� is invalid"
 msgstr "Kompiuterio vardas URI „%s“ yra netinkamas"
 
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s� contains invalidly escaped characters"
 msgstr "URI „%s“ yra klaidingai perkoduoti simboliai"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 msgid "The pathname “%s� is not an absolute path"
 msgstr "Kelias „%s“ nėra absoliutus"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:207
+#: glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a, %Y m. %b %e d., %H:%M:%S"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:210
+#: glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%Y-%m-%d"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:213
+#: glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:216
+#: glib/gdatetime.c:222
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S"
@@ -4315,62 +4323,62 @@ msgstr "%I:%M:%S"
 #. * non-European) there is no difference between the standalone and
 #. * complete date form.
 #.
-#: ../glib/gdatetime.c:251
+#: glib/gdatetime.c:261
 msgctxt "full month name"
 msgid "January"
 msgstr "sausis"
 
-#: ../glib/gdatetime.c:253
+#: glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "vasaris"
 
-#: ../glib/gdatetime.c:255
+#: glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "kovas"
 
-#: ../glib/gdatetime.c:257
+#: glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "balandis"
 
-#: ../glib/gdatetime.c:259
+#: glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "gegužė"
 
-#: ../glib/gdatetime.c:261
+#: glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "birželis"
 
-#: ../glib/gdatetime.c:263
+#: glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "liepa"
 
-#: ../glib/gdatetime.c:265
+#: glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "rugpjūtis"
 
-#: ../glib/gdatetime.c:267
+#: glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "rugsÄ—jis"
 
-#: ../glib/gdatetime.c:269
+#: glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "spalis"
 
-#: ../glib/gdatetime.c:271
+#: glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "lapkritis"
 
-#: ../glib/gdatetime.c:273
+#: glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "gruodis"
@@ -4392,132 +4400,132 @@ msgstr "gruodis"
 #. * other platform.  Here are abbreviated month names in a form
 #. * appropriate when they are used standalone.
 #.
-#: ../glib/gdatetime.c:305
+#: glib/gdatetime.c:315
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "saus."
 
-#: ../glib/gdatetime.c:307
+#: glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "vas."
 
-#: ../glib/gdatetime.c:309
+#: glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "kov."
 
-#: ../glib/gdatetime.c:311
+#: glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "bal."
 
-#: ../glib/gdatetime.c:313
+#: glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "geg."
 
-#: ../glib/gdatetime.c:315
+#: glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "birž."
 
-#: ../glib/gdatetime.c:317
+#: glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "liep."
 
-#: ../glib/gdatetime.c:319
+#: glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "rugp."
 
-#: ../glib/gdatetime.c:321
+#: glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "rugs."
 
-#: ../glib/gdatetime.c:323
+#: glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "spal."
 
-#: ../glib/gdatetime.c:325
+#: glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "lapkr."
 
-#: ../glib/gdatetime.c:327
+#: glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "gruod."
 
-#: ../glib/gdatetime.c:342
+#: glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: ../glib/gdatetime.c:344
+#: glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: ../glib/gdatetime.c:346
+#: glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
-#: ../glib/gdatetime.c:348
+#: glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: ../glib/gdatetime.c:350
+#: glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: ../glib/gdatetime.c:352
+#: glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: ../glib/gdatetime.c:354
+#: glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: ../glib/gdatetime.c:369
+#: glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Pir"
 
-#: ../glib/gdatetime.c:371
+#: glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Ant"
 
-#: ../glib/gdatetime.c:373
+#: glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Tre"
 
-#: ../glib/gdatetime.c:375
+#: glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Ket"
 
-#: ../glib/gdatetime.c:377
+#: glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Pen"
 
-#: ../glib/gdatetime.c:379
+#: glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Šeš"
 
-#: ../glib/gdatetime.c:381
+#: glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Sek"
@@ -4539,62 +4547,62 @@ msgstr "Sek"
 #. * (western European, non-European) there is no difference between the
 #. * standalone and complete date form.
 #.
-#: ../glib/gdatetime.c:441
+#: glib/gdatetime.c:455
 msgctxt "full month name with day"
 msgid "January"
 msgstr "sausio"
 
-#: ../glib/gdatetime.c:443
+#: glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "vasario"
 
-#: ../glib/gdatetime.c:445
+#: glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "kovo"
 
-#: ../glib/gdatetime.c:447
+#: glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "balandžio"
 
-#: ../glib/gdatetime.c:449
+#: glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "gegužės"
 
-#: ../glib/gdatetime.c:451
+#: glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "birželio"
 
-#: ../glib/gdatetime.c:453
+#: glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "liepos"
 
-#: ../glib/gdatetime.c:455
+#: glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "rugpjū�io"
 
-#: ../glib/gdatetime.c:457
+#: glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "rugsÄ—jo"
 
-#: ../glib/gdatetime.c:459
+#: glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "spalio"
 
-#: ../glib/gdatetime.c:461
+#: glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "lapkri�io"
 
-#: ../glib/gdatetime.c:463
+#: glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "gruodžio"
@@ -4616,84 +4624,84 @@ msgstr "gruodžio"
 #. * month names almost ready to copy and paste here.  In other systems
 #. * due to a bug the result is incorrect in some languages.
 #.
-#: ../glib/gdatetime.c:524
+#: glib/gdatetime.c:542
 msgctxt "abbreviated month name with day"
 msgid "Jan"
 msgstr "saus."
 
-#: ../glib/gdatetime.c:526
+#: glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "vas."
 
-#: ../glib/gdatetime.c:528
+#: glib/gdatetime.c:546
 msgctxt "abbreviated month name with day"
 msgid "Mar"
 msgstr "kov."
 
-#: ../glib/gdatetime.c:530
+#: glib/gdatetime.c:548
 msgctxt "abbreviated month name with day"
 msgid "Apr"
 msgstr "bal."
 
-#: ../glib/gdatetime.c:532
+#: glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "geg."
 
-#: ../glib/gdatetime.c:534
+#: glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "birž."
 
-#: ../glib/gdatetime.c:536
+#: glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "liep."
 
-#: ../glib/gdatetime.c:538
+#: glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "rugp."
 
-#: ../glib/gdatetime.c:540
+#: glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "rugs."
 
-#: ../glib/gdatetime.c:542
+#: glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "spal."
 
-#: ../glib/gdatetime.c:544
+#: glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "lapkr."
 
-#: ../glib/gdatetime.c:546
+#: glib/gdatetime.c:564
 msgctxt "abbreviated month name with day"
 msgid "Dec"
 msgstr "gruod."
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:563
+#: glib/gdatetime.c:581
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:566
+#: glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
-#: ../glib/gdir.c:155
+#: glib/gdir.c:155
 #, c-format
 msgid "Error opening directory “%s�: %s"
 msgstr "Klaida atveriant aplanką „%s“: %s"
 
-#: ../glib/gfileutils.c:716 ../glib/gfileutils.c:808
+#: glib/gfileutils.c:716 glib/gfileutils.c:808
 #, c-format
 msgid "Could not allocate %lu byte to read file “%s�"
 msgid_plural "Could not allocate %lu bytes to read file “%s�"
@@ -4701,107 +4709,106 @@ msgstr[0] "Nepavyko išskirti %lu baito failo „%s“ perskaitymui"
 msgstr[1] "Nepavyko išskirti %lu baitų failo „%s“ perskaitymui"
 msgstr[2] "Nepavyko išskirti %lu baitų failo „%s“ perskaitymui"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s�: %s"
 msgstr "Klaida skaitant failą „%s“: %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s� is too large"
 msgstr "Failas „%s“ per didelis"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s�: %s"
 msgstr "Nepavyko perskaityti failo „%s“: %s"
 
-#: ../glib/gfileutils.c:881 ../glib/gfileutils.c:953
+#: glib/gfileutils.c:881 glib/gfileutils.c:953
 #, c-format
 msgid "Failed to open file “%s�: %s"
 msgstr "Nepavyko atverti failo „%s“: %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s�: fstat() failed: %s"
 msgstr "Nepavyko gauti failo „%s“ atributų: fstat() klaida: %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s�: fdopen() failed: %s"
 msgstr "Nepavyko atverti failo „%s“: fdopen() klaida: %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s� to “%s�: g_rename() failed: %s"
 msgstr "Nepavyko pervadinti failo „%s“ į „%s“: g_rename() klaida: %s"
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: glib/gfileutils.c:1057 glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s�: %s"
 msgstr "Nepavyko sukurti failo „%s“: %s"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s�: write() failed: %s"
 msgstr "Nepavyko įrašyti failo „%s“: write() klaida: %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s�: fsync() failed: %s"
 msgstr "Nepavyko įrašyti failo „%s“: fsync() klaida: %s"
 
-#: ../glib/gfileutils.c:1251
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s� could not be removed: g_unlink() failed: %s"
 msgstr "Nepavyko pašalinti egzistuojan�io failo „%s“: g_unlink() klaida: %s"
 
-#: ../glib/gfileutils.c:1530
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s� invalid, should not contain a “%s�"
 msgstr "Šablonas „%s“ klaidingas, jame negali būti „%s“"
 
-#: ../glib/gfileutils.c:1543
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s� doesn’t contain XXXXXX"
 msgstr "Šablone „%s“ nėra XXXXXX"
 
-#: ../glib/gfileutils.c:2105
+#: glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s�: %s"
 msgstr "Nepavyko perskaityti simbolinės nuorodos „%s“: %s"
 
-#: ../glib/giochannel.c:1389
+#: glib/giochannel.c:1389
 #, c-format
 msgid "Could not open converter from “%s� to “%s�: %s"
 msgstr "Nepavyko atverti keitiklio iš „%s“ į „%s“: %s"
 
-#: ../glib/giochannel.c:1734
+#: glib/giochannel.c:1734
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr "Negalima vykdyti tiesioginio skaitymo iš g_io_channel_read_line_string"
 
-#: ../glib/giochannel.c:1781 ../glib/giochannel.c:2039
-#: ../glib/giochannel.c:2126
+#: glib/giochannel.c:1781 glib/giochannel.c:2039 glib/giochannel.c:2126
 msgid "Leftover unconverted data in read buffer"
 msgstr "Nepakeistų duomenų liku�iai skaitymo buferyje"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "Kanalas pasibaigia nepilnu simboliu"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Negalima vykdyti tiesioginio skaitymo iš g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:788
+#: glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr "Paieškos aplankuose nepavyko rasti tinkamo raktų failo"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "NÄ—ra paprastas failas"
 
-#: ../glib/gkeyfile.c:1270
+#: glib/gkeyfile.c:1270
 #, c-format
 msgid ""
 "Key file contains line “%s� which is not a key-value pair, group, or comment"
@@ -4809,49 +4816,49 @@ msgstr ""
 "Raktų faile yra eilutė „%s“, kuri nėra raktas-reikšmė pora, grupė ar "
 "komentaras"
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Netinkamas grupÄ—s pavadinimas: %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Raktų failas neprasideda grupe"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Netinkamas rakto pavadinimas: %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s�"
 msgstr "Raktų faile yra nepalaikoma koduotė „%s“"
 
-#: ../glib/gkeyfile.c:1645 ../glib/gkeyfile.c:1818 ../glib/gkeyfile.c:3271
-#: ../glib/gkeyfile.c:3334 ../glib/gkeyfile.c:3464 ../glib/gkeyfile.c:3594
-#: ../glib/gkeyfile.c:3738 ../glib/gkeyfile.c:3967 ../glib/gkeyfile.c:4034
+#: glib/gkeyfile.c:1645 glib/gkeyfile.c:1818 glib/gkeyfile.c:3271
+#: glib/gkeyfile.c:3334 glib/gkeyfile.c:3464 glib/gkeyfile.c:3594
+#: glib/gkeyfile.c:3738 glib/gkeyfile.c:3967 glib/gkeyfile.c:4034
 #, c-format
 msgid "Key file does not have group “%s�"
 msgstr "Raktų failas neturi grupės „%s“"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s� in group “%s�"
 msgstr "Raktų faile nėra rakto „%s“ grupėje „%s“"
 
-#: ../glib/gkeyfile.c:1935 ../glib/gkeyfile.c:2051
+#: glib/gkeyfile.c:1935 glib/gkeyfile.c:2051
 #, c-format
 msgid "Key file contains key “%s� with value “%s� which is not UTF-8"
 msgstr "Raktų faile yra raktas „%s“ su reikšme „%s“, kuri nėra UTF-8"
 
-#: ../glib/gkeyfile.c:1955 ../glib/gkeyfile.c:2071 ../glib/gkeyfile.c:2513
+#: glib/gkeyfile.c:1955 glib/gkeyfile.c:2071 glib/gkeyfile.c:2513
 #, c-format
 msgid ""
 "Key file contains key “%s� which has a value that cannot be interpreted."
 msgstr "Raktų faile yra raktas „%s“, turintis nesuprantamą reikšmę."
 
-#: ../glib/gkeyfile.c:2731 ../glib/gkeyfile.c:3100
+#: glib/gkeyfile.c:2731 glib/gkeyfile.c:3100
 #, c-format
 msgid ""
 "Key file contains key “%s� in group “%s� which has a value that cannot be "
@@ -4860,224 +4867,268 @@ msgstr ""
 "Raktų faile yra raktas „%s“ grupėje „%s“, kuriame yra reikšmė, kurios "
 "negalima suprasti."
 
-#: ../glib/gkeyfile.c:2809 ../glib/gkeyfile.c:2886
+#: glib/gkeyfile.c:2809 glib/gkeyfile.c:2886
 #, c-format
 msgid "Key “%s� in group “%s� has value “%s� where %s was expected"
 msgstr "Raktas „%s“ grupėje „%s“ turi reikšmę „%s“, nors tikimasi %s"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Raktų faile, eilutės pabaigoje yra pabėgimo simbolis"
 
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s�"
 msgstr "Raktų faile yra klaidinga kaitos eilutė „%s“"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s� cannot be interpreted as a number."
 msgstr "Reikšmės „%s“ negalima interpretuoti kaip skai�iaus."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s� out of range"
 msgstr "Sveikoji reikšmė „%s“ viršija ribas"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s� cannot be interpreted as a float number."
 msgstr ""
 "Reikšmės „%s“ negalima interpretuoti kaip slankiojo kablelio skai�iaus."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s� cannot be interpreted as a boolean."
 msgstr "Reikšmės „%s“ negalima interpretuoti kaip loginės."
 
-#: ../glib/gmappedfile.c:129
+#: glib/gmappedfile.c:129
 #, c-format
 msgid "Failed to get attributes of file “%s%s%s%s�: fstat() failed: %s"
 msgstr "Nepavyko gauti failo „%s%s%s%s“ atributų: fstat() klaida: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "Nepavyko pažymėti failo %s%s%s%s: mmap() klaida: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s�: open() failed: %s"
 msgstr "Nepavyko atverti failo „%s“: open() klaida: %s"
 
-#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
+#: glib/gmarkup.c:397 glib/gmarkup.c:439
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "Klaida eilutÄ—je %d simbolyje %d: "
 
-#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
+#: glib/gmarkup.c:461 glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+#| msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s�"
 msgstr "Klaidingai koduotas UTF-8 tekstas varde – netinkamas „%s“"
 
-#: ../glib/gmarkup.c:472
+#: glib/gmarkup.c:472
 #, c-format
-msgid "'%s' is not a valid name"
+#| msgid "'%s' is not a valid name"
+msgid "“%s� is not a valid name"
 msgstr "„%s“ nėra tinkamas vardas"
 
-#: ../glib/gmarkup.c:488
+#: glib/gmarkup.c:488
 #, c-format
-msgid "'%s' is not a valid name: '%c'"
+#| msgid "'%s' is not a valid name: '%c'"
+msgid "“%s� is not a valid name: “%c�"
 msgstr "„%s“ nėra tinkamas vardas: „%c“"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:598
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Klaida eilutÄ—je %d: %s"
 
-#: ../glib/gmarkup.c:675
+#: glib/gmarkup.c:675
 #, c-format
+#| msgid ""
+#| "Failed to parse '%-.*s', which should have been a digit inside a "
+#| "character reference (&#234; for example) - perhaps the digit is too large"
 msgid ""
-"Failed to parse '%-.*s', which should have been a digit inside a character "
-"reference (&#234; for example) - perhaps the digit is too large"
+"Failed to parse “%-.*s�, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
 msgstr ""
 "Nepavyko perskaityti „%-.*s“, kuris galėjo turėti skai�ius simbolio aprašyme "
-"(pvz., &#234;) - gal skai�ius per didelis"
+"(pvz., &#234;) – gal skai�ius per didelis"
 
-#: ../glib/gmarkup.c:687
+#: glib/gmarkup.c:687
+#| msgid ""
+#| "Character reference did not end with a semicolon; most likely you used an "
+#| "ampersand character without intending to start an entity - escape "
+#| "ampersand as &amp;"
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
 msgstr ""
 "Simbolio nuoroda nepasibaigė kabliataškiu; grei�iausiai Jūs panaudojote "
-"ampersendo simbolį nepradėdami elemento įvedimo - pakeiskite ampersendą "
+"ampersendo simbolį nepradėdami elemento įvedimo – pakeiskite ampersendą "
 "įvesdami &amp;"
 
-#: ../glib/gmarkup.c:713
+#: glib/gmarkup.c:713
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
+#| msgid "Character reference '%-.*s' does not encode a permitted character"
+msgid "Character reference “%-.*s� does not encode a permitted character"
 msgstr "Simbolio aprašymas „%-.*s“ neatitinka leistinų simbolių"
 
-#: ../glib/gmarkup.c:751
+#: glib/gmarkup.c:751
+#| msgid ""
+#| "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
 "Aptiktas tuš�ias elementas '&;'; galimi elementai yra: &amp; &quot; &lt; "
 "&gt; &apos;"
 
-#: ../glib/gmarkup.c:759
+#: glib/gmarkup.c:759
 #, c-format
-msgid "Entity name '%-.*s' is not known"
+#| msgid "Entity name '%-.*s' is not known"
+msgid "Entity name “%-.*s� is not known"
 msgstr "Elemento vardas „%-.*s“ nežinomas"
 
-#: ../glib/gmarkup.c:764
+#: glib/gmarkup.c:764
+#| msgid ""
+#| "Entity did not end with a semicolon; most likely you used an ampersand "
+#| "character without intending to start an entity - escape ampersand as &amp;"
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
+"character without intending to start an entity — escape ampersand as &amp;"
 msgstr ""
 "Elementas nepasibaigė kabliataškiu; grei�iausiai Jūs panaudojote ampersendo "
-"simbolį nepradėdami elemento įvedimo - pakeiskite ampersendą įvesdami &amp;"
+"simbolį nepradėdami elemento įvedimo – pakeiskite ampersendą įvesdami &amp;"
 
-#: ../glib/gmarkup.c:1170
+#: glib/gmarkup.c:1170
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokumentas turėtų prasidėti elementu (pvz., <book>)"
 
-#: ../glib/gmarkup.c:1210
+#: glib/gmarkup.c:1210
 #, c-format
+#| msgid ""
+#| "'%s' is not a valid character following a '<' character; it may not begin "
+#| "an element name"
 msgid ""
-"'%s' is not a valid character following a '<' character; it may not begin an "
+"“%s� is not a valid character following a “<� character; it may not begin an "
 "element name"
 msgstr ""
 "„%s“ negali būti rašomas po „<“ simbolio; jis nepradeda jokio elemento vardo"
 
-#: ../glib/gmarkup.c:1252
+#: glib/gmarkup.c:1252
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected a '>' character to end the empty-element tag "
+#| "'%s'"
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
+"Odd character “%s�, expected a “>� character to end the empty-element tag "
+"“%s�"
 msgstr ""
 "Neįprastas simbolis „%s“, tikėtasi sulaukti „>“ simbolio, užbaigian�io "
 "tuš�ią žymą „%s“"
 
-#: ../glib/gmarkup.c:1333
+#: glib/gmarkup.c:1333
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected a '=' after attribute name '%s' of element "
+#| "'%s'"
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+"Odd character “%s�, expected a “=� after attribute name “%s� of element “%s�"
 msgstr ""
 "Neįprastas simbolis „%1$s“, tikėtasi sulaukti „=“ po elemento „%3$s“ "
 "atributo vardo „%2$s“"
 
-#: ../glib/gmarkup.c:1374
+#: glib/gmarkup.c:1374
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected a '>' or '/' character to end the start tag "
+#| "of element '%s', or optionally an attribute; perhaps you used an invalid "
+#| "character in an attribute name"
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s�, expected a “>� or “/� character to end the start tag of "
+"element “%s�, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
 "Neįprastas simbolis „%s“, tikėtasi sulaukti „>“ arba „/“ simbolių, "
 "užbaigian�ių elementą „%s“, arba papildomo požymio; gal Jūs panaudojote "
 "netinkama simbolį požymio varde"
 
-#: ../glib/gmarkup.c:1418
+#: glib/gmarkup.c:1418
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected an open quote mark after the equals sign "
+#| "when giving value for attribute '%s' of element '%s'"
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
+"Odd character “%s�, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s� of element “%s�"
 msgstr ""
 "Neįprastas simbolis „%1$s“, po lygybės tikėtasi sulaukti atidaran�io "
-"citavimo simbolio pradedant „%3$s“ elemento „%2$s“ atributo reikšmę"
+"citavimo simbolio pradedant „%3$s“ elemento „%2$s“ atributo reikšmę."
 
-#: ../glib/gmarkup.c:1551
+#: glib/gmarkup.c:1551
 #, c-format
+#| msgid ""
+#| "'%s' is not a valid character following the characters '</'; '%s' may not "
+#| "begin an element name"
 msgid ""
-"'%s' is not a valid character following the characters '</'; '%s' may not "
+"“%s� is not a valid character following the characters “</�; “%s� may not "
 "begin an element name"
 msgstr ""
-"„%s“ negali būti rašomas po simbolių „</“; „%s“ negali būti kokio nors "
-"elemento vardu"
+"„%s“ negali būti rašomas po simbolių „</“; „%s“ negali pradėti elemento vardo"
 
-#: ../glib/gmarkup.c:1587
+#: glib/gmarkup.c:1587
 #, c-format
+#| msgid ""
+#| "'%s' is not a valid character following the close element name '%s'; the "
+#| "allowed character is '>'"
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
+"“%s� is not a valid character following the close element name “%s�; the "
+"allowed character is “>�"
 msgstr ""
 "„%s“ negali būti rašomas po uždaran�io elemento vardo „%s“; leistinas "
 "simbolis yra „>“"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1598
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
+#| msgid "Element '%s' was closed, no element is currently open"
+msgid "Element “%s� was closed, no element is currently open"
 msgstr ""
 "Elemento „%s“ uždarymo simbolis sutiktas anks�iau už elemento atidarymo "
 "simbolį"
 
-#: ../glib/gmarkup.c:1607
+#: glib/gmarkup.c:1607
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
+#| msgid "Element '%s' was closed, but the currently open element is '%s'"
+msgid "Element “%s� was closed, but the currently open element is “%s�"
 msgstr ""
 "Sutiktas elemento „%s“ uždarymo simbolis, ta�iau šiuo metu atidarytas kitas "
 "elementas „%s“"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1760
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokumentas tuš�ias arba susideda tik iš tarpų"
 
-#: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
-msgstr "Dokumentas netikėtai pasibaigė tuoj po atidaran�ių skliaustų '<'"
+#: glib/gmarkup.c:1774
+#| msgid "Document ended unexpectedly just after an open angle bracket '<'"
+msgid "Document ended unexpectedly just after an open angle bracket “<�"
+msgstr "Dokumentas netikėtai pasibaigė tuoj po atidaran�ių skliaustų „<“"
 
-#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
+#: glib/gmarkup.c:1782 glib/gmarkup.c:1827
 #, c-format
+#| msgid ""
+#| "Document ended unexpectedly with elements still open - '%s' was the last "
+#| "element opened"
 msgid ""
-"Document ended unexpectedly with elements still open - '%s' was the last "
+"Document ended unexpectedly with elements still open — “%s� was the last "
 "element opened"
 msgstr ""
-"Dokumentas netikėtai pasibaigė neuždarius dalies elementų - „%s“ yra "
+"Dokumentas netikėtai pasibaigė neuždarius dalies elementų – „%s“ yra "
 "paskutinis atviras elementas"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1790
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5086,19 +5137,19 @@ msgstr ""
 "Dokumentas netikėtai pasibaigė, tikėtasi uždaran�ių skliaustų simbolio, "
 "užbaigian�io žymą <%s/>"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1796
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Dokumentas netikÄ—tai pasibaigÄ— elemento varde"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1802
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Dokumentas netikėtai pasibaigė požymio varde"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1807
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "Dokumentas netikėtai pasibaigė elemento atvėrimo žyma."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1813
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5106,311 +5157,312 @@ msgstr ""
 "Dokumentas netikėtai pasibaigė lygybės simboliu einan�io po požymio vardo; "
 "nerasta požymio reikšmė"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1820
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Dokumentas netikėtai pasibaigė požymio verte"
 
-#: ../glib/gmarkup.c:1836
+#: glib/gmarkup.c:1836
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
+#| msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgid "Document ended unexpectedly inside the close tag for element “%s�"
 msgstr "Dokumentas netikėtai pasibaigė žymos „%s“ uždaran�iame simbolyje"
 
-#: ../glib/gmarkup.c:1842
+#: glib/gmarkup.c:1842
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Dokumentas netikÄ—tai pasibaigÄ— komentaruose arba apdorojimo instrukcijose"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[PARAMETRAS…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Pagalbos parametrai:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Rodyti pagalbos parametrus"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Rodyti visus pagalbos parametrus"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Programos parametrai:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Parametrai:"
 
-#: ../glib/goption.c:1113 ../glib/goption.c:1183
+#: glib/goption.c:1113 glib/goption.c:1183
 #, c-format
 msgid "Cannot parse integer value “%s� for %s"
 msgstr "Nepavyko perskaityti sveikosios reikšmės „%s“, reikalingos %s"
 
-#: ../glib/goption.c:1123 ../glib/goption.c:1191
+#: glib/goption.c:1123 glib/goption.c:1191
 #, c-format
 msgid "Integer value “%s� for %s out of range"
 msgstr "Sveikoji reikšmė „%s“, reikalinga %s, viršija ribas"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s� for %s"
 msgstr "Nepavyko apdoroti dvigubos reikšmės „%s“, reikalingos %s"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s� for %s out of range"
 msgstr "Dviguboji reikšmė „%s“, reikalinga %s, viršija ribas"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Klaida apdorojant parametrÄ… %s"
 
-#: ../glib/goption.c:1558 ../glib/goption.c:1671
+#: glib/goption.c:1558 glib/goption.c:1671
 #, c-format
 msgid "Missing argument for %s"
 msgstr "%s trūksta argumento"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Nežinomas parametras %s"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "sugadintas objektas"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "vidinÄ— klaida arba sugadintas objektas"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "nebÄ—ra atminties"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "pasiekta atgalinio sekimo riba"
 
-#: ../glib/gregex.c:278 ../glib/gregex.c:286
+#: glib/gregex.c:278 glib/gregex.c:286
 msgid "the pattern contains items not supported for partial matching"
 msgstr "šablone yra dalinio atitikimo nepalaikomų elementų"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "vidinÄ— klaida"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr "atgalinÄ—s nuorodos kaip sÄ…lygos nepalaikomos daliniam atitikimui"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "pasiekta rekursijos riba"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "netinkama naujos eilutės vėliavėlių kombinacija"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "blogas poslinkis"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "trumpas utf8"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "rekursijos ciklas"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "nežinoma klaida"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ Å¡ablono pabaigoje"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c Å¡ablono pabaigoje"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "neatpažintas simbolis po \\"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "skai�iai ne iš eilės {} kvantoriuje"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "skai�ius per didelis {} kvantoriuje"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "trūksta baigiamojo ] simbolio klasei"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "klaidinga speciali seka simbolio klasÄ—je"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "ruožas ne iš eilės simbolio klasėje"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "nÄ—ra kÄ… kartoti"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "netikÄ—tas pakartojimas"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "neatpažintas simbolis po (? arba (?-"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "klasės POSIX vardais leidžiamos tik klasių viduje"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "trūksta baigiamojo )"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "nuoroda į neegzistuojantį pošablonį"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "trūksta ) po komentaro"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "reguliarioji išraiška per didelė"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "nepavyko rezervuoti atminties"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") be atveriamojo ("
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "kodo perviršis"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "neatpažintas simbolis po (?<"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "žiūros atgal teiginys nefiksuoto ilgio"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "netaisyklingas skai�ius ar vardas po (?("
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "sÄ…lyginÄ— grupÄ— turi daugiau negu dvi Å¡akas"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "tikimasi teiginio po (?("
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: ../glib/gregex.c:409
+#: glib/gregex.c:409
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "po (?R arba (?[+-]skaitmenys turi būti )"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "nežinomas POSIX klasės vardas"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "POSIX gretinimo elementai nepalaikomi"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "simbolio reikšmė \\x{…} sekoje per didelė"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "netaisyklinga sÄ…lygÄ… (?(0)"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C neleistinas žiūros atgal teiginyje"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "pakaitos simboliai \\L, \\l, \\N{name}, \\U, and \\u nepalaikomi"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "rekursyvus iškvietimas gali veikti be galo"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "neatpažintas simbolis po (?P"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "trūksta baigiamojo simbolio pošablonio pavadinime"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "du vardiniai pošabloniai turi tą patį vardą"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "netaisyklinga \\P arba \\p seka"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "nežinomas savybės vardas po \\P arba \\p"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "pošablonio vardas per ilgas (turi būti iki 32 simbolių)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "per daug vardinių pošablonių (iki 10000)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "aštuntainė reikšmė didesnė už \\377"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "perpildyta kompiliavimo darbo sritis"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "anks�iau tikrintas nurodytas pošablonis nerastas"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE grupÄ—je yra daugiau negu viena Å¡aka"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "nenuoseklūs NEWLINE parametrai"
 
-#: ../glib/gregex.c:476
+#: glib/gregex.c:476
 msgid ""
 "\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
 "or by a plain number"
@@ -5418,281 +5470,287 @@ msgstr ""
 "po \\g nÄ—ra vardo riestiniuose arba lenktiniuose skliaustuose ar teigiamo "
 "skai�iaus, ar tiesiog skai�iaus"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "numeruota nuoroda turi būti ne nulis"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "argumentas neleidžiamas veiksmams (*ACCEPT), (*FAIL), ir (*COMMIT)"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) neatpažintas"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "numeris per didelis"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "trūksta baigiamojo simbolio pošablonio po (?&"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "laukta skaitmens po (?+"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr "] yra netinkamas duomenų simbolis JavaScript suderinamumo veiksenoje"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "skirtingi vardai to paties skai�iaus pošabloniams nėra leistini"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) privalo turÄ—ti argumentÄ…"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "Po \\c turi būti ASCII simbolis"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "po \\k nÄ—ra vardo riestiniuose arba lenktiniuose skliaustuose arba kabutÄ—se"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N nepalaikomas klasÄ—je"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "per daug nuorodų tolyn"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "pavadinimas yra per ilgas (*MARK), (*PRUNE), (*SKIP), ir (*THEN)"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "simbolio reikšmė \\u… sekoje per didelė"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: glib/gregex.c:745 glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Klaida ieškant reguliariosios išraiškos %s atitikmens: %s"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE biblioteka sukompiliuota be UTF8 palaikymo"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE biblioteka sukompiliuota be UTF8 ypatybių palaikymo"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "PCRE biblioteka sukompiliuota su nesuderinamais parametrais"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Klaida, optimizuojant reguliariąją išraišką %s: %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Klaida kompiliuojanti reguliarią išraišką %s ties simboliu %d: %s"
 
-#: ../glib/gregex.c:2413
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr "laukta šešioliktainio skaitmens arba „}“"
 
-#: ../glib/gregex.c:2429
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "laukta šešioliktainio skaitmens"
 
-#: ../glib/gregex.c:2469
+#: glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr "simbolinėje nuorodoje trūksta „<“"
 
-#: ../glib/gregex.c:2478
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "nebaigta simbolinÄ— nuoroda"
 
-#: ../glib/gregex.c:2485
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "nulinio ilgio simbolinÄ— nuoroda"
 
-#: ../glib/gregex.c:2496
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "laukta skaitmens"
 
-#: ../glib/gregex.c:2514
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "neleistina simbolinÄ— nuoroda"
 
-#: ../glib/gregex.c:2576
+#: glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr "nevietoje galutinis „\\“"
 
-#: ../glib/gregex.c:2580
+#: glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "nežinoma kaitos seka"
 
-#: ../glib/gregex.c:2590
+#: glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr "Klaida apdorojant pakeitimo tekstą „%s“ ties simboliu %lu: %s"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Cituojamas tekstas neprasideda citavimo ženklu"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Nesutampantis citavimo simbolis komandinÄ—je eilutÄ—je arba kitame terpÄ—s "
 "cituotame tekste"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\� character. (The text was “%s�)"
 msgstr "Tekstas pasibaigė tuoj po „\\“ simbolio. (Tekste buvo įrašyta „%s“)"
 
-#: ../glib/gshell.c:587
+#: glib/gshell.c:587
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was “%s�)"
 msgstr ""
 "Tekstas pasibaigė nesulaukus %c atitinkan�io citatos ženklo. (Tekste buvo "
 "įrašyta „%s“)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Tekstas buvo tuš�ias arba turėjo vien tik tarpo simbolius)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Nepavyko gauti duomenis iš antrinio proceso (%s)"
 
-#: ../glib/gspawn.c:401
+#: glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Netikėta klaida tarp select() funkcijos duomenų gavimo iš antrinio proceso "
 "(%s) metu"
 
-#: ../glib/gspawn.c:486
+#: glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "NetikÄ—ta waitpid() klaida (%s)"
 
-#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
+#: glib/gspawn.c:1043 glib/gspawn-win32.c:1318
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Vaikinis procesas išėjo su kodu %ld"
 
-#: ../glib/gspawn.c:905
+#: glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Vaikinis procesas nutrauktas signalu %ld"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Vaikinis procesas sustabdytas signalu %ld"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Vaikinis procesas išėjo nenormaliai"
 
-#: ../glib/gspawn.c:1324 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
+#: glib/gspawn.c:1360 glib/gspawn-win32.c:339 glib/gspawn-win32.c:347
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Nepavyko perskaityti duomenų iš antrinio konvejerio (%s)"
 
-#: ../glib/gspawn.c:1394
+#: glib/gspawn.c:1596
+#, c-format
+#| msgid "Failed to execute child process “%s� (%s)"
+msgid "Failed to spawn child process “%s� (%s)"
+msgstr "Nepavyko paleisti antrinio proceso „%s“ (%s)"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Nepavyko atskirti (%s)"
 
-#: ../glib/gspawn.c:1543 ../glib/gspawn-win32.c:368
+#: glib/gspawn.c:1784 glib/gspawn-win32.c:370
 #, c-format
 msgid "Failed to change to directory “%s� (%s)"
 msgstr "Nepavyko pereiti į aplanką „%s“ (%s)"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s� (%s)"
 msgstr "Nepavyko paleisti antrinio proceso „%s“ (%s)"
 
-#: ../glib/gspawn.c:1563
+#: glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Nepavyko perimti antrinio proceso (%s) išvedimo arba įvedimo"
 
-#: ../glib/gspawn.c:1572
+#: glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Nepavyko atskirti antrinio proceso (%s)"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s�"
 msgstr "Nežinoma klaida vykdant antrinį procesą „%s“"
 
-#: ../glib/gspawn.c:1604
+#: glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Nepavyko perskaityti reikiamo duomenų kiekio iš antrinio pid konvejerio (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Nepavyko gauti duomenų iš antrinio proceso"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "Nepavyko sukurti konvejerio skirto keistis duomenimis su antriniu procesu "
 "(%s)"
 
-#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
+#: glib/gspawn-win32.c:376 glib/gspawn-win32.c:381 glib/gspawn-win32.c:500
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Nepavyko paleisti antrinio proceso (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Netinkamas programos pavadinimas: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: glib/gspawn-win32.c:460 glib/gspawn-win32.c:714
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Netinkama seka argumento vektoriuje, pozicijoje %d: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: glib/gspawn-win32.c:471 glib/gspawn-win32.c:729
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Netinka seka aplinkoje: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Netinkamas darbinis katalogas: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Nepavyko paleisti pagalbinÄ—s programos (%s)"
 
-#: ../glib/gspawn-win32.c:995
+#: glib/gspawn-win32.c:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5700,163 +5758,163 @@ msgstr ""
 "Netikėta klaida tarp g_io_channel_win32_poll() funkcijos duomenų skaitymo iš "
 "antrinio proceso metu"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "Tuš�ia simbolių eilutė nėra skai�ius"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s� is not a signed number"
 msgstr "„%s“ nėra skai�ius su ženklu"
 
-#: ../glib/gstrfuncs.c:3281 ../glib/gstrfuncs.c:3384
+#: glib/gstrfuncs.c:3281 glib/gstrfuncs.c:3384
 #, c-format
 msgid "Number “%s� is out of bounds [%s, %s]"
 msgstr "Skai�ius „%s“ yra už [%s, %s] ribų"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s� is not an unsigned number"
 msgstr "„%s“ nėra skai�ius be ženklo"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Nepavyko išskirti atminties"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Simbolis neatitinka UTF-8 simbolių diapazono"
 
-#: ../glib/gutf8.c:1045 ../glib/gutf8.c:1054 ../glib/gutf8.c:1184
-#: ../glib/gutf8.c:1193 ../glib/gutf8.c:1332 ../glib/gutf8.c:1429
+#: glib/gutf8.c:1045 glib/gutf8.c:1054 glib/gutf8.c:1184 glib/gutf8.c:1193
+#: glib/gutf8.c:1332 glib/gutf8.c:1429
 msgid "Invalid sequence in conversion input"
 msgstr "Klaidinga seka keitimo įvestyje"
 
-#: ../glib/gutf8.c:1343 ../glib/gutf8.c:1440
+#: glib/gutf8.c:1343 glib/gutf8.c:1440
 msgid "Character out of range for UTF-16"
 msgstr "Simbolis neatitinka UTF-16 simbolių diapazono"
 
-#: ../glib/gutils.c:2229
+#: glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: glib/gutils.c:2245 glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: glib/gutils.c:2246 glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: glib/gutils.c:2247 glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: glib/gutils.c:2248 glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: glib/gutils.c:2249 glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2237
+#: glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2238
+#: glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2239
+#: glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2240
+#: glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2241
+#: glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2242
+#: glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2245
+#: glib/gutils.c:2260
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
-#: ../glib/gutils.c:2246
+#: glib/gutils.c:2261
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
-#: ../glib/gutils.c:2247
+#: glib/gutils.c:2262
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
-#: ../glib/gutils.c:2248
+#: glib/gutils.c:2263
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
-#: ../glib/gutils.c:2249
+#: glib/gutils.c:2264
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
-#: ../glib/gutils.c:2250
+#: glib/gutils.c:2265
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
-#: ../glib/gutils.c:2253
+#: glib/gutils.c:2268
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
-#: ../glib/gutils.c:2254
+#: glib/gutils.c:2269
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
-#: ../glib/gutils.c:2255
+#: glib/gutils.c:2270
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
-#: ../glib/gutils.c:2256
+#: glib/gutils.c:2271
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
-#: ../glib/gutils.c:2257
+#: glib/gutils.c:2272
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
-#: ../glib/gutils.c:2258
+#: glib/gutils.c:2273
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: ../glib/gutils.c:2292 ../glib/gutils.c:2418
+#: glib/gutils.c:2307 glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -5864,7 +5922,7 @@ msgstr[0] "%u baitas"
 msgstr[1] "%u baitai"
 msgstr[2] "%u baitų"
 
-#: ../glib/gutils.c:2296
+#: glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5873,7 +5931,7 @@ msgstr[1] "%u bitai"
 msgstr[2] "%u bitų"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2363
+#: glib/gutils.c:2378
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -5882,7 +5940,7 @@ msgstr[1] "%s baitai"
 msgstr[2] "%s baitų"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2368
+#: glib/gutils.c:2383
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -5895,11 +5953,30 @@ msgstr[2] "%s bitų"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2431
+#: glib/gutils.c:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
+#~ msgid "No such interface '%s'"
+#~ msgstr "Nėra sąsajos „%s“"
+
+#~ msgid "No such method '%s'"
+#~ msgstr "Nėra metodo „%s“"
+
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable - unknown value '%s'"
+#~ msgstr ""
+#~ "Nepavyko nustatyti magistralės adreso iš DBUS_STARTER_BUS_TYPE aplinkos "
+#~ "kintamojo - nežinoma reikšmė „%s“"
+
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGUMENTAI...]"
+
+#~ msgid "Failed to create temp file: %s"
+#~ msgstr "Nepavyko sukurti laikino failo: %s"
+
 #~ msgid ""
 #~ "Message has %d file descriptors but the header field indicates %d file "
 #~ "descriptors"
@@ -5949,10 +6026,6 @@ msgstr "%.1f KB"
 #~ msgid "Error setting attribute: %s\n"
 #~ msgstr "Klaida nustatant atributÄ… %s\n"
 
-#~| msgid "No such interface '%s'"
-#~ msgid "No such interface “%s�"
-#~ msgstr "Nėra sąsajos „%s“"
-
 #~ msgid "Error creating directory '%s': %s"
 #~ msgstr "Klaida kuriant katalogą „%s“: %s"
 
diff --git a/po/ro.po b/po/ro.po
index 07853b4ae..93d3fcbf6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,78 +9,69 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=glib&k"
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-08 14:40+0000\n"
-"PO-Revision-Date: 2017-09-10 13:36+0200\n"
-"Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-07-01 15:08+0000\n"
+"PO-Revision-Date: 2018-07-17 19:51+0300\n"
+"Last-Translator: Florentina Mușat <florentina.musat.28 [at] gmail [dot] "
+"com>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"20)) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.9\n"
 "X-Project-Style: gnome\n"
 
-#: ../gio/gapplication.c:490
-#| msgid "Application Options:"
+#: ../gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Opțiuni GApplication"
 
-#: ../gio/gapplication.c:490
-#, fuzzy
-#| msgid "Application Options:"
+#: ../gio/gapplication.c:496
 msgid "Show GApplication options"
-msgstr "Opțiuni aplicație:"
+msgstr "Arată opțiunile GApplication"
 
-#: ../gio/gapplication.c:535
+#: ../gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr ""
+"Intră în modul de serviciu GApplication (utilizează de la fișierele de "
+"serviciu D-Bus)"
 
-#: ../gio/gapplication.c:547
+#: ../gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Suprascrie ID-ul aplicației"
 
 #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
 #: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:488
-#: ../gio/gsettings-tool.c:522
+#: ../gio/gsettings-tool.c:569
 msgid "Print help"
 msgstr "Afișează ajutorul"
 
 #: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489
 #: ../gio/gresource-tool.c:557
-#, fuzzy
-#| msgid "COMMAND"
 msgid "[COMMAND]"
-msgstr "COMANDÄ‚"
+msgstr "[COMANDÄ‚]"
 
 #: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
-#, fuzzy
-#| msgid "Print help"
 msgid "Print version"
-msgstr "Afișează ajutorul"
+msgstr "Tipărește versiunea"
 
-#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:528
+#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:575
 msgid "Print version information and exit"
 msgstr "Afișează informațiile despre versiune și ieși"
 
 #: ../gio/gapplication-tool.c:52
-#, fuzzy
-#| msgid "Can't find application"
 msgid "List applications"
-msgstr "Nu s-a putut găsi aplicația"
+msgstr "Listează aplicațiile"
 
 #: ../gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
-msgstr ""
+msgstr "Listează aplicațiile D-Bus care se pot activa (după fișiere .desktop)"
 
 #: ../gio/gapplication-tool.c:55
-#, fuzzy
-#| msgid "Can't find application"
 msgid "Launch an application"
-msgstr "Nu s-a putut găsi aplicația"
+msgstr "Lansează o aplicație"
 
 #: ../gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
@@ -88,7 +79,7 @@ msgstr "Lansează aplicația (cu fișiere opționale de deschis)"
 
 #: ../gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
-msgstr ""
+msgstr "APPID [FIȘIER…]"
 
 #: ../gio/gapplication-tool.c:59
 msgid "Activate an action"
@@ -100,7 +91,7 @@ msgstr "Invocă o acțiune pe aplicație"
 
 #: ../gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
-msgstr ""
+msgstr "ACÈšIUNE APPID [PARAMETRU]"
 
 #: ../gio/gapplication-tool.c:63
 msgid "List available actions"
@@ -112,7 +103,7 @@ msgstr "Listează acțiuni statice pentru o aplicație (din fișierul .desktop)"
 
 #: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
 msgid "APPID"
-msgstr ""
+msgstr "APPID"
 
 #: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133
 #: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:224
@@ -125,10 +116,10 @@ msgstr "Comanda pentru care să se afișeze ajutorul detaliat"
 
 #: ../gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
-msgstr ""
+msgstr "Identificatorul de aplicație în format D-Bus (eg: org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
-#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:737
+#: ../gio/glib-compile-resources.c:743 ../gio/glib-compile-resources.c:770
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FIȘIER"
@@ -142,10 +133,8 @@ msgid "ACTION"
 msgstr "ACÈšIUNE"
 
 #: ../gio/gapplication-tool.c:73
-#, fuzzy
-#| msgid "Destination name to introspect"
 msgid "The action name to invoke"
-msgstr "Numele destinației de introspectat"
+msgstr "Numele acțiunii de invocat"
 
 #: ../gio/gapplication-tool.c:74
 msgid "PARAMETER"
@@ -156,7 +145,7 @@ msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "Parametru opțional pentru invocarea acțiunii, în formatul GVariant"
 
 #: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:614
+#: ../gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -166,19 +155,17 @@ msgstr ""
 "\n"
 
 #: ../gio/gapplication-tool.c:101
-#, fuzzy
-#| msgid "Usage:"
 msgid "Usage:\n"
-msgstr "Utilizare:"
+msgstr "Utilizare:\n"
 
 #: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:649
+#: ../gio/gsettings-tool.c:696
 msgid "Arguments:\n"
 msgstr "Argumente:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224
 msgid "[ARGS…]"
-msgstr ""
+msgstr "[ARGUMENTE…]"
 
 #: ../gio/gapplication-tool.c:134
 #, c-format
@@ -192,6 +179,8 @@ msgid ""
 "Use “%s help COMMAND� to get detailed help.\n"
 "\n"
 msgstr ""
+"Utilizați „%s help COMANDĂ� pentru a obține ajutor detaliat.\n"
+"\n"
 
 #: ../gio/gapplication-tool.c:165
 #, c-format
@@ -199,11 +188,13 @@ msgid ""
 "%s command requires an application id to directly follow\n"
 "\n"
 msgstr ""
+"comanda %s trebuie să fie urmată imediat de un id de aplicație\n"
+"\n"
 
 #: ../gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s�\n"
-msgstr ""
+msgstr "id de aplicație nevalid: „%s�\n"
 
 #. Translators: %s is replaced with a command name like 'list-actions'
 #: ../gio/gapplication-tool.c:182
@@ -212,18 +203,18 @@ msgid ""
 "“%s� takes no arguments\n"
 "\n"
 msgstr ""
+"„%s� nu ia argumente\n"
+"\n"
 
 #: ../gio/gapplication-tool.c:266
-#, fuzzy, c-format
-#| msgid "Unable to create trash dir %s: %s"
+#, c-format
 msgid "unable to connect to D-Bus: %s\n"
-msgstr "Nu s-a putut crea directorul coșului de gunoi „%s�: %s"
+msgstr "nu se poate conecta la D-Bus: %s\n"
 
 #: ../gio/gapplication-tool.c:286
-#, fuzzy, c-format
-#| msgid "Error sending message: %s"
+#, c-format
 msgid "error sending %s message to application: %s\n"
-msgstr "Eroare la trimiterea mesajului: %s"
+msgstr "eroare la trimiterea mesajului %s la aplicația: %s\n"
 
 #: ../gio/gapplication-tool.c:317
 #, c-format
@@ -236,12 +227,14 @@ msgid ""
 "invalid action name: “%s�\n"
 "action names must consist of only alphanumerics, “-� and “.�\n"
 msgstr ""
+"nume de acțiune nevalid „%s�\n"
+"numele de acțiuni trebuie să fie formate doar din caractere alfanumerice, "
+"„-� și „.�\n"
 
 #: ../gio/gapplication-tool.c:344
-#, fuzzy, c-format
-#| msgid "Error parsing parameter %d: %s\n"
+#, c-format
 msgid "error parsing action parameter: %s\n"
-msgstr "Eroare la parsarea parametrului %d: %s\n"
+msgstr "eroare la parsarea parametrului: %s\n"
 
 #: ../gio/gapplication-tool.c:356
 #, c-format
@@ -251,62 +244,52 @@ msgstr "acțiunile acceptă maximum un parametru\n"
 #: ../gio/gapplication-tool.c:411
 #, c-format
 msgid "list-actions command takes only the application id"
-msgstr ""
+msgstr "comanda list-actions ia numai id-ul aplicației"
 
 #: ../gio/gapplication-tool.c:421
-#, fuzzy, c-format
-#| msgid "Unable to find terminal required for application"
+#, c-format
 msgid "unable to find desktop file for application %s\n"
-msgstr "Nu s-a găsit un terminal pentru pornirea aplicației"
+msgstr "nu se poate găsi fișierul desktop pentru aplicația %s\n"
 
 #: ../gio/gapplication-tool.c:466
-#, fuzzy, c-format
-#| msgid ""
-#| "Unknown command %s\n"
-#| "\n"
+#, c-format
 msgid ""
 "unrecognised command: %s\n"
 "\n"
 msgstr ""
-"Comandă necunoscută %s\n"
+"comandă nerecunoscută: %s\n"
 "\n"
 
 #: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498
 #: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379
 #: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019
 #: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834
-#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:206
+#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:209
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "S-a pasat o valoare prea mare către %s"
 
 #: ../gio/gbufferedinputstream.c:891 ../gio/gbufferedoutputstream.c:575
 #: ../gio/gdataoutputstream.c:562
-#, fuzzy
-#| msgid "Seek not supported on stream"
 msgid "Seek not supported on base stream"
-msgstr "Căutarea în flux nu este implementată"
+msgstr "Căutarea în fluxul de bază nu este suportată"
 
 #: ../gio/gbufferedinputstream.c:937
-#, fuzzy
-#| msgid "Cannot truncate GMemoryInputStream"
 msgid "Cannot truncate GBufferedInputStream"
-msgstr "Nu se poate trunchia GMemoryInputStream"
+msgstr "Nu se poate trunchia GBufferedInputStream"
 
 #: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208
-#: ../gio/giostream.c:300 ../gio/goutputstream.c:1660
+#: ../gio/giostream.c:300 ../gio/goutputstream.c:1661
 msgid "Stream is already closed"
 msgstr "Flux deja închis"
 
 #: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
-#, fuzzy
-#| msgid "Truncate not supported on stream"
 msgid "Truncate not supported on base stream"
-msgstr "Trunchierea fluxului nu este implementată"
+msgstr "Trunchierea fluxului de bază nu este suportată"
 
 #: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
-#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870
-#: ../gio/gsimpleasyncresult.c:896
+#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:871
+#: ../gio/gsimpleasyncresult.c:897
 #, c-format
 msgid "Operation was cancelled"
 msgstr "Operațiunea a fost anulată"
@@ -324,32 +307,30 @@ msgid "Not enough space in destination"
 msgstr "Spațiu insuficient în destinație"
 
 #: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
-#: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845
+#: ../gio/gdatainputstream.c:1261 ../glib/gconvert.c:454 ../glib/gconvert.c:883
 #: ../glib/giochannel.c:1557 ../glib/giochannel.c:1599
-#: ../glib/giochannel.c:2443 ../glib/gutf8.c:866 ../glib/gutf8.c:1319
+#: ../glib/giochannel.c:2443 ../glib/gutf8.c:869 ../glib/gutf8.c:1322
 msgid "Invalid byte sequence in conversion input"
 msgstr "Secvență de octeți incorectă în inputul conversiei"
 
-#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:446 ../glib/gconvert.c:770
+#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:462 ../glib/gconvert.c:797
 #: ../glib/giochannel.c:1564 ../glib/giochannel.c:2455
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Eroare în timpul conversiei: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1096
+#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "Inițializarea întreruptibilă nu este implementată"
 
-#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:321
+#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:327
 #: ../glib/giochannel.c:1385
-#, fuzzy, c-format
-#| msgid "Conversion from character set '%s' to '%s' is not supported"
+#, c-format
 msgid "Conversion from character set “%s� to “%s� is not supported"
-msgstr "Conversia de la setul de caractere „%s� la „%s� nu este implementată"
+msgstr "Conversia de la setul de caractere „%s� la „%s� nu este suportată"
 
-#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:325
-#, fuzzy, c-format
-#| msgid "Could not open converter from '%s' to '%s'"
+#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:331
+#, c-format
 msgid "Could not open converter from “%s� to “%s�"
 msgstr "Nu s-a putut deschide convertorul de la „%s� la „%s�"
 
@@ -367,220 +348,184 @@ msgstr "Tip necunoscută"
 msgid "%s filetype"
 msgstr "tip de fișier %s"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: ../gio/gcredentials.c:315 ../gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
-msgstr "GCredentials nu este implementat pe acest sistem de operare"
+msgstr "GCredentials nu este implementat pe acest SO"
 
-#: ../gio/gcredentials.c:467
+#: ../gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Nu există suport pentru GCredentials pe platforma dumneavoastră"
 
-#: ../gio/gcredentials.c:513
-#, fuzzy
-#| msgid "GCredentials is not implemented on this OS"
+#: ../gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
-msgstr "GCredentials nu este implementat pe acest sistem de operare"
+msgstr "GCredentials nu conține un ID de proces pe acest SO"
 
-#: ../gio/gcredentials.c:565
-#, fuzzy
-#| msgid "GCredentials is not implemented on this OS"
+#: ../gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
-msgstr "GCredentials nu este implementat pe acest sistem de operare"
+msgstr "Spoofing-ul certificărilor nu este posibil pe acest SO"
 
 #: ../gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Flux terminat neașteptat de repede"
 
-#: ../gio/gdbusaddress.c:155 ../gio/gdbusaddress.c:243
-#: ../gio/gdbusaddress.c:324
-#, fuzzy, c-format
-#| msgid "Unsupported key '%s' in address entry '%s'"
+#: ../gio/gdbusaddress.c:158 ../gio/gdbusaddress.c:246
+#: ../gio/gdbusaddress.c:327
+#, c-format
 msgid "Unsupported key “%s� in address entry “%s�"
 msgstr "Cheie „%s� nesuportată în intrarea de adresă „%s�"
 
-#: ../gio/gdbusaddress.c:182
-#, fuzzy, c-format
-#| msgid ""
-#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract "
-#| "keys)"
+#: ../gio/gdbusaddress.c:185
+#, c-format
 msgid ""
 "Address “%s� is invalid (need exactly one of path, tmpdir or abstract keys)"
 msgstr ""
-"Adresa „%s� nu este validă (e nevoie de exact o cale, un dosar temporar sau "
-"o cheie abstractă)"
+"Adresa „%s� nu este validă (este nevoie de exact una din cale, tmpdir sau "
+"chei abstracte)"
 
-#: ../gio/gdbusaddress.c:195
-#, fuzzy, c-format
-#| msgid "Meaningless key/value pair combination in address entry '%s'"
+#: ../gio/gdbusaddress.c:198
+#, c-format
 msgid "Meaningless key/value pair combination in address entry “%s�"
 msgstr "Pereche cheie/valoare fără sens în intrarea de adresă „%s�"
 
-#: ../gio/gdbusaddress.c:258 ../gio/gdbusaddress.c:339
-#, fuzzy, c-format
-#| msgid "Error in address '%s' - the port attribute is malformed"
+#: ../gio/gdbusaddress.c:261 ../gio/gdbusaddress.c:342
+#, c-format
 msgid "Error in address “%s� — the port attribute is malformed"
-msgstr "Eroare în adresa „%s� - atributul port este greșit"
+msgstr "Eroare în adresa „%s� - atributul port este eronat"
 
-#: ../gio/gdbusaddress.c:269 ../gio/gdbusaddress.c:350
-#, fuzzy, c-format
-#| msgid "Error in address '%s' - the family attribute is malformed"
+#: ../gio/gdbusaddress.c:272 ../gio/gdbusaddress.c:353
+#, c-format
 msgid "Error in address “%s� — the family attribute is malformed"
-msgstr "Eroare în adresa „%s� - atributul familie este greșit"
+msgstr "Eroare în adresa „%s� - atributul familie este eronat"
+
+#: ../gio/gdbusaddress.c:423 ../gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s� for address “%s�"
+msgstr "Transport „%s� necunoscut sau nesuportat pentru adresa „%s�"
 
-#: ../gio/gdbusaddress.c:460
-#, fuzzy, c-format
-#| msgid "Address element '%s', does not contain a colon (:)"
+#: ../gio/gdbusaddress.c:467
+#, c-format
 msgid "Address element “%s� does not contain a colon (:)"
 msgstr "Elementul de adresă „%s� nu conține două puncte (:)"
 
-#: ../gio/gdbusaddress.c:481
-#, fuzzy, c-format
-#| msgid ""
-#| "Key/Value pair %d, '%s', in address element '%s', does not contain an "
-#| "equal sign"
+#: ../gio/gdbusaddress.c:488
+#, c-format
 msgid ""
 "Key/Value pair %d, “%s�, in address element “%s� does not contain an equal "
 "sign"
 msgstr ""
-"Perechea cheie/valoare %d, „%s�, in elementul de adresă „%s�, nu conține un "
+"Perechea cheie/valoare %d, „%s�, în elementul de adresă „%s�, nu conține un "
 "semn de egalitate"
 
-#: ../gio/gdbusaddress.c:495
-#, fuzzy, c-format
-#| msgid ""
-#| "Error unescaping key or value in Key/Value pair %d, '%s', in address "
-#| "element '%s'"
+#: ../gio/gdbusaddress.c:502
+#, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s�, in address element "
 "“%s�"
 msgstr ""
-"Eroare la conversia din format „escaped� a cheii sau valorii din perechea "
-"Cheie/Valoare %d, „%s�, în elementul de adresă „%s�"
+"Eroare la conversia din formatul „escaped� a cheii sau a valorii din "
+"perechea cheie/valoare %d, „%s�, în elementul de adresă „%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"
+#: ../gio/gdbusaddress.c:580
+#, c-format
 msgid ""
 "Error in address “%s� — the unix transport requires exactly one of the keys "
 "“path� or “abstract� to be set"
 msgstr ""
 "Eroare în adresa „%s� - transportul unix necesită exact una din cheile "
-"„path� sau „abstract� să fie setată"
+"„path� sau „abstract� să fie stabilită"
 
-#: ../gio/gdbusaddress.c:609
-#, fuzzy, c-format
-#| msgid "Error in address '%s' - the host attribute is missing or malformed"
+#: ../gio/gdbusaddress.c:616
+#, c-format
 msgid "Error in address “%s� — the host attribute is missing or malformed"
-msgstr "Eroare în adresa „%s� - atributul gazdă este greșit"
+msgstr "Eroare în adresa „%s� - atributul gazdă lipsește sau este eronat"
 
-#: ../gio/gdbusaddress.c:623
-#, fuzzy, c-format
-#| msgid "Error in address '%s' - the port attribute is missing or malformed"
+#: ../gio/gdbusaddress.c:630
+#, c-format
 msgid "Error in address “%s� — the port attribute is missing or malformed"
-msgstr "Eroare la adresa „%s� - atributul port este greșit sau lipsește"
+msgstr "Eroare la adresa „%s� - atributul port lipsește sau este eronat"
 
-#: ../gio/gdbusaddress.c:637
-#, fuzzy, c-format
-#| msgid ""
-#| "Error in address '%s' - the noncefile attribute is missing or malformed"
+#: ../gio/gdbusaddress.c:644
+#, c-format
 msgid "Error in address “%s� — the noncefile attribute is missing or malformed"
-msgstr "Eroare în adresa „%s� - atributul noncefile este greșit sau lipsește"
+msgstr "Eroare în adresa „%s� - atributul noncefile lipsește sau este eronat"
 
-#: ../gio/gdbusaddress.c:658
+#: ../gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Eroare la auto-lansare: "
 
-#: ../gio/gdbusaddress.c:666
-#, fuzzy, c-format
-#| msgid "Unknown or unsupported transport '%s' for address '%s'"
-msgid "Unknown or unsupported transport “%s� for address “%s�"
-msgstr "Transport „%s� necunoscut sau nesuportat pentru adresa „%s�"
-
-#: ../gio/gdbusaddress.c:704
-#, fuzzy, c-format
-#| msgid "Error opening nonce file '%s': %s"
+#: ../gio/gdbusaddress.c:718
+#, c-format
 msgid "Error opening nonce file “%s�: %s"
 msgstr "Eroare la deschiderea fișierului nonce „%s�: %s"
 
-#: ../gio/gdbusaddress.c:723
-#, fuzzy, c-format
-#| msgid "Error reading from nonce file '%s': %s"
+#: ../gio/gdbusaddress.c:737
+#, c-format
 msgid "Error reading from nonce file “%s�: %s"
-msgstr "Eroare la citirea fișierului nonce „%s�: %s"
+msgstr "Eroare la citirea din fișierul nonce „%s�: %s"
 
-#: ../gio/gdbusaddress.c:732
-#, fuzzy, c-format
-#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
+#: ../gio/gdbusaddress.c:746
+#, c-format
 msgid "Error reading from nonce file “%s�, expected 16 bytes, got %d"
 msgstr ""
-"Eroare la citirea fișierului nonce „%s�, se așteptau 16 octeți, s-au primit "
-"%d"
+"Eroare la citirea din fișierul nonce „%s�, se așteptau 16 octeți, s-au "
+"primit %d"
 
-#: ../gio/gdbusaddress.c:750
-#, fuzzy, c-format
-#| msgid "Error writing contents of nonce file '%s' to stream:"
+#: ../gio/gdbusaddress.c:764
+#, c-format
 msgid "Error writing contents of nonce file “%s� to stream:"
-msgstr "Eroare la scrierea conținutului fișierului nonce „%s� în flux:"
+msgstr "Eroare la scrierea conținutului fișierului nonce „%s� la flux:"
 
-#: ../gio/gdbusaddress.c:959
+#: ../gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "Adresa oferită este goală"
 
-#: ../gio/gdbusaddress.c:1072
-#, fuzzy, c-format
-#| msgid "Cannot spawn a message bus without a machine-id: "
+#: ../gio/gdbusaddress.c:1086
+#, c-format
 msgid "Cannot spawn a message bus when setuid"
-msgstr ""
-"Nu se poate lansa o magistrală de mesaje fără un identificator de mașină: "
+msgstr "Nu se poate lansa o magistrală de mesaje când setuid"
 
-#: ../gio/gdbusaddress.c:1079
+#: ../gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr ""
 "Nu se poate lansa o magistrală de mesaje fără un identificator de mașină: "
 
-#: ../gio/gdbusaddress.c:1086
+#: ../gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
-msgstr ""
+msgstr "Nu se poate lansa automat D-Bus fără $DISPLAY X11"
 
-#: ../gio/gdbusaddress.c:1128
-#, fuzzy, c-format
-#| msgid "Error spawning command line '%s': "
+#: ../gio/gdbusaddress.c:1142
+#, c-format
 msgid "Error spawning command line “%s�: "
-msgstr "Eroare la lansarea liniei de comandă „%s�: "
+msgstr "Eroare la crearea liniei de comandă „%s�: "
 
-#: ../gio/gdbusaddress.c:1345
+#: ../gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
-msgstr ""
+msgstr "(Tastați orice caracter pentru a închide această fereastră)\n"
 
-#: ../gio/gdbusaddress.c:1499
+#: ../gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
-msgstr ""
+msgstr "Sesiunea dbus nu rulează, și lansarea automată a eșuat"
 
-#: ../gio/gdbusaddress.c:1510
+#: ../gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Nu se poate determina adresa magistralei de sesiune (neimplementat pe acest "
 "sistem de operare)"
 
-#: ../gio/gdbusaddress.c:1648
-#, fuzzy, c-format
-#| msgid ""
-#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
-#| "variable - unknown value '%s'"
+#: ../gio/gdbusaddress.c:1662 ../gio/gdbusconnection.c:7151
+#, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "— unknown value “%s�"
 msgstr ""
-"Nu s-a putut determina adresa magistralei din variabila de mediu "
-"DBUS_STARTER_BUS_TYPE - valoare necunoscută „%s�"
+"Nu se poate determina adresa magistralei din variabila de mediu "
+"DBUS_STARTER_BUS_TYPE — valoare necunoscută „%s�"
 
-#: ../gio/gdbusaddress.c:1657 ../gio/gdbusconnection.c:7155
+#: ../gio/gdbusaddress.c:1671 ../gio/gdbusconnection.c:7160
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -588,7 +533,7 @@ msgstr ""
 "Nu s-a putut determina adresa magistralei pentru că variabila de mediu "
 "DBUS_STARTER_BUS_TYPE nu este setată"
 
-#: ../gio/gdbusaddress.c:1667
+#: ../gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Tip de magistrală %d necunoscut"
@@ -603,7 +548,7 @@ msgstr ""
 "Lipsă de conținut neașteptată în timp ce se încerca citirea (în siguranță a) "
 "unei linii"
 
-#: ../gio/gdbusauth.c:508
+#: ../gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -611,108 +556,88 @@ msgstr ""
 "S-au epuizat toate mecanismele de autentificare disponibile (încercat: %s) "
 "(disponibile: %s)"
 
-#: ../gio/gdbusauth.c:1174
+#: ../gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Anulat via GDBusAuthObserver::authorize-authenticated-peer"
 
 #: ../gio/gdbusauthmechanismsha1.c:262
-#, fuzzy, c-format
-#| msgid "Error opening directory '%s': %s"
+#, c-format
 msgid "Error when getting information for directory “%s�: %s"
-msgstr "Eroare la deschiderea directorului „%s�: %s"
+msgstr "Eroare în timpul obținerii de informații pentru directorul „%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 ""
-"Permisiunile dosarul „%s� sunt greșite. Se aștepta modul 0700, s-a găsit 0%o"
+"Permisiunile pentru dosarul „%s� sunt eronate. Se aștepta modul 0700, s-a "
+"primit 0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
-#, fuzzy, c-format
-#| msgid "Error creating directory '%s': %s"
+#: ../gio/gdbusauthmechanismsha1.c:299
+#, c-format
 msgid "Error creating directory “%s�: %s"
-msgstr "Eroare la crearea dosarului „%s�: %s"
+msgstr "Eroare la crearea directorului „%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
-#, fuzzy, c-format
-#| msgid "Error opening keyring '%s' for reading: "
+#: ../gio/gdbusauthmechanismsha1.c:346
+#, c-format
 msgid "Error opening keyring “%s� for reading: "
-msgstr "Eroare la deschiderea fișierului „%s� pentru citire: "
+msgstr "Eroare la deschiderea inelului de chei „%s� pentru citire: "
 
-#: ../gio/gdbusauthmechanismsha1.c:403 ../gio/gdbusauthmechanismsha1.c:721
-#, fuzzy, c-format
-#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
+#: ../gio/gdbusauthmechanismsha1.c:369 ../gio/gdbusauthmechanismsha1.c:687
+#, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
-msgstr "Linia %d a inelului de chei de la „%s� cu conținutul „%s� este greșită"
+msgstr "Linia %d a inelului de chei de la „%s� cu conținutul „%s� este eronată"
 
-#: ../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"
+#: ../gio/gdbusauthmechanismsha1.c:383 ../gio/gdbusauthmechanismsha1.c:701
+#, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr ""
-"Primul element al liniei %d a inelului de chei de la „%s� cu conținutul „%s� "
-"este greșit"
+"Primul jeton al liniei %d a inelului de chei de la „%s� cu conținutul „%s� "
+"este eronat"
 
-#: ../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"
+#: ../gio/gdbusauthmechanismsha1.c:397 ../gio/gdbusauthmechanismsha1.c:715
+#, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr ""
-"Al doilea element al liniei %d a inelului de chei de la „%s� cu conținutul "
-"„%s� este greșit"
+"Al doilea jeton al liniei %d a inelului de chei de la „%s� cu conținutul "
+"„%s� este eronat"
 
-#: ../gio/gdbusauthmechanismsha1.c:456
-#, fuzzy, c-format
-#| msgid "Didn't find cookie with id %d in the keyring at '%s'"
+#: ../gio/gdbusauthmechanismsha1.c:421
+#, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
-msgstr ""
-"Nu s-a găsit un cookie cu identificatorul %d în inelul de chei de la „%s�"
+msgstr "Nu s-a găsit un cookie cu id-ul %d în inelul de chei de la „%s�"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
-#, fuzzy, c-format
-#| msgid "Error deleting stale lock file '%s': %s"
+#: ../gio/gdbusauthmechanismsha1.c:503
+#, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Eroare la ștergerea fișierului de blocare învechit „%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:569
-#, fuzzy, c-format
-#| msgid "Error creating lock file '%s': %s"
+#: ../gio/gdbusauthmechanismsha1.c:535
+#, c-format
 msgid "Error creating lock file “%s�: %s"
-msgstr "Eroare la citirea fișierului de blocare „%s�: %s"
+msgstr "Eroare la crearea fișierului de blocare „%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:600
-#, fuzzy, c-format
-#| msgid "Error closing (unlinked) lock file '%s': %s"
+#: ../gio/gdbusauthmechanismsha1.c:566
+#, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
-msgstr ""
-"Eroare la închiderea fișierului de blocare (fără legături deschise) „%s�: %s"
+msgstr "Eroare la închiderea fișierului de blocare (deconectat) „%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:611
-#, fuzzy, c-format
-#| msgid "Error unlinking lock file '%s': %s"
+#: ../gio/gdbusauthmechanismsha1.c:577
+#, c-format
 msgid "Error unlinking lock file “%s�: %s"
-msgstr "Eroare la ștergerea fișierului fișierului de blocare „%s�: %s"
+msgstr "Eroare la deconectarea fișierului de blocare „%s�: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:688
-#, fuzzy, c-format
-#| msgid "Error opening keyring '%s' for writing: "
+#: ../gio/gdbusauthmechanismsha1.c:654
+#, c-format
 msgid "Error opening keyring “%s� for writing: "
-msgstr "Eroare la deschiderea pentru scriere a inelului de chei „%s�: "
+msgstr "Eroare la deschiderea inelului de chei „%s� pentru citire: "
 
-#: ../gio/gdbusauthmechanismsha1.c:885
-#, fuzzy, c-format
-#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
+#: ../gio/gdbusauthmechanismsha1.c:850
+#, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
-msgstr "(În plus, a eșuat și deblocarea fișierului de blocare „%s�: %s)"
+msgstr "(Adițional, a eșuat și eliberarea blocării pentru „%s�: %s) "
 
 #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
 msgid "The connection is closed"
@@ -726,59 +651,59 @@ msgstr "Limita de timp a fost atinsă"
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
-"yuS-au întâlnit flag-uri nesuportate când se construia partea de client a "
+"S-au întâlnit fanioane nesuportate când se construia partea de client a "
 "conexiunii"
 
 #: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
 #, c-format
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
+"No such interface “org.freedesktop.DBus.Properties� on object at path %s"
 msgstr ""
-"Nu există interfața „org.freedesktop.DBus.Properties� în obiectul aflat la "
+"Nu există interfața „org.freedesktop.DBus.Properties� în obiectul de la "
 "calea %s"
 
 #: ../gio/gdbusconnection.c:4266
 #, c-format
-msgid "No such property '%s'"
+msgid "No such property “%s�"
 msgstr "Nu există proprietatea „%s�"
 
 #: ../gio/gdbusconnection.c:4278
 #, c-format
-msgid "Property '%s' is not readable"
+msgid "Property “%s� is not readable"
 msgstr "Proprietatea „%s� nu poate fi citită"
 
 #: ../gio/gdbusconnection.c:4289
 #, c-format
-msgid "Property '%s' is not writable"
+msgid "Property “%s� is not writable"
 msgstr "Proprietatea „%s� nu poate fi scrisă"
 
 #: ../gio/gdbusconnection.c:4309
 #, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+msgid "Error setting property “%s�: Expected type “%s� but got “%s�"
 msgstr ""
-"Eroare la setarea proprietății „%s�: Se aștepta tipul „%s�, dar s-a primit "
-"„%s�"
+"Eroare la stabilirea proprietății „%s�: Se aștepta tipul „%s�, dar s-a "
+"primit „%s�"
 
 #: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
-#: ../gio/gdbusconnection.c:6586
+#: ../gio/gdbusconnection.c:6591
 #, c-format
-msgid "No such interface '%s'"
+msgid "No such interface “%s�"
 msgstr "Nu există interfața „%s�"
 
-#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095
+#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7100
 #, c-format
-msgid "No such interface '%s' on object at path %s"
-msgstr "Nu există proprietatea „%s� în obiectul de la calea %s"
+msgid "No such interface “%s� on object at path %s"
+msgstr "Nu există interfața „%s� în obiectul de la calea %s"
 
 #: ../gio/gdbusconnection.c:4938
 #, c-format
-msgid "No such method '%s'"
+msgid "No such method “%s�"
 msgstr "Nu există metoda „%s�"
 
 #: ../gio/gdbusconnection.c:4969
 #, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
-msgstr "Tipul mesajului, „%s�, nu se potrivește cu cel așteptat „%s�"
+msgid "Type of message, “%s�, does not match expected type “%s�"
+msgstr "Tipul de mesaj, „%s�, nu se potrivește cu cel așteptat „%s�"
 
 #: ../gio/gdbusconnection.c:5167
 #, c-format
@@ -786,165 +711,143 @@ msgid "An object is already exported for the interface %s at %s"
 msgstr "Există deja un obiect exportat pentru interfața %s de la %s"
 
 #: ../gio/gdbusconnection.c:5393
-#, fuzzy, c-format
-#| msgid "Unable to create socket: %s"
+#, c-format
 msgid "Unable to retrieve property %s.%s"
-msgstr "Nu s-a putut crea socket-ul: %s"
+msgstr "Nu se poate obține proprietatea %s.%s"
 
 #: ../gio/gdbusconnection.c:5449
-#, fuzzy, c-format
-#| msgid "Unable to create socket: %s"
+#, c-format
 msgid "Unable to set property %s.%s"
-msgstr "Nu s-a putut crea socket-ul: %s"
+msgstr "Nu se poate stabili proprietatea %s.%s"
 
-#: ../gio/gdbusconnection.c:5625
+#: ../gio/gdbusconnection.c:5627
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Method “%s� returned type “%s�, but expected “%s�"
 msgstr "Metoda „%s� a întors tipul „%s�, dar se aștepta „%s�"
 
-#: ../gio/gdbusconnection.c:6697
+#: ../gio/gdbusconnection.c:6702
 #, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgid "Method “%s� on interface “%s� with signature “%s� does not exist"
 msgstr "Metoda „%s� din interfața „%s� cu semnătura „%s� nu există"
 
-#: ../gio/gdbusconnection.c:6818
+#: ../gio/gdbusconnection.c:6823
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Un subarbore este deja exporta pentru %s"
 
-#: ../gio/gdbusconnection.c:7146
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Nu s-a putut determina adresa magistralei din variabila de mediu "
-"DBUS_STARTER_BUS_TYPE - valoare necunoscută „%s�"
-
-#: ../gio/gdbusmessage.c:1246
+#: ../gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "tipul este NEVALID"
 
-#: ../gio/gdbusmessage.c:1257
+#: ../gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr ""
-"mesaj METHOD_CALL: unul din câmpurile de antet PATH sau MEMBER lipsește"
+"Mesaj METHOD_CALL: unul din câmpurile de antet PATH sau MEMBER lipsește"
 
-#: ../gio/gdbusmessage.c:1268
+#: ../gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
-msgstr "mesaj METHOD_RETURN: câmpul antet REPLY_SERIAL lipsește"
+msgstr "Mesaj METHOD_RETURN: câmpul antet REPLY_SERIAL lipsește"
 
-#: ../gio/gdbusmessage.c:1280
+#: ../gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr ""
-"mesaj METHOD_RETURN: unul din câmpurile de antet REPLY_SERIAL sau ERROR_NAME "
+"Mesaj de EROARE: unul din câmpurile de antet REPLY_SERIAL sau ERROR_NAME "
 "lipsește"
 
-#: ../gio/gdbusmessage.c:1293
+#: ../gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr ""
 "Mesaj SIGNAL: unul din câmpurile de antet PATH, INTERFACE sau MEMBER lipsește"
 
-#: ../gio/gdbusmessage.c:1301
+#: ../gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
 msgstr ""
-"mesaj SIGNAL: câmpul de antet PATH utilizează valoarea rezervată /org/"
+"Mesaj SIGNAL: câmpul de antet PATH utilizează valoarea rezervată /org/"
 "freedesktop/DBus/Local"
 
-#: ../gio/gdbusmessage.c:1309
+#: ../gio/gdbusmessage.c:1311
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
 msgstr ""
-"mesaj SIGNAL: câmpul de antet INTERFACE utilizează valoarea rezervată org."
+"Mesaj SIGNAL: câmpul de antet INTERFACE utilizează valoarea rezervată org."
 "freedesktop.DBus.Local"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:1359 ../gio/gdbusmessage.c:1419
+#, c-format
 msgid "Wanted to read %lu byte but only got %lu"
 msgid_plural "Wanted to read %lu bytes but only got %lu"
-msgstr[0] "S-a încercat să se citească %lu octeți, dar s-a întâlnit EOF"
-msgstr[1] "S-a încercat să se citească %lu octeți, dar s-a întâlnit EOF"
-msgstr[2] "S-a încercat să se citească %lu octeți, dar s-a întâlnit EOF"
+msgstr[0] "S-a încercat să se citească %lu octet, dar s-a primit doar %lu"
+msgstr[1] "S-a încercat să se citească %lu octeți, dar s-au primit doar %lu"
+msgstr[2] "S-a încercat să se citească %lu de octeți, dar s-au primit doar %lu"
 
-#: ../gio/gdbusmessage.c:1371
-#, fuzzy, c-format
-#| msgid "Expected NUL byte after the string '%s' but found byte %d"
+#: ../gio/gdbusmessage.c:1373
+#, c-format
 msgid "Expected NUL byte after the string “%s� but found byte %d"
-msgstr "Se aștepta un octet NUL după șirul „%s�, dar s-a octetul „%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'"
+msgstr "S-a așteptat un octet NUL după șirul „%s�, dar s-a găsit octetul %d"
+
+#: ../gio/gdbusmessage.c:1392
+#, 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 ""
-"Se aștepta un șir UTF-8 valid, dar s-au găsit octeți nevalizi la poziția %d "
-"(lungimea șirului este %d). Șirul UTF-8 valid până la acel punct a fost „%s�"
+"Se aștepta un șir UTF-8 valid, dar s-au găsit octeți nevalizi la decalajul "
+"%d (lungimea șirului este %d). Șirul UTF-8 valid până la acel punct a fost "
+"„%s�"
 
-#: ../gio/gdbusmessage.c:1589
-#, fuzzy, c-format
-#| msgid "Parsed value '%s' is not a valid D-Bus object path"
+#: ../gio/gdbusmessage.c:1595
+#, c-format
 msgid "Parsed value “%s� is not a valid D-Bus object path"
 msgstr "Valoarea parsată „%s� nu este o cale de obiect D-Bus validă"
 
-#: ../gio/gdbusmessage.c:1611
-#, fuzzy, c-format
-#| msgid "Parsed value '%s' is not a valid D-Bus signature"
+#: ../gio/gdbusmessage.c:1617
+#, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature"
 msgstr "Valoarea parsată „%s� nu este o semnătură D-Bus validă"
 
-#: ../gio/gdbusmessage.c:1658
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:1664
+#, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
 msgid_plural ""
 "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)."
 msgstr[0] ""
-"S-a întâlnit un vector de %u octeți. Lungimea maximă este de 2<<26 octeți "
-"(64 MiB)."
+"S-a întâlnit un șir cu lungimea de %u octet. Lungimea maximă este de 2<<26 "
+"de octeți (64 MiB)."
 msgstr[1] ""
-"S-a întâlnit un vector de %u octeți. Lungimea maximă este de 2<<26 octeți "
-"(64 MiB)."
+"S-a întâlnit un șir cu lungimea de %u octeți. Lungimea maximă este de 2<<26 "
+"de octeți (64 MiB)."
 msgstr[2] ""
-"S-a întâlnit un vector de %u octeți. Lungimea maximă este de 2<<26 octeți "
-"(64 MiB)."
+"S-a întâlnit un șir cu lungimea de %u de octeți. Lungimea maximă este de "
+"2<<26 de octeți (64 MiB)."
 
-#: ../gio/gdbusmessage.c:1678
+#: ../gio/gdbusmessage.c:1684
 #, 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 ""
+"S-a întâlnit un șir de tipul „a%c�, se aștepta să aibă o lungime un multiplu "
+"de %u octeți, dar s-a constatat că are o lungime de %u octeți"
 
-#: ../gio/gdbusmessage.c:1845
-#, fuzzy, c-format
-#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
+#: ../gio/gdbusmessage.c:1851
+#, c-format
 msgid "Parsed value “%s� for variant is not a valid D-Bus signature"
-msgstr "Valoarea parsată „%s� nu este o semnătură D-Bus validă"
+msgstr "Valoarea parsată „%s� pentru variantă nu este o semnătură D-Bus validă"
 
-#: ../gio/gdbusmessage.c:1869
-#, fuzzy, c-format
-#| msgid ""
-#| "Error deserializing GVariant with type string '%s' from the D-Bus wire "
-#| "format"
+#: ../gio/gdbusmessage.c:1875
+#, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s� from the D-Bus wire format"
 msgstr ""
-"Eroare la deserializarea GVariant cu șirul-tip „%s� din formatul de rețea D-"
-"Bus"
+"Eroare la deserializarea GVariant cu șirul de tipul „%s� din formatul de "
+"rețea D-Bus"
 
-#: ../gio/gdbusmessage.c:2053
-#, fuzzy, c-format
-#| msgid ""
-#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found "
-#| "value 0x%02x"
+#: ../gio/gdbusmessage.c:2057
+#, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l�) or 0x42 (“B�) but found value "
 "0x%02x"
@@ -952,115 +855,110 @@ msgstr ""
 "Valoare de endianness nevalidă. Se aștepta 0x6c („l�) sau 0x42 („B�), dar s-"
 "a găsit valoarea 0x%02x"
 
-#: ../gio/gdbusmessage.c:2066
+#: ../gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "Versiune majoră de protocol nevalidă. Se aștepta 1 dar s-a găsit %d"
 
-#: ../gio/gdbusmessage.c:2122
-#, fuzzy, c-format
-#| msgid "Signature header with signature '%s' found but message body is empty"
+#: ../gio/gdbusmessage.c:2126
+#, c-format
 msgid "Signature header with signature “%s� found but message body is empty"
-msgstr "S-a găsit un antet cu semnătura „%s�, dar corpul mesajului este vid"
+msgstr ""
+"S-a găsit un antet de semnătură cu semnătura „%s�, dar corpul mesajului este "
+"vid"
 
-#: ../gio/gdbusmessage.c:2136
-#, fuzzy, c-format
-#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
+#: ../gio/gdbusmessage.c:2140
+#, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature (for body)"
 msgstr "Valoarea parsată „%s� nu este o semnătură D-Bus validă (pentru corp)"
 
-#: ../gio/gdbusmessage.c:2166
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:2170
+#, c-format
 msgid "No signature header in message but the message body is %u byte"
 msgid_plural "No signature header in message but the message body is %u bytes"
 msgstr[0] ""
-"Niciun antet de semnătură în mesaj, dar corpul mesajului este de %u octeți"
+"Nu există niciun antet de semnătură în mesaj, dar corpul mesajului este de "
+"%u octet"
 msgstr[1] ""
-"Niciun antet de semnătură în mesaj, dar corpul mesajului este de %u octeți"
+"Nu există niciun antet de semnătură în mesaj, dar corpul mesajului este de "
+"%u octeți"
 msgstr[2] ""
-"Niciun antet de semnătură în mesaj, dar corpul mesajului este de %u octeți"
+"Nu există niciun antet de semnătură în mesaj, dar corpul mesajului este de "
+"%u de octeți"
 
-#: ../gio/gdbusmessage.c:2176
+#: ../gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
-msgstr "Nu se poate deserializa mesajul:"
+msgstr "Nu se poate deserializa mesajul: "
 
-#: ../gio/gdbusmessage.c:2517
-#, fuzzy, c-format
-#| msgid ""
-#| "Error serializing GVariant with type string '%s' to the D-Bus wire format"
+#: ../gio/gdbusmessage.c:2521
+#, c-format
 msgid ""
 "Error serializing GVariant with type string “%s� to the D-Bus wire format"
 msgstr ""
-"Eroare la serializarea GVariant cu șirul-tip „%s� în formatul de rețea D-Bus"
+"Eroare la serializarea GVariant cu șirul de tipul „%s� în formatul de rețea "
+"D-Bus"
 
-#: ../gio/gdbusmessage.c:2654
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:2658
+#, c-format
 msgid ""
-"Message has %d file descriptors but the header field indicates %d file "
-"descriptors"
-msgstr "Mesajul are %d fds, dar câmpul antet indică %d fds"
+"Number of file descriptors in message (%d) differs from header field (%d)"
+msgstr ""
+"Numărul de descriptori de fișier în mesaj (%d) diferă de câmpul de antet (%d)"
 
-#: ../gio/gdbusmessage.c:2662
+#: ../gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
-msgstr "Nu se poate serializa mesajul:"
+msgstr "Nu se poate serializa mesajul: "
 
-#: ../gio/gdbusmessage.c:2706
-#, fuzzy, c-format
-#| msgid "Message body has signature '%s' but there is no signature header"
+#: ../gio/gdbusmessage.c:2710
+#, c-format
 msgid "Message body has signature “%s� but there is no signature header"
 msgstr ""
 "Corpul mesajului are semnătura „%s�, dar nu există nicio semnătură de antet"
 
-#: ../gio/gdbusmessage.c:2716
-#, fuzzy, c-format
-#| msgid ""
-#| "Message body has type signature '%s' but signature in the header field is "
-#| "'%s'"
+#: ../gio/gdbusmessage.c:2720
+#, c-format
 msgid ""
 "Message body has type signature “%s� but signature in the header field is "
 "“%s�"
 msgstr ""
-"Corpul mesajului are semnătura „%s�, dar semnătura din câmpul antet este „%s�"
+"Corpul mesajului are semnătura „%s�, dar semnătura din câmpul de antet este "
+"„%s�"
 
-#: ../gio/gdbusmessage.c:2732
-#, fuzzy, c-format
-#| msgid "Message body is empty but signature in the header field is '(%s)'"
+#: ../gio/gdbusmessage.c:2736
+#, c-format
 msgid "Message body is empty but signature in the header field is “(%s)�"
-msgstr "Corpul mesajului este vid, dar semnătura din câmpul antet este „(%s)�"
+msgstr ""
+"Corpul mesajului este vid, dar semnătura din câmpul de antet este „(%s)�"
 
-#: ../gio/gdbusmessage.c:3285
-#, fuzzy, c-format
-#| msgid "Error return with body of type '%s'"
+#: ../gio/gdbusmessage.c:3289
+#, c-format
 msgid "Error return with body of type “%s�"
-msgstr "Rezultat de eroare cu corp de tipul „%s�"
+msgstr "Eroare la întoarcere cu corpul de tipul „%s�"
 
-#: ../gio/gdbusmessage.c:3293
+#: ../gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Rezultat de eroare cu corp vid"
 
 #: ../gio/gdbusprivate.c:2066
-#, fuzzy, c-format
-#| msgid "Unable to trash file: %s"
+#, c-format
 msgid "Unable to get Hardware profile: %s"
-msgstr "Nu s-a putut muta la coș fișierul: %s"
+msgstr "Nu se poate obține profilul hardware: %s"
 
 #: ../gio/gdbusprivate.c:2111
-#, fuzzy
-#| msgid "Unable to load /var/lib/dbus/machine-id: "
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
-msgstr "Nu s-a putut încărca /var/lib/dbus/machine-id: "
+msgstr "Nu se poate încărca /var/lib/dbus/machine-id sau /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1611
+#: ../gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
-msgstr "Eroare la apelul StartServiceByName pentru %s:"
+msgstr "Eroare la apelul StartServiceByName pentru %s: "
 
-#: ../gio/gdbusproxy.c:1634
+#: ../gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Răspuns neașteptat %d de la metoda StartServiceByName(\"%s\")"
 
-#: ../gio/gdbusproxy.c:2719 ../gio/gdbusproxy.c:2853
+#: ../gio/gdbusproxy.c:2726 ../gio/gdbusproxy.c:2860
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -1077,25 +975,22 @@ msgid "Cannot specify nonce file when creating a server"
 msgstr "Nu se poate specifica un fișier nonce când se creează un server"
 
 #: ../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 "Eroare la citirea fișierului nonce la „%s�: %s"
+msgstr "Eroare la scrierea fișierului nonce la „%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 "Șirul „%s� nu este un GUID D-Bus valid"
 
 #: ../gio/gdbusserver.c:1087
-#, fuzzy, c-format
-#| msgid "Cannot listen on unsupported transport '%s'"
+#, c-format
 msgid "Cannot listen on unsupported transport “%s�"
 msgstr "Nu se poate asculta pe transportul nesuportat „%s�"
 
 #: ../gio/gdbus-tool.c:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Commands:\n"
 "  help         Shows this information\n"
@@ -1108,353 +1003,344 @@ msgid ""
 "Use “%s COMMAND --help� to get help on each command.\n"
 msgstr ""
 "Comenzi:\n"
-"  help         Afișează aceste informații\n"
+"  help         Arată aceste informații\n"
 "  introspect   Introspectează un obiect la distanță\n"
 "  monitor      Monitorizează un obiect la distanță\n"
 "  call         Invocă o metodă pe un obiect la distanță\n"
+"  emit         Emite  un semnal\n"
+"  wait         Așteaptă apariția unui nume de magistrală\n"
 "\n"
-"Utilizați \"%s COMANDĂ --help\" pentru a primi ajutor pentru fiecare "
+"Utilizați \"%s COMANDĂ --help\" pentru a obține ajutor pentru fiecare "
 "comandă.\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
-#: ../gio/gdbus-tool.c:1510
+#: ../gio/gdbus-tool.c:185 ../gio/gdbus-tool.c:252 ../gio/gdbus-tool.c:324
+#: ../gio/gdbus-tool.c:348 ../gio/gdbus-tool.c:834 ../gio/gdbus-tool.c:1171
+#: ../gio/gdbus-tool.c:1613
 #, c-format
 msgid "Error: %s\n"
 msgstr "Eroare: %s\n"
 
-#: ../gio/gdbus-tool.c:176 ../gio/gdbus-tool.c:240 ../gio/gdbus-tool.c:1526
+#: ../gio/gdbus-tool.c:196 ../gio/gdbus-tool.c:265 ../gio/gdbus-tool.c:1629
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Eroare la parsarea introspecției XML: %s\n"
 
-#: ../gio/gdbus-tool.c:209
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:234
+#, c-format
 msgid "Error: %s is not a valid name\n"
-msgstr "Eroare: calea %s către obiect nu este validă\n"
+msgstr ""
+"Eroare: %s nu este un nume valid\n"
+"\n"
 
-#: ../gio/gdbus-tool.c:357
+#: ../gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Conectare la magistrala sistemului"
 
-#: ../gio/gdbus-tool.c:358
+#: ../gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Conectare la magistrala de sesiune"
 
-#: ../gio/gdbus-tool.c:359
+#: ../gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Conectare la adresa D-Bus dată"
 
-#: ../gio/gdbus-tool.c:369
+#: ../gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Opțiuni ale capătului conexiunii:"
 
-#: ../gio/gdbus-tool.c:370
+#: ../gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Opțiuni care specifică capătul conexiunii"
 
-#: ../gio/gdbus-tool.c:392
+#: ../gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Niciun capăt de conexiune specificat"
 
-#: ../gio/gdbus-tool.c:402
+#: ../gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Mai multe capete de conexiune specificate"
 
-#: ../gio/gdbus-tool.c:472
-#, fuzzy, c-format
-#| msgid ""
-#| "Warning: According to introspection data, interface '%s' does not exist\n"
+#: ../gio/gdbus-tool.c:497
+#, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s� does not exist\n"
 msgstr ""
-"Avertisment: Conform datelor de introspecție, interfața „%s� nu există\n"
+"Avertisment: conform datelor de introspecție, interfața „%s� nu există\n"
 
-#: ../gio/gdbus-tool.c:481
-#, fuzzy, c-format
-#| msgid ""
-#| "Warning: According to introspection data, method '%s' does not exist on "
-#| "interface '%s'\n"
+#: ../gio/gdbus-tool.c:506
+#, c-format
 msgid ""
 "Warning: According to introspection data, method “%s� does not exist on "
 "interface “%s�\n"
 msgstr ""
-"Avertisment: Conform datelor de introspecție, metoda „%s� nu există în "
+"Avertisment: conform datelor de introspecție, metoda „%s� nu există în "
 "interfața „%s�\n"
 
-#: ../gio/gdbus-tool.c:543
+#: ../gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
-msgstr ""
+msgstr "Destinația opțională pentru semnal (nume unic)"
 
-#: ../gio/gdbus-tool.c:544
-#, fuzzy
+#: ../gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
-msgstr "Calea către obiectul de monitorizat"
+msgstr "Calea obiectului pe care se emite semnalul"
 
-#: ../gio/gdbus-tool.c:545
-#, fuzzy
+#: ../gio/gdbus-tool.c:570
 msgid "Signal and interface name"
-msgstr "Metoda și numele interfeței"
+msgstr "Numele semnalului și interfeței"
 
-#: ../gio/gdbus-tool.c:579
+#: ../gio/gdbus-tool.c:603
 msgid "Emit a signal."
-msgstr ""
+msgstr "Emite un semnal."
 
-#: ../gio/gdbus-tool.c:613 ../gio/gdbus-tool.c:858 ../gio/gdbus-tool.c:1616
-#: ../gio/gdbus-tool.c:1851 ../gio/gdbus-tool.c:2067
+#: ../gio/gdbus-tool.c:658 ../gio/gdbus-tool.c:965 ../gio/gdbus-tool.c:1715
+#: ../gio/gdbus-tool.c:1944 ../gio/gdbus-tool.c:2164
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Eroare la conectare: %s\n"
 
-#: ../gio/gdbus-tool.c:625
-#, fuzzy, c-format
-msgid "Error: object path not specified.\n"
+#: ../gio/gdbus-tool.c:678
+#, c-format
+msgid "Error: %s is not a valid unique bus name.\n"
+msgstr "Eroare: %s nu este un nume de magistrală unic valid.\n"
+
+#: ../gio/gdbus-tool.c:697 ../gio/gdbus-tool.c:1008 ../gio/gdbus-tool.c:1758
+#, c-format
+msgid "Error: Object path is not specified\n"
 msgstr "Eroare: calea către obiect nu a fost specificată\n"
 
-#: ../gio/gdbus-tool.c:630 ../gio/gdbus-tool.c:925 ../gio/gdbus-tool.c:1681
-#: ../gio/gdbus-tool.c:1917
+#: ../gio/gdbus-tool.c:720 ../gio/gdbus-tool.c:1028 ../gio/gdbus-tool.c:1778
+#: ../gio/gdbus-tool.c:2015
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Eroare: calea %s către obiect nu este validă\n"
 
-#: ../gio/gdbus-tool.c:636
-#, fuzzy, c-format
-msgid "Error: signal not specified.\n"
-msgstr "Eroare: destinația nu a fost specificată\n"
+#: ../gio/gdbus-tool.c:740
+#, c-format
+msgid "Error: Signal name is not specified\n"
+msgstr "Eroare: numele de semnal nu a fost specificat\n"
 
-#: ../gio/gdbus-tool.c:643
-#, fuzzy, c-format
-msgid "Error: signal must be the fully-qualified name.\n"
-msgstr "Eroare: destinația nu a fost specificată\n"
+#: ../gio/gdbus-tool.c:754
+#, c-format
+msgid "Error: Signal name “%s� is invalid\n"
+msgstr ""
+"Eroare: numele de semnal „%s� nu este valid\n"
+"\n"
 
-#: ../gio/gdbus-tool.c:651
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:766
+#, c-format
 msgid "Error: %s is not a valid interface name\n"
-msgstr "Eroare: calea %s către obiect nu este validă\n"
+msgstr "Eroare: %s nu este un nume de interfață valid\n"
 
-#: ../gio/gdbus-tool.c:657
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:772
+#, c-format
 msgid "Error: %s is not a valid member name\n"
-msgstr "Eroare: calea %s către obiect nu este validă\n"
-
-#: ../gio/gdbus-tool.c:663
-#, fuzzy, c-format
-msgid "Error: %s is not a valid unique bus name.\n"
-msgstr "Eroare: calea %s către obiect nu este validă\n"
+msgstr "Eroare: %s nu este un nume de membru valid\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:700 ../gio/gdbus-tool.c:1037
+#: ../gio/gdbus-tool.c:809 ../gio/gdbus-tool.c:1140
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Eroare la parsarea parametrului %d: %s\n"
 
-#: ../gio/gdbus-tool.c:732
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:841
+#, c-format
 msgid "Error flushing connection: %s\n"
-msgstr "Eroare la acceptarea conexiunii: %s"
+msgstr "Eroare la golirea conexiunii: %s\n"
 
-#: ../gio/gdbus-tool.c:759
+#: ../gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Numele destinației pe care se va invoca metoda"
 
-#: ../gio/gdbus-tool.c:760
+#: ../gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Calea către obiectul pe care se va invoca metoda"
 
-#: ../gio/gdbus-tool.c:761
+#: ../gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Metoda și numele interfeței"
 
-#: ../gio/gdbus-tool.c:762
-#, fuzzy
+#: ../gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
-msgstr "Limita de timp a fost atinsă"
+msgstr "Limita de timp în secunde"
 
-#: ../gio/gdbus-tool.c:803
+#: ../gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Invocă o metodă pe un obiect la distanță."
 
-#: ../gio/gdbus-tool.c:878 ../gio/gdbus-tool.c:1635 ../gio/gdbus-tool.c:1870
+#: ../gio/gdbus-tool.c:982 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1969
 #, c-format
 msgid "Error: Destination is not specified\n"
 msgstr "Eroare: destinația nu a fost specificată\n"
 
-#: ../gio/gdbus-tool.c:890 ../gio/gdbus-tool.c:1652 ../gio/gdbus-tool.c:1882
-#, fuzzy, c-format
-msgid "Error: %s is not a valid bus name\n"
-msgstr "Eroare: calea %s către obiect nu este validă\n"
-
-#: ../gio/gdbus-tool.c:905 ../gio/gdbus-tool.c:1661
+#: ../gio/gdbus-tool.c:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
 #, c-format
-msgid "Error: Object path is not specified\n"
-msgstr "Eroare: calea către obiect nu a fost specificată\n"
+msgid "Error: %s is not a valid bus name\n"
+msgstr ""
+"Eroare: %s nu este un nume de magistrală valid\n"
+"\n"
 
-#: ../gio/gdbus-tool.c:940
+#: ../gio/gdbus-tool.c:1043
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "Eroare: numele metodei nu a fost specificat\n"
 
-#: ../gio/gdbus-tool.c:951
-#, fuzzy, c-format
-#| msgid "Error: Method name '%s' is invalid\n"
+#: ../gio/gdbus-tool.c:1054
+#, c-format
 msgid "Error: Method name “%s� is invalid\n"
-msgstr "Eroare: numele metodei „%s� nu este valid\n"
+msgstr ""
+"Eroare: numele de metodă „%s� nu este valid\n"
+"\n"
 
-#: ../gio/gdbus-tool.c:1029
-#, fuzzy, c-format
-#| msgid "Error parsing parameter %d of type '%s': %s\n"
+#: ../gio/gdbus-tool.c:1132
+#, c-format
 msgid "Error parsing parameter %d of type “%s�: %s\n"
 msgstr "Eroare la parsarea parametrului %d cu tipul „%s�: %s\n"
 
-#: ../gio/gdbus-tool.c:1473
+#: ../gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Numele destinației de introspectat"
 
-#: ../gio/gdbus-tool.c:1474
+#: ../gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "Calea obiectului de introspectat"
 
-#: ../gio/gdbus-tool.c:1475
+#: ../gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Afișează XML"
 
-#: ../gio/gdbus-tool.c:1476
+#: ../gio/gdbus-tool.c:1579
 msgid "Introspect children"
-msgstr ""
+msgstr "Introspectează inferiorii"
 
-#: ../gio/gdbus-tool.c:1477
+#: ../gio/gdbus-tool.c:1580
 msgid "Only print properties"
-msgstr ""
+msgstr "Tipărește doar proprietățile"
 
-#: ../gio/gdbus-tool.c:1568
+#: ../gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Introspectează un obiect la distanță."
 
-#: ../gio/gdbus-tool.c:1773
+#: ../gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Numele destinației de monitorizat"
 
-#: ../gio/gdbus-tool.c:1774
+#: ../gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Calea către obiectul de monitorizat"
 
-#: ../gio/gdbus-tool.c:1803
+#: ../gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Monitorizează un obiect la distanță."
 
-#: ../gio/gdbus-tool.c:1980
+#: ../gio/gdbus-tool.c:1954
+#, c-format
+msgid "Error: can’t monitor a non-message-bus connection\n"
+msgstr "Eroare: nu se poate monitoriza o conexiune non-magistrală-mesaj\n"
+
+#: ../gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr ""
+"Serviciu de activat înainte de a-l aștepta pe celălalt (nume bine cunoscut)"
 
-#: ../gio/gdbus-tool.c:1983
+#: ../gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
 msgstr ""
+"Limita de timp de așteptat înainte de a ieși cu o eroare (secunde); 0 pentru "
+"nicio limită de timp (implicit)"
 
-#: ../gio/gdbus-tool.c:2031
+#: ../gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
-msgstr ""
+msgstr "[OPȚIUNE…] NUME-MAGISTRALĂ"
 
-#: ../gio/gdbus-tool.c:2033
+#: ../gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
-msgstr ""
+msgstr "Așteaptă apariția unui nume de magistrală."
 
-#: ../gio/gdbus-tool.c:2109
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:2206
+#, c-format
 msgid "Error: A service to activate for must be specified.\n"
-msgstr "Eroare: calea către obiect nu a fost specificată\n"
+msgstr "Eroare: trebuie specificat un serviciu pentru care să se activeze.\n"
 
-#: ../gio/gdbus-tool.c:2114
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:2211
+#, c-format
 msgid "Error: A service to wait for must be specified.\n"
-msgstr "Eroare: calea către obiect nu a fost specificată\n"
+msgstr "Eroare: trebuie specificat un serviciu după care să se aștepte.\n"
 
-#: ../gio/gdbus-tool.c:2119
+#: ../gio/gdbus-tool.c:2216
 #, c-format
 msgid "Error: Too many arguments.\n"
-msgstr ""
+msgstr "Eroare: prea multe argumente.\n"
 
-#: ../gio/gdbus-tool.c:2127 ../gio/gdbus-tool.c:2134
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:2224 ../gio/gdbus-tool.c:2231
+#, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
-msgstr "Eroare: calea %s către obiect nu este validă\n"
+msgstr "Eroare: %s nu este un nume de magistrală popular valid.\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4531
+#: ../gio/gdesktopappinfo.c:2023 ../gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Nedenumit"
 
-#: ../gio/gdesktopappinfo.c:2411
-#, fuzzy
-#| msgid "Desktop file didn't specify Exec field"
+#: ../gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
-msgstr "Fișierul desktop nu are specificat un câmp „Exec�"
+msgstr "Fișierul desktop nu a specificat un câmp Exec"
 
-#: ../gio/gdesktopappinfo.c:2694
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Nu s-a găsit un terminal pentru pornirea aplicației"
 
-#: ../gio/gdesktopappinfo.c:3127
-#, fuzzy, c-format
-#| msgid "Can't create user application configuration folder %s: %s"
+#: ../gio/gdesktopappinfo.c:3202
+#, c-format
 msgid "Can’t create user application configuration folder %s: %s"
-msgstr "Nu se poate crea dosarul pentru opțiunile aplicației %s: %s"
+msgstr ""
+"Nu se poate crea dosarul de configurare pentru aplicațiile utilizatorului "
+"%s: %s"
 
-#: ../gio/gdesktopappinfo.c:3131
-#, fuzzy, c-format
-#| msgid "Can't create user MIME configuration folder %s: %s"
+#: ../gio/gdesktopappinfo.c:3206
+#, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
-msgstr "Nu se poate crea dosarul pentru opțiunile MIME %s: %s"
+msgstr "Nu se poate crea dosarul de configurare MIME al utilizatorului %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3371 ../gio/gdesktopappinfo.c:3395
+#: ../gio/gdesktopappinfo.c:3446 ../gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
-msgstr ""
+msgstr "Informațiile despre aplicație nu au un indentificator"
 
-#: ../gio/gdesktopappinfo.c:3629
-#, fuzzy, c-format
-#| msgid "Can't create user desktop file %s"
+#: ../gio/gdesktopappinfo.c:3704
+#, c-format
 msgid "Can’t create user desktop file %s"
-msgstr "Nu se poate crea fișierul desktop %s"
+msgstr "Nu se poate crea fișierul desktop al utilizatorului %s"
 
-#: ../gio/gdesktopappinfo.c:3763
+#: ../gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Definiție personalizată pentru %s"
 
 #: ../gio/gdrive.c:417
-#, fuzzy
-#| msgid "drive doesn't implement eject"
 msgid "drive doesn’t implement eject"
-msgstr "unitatea nu poate ejecta discul"
+msgstr "unitatea nu implementează scoaterea"
 
 #. Translators: This is an error
 #. * 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 "unitatea nu implementează „eject� sau „eject_with_operation�"
+msgstr "unitatea nu implementează comenzile eject sau eject_with_operation"
 
 #: ../gio/gdrive.c:571
-#, fuzzy
-#| msgid "drive doesn't implement polling for media"
 msgid "drive doesn’t implement polling for media"
-msgstr "unitatea nu poate verifica periodic pentru medii de stocare noi"
+msgstr ""
+"unitatea nu implementează verificarea periodică pentru medii de stocare noi"
 
-#: ../gio/gdrive.c:776
-#, fuzzy
-#| msgid "drive doesn't implement start"
+#: ../gio/gdrive.c:778
 msgid "drive doesn’t implement start"
-msgstr "unitatea nu implementează comanda „start�"
+msgstr "unitatea nu implementează comanda start"
 
-#: ../gio/gdrive.c:878
-#, fuzzy
-#| msgid "drive doesn't implement stop"
+#: ../gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
-msgstr "unitatea nu implementează comanda „stop�"
+msgstr "unitatea nu implementează comanda stop"
 
 #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
 #: ../gio/gdummytlsbackend.c:509
@@ -1462,45 +1348,41 @@ msgid "TLS support is not available"
 msgstr "Suportul TLS nu este disponibil"
 
 #: ../gio/gdummytlsbackend.c:419
-#, fuzzy
-#| msgid "TLS support is not available"
 msgid "DTLS support is not available"
-msgstr "Suportul TLS nu este disponibil"
+msgstr "Suportul DTLS nu este disponibil"
 
 #: ../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 "Nu se poate gestiona versiunea %d a codării GEmblem"
 
 #: ../gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
-msgstr "Număr de elemente greșit formatat (%d) în codarea GEmblem"
+msgstr "Număr de jetoane formatat eronat (%d) în codarea 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 "Nu se poate gestiona versiunea %d a codării GEmblemedIcon"
 
 #: ../gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
-msgstr "Număr de elemente greșit formatat (%d) în codarea GEmblemedIcon"
+msgstr "Număr de jetoane formatat eronat (%d) în codarea GEmblemedIcon"
 
 #: ../gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Se aștepta un GEmblem pentru 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: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/gfile.c:1076 ../gio/gfile.c:1314 ../gio/gfile.c:1452
+#: ../gio/gfile.c:1690 ../gio/gfile.c:1745 ../gio/gfile.c:1803
+#: ../gio/gfile.c:1887 ../gio/gfile.c:1944 ../gio/gfile.c:2008
+#: ../gio/gfile.c:2063 ../gio/gfile.c:3738 ../gio/gfile.c:3793
+#: ../gio/gfile.c:4029 ../gio/gfile.c:4071 ../gio/gfile.c:4539
+#: ../gio/gfile.c:4950 ../gio/gfile.c:5035 ../gio/gfile.c:5125
+#: ../gio/gfile.c:5222 ../gio/gfile.c:5309 ../gio/gfile.c:5410
+#: ../gio/gfile.c:7988 ../gio/gfile.c:8078 ../gio/gfile.c:8162
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Operațiune neimplementată"
@@ -1509,83 +1391,73 @@ msgstr "Operațiune neimplementată"
 #. * trying to find the enclosing (user visible)
 #. * mount of a file, but none exists.
 #.
-#: ../gio/gfile.c:1468
+#: ../gio/gfile.c:1575
 msgid "Containing mount does not exist"
 msgstr "Montarea conținută nu există"
 
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2377
-#, fuzzy
-#| msgid "Can't copy over directory"
+#: ../gio/gfile.c:2622 ../gio/glocalfile.c:2390
 msgid "Can’t copy over directory"
 msgstr "Nu se poate copia peste director"
 
-#: ../gio/gfile.c:2575
-#, fuzzy
-#| msgid "Can't copy directory over directory"
+#: ../gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
-msgstr "Nu se poate copia un director peste un alt director"
+msgstr "Nu se poate copia un director peste alt director"
 
-#: ../gio/gfile.c:2583
+#: ../gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Fișierul destinație există deja"
 
-#: ../gio/gfile.c:2602
-#, fuzzy
-#| msgid "Can't recursively copy directory"
+#: ../gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Nu se poate copia recursiv directorul"
 
-#: ../gio/gfile.c:2877
+#: ../gio/gfile.c:2984
 msgid "Splice not supported"
-msgstr "Nu există suport pentru funcția „splice�"
+msgstr "Nu există suport pentru funcția splice"
 
-#: ../gio/gfile.c:2881
+#: ../gio/gfile.c:2988 ../gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Eroare la aplicarea funcției „splice� fișierului: %s"
 
-#: ../gio/gfile.c:3013
-#, fuzzy
-#| msgid "Move between mounts not supported"
+#: ../gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
-msgstr ""
-"Operațiunea de mutare între două dispozitive montate nu este implementată"
+msgstr "Copierea (reflink/clonarea) între două montări nu este suportată"
 
-#: ../gio/gfile.c:3017
+#: ../gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr ""
+"Copierea (legătura de referință/clonarea) nu este suportată sau nu este "
+"validă"
 
-#: ../gio/gfile.c:3022
+#: ../gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr ""
+"Copierea (legătura de referință/clonarea) nu este suportată sau nu a "
+"funcționat"
 
-#: ../gio/gfile.c:3085
-#, fuzzy
-#| msgid "Can't copy special file"
+#: ../gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Nu se poate copia fișierul special"
 
-#: ../gio/gfile.c:3883
+#: ../gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "S-a primit o valoare incorectă pentru legătura simbolică"
 
-#: ../gio/gfile.c:4044
+#: ../gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Nu există o implementare pentru coșul de gunoi"
 
-#: ../gio/gfile.c:4156
-#, fuzzy, c-format
-#| msgid "File names cannot contain '%c'"
+#: ../gio/gfile.c:4292
+#, c-format
 msgid "File names cannot contain “%c�"
 msgstr "Numele de fișiere nu pot conține „%c�"
 
-#: ../gio/gfile.c:6602 ../gio/gvolume.c:363
-#, fuzzy
-#| msgid "volume doesn't implement mount"
+#: ../gio/gfile.c:6773 ../gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "volumul nu implementează montarea"
 
-#: ../gio/gfile.c:6711
+#: ../gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "Nu există o aplicație înregistrată pentru deschiderea acestui fișier"
 
@@ -1603,22 +1475,19 @@ msgid "File enumerator is already closed"
 msgstr "Enumeratorul fișierului este deja închis"
 
 #: ../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 "Nu se poate gestiona versiunea %d a codării GFileIcon"
 
 #: ../gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
-msgstr "Date de input malformate pentru GFileIcon"
+msgstr "Date de intrare eronate pentru 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 "Fluxul nu implementează „query_info�"
+msgstr "Fluxul nu suportă query_info"
 
 #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
 #: ../gio/gfileoutputstream.c:371
@@ -1634,37 +1503,34 @@ msgid "Truncate not supported on stream"
 msgstr "Trunchierea fluxului nu este implementată"
 
 #: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
-#: ../glib/gconvert.c:1650
+#: ../glib/gconvert.c:1786
 msgid "Invalid hostname"
 msgstr "Nume nevalid"
 
 #: ../gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
-msgstr ""
+msgstr "Răspuns proxy HTTP greșit"
 
 #: ../gio/ghttpproxy.c:159
-#, fuzzy
-#| msgid "The connection is closed"
 msgid "HTTP proxy connection not allowed"
-msgstr "Conexiunea este închisă"
+msgstr "Conexiunea proxy HTTP nu este permisă"
 
 #: ../gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
-msgstr ""
+msgstr "A eșuat autentificarea la proxy-ul HTTP"
 
 #: ../gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
-msgstr ""
+msgstr "Este necesară autentificarea la proxy-ul HTTP"
 
 #: ../gio/ghttpproxy.c:171
-#, fuzzy, c-format
-#| msgid "The connection is closed"
+#, c-format
 msgid "HTTP proxy connection failed: %i"
-msgstr "Conexiunea este închisă"
+msgstr "Conexiunea proxy HTTP a eșuat: %i"
 
 #: ../gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
-msgstr ""
+msgstr "Conexiunea la serverul proxy HTTP s-a închis în mod neașteptat."
 
 #: ../gio/gicon.c:290
 #, c-format
@@ -1689,7 +1555,7 @@ msgstr "Tipul %s nu este clasificat"
 #: ../gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
-msgstr "Număr malformat de versiune: %s"
+msgstr "Număr de versiune eronat: %s"
 
 #: ../gio/gicon.c:359
 #, c-format
@@ -1697,31 +1563,29 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Tipul %s nu implementează from_tokens() în interfața GIcon"
 
 #: ../gio/gicon.c:461
-#, fuzzy
-#| msgid "Can't handle the supplied version the icon encoding"
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Nu se poate gestiona versiunea furnizată pentru codarea iconiței"
 
 #: ../gio/ginetaddressmask.c:182
 msgid "No address specified"
-msgstr ""
+msgstr "Nu s-a specificat o adresă"
 
 #: ../gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
-msgstr ""
+msgstr "Lungimea %u este prea mare pentru adresă"
 
 #: ../gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
-msgstr ""
+msgstr "Adresa are biți stabiliți peste lungimea prefixului"
 
 #: ../gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s� as IP address mask"
-msgstr ""
+msgstr "Nu s-a putut parsa „%s� ca mască de adresă IP"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218
+#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:220
 msgid "Not enough space for socket address"
 msgstr "Spațiu insuficient pentru adresa socket-ului"
 
@@ -1730,10 +1594,8 @@ msgid "Unsupported socket address"
 msgstr "Adresă nesuportată de socket"
 
 #: ../gio/ginputstream.c:188
-#, fuzzy
-#| msgid "Input stream doesn't implement read"
 msgid "Input stream doesn’t implement read"
-msgstr "Fluxul de input nu are implementată o funcție de citire"
+msgstr "Fluxul de intrare nu implementează citirea"
 
 #. Translators: This is an error you get if there is already an
 #. * operation running against this stream when you try to start
@@ -1742,21 +1604,21 @@ msgstr "Fluxul de input nu are implementată o funcție de citire"
 #. * already an operation running against this stream when
 #. * you try to start one
 #: ../gio/ginputstream.c:1218 ../gio/giostream.c:310
-#: ../gio/goutputstream.c:1670
+#: ../gio/goutputstream.c:1671
 msgid "Stream has outstanding operation"
 msgstr "Asupra fluxului se execută deja o operațiune"
 
 #: ../gio/gio-tool.c:160
 msgid "Copy with file"
-msgstr ""
+msgstr "Copiază cu fișier"
 
 #: ../gio/gio-tool.c:164
 msgid "Keep with file when moved"
-msgstr ""
+msgstr "Păstrează cu fișierul când este mutat"
 
 #: ../gio/gio-tool.c:205
 msgid "“version� takes no arguments"
-msgstr ""
+msgstr "„version� nu ia argumente"
 
 #: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:857
 msgid "Usage:"
@@ -1764,108 +1626,100 @@ msgstr "Utilizare:"
 
 #: ../gio/gio-tool.c:210
 msgid "Print version information and exit."
-msgstr ""
-
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr ""
+msgstr "Tipărește informația versiunii și ieși."
 
 #: ../gio/gio-tool.c:226
 msgid "Commands:"
-msgstr ""
+msgstr "Comenzi:"
 
 #: ../gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
-msgstr ""
+msgstr "Concatenează fișierele la ieșirea standard"
 
 #: ../gio/gio-tool.c:230
 msgid "Copy one or more files"
-msgstr ""
+msgstr "Copiază unul sau mai multe fișiere"
 
 #: ../gio/gio-tool.c:231
 msgid "Show information about locations"
-msgstr ""
+msgstr "Arată informațiile despre locații"
 
 #: ../gio/gio-tool.c:232
 msgid "List the contents of locations"
-msgstr ""
+msgstr "Listează conținuturile locațiilor"
 
 #: ../gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
-msgstr ""
+msgstr "Obține sau stabilește operatorul pentru un tip mime"
 
 #: ../gio/gio-tool.c:234
-#, fuzzy
-#| msgid "Can't open directory"
 msgid "Create directories"
-msgstr "Nu se poate deschide directorul"
+msgstr "Creează directoare"
 
 #: ../gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
-msgstr ""
+msgstr "Monitorizează fișierele și directoarele pentru modificări"
 
 #: ../gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
-msgstr ""
+msgstr "Montează sau demontează locațiile"
 
 #: ../gio/gio-tool.c:237
 msgid "Move one or more files"
-msgstr ""
+msgstr "Mută unul sau mai multe fișiere"
 
 #: ../gio/gio-tool.c:238
 msgid "Open files with the default application"
-msgstr ""
+msgstr "Deschide fișierele cu aplicația implicită"
 
 #: ../gio/gio-tool.c:239
 msgid "Rename a file"
-msgstr ""
+msgstr "Redenumește un fișier"
 
 #: ../gio/gio-tool.c:240
 msgid "Delete one or more files"
-msgstr ""
+msgstr "Șterge unul sau mai multe fișiere"
 
 #: ../gio/gio-tool.c:241
 msgid "Read from standard input and save"
-msgstr ""
+msgstr "Citește de la intrarea standard și salvează"
 
 #: ../gio/gio-tool.c:242
 msgid "Set a file attribute"
-msgstr ""
+msgstr "Stabilește un atribut de fișier"
 
 #: ../gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
-msgstr ""
+msgstr "Mută fișiere sau directoare la gunoi"
 
 #: ../gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
-msgstr ""
+msgstr "Listează conținuturile locațiilor într-un arbore"
 
 #: ../gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
-msgstr ""
+msgstr "Utilizați %s pentru a obține ajutor detaliat.\n"
 
 #: ../gio/gio-tool-cat.c:87
-#, fuzzy
-#| msgid "Error writing to file: %s"
 msgid "Error writing to stdout"
-msgstr "Eroare la scrierea în fișier: %s"
+msgstr "Eroare la scrierea la stdout"
 
 #. Translators: commandline placeholder
 #: ../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
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
-#: ../gio/gio-tool-open.c:45 ../gio/gio-tool-remove.c:48
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1235
+#: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
 msgid "LOCATION"
-msgstr ""
+msgstr "LOCAÈšIE"
 
 #: ../gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
-msgstr ""
+msgstr "Concatenează fișierele și tipărește la ieșirea standard."
 
 #: ../gio/gio-tool-cat.c:140
 msgid ""
@@ -1873,61 +1727,63 @@ msgid ""
 "locations instead of local files: for example, you can use something\n"
 "like smb://server/resource/file.txt as location."
 msgstr ""
+"gio cat funcționează exact ca utilitatea cat tradițională, dar utilizând "
+"locații\n"
+"GIO în loc de fișiere locale: de exemplu, puteți să utilizați ceva "
+"asemănător\n"
+"cu smb://server/resource/file.txt ca locație."
 
 #: ../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
+#: ../gio/gio-tool-mount.c:1285 ../gio/gio-tool-open.c:139
+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
 msgid "No locations given"
-msgstr ""
+msgstr "Nu s-au furnizat locații"
 
 #: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38
-#, fuzzy
-#| msgid "Target file is a directory"
 msgid "No target directory"
-msgstr "Fișierul destinație este un director"
+msgstr "Nu este niciun director țintă"
 
 #: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39
 msgid "Show progress"
-msgstr ""
+msgstr "Arată progresul"
 
 #: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40
 msgid "Prompt before overwrite"
-msgstr ""
+msgstr "Solicită înainte de suprascriere"
 
 #: ../gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
-msgstr ""
+msgstr "Păstrează toate atributele"
 
 #: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
 #: ../gio/gio-tool-save.c:49
-#, fuzzy
-#| msgid "Backup file creation failed"
 msgid "Backup existing destination files"
-msgstr "Crearea fișierului de rezervă a eșuat"
+msgstr "Creează o copie de rezervă a fișierelor destinație existente"
 
 #: ../gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
-msgstr ""
+msgstr "Nu urmări niciodată legăturile simbolice"
 
 #: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67
 #, c-format
 msgid "Transferred %s out of %s (%s/s)"
-msgstr ""
+msgstr "Transferat %s din %s (%s/s)"
 
 #. Translators: commandline placeholder
 #: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
 msgid "SOURCE"
-msgstr ""
+msgstr "SURSÄ‚"
 
 #. Translators: commandline placeholder
 #: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
 #: ../gio/gio-tool-save.c:160
 msgid "DESTINATION"
-msgstr ""
+msgstr "DESTINAÈšIE"
 
 #: ../gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
-msgstr ""
+msgstr "Copiază unul sau mai multe fișiere de la SURSĂ la DESTINAȚIE."
 
 #: ../gio/gio-tool-copy.c:105
 msgid ""
@@ -1935,96 +1791,97 @@ msgid ""
 "locations instead of local files: for example, you can use something\n"
 "like smb://server/resource/file.txt as location."
 msgstr ""
+"gio copy funcționează exact ca utilitatea cp tradițională, dar utilizând "
+"locații\n"
+"GIO în loc de fișiere locale: de exemplu, puteți să utilizați ceva "
+"asemănător\n"
+"cu smb://server/resource/file.txt ca locație."
 
 #: ../gio/gio-tool-copy.c:147
-#, fuzzy, c-format
-#| msgid "Destination name to introspect"
+#, c-format
 msgid "Destination %s is not a directory"
-msgstr "Numele destinației de introspectat"
+msgstr "Destinația %s nu este un director"
 
 #: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185
 #, c-format
 msgid "%s: overwrite “%s�? "
-msgstr ""
+msgstr "%s: se suprascrie „%s�? "
 
 #: ../gio/gio-tool-info.c:34
 msgid "List writable attributes"
-msgstr ""
+msgstr "Listează atributele inscripționabile"
 
 #: ../gio/gio-tool-info.c:35
-#, fuzzy
-#| msgid "Error getting filesystem info: %s"
 msgid "Get file system info"
-msgstr "Eroare la citirea detaliilor sistemului de fișiere: %s"
+msgstr "Obține informațiile sistemului de fișiere"
 
 #: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
 msgid "The attributes to get"
-msgstr ""
+msgstr "Atributele de obținut"
 
 #: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
 msgid "ATTRIBUTES"
-msgstr ""
+msgstr "ATRIBUTE"
 
 #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
 msgid "Don’t follow symbolic links"
-msgstr ""
+msgstr "Nu urmări legăturile simbolice"
 
 #: ../gio/gio-tool-info.c:75
 #, c-format
 msgid "attributes:\n"
-msgstr ""
+msgstr "atribute:\n"
 
 #. Translators: This is a noun and represents and attribute of a file
 #: ../gio/gio-tool-info.c:127
 #, c-format
 msgid "display name: %s\n"
-msgstr ""
+msgstr "nume de afișaj: %s\n"
 
 #. Translators: This is a noun and represents and attribute of a file
 #: ../gio/gio-tool-info.c:132
 #, c-format
 msgid "edit name: %s\n"
-msgstr ""
+msgstr "editează numele: %s\n"
 
 #: ../gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
-msgstr ""
+msgstr "nume: %s\n"
 
 #: ../gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
-msgstr ""
+msgstr "tip: %s\n"
 
 #: ../gio/gio-tool-info.c:151
 #, c-format
 msgid "size: "
-msgstr ""
+msgstr "dimensiune: "
 
 #: ../gio/gio-tool-info.c:156
 #, c-format
 msgid "hidden\n"
-msgstr ""
+msgstr "ascuns\n"
 
 #: ../gio/gio-tool-info.c:159
-#, fuzzy, c-format
-#| msgid "Error: %s\n"
+#, c-format
 msgid "uri: %s\n"
-msgstr "Eroare: %s\n"
+msgstr "uri: %s\n"
 
 #: ../gio/gio-tool-info.c:228
 #, c-format
 msgid "Settable attributes:\n"
-msgstr ""
+msgstr "Atribute care se pot stabili:\n"
 
 #: ../gio/gio-tool-info.c:252
 #, c-format
 msgid "Writable attribute namespaces:\n"
-msgstr ""
+msgstr "Spații de nume de atribut inscripționabile:\n"
 
 #: ../gio/gio-tool-info.c:287
 msgid "Show information about locations."
-msgstr ""
+msgstr "Arată informațiile despre locații."
 
 #: ../gio/gio-tool-info.c:289
 msgid ""
@@ -2034,22 +1891,30 @@ msgid ""
 "be specified with their GIO name, e.g. standard::icon, or just by\n"
 "namespace, e.g. unix, or by “*�, which matches all attributes"
 msgstr ""
+"gio info funcționează exact ca utilitatea ls tradițională, dar utilizând "
+"locații\n"
+"GIO în loc de fișiere locale: de exemplu, puteți să utilizați ceva "
+"asemănător\n"
+"cu smb://server/resource/file.txt ca locație. Atributele de fișier pot fi\n"
+"specificate cu numele lor GIO, ex. standard:icon, sau doar prin\n"
+"spațiul de nume, ex. unix, sau prin „*�, care se potrivește cu toate "
+"atributele"
 
 #: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
 msgid "Show hidden files"
-msgstr ""
+msgstr "Arată fișierele ascunse"
 
 #: ../gio/gio-tool-list.c:37
 msgid "Use a long listing format"
-msgstr ""
+msgstr "Utilizează un format de listare lung"
 
 #: ../gio/gio-tool-list.c:39
 msgid "Print full URIs"
-msgstr ""
+msgstr "Tipărește URI-uri complete"
 
 #: ../gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
-msgstr ""
+msgstr "Listează conținuturile locațiilor."
 
 #: ../gio/gio-tool-list.c:172
 msgid ""
@@ -2058,19 +1923,25 @@ msgid ""
 "like smb://server/resource/file.txt as location. File attributes can\n"
 "be specified with their GIO name, e.g. standard::icon"
 msgstr ""
+"gio list funcționează exact ca utilitatea ls tradițională, dar utilizând "
+"locații\n"
+"GIO în loc de fișiere locale: de exemplu, puteți să utilizați ceva "
+"asemănător\n"
+"cu smb://server/resource/file.txt ca locație. Atributele de fișier pot fi\n"
+"specificate cu numele lor GIO, ex. standard:icon"
 
 #. Translators: commandline placeholder
 #: ../gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
-msgstr ""
+msgstr "TIP MIME"
 
 #: ../gio/gio-tool-mime.c:71
 msgid "HANDLER"
-msgstr ""
+msgstr "OPERATOR"
 
 #: ../gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
-msgstr ""
+msgstr "Obține sau stabilește operatorul pentru un tip mime."
 
 #: ../gio/gio-tool-mime.c:78
 msgid ""
@@ -2078,65 +1949,63 @@ msgid ""
 "for the mimetype. If a handler is given, it is set as the default\n"
 "handler for the mimetype."
 msgstr ""
+"Dacă nu este furnizat niciun operator, listează aplicațiile înregistrate și "
+"recomandate\n"
+"pentru tipul mime. Dacă un operator este furnizat, acesta este stabilit ca "
+"operatorul\n"
+"implicit pentru tipul mime."
 
 #: ../gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
-msgstr ""
+msgstr "Trebuie să specificați un singur tip mime, și poate un operator"
 
 #: ../gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s�\n"
-msgstr ""
+msgstr "Nu sunt aplicații implicite pentru „%s�\n"
 
 #: ../gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s�: %s\n"
-msgstr ""
+msgstr "Aplicația implicită pentru „%s�: %s\n"
 
 #: ../gio/gio-tool-mime.c:127
 #, c-format
 msgid "Registered applications:\n"
-msgstr ""
+msgstr "Aplicații înregistrate:\n"
 
 #: ../gio/gio-tool-mime.c:129
-#, fuzzy, c-format
-#| msgid "Can't find application"
+#, c-format
 msgid "No registered applications\n"
-msgstr "Nu s-a putut găsi aplicația"
+msgstr "Nu sunt aplicații înregistrate\n"
 
 #: ../gio/gio-tool-mime.c:140
 #, c-format
 msgid "Recommended applications:\n"
-msgstr ""
+msgstr "Aplicații recomandate:\n"
 
 #: ../gio/gio-tool-mime.c:142
-#, fuzzy, c-format
-#| msgid "Can't find application"
+#, c-format
 msgid "No recommended applications\n"
-msgstr "Nu s-a putut găsi aplicația"
+msgstr "Nu sunt aplicații recomandate\n"
 
 #: ../gio/gio-tool-mime.c:162
-#, fuzzy, c-format
-#| msgid "Failed to read from file '%s': %s"
+#, c-format
 msgid "Failed to load info for handler “%s�"
-msgstr "Nu s-a putut citi din fișierul „%s�: %s"
+msgstr "Nu s-au putut încărca informațiile pentru operatorul „%s�"
 
 #: ../gio/gio-tool-mime.c:168
 #, c-format
 msgid "Failed to set “%s� as the default handler for “%s�: %s\n"
-msgstr ""
+msgstr "Nu s-a putut stabili „%s� ca operatorul implicit pentru „%s�: %s\n"
 
 #: ../gio/gio-tool-mkdir.c:31
-#, fuzzy
-#| msgid "Can't open directory"
 msgid "Create parent directories"
-msgstr "Nu se poate deschide directorul"
+msgstr "Creează directoare superioare"
 
 #: ../gio/gio-tool-mkdir.c:52
-#, fuzzy
-#| msgid "Can't open directory"
 msgid "Create directories."
-msgstr "Nu se poate deschide directorul"
+msgstr "Creează directoare."
 
 #: ../gio/gio-tool-mkdir.c:54
 msgid ""
@@ -2144,110 +2013,142 @@ msgid ""
 "locations instead of local files: for example, you can use something\n"
 "like smb://server/resource/mydir as location."
 msgstr ""
+"gio mkdir funcționează exact ca utilitatea mkdir tradițională, dar utilizând "
+"locații\n"
+"GIO în loc de fișiere locale: de exemplu, puteți să utilizați ceva "
+"asemănător\n"
+"cu smb://server/resource/mydir ca locație."
 
 #: ../gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
-msgstr ""
+msgstr "Monitorizează un director (implicit: depinde de tip)"
 
 #: ../gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
-msgstr ""
+msgstr "Monitorizează un fișier (implicit: depinde de tip)"
 
 #: ../gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
+"Monitorizează un fișier direct (observă modificările făcute via legături "
+"fizice)"
 
 #: ../gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
-msgstr ""
+msgstr "Monitorizează un fișier direct, dar nu raportează modificările"
 
 #: ../gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
+"Raportează mutările și redenumirile ca simple evenimente șterse / create"
 
 #: ../gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
-msgstr ""
+msgstr "Urmărește evenimentele de montare"
 
 #: ../gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
-msgstr ""
+msgstr "Monitorizează fișierele sau directoarele pentru modificări."
 
-#: ../gio/gio-tool-mount.c:58
+#: ../gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
-msgstr ""
+msgstr "Montează ca montabil"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
-msgstr ""
+msgstr "Montează volumul cu fișier de dispozitiv"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:63 ../gio/gio-tool-mount.c:66
 msgid "DEVICE"
-msgstr ""
+msgstr "DISPOZITIV"
 
-#: ../gio/gio-tool-mount.c:60
+#: ../gio/gio-tool-mount.c:64
 msgid "Unmount"
-msgstr ""
+msgstr "Demontează"
 
-#: ../gio/gio-tool-mount.c:61
+#: ../gio/gio-tool-mount.c:65
 msgid "Eject"
-msgstr ""
+msgstr "Scoate"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:66
+msgid "Stop drive with device file"
+msgstr "Oprește unitatea cu fișierul de dispozitiv"
+
+#: ../gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
-msgstr ""
+msgstr "Demontează toate montările cu schema dată"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:67
 msgid "SCHEME"
-msgstr ""
+msgstr "SCHEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: ../gio/gio-tool-mount.c:68
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr ""
+"Ignoră operațiile de fișier importante atunci când se demontează sau se "
+"scoate"
 
-#: ../gio/gio-tool-mount.c:64
+#: ../gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
-msgstr ""
+msgstr "Utilizează un utilizator anonim la autentificare"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: ../gio/gio-tool-mount.c:71
 msgid "List"
-msgstr ""
+msgstr "Listează"
 
-#: ../gio/gio-tool-mount.c:67
+#: ../gio/gio-tool-mount.c:72
 msgid "Monitor events"
-msgstr ""
+msgstr "Monitorizează evenimente"
 
-#: ../gio/gio-tool-mount.c:68
-#, fuzzy
-#| msgid "Show help options"
+#: ../gio/gio-tool-mount.c:73
 msgid "Show extra information"
-msgstr "Arată opțiunile de ajutor"
+msgstr "Arată informațiile suplimentare"
+
+#: ../gio/gio-tool-mount.c:74
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "PIM-ul numeric la deblocarea unui volum VeraCrypt"
+
+#: ../gio/gio-tool-mount.c:74
+msgid "PIM"
+msgstr "PM"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: ../gio/gio-tool-mount.c:75
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Montează un volum ascuns TCRYPT"
+
+#: ../gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr "Montează un volum de sistem TCRYPT"
+
+#: ../gio/gio-tool-mount.c:264 ../gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
-msgstr ""
+msgstr "Accesul anonim respins"
+
+#: ../gio/gio-tool-mount.c:524
+msgid "No drive for device file"
+msgstr "Nu există nicio unitate pentru fișierul de dispozitiv"
 
-#: ../gio/gio-tool-mount.c:897
+#: ../gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
-msgstr ""
+msgstr "S-a montat %s la %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: ../gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
-msgstr ""
+msgstr "Nu există niciun volum pentru fișierul de dispozitiv"
 
-#: ../gio/gio-tool-mount.c:1145
+#: ../gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
-msgstr ""
+msgstr "Montează sau demontează locațiile."
 
 #: ../gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
-msgstr ""
+msgstr "Nu utiliza opțiunile de revenire pentru copiere și ștergere"
 
 #: ../gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
-msgstr ""
+msgstr "Mută unul sau mai multe fișiere de la SURSĂ la DEST."
 
 #: ../gio/gio-tool-move.c:101
 msgid ""
@@ -2255,166 +2156,162 @@ msgid ""
 "locations instead of local files: for example, you can use something\n"
 "like smb://server/resource/file.txt as location"
 msgstr ""
+"gio move funcționează exact ca utilitatea mv tradițională, dar utilizând "
+"locații\n"
+"GIO în loc de fișiere locale: de exemplu, puteți să utilizați ceva "
+"asemănător\n"
+"cu smb://server/resource/file.txt ca locație"
 
 #: ../gio/gio-tool-move.c:142
-#, fuzzy, c-format
-#| msgid "Target file is a directory"
+#, c-format
 msgid "Target %s is not a directory"
-msgstr "Fișierul destinație este un director"
+msgstr "Èšinta %s nu este un director"
 
-#: ../gio/gio-tool-open.c:50
+#: ../gio/gio-tool-open.c:118
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
 msgstr ""
+"Deschide fișierele cu aplicația implicită care\n"
+"este înregistrată pentru a gestiona fișiere de acest tip."
 
 #: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
 msgid "Ignore nonexistent files, never prompt"
-msgstr ""
+msgstr "Ignoră fișierele care nu există, nu solicita niciodată"
 
 #: ../gio/gio-tool-remove.c:52
 msgid "Delete the given files."
-msgstr ""
+msgstr "Șterge fișierele date."
 
 #: ../gio/gio-tool-rename.c:45
 msgid "NAME"
-msgstr ""
+msgstr "NUME"
 
 #: ../gio/gio-tool-rename.c:50
 msgid "Rename a file."
-msgstr ""
+msgstr "Redenumește un fișier."
 
 #: ../gio/gio-tool-rename.c:70
-#, fuzzy
-#| msgid "Missing argument for %s"
 msgid "Missing argument"
-msgstr "Argument lipsă pentru %s"
+msgstr "Lipsește un argument"
 
 #: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:190
 #: ../gio/gio-tool-set.c:137
 msgid "Too many arguments"
-msgstr ""
+msgstr "Prea multe argumente"
 
 #: ../gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
-msgstr ""
+msgstr "Redenumire cu succes. Uri nou: %s\n"
 
 #: ../gio/gio-tool-save.c:50
 msgid "Only create if not existing"
-msgstr ""
+msgstr "Creează doar dacă nu există"
 
 #: ../gio/gio-tool-save.c:51
 msgid "Append to end of file"
-msgstr ""
+msgstr "Adaugă la sfârșitul fișierului"
 
 #: ../gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
-msgstr ""
+msgstr "La creare, restricționează accesul pentru utilizatorul curent"
 
 #: ../gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
-msgstr ""
+msgstr "La înlocuire, înlocuiește ca și cum destinația nu ar exista"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../gio/gio-tool-save.c:55
 msgid "Print new etag at end"
-msgstr ""
+msgstr "Tipărește etag nou la sfârșit"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../gio/gio-tool-save.c:57
 msgid "The etag of the file being overwritten"
-msgstr ""
+msgstr "Etag-ul fișierului care este suprascris"
 
 #: ../gio/gio-tool-save.c:57
 msgid "ETAG"
-msgstr ""
+msgstr "ETAG"
 
 #: ../gio/gio-tool-save.c:113
-#, fuzzy
-#| msgid "Error reading from handle: %s"
 msgid "Error reading from standard input"
-msgstr "Eroare la citirea din handle: %s"
+msgstr "Eroare la citirea din intrarea standard"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../gio/gio-tool-save.c:139
-#, fuzzy, c-format
-#| msgid "TLS support is not available"
+#, c-format
 msgid "Etag not available\n"
-msgstr "Suportul TLS nu este disponibil"
+msgstr "Etag nu este disponibil\n"
 
 #: ../gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
-msgstr ""
+msgstr "Citește de la intrarea standard și salvează la DEST."
 
 #: ../gio/gio-tool-save.c:183
 msgid "No destination given"
-msgstr ""
+msgstr "Nu s-a furnizat o destinație"
 
 #: ../gio/gio-tool-set.c:33
 msgid "Type of the attribute"
-msgstr ""
+msgstr "Tipul atributului"
 
 #: ../gio/gio-tool-set.c:33
 msgid "TYPE"
-msgstr ""
+msgstr "TIP"
 
 #: ../gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
-msgstr ""
+msgstr "ATRIBUT"
 
 #: ../gio/gio-tool-set.c:89
 msgid "VALUE"
-msgstr ""
+msgstr "VALOARE"
 
 #: ../gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
-msgstr ""
+msgstr "Stabilește un atribut de fișier pentru LOCAȚIE."
 
 #: ../gio/gio-tool-set.c:113
-#, fuzzy
-#| msgid "No connection endpoint specified"
 msgid "Location not specified"
-msgstr "Niciun capăt de conexiune specificat"
+msgstr "Locația nu a fost specificată"
 
 #: ../gio/gio-tool-set.c:120
-#, fuzzy
 msgid "Attribute not specified"
-msgstr "Eroare: destinația nu a fost specificată\n"
+msgstr "Atributul nu a fost specificat"
 
 #: ../gio/gio-tool-set.c:130
-#, fuzzy
 msgid "Value not specified"
-msgstr "Eroare: destinația nu a fost specificată\n"
+msgstr "Valoarea nu a fost specificată"
 
 #: ../gio/gio-tool-set.c:180
-#, fuzzy, c-format
-#| msgid "Invalid attribute type (string expected)"
+#, c-format
 msgid "Invalid attribute type “%s�"
-msgstr "Tip incorect de atribut (se aștepta un șir)"
+msgstr "Tip de atribut nevalid „%s�"
 
 #: ../gio/gio-tool-trash.c:32
 msgid "Empty the trash"
-msgstr ""
+msgstr "Golește gunoiul"
 
 #: ../gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
-msgstr ""
+msgstr "Mută fișiere sau directoare la gunoi."
 
 #: ../gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
-msgstr ""
+msgstr "Urmărește legăturile simbolice, montările și scurtăturile"
 
 #: ../gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
-msgstr ""
+msgstr "Listează conținuturile directoarelor într-un format arborescent."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: ../gio/glib-compile-resources.c:143 ../gio/glib-compile-schemas.c:1515
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Elementul <%s> nu este permis în <%s>"
 
-#: ../gio/glib-compile-resources.c:146
+#: ../gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Elementul <%s> nu este permis la nivelul cel mai de sus"
@@ -2422,344 +2319,328 @@ msgstr "Elementul <%s> nu este permis la nivelul cel mai de sus"
 #: ../gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
-msgstr ""
+msgstr "Fișierul %s apare de mai multe ori în resursă"
 
 #: ../gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s� in any source directory"
-msgstr ""
+msgstr "Nu s-a putut localiza „%s� în niciun director sursă"
 
 #: ../gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s� in current directory"
-msgstr ""
+msgstr "Nu s-a putut localiza %s� în directorul curent"
 
-#: ../gio/glib-compile-resources.c:290
-#, fuzzy, c-format
-#| msgid "Unknown option %s"
+#: ../gio/glib-compile-resources.c:293
+#, c-format
 msgid "Unknown processing option “%s�"
-msgstr "Opțiune necunoscută %s"
+msgstr "Opțiune de procesare necunoscută „%s�"
 
-#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
-#, fuzzy, c-format
-#| msgid "Failed to create file '%s': %s"
-msgid "Failed to create temp file: %s"
-msgstr "Nu s-a putut crea fișierul „%s�: %s"
+#. Translators: the first %s is a gresource XML attribute,
+#. * the second %s is an environment variable, and the third
+#. * %s is a command line tool
+#.
+#: ../gio/glib-compile-resources.c:313 ../gio/glib-compile-resources.c:370
+#: ../gio/glib-compile-resources.c:427
+#, c-format
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr ""
+"preprocesarea %s a fost solicitată, dar nu este stabilit %s, și %s nu se "
+"află în CALE"
 
-#: ../gio/glib-compile-resources.c:382
-#, fuzzy, c-format
-#| msgid "Error reading file '%s': %s"
+#: ../gio/glib-compile-resources.c:460
+#, c-format
 msgid "Error reading file %s: %s"
-msgstr "Eroare la citirea fișierului „%s�: %s"
+msgstr "Eroare la citirea fișierului %s: %s"
 
-#: ../gio/glib-compile-resources.c:402
-#, fuzzy, c-format
-#| msgid "Error closing file: %s"
+#: ../gio/glib-compile-resources.c:480
+#, c-format
 msgid "Error compressing file %s"
-msgstr "Eroare la închiderea fișierului: %s"
+msgstr "Eroare la comprimarea fișierului %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: ../gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "textul nu are voie să apară în <%s>"
 
-#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
+#: ../gio/glib-compile-resources.c:736 ../gio/glib-compile-schemas.c:2138
 msgid "Show program version and exit"
-msgstr ""
+msgstr "Arată versiunea programului și ieși"
 
-#: ../gio/glib-compile-resources.c:665
-#, fuzzy
-#| msgid "removed existing output file.\n"
-msgid "name of the output file"
-msgstr "s-a șters fișierul de ieșire existent.\n"
+#: ../gio/glib-compile-resources.c:737
+msgid "Name of the output file"
+msgstr "Numele fișierului de ieșire"
 
-#: ../gio/glib-compile-resources.c:666
+#: ../gio/glib-compile-resources.c:738
 msgid ""
-"The directories where files are to be read from (default to current "
+"The directories to load files referenced in FILE from (default: current "
 "directory)"
 msgstr ""
+"Directoarele de unde se vor încărca fișierele referențiate în FILE "
+"(implicit: directorul curent)"
 
-#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: ../gio/glib-compile-resources.c:738 ../gio/glib-compile-schemas.c:2139
+#: ../gio/glib-compile-schemas.c:2168
 msgid "DIRECTORY"
 msgstr "DOSAR"
 
-#: ../gio/glib-compile-resources.c:667
+#: ../gio/glib-compile-resources.c:739
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr ""
+"Generează rezultatul în formatul selectat de extensia numelui de fișier țintă"
 
-#: ../gio/glib-compile-resources.c:668
+#: ../gio/glib-compile-resources.c:740
 msgid "Generate source header"
-msgstr ""
+msgstr "Generează antetul sursei"
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
-msgstr ""
+#: ../gio/glib-compile-resources.c:741
+msgid "Generate source code used to link in the resource file into your code"
+msgstr "Generează codul sursă utilizat pentru a lega fișierul resursă în cod"
 
-#: ../gio/glib-compile-resources.c:670
+#: ../gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
-msgstr ""
+msgstr "Generează lista de dependențe"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr ""
+#: ../gio/glib-compile-resources.c:743
+msgid "Name of the dependency file to generate"
+msgstr "Numele fișierului de dependențe de generat"
 
-#: ../gio/glib-compile-resources.c:672
+#: ../gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
-msgstr ""
+msgstr "Include țintele false în fișierul de dependențe generat"
 
-#: ../gio/glib-compile-resources.c:673
+#: ../gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
-msgstr ""
+msgstr "Nu crea și înregistra automat resursa"
 
-#: ../gio/glib-compile-resources.c:674
+#: ../gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
-msgstr ""
+msgstr "Nu exporta funcțiile; declară-le G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:675
+#: ../gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
-msgstr ""
+msgstr "Nume de identificator C utilizat pentru codul sursă generat"
 
-#: ../gio/glib-compile-resources.c:701
-#, fuzzy
-#| msgid ""
-#| "Compile all GSettings schema files into a schema cache.\n"
-#| "Schema files are required to have the extension .gschema.xml,\n"
-#| "and the cache file is called gschemas.compiled."
+#: ../gio/glib-compile-resources.c:773
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
 "and the resource file have the extension called .gresource."
 msgstr ""
-"Compilează toate fișierele-schemă GSettings într-un cache de schemă.\n"
-"Fișierele schemă trebuie să aibă extensia .gschema.xml,\n"
-"iar fișierul cache se numește gschemas.compiled."
+"Compilează o specificație de resursă într-un fișier resursă.\n"
+"Fișierele specificație de resursă au extensia .gresource.xml,\n"
+"iar fișierul resursă are extensia cu numele .gresource."
 
-#: ../gio/glib-compile-resources.c:723
-#, fuzzy, c-format
-#| msgid "You should give exactly one directory name\n"
+#: ../gio/glib-compile-resources.c:795
+#, c-format
 msgid "You should give exactly one file name\n"
-msgstr "Trebuie să dați exact un nume de dosar\n"
+msgstr "Ar trebui să furnizați exact un nume de fișier\n"
 
 #: ../gio/glib-compile-schemas.c:95
 #, c-format
 msgid "nick must be a minimum of 2 characters"
-msgstr ""
+msgstr "pseudonimul trebuie să aibă minim 2 caractere"
 
 #: ../gio/glib-compile-schemas.c:106
-#, fuzzy, c-format
-#| msgid "Invalid symlink value given"
+#, c-format
 msgid "Invalid numeric value"
-msgstr "S-a primit o valoare incorectă pentru legătura simbolică"
+msgstr "Valoare numerică nevalidă"
 
 #: ../gio/glib-compile-schemas.c:114
-#, fuzzy, c-format
-#| msgid "<%s id='%s'> already specified"
+#, c-format
 msgid "<value nick='%s'/> already specified"
-msgstr "<%s id='%s'> deja specificat"
+msgstr "<value nick='%s'/> a fost specificat deja"
 
 #: ../gio/glib-compile-schemas.c:122
-#, fuzzy, c-format
-#| msgid "<key name='%s'> already specified"
+#, c-format
 msgid "value='%s' already specified"
-msgstr "<key name='%s'> deja specificat"
+msgstr "value=„%s� deja specificată"
 
 #: ../gio/glib-compile-schemas.c:136
 #, c-format
 msgid "flags values must have at most 1 bit set"
-msgstr ""
+msgstr "valorile fanioanelor trebuie să aibă stabilit cel mult 1 bit"
 
 #: ../gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
-msgstr ""
+msgstr "<%s> trebuie să conțină cel puțin o <value>"
 
-#: ../gio/glib-compile-schemas.c:315
-#, fuzzy, c-format
-#| msgid "No connection endpoint specified"
+#: ../gio/glib-compile-schemas.c:317
+#, c-format
 msgid "<%s> is not contained in the specified range"
-msgstr "Niciun capăt de conexiune specificat"
+msgstr "<%s> nu este conținut în intervalul specificat"
 
-#: ../gio/glib-compile-schemas.c:327
+#: ../gio/glib-compile-schemas.c:329
 #, c-format
 msgid "<%s> is not a valid member of the specified enumerated type"
-msgstr ""
+msgstr "<%s> nu este un membru valid al tipului enumerat specificat"
 
-#: ../gio/glib-compile-schemas.c:333
+#: ../gio/glib-compile-schemas.c:335
 #, c-format
 msgid "<%s> contains string not in the specified flags type"
-msgstr ""
+msgstr "<%s> conține un șir care nu se află în tipul de fanioane specificat"
 
-#: ../gio/glib-compile-schemas.c:339
+#: ../gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
-msgstr ""
+msgstr "<%s> conține un șir care nu se află în <choices>"
 
-#: ../gio/glib-compile-schemas.c:373
-#, fuzzy
-#| msgid "<key name='%s'> already specified"
+#: ../gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
-msgstr "<key name='%s'> deja specificat"
+msgstr "<range/> a fost specificat deja pentru această cheie"
 
-#: ../gio/glib-compile-schemas.c:391
+#: ../gio/glib-compile-schemas.c:393
 #, c-format
 msgid "<range> not allowed for keys of type “%s�"
-msgstr ""
+msgstr "<range> nu este permis pentru cheile de tipul „%s�"
 
-#: ../gio/glib-compile-schemas.c:408
+#: ../gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
-msgstr ""
+msgstr "minimul specificat al <range> este mai mare decât maximul"
 
-#: ../gio/glib-compile-schemas.c:433
+#: ../gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
-msgstr ""
+msgstr "categorie l10n nesuportată: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: ../gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
-msgstr ""
+msgstr "s-a solicitat l10n, dar nu s-a furnizat niciun domeniu gettext"
 
-#: ../gio/glib-compile-schemas.c:453
+#: ../gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
-msgstr ""
+msgstr "context de traducere furnizat pentru valoare fără să fie activat l10n"
 
-#: ../gio/glib-compile-schemas.c:475
+#: ../gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s�: "
-msgstr ""
+msgstr "Nu s-a putut parsa valoarea <default> de tipul „%s�: "
 
-#: ../gio/glib-compile-schemas.c:492
+#: ../gio/glib-compile-schemas.c:494
 msgid ""
 "<choices> cannot be specified for keys tagged as having an enumerated type"
 msgstr ""
+"<choices> nu pot fi specificate pentru cheile etichetate ca având un tip "
+"enumerat"
 
-#: ../gio/glib-compile-schemas.c:501
-#, fuzzy
-#| msgid "<child name='%s'> already specified"
+#: ../gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
-msgstr "<child name='%s'> deja specificat"
+msgstr "<choices> au fost specificate deja pentru această cheie"
 
-#: ../gio/glib-compile-schemas.c:513
+#: ../gio/glib-compile-schemas.c:515
 #, c-format
 msgid "<choices> not allowed for keys of type “%s�"
-msgstr ""
+msgstr "<choices> nu sunt permise pentru cheile de tipul „%s�"
 
-#: ../gio/glib-compile-schemas.c:529
-#, fuzzy, c-format
-#| msgid "<child name='%s'> already specified"
+#: ../gio/glib-compile-schemas.c:531
+#, c-format
 msgid "<choice value='%s'/> already given"
-msgstr "<child name='%s'> deja specificat"
+msgstr "<choice value='%s'/> a fost furnizat deja"
 
-#: ../gio/glib-compile-schemas.c:544
+#: ../gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
-msgstr ""
+msgstr "<choices> trebuie să conțină cel puțin o <choice>"
 
-#: ../gio/glib-compile-schemas.c:558
-#, fuzzy
-#| msgid "<child name='%s'> already specified"
+#: ../gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
-msgstr "<child name='%s'> deja specificat"
+msgstr "<aliases> au fost specificate deja pentru această cheie"
 
-#: ../gio/glib-compile-schemas.c:562
+#: ../gio/glib-compile-schemas.c:564
 msgid ""
 "<aliases> can only be specified for keys with enumerated or flags types or "
 "after <choices>"
 msgstr ""
+"<aliases> pot fi specificate doar pentru cheile cu tipuri fanioane sau "
+"enumerate sau după <choices>"
 
-#: ../gio/glib-compile-schemas.c:581
+#: ../gio/glib-compile-schemas.c:583
 #, c-format
 msgid ""
 "<alias value='%s'/> given when “%s� is already a member of the enumerated "
 "type"
 msgstr ""
+"<alias value='%s'/> furnizată atunci când „%s� este deja un membru al "
+"tipului enumerat"
 
-#: ../gio/glib-compile-schemas.c:587
+#: ../gio/glib-compile-schemas.c:589
 #, c-format
 msgid "<alias value='%s'/> given when <choice value='%s'/> was already given"
 msgstr ""
+"<alias value='%s'/> furnizată atunci când <choice value='%s'/> a fost dată "
+"deja"
 
-#: ../gio/glib-compile-schemas.c:595
-#, fuzzy, c-format
-#| msgid "<%s id='%s'> already specified"
+#: ../gio/glib-compile-schemas.c:597
+#, c-format
 msgid "<alias value='%s'/> already specified"
-msgstr "<%s id='%s'> deja specificat"
+msgstr "<alias value='%s'/> a fost specificat deja"
 
-#: ../gio/glib-compile-schemas.c:605
+#: ../gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s� is not in enumerated type"
-msgstr ""
+msgstr "ținta aliasului „%s� nu este un tip enumerat"
 
-#: ../gio/glib-compile-schemas.c:606
+#: ../gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s� is not in <choices>"
-msgstr ""
+msgstr "ținta aliasului „%s� nu este în <choices>"
 
-#: ../gio/glib-compile-schemas.c:621
+#: ../gio/glib-compile-schemas.c:623
 #, c-format
 msgid "<aliases> must contain at least one <alias>"
-msgstr ""
+msgstr "<aliases> trebuie să conțină cel puțin un <alias>"
 
-#: ../gio/glib-compile-schemas.c:786
-#, fuzzy
-#| msgid "empty names are not permitted"
+#: ../gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
-msgstr "numele vide nu sunt permise"
+msgstr "Numele goale nu sunt permise"
 
-#: ../gio/glib-compile-schemas.c:796
-#, fuzzy, c-format
-#| msgid "invalid name '%s': names must begin with a lowercase letter"
+#: ../gio/glib-compile-schemas.c:808
+#, c-format
 msgid "Invalid name “%s�: names must begin with a lowercase letter"
-msgstr "nume nevalid „%s�: numele trebuie să înceapă cu o literă mică"
+msgstr "Nume nevalid „%s�: numele trebuie să înceapă cu o literă mică"
 
-#: ../gio/glib-compile-schemas.c:808
-#, fuzzy, c-format
-#| msgid ""
-#| "invalid name '%s': invalid character '%c'; only lowercase letters, "
-#| "numbers and dash ('-') are permitted."
+#: ../gio/glib-compile-schemas.c:820
+#, c-format
 msgid ""
 "Invalid name “%s�: invalid character “%c�; only lowercase letters, numbers "
 "and hyphen (“-�) are permitted"
 msgstr ""
-"nume nevalid „%s�: caracter nevalid „%c�; doar literele mici, numerele și "
-"liniuța ('-') sunt permise."
+"Nume nevalid „%s�: caracter nevalid „%c�; doar literele mici, numerele și "
+"cratima („-�) sunt permise"
 
-#: ../gio/glib-compile-schemas.c:817
-#, fuzzy, c-format
-#| msgid "invalid name '%s': two successive dashes ('--') are not permitted."
+#: ../gio/glib-compile-schemas.c:829
+#, c-format
 msgid "Invalid name “%s�: two successive hyphens (“--�) are not permitted"
-msgstr "nume nevalid „%s�: două liniuțe consecutive ('--') nu sunt permise."
+msgstr "Nume nevalid „%s�: două cratime consecutive („--�) nu sunt permise"
 
-#: ../gio/glib-compile-schemas.c:826
-#, fuzzy, c-format
-#| msgid "invalid name '%s': the last character may not be a dash ('-')."
+#: ../gio/glib-compile-schemas.c:838
+#, c-format
 msgid "Invalid name “%s�: the last character may not be a hyphen (“-�)"
-msgstr "nume nevalid „%s�: ultimul caracter nu poate fi o liniuță ('-')."
+msgstr "Nume nevalid „%s�: ultimul caracter nu poate fi o cratimă („-�)"
 
-#: ../gio/glib-compile-schemas.c:834
-#, fuzzy, c-format
+#: ../gio/glib-compile-schemas.c:846
+#, c-format
 msgid "Invalid name “%s�: maximum length is 1024"
-msgstr "nume nevalid „%s�: lungimea maximă este 32"
+msgstr "Nume nevalid „%s�: lungimea maximă este 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: ../gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> deja specificat"
 
-#: ../gio/glib-compile-schemas.c:930
-#, fuzzy
-#| msgid "can not add keys to a 'list-of' schema"
+#: ../gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of� schema"
-msgstr "nu se pot adăuga chei unei scheme de tip „list-of�"
+msgstr "Nu se pot adăuga chei la o schemă de tipul „list-of�"
 
-#: ../gio/glib-compile-schemas.c:941
+#: ../gio/glib-compile-schemas.c:955
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> deja specificat"
 
-#: ../gio/glib-compile-schemas.c:959
+#: ../gio/glib-compile-schemas.c:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2768,76 +2649,65 @@ msgstr ""
 "<key name='%s'> ascunde <key name='%s'> în <schema id='%s'>; utilizați "
 "<override> pentru a modifica valoarea"
 
-#: ../gio/glib-compile-schemas.c:970
-#, fuzzy, c-format
-#| msgid ""
-#| "exactly one of 'type', 'enum' or 'flags' must be specified as an "
-#| "attribute to <key>"
+#: ../gio/glib-compile-schemas.c:984
+#, c-format
 msgid ""
 "Exactly one of “type�, “enum� or “flags� must be specified as an attribute "
 "to <key>"
 msgstr ""
-"exact una dintre valorile „type�, „enum� sau „flags� trebuie specificată "
-"unui atribut al <key>"
+"Exact una dintre valorile „type�, „enum� sau „flags� trebuie specificată ca "
+"atribut pentru <key>"
 
-#: ../gio/glib-compile-schemas.c:989
+#: ../gio/glib-compile-schemas.c:1003
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> nu este (încă) definit."
 
-#: ../gio/glib-compile-schemas.c:1004
-#, fuzzy, c-format
-#| msgid "invalid GVariant type string '%s'"
+#: ../gio/glib-compile-schemas.c:1018
+#, c-format
 msgid "Invalid GVariant type string “%s�"
-msgstr "șir-tip GVariant nevalid „%s�"
+msgstr "Șir de tip GVariant nevalid „%s�"
 
-#: ../gio/glib-compile-schemas.c:1034
-#, fuzzy
-#| msgid "<override> given but schema isn't extending anything"
+#: ../gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
-msgstr "<override> a fost specificat, dar schema nu extinde nimic"
+msgstr "<override> a fost furnizat dar schema nu extinde nimic"
 
-#: ../gio/glib-compile-schemas.c:1047
-#, fuzzy, c-format
-#| msgid "no <key name='%s'> to override"
+#: ../gio/glib-compile-schemas.c:1061
+#, c-format
 msgid "No <key name='%s'> to override"
-msgstr "niciun element <key name='%s'> de suprascris"
+msgstr "Nu este niciun element <key name='%s'> de suprascris"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: ../gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> deja specificat"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: ../gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> deja specificat"
 
-#: ../gio/glib-compile-schemas.c:1140
-#, fuzzy, c-format
-#| msgid "<schema id='%s'> extends not yet existing schema '%s'"
+#: ../gio/glib-compile-schemas.c:1154
+#, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s�"
-msgstr "<schema id='%s'> extinde o schemă „%s� ce încă nu există"
+msgstr "<schema id='%s'> extinde o schemă încă inexistentă „%s�"
 
-#: ../gio/glib-compile-schemas.c:1156
-#, fuzzy, c-format
-#| msgid "<schema id='%s'> is list of not yet existing schema '%s'"
+#: ../gio/glib-compile-schemas.c:1170
+#, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s�"
-msgstr "<schema id='%s'> este o listă de a unei scheme inexistente „%s�"
+msgstr "<schema id='%s'> este o listare a unei scheme încă inexistente „%s�"
 
-#: ../gio/glib-compile-schemas.c:1164
-#, fuzzy, c-format
-#| msgid "Can not be a list of a schema with a path"
+#: ../gio/glib-compile-schemas.c:1178
+#, c-format
 msgid "Cannot be a list of a schema with a path"
-msgstr "Nu poate fi o listă a unei scheme cu o cale"
+msgstr "Nu poate fi o listă a unei scheme care are o cale"
 
-#: ../gio/glib-compile-schemas.c:1174
-#, fuzzy, c-format
-#| msgid "Can not extend a schema with a path"
+#: ../gio/glib-compile-schemas.c:1188
+#, c-format
 msgid "Cannot extend a schema with a path"
-msgstr "Nu se poate extinde o schemă cu o cale"
+msgstr "Nu se poate extinde o schemă care are o cale"
 
-#: ../gio/glib-compile-schemas.c:1184
+#: ../gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2845,11 +2715,8 @@ msgstr ""
 "<schema id='%s'> este o listă, ce extinde <schema id='%s'> care nu este o "
 "listă"
 
-#: ../gio/glib-compile-schemas.c:1194
-#, fuzzy, c-format
-#| msgid ""
-#| "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but "
-#| "'%s' does not extend '%s'"
+#: ../gio/glib-compile-schemas.c:1208
+#, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s� "
 "does not extend “%s�"
@@ -2857,149 +2724,149 @@ msgstr ""
 "<schema id='%s' list-of='%s'> extinde <schema id='%s' list-of='%s'>, dar "
 "„%s� nu extinde „%s�"
 
-#: ../gio/glib-compile-schemas.c:1211
-#, fuzzy, c-format
-#| msgid "a path, if given, must begin and end with a slash"
+#: ../gio/glib-compile-schemas.c:1225
+#, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr ""
-"dacă este specificată, calea trebuie să înceapă și să se termine cu o bară "
-"oblică („/�)"
+"O cale, dacă este furnizată, trebuie să înceapă și să se termine cu o bară "
+"oblică"
 
-#: ../gio/glib-compile-schemas.c:1218
-#, fuzzy, c-format
-#| msgid "the path of a list must end with ':/'"
+#: ../gio/glib-compile-schemas.c:1232
+#, c-format
 msgid "The path of a list must end with “:/�"
-msgstr "calea unei liste trebuie să se termine cu „:/�"
+msgstr "Calea unei liste trebuie să se termine cu „:/�"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: ../gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s� has path “%s�.  Paths starting with “/apps/�, “/"
 "desktop/� or “/system/� are deprecated."
 msgstr ""
+"Avertisment: Schema „%s� are calea „%s�.  Căile care încep cu „/apps/�, „/"
+"desktop/� sau „/system/� sunt învechite."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: ../gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> deja specificat"
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
-#, fuzzy, c-format
-#| msgid "Element <%s> not allowed inside <%s>"
+#: ../gio/glib-compile-schemas.c:1421 ../gio/glib-compile-schemas.c:1437
+#, c-format
 msgid "Only one <%s> element allowed inside <%s>"
-msgstr "Elementul <%s> nu este permis în <%s>"
+msgstr "Doar un element <%s> este permis în <%s>"
 
-#: ../gio/glib-compile-schemas.c:1505
-#, fuzzy, c-format
-#| msgid "Element <%s> not allowed at toplevel"
+#: ../gio/glib-compile-schemas.c:1519
+#, c-format
 msgid "Element <%s> not allowed at the top level"
-msgstr "Elementul <%s> nu este permis la nivelul cel mai de sus"
+msgstr "Elementul <%s> nu este permis la nivelul de top"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: ../gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
-msgstr ""
+msgstr "Elementul <default> este necesar în <key>"
 
-#: ../gio/glib-compile-schemas.c:1613
-#, fuzzy, c-format
-#| msgid "text may not appear inside <%s>"
+#: ../gio/glib-compile-schemas.c:1627
+#, c-format
 msgid "Text may not appear inside <%s>"
-msgstr "textul nu are voie să apară în <%s>"
+msgstr "Textul nu poate să apară înăuntrul <%s>"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: ../gio/glib-compile-schemas.c:1695
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
-msgstr ""
+msgstr "Avertisment: referință nedefinită la <schema id='%s'/>"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: ../gio/glib-compile-schemas.c:1834 ../gio/glib-compile-schemas.c:1910
+#: ../gio/glib-compile-schemas.c:2025
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict a fost specificat; se iese.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: ../gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Întregul fișier a fost ignorat.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: ../gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Se ignoră acest fișier.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: ../gio/glib-compile-schemas.c:1959
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+msgid "No such key “%s� in schema “%s� as specified in override file “%s�"
 msgstr ""
-"Nu există cheia „%s� în schema „%s� specificată în fișierul de suprascriere "
-"„%s�"
+"Nu există cheia „%s� în schema „%s� cum este specificat în fișierul de "
+"suprascriere „%s�"
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: ../gio/glib-compile-schemas.c:1965 ../gio/glib-compile-schemas.c:1990
+#: ../gio/glib-compile-schemas.c:2050 ../gio/glib-compile-schemas.c:2079
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; se ignoră suprascrierea pentru această cheie.\n"
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: ../gio/glib-compile-schemas.c:1969 ../gio/glib-compile-schemas.c:1994
+#: ../gio/glib-compile-schemas.c:2054 ../gio/glib-compile-schemas.c:2083
 #, c-format
 msgid " and --strict was specified; exiting.\n"
-msgstr "și --strict a fost specificat; se iese.\n"
+msgstr " și --strict a fost specificat; se iese.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
-#, fuzzy, c-format
-#| msgid ""
-#| "error parsing key '%s' in schema '%s' as specified in override file '%s': "
-#| "%s.  "
+#: ../gio/glib-compile-schemas.c:1984
+#, c-format
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
+"cannot provide per-desktop overrides for localised key “%s� in schema "
+"“%s� (override file “%s�)"
 msgstr ""
-"eroare la parsarea cheii „%s� în schema „%s� specificată în fișierul de "
-"suprascriere „%s�: %s."
+"nu se pot furniza suprascrierile per-desktop pentru cheia localizată „%s� în "
+"schema „%s� (suprascrie fișierul „%s�)"
 
-#: ../gio/glib-compile-schemas.c:1966
+#: ../gio/glib-compile-schemas.c:2011
+#, c-format
+msgid ""
+"error parsing key “%s� in schema “%s� as specified in override file “%s�: %s."
+msgstr ""
+"eroare la parsarea cheii „%s� în schema „%s� cum este specificat în fișierul "
+"de suprascriere „%s�: %s."
+
+#: ../gio/glib-compile-schemas.c:2021
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Se ignoră suprascrierea pentru această cheie.\n"
 
-#: ../gio/glib-compile-schemas.c:1984
-#, fuzzy, c-format
-#| msgid ""
-#| "override for key '%s' in schema '%s' in override file '%s' is out of the "
-#| "range given in the schema"
+#: ../gio/glib-compile-schemas.c:2040
+#, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is outside the "
+"override for key “%s� in schema “%s� in override file “%s� is outside the "
 "range given in the schema"
 msgstr ""
 "suprascrierea cheii „%s� în schema „%s� din fișierul de suprascriere „%s� nu "
-"este în intervalul specificat de schemă"
+"se află în intervalul specificat de schemă"
 
-#: ../gio/glib-compile-schemas.c:2012
+#: ../gio/glib-compile-schemas.c:2069
 #, c-format
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is not in the "
+"override for key “%s� in schema “%s� in override file “%s� is not in the "
 "list of valid choices"
 msgstr ""
 "suprascrierea cheii „%s� în schema „%s� din fișierul de suprascriere „%s� nu "
-"este în lista de valori valide"
+"este în lista de alegeri valide"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr "unde se stochează fișierul gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: ../gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr "Abandonează execuția la detectarea oricăror erori în scheme"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: ../gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr "Nu scrie fișierul gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: ../gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr "Nu impune restricții numelor cheilor"
 
-#: ../gio/glib-compile-schemas.c:2099
+#: ../gio/glib-compile-schemas.c:2171
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -3009,351 +2876,336 @@ msgstr ""
 "Fișierele schemă trebuie să aibă extensia .gschema.xml,\n"
 "iar fișierul cache se numește gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: ../gio/glib-compile-schemas.c:2192
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Trebuie să dați exact un nume de dosar\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: ../gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Nu s-a găsit niciun fișier schemă: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: ../gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "nu se face nimic.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: ../gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "s-a șters fișierul de ieșire existent.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:544 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Nume incorect de fișier: %s"
 
-#: ../gio/glocalfile.c:1037
-#, fuzzy, c-format
-#| msgid "Error getting filesystem info: %s"
+#: ../gio/glocalfile.c:1006
+#, c-format
 msgid "Error getting filesystem info for %s: %s"
-msgstr "Eroare la citirea detaliilor sistemului de fișiere: %s"
+msgstr "Eroare la obținerea informațiilor sistemului de fișiere pentru %s: %s"
 
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1176
-#, fuzzy, c-format
-#| msgid "Containing mount does not exist"
+#: ../gio/glocalfile.c:1145
+#, c-format
 msgid "Containing mount for file %s not found"
-msgstr "Montarea conținută nu există"
+msgstr "Montarea conținătoare pentru fișierul %s nu a fost găsită"
 
-#: ../gio/glocalfile.c:1199
-#, fuzzy
-#| msgid "Can't rename root directory"
+#: ../gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Nu se poate redenumi directorul rădăcină"
 
-#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240
-#, fuzzy, c-format
-#| msgid "Error renaming file: %s"
+#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
+#, c-format
 msgid "Error renaming file %s: %s"
-msgstr "Eroare la redenumirea fișierului: %s"
+msgstr "Eroare la redenumirea fișierului %s: %s"
 
-#: ../gio/glocalfile.c:1224
-#, fuzzy
+#: ../gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Nu se poate redenumi fișierul, numele de fișier există deja"
 
-#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2253 ../gio/glocalfile.c:2281
-#: ../gio/glocalfile.c:2438 ../gio/glocalfileoutputstream.c:549
+#: ../gio/glocalfile.c:1206 ../gio/glocalfile.c:2266 ../gio/glocalfile.c:2294
+#: ../gio/glocalfile.c:2451 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Nume nevalid de fișier"
 
-#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419
-#, fuzzy, c-format
-#| msgid "Error opening file '%s': %s"
+#: ../gio/glocalfile.c:1374 ../gio/glocalfile.c:1389
+#, c-format
 msgid "Error opening file %s: %s"
-msgstr "Eroare la deschiderea fișierului „%s�: %s"
+msgstr "Eroare la deschiderea fișierului %s: %s"
 
-#: ../gio/glocalfile.c:1544
-#, fuzzy, c-format
-#| msgid "Error removing file: %s"
+#: ../gio/glocalfile.c:1514
+#, c-format
 msgid "Error removing file %s: %s"
-msgstr "Eroare la ștergerea fișierului: %s"
+msgstr "Eroare la eliminarea fișierului %s: %s"
 
-#: ../gio/glocalfile.c:1928
-#, fuzzy, c-format
-#| msgid "Error trashing file: %s"
+#: ../gio/glocalfile.c:1925
+#, c-format
 msgid "Error trashing file %s: %s"
-msgstr "Eroare la mutarea la coșul de gunoi a fișierului: %s"
+msgstr "Eroare la mutarea la coșul de gunoi a fișierului %s: %s"
 
-#: ../gio/glocalfile.c:1951
+#: ../gio/glocalfile.c:1948
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Nu s-a putut crea directorul coșului de gunoi „%s�: %s"
 
-#: ../gio/glocalfile.c:1971
-#, fuzzy, c-format
-#| msgid "Unable to find toplevel directory for trash"
+#: ../gio/glocalfile.c:1970
+#, c-format
 msgid "Unable to find toplevel directory to trash %s"
-msgstr "Nu s-a găsit directorul de top pentru coșul de gunoi"
+msgstr "Nu se poate găsi directorul de top pentru a muta la coșul de gunoi %s"
 
-#: ../gio/glocalfile.c:2050 ../gio/glocalfile.c:2070
-#, fuzzy, c-format
-#| msgid "Unable to find or create trash directory"
+#: ../gio/glocalfile.c:1979
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr ""
+"Mutarea la coșul de gunoi în montările interne de sistem nu este suportată"
+
+#: ../gio/glocalfile.c:2063 ../gio/glocalfile.c:2083
+#, c-format
 msgid "Unable to find or create trash directory for %s"
-msgstr "Nu s-a putut găsi ori crea directorul coșului de gunoi"
+msgstr "Nu se poate găsi sau crea directorul coșului de gunoi pentru %s"
 
-#: ../gio/glocalfile.c:2105
-#, fuzzy, c-format
-#| msgid "Unable to create trashing info file: %s"
+#: ../gio/glocalfile.c:2118
+#, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr ""
-"Nu s-a putut crea fișierul cu detalii despre mutarea la coșul de gunoi: %s"
+"Nu se poate crea fișierul cu informații despre mutarea la coșul de gunoi "
+"pentru %s: %s"
 
-#: ../gio/glocalfile.c:2164
-#, fuzzy, c-format
-#| msgid "Unable to trash file: %s"
+#: ../gio/glocalfile.c:2177
+#, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
-msgstr "Nu s-a putut muta la coș fișierul: %s"
+msgstr ""
+"Nu se poate muta la coșul de gunoi fișierul %s dincolo de limitele "
+"sistemului de fișiere"
 
-#: ../gio/glocalfile.c:2168 ../gio/glocalfile.c:2224
-#, fuzzy, c-format
-#| msgid "Unable to trash file: %s"
+#: ../gio/glocalfile.c:2181 ../gio/glocalfile.c:2237
+#, c-format
 msgid "Unable to trash file %s: %s"
-msgstr "Nu s-a putut muta la coș fișierul: %s"
+msgstr "Nu se poate muta la coșul de gunoi fișierul %s: %s"
 
-#: ../gio/glocalfile.c:2230
-#, fuzzy, c-format
-#| msgid "Unable to trash file: %s"
+#: ../gio/glocalfile.c:2243
+#, c-format
 msgid "Unable to trash file %s"
-msgstr "Nu s-a putut muta la coș fișierul: %s"
+msgstr "Nu se poate muta la gunoi fișierul %s"
 
-#: ../gio/glocalfile.c:2256
-#, fuzzy, c-format
-#| msgid "Error creating directory '%s': %s"
+#: ../gio/glocalfile.c:2269
+#, c-format
 msgid "Error creating directory %s: %s"
-msgstr "Eroare la crearea dosarului „%s�: %s"
+msgstr "Eroare la crearea directorului %s: %s"
 
-#: ../gio/glocalfile.c:2285
+#: ../gio/glocalfile.c:2298
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Sistemul de fișiere nu suportă legături simbolice"
 
-#: ../gio/glocalfile.c:2288
-#, fuzzy, c-format
-#| msgid "Error making symbolic link: %s"
+#: ../gio/glocalfile.c:2301
+#, c-format
 msgid "Error making symbolic link %s: %s"
-msgstr "Eroare la crearea legăturii simbolice: %s"
+msgstr "Eroare la crearea legăturii simbolice %s: %s"
 
-#: ../gio/glocalfile.c:2294 ../glib/gfileutils.c:2077
+#: ../gio/glocalfile.c:2307 ../glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "Legăturile simbolice nu sunt implementate"
 
-#: ../gio/glocalfile.c:2349 ../gio/glocalfile.c:2384 ../gio/glocalfile.c:2441
-#, fuzzy, c-format
-#| msgid "Error moving file: %s"
+#: ../gio/glocalfile.c:2362 ../gio/glocalfile.c:2397 ../gio/glocalfile.c:2454
+#, c-format
 msgid "Error moving file %s: %s"
-msgstr "Eroare la mutarea fișierului: %s"
+msgstr "Eroare la mutarea fișierului %s: %s"
 
-#: ../gio/glocalfile.c:2372
-#, fuzzy
-#| msgid "Can't move directory over directory"
+#: ../gio/glocalfile.c:2385
 msgid "Can’t move directory over directory"
-msgstr "Nu se poate muta un director peste un alt director"
+msgstr "Nu se poate muta un director peste alt director"
 
-#: ../gio/glocalfile.c:2398 ../gio/glocalfileoutputstream.c:933
-#: ../gio/glocalfileoutputstream.c:947 ../gio/glocalfileoutputstream.c:962
-#: ../gio/glocalfileoutputstream.c:979 ../gio/glocalfileoutputstream.c:993
+#: ../gio/glocalfile.c:2411 ../gio/glocalfileoutputstream.c:935
+#: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
+#: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Crearea fișierului de rezervă a eșuat"
 
-#: ../gio/glocalfile.c:2417
+#: ../gio/glocalfile.c:2430
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Eroare la ștergerea fișierului destinație: %s"
 
-#: ../gio/glocalfile.c:2431
+#: ../gio/glocalfile.c:2444
 msgid "Move between mounts not supported"
 msgstr ""
 "Operațiunea de mutare între două dispozitive montate nu este implementată"
 
-#: ../gio/glocalfile.c:2622
-#, fuzzy, c-format
-#| msgid "could not get remote address: %s"
+#: ../gio/glocalfile.c:2635
+#, c-format
 msgid "Could not determine the disk usage of %s: %s"
-msgstr "nu s-a putut obține adresa la distanță: %s"
+msgstr "Nu s-a putut determina utilizarea discului a %s: %s"
 
-#: ../gio/glocalfileinfo.c:731
+#: ../gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "Valoarea atributului trebuie să fie diferită de NULL"
 
-#: ../gio/glocalfileinfo.c:738
+#: ../gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Tip incorect de atribut (se aștepta un șir)"
 
-#: ../gio/glocalfileinfo.c:745
+#: ../gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Nume incorect de atribut extins"
 
-#: ../gio/glocalfileinfo.c:785
-#, fuzzy, c-format
-#| msgid "Error setting extended attribute '%s': %s"
+#: ../gio/glocalfileinfo.c:799
+#, c-format
 msgid "Error setting extended attribute “%s�: %s"
-msgstr "Eroare la setarea atributului extins „%s�: %s"
+msgstr "Eroare la stabilirea atributului extins „%s�: %s"
 
-#: ../gio/glocalfileinfo.c:1586
+#: ../gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (codare incorectă)"
 
-#: ../gio/glocalfileinfo.c:1777 ../gio/glocalfileoutputstream.c:811
-#, fuzzy, c-format
-#| msgid "Error opening nonce file '%s': %s"
+#: ../gio/glocalfileinfo.c:1783 ../gio/glocalfileoutputstream.c:813
+#, c-format
 msgid "Error when getting information for file “%s�: %s"
-msgstr "Eroare la deschiderea fișierului nonce „%s�: %s"
+msgstr "Eroare în timpul obținerii de informații pentru fișierul „%s�: %s"
 
-#: ../gio/glocalfileinfo.c:2028
-#, fuzzy, c-format
-#| msgid "Error stating file descriptor: %s"
+#: ../gio/glocalfileinfo.c:2045
+#, c-format
 msgid "Error when getting information for file descriptor: %s"
-msgstr "Eroare la citirea descriptorilor fișierului: %s"
+msgstr ""
+"Eroare în timpul obținerii de informații pentru descriptorul de fișier: %s"
 
-#: ../gio/glocalfileinfo.c:2073
+#: ../gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Tip incorect de atribut (se aștepta o valoare uint32)"
 
-#: ../gio/glocalfileinfo.c:2091
+#: ../gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Tip incorect de atribut (se aștepta o valoare uint64)"
 
-#: ../gio/glocalfileinfo.c:2110 ../gio/glocalfileinfo.c:2129
+#: ../gio/glocalfileinfo.c:2127 ../gio/glocalfileinfo.c:2146
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Tip incorect de atribut (se aștepta un șir de octeți)"
 
-#: ../gio/glocalfileinfo.c:2164
+#: ../gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "Nu se pot defini drepturi pentru legături simbolice"
 
-#: ../gio/glocalfileinfo.c:2180
+#: ../gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Eroare la definirea drepturilor: %s"
 
-#: ../gio/glocalfileinfo.c:2231
+#: ../gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Eroare la definirea deținătorului: %s"
 
-#: ../gio/glocalfileinfo.c:2254
+#: ../gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "legătura simbolică trebuie să fie diferită de NULL"
 
-#: ../gio/glocalfileinfo.c:2264 ../gio/glocalfileinfo.c:2283
-#: ../gio/glocalfileinfo.c:2294
+#: ../gio/glocalfileinfo.c:2291 ../gio/glocalfileinfo.c:2310
+#: ../gio/glocalfileinfo.c:2321
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Eroare la definirea legăturii simbolice: %s"
 
-#: ../gio/glocalfileinfo.c:2273
+#: ../gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Eroare la definirea legăturii simbolice: fișierul nu este o legătură "
 "simbolică"
 
-#: ../gio/glocalfileinfo.c:2399
+#: ../gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Eroare la schimbarea datei de acces ori modificare: %s"
 
-#: ../gio/glocalfileinfo.c:2422
+#: ../gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "Contextul SELinux trebuie să fie diferit de NULL"
 
-#: ../gio/glocalfileinfo.c:2437
+#: ../gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Eroare la definirea contextului SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2444
+#: ../gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux nu este activat pentru acest sistem"
 
-#: ../gio/glocalfileinfo.c:2536
+#: ../gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Definirea atributului %s nu este implementată"
 
-#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:694
+#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:696
 #, c-format
 msgid "Error reading from file: %s"
 msgstr "Eroare la citirea din fișier: %s"
 
 #: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211
 #: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333
-#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1011
+#: ../gio/glocalfileoutputstream.c:458 ../gio/glocalfileoutputstream.c:1013
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "Eroare la căutarea în fișier: %s"
 
-#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:246
-#: ../gio/glocalfileoutputstream.c:340
+#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:248
+#: ../gio/glocalfileoutputstream.c:342
 #, c-format
 msgid "Error closing file: %s"
 msgstr "Eroare la închiderea fișierului: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: ../gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr "Nu s-a găsit tipul implicit de monitorizare a fișierelor locale"
 
-#: ../gio/glocalfileoutputstream.c:194 ../gio/glocalfileoutputstream.c:226
-#: ../gio/glocalfileoutputstream.c:715
+#: ../gio/glocalfileoutputstream.c:196 ../gio/glocalfileoutputstream.c:228
+#: ../gio/glocalfileoutputstream.c:717
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "Eroare la scrierea în fișier: %s"
 
-#: ../gio/glocalfileoutputstream.c:273
+#: ../gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Eroare la ștergerea vechii legături simbolice de backup: %s"
 
-#: ../gio/glocalfileoutputstream.c:287 ../gio/glocalfileoutputstream.c:300
+#: ../gio/glocalfileoutputstream.c:289 ../gio/glocalfileoutputstream.c:302
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "Eroare la crearea copiei de backup: %s"
 
-#: ../gio/glocalfileoutputstream.c:318
+#: ../gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Eroare la redenumirea fișierului temporar: %s"
 
-#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1062
+#: ../gio/glocalfileoutputstream.c:504 ../gio/glocalfileoutputstream.c:1064
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "Eroare la trunchierea fișierului: %s"
 
-#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:793
-#: ../gio/glocalfileoutputstream.c:1043 ../gio/gsubprocess.c:380
-#, fuzzy, c-format
-#| msgid "Error opening file '%s': %s"
+#: ../gio/glocalfileoutputstream.c:557 ../gio/glocalfileoutputstream.c:795
+#: ../gio/glocalfileoutputstream.c:1045 ../gio/gsubprocess.c:380
+#, c-format
 msgid "Error opening file “%s�: %s"
 msgstr "Eroare la deschiderea fișierului „%s�: %s"
 
-#: ../gio/glocalfileoutputstream.c:824
+#: ../gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Fișierul destinație este un director"
 
-#: ../gio/glocalfileoutputstream.c:829
+#: ../gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Fișierul destinație nu este un fișier obișnuit"
 
-#: ../gio/glocalfileoutputstream.c:841
+#: ../gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "Fișierul a fost modificat de o terță parte"
 
-#: ../gio/glocalfileoutputstream.c:1027
+#: ../gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Eroare la ștergerea vechiului fișier: %s"
@@ -3364,7 +3216,7 @@ msgstr "S-a primit un GSeekType nevalid"
 
 #: ../gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
-msgstr "Cerere nevalidă de căutare"
+msgstr "Cerere de căutare nevalidă"
 
 #: ../gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
@@ -3397,110 +3249,85 @@ msgstr "S-a cerut mutarea cursorului după sfârșitul fluxului"
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:393
-#, fuzzy
-#| msgid "mount doesn't implement \"unmount\""
+#: ../gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
-msgstr "obiectul montat nu implementează operația de demontare „unmount�"
+msgstr "montarea nu implementează operația de demontare „unmount�"
 
 #. 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\""
+#: ../gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
-msgstr "obiectul montat nu implementează operația de scoatere „eject�"
+msgstr "montarea nu implementează operația de scoatere „eject�"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:547
-#, fuzzy
-#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
+#: ../gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
-msgstr ""
-"obiectul montat nu implementează „unmount� sau „unmount_with_operation�"
+msgstr "montarea nu implementează „unmount� sau „unmount_with_operation�"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:632
-#, fuzzy
-#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
+#: ../gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
-msgstr "obiectul montat nu implementează „eject� sau „eject_with_operation�"
+msgstr "montarea nu implementează „eject� sau „eject_with_operation�"
 
 #. 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\""
+#: ../gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
-msgstr "obiectul montat nu implementează operația „remount�"
+msgstr "montarea nu implementează operația de remontare „remount�"
 
 #. 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"
+#: ../gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
-msgstr "obiectul montat nu implementează detecția automată a conținutului"
+msgstr "montarea nu implementează detecția tipului de conținut"
 
 #. Translators: This is an error
 #. * 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"
+#: ../gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
-msgstr ""
-"obiectul montat nu implementează detecția automată și sincronizată a "
-"conținutului"
+msgstr "montarea nu implementează detecția sincronizată a tipului de conținut"
 
 #: ../gio/gnetworkaddress.c:378
-#, fuzzy, c-format
-#| msgid "Hostname '%s' contains '[' but not ']'"
+#, c-format
 msgid "Hostname “%s� contains “[� but not “]�"
 msgstr "Numele de gazdă „%s� conține „[� dar nu și „]�"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
-#, fuzzy
-#| msgid "Network unreachable through SOCKSv5 proxy."
+#: ../gio/gnetworkmonitorbase.c:211 ../gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
-msgstr "Rețeaua nu poate fi contactată prin intermediul proxy-ului SOCKSv5."
+msgstr "Nu se poate accesa rețeaua"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: ../gio/gnetworkmonitorbase.c:249 ../gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
-msgstr ""
+msgstr "Nu se poate accesa gazda"
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
-#, fuzzy, c-format
-#| msgid "could not get remote address: %s"
+#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
+#: ../gio/gnetworkmonitornetlink.c:128
+#, c-format
 msgid "Could not create network monitor: %s"
-msgstr "nu s-a putut obține adresa la distanță: %s"
+msgstr "Nu s-a putut crea monitorul de rețea: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: ../gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
-msgstr ""
+msgstr "Nu s-a putut crea monitorul de rețea: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
-#, fuzzy
-#| msgid "could not get remote address: %s"
+#: ../gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
-msgstr "nu s-a putut obține adresa la distanță: %s"
+msgstr "Nu s-a putut obține starea rețelei: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: ../gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
-msgstr ""
+msgstr "Versiunea de NetworkManager este prea veche"
 
 #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
-#, fuzzy
-#| msgid "Output stream doesn't implement write"
 msgid "Output stream doesn’t implement write"
 msgstr "Fluxul de ieșire nu implementează scrierea"
 
@@ -3510,38 +3337,39 @@ msgstr "Sursa fluxului este deja închisă"
 
 #: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
-#, fuzzy, c-format
-#| msgid "Error resolving '%s': %s"
+#, c-format
 msgid "Error resolving “%s�: %s"
 msgstr "Eroare la rezolvarea „%s�: %s"
 
-#: ../gio/gresource.c:606 ../gio/gresource.c:857 ../gio/gresource.c:874
-#: ../gio/gresource.c:998 ../gio/gresource.c:1070 ../gio/gresource.c:1143
-#: ../gio/gresource.c:1213 ../gio/gresourcefile.c:453
-#: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
+#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
+msgid "Invalid domain"
+msgstr "Domeniu nevalid"
+
+#: ../gio/gresource.c:621 ../gio/gresource.c:880 ../gio/gresource.c:919
+#: ../gio/gresource.c:1043 ../gio/gresource.c:1115 ../gio/gresource.c:1188
+#: ../gio/gresource.c:1258 ../gio/gresourcefile.c:476
+#: ../gio/gresourcefile.c:599 ../gio/gresourcefile.c:736
 #, c-format
 msgid "The resource at “%s� does not exist"
-msgstr ""
+msgstr "Resursa de la „%s� nu există"
 
-#: ../gio/gresource.c:771
+#: ../gio/gresource.c:786
 #, c-format
 msgid "The resource at “%s� failed to decompress"
-msgstr ""
+msgstr "Resursa de la „%s� nu s-a putut decomprima"
 
-#: ../gio/gresourcefile.c:709
+#: ../gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s� is not a directory"
-msgstr ""
+msgstr "Resursa de la „%s� nu este un director"
 
-#: ../gio/gresourcefile.c:917
-#, fuzzy
-#| msgid "Input stream doesn't implement read"
+#: ../gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
-msgstr "Fluxul de input nu are implementată o funcție de citire"
+msgstr "Fluxul de intrare nu implementează căutarea"
 
 #: ../gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
-msgstr ""
+msgstr "Listează secțiunile care conțin resurse într-un FIȘIER elf"
 
 #: ../gio/gresource-tool.c:500
 msgid ""
@@ -3549,15 +3377,18 @@ msgid ""
 "If SECTION is given, only list resources in this section\n"
 "If PATH is given, only list matching resources"
 msgstr ""
+"Listează resursele\n"
+"Dacă s-a furnizat SECȚIUNE, listează resursele doar din această secțiune\n"
+"Dacă s-a furnizat CALE, listează doar resursele care se potrivesc"
 
 #: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
 msgid "FILE [PATH]"
-msgstr ""
+msgstr "FIȘIER [CALE]"
 
 #: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514
 #: ../gio/gresource-tool.c:521
 msgid "SECTION"
-msgstr ""
+msgstr "SECÈšIUNE"
 
 #: ../gio/gresource-tool.c:509
 msgid ""
@@ -3566,16 +3397,18 @@ msgid ""
 "If PATH is given, only list matching resources\n"
 "Details include the section, size and compression"
 msgstr ""
+"Listează resursele cu detalii\n"
+"Dacă s-a furnizat SECȚIUNE, listează resursele doar din această secțiune\n"
+"Dacă s-a furnizat CALE, listează doar resursele care se potrivesc\n"
+"Detaliile includ secțiunea, dimensiunea și compresia"
 
 #: ../gio/gresource-tool.c:519
 msgid "Extract a resource file to stdout"
-msgstr ""
+msgstr "Extrage un fișier resursă la stdout"
 
 #: ../gio/gresource-tool.c:520
-#, fuzzy
-#| msgid "PATH"
 msgid "FILE PATH"
-msgstr "CALE"
+msgstr "CALE FIȘIER"
 
 #: ../gio/gresource-tool.c:534
 msgid ""
@@ -3592,15 +3425,21 @@ msgid ""
 "Use “gresource help COMMAND� to get detailed help.\n"
 "\n"
 msgstr ""
+"Utilizare:\n"
+"  gresource [--section SECȚIUNE] COMANDĂ [ARGUMENTE…]\n"
+"\n"
+"Comenzi:\n"
+"  help                      Arată aceste informații\n"
+"  sections                  Listează secțiunile de resursă\n"
+"  list                      Listează resursele\n"
+"  details                   Listează resursele cu detalii\n"
+"  extract                   Extrage o resursă\n"
+"\n"
+"Utilizați “gresource help COMANDĂ� pentru a obține ajutor detaliat.\n"
+"\n"
 
 #: ../gio/gresource-tool.c:548
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage:\n"
-#| "  gsettings %s %s\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
+#, c-format
 msgid ""
 "Usage:\n"
 "  gresource %s%s%s %s\n"
@@ -3609,38 +3448,38 @@ msgid ""
 "\n"
 msgstr ""
 "Utilizare:\n"
-"  gsettings %s %s\n"
+"  gresource %s%s%s %s\n"
 "\n"
 "%s\n"
 "\n"
 
 #: ../gio/gresource-tool.c:555
 msgid "  SECTION   An (optional) elf section name\n"
-msgstr ""
+msgstr "  SECȚIUNE   Un nume (opțional) de secțiune elf\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:656
+#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMANDĂ   Comandă (opțională) de explicat\n"
 
 #: ../gio/gresource-tool.c:565
 msgid "  FILE      An elf file (a binary or a shared library)\n"
-msgstr ""
+msgstr "  FIȘIER      Un fișier elf (o bibliotecă binară sau partajată)\n"
 
 #: ../gio/gresource-tool.c:568
 msgid ""
 "  FILE      An elf file (a binary or a shared library)\n"
 "            or a compiled resource file\n"
 msgstr ""
+"  FIȘIER      Un fișier elf (o bibliotecă binară sau partajată)\n"
+"            sau un fișier resursă partajat\n"
 
 #: ../gio/gresource-tool.c:572
-#, fuzzy
-#| msgid "PATH"
 msgid "[PATH]"
-msgstr "CALE"
+msgstr "[CALE]"
 
 #: ../gio/gresource-tool.c:574
 msgid "  PATH      An (optional) resource path (may be partial)\n"
-msgstr ""
+msgstr "  CALE      O cale (opțională) de resursă (poate fi parțială)\n"
 
 #: ../gio/gresource-tool.c:575
 msgid "PATH"
@@ -3648,24 +3487,21 @@ msgstr "CALE"
 
 #: ../gio/gresource-tool.c:577
 msgid "  PATH      A resource path\n"
-msgstr ""
+msgstr "  CALE      O cale de resursă\n"
 
 #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:853
-#, fuzzy, c-format
-#| msgid "No such schema '%s'\n"
+#: ../gio/gsettings-tool.c:908
+#, c-format
 msgid "No such schema “%s�\n"
 msgstr "Nu există schema „%s�\n"
 
 #: ../gio/gsettings-tool.c:57
-#, fuzzy, c-format
-#| msgid "Schema '%s' is not relocatable (path must not be specified)\n"
+#, c-format
 msgid "Schema “%s� is not relocatable (path must not be specified)\n"
 msgstr "Schema „%s� nu este relocalizabilă (nu trebuie specificată calea)\n"
 
 #: ../gio/gsettings-tool.c:78
-#, fuzzy, c-format
-#| msgid "Schema '%s' is relocatable (path must be specified)\n"
+#, c-format
 msgid "Schema “%s� is relocatable (path must be specified)\n"
 msgstr "Schema „%s� este relocalizabilă (trebuie specificată calea)\n"
 
@@ -3689,39 +3525,38 @@ msgstr "Calea trebuie să se termine cu o bară oblică (/)\n"
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Calea trebuie să nu conțină două bare oblice adiacente (//)\n"
 
-#: ../gio/gsettings-tool.c:491
+#: ../gio/gsettings-tool.c:538
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "Valoarea furnizată este în afara intervalului valid\n"
 
-#: ../gio/gsettings-tool.c:498
-#, fuzzy, c-format
-#| msgid "Key %s is not writable\n"
+#: ../gio/gsettings-tool.c:545
+#, c-format
 msgid "The key is not writable\n"
-msgstr "Cheia %s nu poate fi scrisă\n"
+msgstr "Cheia nu este inscripționabilă\n"
 
-#: ../gio/gsettings-tool.c:534
+#: ../gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Listează schemele (nerelocalizabile) instalate"
 
-#: ../gio/gsettings-tool.c:540
+#: ../gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Listează schemele relocalizabile instalate"
 
-#: ../gio/gsettings-tool.c:546
+#: ../gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Listează cheile din SCHEMĂ"
 
-#: ../gio/gsettings-tool.c:547 ../gio/gsettings-tool.c:553
-#: ../gio/gsettings-tool.c:596
+#: ../gio/gsettings-tool.c:594 ../gio/gsettings-tool.c:600
+#: ../gio/gsettings-tool.c:643
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMÄ‚[:CALE]"
 
-#: ../gio/gsettings-tool.c:552
+#: ../gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Listează copiii SCHEMEI"
 
-#: ../gio/gsettings-tool.c:558
+#: ../gio/gsettings-tool.c:605
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -3729,51 +3564,49 @@ msgstr ""
 "Listează chei și valori, recursiv\n"
 "Dacă nu a fost furnizată nicio SCHEMĂ, listează toate cheile\n"
 
-#: ../gio/gsettings-tool.c:560
+#: ../gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHEMÄ‚[:CALE]]"
 
-#: ../gio/gsettings-tool.c:565
+#: ../gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Obține valoarea CHEII"
 
-#: ../gio/gsettings-tool.c:566 ../gio/gsettings-tool.c:572
-#: ../gio/gsettings-tool.c:578 ../gio/gsettings-tool.c:590
-#: ../gio/gsettings-tool.c:602
+#: ../gio/gsettings-tool.c:613 ../gio/gsettings-tool.c:619
+#: ../gio/gsettings-tool.c:625 ../gio/gsettings-tool.c:637
+#: ../gio/gsettings-tool.c:649
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMÄ‚[:CALE] CHEIE"
 
-#: ../gio/gsettings-tool.c:571
+#: ../gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Interoghează intervalul valorilor valide pentru CHEIE"
 
-#: ../gio/gsettings-tool.c:577
-#, fuzzy
-#| msgid "Query the range of valid values for KEY"
+#: ../gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
-msgstr "Interoghează intervalul valorilor valide pentru CHEIE"
+msgstr "Interoghează descrierea pentru CHEIE"
 
-#: ../gio/gsettings-tool.c:583
+#: ../gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Setează valoarea CHEII la VALOARE"
 
-#: ../gio/gsettings-tool.c:584
+#: ../gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMÄ‚[:CALE] CHEIE VALOARE"
 
-#: ../gio/gsettings-tool.c:589
+#: ../gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Resetează CHEIA la valoarea ei implicită"
 
-#: ../gio/gsettings-tool.c:595
+#: ../gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
-msgstr ""
+msgstr "Restabilește toate cheile în SCHEMA la valorile implicite"
 
-#: ../gio/gsettings-tool.c:601
+#: ../gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Verifică dacă CHEIA poate fi scrisă"
 
-#: ../gio/gsettings-tool.c:607
+#: ../gio/gsettings-tool.c:654
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -3784,12 +3617,11 @@ msgstr ""
 "SCHEMÄ‚.\n"
 "Folosiți ^C pentru a opri monitorizarea.\n"
 
-#: ../gio/gsettings-tool.c:610
+#: ../gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMÄ‚[:CALE] [CHEIE]"
 
-#: ../gio/gsettings-tool.c:622
-#, fuzzy
+#: ../gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3815,33 +3647,30 @@ msgid ""
 "\n"
 msgstr ""
 "Utilizare:\n"
-"  gsettings COMANDÄ‚ [ARGUMENTE...]\n"
+"  gsettings --version\n"
+"  gsettings [--schemadir SCHEMADIR] COMANDĂ [ARGS…]\n"
 "\n"
 "Comenzi:\n"
 "  help                      Arată aceste informații\n"
 "  list-schemas              Listează schemele instalate\n"
 "  list-relocatable-schemas  Listează schemele relocalizabile\n"
 "  list-keys                 Listează cheile dintr-o schemă\n"
-"  list-children             Listează copiii unei scheme\n"
+"  list-children             Listează inferiorii unei scheme\n"
 "  list-recursively          Listează cheile și valorile, recursiv\n"
 "  range                     Interoghează intervalul unei chei\n"
+"  describe                  Interoghează descrierea unei chei\n"
 "  get                       Obține valoarea unei chei\n"
-"  set                       Setează valoarea unei chei\n"
-"  reset                     Resetează valoarea unei chei\n"
-"  writable                  Verifică dacă o cheie poate fi scrisă\n"
+"  set                       Stabilește valoarea unei chei\n"
+"  reset                     Restabilește valoarea unei chei\n"
+"  reset-recursively         Restabilește toate valorile într-o schemă dată\n"
+"  writable                  Verifică dacă o cheie este inscripționabilă\n"
 "  monitor                   Monitorizează modificările\n"
 "\n"
 "Folosiți comanda „gsettings help COMANDĂ� pentru a obține ajutor detaliat.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:646
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage:\n"
-#| "  gsettings %s %s\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
+#: ../gio/gsettings-tool.c:693
+#, c-format
 msgid ""
 "Usage:\n"
 "  gsettings [--schemadir SCHEMADIR] %s %s\n"
@@ -3850,16 +3679,16 @@ msgid ""
 "\n"
 msgstr ""
 "Utilizare:\n"
-"  gsettings %s %s\n"
+"  gsettings [--schemadir SCHEMADIR] %s %s\n"
 "\n"
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:652
+#: ../gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
-msgstr ""
+msgstr "  SCHEMADIR Un director pentru căutarea de scheme adiționale\n"
 
-#: ../gio/gsettings-tool.c:660
+#: ../gio/gsettings-tool.c:707
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -3867,188 +3696,210 @@ msgstr ""
 "  SCHEMÄ‚    Numele schemei\n"
 "  CALE      Calea, pentru schemele relocalizabile\n"
 
-#: ../gio/gsettings-tool.c:665
+#: ../gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  CHEIE     Cheia (opțională) din schemă\n"
 
-#: ../gio/gsettings-tool.c:669
+#: ../gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  CHEIE     Cheia din schemă\n"
 
-#: ../gio/gsettings-tool.c:673
+#: ../gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  VALOARE   Valoarea de setat\n"
 
-#: ../gio/gsettings-tool.c:728
-#, fuzzy, c-format
-#| msgid "Could not open converter from '%s' to '%s'"
+#: ../gio/gsettings-tool.c:775
+#, c-format
 msgid "Could not load schemas from %s: %s\n"
-msgstr "Nu s-a putut deschide convertorul de la „%s� la „%s�"
+msgstr "Nu s-au putut încărca schemele de la %s: %s\n"
 
-#: ../gio/gsettings-tool.c:740
-#, fuzzy, c-format
-#| msgid "No schema files found: "
+#: ../gio/gsettings-tool.c:787
+#, c-format
 msgid "No schemas installed\n"
-msgstr "Nu s-a găsit niciun fișier schemă: "
+msgstr "Nu sunt scheme instalate\n"
 
-#: ../gio/gsettings-tool.c:811
+#: ../gio/gsettings-tool.c:866
 #, c-format
 msgid "Empty schema name given\n"
 msgstr "Numele schemei dat este gol \n"
 
-#: ../gio/gsettings-tool.c:866
-#, fuzzy, c-format
-#| msgid "No such key '%s'\n"
+#: ../gio/gsettings-tool.c:921
+#, c-format
 msgid "No such key “%s�\n"
 msgstr "Nu există cheia „%s�\n"
 
-#: ../gio/gsocket.c:379
+#: ../gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Socket nevalid (neinițializat)"
 
-#: ../gio/gsocket.c:386
+#: ../gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket nevalid, inițializarea a eșuat din următoarea cauză: %s"
 
-#: ../gio/gsocket.c:394
+#: ../gio/gsocket.c:399
 msgid "Socket is already closed"
 msgstr "Socket-ul este deja închis"
 
-#: ../gio/gsocket.c:409 ../gio/gsocket.c:2765 ../gio/gsocket.c:3950
-#: ../gio/gsocket.c:4008
+#: ../gio/gsocket.c:414 ../gio/gsocket.c:3034 ../gio/gsocket.c:4244
+#: ../gio/gsocket.c:4302
 msgid "Socket I/O timed out"
 msgstr "A expirat limita de timp la I/O pe socket"
 
-#: ../gio/gsocket.c:541
+#: ../gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "se creează GSocket din fd: %s"
 
-#: ../gio/gsocket.c:570 ../gio/gsocket.c:624 ../gio/gsocket.c:631
+#: ../gio/gsocket.c:578 ../gio/gsocket.c:632 ../gio/gsocket.c:639
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nu s-a putut crea socket-ul: %s"
 
-#: ../gio/gsocket.c:624
-#, fuzzy
-#| msgid "Unknown protocol was specified"
+#: ../gio/gsocket.c:632
 msgid "Unknown family was specified"
-msgstr "S-a specificat un protocol necunoscut"
+msgstr "S-a specificat o familie necunoscută"
 
-#: ../gio/gsocket.c:631
+#: ../gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "S-a specificat un protocol necunoscut"
 
-#: ../gio/gsocket.c:1122
+#: ../gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
-msgstr ""
+msgstr "Nu se pot utiliza operațiile de datagramă pe un soclu non-datagramă."
 
-#: ../gio/gsocket.c:1139
+#: ../gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
+"Nu se pot utiliza operațiile de datagramă pe un soclu care are stabilită o "
+"limită de timp."
 
-#: ../gio/gsocket.c:1943
+#: ../gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nu s-a putut obține adresa locală: %s"
 
-#: ../gio/gsocket.c:1986
+#: ../gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nu s-a putut obține adresa la distanță: %s"
 
-#: ../gio/gsocket.c:2052
+#: ../gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "nu s-a putut asculta: %s"
 
-#: ../gio/gsocket.c:2151
+#: ../gio/gsocket.c:2168
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Eroare la asocierea adresei: %s"
 
-#: ../gio/gsocket.c:2266 ../gio/gsocket.c:2303
-#, fuzzy, c-format
-#| msgid "Error launching application: %s"
+#: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
+#: ../gio/gsocket.c:2398 ../gio/gsocket.c:2471 ../gio/gsocket.c:2529
+#: ../gio/gsocket.c:2547
+#, c-format
 msgid "Error joining multicast group: %s"
-msgstr "Eroare la lansarea aplicației: %s"
+msgstr "Eroare la alăturarea grupului multicast: %s"
 
-#: ../gio/gsocket.c:2267 ../gio/gsocket.c:2304
-#, fuzzy, c-format
-#| msgid "Error launching application: %s"
+#: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
+#: ../gio/gsocket.c:2399 ../gio/gsocket.c:2472 ../gio/gsocket.c:2530
+#: ../gio/gsocket.c:2548
+#, c-format
 msgid "Error leaving multicast group: %s"
-msgstr "Eroare la lansarea aplicației: %s"
+msgstr "Eroare la părăsirea grupului multicast: %s"
 
-#: ../gio/gsocket.c:2268
+#: ../gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
+msgstr "Nu există niciun suport pentru difuzarea multiplă specifică sursei"
+
+#: ../gio/gsocket.c:2375
+msgid "Unsupported socket family"
+msgstr "Familie de soclu nesuportată"
+
+#: ../gio/gsocket.c:2400
+msgid "source-specific not an IPv4 address"
+msgstr "specific sursei nu o adresă IPv4"
+
+#: ../gio/gsocket.c:2418 ../gio/gsocket.c:2447 ../gio/gsocket.c:2497
+#, c-format
+msgid "Interface not found: %s"
+msgstr "Nu s-a putut găsi interfața: %s"
+
+#: ../gio/gsocket.c:2434
+#, c-format
+msgid "Interface name too long"
+msgstr "Numele de interfață este prea lung"
+
+#: ../gio/gsocket.c:2473
+msgid "No support for IPv4 source-specific multicast"
 msgstr ""
+"Nu există niciun suport pentru difuzarea multiplă specifică sursei IPv4"
 
-#: ../gio/gsocket.c:2488
+#: ../gio/gsocket.c:2531
+msgid "No support for IPv6 source-specific multicast"
+msgstr ""
+"Nu există niciun suport pentru difuzarea multiplă specifică sursei IPv6"
+
+#: ../gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Eroare la acceptarea conexiunii: %s"
 
-#: ../gio/gsocket.c:2609
+#: ../gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Conectare în progres"
 
-#: ../gio/gsocket.c:2658
-#, fuzzy
-#| msgid "Unable to get pending error: %s"
+#: ../gio/gsocket.c:2913
 msgid "Unable to get pending error: "
-msgstr "Nu s-a putut obține eroarea în așteptare: %s"
+msgstr "Nu se poate obține eroarea în așteptare: "
 
-#: ../gio/gsocket.c:2828
+#: ../gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Eroare la primirea datelor: %s"
 
-#: ../gio/gsocket.c:3023
+#: ../gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Eroare la trimiterea datelor: %s"
 
-#: ../gio/gsocket.c:3210
-#, fuzzy, c-format
+#: ../gio/gsocket.c:3479
+#, c-format
 msgid "Unable to shutdown socket: %s"
-msgstr "Nu s-a putut crea socket-ul: %s"
+msgstr "Nu se poate opri soclul: %s"
 
-#: ../gio/gsocket.c:3291
+#: ../gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Eroare la închiderea socket-ului: %s"
 
-#: ../gio/gsocket.c:3943
+#: ../gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Se așteaptă condiția socket-ului: %s"
 
-#: ../gio/gsocket.c:4417 ../gio/gsocket.c:4497 ../gio/gsocket.c:4675
+#: ../gio/gsocket.c:4711 ../gio/gsocket.c:4791 ../gio/gsocket.c:4969
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Eroare la trimiterea mesajului: %s"
 
-#: ../gio/gsocket.c:4441
-#, fuzzy
-#| msgid "GSocketControlMessage not supported on windows"
+#: ../gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
-msgstr "GSocketControlMessage nu e implementat în Windows"
+msgstr "GSocketControlMessage nu este suportat pe Windows"
 
-#: ../gio/gsocket.c:4894 ../gio/gsocket.c:4967 ../gio/gsocket.c:5193
+#: ../gio/gsocket.c:5188 ../gio/gsocket.c:5261 ../gio/gsocket.c:5487
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Eroare la primirea mesajului: %s"
 
-#: ../gio/gsocket.c:5465
-#, fuzzy, c-format
-#| msgid "Unable to create socket: %s"
+#: ../gio/gsocket.c:5759
+#, c-format
 msgid "Unable to read socket credentials: %s"
-msgstr "Nu s-a putut crea socket-ul: %s"
+msgstr "Nu se pot citi certificările soclului: %s"
 
-#: ../gio/gsocket.c:5474
+#: ../gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials nu este implementat pe acest sistem de operare"
@@ -4056,65 +3907,51 @@ msgstr ""
 #: ../gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
-msgstr ""
+msgstr "Nu s-a putut conecta la serverul proxy %s: "
 
 #: ../gio/gsocketclient.c:190
-#, fuzzy, c-format
-#| msgid "Could not open converter from '%s' to '%s': %s"
+#, c-format
 msgid "Could not connect to %s: "
-msgstr "Nu s-a putut iniția conversia de la „%s� la „%s�: %s"
+msgstr "Nu s-a putut conecta la %s: "
 
 #: ../gio/gsocketclient.c:192
-#, fuzzy
-#| msgid "could not listen: %s"
 msgid "Could not connect: "
-msgstr "nu s-a putut asculta: %s"
+msgstr "Nu s-a putut conecta: "
 
 #: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Eroare necunoscută la conectare"
 
 #: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535
-#, fuzzy
-#| msgid "Trying to proxy over non-TCP connection is not supported."
 msgid "Proxying over a non-TCP connection is not supported."
 msgstr "Nu se poate utiliza proxy peste o conexiune non-TCP."
 
 #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
-#, fuzzy, c-format
-#| msgid "Proxy protocol '%s' is not supported."
+#, c-format
 msgid "Proxy protocol “%s� is not supported."
 msgstr "Protocolul proxy „%s� nu este suportat."
 
-#: ../gio/gsocketlistener.c:218
+#: ../gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Procesul de ascultare este deja închis"
 
-#: ../gio/gsocketlistener.c:264
+#: ../gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Socket-ul adăugat este închis"
 
 #: ../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 nu acceptă adresă IPv6 „%s�"
+msgstr "SOCKSv4 nu suportă adresa IPv6 „%s�"
 
 #: ../gio/gsocks4aproxy.c:136
-#, fuzzy
-#| msgid "Username or password is too long for SOCKSv5 protocol (max. is %i)."
 msgid "Username is too long for SOCKSv4 protocol"
-msgstr ""
-"Numele de utilizator sau parola este prea lungă pentru protocolul SOCKSv5 "
-"(lungimea maximă este %i)."
+msgstr "Numele de utilizator este prea lung pentru protocolul SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:153
-#, fuzzy, c-format
-#| msgid "Hostname '%s' too long for SOCKSv5 protocol (maximum is %i bytes)"
+#, c-format
 msgid "Hostname “%s� is too long for SOCKSv4 protocol"
-msgstr ""
-"Numele de gazdă „%s� este prea lung pentru protocolul SOCKSv5 (lungimea "
-"maximă este de %i octeți)."
+msgstr "Numele de gazdă „%s� este prea lung pentru protocolul SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
@@ -4141,12 +3978,9 @@ msgstr ""
 "SOCKSv5 necesită o metodă de autentificare ce nu este acceptată de GLib."
 
 #: ../gio/gsocks5proxy.c:206
-#, fuzzy
-#| msgid "Username or password is too long for SOCKSv5 protocol (max. is %i)."
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr ""
-"Numele de utilizator sau parola este prea lungă pentru protocolul SOCKSv5 "
-"(lungimea maximă este %i)."
+"Numele de utilizator sau parola este prea lungă pentru protocolul SOCKSv5."
 
 #: ../gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
@@ -4155,15 +3989,11 @@ msgstr ""
 "parole greșite."
 
 #: ../gio/gsocks5proxy.c:286
-#, fuzzy, c-format
-#| msgid "Hostname '%s' too long for SOCKSv5 protocol (maximum is %i bytes)"
+#, c-format
 msgid "Hostname “%s� is too long for SOCKSv5 protocol"
-msgstr ""
-"Numele de gazdă „%s� este prea lung pentru protocolul SOCKSv5 (lungimea "
-"maximă este de %i octeți)."
+msgstr "Numele de gazdă „%s� este prea lung pentru protocolul SOCKSv5"
 
 #: ../gio/gsocks5proxy.c:348
-#, fuzzy
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "Serverul proxy SOCKSv5 utilizează un tip de adresă necunoscut."
 
@@ -4188,10 +4018,8 @@ msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Conexiune refuzată prin proxy-ul SOCKSv5."
 
 #: ../gio/gsocks5proxy.c:386
-#, fuzzy
-#| msgid "SOCKSv5 proxy does not support 'connect' command."
 msgid "SOCKSv5 proxy does not support “connect� command."
-msgstr "Proxy-ul SOCKSv5 nu acceptă comanda „connect�."
+msgstr "Proxy-ul SOCKSv5 nu suportă comanda „connect�."
 
 #: ../gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
@@ -4202,49 +4030,43 @@ msgid "Unknown SOCKSv5 proxy error."
 msgstr "Eroare necunoscută a proxy-ului 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 "Nu se poate gestiona versiunea %d a codării GThemedIcon"
 
 #: ../gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
-msgstr ""
+msgstr "Nu s-au găsit adrese valide"
 
 #: ../gio/gthreadedresolver.c:213
-#, fuzzy, c-format
-#| msgid "Error reverse-resolving '%s': %s"
+#, c-format
 msgid "Error reverse-resolving “%s�: %s"
-msgstr "Eroare la rezolvarea inversă „%s�: %s"
+msgstr "Eroare la rezolvarea inversă a „%s�: %s"
 
-#: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
-#: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
+#: ../gio/gthreadedresolver.c:549 ../gio/gthreadedresolver.c:628
+#: ../gio/gthreadedresolver.c:726 ../gio/gthreadedresolver.c:776
 #, c-format
 msgid "No DNS record of the requested type for “%s�"
-msgstr ""
+msgstr "Nu există nicio înregistrare DNS a tipului solicitat pentru „%s�"
 
-#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
-#, fuzzy, c-format
-#| msgid "Temporarily unable to resolve '%s'"
+#: ../gio/gthreadedresolver.c:554 ../gio/gthreadedresolver.c:731
+#, c-format
 msgid "Temporarily unable to resolve “%s�"
-msgstr "Eroare temporară la rezolvarea „%s�"
+msgstr "Nu se poate rezolva temporar „%s�"
 
-#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
-#, fuzzy, c-format
-#| msgid "Error resolving '%s'"
+#: ../gio/gthreadedresolver.c:559 ../gio/gthreadedresolver.c:736
+#: ../gio/gthreadedresolver.c:844
+#, c-format
 msgid "Error resolving “%s�"
 msgstr "Eroare la rezolvarea „%s�"
 
 #: ../gio/gtlscertificate.c:250
-#, fuzzy
-#| msgid "Could not parse PEM-encoded private key"
 msgid "Cannot decrypt PEM-encoded private key"
-msgstr "Nu s-a putut parsa cheia privată codificată PEM"
+msgstr "Nu se poate decripta cheia privată codată PEM"
 
 #: ../gio/gtlscertificate.c:255
-#, fuzzy
 msgid "No PEM-encoded private key found"
-msgstr "Nu s-a găsit niciun certificat codificat PEM"
+msgstr "Nu s-a găsit nicio cheie privată codată PEM"
 
 #: ../gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
@@ -4263,6 +4085,8 @@ msgid ""
 "This is the last chance to enter the password correctly before your access "
 "is locked out."
 msgstr ""
+"Aceasta este ultima șansă de a introduce parola corect înainte ca accesul să "
+"fie blocat."
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
@@ -4271,17 +4095,18 @@ msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
 msgstr ""
+"Mai multe parole introduse nu au fost corecte, și accesul va fi blocat după "
+"alte eșecuri."
 
 #: ../gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
-msgstr ""
+msgstr "Parola introdusă nu este corectă."
 
 #: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:563
-#, fuzzy, c-format
-#| msgid "Expecting 1 control message, got %d"
+#, c-format
 msgid "Expecting 1 control message, got %d"
 msgid_plural "Expecting 1 control message, got %d"
-msgstr[0] "S-a așteptat un mesaj de control, dar s-au primit %d"
+msgstr[0] "S-a așteptat un mesaj de control, dar s-a primit %d"
 msgstr[1] "S-a așteptat un mesaj de control, dar s-au primit %d"
 msgstr[2] "S-a așteptat un mesaj de control, dar s-au primit %d"
 
@@ -4290,8 +4115,7 @@ msgid "Unexpected type of ancillary data"
 msgstr "Tip neașteptat de date auxiliare"
 
 #: ../gio/gunixconnection.c:200
-#, fuzzy, c-format
-#| msgid "Expecting one fd, but got %d\n"
+#, c-format
 msgid "Expecting one fd, but got %d\n"
 msgid_plural "Expecting one fd, but got %d\n"
 msgstr[0] "S-a așteptat un fd, dar s-a primit %d\n"
@@ -4324,9 +4148,9 @@ msgstr ""
 "s-au citi zero octeți"
 
 #: ../gio/gunixconnection.c:589
-#, fuzzy, c-format
+#, c-format
 msgid "Not expecting control message, but got %d"
-msgstr "S-a așteptat un mesaj de control, dar s-au primit %d"
+msgstr "Nu s-a așteptat un mesaj de control, dar s-a primit %d"
 
 #: ../gio/gunixconnection.c:614
 #, c-format
@@ -4334,50 +4158,41 @@ msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Eroare la dezactivarea SO_PASSCRED: %s"
 
 #: ../gio/gunixinputstream.c:372 ../gio/gunixinputstream.c:393
-#, fuzzy, c-format
-#| msgid "Error stating file descriptor: %s"
+#, c-format
 msgid "Error reading from file descriptor: %s"
-msgstr "Eroare la citirea descriptorilor fișierului: %s"
+msgstr "Eroare la citirea din descriptorul de fișier: %s"
 
 #: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:411
 #: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204
-#, fuzzy, c-format
-#| msgid "Error stating file descriptor: %s"
+#, c-format
 msgid "Error closing file descriptor: %s"
-msgstr "Eroare la citirea descriptorilor fișierului: %s"
+msgstr "Eroare la închiderea descriptorului de fișier: %s"
 
-#: ../gio/gunixmounts.c:2430 ../gio/gunixmounts.c:2483
+#: ../gio/gunixmounts.c:2589 ../gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Rădăcina sistemului de fișiere"
 
 #: ../gio/gunixoutputstream.c:358 ../gio/gunixoutputstream.c:378
-#, fuzzy, c-format
-#| msgid "Error stating file descriptor: %s"
+#, c-format
 msgid "Error writing to file descriptor: %s"
-msgstr "Eroare la citirea descriptorilor fișierului: %s"
+msgstr "Eroare la scrierea în descriptorul de fișier: %s"
 
-#: ../gio/gunixsocketaddress.c:241
-#, fuzzy
-#| msgid "Abstract unix domain socket addresses not supported on this system"
+#: ../gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
-"Adresele cu nume abstract de socket tip unix nu sunt implementate pe acest "
+"Adresele de soclu abstracte pentru domeniul UNIX nu sunt suportate pe acest "
 "sistem"
 
-#: ../gio/gvolume.c:437
-#, fuzzy
-#| msgid "volume doesn't implement eject"
+#: ../gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
-msgstr "Volumul nu implementează ejectarea"
+msgstr "volumul nu implementează eject"
 
 #. 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"
+#: ../gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
-msgstr "Volumul nu implementează „eject� sau „eject_with_operation�"
+msgstr "volumul nu implementează eject sau eject_with_operation"
 
 #: ../gio/gwin32inputstream.c:185
 #, c-format
@@ -4413,497 +4228,655 @@ msgstr "Date comprimate nevalid"
 
 #: ../gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
-msgstr ""
+msgstr "Adresa de pe care se ascultă"
 
 #: ../gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
-msgstr ""
+msgstr "Ignorat, pentru compatibilitate cu GTestDbus"
 
 #: ../gio/tests/gdbus-daemon.c:20
-#, fuzzy
-#| msgid "Print help"
 msgid "Print address"
-msgstr "Afișează ajutorul"
+msgstr "Tipărește adresa"
 
 #: ../gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
-msgstr ""
+msgstr "Tipărește adresa în modul shell"
 
 #: ../gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
-msgstr ""
+msgstr "Rulează un serviciu dbus"
 
 #: ../gio/tests/gdbus-daemon.c:42
 #, c-format
 msgid "Wrong args\n"
-msgstr ""
+msgstr "Argumente greșite\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 "Nu se aștepta un atribut „%s� pentru elementul „%s�"
+msgstr "Atribut neașteptat „%s� pentru elementul „%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 "Atributul „%s� al elementului „%s� nu a putut fi găsit"
+msgstr "Atributul „%s� al elementului „%s� nu a fost găsit"
 
 #: ../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 "S-a primit eticheta „%s�, se aștepta eticheta „%s�"
+msgstr "Etichetă neașteptată „%s�, se aștepta eticheta „%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 "Nu se aștepta eticheta „%s� în „%s�"
+msgstr "Etichetă neașteptată „%s� în „%s�"
 
-#: ../glib/gbookmarkfile.c:1756
+#: ../glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr "Nu s-a găsit un fișier valid cu favorite în directoarele de date"
 
-#: ../glib/gbookmarkfile.c:1957
-#, fuzzy, c-format
-#| msgid "A bookmark for URI '%s' already exists"
+#: ../glib/gbookmarkfile.c:1958
+#, c-format
 msgid "A bookmark for URI “%s� already exists"
 msgstr "Un favorit pentru URI-ul „%s� există deja"
 
-#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161
-#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326
-#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494
-#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651
-#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790
-#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100
-#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344
-#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522
-#: ../glib/gbookmarkfile.c:3638
-#, fuzzy, c-format
-#| msgid "No bookmark found for URI '%s'"
+#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
+#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
+#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
+#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
+#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
+#: ../glib/gbookmarkfile.c:2912 ../glib/gbookmarkfile.c:3102
+#: ../glib/gbookmarkfile.c:3178 ../glib/gbookmarkfile.c:3346
+#: ../glib/gbookmarkfile.c:3435 ../glib/gbookmarkfile.c:3524
+#: ../glib/gbookmarkfile.c:3640
+#, c-format
 msgid "No bookmark found for URI “%s�"
-msgstr "Nu s-a găsit un favorit pentru URI-ul „%s�"
+msgstr "Nu s-a găsit niciun favorit pentru URI-ul „%s�"
 
-#: ../glib/gbookmarkfile.c:2335
-#, fuzzy, c-format
-#| msgid "No MIME type defined in the bookmark for URI '%s'"
+#: ../glib/gbookmarkfile.c:2336
+#, c-format
 msgid "No MIME type defined in the bookmark for URI “%s�"
-msgstr "Nu există un tip MIME definit în favoritul URI-ului „%s�"
+msgstr "Nu s-a definit niciun tip MIME în favorit pentru URI-ul „%s�"
 
-#: ../glib/gbookmarkfile.c:2420
-#, fuzzy, c-format
-#| msgid "No private flag has been defined in bookmark for URI '%s'"
+#: ../glib/gbookmarkfile.c:2421
+#, c-format
 msgid "No private flag has been defined in bookmark for URI “%s�"
-msgstr "Nu există un indicator privat definit în favoritul URI-ului „%s�"
+msgstr "Nu s-a definit niciun fanion privat în favorit pentru URI-ul „%s�"
 
-#: ../glib/gbookmarkfile.c:2799
-#, fuzzy, c-format
-#| msgid "No groups set in bookmark for URI '%s'"
+#: ../glib/gbookmarkfile.c:2800
+#, c-format
 msgid "No groups set in bookmark for URI “%s�"
-msgstr "Nu există grupuri definite în favoritul URI-ului „%s�"
+msgstr "Nu s-au stabilit grupuri în favorit pentru URI-ul „%s�"
 
-#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
-#, fuzzy, c-format
-#| msgid "No application with name '%s' registered a bookmark for '%s'"
+#: ../glib/gbookmarkfile.c:3199 ../glib/gbookmarkfile.c:3356
+#, c-format
 msgid "No application with name “%s� registered a bookmark for “%s�"
-msgstr ""
-"Nu există o aplicație cu numele „%s� înregistrată în favoritul pentru „%s�"
+msgstr "Nicio aplicație cu numele „%s� nu a înregistrat un favorit pentru „%s�"
 
-#: ../glib/gbookmarkfile.c:3377
-#, fuzzy, c-format
-#| msgid "Failed to expand exec line '%s' with URI '%s'"
+#: ../glib/gbookmarkfile.c:3379
+#, c-format
 msgid "Failed to expand exec line “%s� with URI “%s�"
-msgstr "Nu s-a putut expanda linia de comandă „%s� cu URI-ul %s"
+msgstr "Nu s-a putut extinde linia de exec „%s� cu URI-ul „%s�"
 
-#: ../glib/gconvert.c:477 ../glib/gutf8.c:862 ../glib/gutf8.c:1074
-#: ../glib/gutf8.c:1211 ../glib/gutf8.c:1315
+#: ../glib/gconvert.c:473
+msgid "Unrepresentable character in conversion input"
+msgstr "Caracter nereprezentabil în intrarea conversiei"
+
+#: ../glib/gconvert.c:500 ../glib/gutf8.c:865 ../glib/gutf8.c:1077
+#: ../glib/gutf8.c:1214 ../glib/gutf8.c:1318
 msgid "Partial character sequence at end of input"
 msgstr "Secvență parțială de caractere la sfârșitul inputului"
 
-#: ../glib/gconvert.c:742
-#, fuzzy, c-format
-#| msgid "Cannot convert fallback '%s' to codeset '%s'"
+#: ../glib/gconvert.c:769
+#, c-format
 msgid "Cannot convert fallback “%s� to codeset “%s�"
-msgstr "Nu se poate converti rezerva „%s� la setul de caractere „%s�"
+msgstr "Nu se poate converti rezerva „%s� la setul de codare „%s�"
 
-#: ../glib/gconvert.c:1513
-#, fuzzy, c-format
-#| msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
+#: ../glib/gconvert.c:940
+msgid "Embedded NUL byte in conversion input"
+msgstr "Octet NUL încorporat în intrarea conversiei"
+
+#: ../glib/gconvert.c:961
+msgid "Embedded NUL byte in conversion output"
+msgstr "Octet NUL încorporat în ieșirea conversiei"
+
+#: ../glib/gconvert.c:1649
+#, c-format
 msgid "The URI “%s� is not an absolute URI using the “file� scheme"
-msgstr "URI-ul „%s� nu este un URI absolut folosind schema „file�"
+msgstr "URI-ul „%s� nu este un URI absolut care utilizează schema „file�"
 
-#: ../glib/gconvert.c:1523
-#, fuzzy, c-format
-#| msgid "The local file URI '%s' may not include a '#'"
+#: ../glib/gconvert.c:1659
+#, c-format
 msgid "The local file URI “%s� may not include a “#�"
 msgstr "URI-ul fișierului local „%s� nu poate include un „#�"
 
-#: ../glib/gconvert.c:1540
-#, fuzzy, c-format
-#| msgid "The URI '%s' is invalid"
+#: ../glib/gconvert.c:1676
+#, c-format
 msgid "The URI “%s� is invalid"
-msgstr "URI-ul „%s� este nevalid"
+msgstr "URI-ul „%s� nu este valid"
 
-#: ../glib/gconvert.c:1552
-#, fuzzy, c-format
-#| msgid "The hostname of the URI '%s' is invalid"
+#: ../glib/gconvert.c:1688
+#, c-format
 msgid "The hostname of the URI “%s� is invalid"
-msgstr "Numele din URI-ul „%s� este nevalid"
+msgstr "Numele de gazdă al URI-ului „%s� nu este valid"
 
-#: ../glib/gconvert.c:1568
-#, fuzzy, c-format
-#| msgid "The URI '%s' contains invalidly escaped characters"
+#: ../glib/gconvert.c:1704
+#, c-format
 msgid "The URI “%s� contains invalidly escaped characters"
-msgstr "URI-ul „%s� conține caractere „escaped� incorecte"
+msgstr "URI-ul „%s� conține caractere eludate nevalid"
 
-#: ../glib/gconvert.c:1640
-#, fuzzy, c-format
-#| msgid "The pathname '%s' is not an absolute path"
+#: ../glib/gconvert.c:1776
+#, c-format
 msgid "The pathname “%s� is not an absolute path"
-msgstr "Calea „%s� nu este o cale absolută"
+msgstr "Numele căii „%s� nu este o cale absolută"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:202
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %d %b %Y %T %z"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:205
+#: ../glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:208
+#: ../glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:211
-#, fuzzy
+#: ../glib/gdatetime.c:222
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#: ../glib/gdatetime.c:224
+msgstr "%I:%M:%S %p"
+
+#. Translators: Some languages (Baltic, Slavic, Greek, and some more)
+#. * need different grammatical forms of month names depending on whether
+#. * they are standalone or in a complete date context, with the day
+#. * number.  Some other languages may prefer starting with uppercase when
+#. * they are standalone and with lowercase when they are in a complete
+#. * date context.  Here are full month names in a form appropriate when
+#. * they are used standalone.  If your system is Linux with the glibc
+#. * version 2.27 (released Feb 1, 2018) or newer or if it is from the BSD
+#. * family (which includes OS X) then you can refer to the date command
+#. * line utility and see what the command `date +%OB' produces.  Also in
+#. * the latest Linux the command `locale alt_mon' in your native locale
+#. * produces a complete list of month names almost ready to copy and
+#. * paste here.  Note that in most of the languages (western European,
+#. * non-European) there is no difference between the standalone and
+#. * complete date form.
+#.
+#: ../glib/gdatetime.c:261
 msgctxt "full month name"
 msgid "January"
 msgstr "Ianuarie"
 
-#: ../glib/gdatetime.c:226
+#: ../glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "Februarie"
 
-#: ../glib/gdatetime.c:228
+#: ../glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "Martie"
 
-#: ../glib/gdatetime.c:230
+#: ../glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "Aprilie"
 
-#: ../glib/gdatetime.c:232
+#: ../glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:234
+#: ../glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "Iunie"
 
-#: ../glib/gdatetime.c:236
+#: ../glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "Iulie"
 
-#: ../glib/gdatetime.c:238
+#: ../glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "August"
 
-#: ../glib/gdatetime.c:240
+#: ../glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "Septembrie"
 
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "Octombrie"
 
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "Noiembrie"
 
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "Decembrie"
 
-#: ../glib/gdatetime.c:261
+#. Translators: Some languages need different grammatical forms of
+#. * month names depending on whether they are standalone or in a complete
+#. * date context, with the day number.  Some may prefer starting with
+#. * uppercase when they are standalone and with lowercase when they are
+#. * in a full date context.  However, as these names are abbreviated
+#. * the grammatical difference is visible probably only in Belarusian
+#. * and Russian.  In other languages there is no difference between
+#. * the standalone and complete date form when they are abbreviated.
+#. * If your system is Linux with the glibc version 2.27 (released
+#. * Feb 1, 2018) or newer then you can refer to the date command line
+#. * utility and see what the command `date +%Ob' produces.  Also in
+#. * the latest Linux the command `locale ab_alt_mon' in your native
+#. * locale produces a complete list of month names almost ready to copy
+#. * and paste here.  Note that this feature is not yet supported by any
+#. * other platform.  Here are abbreviated month names in a form
+#. * appropriate when they are used standalone.
+#.
+#: ../glib/gdatetime.c:315
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Ian"
 
-#: ../glib/gdatetime.c:263
+#: ../glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Iun"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Iul"
 
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "Aug"
 
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Oct"
 
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Noi"
 
-#: ../glib/gdatetime.c:283
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Dec"
 
-#: ../glib/gdatetime.c:298
+#: ../glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Luni"
 
-#: ../glib/gdatetime.c:300
+#: ../glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Marți"
 
-#: ../glib/gdatetime.c:302
+#: ../glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: ../glib/gdatetime.c:304
+#: ../glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Joi"
 
-#: ../glib/gdatetime.c:306
+#: ../glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Vineri"
 
-#: ../glib/gdatetime.c:308
+#: ../glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: ../glib/gdatetime.c:310
+#: ../glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Duminică"
 
-#: ../glib/gdatetime.c:325
+#: ../glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Lun"
 
-#: ../glib/gdatetime.c:327
+#: ../glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:329
+#: ../glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Mie"
 
-#: ../glib/gdatetime.c:331
+#: ../glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Joi"
 
-#: ../glib/gdatetime.c:333
+#: ../glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Vin"
 
-#: ../glib/gdatetime.c:335
+#: ../glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Sâm"
 
-#: ../glib/gdatetime.c:337
+#: ../glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Dum"
 
+#. Translators: Some languages need different grammatical forms of
+#. * month names depending on whether they are standalone or in a full
+#. * date context, with the day number.  Some may prefer starting with
+#. * uppercase when they are standalone and with lowercase when they are
+#. * in a full date context.  Here are full month names in a form
+#. * appropriate when they are used in a full date context, with the
+#. * day number.  If your system is Linux with the glibc version 2.27
+#. * (released Feb 1, 2018) or newer or if it is from the BSD family
+#. * (which includes OS X) then you can refer to the date command line
+#. * utility and see what the command `date +%B' produces.  Also in
+#. * the latest Linux the command `locale mon' in your native locale
+#. * produces a complete list of month names almost ready to copy and
+#. * paste here.  In older Linux systems due to a bug the result is
+#. * incorrect in some languages.  Note that in most of the languages
+#. * (western European, non-European) there is no difference between the
+#. * standalone and complete date form.
+#.
+#: ../glib/gdatetime.c:455
+msgctxt "full month name with day"
+msgid "January"
+msgstr "Ianuarie"
+
+#: ../glib/gdatetime.c:457
+msgctxt "full month name with day"
+msgid "February"
+msgstr "Februarie"
+
+#: ../glib/gdatetime.c:459
+msgctxt "full month name with day"
+msgid "March"
+msgstr "Martie"
+
+#: ../glib/gdatetime.c:461
+msgctxt "full month name with day"
+msgid "April"
+msgstr "Aprilie"
+
+#: ../glib/gdatetime.c:463
+msgctxt "full month name with day"
+msgid "May"
+msgstr "Mai"
+
+#: ../glib/gdatetime.c:465
+msgctxt "full month name with day"
+msgid "June"
+msgstr "Iunie"
+
+#: ../glib/gdatetime.c:467
+msgctxt "full month name with day"
+msgid "July"
+msgstr "Iulie"
+
+#: ../glib/gdatetime.c:469
+msgctxt "full month name with day"
+msgid "August"
+msgstr "August"
+
+#: ../glib/gdatetime.c:471
+msgctxt "full month name with day"
+msgid "September"
+msgstr "Septembrie"
+
+#: ../glib/gdatetime.c:473
+msgctxt "full month name with day"
+msgid "October"
+msgstr "Octombrie"
+
+#: ../glib/gdatetime.c:475
+msgctxt "full month name with day"
+msgid "November"
+msgstr "Noiembrie"
+
+#: ../glib/gdatetime.c:477
+msgctxt "full month name with day"
+msgid "December"
+msgstr "Decembrie"
+
+#. Translators: Some languages need different grammatical forms of
+#. * month names depending on whether they are standalone or in a full
+#. * date context, with the day number.  Some may prefer starting with
+#. * uppercase when they are standalone and with lowercase when they are
+#. * in a full date context.  Here are abbreviated month names in a form
+#. * appropriate when they are used in a full date context, with the
+#. * day number.  However, as these names are abbreviated the grammatical
+#. * difference is visible probably only in Belarusian and Russian.
+#. * In other languages there is no difference between the standalone
+#. * and complete date form when they are abbreviated.  If your system
+#. * is Linux with the glibc version 2.27 (released Feb 1, 2018) or newer
+#. * then you can refer to the date command line utility and see what the
+#. * command `date +%b' produces.  Also in the latest Linux the command
+#. * `locale abmon' in your native locale produces a complete list of
+#. * month names almost ready to copy and paste here.  In other systems
+#. * due to a bug the result is incorrect in some languages.
+#.
+#: ../glib/gdatetime.c:542
+msgctxt "abbreviated month name with day"
+msgid "Jan"
+msgstr "Ian"
+
+#: ../glib/gdatetime.c:544
+msgctxt "abbreviated month name with day"
+msgid "Feb"
+msgstr "Feb"
+
+#: ../glib/gdatetime.c:546
+msgctxt "abbreviated month name with day"
+msgid "Mar"
+msgstr "Mar"
+
+#: ../glib/gdatetime.c:548
+msgctxt "abbreviated month name with day"
+msgid "Apr"
+msgstr "Apr"
+
+#: ../glib/gdatetime.c:550
+msgctxt "abbreviated month name with day"
+msgid "May"
+msgstr "Mai"
+
+#: ../glib/gdatetime.c:552
+msgctxt "abbreviated month name with day"
+msgid "Jun"
+msgstr "Iun"
+
+#: ../glib/gdatetime.c:554
+msgctxt "abbreviated month name with day"
+msgid "Jul"
+msgstr "Iul"
+
+#: ../glib/gdatetime.c:556
+msgctxt "abbreviated month name with day"
+msgid "Aug"
+msgstr "Aug"
+
+#: ../glib/gdatetime.c:558
+msgctxt "abbreviated month name with day"
+msgid "Sep"
+msgstr "Sep"
+
+#: ../glib/gdatetime.c:560
+msgctxt "abbreviated month name with day"
+msgid "Oct"
+msgstr "Oct"
+
+#: ../glib/gdatetime.c:562
+msgctxt "abbreviated month name with day"
+msgid "Nov"
+msgstr "Noi"
+
+#: ../glib/gdatetime.c:564
+msgctxt "abbreviated month name with day"
+msgid "Dec"
+msgstr "Dec"
+
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:354
+#: ../glib/gdatetime.c:581
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:357
+#: ../glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
 #: ../glib/gdir.c:155
-#, fuzzy, c-format
-#| msgid "Error opening directory '%s': %s"
+#, c-format
 msgid "Error opening directory “%s�: %s"
 msgstr "Eroare la deschiderea directorului „%s�: %s"
 
-#: ../glib/gfileutils.c:706 ../glib/gfileutils.c:798
-#, fuzzy, c-format
-#| msgid "Could not allocate %lu bytes to read file \"%s\""
+#: ../glib/gfileutils.c:716 ../glib/gfileutils.c:808
+#, 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] "Nu s-au putut aloca %lu octeți pentru citirea fișierului „%s�"
-msgstr[1] "Nu s-au putut aloca %lu octeți pentru citirea fișierului „%s�"
-msgstr[2] "Nu s-au putut aloca %lu octeți pentru citirea fișierului „%s�"
+msgstr[0] "Nu s-a putut aloca %lu octet pentru a citi fișierul „%s�"
+msgstr[1] "Nu s-au putut aloca %lu octeți pentru a citi fișierul „%s�"
+msgstr[2] "Nu s-au putut aloca %lu de octeți pentru a citi fișierul „%s�"
 
-#: ../glib/gfileutils.c:723
-#, fuzzy, c-format
-#| msgid "Error reading file '%s': %s"
+#: ../glib/gfileutils.c:733
+#, c-format
 msgid "Error reading file “%s�: %s"
 msgstr "Eroare la citirea fișierului „%s�: %s"
 
-#: ../glib/gfileutils.c:759
-#, fuzzy, c-format
-#| msgid "File \"%s\" is too large"
+#: ../glib/gfileutils.c:769
+#, c-format
 msgid "File “%s� is too large"
 msgstr "Fișierul „%s� este prea mare"
 
-#: ../glib/gfileutils.c:823
-#, fuzzy, c-format
-#| msgid "Failed to read from file '%s': %s"
+#: ../glib/gfileutils.c:833
+#, c-format
 msgid "Failed to read from file “%s�: %s"
 msgstr "Nu s-a putut citi din fișierul „%s�: %s"
 
-#: ../glib/gfileutils.c:871 ../glib/gfileutils.c:943
-#, fuzzy, c-format
-#| msgid "Failed to open file '%s': %s"
+#: ../glib/gfileutils.c:881 ../glib/gfileutils.c:953
+#, c-format
 msgid "Failed to open file “%s�: %s"
 msgstr "Nu s-a putut deschide fișierul „%s�: %s"
 
-#: ../glib/gfileutils.c:883
-#, fuzzy, c-format
-#| msgid "Failed to get attributes of file '%s': fstat() failed: %s"
+#: ../glib/gfileutils.c:893
+#, c-format
 msgid "Failed to get attributes of file “%s�: fstat() failed: %s"
 msgstr "Nu s-au putut obține atributele fișierului „%s�: fstat() a eșuat: %s"
 
-#: ../glib/gfileutils.c:913
-#, fuzzy, c-format
-#| msgid "Failed to open file '%s': fdopen() failed: %s"
+#: ../glib/gfileutils.c:923
+#, c-format
 msgid "Failed to open file “%s�: fdopen() failed: %s"
 msgstr "Nu s-a putut deschide fișierul „%s�: fdopen() a eșuat: %s"
 
-#: ../glib/gfileutils.c:1012
-#, fuzzy, c-format
-#| msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
+#: ../glib/gfileutils.c:1022
+#, c-format
 msgid "Failed to rename file “%s� to “%s�: g_rename() failed: %s"
 msgstr "Nu s-a putut redenumi fișierul „%s� în „%s�: g_rename() a eșuat: %s"
 
-#: ../glib/gfileutils.c:1047 ../glib/gfileutils.c:1554
-#, fuzzy, c-format
-#| msgid "Failed to create file '%s': %s"
+#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1575
+#, c-format
 msgid "Failed to create file “%s�: %s"
 msgstr "Nu s-a putut crea fișierul „%s�: %s"
 
-#: ../glib/gfileutils.c:1074
-#, fuzzy, c-format
-#| msgid "Failed to write file '%s': fwrite() failed: %s"
+#: ../glib/gfileutils.c:1084
+#, c-format
 msgid "Failed to write file “%s�: write() failed: %s"
-msgstr "Nu s-a putut scrie fișierul „%s�: fwrite() a eșuat: %s"
+msgstr "Nu s-a putut scrie fișierul „%s�: write() a eșuat: %s"
 
-#: ../glib/gfileutils.c:1117
-#, fuzzy, c-format
-#| msgid "Failed to write file '%s': fsync() failed: %s"
+#: ../glib/gfileutils.c:1127
+#, c-format
 msgid "Failed to write file “%s�: fsync() failed: %s"
 msgstr "Nu s-a putut scrie fișierul „%s�: fsync() a eșuat: %s"
 
-#: ../glib/gfileutils.c:1241
-#, fuzzy, c-format
-#| msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
+#: ../glib/gfileutils.c:1262
+#, c-format
 msgid "Existing file “%s� could not be removed: g_unlink() failed: %s"
-msgstr "Fișierul existent „%s� nu a putut fi șters: g_unlink() a eșuat: %s"
+msgstr "Fișierul existent „%s� nu a putut fi eliminat: g_unlink() a eșuat: %s"
 
-#: ../glib/gfileutils.c:1520
-#, fuzzy, c-format
-#| msgid "Template '%s' invalid, should not contain a '%s'"
+#: ../glib/gfileutils.c:1541
+#, c-format
 msgid "Template “%s� invalid, should not contain a “%s�"
-msgstr "Șablonul „%s� este incorect, n-ar trebui să conțină un „%s�"
+msgstr "Șablonul „%s� nu este valid, nu ar trebui să conțină un „%s�"
 
-#: ../glib/gfileutils.c:1533
-#, fuzzy, c-format
-#| msgid "Template '%s' doesn't contain XXXXXX"
+#: ../glib/gfileutils.c:1554
+#, c-format
 msgid "Template “%s� doesn’t contain XXXXXX"
 msgstr "Șablonul „%s� nu conține XXXXXX"
 
-#: ../glib/gfileutils.c:2058
-#, fuzzy, c-format
-#| msgid "Failed to read the symbolic link '%s': %s"
+#: ../glib/gfileutils.c:2116
+#, c-format
 msgid "Failed to read the symbolic link “%s�: %s"
 msgstr "Nu s-a putut citi legătura simbolică „%s�: %s"
 
 #: ../glib/giochannel.c:1389
-#, fuzzy, c-format
-#| msgid "Could not open converter from '%s' to '%s': %s"
+#, c-format
 msgid "Could not open converter from “%s� to “%s�: %s"
-msgstr "Nu s-a putut iniția conversia de la „%s� la „%s�: %s"
+msgstr "Nu s-a putut deschide convertorul de la „%s� la „%s�: %s"
 
 #: ../glib/giochannel.c:1734
-#, fuzzy
-#| msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
-msgstr "Nu s-au putut citi datele brute din g_io_channel_read_line_string"
+msgstr "Nu se poate efectua o citire brută în g_io_channel_read_line_string"
 
 #: ../glib/giochannel.c:1781 ../glib/giochannel.c:2039
 #: ../glib/giochannel.c:2126
@@ -4915,144 +4888,126 @@ msgid "Channel terminates in a partial character"
 msgstr "Canalul se termină cu un caracter parțial"
 
 #: ../glib/giochannel.c:1925
-#, fuzzy
-#| msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
-msgstr "Nu s-au putut citi datele brute din g_io_channel_read_to_end"
+msgstr "Nu se poate efectua o citire brută în g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:736
+#: ../glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr "Nu s-a găsit un fișier cheie valid în directoarele de căutare"
 
-#: ../glib/gkeyfile.c:773
+#: ../glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "Nu e un fișier obișnuit"
 
-#: ../glib/gkeyfile.c:1218
-#, fuzzy, c-format
-#| msgid ""
-#| "Key file contains line '%s' which is not a key-value pair, group, or "
-#| "comment"
+#: ../glib/gkeyfile.c:1270
+#, c-format
 msgid ""
 "Key file contains line “%s� which is not a key-value pair, group, or comment"
 msgstr ""
-"Fișierul-cheie conține linia „%s� care nu este o pereche cheie-valoare, un "
-"grup sau un comentariu"
+"Fișierul cheii conține linia „%s� care nu este o pereche cheie-valoare, un "
+"grup, sau un comentariu"
 
-#: ../glib/gkeyfile.c:1275
+#: ../glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Nume incorect de grup: %s"
 
-#: ../glib/gkeyfile.c:1297
+#: ../glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Fișierul cheie nu începe cu un grup"
 
-#: ../glib/gkeyfile.c:1323
+#: ../glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Nume incorect de cheie: %s"
 
-#: ../glib/gkeyfile.c:1350
-#, fuzzy, c-format
-#| msgid "Key file contains unsupported encoding '%s'"
+#: ../glib/gkeyfile.c:1402
+#, c-format
 msgid "Key file contains unsupported encoding “%s�"
-msgstr "Fișierul cheie are o codare neimplementată de tip „%s�"
+msgstr "Fișierul cheii conține codarea nesuportată „%s�"
 
-#: ../glib/gkeyfile.c:1593 ../glib/gkeyfile.c:1766 ../glib/gkeyfile.c:3146
-#: ../glib/gkeyfile.c:3209 ../glib/gkeyfile.c:3339 ../glib/gkeyfile.c:3469
-#: ../glib/gkeyfile.c:3613 ../glib/gkeyfile.c:3842 ../glib/gkeyfile.c:3909
-#, fuzzy, c-format
-#| msgid "Key file does not have group '%s'"
+#: ../glib/gkeyfile.c:1645 ../glib/gkeyfile.c:1818 ../glib/gkeyfile.c:3271
+#: ../glib/gkeyfile.c:3334 ../glib/gkeyfile.c:3464 ../glib/gkeyfile.c:3594
+#: ../glib/gkeyfile.c:3738 ../glib/gkeyfile.c:3967 ../glib/gkeyfile.c:4034
+#, c-format
 msgid "Key file does not have group “%s�"
-msgstr "Fișierul cheie nu are grupul „%s�"
+msgstr "Fișierul cheii nu are grupul „%s�"
 
-#: ../glib/gkeyfile.c:1721
-#, fuzzy, c-format
-#| msgid "Key file does not have key '%s' in group '%s'"
+#: ../glib/gkeyfile.c:1773
+#, c-format
 msgid "Key file does not have key “%s� in group “%s�"
-msgstr "Fișierul cheie nu are cheia „%s� în grupul „%s�"
+msgstr "Fișierul cheii nu are cheia „%s� în grupul „%s�"
 
-#: ../glib/gkeyfile.c:1883 ../glib/gkeyfile.c:1999
-#, fuzzy, c-format
-#| msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
+#: ../glib/gkeyfile.c:1935 ../glib/gkeyfile.c:2051
+#, c-format
 msgid "Key file contains key “%s� with value “%s� which is not UTF-8"
-msgstr "Fișierul cheie conține cheia „%s�, cu valoarea „%s�, ce nu este UTF-8"
+msgstr ""
+"Fișierul cheii conține cheia „%s�, cu valoarea „%s�, care nu este UTF-8"
 
-#: ../glib/gkeyfile.c:1903 ../glib/gkeyfile.c:2019 ../glib/gkeyfile.c:2388
-#, fuzzy, c-format
-#| msgid ""
-#| "Key file contains key '%s' which has a value that cannot be interpreted."
+#: ../glib/gkeyfile.c:1955 ../glib/gkeyfile.c:2071 ../glib/gkeyfile.c:2513
+#, c-format
 msgid ""
 "Key file contains key “%s� which has a value that cannot be interpreted."
-msgstr "Fișierul cheie conține cheia „%s� ce are o valoare neinterpretabilă."
+msgstr ""
+"Fișierul cheii conține cheia „%s� care are o valoare care nu se poate "
+"interpreta."
 
-#: ../glib/gkeyfile.c:2606 ../glib/gkeyfile.c:2975
-#, fuzzy, c-format
-#| msgid ""
-#| "Key file contains key '%s' in group '%s' which has value that cannot be "
-#| "interpreted."
+#: ../glib/gkeyfile.c:2731 ../glib/gkeyfile.c:3100
+#, c-format
 msgid ""
 "Key file contains key “%s� in group “%s� which has a value that cannot be "
 "interpreted."
 msgstr ""
 "Fișierul cheie conține cheia „%s� în grupul „%s�, care are o valoare ce nu "
-"poate fi interpretată"
+"poate fi interpretată."
 
-#: ../glib/gkeyfile.c:2684 ../glib/gkeyfile.c:2761
+#: ../glib/gkeyfile.c:2809 ../glib/gkeyfile.c:2886
 #, c-format
 msgid "Key “%s� in group “%s� has value “%s� where %s was expected"
-msgstr ""
+msgstr "Cheia „%s� în grupul „%s� are valoarea „%s� unde %s a fost așteptat"
 
-#: ../glib/gkeyfile.c:4149
+#: ../glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Fișieul cheie conține caractere „escape� la sfârșit de linie"
 
-#: ../glib/gkeyfile.c:4171
-#, fuzzy, c-format
-#| msgid "Key file contains invalid escape sequence '%s'"
+#: ../glib/gkeyfile.c:4296
+#, c-format
 msgid "Key file contains invalid escape sequence “%s�"
-msgstr "URI-ul „%s� conține secvențe „escaped� incorecte"
+msgstr "Fișierul cheie conține secvența de eludare nevalidă „%s�"
 
-#: ../glib/gkeyfile.c:4315
-#, fuzzy, c-format
-#| msgid "Value '%s' cannot be interpreted as a number."
+#: ../glib/gkeyfile.c:4440
+#, c-format
 msgid "Value “%s� cannot be interpreted as a number."
 msgstr "Valoarea „%s� nu poate fi interpretată ca un număr."
 
-#: ../glib/gkeyfile.c:4329
-#, fuzzy, c-format
-#| msgid "Integer value '%s' out of range"
+#: ../glib/gkeyfile.c:4454
+#, c-format
 msgid "Integer value “%s� out of range"
-msgstr "Valoarea întregului „%s� este în afara limitelor"
+msgstr "Valoarea întreagă „%s� este în afara limitelor"
 
-#: ../glib/gkeyfile.c:4362
-#, fuzzy, c-format
-#| msgid "Value '%s' cannot be interpreted as a float number."
+#: ../glib/gkeyfile.c:4487
+#, c-format
 msgid "Value “%s� cannot be interpreted as a float number."
-msgstr "Valoarea „%s� nu poate fi interpretată ca un număr flotant."
+msgstr "Valoarea „%s� nu poate fi interpretată ca un număr rațional."
 
-#: ../glib/gkeyfile.c:4401
-#, fuzzy, c-format
-#| msgid "Value '%s' cannot be interpreted as a boolean."
+#: ../glib/gkeyfile.c:4526
+#, c-format
 msgid "Value “%s� cannot be interpreted as a boolean."
-msgstr "Valoarea „%s� nu poate fi interpretată ca o valoare booleană."
+msgstr "Valoarea „%s� nu poate fi interpretată ca o valoare logică."
 
 #: ../glib/gmappedfile.c:129
-#, fuzzy, c-format
-#| msgid "Failed to get attributes of file '%s': fstat() failed: %s"
+#, c-format
 msgid "Failed to get attributes of file “%s%s%s%s�: fstat() failed: %s"
-msgstr "Nu s-au putut obține atributele fișierului „%s�: fstat() a eșuat: %s"
+msgstr ""
+"Nu s-au putut obține atributele fișierului „%s%s%s%s�: fstat() a eșuat: %s"
 
 #: ../glib/gmappedfile.c:195
-#, fuzzy, c-format
-#| msgid "Failed to map file '%s': mmap() failed: %s"
+#, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
-msgstr "Nu s-a putut mapa fișierul „%s�: mmap() a eșuat: %s"
+msgstr "Nu s-a putut mapa %s%s%s%s: mmap() a eșuat: %s"
 
 #: ../glib/gmappedfile.c:262
-#, fuzzy, c-format
-#| msgid "Failed to open file '%s': open() failed: %s"
+#, c-format
 msgid "Failed to open file “%s�: open() failed: %s"
 msgstr "Nu s-a putut deschide fișierul „%s�: open() a eșuat: %s"
 
@@ -5063,20 +5018,18 @@ msgstr "Eroare în linia %d, caracterul %d: "
 
 #: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
-msgstr "Text codat UTF-8 incorect în nume - „%s� nevalid"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s�"
+msgstr "Text codat UTF-8 nevalid în nume — „%s� nu este valid"
 
 #: ../glib/gmarkup.c:472
-#, fuzzy, c-format
-#| msgid "'%s' is not a valid name "
-msgid "'%s' is not a valid name"
-msgstr "„%s� nu este un nume valid "
+#, c-format
+msgid "“%s� is not a valid name"
+msgstr "„%s� nu este un nume valid"
 
 #: ../glib/gmarkup.c:488
-#, fuzzy, c-format
-#| msgid "'%s' is not a valid name: '%c' "
-msgid "'%s' is not a valid name: '%c'"
-msgstr "„%s� nu este un nume valid: „%c� "
+#, c-format
+msgid "“%s� is not a valid name: “%c�"
+msgstr "„%s� nu este un nume valid: „%c�"
 
 #: ../glib/gmarkup.c:598
 #, c-format
@@ -5086,45 +5039,47 @@ msgstr "Eroare în linia %d: %s"
 #: ../glib/gmarkup.c:675
 #, c-format
 msgid ""
-"Failed to parse '%-.*s', which should have been a digit inside a character "
-"reference (&#234; for example) - perhaps the digit is too large"
+"Failed to parse “%-.*s�, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
 msgstr ""
-"Nu s-a putut parsa „%-.*s�, care ar fi trebuit să fie o cifră într-un "
-"caracter referință (de exemplu &#234;). Poate cifra este prea mare"
+"Nu s-a putut parsa „%-.*s�, care ar fi trebuit să fie o cifră într-o "
+"referință de caracter (de exemplu &#234;) — poate cifra este prea mare"
 
 #: ../glib/gmarkup.c:687
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
 msgstr ""
-"Referința caracter nu s-a terminat cu punct și virgulă. Probabil ați folosit "
-"un caracter ampersand fără intenția de a începe o entitate. Utilizați &amp;"
+"Referința de caracter nu s-a terminat cu punct virgulă; cel mai probabil ați "
+"utilizat un caracter ampersand fără intenția de a începe o entitate — "
+"eludați ampersand ca &amp;"
 
 #: ../glib/gmarkup.c:713
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
-msgstr "Referința caracterului „%-.*s� nu codează un caracter permis"
+msgid "Character reference “%-.*s� does not encode a permitted character"
+msgstr "Referința de caracter „%-.*s� nu codează un caracter permis"
 
 #: ../glib/gmarkup.c:751
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
-"S-a depistat o entitate nulă „&;�. Entitățile valide sunt: &amp; &quot; &lt; "
-"&gt; &apos;"
+"S-a depistat o entitate goală „&;�; entitățile valide sunt: &amp; &quot; "
+"&lt; &gt; &apos;"
 
 #: ../glib/gmarkup.c:759
 #, c-format
-msgid "Entity name '%-.*s' is not known"
+msgid "Entity name “%-.*s� is not known"
 msgstr "Numele entității „%-.*s� nu este cunoscut"
 
 #: ../glib/gmarkup.c:764
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
+"character without intending to start an entity — escape ampersand as &amp;"
 msgstr ""
-"Entitatea nu s-a terminat cu punct și virgulă. Probabil că ați folosit un "
-"caracter ampersand fără intenția de a începe o entitate. Utilizați &amp;"
+"Entitatea nu s-a terminat cu punct și virgulă; probabil că ați folosit un "
+"caracter ampersand fără intenția de a începe o entitate — eludați ampersand "
+"ca &amp;"
 
 #: ../glib/gmarkup.c:1170
 msgid "Document must begin with an element (e.g. <book>)"
@@ -5133,75 +5088,75 @@ msgstr "Documentul trebuie să înceapă cu un element (de ex. <book>)"
 #: ../glib/gmarkup.c:1210
 #, c-format
 msgid ""
-"'%s' is not a valid character following a '<' character; it may not begin an "
+"“%s� is not a valid character following a “<� character; it may not begin an "
 "element name"
 msgstr ""
-"„%s� nu este un caracter valid după caracterul „<�; nu poate începe numele "
+"„%s� nu este un caracter valid după un caracter „<�; nu poate începe numele "
 "unui element"
 
 #: ../glib/gmarkup.c:1252
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
+"Odd character “%s�, expected a “>� character to end the empty-element tag "
+"“%s�"
 msgstr ""
-"Caracter neobișnuit „%s�, se aștepta un „>� pentru a termina eticheta de "
-"element gol „%s�"
+"Caracter neobișnuit „%s�, se aștepta un caracter „>� pentru a termina "
+"eticheta de element gol „%s�"
 
 #: ../glib/gmarkup.c:1333
 #, c-format
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+"Odd character “%s�, expected a “=� after attribute name “%s� of element “%s�"
 msgstr ""
-"Caracter neobișnuit „%s�, se aștepta un „=� după numele atributului „%s� al "
-"elementului „%s�"
+"Caracter neobișnuit „%s�, se aștepta un caracter „=� după numele atributului "
+"„%s� al elementului „%s�"
 
 #: ../glib/gmarkup.c:1374
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s�, expected a “>� or “/� character to end the start tag of "
+"element “%s�, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
-"Caracter neobișnuit „%s�, se aștepta un „>� sau „/� pentru a termina "
-"eticheta de început a elementului „%s� sau opțional un atribut. Poate ați "
-"utilizat un caracter incorect în numele atributului"
+"Caracter neobișnuit „%s�, se aștepta un caracter „>� sau „/� pentru a "
+"termina eticheta de început a elementului „%s�, sau opțional un atribut; "
+"poate ați utilizat un caracter nevalid în numele atributului"
 
 #: ../glib/gmarkup.c:1418
 #, c-format
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
+"Odd character “%s�, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s� of element “%s�"
 msgstr ""
 "Caracter neobișnuit „%s�, se așteptau ghilimele de deschidere după semnul "
-"egal pentru a da valoarea atributului „%s� al elementului „%s�"
+"egal când se dă valoarea atributului „%s� al elementului „%s�"
 
 #: ../glib/gmarkup.c:1551
 #, c-format
 msgid ""
-"'%s' is not a valid character following the characters '</'; '%s' may not "
+"“%s� is not a valid character following the characters “</�; “%s� may not "
 "begin an element name"
 msgstr ""
-"„%s� nu este un caracter valid după caracterele „</�. „%s� nu poate începe "
+"„%s� nu este un caracter valid după caracterele „</�; „%s� nu poate începe "
 "un nume de element"
 
 #: ../glib/gmarkup.c:1587
 #, c-format
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
+"“%s� is not a valid character following the close element name “%s�; the "
+"allowed character is “>�"
 msgstr ""
-"„%s� nu este un caracter valid după numele elementului de închidere „%s�. "
-"Caracterul permis este „>�"
+"„%s� nu este un caracter valid după numele elementului de închidere „%s�; "
+"caracterul permis este „>�"
 
 #: ../glib/gmarkup.c:1598
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
+msgid "Element “%s� was closed, no element is currently open"
 msgstr "Elementul „%s� a fost închis, nici un element nu este curent deschis"
 
 #: ../glib/gmarkup.c:1607
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
+msgid "Element “%s� was closed, but the currently open element is “%s�"
 msgstr "Elementul „%s� a fost închis, dar elementul deschis curent este „%s�"
 
 #: ../glib/gmarkup.c:1760
@@ -5209,16 +5164,18 @@ msgid "Document was empty or contained only whitespace"
 msgstr "Documentul era gol sau conținea doar spațiu gol"
 
 #: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
-msgstr "Documentul s-a terminat în mod neașteptat imediat după un caracter „<�"
+msgid "Document ended unexpectedly just after an open angle bracket “<�"
+msgstr ""
+"Documentul s-a terminat în mod neașteptat imediat după o paranteză "
+"unghiulară de deschidere „<�"
 
 #: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
 #, c-format
 msgid ""
-"Document ended unexpectedly with elements still open - '%s' was the last "
+"Document ended unexpectedly with elements still open — “%s� was the last "
 "element opened"
 msgstr ""
-"Documentul s-a terminat în mod neașteptat cu unele elemente încă deschise. "
+"Documentul s-a terminat în mod neașteptat cu unele elemente încă deschise — "
 "„%s� a fost ultimul element deschis"
 
 #: ../glib/gmarkup.c:1790
@@ -5243,8 +5200,8 @@ msgstr ""
 #: ../glib/gmarkup.c:1807
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr ""
-"Documentul s-a terminat în mod neașteptat în cadul unei etichete ce "
-"deschidea un element"
+"Documentul s-a terminat în mod neașteptat în cadrul unei etichete ce "
+"deschidea un element."
 
 #: ../glib/gmarkup.c:1813
 msgid ""
@@ -5261,7 +5218,7 @@ msgstr ""
 
 #: ../glib/gmarkup.c:1836
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgid "Document ended unexpectedly inside the close tag for element “%s�"
 msgstr ""
 "Documentul s-a terminat în mod neașteptat în cadrul etichetei de închidere a "
 "elementului „%s�"
@@ -5273,10 +5230,8 @@ msgstr ""
 "unei instrucțiuni de procesare"
 
 #: ../glib/goption.c:861
-#, fuzzy
-#| msgid "[OPTION...]"
 msgid "[OPTION…]"
-msgstr "[OPÈšIUNE...]"
+msgstr "[OPȚIUNE…]"
 
 #: ../glib/goption.c:977
 msgid "Help Options:"
@@ -5295,32 +5250,26 @@ msgid "Application Options:"
 msgstr "Opțiuni aplicație:"
 
 #: ../glib/goption.c:1049
-#, fuzzy
-#| msgid "Help Options:"
 msgid "Options:"
-msgstr "Opțiuni ajutor:"
+msgstr "Opțiuni:"
 
 #: ../glib/goption.c:1113 ../glib/goption.c:1183
-#, fuzzy, c-format
-#| msgid "Cannot parse integer value '%s' for %s"
+#, c-format
 msgid "Cannot parse integer value “%s� for %s"
-msgstr "Nu se poate parsa valoarea întregului „%s� pentru %s"
+msgstr "Nu se poate parsa valoarea întreagă „%s� pentru %s"
 
 #: ../glib/goption.c:1123 ../glib/goption.c:1191
-#, fuzzy, c-format
-#| msgid "Integer value '%s' for %s out of range"
+#, c-format
 msgid "Integer value “%s� for %s out of range"
-msgstr "Valoarea întregului „%s� pentru %s este în afara limitelor"
+msgstr "Valoarea întreagă „%s� pentru %s este în afara limitelor"
 
 #: ../glib/goption.c:1148
-#, fuzzy, c-format
-#| msgid "Cannot parse double value '%s' for %s"
+#, c-format
 msgid "Cannot parse double value “%s� for %s"
 msgstr "Nu se poate parsa valoarea dublă „%s� pentru %s"
 
 #: ../glib/goption.c:1156
-#, fuzzy, c-format
-#| msgid "Double value '%s' for %s out of range"
+#, c-format
 msgid "Double value “%s� for %s out of range"
 msgstr "Valoarea dublă „%s� pentru %s este în afara limitelor"
 
@@ -5353,7 +5302,7 @@ msgstr "memorie insuficientă"
 
 #: ../glib/gregex.c:266
 msgid "backtracking limit reached"
-msgstr "s-a atins limita de „backtracking�"
+msgstr "s-a atins limita de backtracking"
 
 #: ../glib/gregex.c:278 ../glib/gregex.c:286
 msgid "the pattern contains items not supported for partial matching"
@@ -5388,7 +5337,7 @@ msgstr "utf8 scurt"
 
 #: ../glib/gregex.c:305
 msgid "recursion loop"
-msgstr ""
+msgstr "buclă de recursivitate"
 
 #: ../glib/gregex.c:309
 msgid "unknown error"
@@ -5403,10 +5352,8 @@ msgid "\\c at end of pattern"
 msgstr "\\c la sfârșitul unui model"
 
 #: ../glib/gregex.c:335
-#, fuzzy
-#| msgid "unrecognized character follows \\"
 msgid "unrecognized character following \\"
-msgstr "după \\ urmează un caracter necunoscut"
+msgstr "caracter nerecunoscut după \\"
 
 #: ../glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
@@ -5422,7 +5369,7 @@ msgstr "lipsește un ] de închidere pentru clasa caracter"
 
 #: ../glib/gregex.c:347
 msgid "invalid escape sequence in character class"
-msgstr "secvență incorectă de tip „escape� în clasa caracter"
+msgstr "secvență de eludare incorectă în clasa caracter"
 
 #: ../glib/gregex.c:350
 msgid "range out of order in character class"
@@ -5437,14 +5384,12 @@ msgid "unexpected repeat"
 msgstr "repetare neașteptată"
 
 #: ../glib/gregex.c:360
-#, fuzzy
-#| msgid "unrecognized character after (?"
 msgid "unrecognized character after (? or (?-"
-msgstr "caracter nerecunoscut după (?"
+msgstr "caracter nerecunoscut după (? sau (?-"
 
 #: ../glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
-msgstr "clasele cu nume POSIX sunt implementate doar înăuntrul altei clase"
+msgstr "Clasele cu nume POSIX sunt implementate doar înăuntrul altei clase"
 
 #: ../glib/gregex.c:366
 msgid "missing terminating )"
@@ -5459,10 +5404,8 @@ msgid "missing ) after comment"
 msgstr "lipsește un ) după comentariu"
 
 #: ../glib/gregex.c:375
-#, fuzzy
-#| msgid "regular expression too large"
 msgid "regular expression is too large"
-msgstr "expresie regulată prea lungă"
+msgstr "expresia regulată este prea lungă"
 
 #: ../glib/gregex.c:378
 msgid "failed to get memory"
@@ -5470,7 +5413,7 @@ msgstr "nu s-a putut aloca memoria"
 
 #: ../glib/gregex.c:382
 msgid ") without opening ("
-msgstr ") fără un ( în față"
+msgstr ") fără paranteza de deschidere ("
 
 #: ../glib/gregex.c:386
 msgid "code overflow"
@@ -5486,7 +5429,7 @@ msgstr "aserțiunea „lookbehind� nu e de lungime fixă"
 
 #: ../glib/gregex.c:396
 msgid "malformed number or name after (?("
-msgstr "număr greșit formatat sau nume după (?("
+msgstr "număr sau nume formatat eronat după (?("
 
 #: ../glib/gregex.c:399
 msgid "conditional group contains more than two branches"
@@ -5509,7 +5452,7 @@ msgstr "nume necunoscut de clasă POSIX"
 
 #: ../glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
-msgstr "elementele POSIX de unire nu sunt implementate"
+msgstr "Elementele POSIX de unire nu sunt suportate"
 
 #: ../glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
@@ -5521,11 +5464,12 @@ msgstr "condiție nevalidă (?(0)"
 
 #: ../glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
-msgstr "\\C nu este permis în aserțiunea „lookbehind�"
+msgstr "\\C nu este permis în aserțiunea lookbehind"
 
 #: ../glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr ""
+"caracterele de eludare \\L, \\l, \\N{nume}, \\U, și \\u nu sunt suportate"
 
 #: ../glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
@@ -5545,7 +5489,7 @@ msgstr "două submodele au același nume"
 
 #: ../glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
-msgstr "secvență malformată \\P sau \\p"
+msgstr "secvență eronată \\P sau \\p"
 
 #: ../glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
@@ -5573,101 +5517,84 @@ msgstr "nu s-a găsit submodelul referit și verificat anterior"
 
 #: ../glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
-msgstr "grupul DEFINE conține mai mult de o ramură"
+msgstr "Grupul DEFINE conține mai mult de o ramură"
 
 #: ../glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "opțiuni NEWLINE inconsistente"
 
 #: ../glib/gregex.c:476
-#, fuzzy
-#| msgid ""
-#| "\\g is not followed by a braced name or an optionally braced non-zero "
-#| "number"
 msgid ""
 "\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
 "or by a plain number"
 msgstr ""
-"\\g nu este urmat de un nume între acolade sau un număr diferit de zero, "
-"opțional între acolade"
+"\\g nu este urmat de un nume sau un număr între acolade, paranteze "
+"unghiulare sau citate, sau de un număr simplu"
 
 #: ../glib/gregex.c:480
 msgid "a numbered reference must not be zero"
-msgstr ""
+msgstr "o referință numerotată trebuie să fie diferită de zero"
 
 #: ../glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
-msgstr ""
+msgstr "nu este permis un argument pentru (*ACCEPT), (*FAIL), sau (*COMMIT)"
 
 #: ../glib/gregex.c:486
 msgid "(*VERB) not recognized"
-msgstr ""
+msgstr "(*VERB) nu este recunoscut"
 
 #: ../glib/gregex.c:489
 msgid "number is too big"
-msgstr ""
+msgstr "numărul este prea mare"
 
 #: ../glib/gregex.c:492
-#, fuzzy
-#| msgid "missing terminator in subpattern name"
 msgid "missing subpattern name after (?&"
-msgstr "terminator lipsă în numele de submodel"
+msgstr "lipsește numele de sub-mostră după (?&"
 
 #: ../glib/gregex.c:495
-#, fuzzy
-#| msgid "digit expected"
 msgid "digit expected after (?+"
-msgstr "se aștepta un digit"
+msgstr "s-a așteptat o cifră după (?+"
 
 #: ../glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
+"] este un caracter de date nevalid în modul de compatibilitate JavaScript"
 
 #: ../glib/gregex.c:501
-#, fuzzy
-#| msgid "two named subpatterns have the same name"
 msgid "different names for subpatterns of the same number are not allowed"
-msgstr "două submodele au același nume"
+msgstr "nume diferite pentru submodele ale aceluiași număr nu sunt permise"
 
 #: ../glib/gregex.c:504
 msgid "(*MARK) must have an argument"
-msgstr ""
+msgstr "(*MARK) trebuie să aibă un argument"
 
 #: ../glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
-msgstr ""
+msgstr "\\c trebuie să fie urmat de un caracter ASCII"
 
 #: ../glib/gregex.c:510
-#, fuzzy
-#| msgid ""
-#| "\\g is not followed by a braced name or an optionally braced non-zero "
-#| "number"
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
-"\\g nu este urmat de un nume între acolade sau un număr diferit de zero, "
-"opțional între acolade"
+"\\k nu este urmat de un nume scris între paranteze acolade, unghiulare sau "
+"cu citate"
 
 #: ../glib/gregex.c:513
-#, fuzzy
-#| msgid "URIs not supported"
 msgid "\\N is not supported in a class"
-msgstr "URI-urile nu sunt admise"
+msgstr "\\N nu este suportat într-o clasă"
 
 #: ../glib/gregex.c:516
 msgid "too many forward references"
-msgstr ""
+msgstr "prea multe referințe de înaintare"
 
 #: ../glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
-msgstr ""
+msgstr "numele este prea lung în (*MARK), (*PRUNE), (*SKIP), sau (*THEN)"
 
 #: ../glib/gregex.c:522
-#, fuzzy
-#| msgid "character value in \\x{...} sequence is too large"
 msgid "character value in \\u.... sequence is too large"
-msgstr "valoarea caracterului în secvența \\x{...} este prea mare"
+msgstr "valoarea caracterului în secvența \\u.... este prea mare"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Eroare la compararea expresiei regulate %s: %s"
@@ -5681,10 +5608,8 @@ msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "Biblioteca PCRE este compilată fără suport pentru proprietăți UTF-8"
 
 #: ../glib/gregex.c:1328
-#, fuzzy
-#| msgid "PCRE library is compiled without UTF8 properties support"
 msgid "PCRE library is compiled with incompatible options"
-msgstr "Biblioteca PCRE este compilată fără suport pentru proprietăți UTF-8"
+msgstr "Biblioteca PCRE este compilată cu opțiuni incompatibile"
 
 #: ../glib/gregex.c:1357
 #, c-format
@@ -5696,203 +5621,196 @@ msgstr "Eroare la optimizarea expresiei regulate %s: %s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Eroare la parsarea expresiei regulate %s la caracterul %d: %s"
 
-#: ../glib/gregex.c:2413
-#, fuzzy
-#| msgid "hexadecimal digit or '}' expected"
+#: ../glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
-msgstr "se aștepta un digit hexadecimal or „}�"
+msgstr "s-a așteptat o cifră hexazecimală sau „}�"
 
-#: ../glib/gregex.c:2429
+#: ../glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "se aștepta un digit hexadecimal"
 
-#: ../glib/gregex.c:2469
-#, fuzzy
-#| msgid "missing '<' in symbolic reference"
+#: ../glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
-msgstr "„<� lipsă în referința simbolică"
+msgstr "lipsește „<� în referința simbolică"
 
-#: ../glib/gregex.c:2478
+#: ../glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "referință simbolică neterminată"
 
-#: ../glib/gregex.c:2485
+#: ../glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "referință simbolică de lungime zero"
 
-#: ../glib/gregex.c:2496
+#: ../glib/gregex.c:2502
 msgid "digit expected"
 msgstr "se aștepta un digit"
 
-#: ../glib/gregex.c:2514
+#: ../glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "referință simbolică ilegală"
 
-#: ../glib/gregex.c:2576
-#, fuzzy
-#| msgid "stray final '\\'"
+#: ../glib/gregex.c:2582
 msgid "stray final “\\�"
-msgstr "„\\� inutil la final"
+msgstr "caracter neprevăzut la final „\\�"
 
-#: ../glib/gregex.c:2580
+#: ../glib/gregex.c:2586
 msgid "unknown escape sequence"
-msgstr "secvență „escape� necunoscută"
+msgstr "secvență de eludare necunoscută"
 
-#: ../glib/gregex.c:2590
-#, fuzzy, c-format
-#| msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
+#: ../glib/gregex.c:2596
+#, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
-msgstr "Eroare la prelucrarea textului de înlocuire „%s� la caracterul %lu: %s"
+msgstr ""
+"Eroare în timpul parsării textului de înlocuire „%s� la caracterul %lu: %s"
 
 #: ../glib/gshell.c:94
-#, fuzzy
-#| msgid "Quoted text doesn't begin with a quotation mark"
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Textul citat nu începe cu un semn de citare"
 
 #: ../glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
-msgstr "Semn de citare nepereche în linia de comandă sau text „shell-quoted�"
+msgstr ""
+"Semn de citare nepereche în linia de comandă sau alt text „shell-quoted�"
 
 #: ../glib/gshell.c:580
-#, fuzzy, c-format
-#| msgid "Text ended just after a '\\' character. (The text was '%s')"
+#, c-format
 msgid "Text ended just after a “\\� character. (The text was “%s�)"
-msgstr "Textul s-a terminat imediat după un caracter „\\� (textul era „%s�)"
+msgstr "Textul s-a terminat imediat după un caracter „\\�. (Textul era „%s�)"
 
 #: ../glib/gshell.c:587
-#, fuzzy, c-format
-#| msgid ""
-#| "Text ended before matching quote was found for %c. (The text was '%s')"
+#, c-format
 msgid "Text ended before matching quote was found for %c. (The text was “%s�)"
 msgstr ""
-"Textul s-a terminat înainte de semnul de citare pereche pentru %c (textul "
+"Textul s-a terminat înainte de semnul de citare pereche pentru %c. (Textul "
 "era „%s�)"
 
 #: ../glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Textul era gol (sau conținea doar spațiu gol)"
 
-#: ../glib/gspawn.c:250
+#: ../glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Nu s-au putut citi datele din procesul copil (%s)"
 
-#: ../glib/gspawn.c:394
+#: ../glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Eroare neașteptată în select() la citirea datelor din procesul copil (%s)"
 
-#: ../glib/gspawn.c:479
+#: ../glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Eroare neașteptată în waitpid() (%s)"
 
-#: ../glib/gspawn.c:886 ../glib/gspawn-win32.c:1231
+#: ../glib/gspawn.c:1043 ../glib/gspawn-win32.c:1318
 #, c-format
 msgid "Child process exited with code %ld"
-msgstr ""
+msgstr "Procesul inferior a ieșit cu codul %ld"
 
-#: ../glib/gspawn.c:894
+#: ../glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
-msgstr ""
+msgstr "Procesul inferior a fost terminat de semnalul %ld"
 
-#: ../glib/gspawn.c:901
+#: ../glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
-msgstr ""
+msgstr "Procesul inferior a fost oprit de semnalul %ld"
 
-#: ../glib/gspawn.c:908
+#: ../glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
-msgstr ""
+msgstr "Procesul inferior a ieșit în mod neobișnuit"
 
-#: ../glib/gspawn.c:1313 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
+#: ../glib/gspawn.c:1360 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Nu s-au putut citi datele din conectorul „pipe� copil (%s)"
 
-#: ../glib/gspawn.c:1383
+#: ../glib/gspawn.c:1596
+#, c-format
+msgid "Failed to spawn child process “%s� (%s)"
+msgstr "Nu s-a putut crea procesul inferior „%s� (%s)"
+
+#: ../glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Nu s-a putut clona procesul (%s)"
 
-#: ../glib/gspawn.c:1532 ../glib/gspawn-win32.c:368
-#, fuzzy, c-format
-#| msgid "Failed to change to directory '%s' (%s)"
+#: ../glib/gspawn.c:1784 ../glib/gspawn-win32.c:370
+#, c-format
 msgid "Failed to change to directory “%s� (%s)"
-msgstr "Nu s-a putut schimba directorul curent în directorul „%s� (%s)"
+msgstr "Nu s-a putut schimba la directorul „%s� (%s)"
 
-#: ../glib/gspawn.c:1542
-#, fuzzy, c-format
-#| msgid "Failed to execute child process \"%s\" (%s)"
+#: ../glib/gspawn.c:1794
+#, c-format
 msgid "Failed to execute child process “%s� (%s)"
-msgstr "Nu s-a putut executa procesul „%s� (%s)"
+msgstr "Nu s-a putut executa procesul inferior „%s� (%s)"
 
-#: ../glib/gspawn.c:1552
+#: ../glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Nu s-a putut redirecta ieșirea sau inputul procesului copil (%s)"
 
-#: ../glib/gspawn.c:1561
+#: ../glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Nu s-a putut clona procesul copil (%s)"
 
-#: ../glib/gspawn.c:1569
-#, fuzzy, c-format
-#| msgid "Unknown error executing child process \"%s\""
+#: ../glib/gspawn.c:1821
+#, c-format
 msgid "Unknown error executing child process “%s�"
-msgstr "Eroare necunoscută la lansarea în execuție a procesului copil „%s�"
+msgstr "Eroare necunoscută la executarea procesului inferior „%s�"
 
-#: ../glib/gspawn.c:1593
+#: ../glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Nu s-au putut citi date suficiente de la procesul copil (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: ../glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Nu s-au putut citi datele de la procesul copil"
 
-#: ../glib/gspawn-win32.c:298
+#: ../glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "Nu s-a putut crea conectorul „pipe� pentru comunicarea cu procesul copil (%s)"
 
-#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
+#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:381
+#: ../glib/gspawn-win32.c:500
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Nu s-a putut executa procesul copil (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: ../glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Nume incorect de program: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:460 ../glib/gspawn-win32.c:714
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Secvență incorectă în vectorul argumentului la %d: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:471 ../glib/gspawn-win32.c:729
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Secvență incorectă în variabilele de mediu: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: ../glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Director curent nevalid: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: ../glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Nu s-a putut porni programul asociat (%s)"
 
-#: ../glib/gspawn-win32.c:995
+#: ../glib/gspawn-win32.c:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5902,226 +5820,239 @@ msgstr ""
 
 #: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
-msgstr ""
+msgstr "Șirul gol nu este un număr"
 
 #: ../glib/gstrfuncs.c:3271
-#, fuzzy, c-format
-#| msgid "'%s' is not a valid name "
+#, c-format
 msgid "“%s� is not a signed number"
-msgstr "„%s� nu este un nume valid "
+msgstr "„%s� nu este un număr negativ"
 
 #: ../glib/gstrfuncs.c:3281 ../glib/gstrfuncs.c:3384
 #, c-format
 msgid "Number “%s� is out of bounds [%s, %s]"
-msgstr ""
+msgstr "Numărul „%s� se află în afara intervalului [%s, %s]"
 
 #: ../glib/gstrfuncs.c:3374
-#, fuzzy, c-format
-#| msgid "'%s' is not a valid name "
+#, c-format
 msgid "“%s� is not an unsigned number"
-msgstr "„%s� nu este un nume valid "
+msgstr "„%s� nu este un număr pozitiv"
 
-#: ../glib/gutf8.c:808
-#, fuzzy
-#| msgid "failed to get memory"
+#: ../glib/gutf8.c:811
 msgid "Failed to allocate memory"
-msgstr "nu s-a putut aloca memoria"
+msgstr "Nu s-a putut aloca memoria"
 
-#: ../glib/gutf8.c:941
+#: ../glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Caracter în afara limitelor standardului UTF-8"
 
-#: ../glib/gutf8.c:1042 ../glib/gutf8.c:1051 ../glib/gutf8.c:1181
-#: ../glib/gutf8.c:1190 ../glib/gutf8.c:1329 ../glib/gutf8.c:1426
+#: ../glib/gutf8.c:1045 ../glib/gutf8.c:1054 ../glib/gutf8.c:1184
+#: ../glib/gutf8.c:1193 ../glib/gutf8.c:1332 ../glib/gutf8.c:1429
 msgid "Invalid sequence in conversion input"
 msgstr "Secvență incorectă în inputul conversiei"
 
-#: ../glib/gutf8.c:1340 ../glib/gutf8.c:1437
+#: ../glib/gutf8.c:1343 ../glib/gutf8.c:1440
 msgid "Character out of range for UTF-16"
 msgstr "Caracter în afara limitelor standardului UTF-16"
 
-#: ../glib/gutils.c:2209 ../glib/gutils.c:2236 ../glib/gutils.c:2342
+#: ../glib/gutils.c:2244
 #, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u octet"
-msgstr[1] "%u octeți"
-msgstr[2] "%u de octeți"
-
-#: ../glib/gutils.c:2215
-#, fuzzy, c-format
-msgid "%.1f KiB"
-msgstr "%.1f KB"
-
-#: ../glib/gutils.c:2217
-#, fuzzy, c-format
-msgid "%.1f MiB"
-msgstr "%.1f MB"
-
-#: ../glib/gutils.c:2220
-#, fuzzy, c-format
-msgid "%.1f GiB"
-msgstr "%.1f GB"
-
-#: ../glib/gutils.c:2223
-#, fuzzy, c-format
-msgid "%.1f TiB"
-msgstr "%.1f TB"
-
-#: ../glib/gutils.c:2226
-#, fuzzy, c-format
-msgid "%.1f PiB"
-msgstr "%.1f PB"
-
-#: ../glib/gutils.c:2229
-#, fuzzy, c-format
-msgid "%.1f EiB"
-msgstr "%.1f EB"
-
-#: ../glib/gutils.c:2242
-#, fuzzy, c-format
 msgid "%.1f kB"
-msgstr "%.1f KB"
+msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2245 ../glib/gutils.c:2360
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2248 ../glib/gutils.c:2365
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2250 ../glib/gutils.c:2370
+#: ../glib/gutils.c:2247 ../glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2253 ../glib/gutils.c:2375
+#: ../glib/gutils.c:2248 ../glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2256 ../glib/gutils.c:2380
+#: ../glib/gutils.c:2249 ../glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2293
-#, fuzzy, c-format
-msgid "%s byte"
-msgid_plural "%s bytes"
-msgstr[0] "%u octet"
-msgstr[1] "%u octeți"
-msgstr[2] "%u de octeți"
+#: ../glib/gutils.c:2252
+#, c-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
 
-#. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to
-#. * mean 1024 bytes.  I am aware that 'KB' is not correct, but it has been preserved for reasons of
-#. * compatibility.  Users will not see this string unless a program is using this deprecated function.
-#. * Please translate as literally as possible.
-#.
-#: ../glib/gutils.c:2355
+#: ../glib/gutils.c:2253
 #, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
+msgid "%.1f MiB"
+msgstr "%.1f MiB"
 
-msgctxt "full month name with day"
-msgid "January"
-msgstr "Ianuarie"
+#: ../glib/gutils.c:2254
+#, c-format
+msgid "%.1f GiB"
+msgstr "%.1f GiB"
 
-msgctxt "full month name with day"
-msgid "February"
-msgstr "Februarie"
+#: ../glib/gutils.c:2255
+#, c-format
+msgid "%.1f TiB"
+msgstr "%.1f TiB"
 
-msgctxt "full month name with day"
-msgid "March"
-msgstr "Martie"
+#: ../glib/gutils.c:2256
+#, c-format
+msgid "%.1f PiB"
+msgstr "%.1f PiB"
 
-msgctxt "full month name with day"
-msgid "April"
-msgstr "Aprilie"
+#: ../glib/gutils.c:2257
+#, c-format
+msgid "%.1f EiB"
+msgstr "%.1f EiB"
 
-msgctxt "full month name with day"
-msgid "May"
-msgstr "Mai"
+#: ../glib/gutils.c:2260
+#, c-format
+msgid "%.1f kb"
+msgstr "%.1f kb"
 
-msgctxt "full month name with day"
-msgid "June"
-msgstr "Iunie"
+#: ../glib/gutils.c:2261
+#, c-format
+msgid "%.1f Mb"
+msgstr "%.1f Mb"
 
-msgctxt "full month name with day"
-msgid "July"
-msgstr "Iulie"
+#: ../glib/gutils.c:2262
+#, c-format
+msgid "%.1f Gb"
+msgstr "%.1f Gb"
 
-msgctxt "full month name with day"
-msgid "August"
-msgstr "August"
+#: ../glib/gutils.c:2263
+#, c-format
+msgid "%.1f Tb"
+msgstr "%.1f Tb"
 
-msgctxt "full month name with day"
-msgid "September"
-msgstr "Septembrie"
+#: ../glib/gutils.c:2264
+#, c-format
+msgid "%.1f Pb"
+msgstr "%.1f Pb"
 
-msgctxt "full month name with day"
-msgid "October"
-msgstr "Octombrie"
+#: ../glib/gutils.c:2265
+#, c-format
+msgid "%.1f Eb"
+msgstr "%.1f Eb"
 
-msgctxt "full month name with day"
-msgid "November"
-msgstr "Noiembrie"
+#: ../glib/gutils.c:2268
+#, c-format
+msgid "%.1f Kib"
+msgstr "%.1f Kib"
 
-msgctxt "full month name with day"
-msgid "December"
-msgstr "Decembrie"
+#: ../glib/gutils.c:2269
+#, c-format
+msgid "%.1f Mib"
+msgstr "%.1f Mib"
 
-msgctxt "abbreviated month name with day"
-msgid "Jan"
-msgstr "Ian"
+#: ../glib/gutils.c:2270
+#, c-format
+msgid "%.1f Gib"
+msgstr "%.1f Gib"
 
-msgctxt "abbreviated month name with day"
-msgid "Feb"
-msgstr "Feb"
+#: ../glib/gutils.c:2271
+#, c-format
+msgid "%.1f Tib"
+msgstr "%.1f Tib"
 
-msgctxt "abbreviated month name with day"
-msgid "Mar"
-msgstr "Mar"
+#: ../glib/gutils.c:2272
+#, c-format
+msgid "%.1f Pib"
+msgstr "%.1f Pib"
 
-msgctxt "abbreviated month name with day"
-msgid "Apr"
-msgstr "Apr"
+#: ../glib/gutils.c:2273
+#, c-format
+msgid "%.1f Eib"
+msgstr "%.1f Eib"
 
-msgctxt "abbreviated month name with day"
-msgid "May"
-msgstr "Mai"
+#: ../glib/gutils.c:2307 ../glib/gutils.c:2433
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u octet"
+msgstr[1] "%u octeți"
+msgstr[2] "%u de octeți"
 
-msgctxt "abbreviated month name with day"
-msgid "Jun"
-msgstr "Iun"
+#: ../glib/gutils.c:2311
+#, c-format
+msgid "%u bit"
+msgid_plural "%u bits"
+msgstr[0] "%u bit"
+msgstr[1] "%u biți"
+msgstr[2] "%u de biți"
 
-msgctxt "abbreviated month name with day"
-msgid "Jul"
-msgstr "Iul"
+#. Translators: the %s in "%s bytes" will always be replaced by a number.
+#: ../glib/gutils.c:2378
+#, c-format
+msgid "%s byte"
+msgid_plural "%s bytes"
+msgstr[0] "%s octet"
+msgstr[1] "%s octeți"
+msgstr[2] "%s de octeți"
 
-msgctxt "abbreviated month name with day"
-msgid "Aug"
-msgstr "Aug"
+#. Translators: the %s in "%s bits" will always be replaced by a number.
+#: ../glib/gutils.c:2383
+#, c-format
+msgid "%s bit"
+msgid_plural "%s bits"
+msgstr[0] "%s bit"
+msgstr[1] "%s biți"
+msgstr[2] "%s de biți"
 
-msgctxt "abbreviated month name with day"
-msgid "Sep"
-msgstr "Sep"
+#. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to
+#. * mean 1024 bytes.  I am aware that 'KB' is not correct, but it has been preserved for reasons of
+#. * compatibility.  Users will not see this string unless a program is using this deprecated function.
+#. * Please translate as literally as possible.
+#.
+#: ../glib/gutils.c:2446
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
 
-msgctxt "abbreviated month name with day"
-msgid "Oct"
-msgstr "Oct"
+#~ msgid "No such method '%s'"
+#~ msgstr "Nu există metoda „%s�"
 
-msgctxt "abbreviated month name with day"
-msgid "Nov"
-msgstr "Noi"
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable - unknown value '%s'"
+#~ msgstr ""
+#~ "Nu s-a putut determina adresa magistralei din variabila de mediu "
+#~ "DBUS_STARTER_BUS_TYPE - valoare necunoscută „%s�"
 
-msgctxt "abbreviated month name with day"
-msgid "Dec"
-msgstr "Dec"
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGUMENTE…]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Message has %d file descriptors but the header field indicates %d file "
+#~ "descriptors"
+#~ msgstr "Mesajul are %d fds, dar câmpul antet indică %d fds"
+
+#, fuzzy
+#~ msgid "Error: object path not specified.\n"
+#~ msgstr "Eroare: calea către obiect nu a fost specificată\n"
+
+#, fuzzy
+#~ msgid "Error: signal not specified.\n"
+#~ msgstr "Eroare: destinația nu a fost specificată\n"
+
+#, fuzzy
+#~ msgid "Error: signal must be the fully-qualified name.\n"
+#~ msgstr "Eroare: destinația nu a fost specificată\n"
+
+#, fuzzy
+#~| msgid "Failed to create file '%s': %s"
+#~ msgid "Failed to create temp file: %s"
+#~ msgstr "Nu s-a putut crea fișierul „%s�: %s"
 
 #~ msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 #~ msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 9a3d5427d..c6d922008 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: 2018-04-23 15:17+0000\n"
-"PO-Revision-Date: 2018-04-23 20:48+0200\n"
+"POT-Creation-Date: 2018-05-29 16:36+0000\n"
+"PO-Revision-Date: 2018-05-30 20:05+0200\n"
 "Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -164,7 +164,7 @@ msgstr "Uporaba:\n"
 msgid "Arguments:\n"
 msgstr "Argumenti:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGUMENTI ...]"
 
@@ -348,19 +348,19 @@ msgstr "Neznana vrsta"
 msgid "%s filetype"
 msgstr "%s vrsta datoteke"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: ../gio/gcredentials.c:315 ../gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
 msgstr "Na tem OS predmet GCredentials ni podprt"
 
-#: ../gio/gcredentials.c:467
+#: ../gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Okolje ne podpira možnosti GCredentials"
 
-#: ../gio/gcredentials.c:513
+#: ../gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "Predmet GCredentials na tem sistemu ne vsebuje ustreznega ID opravila"
 
-#: ../gio/gcredentials.c:565
+#: ../gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr "Na tem OS vohljanje po poverilih ni podprto"
 
@@ -572,22 +572,22 @@ msgstr ""
 "Dovoljenja na mapi »%s« so napa�no oblikovana. Pri�akovano je dovoljenje "
 "0700, pridobljeno pa 0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: ../gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s�: %s"
 msgstr "Napaka med ustvarjanjem mape »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:343
+#: ../gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s� for reading: "
 msgstr "Napaka med odpiranjem zbirke klju�ev »%s« za branje:"
 
-#: ../gio/gdbusauthmechanismsha1.c:366 ../gio/gdbusauthmechanismsha1.c:684
+#: ../gio/gdbusauthmechanismsha1.c:369 ../gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr "Vrstica %d zbirke klju�ev »%s« z vsebino »%s« je neustrezno oblikovana"
 
-#: ../gio/gdbusauthmechanismsha1.c:380 ../gio/gdbusauthmechanismsha1.c:698
+#: ../gio/gdbusauthmechanismsha1.c:383 ../gio/gdbusauthmechanismsha1.c:701
 #, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -595,7 +595,7 @@ msgstr ""
 "Prvi žeton vrstice %d zbirke klju�ev pri »%s« z vsebino »%s« je neustrezno "
 "oblikovan"
 
-#: ../gio/gdbusauthmechanismsha1.c:394 ../gio/gdbusauthmechanismsha1.c:712
+#: ../gio/gdbusauthmechanismsha1.c:397 ../gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -603,37 +603,37 @@ msgstr ""
 "Drugi žeton vrstice %d zbirke klju�ev pri »%s« z vsebino »%s« je neustrezno "
 "oblikovana"
 
-#: ../gio/gdbusauthmechanismsha1.c:418
+#: ../gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
 msgstr "Piškotka z ID %d v zbirki klju�ev »%s« ni mogo�e najti"
 
-#: ../gio/gdbusauthmechanismsha1.c:500
+#: ../gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Napaka brisanja stare datoteke zaklepa »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:532
+#: ../gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s�: %s"
 msgstr "Napaka med ustvarjanjem datoteke zaklepa »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:563
+#: ../gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
 msgstr "Napaka med zapiranjem (nepovezane) datoteke zaklepa »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:574
+#: ../gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s�: %s"
 msgstr "Napaka med razvezovanjem datoteke zaklepa »%s«: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:651
+#: ../gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s� for writing: "
 msgstr "Napaka med odpiranjem zbirke klju�ev »%s« za branje: "
 
-#: ../gio/gdbusauthmechanismsha1.c:847
+#: ../gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
 msgstr "(V nadaljevanju je spodletelo tudi sproš�anje zaklepa »%s«: %s)"
@@ -1275,38 +1275,38 @@ msgstr "Napaka: navedenih je preve� argumentov.\n"
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Napaka: %s ni veljavno enozna�no ime vodila.\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4568
+#: ../gio/gdesktopappinfo.c:2022 ../gio/gdesktopappinfo.c:4589
 msgid "Unnamed"
 msgstr "Neimenovano"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: ../gio/gdesktopappinfo.c:2432
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Namizna datoteka ne vsebuje dolo�enega polja Exec"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: ../gio/gdesktopappinfo.c:2722
 msgid "Unable to find terminal required for application"
 msgstr "Ni mogo�e najti terminala, ki ga zahteva program"
 
-#: ../gio/gdesktopappinfo.c:3137
+#: ../gio/gdesktopappinfo.c:3158
 #, 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:3141
+#: ../gio/gdesktopappinfo.c:3162
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Ni mogo�e ustvariti uporabnikove nastavitvene mape MIME %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3381 ../gio/gdesktopappinfo.c:3405
+#: ../gio/gdesktopappinfo.c:3402 ../gio/gdesktopappinfo.c:3426
 msgid "Application information lacks an identifier"
 msgstr "Podatki programa so brez dolo�ila"
 
-#: ../gio/gdesktopappinfo.c:3639
+#: ../gio/gdesktopappinfo.c:3660
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Ni mogo�e ustvariti uporabnikove datoteke namizja %s"
 
-#: ../gio/gdesktopappinfo.c:3773
+#: ../gio/gdesktopappinfo.c:3794
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Dolo�ilo po meri za %s"
@@ -1326,11 +1326,11 @@ msgstr "pogon ne vklju�uje ukaza izvrzi ali izvrzi_z_dejanjem"
 msgid "drive doesn’t implement polling for media"
 msgstr "pogon ne podpira preverjanja enote"
 
-#: ../gio/gdrive.c:776
+#: ../gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "pogon ne vklju�uje možnosti zagona"
 
-#: ../gio/gdrive.c:878
+#: ../gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "pogon ne vklju�uje možnosti zaustavitve"
 
@@ -1387,7 +1387,7 @@ msgstr "Opravilo ni podprto"
 msgid "Containing mount does not exist"
 msgstr "Obstoje�a enota ne obstaja"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2347
 msgid "Can’t copy over directory"
 msgstr "Ni mogo�e kopirati prek mape"
 
@@ -1442,7 +1442,7 @@ msgstr "Smeti niso podprte"
 msgid "File names cannot contain “%c�"
 msgstr "Ni mogo�e uporabiti »%c« v imenu datoteke"
 
-#: ../gio/gfile.c:6768 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6768 ../gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "enota ne podpira priklopa"
 
@@ -1617,10 +1617,6 @@ msgstr "Uporaba:"
 msgid "Print version information and exit."
 msgstr "Izpiši podatke o razli�ici in kon�aj."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGUMENTI ...]"
-
 #: ../gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Ukazi:"
@@ -1703,7 +1699,7 @@ msgstr "Napaka med pisanjem v standardni odvod"
 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1219
 #: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
@@ -1726,7 +1722,8 @@ msgstr ""
 
 #: ../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:139 ../gio/gio-tool-remove.c:72
+#: ../gio/gio-tool-mount.c:1269 ../gio/gio-tool-open.c:139
+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Ni podanih mest"
 
@@ -2028,70 +2025,78 @@ msgstr "Spremljaj dogodke priklopne to�ke"
 msgid "Monitor files or directories for changes."
 msgstr "Spremljaj spremembe map in datotek."
 
-#: ../gio/gio-tool-mount.c:58
+#: ../gio/gio-tool-mount.c:59
 msgid "Mount as mountable"
 msgstr "priklopi kot priklopno"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:60
 msgid "Mount volume with device file"
 msgstr "Priklopi nosilec z datoteko naprave"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:60 ../gio/gio-tool-mount.c:63
 msgid "DEVICE"
 msgstr "NAPRAVA"
 
-#: ../gio/gio-tool-mount.c:60
+#: ../gio/gio-tool-mount.c:61
 msgid "Unmount"
 msgstr "Odklopi"
 
-#: ../gio/gio-tool-mount.c:61
+#: ../gio/gio-tool-mount.c:62
 msgid "Eject"
 msgstr "Izvrzi"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:63
+msgid "Stop drive with device file"
+msgstr "Zaustavi pogon z datoteko naprave"
+
+#: ../gio/gio-tool-mount.c:64
 msgid "Unmount all mounts with the given scheme"
 msgstr "Odklopi vse priklope s podano shemo"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:64
 msgid "SCHEME"
 msgstr "SHEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: ../gio/gio-tool-mount.c:65
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr ""
 "Prezri opravila datotek med odklapljanjem oziroma izmetavanjem priklopa"
 
-#: ../gio/gio-tool-mount.c:64
+#: ../gio/gio-tool-mount.c:66
 msgid "Use an anonymous user when authenticating"
 msgstr "Uporabni brezimne podatke za overjanje"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: ../gio/gio-tool-mount.c:68
 msgid "List"
 msgstr "Seznam"
 
-#: ../gio/gio-tool-mount.c:67
+#: ../gio/gio-tool-mount.c:69
 msgid "Monitor events"
 msgstr "Nadzor dogodkov"
 
-#: ../gio/gio-tool-mount.c:68
+#: ../gio/gio-tool-mount.c:70
 msgid "Show extra information"
 msgstr "Pokaži dodatne podrobnosti"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:280
 msgid "Anonymous access denied"
 msgstr "Brezimen dostop ni dovoljen!"
 
-#: ../gio/gio-tool-mount.c:897
+#: ../gio/gio-tool-mount.c:508
+msgid "No drive for device file"
+msgstr "Ni dolo�enega pogona za datoteko naprave"
+
+#: ../gio/gio-tool-mount.c:973
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Priklopljen %s na %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: ../gio/gio-tool-mount.c:1028
 msgid "No volume for device file"
 msgstr "Ni dolo�enega nosilca za datoteko naprave"
 
-#: ../gio/gio-tool-mount.c:1145
+#: ../gio/gio-tool-mount.c:1223
 msgid "Mount or unmount the locations."
 msgstr "Priklop oziroma odklop razli�nih nosilcev"
 
@@ -2828,12 +2833,12 @@ msgstr "je brez dela.\n"
 msgid "removed existing output file.\n"
 msgstr "odstranjena obstoje�a odvodna datoteka.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:544 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Neveljavno ime datoteke %s"
 
-#: ../gio/glocalfile.c:1105
+#: ../gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Napaka med pridobivanjem podrobnosti datote�nega sistema za %s: %s"
@@ -2842,124 +2847,124 @@ msgstr "Napaka med pridobivanjem podrobnosti datote�nega sistema za %s: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: ../gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "Priklopne to�ke datoteke %s ni mogo�e najti"
 
-#: ../gio/glocalfile.c:1267
+#: ../gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Ni mogo�e preimenovati korenske mape"
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Napaka med preimenovanjem datoteke %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: ../gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Ni mogo�e preimenovati datoteke, izbrano ime že obstaja"
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: ../gio/glocalfile.c:1206 ../gio/glocalfile.c:2223 ../gio/glocalfile.c:2251
+#: ../gio/glocalfile.c:2408 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Neveljavno ime datoteke"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: ../gio/glocalfile.c:1374 ../gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Napaka med odpiranjem datoteke %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: ../gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Napaka med odstranjevanjem datoteke %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: ../gio/glocalfile.c:1898
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Napaka med premikanjem datoteke %s v smeti: %s"
 
-#: ../gio/glocalfile.c:2020
+#: ../gio/glocalfile.c:1921
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Ni mogo�e ustvariti mape smeti %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: ../gio/glocalfile.c:1941
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Ni mogo�e najti vrhnje ravni smeti %s"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: ../gio/glocalfile.c:2020 ../gio/glocalfile.c:2040
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Ni mogo�e najti oziroma ustvariti mape smeti za %s"
 
-#: ../gio/glocalfile.c:2174
+#: ../gio/glocalfile.c:2075
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Ni mogo�e ustvariti datoteke podrobnosti smeti za %s: %s"
 
-#: ../gio/glocalfile.c:2233
+#: ../gio/glocalfile.c:2134
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 "Datoteke %s ni mogo�e premakniti v smeti prek razli�nih datote�nih sistemov"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2138 ../gio/glocalfile.c:2194
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Datoteke %s ni mogo�e premakniti v smeti: %s"
 
-#: ../gio/glocalfile.c:2299
+#: ../gio/glocalfile.c:2200
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Datoteke %s ni mogo�e premakniti v smeti"
 
-#: ../gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2226
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Napaka med ustvarjanjem mape %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: ../gio/glocalfile.c:2255
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Datote�ni sistem ne podpira simbolnih povezav"
 
-#: ../gio/glocalfile.c:2357
+#: ../gio/glocalfile.c:2258
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Napaka med ustvarjanjem simbolne povezave %s: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: ../gio/glocalfile.c:2264 ../glib/gfileutils.c:2127
 msgid "Symbolic links not supported"
 msgstr "Simbolne povezave niso podprte"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: ../gio/glocalfile.c:2319 ../gio/glocalfile.c:2354 ../gio/glocalfile.c:2411
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Napaka med premikanjem datoteke %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: ../gio/glocalfile.c:2342
 msgid "Can’t move directory over directory"
 msgstr "Ni mogo�e premakniti mape �ez mapo"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
+#: ../gio/glocalfile.c:2368 ../gio/glocalfileoutputstream.c:935
 #: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
 #: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Ustvarjanje varnostne kopije je spodletelo."
 
-#: ../gio/glocalfile.c:2486
+#: ../gio/glocalfile.c:2387
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Napaka med odstranjevanjem ciljne datoteke: %s"
 
-#: ../gio/glocalfile.c:2500
+#: ../gio/glocalfile.c:2401
 msgid "Move between mounts not supported"
 msgstr "Premikanje med priklopi ni podprto"
 
-#: ../gio/glocalfile.c:2691
+#: ../gio/glocalfile.c:2592
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Ni mogo�e dolo�iti porabe diska %s: %s."
@@ -2981,80 +2986,80 @@ msgstr "Neveljavno razširjeno ime atributa"
 msgid "Error setting extended attribute “%s�: %s"
 msgstr "Napaka med dolo�anjem razširjenega atributa »%s«: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: ../gio/glocalfileinfo.c:1609
 msgid " (invalid encoding)"
 msgstr " (neveljavni nabor znakov)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: ../gio/glocalfileinfo.c:1773 ../gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr "Napaka med pridobivanjem podatkov za datoteko »%s«: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: ../gio/glocalfileinfo.c:2035
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Napaka med potrjevanjem opisovalnika datoteke: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: ../gio/glocalfileinfo.c:2080
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Neveljavna vrsta atributa (pri�akovan uint32)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: ../gio/glocalfileinfo.c:2098
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Neveljavna vrsta atributa (pri�akovan uint64)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: ../gio/glocalfileinfo.c:2117 ../gio/glocalfileinfo.c:2136
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Neveljavna vrsta atributa (pri�akovan bitni niz)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: ../gio/glocalfileinfo.c:2181
 msgid "Cannot set permissions on symlinks"
 msgstr "Ni mogo�e dolo�iti dovoljenj simbolnih povezav"
 
-#: ../gio/glocalfileinfo.c:2200
+#: ../gio/glocalfileinfo.c:2197
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Napaka med dolo�anjem dovoljenj: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: ../gio/glocalfileinfo.c:2248
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Napaka med dolo�anjem lastnika: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: ../gio/glocalfileinfo.c:2271
 msgid "symlink must be non-NULL"
 msgstr "Simbolna povezava ne sme biti dolo�ena kot NULL"
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: ../gio/glocalfileinfo.c:2281 ../gio/glocalfileinfo.c:2300
+#: ../gio/glocalfileinfo.c:2311
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Napaka med dolo�anjem simbolne povezave: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: ../gio/glocalfileinfo.c:2290
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Napaka med dolo�evanjem simbolne povezave; datoteka ni simbolna povezava"
 
-#: ../gio/glocalfileinfo.c:2419
+#: ../gio/glocalfileinfo.c:2416
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Napaka med dolo�anjem sprememb ali �asa dostopa: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: ../gio/glocalfileinfo.c:2439
 msgid "SELinux context must be non-NULL"
 msgstr "Atributa SELinux ni mogo�e dolo�iti kot NULL"
 
-#: ../gio/glocalfileinfo.c:2457
+#: ../gio/glocalfileinfo.c:2454
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Napaka nastavitve vsebine SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: ../gio/glocalfileinfo.c:2461
 msgid "SELinux is not enabled on this system"
 msgstr "Na tem sistemu SELinux ni omogo�en"
 
-#: ../gio/glocalfileinfo.c:2556
+#: ../gio/glocalfileinfo.c:2553
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Dolo�anje atributa %s ni podprto"
@@ -3169,49 +3174,49 @@ msgstr "Zahtevano iskanje za koncem pretoka"
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: ../gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr "enota ne podpira možnosti »odklopi«"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: ../gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 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:550
+#: ../gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 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:635
+#: ../gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 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:723
+#: ../gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 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:805
+#: ../gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "priklop ne podpira ugibanja vsebine vrste"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: ../gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "priklop ne podpira usklajevanja ugibanja vsebine vrste"
 
@@ -3660,8 +3665,8 @@ msgstr "Neveljaven vti�, zaganjanje je spodletelo: %s"
 msgid "Socket is already closed"
 msgstr "Vti� je že zaprt"
 
-#: ../gio/gsocket.c:414 ../gio/gsocket.c:3010 ../gio/gsocket.c:4220
-#: ../gio/gsocket.c:4278
+#: ../gio/gsocket.c:414 ../gio/gsocket.c:3020 ../gio/gsocket.c:4230
+#: ../gio/gsocket.c:4288
 msgid "Socket I/O timed out"
 msgstr "Vti� V/I naprave je �asovno potekel"
 
@@ -3716,15 +3721,15 @@ msgid "Error binding to address: %s"
 msgstr "Napaka vezanjem na naslov: %s"
 
 #: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
-#: ../gio/gsocket.c:2391 ../gio/gsocket.c:2461 ../gio/gsocket.c:2519
-#: ../gio/gsocket.c:2537
+#: ../gio/gsocket.c:2398 ../gio/gsocket.c:2471 ../gio/gsocket.c:2529
+#: ../gio/gsocket.c:2547
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Napaka povezovanja v skupino za ve�smerno oddajanje: %s"
 
 #: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
-#: ../gio/gsocket.c:2392 ../gio/gsocket.c:2462 ../gio/gsocket.c:2520
-#: ../gio/gsocket.c:2538
+#: ../gio/gsocket.c:2399 ../gio/gsocket.c:2472 ../gio/gsocket.c:2530
+#: ../gio/gsocket.c:2548
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Napaka zapuš�anja skupine za ve�smerno oddajanje: %s"
@@ -3737,86 +3742,86 @@ msgstr "Ni podpore za ve�smerno oddajanje lastno viru"
 msgid "Unsupported socket family"
 msgstr "Nepodprta skupina vti�a"
 
-#: ../gio/gsocket.c:2393
+#: ../gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "dolo�eno po viru in ne po naslovu IPv4"
 
-#: ../gio/gsocket.c:2411 ../gio/gsocket.c:2440 ../gio/gsocket.c:2487
+#: ../gio/gsocket.c:2418 ../gio/gsocket.c:2447 ../gio/gsocket.c:2497
 #, c-format
 msgid "Interface not found: %s"
 msgstr "Vmesnika ni mogo�e najti: %s"
 
-#: ../gio/gsocket.c:2427
+#: ../gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Ime vmesnika je predolgo"
 
-#: ../gio/gsocket.c:2463
+#: ../gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "Ni podpore za ve�smerno oddajanje v protokolu IPv4"
 
-#: ../gio/gsocket.c:2521
+#: ../gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "Ni podpore za ve�smerno oddajanje v protokolu IPv6"
 
-#: ../gio/gsocket.c:2730
+#: ../gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Napaka med sprejemanjem povezave: %s"
 
-#: ../gio/gsocket.c:2854
+#: ../gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Povezava v teku"
 
-#: ../gio/gsocket.c:2903
+#: ../gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Ni mogo�e pridobiti uvrš�ene napake:"
 
-#: ../gio/gsocket.c:3073
+#: ../gio/gsocket.c:3083
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Napaka med prejemanjem podatkov: %s"
 
-#: ../gio/gsocket.c:3268
+#: ../gio/gsocket.c:3278
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Napaka med pošiljanjem podatkov: %s"
 
-#: ../gio/gsocket.c:3455
+#: ../gio/gsocket.c:3465
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Ni mogo�e izklopiti vti�a: %s"
 
-#: ../gio/gsocket.c:3536
+#: ../gio/gsocket.c:3546
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Napaka med zapiranjem vti�a: %s"
 
-#: ../gio/gsocket.c:4213
+#: ../gio/gsocket.c:4223
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Čakanje na stanje vti�a: %s"
 
-#: ../gio/gsocket.c:4687 ../gio/gsocket.c:4767 ../gio/gsocket.c:4945
+#: ../gio/gsocket.c:4697 ../gio/gsocket.c:4777 ../gio/gsocket.c:4955
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Napaka med pošiljanjem sporo�ila: %s"
 
-#: ../gio/gsocket.c:4711
+#: ../gio/gsocket.c:4721
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "Predmet GSocketControlMessage na sistemih Windows ni podprt"
 
-#: ../gio/gsocket.c:5164 ../gio/gsocket.c:5237 ../gio/gsocket.c:5463
+#: ../gio/gsocket.c:5174 ../gio/gsocket.c:5247 ../gio/gsocket.c:5473
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Napaka med prejemanjem sporo�ila: %s"
 
-#: ../gio/gsocket.c:5735
+#: ../gio/gsocket.c:5745
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Ni mogo�e prebrati poveril vti�a: %s."
 
-#: ../gio/gsocket.c:5744
+#: ../gio/gsocket.c:5754
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "Operacijski sistem ne podpira možnosti g_socket_get_credentials"
 
@@ -4083,7 +4088,7 @@ msgstr "Napaka med branjem iz opisovalnika datoteke: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Napaka med zapiranjem opisovalnika datoteke: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: ../gio/gunixmounts.c:2593 ../gio/gunixmounts.c:2646
 msgid "Filesystem root"
 msgstr "Koren datote�nega sistema"
 
@@ -4096,14 +4101,14 @@ msgstr "Napaka med pisanjem v opisovalnik datoteke: %s"
 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
+#: ../gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 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
+#: ../gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "nosilec ne prepozna ukaza izvrzi ali izvrzi_z_dejanjem"
 
@@ -5496,7 +5501,7 @@ msgstr "ime je predolgo v (*MARK), (*PRUNE), (*SKIP) ali (*THEN)"
 msgid "character value in \\u.... sequence is too large"
 msgstr "znakovna vrednost v zaporedju \\u.... je predolga"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Napaka med primerjanjem logi�nega izraza %s: %s"
@@ -5523,43 +5528,43 @@ msgstr "Napaka med prilagajanjem logi�nega izraza %s: %s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Napaka med pretvarjanjem logi�nega izraza %s pri znaku %d: %s"
 
-#: ../glib/gregex.c:2413
+#: ../glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr "šestnajstiško število ali pa manjka » } «"
 
-#: ../glib/gregex.c:2429
+#: ../glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "pri�akovano šestnajstiško število"
 
-#: ../glib/gregex.c:2469
+#: ../glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr "manjka znak » < « v simbolni povezavi"
 
-#: ../glib/gregex.c:2478
+#: ../glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "nedokon�ana simbolna povezava"
 
-#: ../glib/gregex.c:2485
+#: ../glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "simbolna povezava ni�ne dolžine"
 
-#: ../glib/gregex.c:2496
+#: ../glib/gregex.c:2502
 msgid "digit expected"
 msgstr "pri�akovano število"
 
-#: ../glib/gregex.c:2514
+#: ../glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "neveljavna simbolna povezava"
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr "obidi kon�na » \\ «"
 
-#: ../glib/gregex.c:2580
+#: ../glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "neznano ubežno zaporedje"
 
-#: ../glib/gregex.c:2590
+#: ../glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr "Napaka med raz�lenjevanjem besedila zamenjave »%s« pri znaku %lu: %s"
@@ -5604,7 +5609,7 @@ msgstr ""
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Nepri�akovana napaka v waitpid() (%s)"
 
-#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
+#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1230
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Podrejeni proces se je zaklju�il s kodo %ld"
@@ -5683,27 +5688,27 @@ msgstr "Ni mogo�e izvesti podrejenega opravila (%s)"
 msgid "Invalid program name: %s"
 msgstr "Neveljavno ime programa: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:719
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Neveljaven niz v vektorju argumenta pri %d: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:734
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Neveljaven niz okolja: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: ../glib/gspawn-win32.c:715
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Neveljavna delovna mapa: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: ../glib/gspawn-win32.c:780
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Napaka med izvajanjem pomožnega programa  (%s)"
 
-#: ../glib/gspawn-win32.c:995
+#: ../glib/gspawn-win32.c:994
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5747,127 +5752,127 @@ 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:2229
+#: ../glib/gutils.c:2241
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: ../glib/gutils.c:2242 ../glib/gutils.c:2448
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: ../glib/gutils.c:2243 ../glib/gutils.c:2453
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: ../glib/gutils.c:2244 ../glib/gutils.c:2458
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2463
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2468
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2237
+#: ../glib/gutils.c:2249
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2238
+#: ../glib/gutils.c:2250
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2239
+#: ../glib/gutils.c:2251
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2240
+#: ../glib/gutils.c:2252
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2241
+#: ../glib/gutils.c:2253
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2242
+#: ../glib/gutils.c:2254
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2245
+#: ../glib/gutils.c:2257
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
-#: ../glib/gutils.c:2246
+#: ../glib/gutils.c:2258
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
-#: ../glib/gutils.c:2247
+#: ../glib/gutils.c:2259
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
-#: ../glib/gutils.c:2248
+#: ../glib/gutils.c:2260
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
-#: ../glib/gutils.c:2249
+#: ../glib/gutils.c:2261
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
-#: ../glib/gutils.c:2250
+#: ../glib/gutils.c:2262
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
-#: ../glib/gutils.c:2253
+#: ../glib/gutils.c:2265
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
-#: ../glib/gutils.c:2254
+#: ../glib/gutils.c:2266
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
-#: ../glib/gutils.c:2255
+#: ../glib/gutils.c:2267
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
-#: ../glib/gutils.c:2256
+#: ../glib/gutils.c:2268
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
-#: ../glib/gutils.c:2257
+#: ../glib/gutils.c:2269
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
-#: ../glib/gutils.c:2258
+#: ../glib/gutils.c:2270
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: ../glib/gutils.c:2292 ../glib/gutils.c:2418
+#: ../glib/gutils.c:2304 ../glib/gutils.c:2430
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -5876,7 +5881,7 @@ msgstr[1] "%u bajt"
 msgstr[2] "%u bajta"
 msgstr[3] "%u bajti"
 
-#: ../glib/gutils.c:2296
+#: ../glib/gutils.c:2308
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5886,7 +5891,7 @@ msgstr[2] "%u bita"
 msgstr[3] "%u biti"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2363
+#: ../glib/gutils.c:2375
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -5896,7 +5901,7 @@ msgstr[2] "%s bajta"
 msgstr[3] "%s bajti"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2368
+#: ../glib/gutils.c:2380
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -5910,11 +5915,14 @@ msgstr[3] "%s biti"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2431
+#: ../glib/gutils.c:2443
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGUMENTI ...]"
+
 #~ msgid "Failed to create temp file: %s"
 #~ msgstr "Ustvarjanje za�asne datoteke je spodletelo: %s"
 
diff --git a/po/tr.po b/po/tr.po
index 2cb4b1cef..ca9260703 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,10 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-02-16 14:39+0000\n"
-"PO-Revision-Date: 2018-03-04 14:54+0300\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-06-11 11:04+0000\n"
+"PO-Revision-Date: 2018-06-14 12:23+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
@@ -28,19 +27,19 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-POOTLE-MTIME: 1433280446.000000\n"
 
-#: ../gio/gapplication.c:495
+#: ../gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "GApplication seçenekleri"
 
-#: ../gio/gapplication.c:495
+#: ../gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "GApplication seçeneklerini göster"
 
-#: ../gio/gapplication.c:540
+#: ../gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr "GApplication servis kipi girin (D-Bus servis dosyalarından kullan)"
 
-#: ../gio/gapplication.c:552
+#: ../gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Uygulama kimliğini (ID) geçersiz kıl"
 
@@ -121,8 +120,8 @@ msgstr "Ayrıntılı yardım yazdırmak için komut"
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "D-Bus biçiminde uygulama tanımlayıcı (örneğin: org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
-#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:737
+#: ../gio/glib-compile-resources.c:743 ../gio/glib-compile-resources.c:770
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "DOSYA"
@@ -166,7 +165,7 @@ msgstr "Kullanım:\n"
 msgid "Arguments:\n"
 msgstr "Argümanlar:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGÜMANLAR…]"
 
@@ -251,7 +250,7 @@ msgstr "list-actions komutu yalnızca uygulama kimliği değişkenini alır"
 #: ../gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
-msgstr "Uygulama %s için masaüstü dosyası bulunamıyor\n"
+msgstr "%s uygulaması için masaüstü dosyası bulunamıyor\n"
 
 #: ../gio/gapplication-tool.c:466
 #, c-format
@@ -350,19 +349,19 @@ msgstr "Bilinmeyen tür"
 msgid "%s filetype"
 msgstr "%s dosya türü"
 
-#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571
+#: ../gio/gcredentials.c:315 ../gio/gcredentials.c:574
 msgid "GCredentials is not implemented on this OS"
 msgstr "Bu işletim sisteminde GCredentials sağlanmamış"
 
-#: ../gio/gcredentials.c:467
+#: ../gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Platformunuz için GCredentials desteği yok"
 
-#: ../gio/gcredentials.c:513
+#: ../gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "Bu iştetim sisteminde GCredentials bir süreç kimliği içermez"
 
-#: ../gio/gcredentials.c:565
+#: ../gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr "Bu işletim sisteminde kimlik sızdırma mümkün değildir"
 
@@ -401,7 +400,7 @@ msgstr "“%s� adresinde hata — grup özniteliği hatalı oluşturulmuş"
 #: ../gio/gdbusaddress.c:463
 #, c-format
 msgid "Address element “%s� does not contain a colon (:)"
-msgstr "Adres ögesi “%s� iki nokta üst üste (:) içermez "
+msgstr "Adres ögesi “%s� iki nokta üst üste (:) içermez"
 
 #: ../gio/gdbusaddress.c:484
 #, c-format
@@ -516,7 +515,7 @@ msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Oturum veri yolu adresi saptanamıyor (bu işletim sistemi için uygulanmadı)"
 
-#: ../gio/gdbusaddress.c:1658
+#: ../gio/gdbusaddress.c:1658 ../gio/gdbusconnection.c:7151
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -546,7 +545,7 @@ msgstr "Satır okunmaya çalışılırken beklenmeyen içerik eksikliği"
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr "Satır okunmaya çalışılırken (güvenli) beklenmeyen içerik eksikliği"
 
-#: ../gio/gdbusauth.c:508
+#: ../gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -554,7 +553,7 @@ msgstr ""
 "Tüm olası kimlik doğrulama yöntemleri tükendi (denenen: %s) (kullanılabilir: "
 "%s)"
 
-#: ../gio/gdbusauth.c:1171
+#: ../gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "GDBusAuthObserver::authorize-authenticated-peer yolu ile iptal edildi"
 
@@ -571,22 +570,22 @@ msgstr ""
 "“%s� dizini üzerindeki izinler bozulmuştur. 0700 kipi beklenmiştir, ama 0%o "
 "alınmıştır"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: ../gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s�: %s"
 msgstr "“%s� dizini oluşturulurken hata: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: ../gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s� for reading: "
 msgstr "Okumak için “%s� anahtarlığı açılırken hata: "
 
-#: ../gio/gdbusauthmechanismsha1.c:402 ../gio/gdbusauthmechanismsha1.c:720
+#: ../gio/gdbusauthmechanismsha1.c:369 ../gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s� with content “%s� is malformed"
 msgstr "“%3$s� içerikli “%2$s� konumundaki anahtarlığın %1$d. satırı bozulmuş"
 
-#: ../gio/gdbusauthmechanismsha1.c:416 ../gio/gdbusauthmechanismsha1.c:734
+#: ../gio/gdbusauthmechanismsha1.c:383 ../gio/gdbusauthmechanismsha1.c:701
 #, c-format
 msgid ""
 "First token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -594,7 +593,7 @@ msgstr ""
 "“%3$s� içerikli “%2$s� konumundaki anahtarlığın %1$d. satırının ilk "
 "belirteci bozulmuÅŸ"
 
-#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:748
+#: ../gio/gdbusauthmechanismsha1.c:397 ../gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at “%s� with content “%s� is malformed"
@@ -602,37 +601,37 @@ msgstr ""
 "“%3$s� içerikli “%2$s� konumundaki anahtarlığın %1$d. satırının ikinci "
 "belirteci bozulmuÅŸ"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: ../gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s�"
 msgstr "“%2$s� konumundaki anahtarlıkta %1$d kimlikli çerez bulunamadı"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: ../gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s�: %s"
 msgstr "Eski kilit dosyası “%s� silinirken hata: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: ../gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s�: %s"
 msgstr "Kilit dosyası “%s� oluşturulurken hata: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: ../gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s�: %s"
 msgstr "(Bağlantısı olmayan) kilit dosyası “%s� kapatılırken hata: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: ../gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s�: %s"
 msgstr "“%s� kilit dosyasının bağlantısı kaldırılırken hata: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: ../gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s� for writing: "
 msgstr "“%s� anahtarlığını yazma için açarken hata: "
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: ../gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s� also failed: %s) "
 msgstr "(Ayrıca, “%s� için kilidi açma başarısız oldu: %s) "
@@ -653,51 +652,65 @@ msgstr ""
 
 #: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
 #, c-format
+#| msgid ""
+#| "No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
+"No such interface “org.freedesktop.DBus.Properties� on object at path %s"
 msgstr ""
-"%s yolundaki nesnede 'org.freedesktop.DBus.Properties' gibi bir arayüz yok"
+"%s yolundaki nesnede “org.freedesktop.DBus.Properties� gibi bir arayüz yok"
 
 #: ../gio/gdbusconnection.c:4266
 #, c-format
-msgid "No such property '%s'"
-msgstr "'%s' gibi bir özellik yok"
+#| msgid "No such property '%s'"
+msgid "No such property “%s�"
+msgstr "“%s� gibi bir özellik yok"
 
 #: ../gio/gdbusconnection.c:4278
 #, c-format
-msgid "Property '%s' is not readable"
-msgstr "'%s' özelliği okunabilir değil"
+#| msgid "Property '%s' is not readable"
+msgid "Property “%s� is not readable"
+msgstr "“%s� özelliği okunabilir değil"
 
 #: ../gio/gdbusconnection.c:4289
 #, c-format
-msgid "Property '%s' is not writable"
-msgstr "'%s' özelliği yazılabilir değil"
+#| msgid "Property '%s' is not writable"
+msgid "Property “%s� is not writable"
+msgstr "“%s� özelliği yazılabilir değil"
 
 #: ../gio/gdbusconnection.c:4309
 #, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
-msgstr "'%s' özelliği ayarlanırken hata: '%s' türü beklendi, '%s' elde edildi"
+#| msgid "Error setting property '%s': Expected type '%s' but got '%s'"
+msgid "Error setting property “%s�: Expected type “%s� but got “%s�"
+msgstr "“%s� özelliği ayarlanırken hata: “%s� türü beklendi, “%s� elde edildi"
 
-#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
-#: ../gio/gdbusconnection.c:6591
+#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:6591
+#, c-format
+#| msgid "No such interface '%s'"
+msgid "No such interface “%s�"
+msgstr "“%s� gibi bir arabirim yok"
+
+#: ../gio/gdbusconnection.c:4622
 #, c-format
 msgid "No such interface '%s'"
 msgstr "'%s' gibi bir arayüz yok"
 
 #: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7100
 #, c-format
-msgid "No such interface '%s' on object at path %s"
-msgstr "%2$s yolundaki nesnede '%1$s' gibi bir arayüz yok"
+#| msgid "No such interface '%s' on object at path %s"
+msgid "No such interface “%s� on object at path %s"
+msgstr "%2$s yolundaki nesnede “%1$s� gibi bir arayüz yok"
 
 #: ../gio/gdbusconnection.c:4938
 #, c-format
-msgid "No such method '%s'"
-msgstr "'%s' gibi bir yöntem yok"
+#| msgid "No such key “%s�\n"
+msgid "No such method “%s�"
+msgstr "“%s� gibi bir anahtar yok"
 
 #: ../gio/gdbusconnection.c:4969
 #, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
-msgstr "'%s' iletisinin türü, beklenen '%s' türü ile örtüşmüyor"
+#| msgid "Type of message, '%s', does not match expected type '%s'"
+msgid "Type of message, “%s�, does not match expected type “%s�"
+msgstr "“%s� iletisinin türü, beklenen “%s� türü ile örtüşmüyor"
 
 #: ../gio/gdbusconnection.c:5167
 #, c-format
@@ -716,49 +729,42 @@ msgstr "%s.%s özelliği ayarlanamadı"
 
 #: ../gio/gdbusconnection.c:5627
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
-msgstr "'%s' yöntemi '%s' türü döndürdü, fakat '%s' bekleniyordu"
+#| msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Method “%s� returned type “%s�, but expected “%s�"
+msgstr "“%s� yöntemi “%s� türü döndürdü, ancak “%s� bekleniyordu"
 
 #: ../gio/gdbusconnection.c:6702
 #, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
-msgstr "'%3$s' imzalı '%2$s' arayüzü üzerinde '%1$s' yöntemi yok"
+#| msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgid "Method “%s� on interface “%s� with signature “%s� does not exist"
+msgstr "“%3$s� imzalı “%2$s� arayüzü üzerinde “%1$s� yöntemi yok"
 
 #: ../gio/gdbusconnection.c:6823
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "%s için bir alt ağaç zaten dışa aktarılmış"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"DBUS_STARTER_BUS_TYPE ortam değişkeninden veri yolu adresi saptanamıyor - "
-"bilinmeyen deÄŸer '%s'"
-
-#: ../gio/gdbusmessage.c:1246
+#: ../gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "tür GEÇERSİZ"
 
-#: ../gio/gdbusmessage.c:1257
+#: ../gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "METHOD_CALL iletisi:  PATH ya da MEMBER başlık alanı eksik"
 
-#: ../gio/gdbusmessage.c:1268
+#: ../gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
-msgstr "METHOD_RETURN iletisi: REPLY_SERIAL başlık alanı eksik "
+msgstr "METHOD_RETURN iletisi: REPLY_SERIAL başlık alanı eksik"
 
-#: ../gio/gdbusmessage.c:1280
+#: ../gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "ERROR iletisi: REPLY_SERIAL ya da ERROR_NAME başlık alanı eksik"
 
-#: ../gio/gdbusmessage.c:1293
+#: ../gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "SIGNAL iletisi: PATH, INTERFACE ya da MEMBER başlık alanı eksik"
 
-#: ../gio/gdbusmessage.c:1301
+#: ../gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -766,7 +772,7 @@ msgstr ""
 "SIGNAL iletisi: PATH başlık alanı, ayrılmış olan /org/freedesktop/DBus/Local "
 "değerini kullanıyor"
 
-#: ../gio/gdbusmessage.c:1309
+#: ../gio/gdbusmessage.c:1311
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
@@ -774,18 +780,18 @@ msgstr ""
 "SIGNAL iletisi: INTERFACE başlık alanı, ayrılmış olan org.freedesktop.DBus."
 "Local değerini kullanıyor"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
+#: ../gio/gdbusmessage.c:1359 ../gio/gdbusmessage.c:1419
 #, c-format
 msgid "Wanted to read %lu byte but only got %lu"
 msgid_plural "Wanted to read %lu bytes but only got %lu"
 msgstr[0] "%lu bayt okumak istendi fakat yalnızca %lu var"
 
-#: ../gio/gdbusmessage.c:1371
+#: ../gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s� but found byte %d"
 msgstr "“%s� dizgesinden sonra NUL baytı beklendi, ama %d baytı bulundu"
 
-#: ../gio/gdbusmessage.c:1390
+#: ../gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -794,17 +800,17 @@ msgstr ""
 "Geçerli bir UTF-8 dizgesi beklendi ama %d bayt konumunda geçersiz baytlar "
 "bulundu (dizge uzunluğu %d). Bu noktaya kadar geçerli olan dizge şudur: “%s�"
 
-#: ../gio/gdbusmessage.c:1593
+#: ../gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus object path"
 msgstr "Ayrıştırılan değer “%s�, geçerli bir D-Bus nesne yolu değil"
 
-#: ../gio/gdbusmessage.c:1615
+#: ../gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature"
 msgstr "Ayrıştırılan değer “%s�, geçerli bir D-Bus imzası değil"
 
-#: ../gio/gdbusmessage.c:1662
+#: ../gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -814,7 +820,7 @@ msgstr[0] ""
 "%u bayt uzunluğunda dizi ile karşılaşıldı. Olabilecek en çok uzunluk 2<<26 "
 "bayt (64 MiB)."
 
-#: ../gio/gdbusmessage.c:1682
+#: ../gio/gdbusmessage.c:1684
 #, c-format
 msgid ""
 "Encountered array of type “a%c�, expected to have a length a multiple of %u "
@@ -823,19 +829,19 @@ msgstr ""
 "“a%c� türünde dizi ile karşılaşıldı, birden çok %u bayt uzunluğu "
 "beklenmektedir fakat %u bayt uzunluk bulundu"
 
-#: ../gio/gdbusmessage.c:1849
+#: ../gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s� for variant is not a valid D-Bus signature"
 msgstr "Varyant için ayrıştırılmış “%s� değeri geçeriz bir D-Bus imzasıdır"
 
-#: ../gio/gdbusmessage.c:1873
+#: ../gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s� from the D-Bus wire format"
 msgstr ""
 "GVariant, D-Bus tel biçiminden “%s� dizge türüyle geri dönüştürülürken hata"
 
-#: ../gio/gdbusmessage.c:2055
+#: ../gio/gdbusmessage.c:2057
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l�) or 0x42 (“B�) but found value "
@@ -844,53 +850,53 @@ msgstr ""
 "Geçersiz endian değeri. 0x6c (“l�) veya 0x42 (“B�) bekleniyordu fakat 0x%02x "
 "deÄŸeri bulundu"
 
-#: ../gio/gdbusmessage.c:2068
+#: ../gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "Geçersiz önemli iletişim kuralı sürümü. 1 beklendi, %d bulundu"
 
-#: ../gio/gdbusmessage.c:2124
+#: ../gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s� found but message body is empty"
 msgstr "“%s� imzalı bir imza başlığı bulundu ama ileti gövdesi boş"
 
-#: ../gio/gdbusmessage.c:2138
+#: ../gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s� is not a valid D-Bus signature (for body)"
 msgstr "Ayrıştırılan değer “%s� geçerli bir D-Bus imzası değil (gövde için)"
 
-#: ../gio/gdbusmessage.c:2168
+#: ../gio/gdbusmessage.c:2170
 #, c-format
 msgid "No signature header in message but the message body is %u byte"
 msgid_plural "No signature header in message but the message body is %u bytes"
 msgstr[0] "İletide imza başlığı yok fakat ileti gövdesi %u bayt"
 
-#: ../gio/gdbusmessage.c:2178
+#: ../gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "İleti geri dönüştürülemiyor: "
 
-#: ../gio/gdbusmessage.c:2519
+#: ../gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s� to the D-Bus wire format"
 msgstr "GVariant, D-Bus tel biçimine “%s� dizge türüyle dönüştürülürken hata"
 
-#: ../gio/gdbusmessage.c:2656
+#: ../gio/gdbusmessage.c:2658
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
 msgstr "İletideki dosya açıklayıcı sayısı (%d) başlık alanından (%d) farklı"
 
-#: ../gio/gdbusmessage.c:2664
+#: ../gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "İleti dönüştürülemiyor: "
 
-#: ../gio/gdbusmessage.c:2708
+#: ../gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s� but there is no signature header"
 msgstr "İleti gövdesi “%s� imzasına sahip fakat imza başlığı yok"
 
-#: ../gio/gdbusmessage.c:2718
+#: ../gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s� but signature in the header field is "
@@ -898,17 +904,17 @@ msgid ""
 msgstr ""
 "İleti gövdesi “%s� tür imzasına sahip fakat başlık alanındaki imza “%s�"
 
-#: ../gio/gdbusmessage.c:2734
+#: ../gio/gdbusmessage.c:2736
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)�"
 msgstr "İleti gövdesi boş, fakat başlık alanındaki imza “(%s)�"
 
-#: ../gio/gdbusmessage.c:3287
+#: ../gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s�"
 msgstr "“%s� türünden bir gövdeyle dönüş hatası"
 
-#: ../gio/gdbusmessage.c:3295
+#: ../gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Boş gövdeyle dönüş hatası"
 
@@ -920,8 +926,7 @@ msgstr "Donanım profili alınamıyor: %s"
 #: ../gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr ""
-" /var/lib/dbus/makine-kimliÄŸi veya /etc/makine-kimliÄŸi konumuna "
-"yüklenemiyor: "
+"/var/lib/dbus/makine-kimliği veya /etc/makine-kimliği konumuna yüklenemiyor: "
 
 #: ../gio/gdbusproxy.c:1612
 #, c-format
@@ -987,229 +992,226 @@ msgstr ""
 "\n"
 "Her bir komut hakkında yardım almak için “%s KOMUT --help� kullanın.\n"
 
-#: ../gio/gdbus-tool.c:167 ../gio/gdbus-tool.c:234 ../gio/gdbus-tool.c:306
-#: ../gio/gdbus-tool.c:330 ../gio/gdbus-tool.c:811 ../gio/gdbus-tool.c:1150
-#: ../gio/gdbus-tool.c:1592
+#: ../gio/gdbus-tool.c:185 ../gio/gdbus-tool.c:252 ../gio/gdbus-tool.c:324
+#: ../gio/gdbus-tool.c:348 ../gio/gdbus-tool.c:834 ../gio/gdbus-tool.c:1171
+#: ../gio/gdbus-tool.c:1613
 #, c-format
 msgid "Error: %s\n"
 msgstr "Hata: %s\n"
 
-#: ../gio/gdbus-tool.c:178 ../gio/gdbus-tool.c:247 ../gio/gdbus-tool.c:1608
+#: ../gio/gdbus-tool.c:196 ../gio/gdbus-tool.c:265 ../gio/gdbus-tool.c:1629
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "İçgözlem XML’ini ayrıştırmada hata: %s\n"
 
-#: ../gio/gdbus-tool.c:216
+#: ../gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Hata: %s geçerli bir ad değil\n"
 
-#: ../gio/gdbus-tool.c:364
+#: ../gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Sistem veriyoluna baÄŸlan"
 
-#: ../gio/gdbus-tool.c:365
+#: ../gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Oturum veriyoluna baÄŸlan"
 
-#: ../gio/gdbus-tool.c:366
+#: ../gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Verilen D-Bus adresine baÄŸlan"
 
-#: ../gio/gdbus-tool.c:376
+#: ../gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Bağlantı Uç Noktası Seçenekleri:"
 
-#: ../gio/gdbus-tool.c:377
+#: ../gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Bağlantı uç noktasını belirleyen seçenekler"
 
-#: ../gio/gdbus-tool.c:399
+#: ../gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Bağlantı uç noktası belirtilmedi"
 
-#: ../gio/gdbus-tool.c:409
+#: ../gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Birden çok bağlantı uç noktası belirtildi"
 
-#: ../gio/gdbus-tool.c:479
+#: ../gio/gdbus-tool.c:497
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s� does not exist\n"
 msgstr "Uyarı: İçgözlem verilerine göre, “%s� arayüzü yok\n"
 
-#: ../gio/gdbus-tool.c:488
+#: ../gio/gdbus-tool.c:506
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s� does not exist on "
 "interface “%s�\n"
 msgstr "Uyarı: İçgözlem verilerine göre, “%s� yöntemi “%s� arayüzünde yok\n"
 
-#: ../gio/gdbus-tool.c:550
+#: ../gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Sinyal için isteğe bağlı hedef nokta (eşsiz ad)"
 
-#: ../gio/gdbus-tool.c:551
+#: ../gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Üzerinde sinyal yaymak için nesne yolu"
 
-#: ../gio/gdbus-tool.c:552
+#: ../gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Sinyal ve arayüz adı"
 
-#: ../gio/gdbus-tool.c:587
+#: ../gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Bir sinyal yayınla."
 
-#: ../gio/gdbus-tool.c:642 ../gio/gdbus-tool.c:944 ../gio/gdbus-tool.c:1698
-#: ../gio/gdbus-tool.c:1931 ../gio/gdbus-tool.c:2152
+#: ../gio/gdbus-tool.c:658 ../gio/gdbus-tool.c:965 ../gio/gdbus-tool.c:1715
+#: ../gio/gdbus-tool.c:1944 ../gio/gdbus-tool.c:2164
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Bağlanırken hata: %s\n"
 
-#: ../gio/gdbus-tool.c:659 ../gio/gdbus-tool.c:961 ../gio/gdbus-tool.c:1715
-#: ../gio/gdbus-tool.c:1956
-#, c-format
-msgid "Error: Destination is not specified\n"
-msgstr "Hata: Hedef belirtilmedi\n"
-
-#: ../gio/gdbus-tool.c:670
+#: ../gio/gdbus-tool.c:678
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "Hata: %s geçerli bir özgün veriyolu adı değil\n"
 
-#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
+#: ../gio/gdbus-tool.c:697 ../gio/gdbus-tool.c:1008 ../gio/gdbus-tool.c:1758
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "Hata: Nesne yolu belirtilmedi\n"
 
-#: ../gio/gdbus-tool.c:705 ../gio/gdbus-tool.c:1007 ../gio/gdbus-tool.c:1761
-#: ../gio/gdbus-tool.c:2002
+#: ../gio/gdbus-tool.c:720 ../gio/gdbus-tool.c:1028 ../gio/gdbus-tool.c:1778
+#: ../gio/gdbus-tool.c:2015
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Hata: %s geçerli bir nesne yolu değil\n"
 
-#: ../gio/gdbus-tool.c:720
+#: ../gio/gdbus-tool.c:740
 #, c-format
-#| msgid "Error: Method name is not specified\n"
 msgid "Error: Signal name is not specified\n"
 msgstr "Hata: Sinyal adı belirtilmedi\n"
 
-#: ../gio/gdbus-tool.c:731
+#: ../gio/gdbus-tool.c:754
 #, c-format
-#| msgid "Error: Method name “%s� is invalid\n"
 msgid "Error: Signal name “%s� is invalid\n"
 msgstr "Hata: Sinyal adı “%s� geçersiz\n"
 
-#: ../gio/gdbus-tool.c:743
+#: ../gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Hata: %s geçerli bir arayüz adı değil\n"
 
-#: ../gio/gdbus-tool.c:749
+#: ../gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Hata: %s geçerli bir üye adı değil\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:786 ../gio/gdbus-tool.c:1119
+#: ../gio/gdbus-tool.c:809 ../gio/gdbus-tool.c:1140
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "%d parametresini ayrıştırırken hata oluştu: %s\n"
 
-#: ../gio/gdbus-tool.c:818
+#: ../gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Bağlantı boşaltılırken hata: %s\n"
 
-#: ../gio/gdbus-tool.c:845
+#: ../gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Üzerinde yöntem çalıştırılacak hedef nokta adı"
 
-#: ../gio/gdbus-tool.c:846
+#: ../gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Yöntemin üzerinde çalıştırılacağı nesne yolu"
 
-#: ../gio/gdbus-tool.c:847
+#: ../gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Yöntem ve arayüz adı"
 
-#: ../gio/gdbus-tool.c:848
+#: ../gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Saniye cinsinden zaman aşımı"
 
-#: ../gio/gdbus-tool.c:889
+#: ../gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Uzak bir nesne üzerinde yöntem çalıştır."
 
-#: ../gio/gdbus-tool.c:972 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1967
+#: ../gio/gdbus-tool.c:982 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1969
+#, c-format
+msgid "Error: Destination is not specified\n"
+msgstr "Hata: Hedef belirtilmedi\n"
+
+#: ../gio/gdbus-tool.c:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Hata: %s geçerli bir veri yolu adı değil\n"
 
-#: ../gio/gdbus-tool.c:1022
+#: ../gio/gdbus-tool.c:1043
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "Hata: Yöntem adı belirtilmedi\n"
 
-#: ../gio/gdbus-tool.c:1033
+#: ../gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s� is invalid\n"
 msgstr "Hata: Yöntem adı “%s� geçersiz\n"
 
-#: ../gio/gdbus-tool.c:1111
+#: ../gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s�: %s\n"
 msgstr "“%2$s� türünün %1$d parametresi ayrıştırılırken hata: %3$s\n"
 
-#: ../gio/gdbus-tool.c:1555
+#: ../gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "İçgözlem için hedef nokta adı"
 
-#: ../gio/gdbus-tool.c:1556
+#: ../gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "İçgözlem yapmak için nesne yolu"
 
-#: ../gio/gdbus-tool.c:1557
+#: ../gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "XML yazdır"
 
-#: ../gio/gdbus-tool.c:1558
+#: ../gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "Alt iç gözlemi"
 
-#: ../gio/gdbus-tool.c:1559
+#: ../gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Yalnızca özellikleri yazdır"
 
-#: ../gio/gdbus-tool.c:1650
+#: ../gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Uzak nesneye içgözlem yap."
 
-#: ../gio/gdbus-tool.c:1853
+#: ../gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Gözlemlenecek hedefin adı"
 
-#: ../gio/gdbus-tool.c:1854
+#: ../gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Gözlemlenecek nesne yolu"
 
-#: ../gio/gdbus-tool.c:1883
+#: ../gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Uzak nesneyi gözlemle."
 
-#: ../gio/gdbus-tool.c:1941
+#: ../gio/gdbus-tool.c:1954
 #, c-format
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr "Hata: non-message-bus gözlemlenemiyor\n"
 
-#: ../gio/gdbus-tool.c:2065
+#: ../gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Bir diğeri (tanınmış ad) için beklemeden önce aktifleştirilecek hizmet"
 
-#: ../gio/gdbus-tool.c:2068
+#: ../gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1217,66 +1219,66 @@ msgstr ""
 "Bir hatayla çıkılmadan önce beklenecek zaman aşımı süresi (saniye); zaman "
 "aşımı olmaması için 0 (öntanımlı)"
 
-#: ../gio/gdbus-tool.c:2116
+#: ../gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[SEÇENEK…] VERİYOLU-ADI"
 
-#: ../gio/gdbus-tool.c:2118
+#: ../gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Veri yolu adının belirmesini bekle."
 
-#: ../gio/gdbus-tool.c:2194
+#: ../gio/gdbus-tool.c:2206
 #, c-format
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Hata: AktifleÅŸtirilecek bir hizmet belirtilmelidir.\n"
 
-#: ../gio/gdbus-tool.c:2199
+#: ../gio/gdbus-tool.c:2211
 #, c-format
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Hata: Beklenecek bir hizmet belirtilmelidir.\n"
 
-#: ../gio/gdbus-tool.c:2204
+#: ../gio/gdbus-tool.c:2216
 #, c-format
 msgid "Error: Too many arguments.\n"
 msgstr "Hata: Çok fazla argüman.\n"
 
-#: ../gio/gdbus-tool.c:2212 ../gio/gdbus-tool.c:2219
+#: ../gio/gdbus-tool.c:2224 ../gio/gdbus-tool.c:2231
 #, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Hata: %s geçerli bilinen bir veri yolu adı değil\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: ../gio/gdesktopappinfo.c:2022 ../gio/gdesktopappinfo.c:4589
 msgid "Unnamed"
 msgstr "Adlandırılmamış"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: ../gio/gdesktopappinfo.c:2432
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Desktop dosyası Exec alanı belirtmemiş"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: ../gio/gdesktopappinfo.c:2722
 msgid "Unable to find terminal required for application"
 msgstr "Uygulama için gerekli uçbirim bulunamadı"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: ../gio/gdesktopappinfo.c:3158
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr "Kullanıcı uygulaması yapılandırma klasörü %s oluşturulamıyor: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: ../gio/gdesktopappinfo.c:3162
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Kullanıcı MIME yapılandırma klasörü %s oluşturulamıyor: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: ../gio/gdesktopappinfo.c:3402 ../gio/gdesktopappinfo.c:3426
 msgid "Application information lacks an identifier"
 msgstr "Uygulama bilgisi bir tanımlayıcıya sahip değildir"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: ../gio/gdesktopappinfo.c:3660
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Kullanıcı masaüstü dosyası %s oluşturulamıyor"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: ../gio/gdesktopappinfo.c:3794
 #, c-format
 msgid "Custom definition for %s"
 msgstr "%s için özel tanım"
@@ -1296,11 +1298,11 @@ msgstr "sürücü eject veya eject_with_operation uygulamıyor"
 msgid "drive doesn’t implement polling for media"
 msgstr "sürücü ortam için yoklamayı uygulamıyor"
 
-#: ../gio/gdrive.c:776
+#: ../gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "sürücü start uygulamıyor"
 
-#: ../gio/gdrive.c:878
+#: ../gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "sürücü stop uygulamıyor"
 
@@ -1340,11 +1342,11 @@ msgstr "GEmblemedIcon için bir Gemblem beklendi"
 #: ../gio/gfile.c:1071 ../gio/gfile.c:1309 ../gio/gfile.c:1447
 #: ../gio/gfile.c:1685 ../gio/gfile.c:1740 ../gio/gfile.c:1798
 #: ../gio/gfile.c:1882 ../gio/gfile.c:1939 ../gio/gfile.c:2003
-#: ../gio/gfile.c:2058 ../gio/gfile.c:3725 ../gio/gfile.c:3780
-#: ../gio/gfile.c:4016 ../gio/gfile.c:4058 ../gio/gfile.c:4526
-#: ../gio/gfile.c:4937 ../gio/gfile.c:5022 ../gio/gfile.c:5112
-#: ../gio/gfile.c:5209 ../gio/gfile.c:5296 ../gio/gfile.c:5397
-#: ../gio/gfile.c:7975 ../gio/gfile.c:8065 ../gio/gfile.c:8149
+#: ../gio/gfile.c:2058 ../gio/gfile.c:3733 ../gio/gfile.c:3788
+#: ../gio/gfile.c:4024 ../gio/gfile.c:4066 ../gio/gfile.c:4534
+#: ../gio/gfile.c:4945 ../gio/gfile.c:5030 ../gio/gfile.c:5120
+#: ../gio/gfile.c:5217 ../gio/gfile.c:5304 ../gio/gfile.c:5405
+#: ../gio/gfile.c:7983 ../gio/gfile.c:8073 ../gio/gfile.c:8157
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Ä°ÅŸlem desteklenmiyor"
@@ -1357,7 +1359,7 @@ msgstr "Ä°ÅŸlem desteklenmiyor"
 msgid "Containing mount does not exist"
 msgstr "BaÄŸlama yok"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2389
 msgid "Can’t copy over directory"
 msgstr "Dizin üzerine kopyalanamıyor"
 
@@ -1377,47 +1379,47 @@ msgstr "Dizin iç içe kopyalanamıyor"
 msgid "Splice not supported"
 msgstr "Splice desteklenmiyor"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: ../gio/gfile.c:2983 ../gio/gfile.c:3028
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Dosya uç uca eklenirken hata: %s"
 
-#: ../gio/gfile.c:3136
+#: ../gio/gfile.c:3144
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr ""
 "Bağlı sistemler arasında kopyalama (referans bağlantı/çoğaltmak) "
 "desteklenmiyor"
 
-#: ../gio/gfile.c:3140
+#: ../gio/gfile.c:3148
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopyalama desteklenmiyor ya da geçersiz"
 
-#: ../gio/gfile.c:3145
+#: ../gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Kopyalama (bağlama/klonlama) destenlenmiyor ya da çalışmadı"
 
-#: ../gio/gfile.c:3208
+#: ../gio/gfile.c:3216
 msgid "Can’t copy special file"
 msgstr "Özel dosya kopyalanamıyor"
 
-#: ../gio/gfile.c:4006
+#: ../gio/gfile.c:4014
 msgid "Invalid symlink value given"
 msgstr "Geçersiz simgesel bağ değeri verildi"
 
-#: ../gio/gfile.c:4167
+#: ../gio/gfile.c:4175
 msgid "Trash not supported"
 msgstr "Çöp desteklenmiyor"
 
-#: ../gio/gfile.c:4279
+#: ../gio/gfile.c:4287
 #, c-format
 msgid "File names cannot contain “%c�"
 msgstr "Dosya adları “%c� içeremez"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6768 ../gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "bölüm, bağlamayı yerine getirmiyor"
 
-#: ../gio/gfile.c:6869
+#: ../gio/gfile.c:6877
 msgid "No application is registered as handling this file"
 msgstr "Bu dosyayı işlemek için hiçbir uygulama kayıtlı değil"
 
@@ -1505,12 +1507,12 @@ msgstr "Sınıf adı %s için tür yok"
 #: ../gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
-msgstr "Tür %s GIcon arayüzü uygulamıyor"
+msgstr "%s türü GIcon arayüzü uygulamıyor"
 
 #: ../gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
-msgstr "Tür %s sınıflandırılmış değil"
+msgstr "%s türü sınıflandırılmış değil"
 
 #: ../gio/gicon.c:345
 #, c-format
@@ -1520,7 +1522,7 @@ msgstr "Bozuk sürüm numarası: %s"
 #: ../gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
-msgstr "Tür %s GIcon arayüzü üzerinde from_tokens() uygulamıyor"
+msgstr "%s türü GIcon arayüzü üzerinde from_tokens() uygulamıyor"
 
 #: ../gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
@@ -1588,10 +1590,6 @@ msgstr "Kullanım:"
 msgid "Print version information and exit."
 msgstr "Sürüm bilgisini yazdır ve çık."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[DEĞİŞKENLER...]"
-
 #: ../gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Komutlar:"
@@ -1674,7 +1672,7 @@ msgstr "stdout’a yazılırken hata"
 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
-#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1219
 #: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
@@ -1697,7 +1695,8 @@ msgstr ""
 
 #: ../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:139 ../gio/gio-tool-remove.c:72
+#: ../gio/gio-tool-mount.c:1269 ../gio/gio-tool-open.c:139
+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Konum verilmedi"
 
@@ -1744,7 +1743,7 @@ msgstr "HEDEF"
 
 #: ../gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
-msgstr "Bir veya daha çok dosyayı KAYNAK’tan HEDEF’e taşı"
+msgstr "Bir veya daha çok dosyayı KAYNAK’tan HEDEF’e taşı."
 
 #: ../gio/gio-tool-copy.c:105
 msgid ""
@@ -1764,7 +1763,7 @@ msgstr "%s konumu bir dizin deÄŸildir"
 #: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185
 #, c-format
 msgid "%s: overwrite “%s�? "
-msgstr "%s: “%s� üzerine yaz?"
+msgstr "%s: “%s� üzerine yaz? "
 
 #: ../gio/gio-tool-info.c:34
 msgid "List writable attributes"
@@ -1816,7 +1815,7 @@ msgstr "tür: %s\n"
 #: ../gio/gio-tool-info.c:151
 #, c-format
 msgid "size: "
-msgstr "boyut:"
+msgstr "boyut: "
 
 #: ../gio/gio-tool-info.c:156
 #, c-format
@@ -1895,7 +1894,7 @@ msgstr "Ä°ÅžLEYÄ°CÄ°"
 
 #: ../gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
-msgstr "Bir MIME türü için işleyici belirle veya al"
+msgstr "Bir MIME türü için işleyici belirle veya al."
 
 #: ../gio/gio-tool-mime.c:78
 msgid ""
@@ -2001,69 +2000,79 @@ msgstr "Bağlama eylemlerini gözlemle"
 msgid "Monitor files or directories for changes."
 msgstr "Dosyaları ve dizinleri değişiklikler için gözlemle."
 
-#: ../gio/gio-tool-mount.c:58
+#: ../gio/gio-tool-mount.c:59
 msgid "Mount as mountable"
 msgstr "BaÄŸlanabilir olarak baÄŸla"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:60
 msgid "Mount volume with device file"
 msgstr "Aygıt dosyasıyla bölümü bağla"
 
-#: ../gio/gio-tool-mount.c:59
+#: ../gio/gio-tool-mount.c:60 ../gio/gio-tool-mount.c:63
 msgid "DEVICE"
 msgstr "AYGIT"
 
-#: ../gio/gio-tool-mount.c:60
+#: ../gio/gio-tool-mount.c:61
 msgid "Unmount"
 msgstr "Ayır"
 
-#: ../gio/gio-tool-mount.c:61
+#: ../gio/gio-tool-mount.c:62
 msgid "Eject"
 msgstr "Çıkart"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:63
+#| msgid "Mount volume with device file"
+msgid "Stop drive with device file"
+msgstr "Aygıt dosyasıyla sürücüyü durdur"
+
+#: ../gio/gio-tool-mount.c:64
 msgid "Unmount all mounts with the given scheme"
 msgstr "Verilen şemayla birlikte tüm bağları ayır"
 
-#: ../gio/gio-tool-mount.c:62
+#: ../gio/gio-tool-mount.c:64
 msgid "SCHEME"
 msgstr "ÅžEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: ../gio/gio-tool-mount.c:65
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr "Ayırırken veya çıkarırken tamamlanmamış dosya eylemlerini göz ardı et"
 
-#: ../gio/gio-tool-mount.c:64
+#: ../gio/gio-tool-mount.c:66
 msgid "Use an anonymous user when authenticating"
 msgstr "Yetkilendirirken anonim bir kullanıcı kullan"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: ../gio/gio-tool-mount.c:68
 msgid "List"
 msgstr "Listele"
 
-#: ../gio/gio-tool-mount.c:67
+#: ../gio/gio-tool-mount.c:69
 msgid "Monitor events"
 msgstr "Eylemleri gözlemle"
 
-#: ../gio/gio-tool-mount.c:68
+#: ../gio/gio-tool-mount.c:70
 msgid "Show extra information"
 msgstr "Ek bilgi göster"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:280
 msgid "Anonymous access denied"
 msgstr "Anonim eriÅŸim engellendi"
 
-#: ../gio/gio-tool-mount.c:897
+#: ../gio/gio-tool-mount.c:508
+#| msgid "No volume for device file"
+msgid "No drive for device file"
+msgstr "Aygıt dosyası için sürücü yok"
+
+#: ../gio/gio-tool-mount.c:973
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s, %s konumunda bağlandı\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: ../gio/gio-tool-mount.c:1028
 msgid "No volume for device file"
 msgstr "Bu aygıt dosyası için bölüm yok"
 
-#: ../gio/gio-tool-mount.c:1145
+#: ../gio/gio-tool-mount.c:1223
 msgid "Mount or unmount the locations."
 msgstr "Konumları bağla veya ayır."
 
@@ -2083,7 +2092,7 @@ msgid ""
 msgstr ""
 "gio move geleneksel mv aracı gibi çalışır, fakat yerel dosyalar\n"
 "yerine GIO konumlarını kullanır: örneğin, smb://server/resource/file.txt\n"
-"gibi bir ÅŸeyi konum olarak kullanabilirsiniz."
+"gibi bir ÅŸeyi konum olarak kullanabilirsiniz"
 
 #: ../gio/gio-tool-move.c:142
 #, c-format
@@ -2194,7 +2203,7 @@ msgstr "DEÄžER"
 
 #: ../gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
-msgstr "KONUM’un bir dosya özniteliğini belirle"
+msgstr "KONUM’un bir dosya özniteliğini belirle."
 
 #: ../gio/gio-tool-set.c:113
 msgid "Location not specified"
@@ -2229,12 +2238,12 @@ msgstr "Simgesel bağlantıları, bağları ve kısayolları takip et"
 msgid "List contents of directories in a tree-like format."
 msgstr "Dizinlerin içeriklerini ağaç benzeri biçimde listele."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: ../gio/glib-compile-resources.c:143 ../gio/glib-compile-schemas.c:1505
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "<%2$s> içinde <%1$s> ögesine izin verilmiyor"
 
-#: ../gio/glib-compile-resources.c:146
+#: ../gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "<%s> ögesine en üst seviyede izin verilmiyor"
@@ -2254,90 +2263,102 @@ msgstr "Herhangi bir kaynak dizinde “%s� konumlanamadı"
 msgid "Failed to locate “%s� in current directory"
 msgstr "Geçerli dizinde “%s� konumlanamadı"
 
-#: ../gio/glib-compile-resources.c:290
+#: ../gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s�"
 msgstr "Bilinmeyen işleme seçeneği “%s�"
 
-#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
+#. Translators: the first %s is a gresource XML attribute,
+#. * the second %s is an environment variable, and the third
+#. * %s is a command line tool
+#.
+#: ../gio/glib-compile-resources.c:313 ../gio/glib-compile-resources.c:370
+#: ../gio/glib-compile-resources.c:427
 #, c-format
-msgid "Failed to create temp file: %s"
-msgstr "Geçici dosya oluşturulamadı: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr "%s ön işleme istendi, ancak %s belirtilmedi ve %s PATH içinde değil"
 
-#: ../gio/glib-compile-resources.c:382
+#: ../gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "%s dosyası okuma hatası: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: ../gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "%s dosyası sıkıştırma hatası"
 
-#: ../gio/glib-compile-resources.c:469
+#: ../gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "<%s> içinde metin bulunamaz"
 
-#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
+#: ../gio/glib-compile-resources.c:736 ../gio/glib-compile-schemas.c:2071
 msgid "Show program version and exit"
 msgstr "Programın sürümünü göster ve çık"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
-msgstr "çıktı dosyasının adı"
+#: ../gio/glib-compile-resources.c:737
+#| msgid "name of the output file"
+msgid "Name of the output file"
+msgstr "Çıktı dosyasının adı"
 
-#: ../gio/glib-compile-resources.c:666
+#: ../gio/glib-compile-resources.c:738
+#| msgid ""
+#| "The directories where files are to be read from (default to current "
+#| "directory)"
 msgid ""
-"The directories where files are to be read from (default to current "
+"The directories to load files referenced in FILE from (default: current "
 "directory)"
-msgstr "Okunacak dosyaların olduğu dizin (öntanımlıdan geçerli dizine)"
+msgstr ""
+"FILEʼda belirtilen dosyaların yükleneceği dizinler (öntanımlı: geçerli dizin)"
 
-#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: ../gio/glib-compile-resources.c:738 ../gio/glib-compile-schemas.c:2072
+#: ../gio/glib-compile-schemas.c:2100
 msgid "DIRECTORY"
 msgstr "DÄ°ZÄ°N"
 
-#: ../gio/glib-compile-resources.c:667
+#: ../gio/glib-compile-resources.c:739
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Hedef dosya adı uzantısı tarafından seçilen biçimde çıktı oluştur"
 
-#: ../gio/glib-compile-resources.c:668
+#: ../gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Kaynak başlığı oluştur"
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
+#: ../gio/glib-compile-resources.c:741
+#| msgid "Generate sourcecode used to link in the resource file into your code"
+msgid "Generate source code used to link in the resource file into your code"
 msgstr ""
 "Kodunuz içinde kaynak dosyasına bağlanmak için kullanılacak kaynak kodu "
 "oluÅŸturun"
 
-#: ../gio/glib-compile-resources.c:670
+#: ../gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Bağımlılık listesi oluştur"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr "oluşturulacak bağımlılık dosyasının adı"
+#: ../gio/glib-compile-resources.c:743
+#| msgid "name of the dependency file to generate"
+msgid "Name of the dependency file to generate"
+msgstr "Oluşturulacak bağımlılık dosyasının adı"
 
-#: ../gio/glib-compile-resources.c:672
+#: ../gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Oluşturulan bağımlılık dosyasında sahte hedefleri içer"
 
-#: ../gio/glib-compile-resources.c:673
+#: ../gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "Kaynağı kendiliğinden oluşturma ve kaydetme"
 
-#: ../gio/glib-compile-resources.c:674
+#: ../gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "İşlevleri dışarı aktarma; onları G_GNUC_INTERNAL beyan et"
 
-#: ../gio/glib-compile-resources.c:675
+#: ../gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
 msgstr "C oluşturulan kaynak kod için kullanılan tanımlayıcı ad"
 
-#: ../gio/glib-compile-resources.c:701
+#: ../gio/glib-compile-resources.c:773
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2345,9 +2366,9 @@ msgid ""
 msgstr ""
 "Bir kaynak dosyasına kaynak özelliklerini derle.\n"
 "Kaynak özellikleri dosyaları .gresource.xml uzantısına sahiptir\n"
-"ve kaynak dosyaları uzantısı .gresource "
+"ve kaynak dosyaları uzantısı .gresource."
 
-#: ../gio/glib-compile-resources.c:723
+#: ../gio/glib-compile-resources.c:795
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Tam olarak bir adet dosya adı vermelisiniz\n"
@@ -2507,16 +2528,16 @@ msgstr "takma ad hedefi “%s�, <choices> içinde değil"
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> en az bir <alias> içermelidir"
 
-#: ../gio/glib-compile-schemas.c:786
+#: ../gio/glib-compile-schemas.c:788
 msgid "Empty names are not permitted"
 msgstr "BoÅŸ adlara izin verilmiyor"
 
-#: ../gio/glib-compile-schemas.c:796
+#: ../gio/glib-compile-schemas.c:798
 #, c-format
 msgid "Invalid name “%s�: names must begin with a lowercase letter"
 msgstr "Geçersiz ad “%s�: adlar küçük harf ile başlamalıdır"
 
-#: ../gio/glib-compile-schemas.c:808
+#: ../gio/glib-compile-schemas.c:810
 #, c-format
 msgid ""
 "Invalid name “%s�: invalid character “%c�; only lowercase letters, numbers "
@@ -2525,36 +2546,36 @@ msgstr ""
 "Geçesiz ad “%s�: geçersiz karakter “%c�; yalnızca küçük harfler, sayılar ve "
 "tire (“-�) işareti kullanılabilir"
 
-#: ../gio/glib-compile-schemas.c:817
+#: ../gio/glib-compile-schemas.c:819
 #, c-format
 msgid "Invalid name “%s�: two successive hyphens (“--�) are not permitted"
 msgstr "Geçesiz ad “%s�: birbirini izleyen iki tire (“--�) kullanılamaz"
 
-#: ../gio/glib-compile-schemas.c:826
+#: ../gio/glib-compile-schemas.c:828
 #, c-format
 msgid "Invalid name “%s�: the last character may not be a hyphen (“-�)"
 msgstr "Geçesiz ad “%s�: son karakter tire (“-�) olamaz."
 
-#: ../gio/glib-compile-schemas.c:834
+#: ../gio/glib-compile-schemas.c:836
 #, c-format
 msgid "Invalid name “%s�: maximum length is 1024"
 msgstr "Geçesiz ad “%s�: olabilecek azami uzunluk 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: ../gio/glib-compile-schemas.c:908
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> zaten belirtilmiÅŸ"
 
-#: ../gio/glib-compile-schemas.c:930
+#: ../gio/glib-compile-schemas.c:934
 msgid "Cannot add keys to a “list-of� schema"
 msgstr "“list-of� şemasına anahtarlar eklenemiyor"
 
-#: ../gio/glib-compile-schemas.c:941
+#: ../gio/glib-compile-schemas.c:945
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> zaten belirtilmiÅŸ"
 
-#: ../gio/glib-compile-schemas.c:959
+#: ../gio/glib-compile-schemas.c:963
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2563,7 +2584,7 @@ msgstr ""
 "<key name='%1$s'> dizgesi <schema id='%3$s'> içindeki <key name='%2$s'> "
 "dizgesini gölgeler; değerleri değiştirmek için <override> kullanın"
 
-#: ../gio/glib-compile-schemas.c:970
+#: ../gio/glib-compile-schemas.c:974
 #, c-format
 msgid ""
 "Exactly one of “type�, “enum� or “flags� must be specified as an attribute "
@@ -2572,63 +2593,63 @@ msgstr ""
 "<key>’e “type�, “enum�, ya da “flags� özniteliklerinden bir tanesi "
 "kesinlikle belirtilmelidir"
 
-#: ../gio/glib-compile-schemas.c:989
+#: ../gio/glib-compile-schemas.c:993
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> (henüz) tanımlanmamış."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: ../gio/glib-compile-schemas.c:1008
 #, c-format
 msgid "Invalid GVariant type string “%s�"
 msgstr "Geçersiz GVariant tür dizgesi “%s�"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: ../gio/glib-compile-schemas.c:1038
 msgid "<override> given but schema isn’t extending anything"
 msgstr "<override> verildi, fakat şema hiçbir şeyi genişletmiyor"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: ../gio/glib-compile-schemas.c:1051
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Üzerine yazılacak hiçbir <key name='%s'> yok"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: ../gio/glib-compile-schemas.c:1059
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> zaten belirtilmiÅŸ"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: ../gio/glib-compile-schemas.c:1132
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> zaten belirtilmiÅŸ"
 
-#: ../gio/glib-compile-schemas.c:1140
+#: ../gio/glib-compile-schemas.c:1144
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s�"
 msgstr "<schema id='%s'> henüz var olmayan “%s� şemasını genişletir"
 
-#: ../gio/glib-compile-schemas.c:1156
+#: ../gio/glib-compile-schemas.c:1160
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s�"
 msgstr "<schema id='%s'> henüz var olmayan “%s� şemasının bir listesidir"
 
-#: ../gio/glib-compile-schemas.c:1164
+#: ../gio/glib-compile-schemas.c:1168
 #, c-format
 msgid "Cannot be a list of a schema with a path"
 msgstr "Yolu olan bir şemanın listesi olamaz"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: ../gio/glib-compile-schemas.c:1178
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Åžema bir yol ile geniÅŸletilemez"
 
-#: ../gio/glib-compile-schemas.c:1184
+#: ../gio/glib-compile-schemas.c:1188
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
 msgstr ""
 "<schema id='%s'>, liste olmayan <schema id='%s'> 'i geniÅŸleten bir listedir"
 
-#: ../gio/glib-compile-schemas.c:1194
+#: ../gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s� "
@@ -2637,17 +2658,17 @@ msgstr ""
 "<schema id='%s' list-of='%s'>, <schema id='%s' list-of='%s'> ’i genişletir; "
 "fakat “%s�, “%s�i genişletemez"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: ../gio/glib-compile-schemas.c:1215
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr "Eğer verilmişse, yol, mutlaka bir taksim ile başlayıp bitmeli"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: ../gio/glib-compile-schemas.c:1222
 #, c-format
 msgid "The path of a list must end with “:/�"
 msgstr "bir listenin yolu mutlaka “:/� ile bitmelidir"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: ../gio/glib-compile-schemas.c:1231
 #, c-format
 msgid ""
 "Warning: Schema “%s� has path “%s�.  Paths starting with “/apps/�, “/"
@@ -2656,119 +2677,129 @@ msgstr ""
 "Uyarı: “%s� şeması “%s� yoluna sahip.  “/apps/�, “/desktop/� veya “/system/� "
 "ile başlayan yollar artık kullanılmamaktadır."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: ../gio/glib-compile-schemas.c:1261
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> zaten belirtilmiÅŸ"
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
+#: ../gio/glib-compile-schemas.c:1411 ../gio/glib-compile-schemas.c:1427
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
 msgstr "<%s> içinde yalnızca bir <%s> ögesi bulunabilir"
 
-#: ../gio/glib-compile-schemas.c:1505
+#: ../gio/glib-compile-schemas.c:1509
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr "<%s> ögesine en üst düzeyde izin verilmez"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: ../gio/glib-compile-schemas.c:1527
 msgid "Element <default> is required in <key>"
 msgstr "<default> ögesi <key> içinde zorunludur"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: ../gio/glib-compile-schemas.c:1617
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "<%s> içinde metin bulunamayabilir"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: ../gio/glib-compile-schemas.c:1685
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Uyarı: <schema id='%s'/> ’e tanımlanmamış referans"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: ../gio/glib-compile-schemas.c:1824 ../gio/glib-compile-schemas.c:1898
+#: ../gio/glib-compile-schemas.c:1974
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict belirtildi; çıkılıyor.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: ../gio/glib-compile-schemas.c:1834
 #, c-format
 msgid "This entire file has been ignored.\n"
-msgstr "Bu dosyanın tamamı gözardı edildi.\n"
+msgstr "Bu dosyanın tümü göz ardı edildi.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: ../gio/glib-compile-schemas.c:1894
 #, c-format
 msgid "Ignoring this file.\n"
-msgstr "Bu dosya gözardı ediliyor.\n"
+msgstr "Bu dosya göz ardı ediliyor.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: ../gio/glib-compile-schemas.c:1934
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+#| msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
+msgid "No such key “%s� in schema “%s� as specified in override file “%s�"
 msgstr ""
-"'%3$s' dosyasında üzerine yazılacağı belirtilen '%2$s' şemasında '%1$s' gibi "
+"“%3$s� dosyasında üzerine yazılacağı belirtilen “%2$s� şemasında “%1$s� gibi "
 "bir anahtar yok"
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
+#: ../gio/glib-compile-schemas.c:2026
 #, c-format
 msgid "; ignoring override for this key.\n"
-msgstr "; bu anahtar için üzerine yazma gözardı ediliyor.\n"
+msgstr "; bu anahtar için üzerine yazma göz ardı ediliyor.\n"
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: ../gio/glib-compile-schemas.c:1944 ../gio/glib-compile-schemas.c:2002
+#: ../gio/glib-compile-schemas.c:2030
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " ve --strict belirtilmiş; çıkılıyor.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+#: ../gio/glib-compile-schemas.c:1960
 #, c-format
+#| msgid ""
+#| "error parsing key '%s' in schema '%s' as specified in override file '%s': "
+#| "%s."
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
+"error parsing key “%s� in schema “%s� as specified in override file “%s�: %s."
 msgstr ""
-"'%3$s' dosyasında üzerine yazılacağı belirtilen '%2$s' şemasında '%1$s' "
+"“%3$s� dosyasında üzerine yazılacağı belirtilen “%2$s� şemasında “%1$s� "
 "anahtarı ayrıştırmada hata: %4$s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: ../gio/glib-compile-schemas.c:1970
 #, c-format
 msgid "Ignoring override for this key.\n"
-msgstr "Bu anahtar için üzerine yazma gözardı ediliyor.\n"
+msgstr "Bu anahtar için üzerine yazma göz ardı ediliyor.\n"
 
-#: ../gio/glib-compile-schemas.c:1984
+#: ../gio/glib-compile-schemas.c:1988
 #, c-format
+#| msgid ""
+#| "override for key '%s' in schema '%s' in override file '%s' is outside the "
+#| "range given in the schema"
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is outside the "
+"override for key “%s� in schema “%s� in override file “%s� is outside the "
 "range given in the schema"
 msgstr ""
-"'%3$s' üzerine yazma dosyasındaki '%2$s' şemasının '%1$s' anahtarının "
+"“%3$s� üzerine yazma dosyasındaki “%2$s� şemasının “%1$s� anahtarının "
 "üzerine yazma, şemada verilen aralığın dışındadır"
 
-#: ../gio/glib-compile-schemas.c:2012
+#: ../gio/glib-compile-schemas.c:2016
 #, c-format
+#| msgid ""
+#| "override for key '%s' in schema '%s' in override file '%s' is not in the "
+#| "list of valid choices"
 msgid ""
-"override for key '%s' in schema '%s' in override file '%s' is not in the "
+"override for key “%s� in schema “%s� in override file “%s� is not in the "
 "list of valid choices"
 msgstr ""
-"'%3$s' dosyasındaki '%2$s' şemasının '%1$s' anahtarının üzerine yazma, "
+"“%3$s� dosyasındaki “%2$s� şemasının “%1$s� anahtarının üzerine yazma, "
 "geçerli seçenekler listesinde değildir"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2072
 msgid "where to store the gschemas.compiled file"
 msgstr "gschemas.compiled dosyasının saklanacağı yer"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: ../gio/glib-compile-schemas.c:2073
 msgid "Abort on any errors in schemas"
 msgstr "Åžemalardaki herhangi bir hatada iptal et"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: ../gio/glib-compile-schemas.c:2074
 msgid "Do not write the gschema.compiled file"
 msgstr "gschema.compiled dosyasını yazma"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: ../gio/glib-compile-schemas.c:2075
 msgid "Do not enforce key name restrictions"
 msgstr "Anahtar adı kısıtlamalarını zorlama"
 
-#: ../gio/glib-compile-schemas.c:2099
+#: ../gio/glib-compile-schemas.c:2103
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2778,32 +2809,32 @@ msgstr ""
 "Şema dosyalarının .gschema.xml uzantısına sahip olmaları gerekir,\n"
 "ve önbellek dosyası gschemas.compiled olarak anılır."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: ../gio/glib-compile-schemas.c:2124
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Tam olarak bir adet dizin adı vermelisiniz\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: ../gio/glib-compile-schemas.c:2166
 #, c-format
 msgid "No schema files found: "
 msgstr "Hiç şema dosyası bulunamadı: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: ../gio/glib-compile-schemas.c:2169
 #, c-format
 msgid "doing nothing.\n"
 msgstr "hiçbir şey yapılmıyor.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: ../gio/glib-compile-schemas.c:2172
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "var olan çıktı dosyası silindi.\n"
 
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:544 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Geçersiz dosya adı %s"
 
-#: ../gio/glocalfile.c:1105
+#: ../gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "%s için dosya sistemi bilgisi alınırken hata: %s"
@@ -2812,123 +2843,129 @@ msgstr "%s için dosya sistemi bilgisi alınırken hata: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1244
+#: ../gio/glocalfile.c:1145
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "%s dosyası için bağlama bulunamadı"
 
-#: ../gio/glocalfile.c:1267
+#: ../gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Kök dizini yeniden adlandırılamaz"
 
-#: ../gio/glocalfile.c:1285 ../gio/glocalfile.c:1308
+#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "%s dosyası yeniden adlandırılırken hata: %s"
 
-#: ../gio/glocalfile.c:1292
+#: ../gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Dosya yeniden adlandırılamıyor, dosya adı zaten var"
 
-#: ../gio/glocalfile.c:1305 ../gio/glocalfile.c:2322 ../gio/glocalfile.c:2350
-#: ../gio/glocalfile.c:2507 ../gio/glocalfileoutputstream.c:551
+#: ../gio/glocalfile.c:1206 ../gio/glocalfile.c:2265 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2450 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Geçersiz dosya adı"
 
-#: ../gio/glocalfile.c:1473 ../gio/glocalfile.c:1488
+#: ../gio/glocalfile.c:1374 ../gio/glocalfile.c:1389
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "%s dosyası açılırken hata: %s"
 
-#: ../gio/glocalfile.c:1613
+#: ../gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "%s dosyası silinirken hata: %s"
 
-#: ../gio/glocalfile.c:1997
+#: ../gio/glocalfile.c:1924
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "%s dosyası çöpe atılırken hata: %s"
 
-#: ../gio/glocalfile.c:2020
+#: ../gio/glocalfile.c:1947
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Çöp dizini %s oluşturulamıyor: %s"
 
-#: ../gio/glocalfile.c:2040
+#: ../gio/glocalfile.c:1969
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "%s çöpe atmak için en üst seviye dizin bulunamıyor"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: ../gio/glocalfile.c:1978
+#, c-format
+#| msgid "Copy (reflink/clone) between mounts is not supported"
+msgid "Trashing on system internal mounts is not supported"
+msgstr "Sistem iç bağlarına çöpleme desteklenmiyor"
+
+#: ../gio/glocalfile.c:2062 ../gio/glocalfile.c:2082
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "%s için çöp dizini bulunamıyor ya da oluşturulamıyor"
 
-#: ../gio/glocalfile.c:2174
+#: ../gio/glocalfile.c:2117
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "%s için çöp bilgi dosyası oluşturulamıyor: %s"
 
-#: ../gio/glocalfile.c:2233
+#: ../gio/glocalfile.c:2176
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr "%s dosyası, dosya sistemi sınırları dışına, çöpe atılamıyor"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: ../gio/glocalfile.c:2180 ../gio/glocalfile.c:2236
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "%s dosyası çöpe atılamıyor: %s"
 
-#: ../gio/glocalfile.c:2299
+#: ../gio/glocalfile.c:2242
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "%s dosyası çöpe atılamıyor"
 
-#: ../gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2268
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "%s dizini oluÅŸturulurken hata: %s"
 
-#: ../gio/glocalfile.c:2354
+#: ../gio/glocalfile.c:2297
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Dosya sistemi simgesel bağları desteklemiyor"
 
-#: ../gio/glocalfile.c:2357
+#: ../gio/glocalfile.c:2300
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "%s simgesel bağlantısı yapılırken hata: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: ../gio/glocalfile.c:2306 ../glib/gfileutils.c:2127
 msgid "Symbolic links not supported"
 msgstr "Simgesel baÄŸlar desteklenmiyor"
 
-#: ../gio/glocalfile.c:2418 ../gio/glocalfile.c:2453 ../gio/glocalfile.c:2510
+#: ../gio/glocalfile.c:2361 ../gio/glocalfile.c:2396 ../gio/glocalfile.c:2453
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "%s dosyası taşınırken hata: %s"
 
-#: ../gio/glocalfile.c:2441
+#: ../gio/glocalfile.c:2384
 msgid "Can’t move directory over directory"
 msgstr "Dizin dizin üzerine taşınamıyor"
 
-#: ../gio/glocalfile.c:2467 ../gio/glocalfileoutputstream.c:935
+#: ../gio/glocalfile.c:2410 ../gio/glocalfileoutputstream.c:935
 #: ../gio/glocalfileoutputstream.c:949 ../gio/glocalfileoutputstream.c:964
 #: ../gio/glocalfileoutputstream.c:981 ../gio/glocalfileoutputstream.c:995
 msgid "Backup file creation failed"
 msgstr "Yedek dosyası oluşturma başarısız oldu"
 
-#: ../gio/glocalfile.c:2486
+#: ../gio/glocalfile.c:2429
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Hedef dosya silerken hata: %s"
 
-#: ../gio/glocalfile.c:2500
+#: ../gio/glocalfile.c:2443
 msgid "Move between mounts not supported"
 msgstr "Bağlı sistemler arasında taşıma desteklenmiyor"
 
-#: ../gio/glocalfile.c:2691
+#: ../gio/glocalfile.c:2634
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "%s’in disk kullanımı saptanamadı: %s"
@@ -2950,79 +2987,79 @@ msgstr "Geçersiz genişletilmiş öznitelik adı"
 msgid "Error setting extended attribute “%s�: %s"
 msgstr "“%s� genişletilmiş özniteliği atanırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: ../gio/glocalfileinfo.c:1615
 msgid " (invalid encoding)"
 msgstr " (geçersiz kodlama)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: ../gio/glocalfileinfo.c:1779 ../gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s�: %s"
 msgstr "“%s� dosyası için bilgi alınırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: ../gio/glocalfileinfo.c:2041
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Dosya tanımlayıcı için bilgi alındığında hata: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: ../gio/glocalfileinfo.c:2086
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Geçersiz öznitelik türü (uint32 beklendi)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: ../gio/glocalfileinfo.c:2104
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Geçersiz öznitelik türü (uint64 beklendi)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: ../gio/glocalfileinfo.c:2123 ../gio/glocalfileinfo.c:2142
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Geçersiz öznitelik türü (byte dizisi beklendi)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: ../gio/glocalfileinfo.c:2187
 msgid "Cannot set permissions on symlinks"
 msgstr "Simgesel bağlar üzerindeki yetkiler ayarlanamıyor"
 
-#: ../gio/glocalfileinfo.c:2200
+#: ../gio/glocalfileinfo.c:2203
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "İzinler atanırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: ../gio/glocalfileinfo.c:2254
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Sahip atanırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: ../gio/glocalfileinfo.c:2277
 msgid "symlink must be non-NULL"
 msgstr "simgesel bağ NULL olmamalı"
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: ../gio/glocalfileinfo.c:2287 ../gio/glocalfileinfo.c:2306
+#: ../gio/glocalfileinfo.c:2317
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Simgesel bağ atanırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: ../gio/glocalfileinfo.c:2296
 msgid "Error setting symlink: file is not a symlink"
 msgstr "Simgesel bağ atanırken hata: dosya bir simgesel bağ değil"
 
-#: ../gio/glocalfileinfo.c:2419
+#: ../gio/glocalfileinfo.c:2422
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Değiştirme veya erişim süresi atanırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: ../gio/glocalfileinfo.c:2445
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux bağlamı NULL olmamalı"
 
-#: ../gio/glocalfileinfo.c:2457
+#: ../gio/glocalfileinfo.c:2460
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "SELinux bağlamı atanırken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: ../gio/glocalfileinfo.c:2467
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux bu sistede etkin deÄŸil"
 
-#: ../gio/glocalfileinfo.c:2556
+#: ../gio/glocalfileinfo.c:2559
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Öznitelik %s ataması desteklenmiyor"
@@ -3045,7 +3082,7 @@ msgstr "Dosya içinde atlama yapılırken hata: %s"
 msgid "Error closing file: %s"
 msgstr "Dosya kapatılırken hata: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: ../gio/glocalfilemonitor.c:852
 msgid "Unable to find default local file monitor type"
 msgstr "Öntanımlı yerel dosya izleme türü bulunamadı"
 
@@ -3137,21 +3174,21 @@ msgstr "Akışın sonu dışında arama istendi"
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:396
+#: ../gio/gmount.c:399
 msgid "mount doesn’t implement “unmount�"
 msgstr "bağlama, “ayır� işlemini yerine getirmiyor"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:472
+#: ../gio/gmount.c:475
 msgid "mount doesn’t implement “eject�"
 msgstr "bağlama, “çıkar� işlemini yerine getirmiyor"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:550
+#: ../gio/gmount.c:553
 msgid "mount doesn’t implement “unmount� or “unmount_with_operation�"
 msgstr ""
 "bağlama, “ayır� veya “unmount_with_operation� işlemini yerine getirmiyor"
@@ -3159,7 +3196,7 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:635
+#: ../gio/gmount.c:638
 msgid "mount doesn’t implement “eject� or “eject_with_operation�"
 msgstr ""
 "bağlama, “çıkar� veya “eject_with_operation� işlemini yerine getirmiyor"
@@ -3167,21 +3204,21 @@ msgstr ""
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:723
+#: ../gio/gmount.c:726
 msgid "mount doesn’t implement “remount�"
 msgstr "bağlama, “remount� işlemini yerine getirmiyor"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:805
+#: ../gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "bağlama, içerik türü tahminini yerine getirmiyor"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:892
+#: ../gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "bağlama, eş zamanlı içerik türü tahminini yerine getirmiyor"
 
@@ -3190,29 +3227,29 @@ msgstr "bağlama, eş zamanlı içerik türü tahminini yerine getirmiyor"
 msgid "Hostname “%s� contains “[� but not “]�"
 msgstr "“%s� ana makine adı “[� içeriyor ama “]� içermiyor"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: ../gio/gnetworkmonitorbase.c:211 ../gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "AÄŸa eriÅŸilemiyor"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: ../gio/gnetworkmonitorbase.c:249 ../gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Makineye eriÅŸilemiyor"
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
+#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
+#: ../gio/gnetworkmonitornetlink.c:128
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "Ağ izleme oluşturulamadı: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: ../gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "Ağ izleme oluşturulamadı: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: ../gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Ağ durumu alınamadı: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: ../gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "NetworkManager sürümü çok eski"
@@ -3232,7 +3269,6 @@ msgid "Error resolving “%s�: %s"
 msgstr "“%s� çözülürken hata: %s"
 
 #: ../gio/gresolver.c:729 ../gio/gresolver.c:781
-#| msgid "Invalid hostname"
 msgid "Invalid domain"
 msgstr "Geçersiz alan adı"
 
@@ -3455,7 +3491,7 @@ msgid ""
 "If no SCHEMA is given, list all keys\n"
 msgstr ""
 "Yinelemeli bir ÅŸekilde anahtar ve deÄŸerleri listele\n"
-"Eğer hiçbir ŞEMA verilmediyse, bütün anahtarları listele\n"
+"Eğer hiçbir ŞEMA verilmediyse, tüm anahtarları listele\n"
 
 #: ../gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
@@ -3493,7 +3529,7 @@ msgstr "ANAHTAR’ı öntanımlı değerine döndür"
 
 #: ../gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
-msgstr "ŞEMA içindeki bütün anahtarları öntanımlı değerlerine döndür"
+msgstr "ŞEMA içindeki tüm anahtarları öntanımlı değerlerine döndür"
 
 #: ../gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
@@ -3633,8 +3669,8 @@ msgstr "Geçersiz soket, başlatma başarısız oldu: %s"
 msgid "Socket is already closed"
 msgstr "Soket zaten kapalı"
 
-#: ../gio/gsocket.c:414 ../gio/gsocket.c:3010 ../gio/gsocket.c:4220
-#: ../gio/gsocket.c:4278
+#: ../gio/gsocket.c:414 ../gio/gsocket.c:3034 ../gio/gsocket.c:4244
+#: ../gio/gsocket.c:4302
 msgid "Socket I/O timed out"
 msgstr "Soket Girdi/Çıktı zaman aşımı"
 
@@ -3688,15 +3724,15 @@ msgid "Error binding to address: %s"
 msgstr "Adrese baÄŸlarken hata: %s"
 
 #: ../gio/gsocket.c:2226 ../gio/gsocket.c:2263 ../gio/gsocket.c:2373
-#: ../gio/gsocket.c:2391 ../gio/gsocket.c:2461 ../gio/gsocket.c:2519
-#: ../gio/gsocket.c:2537
+#: ../gio/gsocket.c:2398 ../gio/gsocket.c:2471 ../gio/gsocket.c:2529
+#: ../gio/gsocket.c:2547
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Çok yöne yayın grubuna katılırken hata: %s"
 
 #: ../gio/gsocket.c:2227 ../gio/gsocket.c:2264 ../gio/gsocket.c:2374
-#: ../gio/gsocket.c:2392 ../gio/gsocket.c:2462 ../gio/gsocket.c:2520
-#: ../gio/gsocket.c:2538
+#: ../gio/gsocket.c:2399 ../gio/gsocket.c:2472 ../gio/gsocket.c:2530
+#: ../gio/gsocket.c:2548
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Çok yöne yayın grubundan ayrılırken hata: %s"
@@ -3706,92 +3742,89 @@ msgid "No support for source-specific multicast"
 msgstr "Kaynağa-özgü çok yöne yayın desteklenmiyor"
 
 #: ../gio/gsocket.c:2375
-#| msgid "Unsupported socket address"
 msgid "Unsupported socket family"
 msgstr "Desteklenmeyen soket ailesi"
 
-#: ../gio/gsocket.c:2393
+#: ../gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "kaynağa-özgü bir IPv4 adresi değil"
 
-#: ../gio/gsocket.c:2411 ../gio/gsocket.c:2440 ../gio/gsocket.c:2487
+#: ../gio/gsocket.c:2418 ../gio/gsocket.c:2447 ../gio/gsocket.c:2497
 #, c-format
 msgid "Interface not found: %s"
 msgstr "Arayüz bulunamadı: %s"
 
-#: ../gio/gsocket.c:2427
+#: ../gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Arayüz adı çok uzun"
 
-#: ../gio/gsocket.c:2463
-#| msgid "No support for source-specific multicast"
+#: ../gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "IPv4 kaynağa-özgü çok yöne yayın desteklenmiyor"
 
-#: ../gio/gsocket.c:2521
-#| msgid "No support for source-specific multicast"
+#: ../gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "IPv6 kaynağa-özgü çok yöne yayın desteklenmiyor"
 
-#: ../gio/gsocket.c:2730
+#: ../gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Bağlantı kabul edilirken hata: %s"
 
-#: ../gio/gsocket.c:2854
+#: ../gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Bağlantı devam ediyor"
 
-#: ../gio/gsocket.c:2903
+#: ../gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Bekleyen hata alınamadı: "
 
-#: ../gio/gsocket.c:3073
+#: ../gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Veri alırken hata: %s"
 
-#: ../gio/gsocket.c:3268
+#: ../gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Veri gönderirken hata: %s"
 
-#: ../gio/gsocket.c:3455
+#: ../gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Soket kapatılamadı: %s"
 
-#: ../gio/gsocket.c:3536
+#: ../gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Soket kapatılırken hata: %s"
 
-#: ../gio/gsocket.c:4213
+#: ../gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Soket durumu bekleniyor: %s"
 
-#: ../gio/gsocket.c:4687 ../gio/gsocket.c:4767 ../gio/gsocket.c:4945
+#: ../gio/gsocket.c:4711 ../gio/gsocket.c:4791 ../gio/gsocket.c:4969
 #, c-format
 msgid "Error sending message: %s"
 msgstr "İleti gönderme hatası: %s"
 
-#: ../gio/gsocket.c:4711
+#: ../gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage Windows iÅŸletim sisteminde desteklenmiyor"
 
-#: ../gio/gsocket.c:5164 ../gio/gsocket.c:5237 ../gio/gsocket.c:5463
+#: ../gio/gsocket.c:5188 ../gio/gsocket.c:5261 ../gio/gsocket.c:5487
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "İleti alma hatası: %s"
 
-#: ../gio/gsocket.c:5735
+#: ../gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Soket kimliği okunamadı : %s"
 
-#: ../gio/gsocket.c:5744
+#: ../gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "bu işletim sistemi için g_socket_get_credentials uygulanmadı"
 
@@ -3822,11 +3855,11 @@ msgstr "TCP olmayan bağlantılar üzerinden vekil sunucusu desteklenmiyor."
 msgid "Proxy protocol “%s� is not supported."
 msgstr "“%s� vekil iletişim kuralı desteklenmiyor."
 
-#: ../gio/gsocketlistener.c:218
+#: ../gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Dinleyici zaten kapalı"
 
-#: ../gio/gsocketlistener.c:264
+#: ../gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Eklenen soket kapalı"
 
@@ -4053,7 +4086,7 @@ msgstr "Dosya tanımlayıcıdan okuma hatası: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Dosya tanımlayıcı kapatılırken hata: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: ../gio/gunixmounts.c:2593 ../gio/gunixmounts.c:2646
 msgid "Filesystem root"
 msgstr "Dosya sistemi kök dizini"
 
@@ -4066,14 +4099,14 @@ msgstr "Dosya tanımlayıcıya yazmada hata: %s"
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr "Soyut UNIX alan soketi adresleri bu sistemde desteklenmiyor"
 
-#: ../gio/gvolume.c:437
+#: ../gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "bölüm, çıkartmayı yerine getirmiyor"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gvolume.c:514
+#: ../gio/gvolume.c:515
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "bölüm, çıkartmayı veya eject_with_operation’ı yerine getirmiyor"
 
@@ -4205,7 +4238,6 @@ msgid "Failed to expand exec line “%s� with URI “%s�"
 msgstr "Exec satırı “%s�, “%s� URI’si ile genişletilirken başarısız olundu"
 
 #: ../glib/gconvert.c:473
-#| msgid "Invalid sequence in conversion input"
 msgid "Unrepresentable character in conversion input"
 msgstr "Dönüşüm girdisi içinde temsil edilemez karakter"
 
@@ -4221,12 +4253,10 @@ msgstr ""
 "Geridönüş karakter kümesi “%s�, “%s� karakter kümesine dönüştürülemiyor"
 
 #: ../glib/gconvert.c:940
-#| msgid "Invalid byte sequence in conversion input"
 msgid "Embedded NUL byte in conversion input"
 msgstr "Dönüşüm girdisinde gömülü NUL baytı"
 
 #: ../glib/gconvert.c:961
-#| msgid "Invalid byte sequence in conversion input"
 msgid "Embedded NUL byte in conversion output"
 msgstr "Dönüşüm çıktısında gömülü NUL baytı"
 
@@ -4261,25 +4291,25 @@ msgid "The pathname “%s� is not an absolute path"
 msgstr "Yol adı “%s�, kesin bir yol değil"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:207
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %d %b %Y %T %Z"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:210
+#: ../glib/gdatetime.c:216
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:213
+#: ../glib/gdatetime.c:219
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:216
+#: ../glib/gdatetime.c:222
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
@@ -4300,62 +4330,62 @@ msgstr "%I:%M:%S %p"
 #. * non-European) there is no difference between the standalone and
 #. * complete date form.
 #.
-#: ../glib/gdatetime.c:251
+#: ../glib/gdatetime.c:261
 msgctxt "full month name"
 msgid "January"
 msgstr "Ocak"
 
-#: ../glib/gdatetime.c:253
+#: ../glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "Şubat"
 
-#: ../glib/gdatetime.c:255
+#: ../glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "Mart"
 
-#: ../glib/gdatetime.c:257
+#: ../glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "Nisan"
 
-#: ../glib/gdatetime.c:259
+#: ../glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "Mayıs"
 
-#: ../glib/gdatetime.c:261
+#: ../glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "Haziran"
 
-#: ../glib/gdatetime.c:263
+#: ../glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "Temmuz"
 
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "AÄŸustos"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "Eylül"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "Ekim"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "Kasım"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "Aralık"
@@ -4377,132 +4407,132 @@ msgstr "Aralık"
 #. * other platform.  Here are abbreviated month names in a form
 #. * appropriate when they are used standalone.
 #.
-#: ../glib/gdatetime.c:305
+#: ../glib/gdatetime.c:315
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Oca"
 
-#: ../glib/gdatetime.c:307
+#: ../glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Åžub"
 
-#: ../glib/gdatetime.c:309
+#: ../glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:311
+#: ../glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Nis"
 
-#: ../glib/gdatetime.c:313
+#: ../glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "May"
 
-#: ../glib/gdatetime.c:315
+#: ../glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Haz"
 
-#: ../glib/gdatetime.c:317
+#: ../glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Tem"
 
-#: ../glib/gdatetime.c:319
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "AÄŸu"
 
-#: ../glib/gdatetime.c:321
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Eyl"
 
-#: ../glib/gdatetime.c:323
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Eki"
 
-#: ../glib/gdatetime.c:325
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Kas"
 
-#: ../glib/gdatetime.c:327
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Ara"
 
-#: ../glib/gdatetime.c:342
+#: ../glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: ../glib/gdatetime.c:344
+#: ../glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Salı"
 
-#: ../glib/gdatetime.c:346
+#: ../glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: ../glib/gdatetime.c:348
+#: ../glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "PerÅŸembe"
 
-#: ../glib/gdatetime.c:350
+#: ../glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Cuma"
 
-#: ../glib/gdatetime.c:352
+#: ../glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: ../glib/gdatetime.c:354
+#: ../glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Pazar"
 
-#: ../glib/gdatetime.c:369
+#: ../glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Pzt"
 
-#: ../glib/gdatetime.c:371
+#: ../glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Sal"
 
-#: ../glib/gdatetime.c:373
+#: ../glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Çar"
 
-#: ../glib/gdatetime.c:375
+#: ../glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Per"
 
-#: ../glib/gdatetime.c:377
+#: ../glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Cum"
 
-#: ../glib/gdatetime.c:379
+#: ../glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Cmt"
 
-#: ../glib/gdatetime.c:381
+#: ../glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Paz"
@@ -4524,86 +4554,62 @@ msgstr "Paz"
 #. * (western European, non-European) there is no difference between the
 #. * standalone and complete date form.
 #.
-#: ../glib/gdatetime.c:441
-#| msgctxt "full month name"
-#| msgid "January"
+#: ../glib/gdatetime.c:455
 msgctxt "full month name with day"
 msgid "January"
 msgstr "Ocak"
 
-#: ../glib/gdatetime.c:443
-#| msgctxt "full month name"
-#| msgid "February"
+#: ../glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "Şubat"
 
-#: ../glib/gdatetime.c:445
-#| msgctxt "full month name"
-#| msgid "March"
+#: ../glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "Mart"
 
-#: ../glib/gdatetime.c:447
-#| msgctxt "full month name"
-#| msgid "April"
+#: ../glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "Nisan"
 
-#: ../glib/gdatetime.c:449
-#| msgctxt "full month name"
-#| msgid "May"
+#: ../glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "Mayıs"
 
-#: ../glib/gdatetime.c:451
-#| msgctxt "full month name"
-#| msgid "June"
+#: ../glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "Haziran"
 
-#: ../glib/gdatetime.c:453
-#| msgctxt "full month name"
-#| msgid "July"
+#: ../glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "Temmuz"
 
-#: ../glib/gdatetime.c:455
-#| msgctxt "full month name"
-#| msgid "August"
+#: ../glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "AÄŸustos"
 
-#: ../glib/gdatetime.c:457
-#| msgctxt "full month name"
-#| msgid "September"
+#: ../glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "Eylül"
 
-#: ../glib/gdatetime.c:459
-#| msgctxt "full month name"
-#| msgid "October"
+#: ../glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "Ekim"
 
-#: ../glib/gdatetime.c:461
-#| msgctxt "full month name"
-#| msgid "November"
+#: ../glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "Kasım"
 
-#: ../glib/gdatetime.c:463
-#| msgctxt "full month name"
-#| msgid "December"
+#: ../glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "Aralık"
@@ -4625,98 +4631,74 @@ msgstr "Aralık"
 #. * month names almost ready to copy and paste here.  In other systems
 #. * due to a bug the result is incorrect in some languages.
 #.
-#: ../glib/gdatetime.c:524
-#| msgctxt "abbreviated month name"
-#| msgid "Jan"
+#: ../glib/gdatetime.c:542
 msgctxt "abbreviated month name with day"
 msgid "Jan"
 msgstr "Oca"
 
-#: ../glib/gdatetime.c:526
-#| msgctxt "abbreviated month name"
-#| msgid "Feb"
+#: ../glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "Åžub"
 
-#: ../glib/gdatetime.c:528
-#| msgctxt "abbreviated month name"
-#| msgid "Mar"
+#: ../glib/gdatetime.c:546
 msgctxt "abbreviated month name with day"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:530
-#| msgctxt "abbreviated month name"
-#| msgid "Apr"
+#: ../glib/gdatetime.c:548
 msgctxt "abbreviated month name with day"
 msgid "Apr"
 msgstr "Nis"
 
-#: ../glib/gdatetime.c:532
-#| msgctxt "full month name"
-#| msgid "May"
+#: ../glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "May"
 
-#: ../glib/gdatetime.c:534
-#| msgctxt "abbreviated month name"
-#| msgid "Jun"
+#: ../glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "Haz"
 
-#: ../glib/gdatetime.c:536
-#| msgctxt "abbreviated month name"
-#| msgid "Jul"
+#: ../glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "Tem"
 
-#: ../glib/gdatetime.c:538
-#| msgctxt "abbreviated month name"
-#| msgid "Aug"
+#: ../glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "AÄŸu"
 
-#: ../glib/gdatetime.c:540
-#| msgctxt "abbreviated month name"
-#| msgid "Sep"
+#: ../glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "Eyl"
 
-#: ../glib/gdatetime.c:542
-#| msgctxt "abbreviated month name"
-#| msgid "Oct"
+#: ../glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "Eki"
 
-#: ../glib/gdatetime.c:544
-#| msgctxt "abbreviated month name"
-#| msgid "Nov"
+#: ../glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "Kas"
 
-#: ../glib/gdatetime.c:546
-#| msgctxt "abbreviated month name"
-#| msgid "Dec"
+#: ../glib/gdatetime.c:564
 msgctxt "abbreviated month name with day"
 msgid "Dec"
 msgstr "Ara"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:563
+#: ../glib/gdatetime.c:581
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "ÖÖ"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:566
+#: ../glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "ÖS"
@@ -4953,18 +4935,21 @@ msgstr "Satır %d karakter %d hatalı: "
 
 #: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
-msgstr "Adda geçersiz UTF-8 kodlu metin - geçerli olmayan “%s�"
+#| msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s�"
+msgstr "Adda geçersiz UTF-8 kodlu metin — geçerli olmayan “%s�"
 
 #: ../glib/gmarkup.c:472
 #, c-format
-msgid "'%s' is not a valid name"
-msgstr "'%s' geçerli bir ad değil"
+#| msgid "'%s' is not a valid name"
+msgid "“%s� is not a valid name"
+msgstr "“%s� geçerli bir ad değil"
 
 #: ../glib/gmarkup.c:488
 #, c-format
-msgid "'%s' is not a valid name: '%c'"
-msgstr "'%s' geçerli bir ad değil: '%c'"
+#| msgid "'%s' is not a valid name: '%c'"
+msgid "“%s� is not a valid name: “%c�"
+msgstr "“%s� geçerli bir ad değil: “%c�"
 
 #: ../glib/gmarkup.c:598
 #, c-format
@@ -4973,46 +4958,60 @@ msgstr "Satır %d hata içeriyor: %s"
 
 #: ../glib/gmarkup.c:675
 #, c-format
+#| msgid ""
+#| "Failed to parse '%-.*s', which should have been a digit inside a "
+#| "character reference (&#234; for example) - perhaps the digit is too large"
 msgid ""
-"Failed to parse '%-.*s', which should have been a digit inside a character "
-"reference (&#234; for example) - perhaps the digit is too large"
+"Failed to parse “%-.*s�, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
 msgstr ""
-"Karakter referansı içinde bir rakam olması gereken '%-.*s' ayrıştırılamadı, "
-"(örneğin; &#234;) - rakam çok büyük olabilir"
+"Karakter referansı içinde bir rakam olması gereken “%-.*s� ayrıştırılamadı, "
+"(örneğin; &#234;) — rakam çok büyük olabilir"
 
 #: ../glib/gmarkup.c:687
+#| msgid ""
+#| "Character reference did not end with a semicolon; most likely you used an "
+#| "ampersand character without intending to start an entity - escape "
+#| "ampersand as &amp;"
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
 msgstr ""
 "Karakter referansı noktalı virgül ile bitmemiş; yüksek olasılıkla bir "
-"özvarlık başlatmak istemeksizin “ve� işareti kullandınız - “ve� işaretini "
+"özvarlık başlatmak istemeksizin “ve� işareti kullandınız — “ve� işaretini "
 "&amp; olarak kullanabilirsiniz"
 
 #: ../glib/gmarkup.c:713
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
-msgstr "Karakter referansı '%-.*s' izin verilen karakteri kodlamıyor"
+#| msgid "Character reference '%-.*s' does not encode a permitted character"
+msgid "Character reference “%-.*s� does not encode a permitted character"
+msgstr "Karakter referansı “%-.*s� izin verilen karakteri kodlamıyor"
 
 #: ../glib/gmarkup.c:751
+#| msgid ""
+#| "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity “&;� seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
-"Boş özvarlık '&;' görüldü; geçerli ögeler: &amp; &quot; &lt; &gt; &apos;"
+"Boş özvarlık “&;� görüldü; geçerli ögeler: &amp; &quot; &lt; &gt; &apos;"
 
 #: ../glib/gmarkup.c:759
 #, c-format
-msgid "Entity name '%-.*s' is not known"
-msgstr "Varlık adı '%-.*s' bilinmiyor"
+#| msgid "Entity name '%-.*s' is not known"
+msgid "Entity name “%-.*s� is not known"
+msgstr "Varlık adı “%-.*s� bilinmiyor"
 
 #: ../glib/gmarkup.c:764
+#| msgid ""
+#| "Entity did not end with a semicolon; most likely you used an ampersand "
+#| "character without intending to start an entity - escape ampersand as &amp;"
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
+"character without intending to start an entity — escape ampersand as &amp;"
 msgstr ""
 "Özvarlık noktalı virgül ile bitmiyor; yüksek olasılıkla bir özvarlık "
-"başlatmak istemeksizin “ve� işareti kullandınız - “ve� işaretini &amp; "
+"başlatmak istemeksizin “ve� işareti kullandınız — “ve� işaretini &amp; "
 "olarak kullanabilirsiniz"
 
 #: ../glib/gmarkup.c:1170
@@ -5021,95 +5020,123 @@ msgstr "Belge bir öge ile başlamalıdır (örneğin <kitap>)"
 
 #: ../glib/gmarkup.c:1210
 #, c-format
+#| msgid ""
+#| "'%s' is not a valid character following a '<' character; it may not begin "
+#| "an element name"
 msgid ""
-"'%s' is not a valid character following a '<' character; it may not begin an "
+"“%s� is not a valid character following a “<� character; it may not begin an "
 "element name"
 msgstr ""
-"'<' karakterinden sonra gelen '%s' geçerli bir karakter değil; bir öge adı "
+"“<� karakterinden sonra gelen “%s� geçerli bir karakter değil; bir öge adı "
 "başlatmamalı"
 
 #: ../glib/gmarkup.c:1252
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected a '>' character to end the empty-element tag "
+#| "'%s'"
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
+"Odd character “%s�, expected a “>� character to end the empty-element tag "
+"“%s�"
 msgstr ""
-"Tuhaf karakter '%s', '%s' boş öge etiketinin sonunda '>' karakteri beklendi"
+"Tuhaf karakter “%s�, “%s� boş öge etiketinin sonunda “>� karakteri bekledi"
 
 #: ../glib/gmarkup.c:1333
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected a '=' after attribute name '%s' of element "
+#| "'%s'"
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+"Odd character “%s�, expected a “=� after attribute name “%s� of element “%s�"
 msgstr ""
-"Tuhaf karakter '%1$s', '%3$s' ögesinin '%2$s' özniteliğinin sonunda '=' "
-"karakteri beklendi"
+"Tuhaf karakter “%1$s�, “%3$s� ögesinin “%2$s� özniteliğinin sonunda “=� "
+"karakteri bekledi"
 
 #: ../glib/gmarkup.c:1374
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected a '>' or '/' character to end the start tag "
+#| "of element '%s', or optionally an attribute; perhaps you used an invalid "
+#| "character in an attribute name"
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s�, expected a “>� or “/� character to end the start tag of "
+"element “%s�, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
-"Tuhaf karakter '%s', '%s' ögesinin başlangıç etiketinin sonunda '>', '/' "
-"karakteri veya bir öznitelik beklendi; öznitelik adında geçersiz bir "
+"Tuhaf karakter “%s�, “%s� ögesinin başlangıç etiketini sonlandırmak için "
+"“>�, “/� karakteri veya bir öznitelik bekledi; öznitelik adında geçersiz bir "
 "karakter kullanmış olabilirsiniz"
 
 #: ../glib/gmarkup.c:1418
 #, c-format
+#| msgid ""
+#| "Odd character '%s', expected an open quote mark after the equals sign "
+#| "when giving value for attribute '%s' of element '%s'"
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
+"Odd character “%s�, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s� of element “%s�"
 msgstr ""
-"Tuhaf karakter '%1$s', '%3$s' ögesindeki '%2$s' özniteliği için değer "
+"Tuhaf karakter “%1$s�, “%3$s� ögesindeki “%2$s� özniteliği için değer "
 "verildiğinde eşittir işaretinden sonra tırnak işareti beklendi"
 
 #: ../glib/gmarkup.c:1551
 #, c-format
+#| msgid ""
+#| "'%s' is not a valid character following the characters '</'; '%s' may not "
+#| "begin an element name"
 msgid ""
-"'%s' is not a valid character following the characters '</'; '%s' may not "
+"“%s� is not a valid character following the characters “</�; “%s� may not "
 "begin an element name"
 msgstr ""
-"'</' karakterlerini takip eden '%s' geçerli bir karakter değildir; '%s', öge "
+"“</� karakterlerini takip eden “%s� geçerli bir karakter değildir; “%s�, öge "
 "adı ile başlamamalı"
 
 #: ../glib/gmarkup.c:1587
 #, c-format
+#| msgid ""
+#| "'%s' is not a valid character following the close element name '%s'; the "
+#| "allowed character is '>'"
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
+"“%s� is not a valid character following the close element name “%s�; the "
+"allowed character is “>�"
 msgstr ""
-"'%s', kapalı öge adı '%s' ardından gelebilecek bir karakter değil; izin "
-"verilen karakter ise '>'"
+"“%s�, kapalı öge adı “%s� ardından gelebilecek bir karakter değil; izin "
+"verilen karakter ise “>�"
 
 #: ../glib/gmarkup.c:1598
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
-msgstr "'%s' ögesi kapatılmış, hiçbir öge şu anda açık değil"
+#| msgid "Element '%s' was closed, no element is currently open"
+msgid "Element “%s� was closed, no element is currently open"
+msgstr "“%s� ögesi kapatılmış, hiçbir öge şu anda açık değil"
 
 #: ../glib/gmarkup.c:1607
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
-msgstr "'%s' ögesi kapatılmış, fakat '%s' şu an açık olan ögedir"
+#| msgid "Element '%s' was closed, but the currently open element is '%s'"
+msgid "Element “%s� was closed, but the currently open element is “%s�"
+msgstr "“%s� ögesi kapatılmış, ancak “%s� şu an açık olan ögedir"
 
 #: ../glib/gmarkup.c:1760
 msgid "Document was empty or contained only whitespace"
 msgstr "Belge boş veya yalnızca boşluk karakteri içeriyor"
 
 #: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
+#| msgid "Document ended unexpectedly just after an open angle bracket '<'"
+msgid "Document ended unexpectedly just after an open angle bracket “<�"
 msgstr ""
-"Belge, açık açı parantezi '<' işaretinden hemen sonra beklenmedik bir "
+"Belge, açık açı parantezi “<� işaretinden hemen sonra beklenmedik bir "
 "ÅŸekilde bitti"
 
 #: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
 #, c-format
+#| msgid ""
+#| "Document ended unexpectedly with elements still open - '%s' was the last "
+#| "element opened"
 msgid ""
-"Document ended unexpectedly with elements still open - '%s' was the last "
+"Document ended unexpectedly with elements still open — “%s� was the last "
 "element opened"
 msgstr ""
 "Belge, ögeleri hala açıkken beklenmedik bir şekilde bitti - son açılan öge: "
-"'%s'"
+"“%s�"
 
 #: ../glib/gmarkup.c:1790
 #, c-format
@@ -5146,9 +5173,10 @@ msgstr "Belge bir öznitelik değeri içinde iken beklenmedik bir şekilde bitti
 
 #: ../glib/gmarkup.c:1836
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
+#| msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgid "Document ended unexpectedly inside the close tag for element “%s�"
 msgstr ""
-"Belge, '%s' ögesinin kapatma etiketi içinde beklenmedik bir şekilde bitti"
+"Belge, “%s� ögesinin kapatma etiketi içinde beklenmedik bir şekilde bitti"
 
 #: ../glib/gmarkup.c:1842
 msgid "Document ended unexpectedly inside a comment or processing instruction"
@@ -5505,7 +5533,7 @@ msgstr "\\N bir sınıfta desteklenmez"
 
 #: ../glib/gregex.c:516
 msgid "too many forward references"
-msgstr "Çok fazla yönlendirme kaynağı"
+msgstr "çok fazla yönlendirme kaynağı"
 
 #: ../glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
@@ -5515,7 +5543,7 @@ msgstr "(*MARK), (*PRUNE), (*SKIP) ya da (*THEN) içinde ad çok uzun"
 msgid "character value in \\u.... sequence is too large"
 msgstr "\\u.... dizisindeki karakter değeri çok büyük"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Düzenli ifade %s eşleşirken hata: %s"
@@ -5542,43 +5570,43 @@ msgstr "Düzenli ifade %s eniyilemesinde (optimization) hata: %s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Düzenli ifade %s derlenirken karakter %d hatalı: %s"
 
-#: ../glib/gregex.c:2413
+#: ../glib/gregex.c:2419
 msgid "hexadecimal digit or “}� expected"
 msgstr "onaltılı rakam ya da “}� beklendi"
 
-#: ../glib/gregex.c:2429
+#: ../glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "onaltılı rakam beklendi"
 
-#: ../glib/gregex.c:2469
+#: ../glib/gregex.c:2475
 msgid "missing “<� in symbolic reference"
 msgstr "simgesel referansda eksik “<�"
 
-#: ../glib/gregex.c:2478
+#: ../glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "tamamlanmamış simgesel referans"
 
-#: ../glib/gregex.c:2485
+#: ../glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "sıfır-uzunlukta simgesel referans"
 
-#: ../glib/gregex.c:2496
+#: ../glib/gregex.c:2502
 msgid "digit expected"
 msgstr "rakam beklendi"
 
-#: ../glib/gregex.c:2514
+#: ../glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "geçersiz simgesel referans"
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2582
 msgid "stray final “\\�"
 msgstr "son “\\� kayıp"
 
-#: ../glib/gregex.c:2580
+#: ../glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "geçersiz çıkış dizisi"
 
-#: ../glib/gregex.c:2590
+#: ../glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s� at char %lu: %s"
 msgstr "Yerine koyma metni “%s� işlenirken karakter %lu hatalı: %s"
@@ -5621,7 +5649,7 @@ msgstr "Alt süreçten bilgi okurken select()’te beklenmeyen hata oluştu (%s)
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid()’de beklenmeyen hata (%s)"
 
-#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
+#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1230
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Alt işlem %ld kodu ile sonlandı"
@@ -5700,27 +5728,27 @@ msgstr "Alt süreç yürütme başarısızlığı (%s)"
 msgid "Invalid program name: %s"
 msgstr "Geçersiz program adı: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:719
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "%d konumunda argüman vektörü içinde geçersiz dizgi: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:734
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Çevre içinde geçersiz dizgi: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: ../glib/gspawn-win32.c:715
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Geçersiz çalışma dizini: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: ../glib/gspawn-win32.c:780
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Yardımcı program (%s) çalıştırılamadı"
 
-#: ../glib/gspawn-win32.c:995
+#: ../glib/gspawn-win32.c:994
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5764,164 +5792,148 @@ msgstr "Dönüşüm girdisi içinde geçersiz dizi"
 msgid "Character out of range for UTF-16"
 msgstr "Karakter UTF-16 sınırlarının dışında"
 
-#: ../glib/gutils.c:2229
+#: ../glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: ../glib/gutils.c:2247 ../glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: ../glib/gutils.c:2248 ../glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: ../glib/gutils.c:2249 ../glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2237
+#: ../glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2238
+#: ../glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2239
+#: ../glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2240
+#: ../glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2241
+#: ../glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2242
+#: ../glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2245
+#: ../glib/gutils.c:2260
 #, c-format
-#| msgid "%.1f kB"
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
-#: ../glib/gutils.c:2246
+#: ../glib/gutils.c:2261
 #, c-format
-#| msgid "%.1f MB"
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
-#: ../glib/gutils.c:2247
+#: ../glib/gutils.c:2262
 #, c-format
-#| msgid "%.1f GB"
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
-#: ../glib/gutils.c:2248
+#: ../glib/gutils.c:2263
 #, c-format
-#| msgid "%.1f TB"
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
-#: ../glib/gutils.c:2249
+#: ../glib/gutils.c:2264
 #, c-format
-#| msgid "%.1f PB"
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
-#: ../glib/gutils.c:2250
+#: ../glib/gutils.c:2265
 #, c-format
-#| msgid "%.1f EB"
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
-#: ../glib/gutils.c:2253
+#: ../glib/gutils.c:2268
 #, c-format
-#| msgid "%.1f KiB"
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
-#: ../glib/gutils.c:2254
+#: ../glib/gutils.c:2269
 #, c-format
-#| msgid "%.1f MiB"
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
-#: ../glib/gutils.c:2255
+#: ../glib/gutils.c:2270
 #, c-format
-#| msgid "%.1f GiB"
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
-#: ../glib/gutils.c:2256
+#: ../glib/gutils.c:2271
 #, c-format
-#| msgid "%.1f TiB"
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
-#: ../glib/gutils.c:2257
+#: ../glib/gutils.c:2272
 #, c-format
-#| msgid "%.1f PiB"
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
-#: ../glib/gutils.c:2258
+#: ../glib/gutils.c:2273
 #, c-format
-#| msgid "%.1f EiB"
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: ../glib/gutils.c:2292 ../glib/gutils.c:2418
+#: ../glib/gutils.c:2307 ../glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u bayt"
 
-#: ../glib/gutils.c:2296
+#: ../glib/gutils.c:2311
 #, c-format
-#| msgid "%u byte"
-#| msgid_plural "%u bytes"
 msgid "%u bit"
 msgid_plural "%u bits"
 msgstr[0] "%u bit"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2363
+#: ../glib/gutils.c:2378
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
 msgstr[0] "%s bayt"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: ../glib/gutils.c:2368
+#: ../glib/gutils.c:2383
 #, c-format
-#| msgid "%s byte"
-#| msgid_plural "%s bytes"
 msgid "%s bit"
 msgid_plural "%s bits"
 msgstr[0] "%s bit"
@@ -5931,11 +5943,27 @@ msgstr[0] "%s bit"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2431
+#: ../glib/gutils.c:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
+#~ msgid "No such method '%s'"
+#~ msgstr "'%s' gibi bir yöntem yok"
+
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable - unknown value '%s'"
+#~ msgstr ""
+#~ "DBUS_STARTER_BUS_TYPE ortam değişkeninden veri yolu adresi saptanamıyor - "
+#~ "bilinmeyen deÄŸer '%s'"
+
+#~ msgid "[ARGS...]"
+#~ msgstr "[DEĞİŞKENLER...]"
+
+#~ msgid "Failed to create temp file: %s"
+#~ msgstr "Geçici dosya oluşturulamadı: %s"
+
 #~ msgid ""
 #~ "Message has %d file descriptors but the header field indicates %d file "
 #~ "descriptors"
@@ -5953,11 +5981,6 @@ msgstr "%.1f KB"
 #~ msgstr "Hata: sinyal tam nitelikli ad olmalıdır.\n"
 
 #, fuzzy
-#~| msgid "No such interface '%s'"
-#~ msgid "No such interface “%s�"
-#~ msgstr "'%s' gibi bir arabirim yok"
-
-#, fuzzy
 #~| msgid "Error setting extended attribute '%s': %s"
 #~ msgid "Error getting writable attributes: %s\n"
 #~ msgstr "Genişletilmiş öznitelik '%s' atanırken hata: %s"
diff --git a/sanity_check b/sanity_check
index 5f6e66e20..44ae7f1f3 100755
--- a/sanity_check
+++ b/sanity_check
@@ -13,7 +13,7 @@ echo "Checking glib-$VERSION.tar.gz..."
 tar xfz glib-$VERSION.tar.gz
 
 
-for file in INSTALL NEWS README 
+for file in INSTALL NEWS
 do
 	echo -n "$file... "
 	if [ "x`grep $VERSION glib-$VERSION/$file | wc -l | awk -F' ' '{print $1}'`" = "x0" ]; then
diff --git a/subprojects/Makefile.am b/subprojects/Makefile.am
new file mode 100644
index 000000000..34b2a92ec
--- /dev/null
+++ b/subprojects/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = \
+	libffi.wrap \
+	proxy-libintl.wrap \
+	zlib.wrap \
+	$(NULL)
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
index f32522ee6..b53c8f7c3 100644
--- a/subprojects/proxy-libintl.wrap
+++ b/subprojects/proxy-libintl.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory=proxy-libintl
-url=https://github.com/centricular/proxy-libintl.git
-revision=master
+url=https://github.com/frida/proxy-libintl.git
+revision=0.1
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
index de1e861e1..6aff13ff3 100644
--- a/subprojects/zlib.wrap
+++ b/subprojects/zlib.wrap
@@ -1,4 +1,10 @@
-[wrap-git]
-directory=zlib
-url=https://github.com/centricular/zlib.git
-revision=meson
+[wrap-file]
+directory = zlib-1.2.11
+
+source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz
+source_filename = zlib-1.2.11.tar.gz
+source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/3/get_zip
+patch_filename = zlib-1.2.11-3-wrap.zip
+patch_hash = f07dc491ab3d05daf00632a0591e2ae61b470615b5b73bcf9b3f061fff65cff0
diff --git a/template.test.in b/template.test.in
new file mode 100644
index 000000000..f701627f8
--- /dev/null
+++ b/template.test.in
@@ -0,0 +1,3 @@
+[Test]
+Type=session
+Exec=@installed_tests_dir@/@program@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index de3ddb49e..fba18655d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -146,8 +146,8 @@ endif
 
 EXTRA_DIST += \
 	$(test_scripts)				\
-	gen-casefold-txt.pl			\
-	gen-casemap-txt.pl			\
+	gen-casefold-txt.py			\
+	gen-casemap-txt.py			\
 	iochannel-test-infile			\
 	timeloop-basic.c			\
 	assert-msg-test.gdb
diff --git a/tests/casefold.txt b/tests/casefold.txt
index f7b47abd2..f59c48eba 100644
--- a/tests/casefold.txt
+++ b/tests/casefold.txt
@@ -1,5 +1,5 @@
-# Test cases generated from Unicode 10.0.0 data
-# by gen-casefold-test.pl. Do not edit.
+# Test cases generated from Unicode 11.0.0 data
+# by gen-casefold-txt.py. Do not edit.
 #
 # Some special hand crafted tests
 #
@@ -548,6 +548,52 @@ Z	z
 ᲆ	ъ
 ᲇ	ѣ
 ᲈ	ꙋ
+�	�
+Ბ	ბ
+Გ	გ
+Დ	დ
+Ე	ე
+Ვ	ვ
+Ზ	ზ
+Თ	თ
+Ი	ი
+Კ	კ
+Ლ	ლ
+Მ	მ
+Ნ	ნ
+�	�
+Პ	პ
+Ჟ	ჟ
+Რ	რ
+Ს	ს
+Ტ	ტ
+Უ	უ
+Ფ	ფ
+Ქ	ქ
+Ღ	ღ
+Ყ	ყ
+Შ	შ
+Ჩ	ჩ
+Ც	ც
+Ძ	ძ
+Წ	წ
+Ჭ	ჭ
+Ხ	ხ
+Ჯ	ჯ
+Ჰ	ჰ
+Ჱ	ჱ
+Ჲ	ჲ
+Ჳ	ჳ
+Ჴ	ჴ
+Ჵ	ჵ
+Ჶ	ჶ
+Ჷ	ჷ
+Ჸ	ჸ
+Ჹ	ჹ
+Ჺ	ჺ
+Ჽ	ჽ
+Ჾ	ჾ
+Ჿ	ჿ
 Ḁ	�
 Ḃ	ḃ
 Ḅ	ḅ
@@ -1097,6 +1143,7 @@ Z	z
 êž³	ê­“
 êž´	êžµ
 Ꞷ	ꞷ
+Ꞹ	ꞹ
 ꭰ	Ꭰ
 ꭱ	Ꭱ
 ꭲ	Ꭲ
@@ -1374,6 +1421,38 @@ Z	z
 𑢽	�
 𑢾	𑣞
 𑢿	𑣟
+ð–¹€	ð–¹ 
+�	𖹡
+𖹂	𖹢
+𖹃	𖹣
+𖹄	𖹤
+ð–¹…	ð–¹¥
+𖹆	𖹦
+𖹇	𖹧
+𖹈	𖹨
+𖹉	𖹩
+𖹊	𖹪
+𖹋	𖹫
+𖹌	𖹬
+�	𖹭
+𖹎	𖹮
+�	𖹯
+�	𖹰
+𖹑	𖹱
+ð–¹’	ð–¹²
+𖹓	𖹳
+ð–¹”	ð–¹´
+𖹕	𖹵
+𖹖	𖹶
+ð–¹—	ð–¹·
+𖹘	𖹸
+ð–¹™	ð–¹¹
+𖹚	𖹺
+ð–¹›	ð–¹»
+𖹜	𖹼
+�	𖹽
+𖹞	𖹾
+𖹟	𖹿
 𞤀	𞤢
 �	𞤣
 𞤂	𞤤
diff --git a/tests/casemap.txt b/tests/casemap.txt
index 5e983f70f..5bc76badb 100644
--- a/tests/casemap.txt
+++ b/tests/casemap.txt
@@ -1,5 +1,5 @@
-# Test cases generated from Unicode 10.0.0 data
-# by gen-case-tests.pl. Do not edit.
+# Test cases generated from Unicode 11.0.0 data
+# by gen-casemap-txt.py. Do not edit.
 #
 # Some special hand crafted tests
 #
@@ -1046,6 +1046,7 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	Õ”	Ö„		Õ”	#  554
 	Õ•	Ö…		Õ•	#  555
 	Õ–	Ö†		Õ–	#  556
+	Õ 	Õ 			#  560
 	Õ¡	Õ¡	Ô±	Ô±	#  561
 	Õ¢	Õ¢	Ô²	Ô²	#  562
 	Õ£	Õ£	Ô³	Ô³	#  563
@@ -1085,6 +1086,7 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	Ö…	Ö…	Õ•	Õ•	#  585
 	Ö†	Ö†	Õ–	Õ–	#  586
 	Ö‡	Ö‡	ÔµÖ‚	ÔµÕ’	#  587
+	Öˆ	Öˆ			#  588
 	á‚ 	â´€		á‚ 	# 10A0
 	á‚¡	â´�		á‚¡	# 10A1
 	á‚¢	â´‚		á‚¢	# 10A2
@@ -1125,6 +1127,52 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	Ⴥ	ⴥ		Ⴥ	# 10C5
 	Ⴧ	ⴧ		Ⴧ	# 10C7
 	�	ⴭ		�	# 10CD
+	�	�	�	�	# 10D0
+	ბ	ბ	ბ	Ბ	# 10D1
+	გ	გ	გ	Გ	# 10D2
+	დ	დ	დ	Დ	# 10D3
+	ე	ე	ე	Ე	# 10D4
+	ვ	ვ	ვ	Ვ	# 10D5
+	ზ	ზ	ზ	Ზ	# 10D6
+	თ	თ	თ	Თ	# 10D7
+	ი	ი	ი	Ი	# 10D8
+	კ	კ	კ	Კ	# 10D9
+	ლ	ლ	ლ	Ლ	# 10DA
+	მ	მ	მ	Მ	# 10DB
+	ნ	ნ	ნ	Ნ	# 10DC
+	�	�	�	�	# 10DD
+	პ	პ	პ	Პ	# 10DE
+	ჟ	ჟ	ჟ	Ჟ	# 10DF
+	რ	რ	რ	Რ	# 10E0
+	ს	ს	ს	Ს	# 10E1
+	ტ	ტ	ტ	Ტ	# 10E2
+	უ	უ	უ	Უ	# 10E3
+	ფ	ფ	ფ	Ფ	# 10E4
+	ქ	ქ	ქ	Ქ	# 10E5
+	ღ	ღ	ღ	Ღ	# 10E6
+	ყ	ყ	ყ	Ყ	# 10E7
+	შ	შ	შ	Შ	# 10E8
+	ჩ	ჩ	ჩ	Ჩ	# 10E9
+	ც	ც	ც	Ც	# 10EA
+	ძ	ძ	ძ	Ძ	# 10EB
+	წ	წ	წ	Წ	# 10EC
+	ჭ	ჭ	ჭ	Ჭ	# 10ED
+	ხ	ხ	ხ	Ხ	# 10EE
+	ჯ	ჯ	ჯ	Ჯ	# 10EF
+	ჰ	ჰ	ჰ	Ჰ	# 10F0
+	ჱ	ჱ	ჱ	Ჱ	# 10F1
+	ჲ	ჲ	ჲ	Ჲ	# 10F2
+	ჳ	ჳ	ჳ	Ჳ	# 10F3
+	ჴ	ჴ	ჴ	Ჴ	# 10F4
+	ჵ	ჵ	ჵ	Ჵ	# 10F5
+	ჶ	ჶ	ჶ	Ჶ	# 10F6
+	ჷ	ჷ	ჷ	Ჷ	# 10F7
+	ჸ	ჸ	ჸ	Ჸ	# 10F8
+	ჹ	ჹ	ჹ	Ჹ	# 10F9
+	ჺ	ჺ	ჺ	Ჺ	# 10FA
+	ჽ	ჽ	ჽ	Ჽ	# 10FD
+	ჾ	ჾ	ჾ	Ჾ	# 10FE
+	ჿ	ჿ	ჿ	Ჿ	# 10FF
 	Ꭰ	ꭰ		Ꭰ	# 13A0
 	Ꭱ	ꭱ		Ꭱ	# 13A1
 	Ꭲ	ꭲ		Ꭲ	# 13A2
@@ -1226,6 +1274,52 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	ᲆ	ᲆ	Ъ	Ъ	# 1C86
 	ᲇ	ᲇ	Ѣ	Ѣ	# 1C87
 	ᲈ	ᲈ	Ꙋ	Ꙋ	# 1C88
+	�	�		�	# 1C90
+	Ბ	ბ		Ბ	# 1C91
+	Გ	გ		Გ	# 1C92
+	Დ	დ		Დ	# 1C93
+	Ე	ე		Ე	# 1C94
+	Ვ	ვ		Ვ	# 1C95
+	Ზ	ზ		Ზ	# 1C96
+	Თ	თ		Თ	# 1C97
+	Ი	ი		Ი	# 1C98
+	Კ	კ		Კ	# 1C99
+	Ლ	ლ		Ლ	# 1C9A
+	Მ	მ		Მ	# 1C9B
+	Ნ	ნ		Ნ	# 1C9C
+	�	�		�	# 1C9D
+	Პ	პ		Პ	# 1C9E
+	Ჟ	ჟ		Ჟ	# 1C9F
+	Რ	რ		Რ	# 1CA0
+	Ს	ს		Ს	# 1CA1
+	Ტ	ტ		Ტ	# 1CA2
+	Უ	უ		Უ	# 1CA3
+	Ფ	ფ		Ფ	# 1CA4
+	Ქ	ქ		Ქ	# 1CA5
+	Ღ	ღ		Ღ	# 1CA6
+	Ყ	ყ		Ყ	# 1CA7
+	Შ	შ		Შ	# 1CA8
+	Ჩ	ჩ		Ჩ	# 1CA9
+	Ც	ც		Ც	# 1CAA
+	Ძ	ძ		Ძ	# 1CAB
+	Წ	წ		Წ	# 1CAC
+	Ჭ	ჭ		Ჭ	# 1CAD
+	Ხ	ხ		Ხ	# 1CAE
+	Ჯ	ჯ		Ჯ	# 1CAF
+	Ჰ	ჰ		Ჰ	# 1CB0
+	Ჱ	ჱ		Ჱ	# 1CB1
+	Ჲ	ჲ		Ჲ	# 1CB2
+	Ჳ	ჳ		Ჳ	# 1CB3
+	Ჴ	ჴ		Ჴ	# 1CB4
+	Ჵ	ჵ		Ჵ	# 1CB5
+	Ჶ	ჶ		Ჶ	# 1CB6
+	Ჷ	ჷ		Ჷ	# 1CB7
+	Ჸ	ჸ		Ჸ	# 1CB8
+	Ჹ	ჹ		Ჹ	# 1CB9
+	Ჺ	ჺ		Ჺ	# 1CBA
+	Ჽ	ჽ		Ჽ	# 1CBD
+	Ჾ	ჾ		Ჾ	# 1CBE
+	Ჿ	ჿ		Ჿ	# 1CBF
 	á´€	á´€			# 1D00
 	á´�	á´�			# 1D01
 	á´‚	á´‚			# 1D02
@@ -2316,6 +2410,7 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	Ɡ	ɡ		Ɡ	# A7AC
 	Ɬ	ɬ		Ɬ	# A7AD
 	Ɪ	ɪ		Ɪ	# A7AE
+	ꞯ	ꞯ			# A7AF
 	êž°	Êž		êž°	# A7B0
 	Ʇ	ʇ		Ʇ	# A7B1
 	Ʝ	�		Ʝ	# A7B2
@@ -2324,6 +2419,8 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	êžµ	êžµ	êž´	êž´	# A7B5
 	Ꞷ	ꞷ		Ꞷ	# A7B6
 	ꞷ	ꞷ	Ꞷ	Ꞷ	# A7B7
+	Ꞹ	ꞹ		Ꞹ	# A7B8
+	ꞹ	ꞹ	Ꞹ	Ꞹ	# A7B9
 	ꟺ	ꟺ			# A7FA
 	ꬰ	ꬰ			# AB30
 	ꬱ	ꬱ			# AB31
@@ -2836,6 +2933,70 @@ lt_LT.UTF-8	Į�	į̇�	Į�	Į�	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	�	�	𑢽	𑢽	# 118DD
 	𑣞	𑣞	𑢾	𑢾	# 118DE
 	𑣟	𑣟	𑢿	𑢿	# 118DF
+	ð–¹€	ð–¹ 		ð–¹€	# 16E40
+	�	𖹡		�	# 16E41
+	𖹂	𖹢		𖹂	# 16E42
+	𖹃	𖹣		𖹃	# 16E43
+	𖹄	𖹤		𖹄	# 16E44
+	ð–¹…	ð–¹¥		ð–¹…	# 16E45
+	𖹆	𖹦		𖹆	# 16E46
+	𖹇	𖹧		𖹇	# 16E47
+	𖹈	𖹨		𖹈	# 16E48
+	𖹉	𖹩		𖹉	# 16E49
+	𖹊	𖹪		𖹊	# 16E4A
+	𖹋	𖹫		𖹋	# 16E4B
+	𖹌	𖹬		𖹌	# 16E4C
+	�	𖹭		�	# 16E4D
+	𖹎	𖹮		𖹎	# 16E4E
+	�	𖹯		�	# 16E4F
+	�	𖹰		�	# 16E50
+	𖹑	𖹱		𖹑	# 16E51
+	ð–¹’	ð–¹²		ð–¹’	# 16E52
+	𖹓	𖹳		𖹓	# 16E53
+	ð–¹”	ð–¹´		ð–¹”	# 16E54
+	𖹕	𖹵		𖹕	# 16E55
+	𖹖	𖹶		𖹖	# 16E56
+	ð–¹—	ð–¹·		ð–¹—	# 16E57
+	𖹘	𖹸		𖹘	# 16E58
+	ð–¹™	ð–¹¹		ð–¹™	# 16E59
+	𖹚	𖹺		𖹚	# 16E5A
+	ð–¹›	ð–¹»		ð–¹›	# 16E5B
+	𖹜	𖹼		𖹜	# 16E5C
+	�	𖹽		�	# 16E5D
+	𖹞	𖹾		𖹞	# 16E5E
+	𖹟	𖹿		𖹟	# 16E5F
+	ð–¹ 	ð–¹ 	ð–¹€	ð–¹€	# 16E60
+	𖹡	𖹡	�	�	# 16E61
+	𖹢	𖹢	𖹂	𖹂	# 16E62
+	𖹣	𖹣	𖹃	𖹃	# 16E63
+	𖹤	𖹤	𖹄	𖹄	# 16E64
+	ð–¹¥	ð–¹¥	ð–¹…	ð–¹…	# 16E65
+	𖹦	𖹦	𖹆	𖹆	# 16E66
+	𖹧	𖹧	𖹇	𖹇	# 16E67
+	𖹨	𖹨	𖹈	𖹈	# 16E68
+	𖹩	𖹩	𖹉	𖹉	# 16E69
+	𖹪	𖹪	𖹊	𖹊	# 16E6A
+	𖹫	𖹫	𖹋	𖹋	# 16E6B
+	𖹬	𖹬	𖹌	𖹌	# 16E6C
+	𖹭	𖹭	�	�	# 16E6D
+	𖹮	𖹮	𖹎	𖹎	# 16E6E
+	𖹯	𖹯	�	�	# 16E6F
+	𖹰	𖹰	�	�	# 16E70
+	𖹱	𖹱	𖹑	𖹑	# 16E71
+	ð–¹²	ð–¹²	ð–¹’	ð–¹’	# 16E72
+	𖹳	𖹳	𖹓	𖹓	# 16E73
+	ð–¹´	ð–¹´	ð–¹”	ð–¹”	# 16E74
+	𖹵	𖹵	𖹕	𖹕	# 16E75
+	𖹶	𖹶	𖹖	𖹖	# 16E76
+	ð–¹·	ð–¹·	ð–¹—	ð–¹—	# 16E77
+	𖹸	𖹸	𖹘	𖹘	# 16E78
+	ð–¹¹	ð–¹¹	ð–¹™	ð–¹™	# 16E79
+	𖹺	𖹺	𖹚	𖹚	# 16E7A
+	ð–¹»	ð–¹»	ð–¹›	ð–¹›	# 16E7B
+	𖹼	𖹼	𖹜	𖹜	# 16E7C
+	𖹽	𖹽	�	�	# 16E7D
+	𖹾	𖹾	𖹞	𖹞	# 16E7E
+	𖹿	𖹿	𖹟	𖹟	# 16E7F
 	�			�	# 1D400
 	�			�	# 1D401
 	�			�	# 1D402
diff --git a/tests/gen-casefold-txt.pl b/tests/gen-casefold-txt.pl
deleted file mode 100755
index 2a6a0d4b1..000000000
--- a/tests/gen-casefold-txt.pl
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /usr/bin/perl -w
-
-#    Copyright (C) 1998, 1999 Tom Tromey
-#    Copyright (C) 2001 Red Hat Software
-
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2, or (at your option)
-#    any later version.
-
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-# gen-casefold-test.pl - Generate test cases for casefolding from Unicode data.
-# See http://www.unicode.org/Public/UNIDATA/UnicodeCharacterDatabase.html
-# Usage: 
-# I consider the output of this program to be unrestricted.  Use it as
-# you will.
-
-require 5.006;
-
-# Names of fields in the CaseFolding table
-$FOLDING_CODE = 0;
-$FOLDING_STATUS = 1;
-$FOLDING_MAPPING = 2;
-
-my $casefoldlen = 0;
-my @casefold;
-
-if (@ARGV != 2) {
-    $0 =~ s@.*/@@;
-    die "Usage: $0 UNICODE-VERSION  CaseFolding.txt\n";
-}
- 
-print <<EOT;
-# Test cases generated from Unicode $ARGV[0] data
-# by gen-casefold-test.pl. Do not edit.
-#
-# Some special hand crafted tests
-#
-AaBbCc@@\taabbcc@@
-#
-# Now the automatic tests
-#
-EOT
-
-binmode STDOUT, ":utf8";
-open (INPUT, "< $ARGV[1]") || exit 1;
-
-while (<INPUT>)
-{
-    chop;
-
-    next if /^#/;
-    next if /^\s*$/;
-
-    s/\s*#.*//;
-
-    my @fields = split ('\s*;\s*', $_, 30);
-
-    my $raw_code = $fields[$FOLDING_CODE];
-    my $code = hex ($raw_code);
-
-    if ($#fields != 3)
-    {
-	printf STDERR ("Entry for $raw_code has wrong number of fields (%d)\n", $#fields);
-	next;
-    }
-
-    # skip simple and Turkic mappings
-    next if ($fields[$FOLDING_STATUS] =~ /^[ST]$/);
-
-    @values = map { hex ($_) } split /\s+/, $fields[$FOLDING_MAPPING];
-    printf ("%s\t%s\n", pack ("U", $code), pack ("U*", @values));
-}
-
-close INPUT;
diff --git a/tests/gen-casefold-txt.py b/tests/gen-casefold-txt.py
new file mode 100755
index 000000000..3c55828d3
--- /dev/null
+++ b/tests/gen-casefold-txt.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+# Copyright (C) 1998, 1999 Tom Tromey
+# Copyright (C) 2001 Red Hat Software
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+"""
+gen-casefold-txt.py - Generate test cases for casefolding from Unicode data.
+See http://www.unicode.org/Public/UNIDATA/UnicodeCharacterDatabase.html
+Usage:
+    I consider the output of this program to be unrestricted.
+    Use it as you will.
+"""
+
+import sys
+import argparse
+
+
+def main(argv):
+    parser = argparse.ArgumentParser(
+        description="Generate test cases for casefolding from Unicode data")
+    parser.add_argument("UNICODE-VERSION")
+    parser.add_argument("CaseFolding.txt")
+    args = parser.parse_args(argv[1:])
+    version = getattr(args, "UNICODE-VERSION")
+    filename = getattr(args, "CaseFolding.txt")
+
+    print("""\
+# Test cases generated from Unicode {} data
+# by gen-casefold-txt.py. Do not edit.
+#
+# Some special hand crafted tests
+#
+AaBbCc@@\taabbcc@@
+#
+# Now the automatic tests
+#""".format(version))
+
+    # Names of fields in the CaseFolding table
+    CODE, STATUS, MAPPING = range(3)
+
+    with open(filename, encoding="utf-8") as fileobj:
+        for line in fileobj:
+            # strip comments and skip empty lines
+            line = line.split("#", 1)[0].strip()
+            if not line:
+                continue
+
+            fields = [f.strip() for f in line.split(";", 3)[:3]]
+            if len(fields) != 3:
+                raise SystemExit(
+                    "Entry for %s has wrong number of fields (%d)" % (
+                        fields[CODE], len(fields)))
+
+            status = fields[STATUS]
+            # skip simple and Turkic mappings
+            if status in "ST":
+                continue
+
+            code = chr(int(fields[CODE], 16))
+            values = "".join(
+                [chr(int(v, 16)) for v in fields[MAPPING].split()])
+            print("{}\t{}".format(code, values))
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
diff --git a/tests/gen-casemap-txt.pl b/tests/gen-casemap-txt.pl
deleted file mode 100755
index 3ae419ca9..000000000
--- a/tests/gen-casemap-txt.pl
+++ /dev/null
@@ -1,256 +0,0 @@
-#! /usr/bin/perl -w
-
-#    Copyright (C) 1998, 1999 Tom Tromey
-#    Copyright (C) 2001 Red Hat Software
-
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2, or (at your option)
-#    any later version.
-
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-# gen-casemap-test.pl - Generate test cases for case mapping from Unicode data.
-# See http://www.unicode.org/Public/UNIDATA/UnicodeCharacterDatabase.html
-# I consider the output of this program to be unrestricted.  Use it as
-# you will.
-
-require 5.006;
-use utf8;
-
-if (@ARGV != 3) {
-    $0 =~ s@.*/@@;
-    die "Usage: $0 UNICODE-VERSION UnicodeData.txt SpecialCasing.txt\n";
-}
- 
-use vars qw($CODE $NAME $CATEGORY $COMBINING_CLASSES $BIDI_CATEGORY $DECOMPOSITION $DECIMAL_VALUE $DIGIT_VALUE $NUMERIC_VALUE $MIRRORED $OLD_NAME $COMMENT $UPPER $LOWER $TITLE $BREAK_CODE $BREAK_CATEGORY $BREAK_NAME $CASE_CODE $CASE_LOWER $CASE_TITLE $CASE_UPPER $CASE_CONDITION);
-
-# Names of fields in Unicode data table.
-$CODE = 0;
-$NAME = 1;
-$CATEGORY = 2;
-$COMBINING_CLASSES = 3;
-$BIDI_CATEGORY = 4;
-$DECOMPOSITION = 5;
-$DECIMAL_VALUE = 6;
-$DIGIT_VALUE = 7;
-$NUMERIC_VALUE = 8;
-$MIRRORED = 9;
-$OLD_NAME = 10;
-$COMMENT = 11;
-$UPPER = 12;
-$LOWER = 13;
-$TITLE = 14;
-
-# Names of fields in the SpecialCasing table
-$CASE_CODE = 0;
-$CASE_LOWER = 1;
-$CASE_TITLE = 2;
-$CASE_UPPER = 3;
-$CASE_CONDITION = 4;
-
-my @upper;
-my @title;
-my @lower;
-
-binmode STDOUT, ":utf8";
-open (INPUT, "< $ARGV[1]") || exit 1;
-
-$last_code = -1;
-while (<INPUT>)
-{
-    chop;
-    @fields = split (';', $_, 30);
-    if ($#fields != 14)
-    {
-	printf STDERR ("Entry for $fields[$CODE] has wrong number of fields (%d)\n", $#fields);
-    }
-
-    $code = hex ($fields[$CODE]);
-
-    if ($code > $last_code + 1)
-    {
-	# Found a gap.
-	if ($fields[$NAME] =~ /Last>/)
-	{
-	    # Fill the gap with the last character read,
-            # since this was a range specified in the char database
-	    @gfields = @fields;
-	}
-	else
-	{
-	    # The gap represents undefined characters.  Only the type
-	    # matters.
-	    @gfields = ('', '', 'Cn', '0', '', '', '', '', '', '', '',
-			'', '', '', '');
-	}
-	for (++$last_code; $last_code < $code; ++$last_code)
-	{
-	    $gfields{$CODE} = sprintf ("%04x", $last_code);
-	    &process_one ($last_code, @gfields);
-	}
-    }
-    &process_one ($code, @fields);
-    $last_code = $code;
-}
-
-close INPUT;
-
-open (INPUT, "< $ARGV[2]") || exit 1;
-
-while (<INPUT>)
-{
-    my $code;
-    
-    chop;
-
-    next if /^#/;
-    next if /^\s*$/;
-
-    s/\s*#.*//;
-
-    @fields = split ('\s*;\s*', $_, 30);
-
-    $raw_code = $fields[$CASE_CODE];
-    $code = hex ($raw_code);
-
-    if ($#fields != 4 && $#fields != 5)
-    {
-	printf STDERR ("Entry for $raw_code has wrong number of fields (%d)\n", $#fields);
-	next;
-    }
-
-    if (defined $fields[5]) {
-	# Ignore conditional special cases - we'll handle them manually
-	next;
-    }
-
-    $upper[$code] = &make_hex ($fields[$CASE_UPPER]);
-    $lower[$code] = &make_hex ($fields[$CASE_LOWER]);
-    $title[$code] = &make_hex ($fields[$CASE_TITLE]);
-}
-
-close INPUT;
-
-print <<EOT;
-# Test cases generated from Unicode $ARGV[0] data
-# by gen-case-tests.pl. Do not edit.
-#
-# Some special hand crafted tests
-#
-tr_TR\ti\ti\t\x{0130}\t\x{0130}\t# i => LATIN CAPITAL LETTER I WITH DOT ABOVE
-tr_TR\tI\t\x{0131}\tI\tI\t# I => LATIN SMALL LETTER DOTLESS I
-tr_TR\tI\x{0307}\ti\tI\x{0307}\tI\x{0307}\t# I => LATIN SMALL LETTER DOTLESS I
-tr_TR.UTF-8\ti\ti\t\x{0130}\t\x{0130}\t# i => LATIN CAPITAL LETTER I WITH DOT ABOVE
-tr_TR.UTF-8\tI\t\x{0131}\tI\tI\t# I => LATIN SMALL LETTER DOTLESS I
-tr_TR.UTF-8\tI\x{0307}\ti\tI\x{0307}\tI\x{0307}\t# I => LATIN SMALL LETTER DOTLESS I
-# Test reordering of YPOGEGRAMMENI across other accents
-\t\x{03b1}\x{0345}\x{0314}\t\x{03b1}\x{0345}\x{314}\t\x{0391}\x{0345}\x{0314}\t\x{0391}\x{0314}\x{0399}\t
-\t\x{03b1}\x{0314}\x{0345}\t\x{03b1}\x{314}\x{0345}\t\x{0391}\x{0314}\x{0345}\t\x{0391}\x{0314}\x{0399}\t
-# Handling of final and nonfinal sigma
-	ΜΆΙΟΣ 	μάιος 	Μάιος 	ΜΆΙΟΣ 	
-	ΜΆΙΟΣ	μάιος	Μάιος	ΜΆΙΟΣ	
-	ΣΙΓΜΑ	σιγμα	Σιγμα	ΣΙΓΜΑ	
-# Lithuanian rule of i followed by letter with dot. Not at all sure
-# about the titlecase part here
-lt_LT\ti\x{117}\ti\x{117}\tIe\tIE\t
-lt_LT\tie\x{307}\tie\x{307}\tIe\tIE\t
-lt_LT\t\x{00cc}\ti\x{0307}\x{0300}\t\x{00cc}\t\x{00cc}\t # LATIN CAPITAL LETTER I WITH GRAVE
-lt_LT\t\x{00CD}\ti\x{0307}\x{0301}\t\x{00CD}\t\x{00CD}\t # LATIN CAPITAL LETTER I WITH ACUTE
-lt_LT\t\x{0128}\ti\x{0307}\x{0303}\t\x{0128}\t\x{0128}\t # LATIN CAPITAL LETTER I WITH TILDE
-lt_LT\tI\x{0301}\ti\x{0307}\x{0301}\tI\x{0301}\tI\x{0301}\t # LATIN CAPITAL LETTER I (with acute accent)
-lt_LT\tI\x{0300}\ti\x{0307}\x{0300}\tI\x{0300}\tI\x{0300}\t # LATIN CAPITAL LETTER I (with grave accent)
-lt_LT\tI\x{0303}\ti\x{0307}\x{0303}\tI\x{0303}\tI\x{0303}\t # LATIN CAPITAL LETTER I (with tilde above)
-lt_LT\tI\x{0328}\x{0301}\ti\x{0307}\x{0328}\x{0301}\tI\x{0328}\x{0301}\tI\x{0328}\x{0301}\t # LATIN CAPITAL LETTER I (with ogonek and acute accent)
-lt_LT\tJ\x{0301}\tj\x{0307}\x{0301}\tJ\x{0301}\tJ\x{0301}\t # LATIN CAPITAL LETTER J (with acute accent)
-lt_LT\t\x{012e}\x{0301}\t\x{012f}\x{0307}\x{0301}\t\x{012e}\x{0301}\t\x{012e}\x{0301}\t # LATIN CAPITAL LETTER I WITH OGONEK (with acute accent)
-lt_LT.UTF-8\ti\x{117}\ti\x{117}\tIe\tIE\t
-lt_LT.UTF-8\tie\x{307}\tie\x{307}\tIe\tIE\t
-lt_LT.UTF-8\t\x{00cc}\ti\x{0307}\x{0300}\t\x{00cc}\t\x{00cc}\t # LATIN CAPITAL LETTER I WITH GRAVE
-lt_LT.UTF-8\t\x{00CD}\ti\x{0307}\x{0301}\t\x{00CD}\t\x{00CD}\t # LATIN CAPITAL LETTER I WITH ACUTE
-lt_LT.UTF-8\t\x{0128}\ti\x{0307}\x{0303}\t\x{0128}\t\x{0128}\t # LATIN CAPITAL LETTER I WITH TILDE
-lt_LT.UTF-8\tI\x{0301}\ti\x{0307}\x{0301}\tI\x{0301}\tI\x{0301}\t # LATIN CAPITAL LETTER I (with acute accent)
-lt_LT.UTF-8\tI\x{0300}\ti\x{0307}\x{0300}\tI\x{0300}\tI\x{0300}\t # LATIN CAPITAL LETTER I (with grave accent)
-lt_LT.UTF-8\tI\x{0303}\ti\x{0307}\x{0303}\tI\x{0303}\tI\x{0303}\t # LATIN CAPITAL LETTER I (with tilde above)
-lt_LT.UTF-8\tI\x{0328}\x{0301}\ti\x{0307}\x{0328}\x{0301}\tI\x{0328}\x{0301}\tI\x{0328}\x{0301}\t # LATIN CAPITAL LETTER I (with ogonek and acute accent)
-lt_LT.UTF-8\tJ\x{0301}\tj\x{0307}\x{0301}\tJ\x{0301}\tJ\x{0301}\t # LATIN CAPITAL LETTER J (with acute accent)
-lt_LT.UTF-8\t\x{012e}\x{0301}\t\x{012f}\x{0307}\x{0301}\t\x{012e}\x{0301}\t\x{012e}\x{0301}\t # LATIN CAPITAL LETTER I WITH OGONEK (with acute accent)
-# Special case not at initial position
-\ta\x{fb04}\ta\x{fb04}\tAffl\tAFFL\t# FB04
-#
-# Now the automatic tests
-#
-EOT
-&print_tests;
-
-exit 0;
-
-# Process a single character.
-sub process_one
-{
-    my ($code, @fields) = @_;
-
-    my $type =  $fields[$CATEGORY];
-    if ($type eq 'Ll')
-    {
-	$upper[$code] = make_hex ($fields[$UPPER]);
-	$lower[$code] = pack ("U", $code);
-	$title[$code] = make_hex ($fields[$TITLE]);
-    }
-    elsif ($type eq 'Lu')
-    {
-	$lower[$code] = make_hex ($fields[$LOWER]);
-	$upper[$code] = pack ("U", $code);
-	$title[$code] = make_hex ($fields[$TITLE]);
-    }
-
-    if ($type eq 'Lt')
-    {
-	$upper[$code] = make_hex ($fields[$UPPER]);
-	$lower[$code] = pack ("U", hex ($fields[$LOWER]));
-	$title[$code] = make_hex ($fields[$LOWER]);
-    }
-}
-
-sub print_tests
-{
-    for ($i = 0; $i < 0x10ffff; $i++) {
-	if ($i == 0x3A3) {
-	    # Greek sigma needs special tests
-	    next;
-	}
-	
-	my $lower = $lower[$i];
-	my $title = $title[$i];
-	my $upper = $upper[$i];
-
-	if (defined $upper || defined $lower || defined $title) {
-	    printf "\t%s\t%s\t%s\t%s\t# %4X\n",
-		    pack ("U", $i),
-		    (defined $lower ? $lower : ""),
-		    (defined $title ? $title : ""),
-		    (defined $upper ? $upper : ""),
-                    $i;
-	}
-    }
-}
-
-sub make_hex
-{
-    my $codes = shift;
-
-    $codes =~ s/^\s+//;
-    $codes =~ s/\s+$//;
-
-    if ($codes eq "0" || $codes eq "") {
-	return "";
-    } else {
-	return pack ("U*", map { hex ($_) } split /\s+/, $codes);
-    }
-}
diff --git a/tests/gen-casemap-txt.py b/tests/gen-casemap-txt.py
new file mode 100755
index 000000000..98f6bc969
--- /dev/null
+++ b/tests/gen-casemap-txt.py
@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+# Copyright (C) 1998, 1999 Tom Tromey
+# Copyright (C) 2001 Red Hat Software
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+"""
+gen-casemap-txt.py - Generate test cases for case mapping from Unicode data.
+See http://www.unicode.org/Public/UNIDATA/UnicodeCharacterDatabase.html
+Usage:
+    I consider the output of this program to be unrestricted.
+    Use it as you will.
+"""
+
+import sys
+import argparse
+
+
+def main(argv):
+    parser = argparse.ArgumentParser(
+        description="Generate test cases for case mapping from Unicode data")
+    parser.add_argument("UNICODE-VERSION")
+    parser.add_argument("UnicodeData.txt")
+    parser.add_argument("SpecialCasing.txt")
+    args = parser.parse_args(argv[1:])
+    version = getattr(args, "UNICODE-VERSION")
+    filename_udata = getattr(args, "UnicodeData.txt")
+    filename_casing = getattr(args, "SpecialCasing.txt")
+
+    # Names of fields in Unicode data table.
+    CODE, NAME, CATEGORY, COMBINING_CLASSES, BIDI_CATEGORY, DECOMPOSITION, \
+        DECIMAL_VALUE, DIGIT_VALUE, NUMERIC_VALUE, MIRRORED, OLD_NAME, \
+        COMMENT, UPPER, LOWER, TITLE = range(15)
+
+    # Names of fields in the SpecialCasing table
+    CASE_CODE, CASE_LOWER, CASE_TITLE, CASE_UPPER, CASE_CONDITION = range(5)
+
+    upper = {}
+    title = {}
+    lower = {}
+
+    def make_hex(codes):
+        """Converts a string of white space separated code points encoded as
+        hex values to a Unicode string. Any extra white space is ignored.
+        """
+        return "".join([chr(int(c, 16)) for c in codes.split()])
+
+    def process_one(code, fields):
+        type_ = fields[CATEGORY]
+        if type_ == "Ll":
+            upper[code] = make_hex(fields[UPPER])
+            lower[code] = chr(code)
+            title[code] = make_hex(fields[TITLE])
+        elif type_ == "Lu":
+            lower[code] = make_hex(fields[LOWER])
+            upper[code] = chr(code)
+            title[code] = make_hex(fields[TITLE])
+        elif type_ == "Lt":
+            upper[code] = make_hex(fields[UPPER])
+            lower[code] = make_hex(fields[LOWER])
+            title[code] = make_hex(fields[LOWER])
+
+    with open(filename_udata, encoding="utf-8") as fileobj:
+        last_code = -1
+        for line in fileobj:
+            line = line.strip()
+            fields = [f.strip() for f in line.split(";")]
+            if len(fields) != 15:
+                raise SystemExit(
+                    "Entry for %s has wrong number of fields (%d)" % (
+                        fields[CODE], len(fields)))
+
+            code = int(fields[CODE], 16)
+
+            if code > last_code + 1:
+                # Found a gap
+                if fields[NAME].endswith("Last>"):
+                    # Fill the gap with the last character read,
+                    # since this was a range specified in the char database
+                    gfields = fields
+                else:
+                    # The gap represents undefined characters.  Only the type
+                    # matters.
+                    gfields = ['', '', 'Cn', '0', '', '', '', '', '', '', '',
+                               '', '', '', '']
+
+                last_code += 1
+                while last_code < code:
+                    gfields[CODE] = "%04x" % last_code
+                    process_one(last_code, gfields)
+                    last_code += 1
+
+            process_one(code, fields)
+            last_code = code
+
+    with open(filename_casing, encoding="utf-8") as fileobj:
+        last_code = -1
+        for line in fileobj:
+            # strip comments and skip empty lines
+            line = line.split("#", 1)[0].strip()
+            if not line:
+                continue
+
+            # all lines end with ";" so just remove it
+            line = line.rstrip(";").rstrip()
+            fields = [f.strip() for f in line.split(";")]
+            if len(fields) not in (4, 5):
+                raise SystemExit(
+                    "Entry for %s has wrong number of fields (%d)" % (
+                        fields[CASE_CODE], len(fields)))
+
+            if len(fields) == 5:
+                # Ignore conditional special cases - we'll handle them manually
+                continue
+
+            code = int(fields[CASE_CODE], 16)
+
+            upper[code] = make_hex(fields[CASE_UPPER])
+            lower[code] = make_hex(fields[CASE_LOWER])
+            title[code] = make_hex(fields[CASE_TITLE])
+
+    print_tests(version, upper, title, lower)
+
+
+def print_tests(version, upper, title, lower):
+    print("""\
+# Test cases generated from Unicode {} data
+# by gen-casemap-txt.py. Do not edit.
+#
+# Some special hand crafted tests
+#
+tr_TR\ti\ti\t\u0130\t\u0130\t# i => LATIN CAPITAL LETTER I WITH DOT ABOVE
+tr_TR\tI\t\u0131\tI\tI\t# I => LATIN SMALL LETTER DOTLESS I
+tr_TR\tI\u0307\ti\tI\u0307\tI\u0307\t# I => LATIN SMALL LETTER DOTLESS I
+tr_TR.UTF-8\ti\ti\t\u0130\t\u0130\t# i => LATIN CAPITAL LETTER I WITH DOT ABOVE
+tr_TR.UTF-8\tI\t\u0131\tI\tI\t# I => LATIN SMALL LETTER DOTLESS I
+tr_TR.UTF-8\tI\u0307\ti\tI\u0307\tI\u0307\t# I => LATIN SMALL LETTER DOTLESS I
+# Test reordering of YPOGEGRAMMENI across other accents
+\t\u03b1\u0345\u0314\t\u03b1\u0345\u0314\t\u0391\u0345\u0314\t\u0391\u0314\u0399\t
+\t\u03b1\u0314\u0345\t\u03b1\u0314\u0345\t\u0391\u0314\u0345\t\u0391\u0314\u0399\t
+# Handling of final and nonfinal sigma
+\tΜΆΙΟΣ 	μάιος 	Μάιος 	ΜΆΙΟΣ 	
+\tΜΆΙΟΣ	μάιος	Μάιος	ΜΆΙΟΣ	
+\tΣΙΓΜΑ	σιγμα	Σιγμα	ΣΙΓΜΑ	
+# Lithuanian rule of i followed by letter with dot. Not at all sure
+# about the titlecase part here
+lt_LT\ti\u0117\ti\u0117\tIe\tIE\t
+lt_LT\tie\u0307\tie\u0307\tIe\tIE\t
+lt_LT\t\u00cc\ti\u0307\u0300\t\u00cc\t\u00cc\t # LATIN CAPITAL LETTER I WITH GRAVE
+lt_LT\t\u00CD\ti\u0307\u0301\t\u00CD\t\u00CD\t # LATIN CAPITAL LETTER I WITH ACUTE
+lt_LT\t\u0128\ti\u0307\u0303\t\u0128\t\u0128\t # LATIN CAPITAL LETTER I WITH TILDE
+lt_LT\tI\u0301\ti\u0307\u0301\tI\u0301\tI\u0301\t # LATIN CAPITAL LETTER I (with acute accent)
+lt_LT\tI\u0300\ti\u0307\u0300\tI\u0300\tI\u0300\t # LATIN CAPITAL LETTER I (with grave accent)
+lt_LT\tI\u0303\ti\u0307\u0303\tI\u0303\tI\u0303\t # LATIN CAPITAL LETTER I (with tilde above)
+lt_LT\tI\u0328\u0301\ti\u0307\u0328\u0301\tI\u0328\u0301\tI\u0328\u0301\t # LATIN CAPITAL LETTER I (with ogonek and acute accent)
+lt_LT\tJ\u0301\tj\u0307\u0301\tJ\u0301\tJ\u0301\t # LATIN CAPITAL LETTER J (with acute accent)
+lt_LT\t\u012e\u0301\t\u012f\u0307\u0301\t\u012e\u0301\t\u012e\u0301\t # LATIN CAPITAL LETTER I WITH OGONEK (with acute accent)
+lt_LT.UTF-8\ti\u0117\ti\u0117\tIe\tIE\t
+lt_LT.UTF-8\tie\u0307\tie\u0307\tIe\tIE\t
+lt_LT.UTF-8\t\u00cc\ti\u0307\u0300\t\u00cc\t\u00cc\t # LATIN CAPITAL LETTER I WITH GRAVE
+lt_LT.UTF-8\t\u00CD\ti\u0307\u0301\t\u00CD\t\u00CD\t # LATIN CAPITAL LETTER I WITH ACUTE
+lt_LT.UTF-8\t\u0128\ti\u0307\u0303\t\u0128\t\u0128\t # LATIN CAPITAL LETTER I WITH TILDE
+lt_LT.UTF-8\tI\u0301\ti\u0307\u0301\tI\u0301\tI\u0301\t # LATIN CAPITAL LETTER I (with acute accent)
+lt_LT.UTF-8\tI\u0300\ti\u0307\u0300\tI\u0300\tI\u0300\t # LATIN CAPITAL LETTER I (with grave accent)
+lt_LT.UTF-8\tI\u0303\ti\u0307\u0303\tI\u0303\tI\u0303\t # LATIN CAPITAL LETTER I (with tilde above)
+lt_LT.UTF-8\tI\u0328\u0301\ti\u0307\u0328\u0301\tI\u0328\u0301\tI\u0328\u0301\t # LATIN CAPITAL LETTER I (with ogonek and acute accent)
+lt_LT.UTF-8\tJ\u0301\tj\u0307\u0301\tJ\u0301\tJ\u0301\t # LATIN CAPITAL LETTER J (with acute accent)
+lt_LT.UTF-8\t\u012e\u0301\t\u012f\u0307\u0301\t\u012e\u0301\t\u012e\u0301\t # LATIN CAPITAL LETTER I WITH OGONEK (with acute accent)
+# Special case not at initial position
+\ta\ufb04\ta\ufb04\tAffl\tAFFL\t# FB04
+#
+# Now the automatic tests
+#""".format(version))
+
+    for i in range(0x10ffff):
+        if i == 0x3A3:
+            # Greek sigma needs special tests
+            continue
+
+        up = upper.get(i, "")
+        lo = lower.get(i, "")
+        ti = title.get(i, "")
+
+        if any([up, lo, ti]):
+            print("\t%s\t%s\t%s\t%s\t# %4X" % (chr(i), lo, ti, up, i))
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
diff --git a/tests/gio-ls.c b/tests/gio-ls.c
deleted file mode 100644
index 9ae74d476..000000000
--- a/tests/gio-ls.c
+++ /dev/null
@@ -1,114 +0,0 @@
-
-#include <gio/gio.h>
-
-#define GETTEXT_PACKAGE "gio-ls"
-#define N_(s) (s)
-#define _(s) (s)
-
-enum
-{
-  SHOW_ALL,
-  SHOW_LONG
-};
-
-static void print_path (const gchar* path, guint32 flags);
-
-static gboolean show_all = FALSE;
-static gboolean show_long = FALSE;
-
-int 
-main (int argc, char *argv[])
-{
-  
-  GOptionContext *context = NULL;
-  static GOptionEntry options[] =
-  {
-    {"all", 'a', 0, G_OPTION_ARG_NONE, &show_all,
-     N_("do not hide entries"), NULL },
-    {"long", 'l', 0, G_OPTION_ARG_NONE, &show_long,
-     N_("use a long listing format"), NULL },
-    { NULL }
-  };
-  GError *error = NULL;
-  int i;
-
-  context = g_option_context_new(_("[FILE...]"));
-  g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-  
-  if (!g_option_context_parse (context, &argc, &argv, &error)) 
-    {
-      g_print ("%s", error->message);
-      g_error_free (error);
-      
-    }
-  else
-    {
-      for (i = 1; i < argc; i++) 
-        {
-	  print_path (argv[i], (show_all ? SHOW_ALL : 0) | (show_long ? SHOW_LONG : 0));
-	}
-    }
-
-  g_option_context_free(context);
-  return 0;
-}
-
-static void 
-print_path (const gchar* path, 
-            guint32      flags)
-{
-  GFile *top;
-  const gchar *short_attrs = G_FILE_ATTRIBUTE_STANDARD_NAME;
-  const gchar *long_attrs = G_FILE_ATTRIBUTE_OWNER_USER "," G_FILE_ATTRIBUTE_OWNER_GROUP "," \
-			    "access:*,std:*";
-  const gchar *attrs;
-  
-  if (flags & SHOW_LONG)
-    attrs = long_attrs;
-  else
-    attrs = short_attrs;
-
-  top = g_file_new_for_path (path);
-  if (top)
-    {
-      GFileInfo *info;
-      GError *error = NULL;
-      GFileEnumerator *enumerator = g_file_enumerate_children (top, attrs, 
-                                                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &error);
-      if (error)
-        {
-	  g_print ("%s", error->message);
-	  g_error_free (error);
-	}
-      if (!enumerator)
-        return;
- 
-      while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL)
-        {
-	  const gchar *name = g_file_info_get_name (info);
-
-          if (flags & SHOW_LONG)
-	    {
-	      const gchar *val;
-	      
-	      g_print ("%c%c%c%c ",
-		g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY ? 'd' : '-',
-		g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ) ? 'r' : '-',
-		g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE) ? 'w' : '-',
-		g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE) ? 'x' : '-');
-
-	      val = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_OWNER_USER);
-	      g_print ("\t%15s", val ? val : "?user?");
-
-	      val = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_OWNER_GROUP);
-	      g_print ("\t%15s", val ? val : "?group?");
-	    }
-	    
-	  g_print ("\t%s\n", name ? name : "?noname?");
-
-	  g_object_unref (info);
-	}
-
-      g_object_unref (top);
-    }
-}
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index aa5dbb602..0e609870b 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -40,7 +40,8 @@ AM_TESTS_ENVIRONMENT = \
 	MALLOC_CHECK_=2                                         \
 	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
-accumulator_SOURCES = accumulator.c testmarshal.c testmarshal.h
+accumulator_SOURCES = accumulator.c
+nodist_accumulator_SOURCES = testmarshal.c testmarshal.h
 signals_SOURCES = signals.c
 defaultiface_SOURCES = defaultiface.c testmodule.c testmodule.h
 dynamictype_SOURCES = dynamictype.c testmodule.c testmodule.h
@@ -68,18 +69,6 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal)
 	&& rm -f xgen-gmc xgen-gmc~
 
 BUILT_SOURCES += testmarshal.h testmarshal.c
-CLEANFILES += stamp-testmarshal.h
+CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c
 EXTRA_DIST += testcommon.h testmarshal.list
-BUILT_EXTRA_DIST += testmarshal.h testmarshal.c
-endif # !CROSS_COMPILING
-
-dist-hook: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)';				\
-	for f in $$files; do					\
-	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
-	  cp $$d/$$f $(distdir) || exit 1; done
-
-distclean-local:
-	if test $(srcdir) = .; then :; else	\
-	    rm -f $(BUILT_EXTRA_DIST);		\
-	fi
+endif # !CROSS_COMPILING
\ No newline at end of file
diff --git a/tests/gobject/ifacecheck.c b/tests/gobject/ifacecheck.c
deleted file mode 100644
index 369c546cd..000000000
--- a/tests/gobject/ifacecheck.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001, 2003 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#undef	G_LOG_DOMAIN
-#define	G_LOG_DOMAIN "TestIfaceCheck"
-
-#undef G_DISABLE_ASSERT
-#undef G_DISABLE_CHECKS
-#undef G_DISABLE_CAST_CHECKS
-
-#include <string.h>
-
-#include <glib-object.h>
-
-#include "testcommon.h"
-
-/* This test tests g_type_add_interface_check_func(), which allows
- * installing a post-initialization check function.
- */
-
-#define TEST_TYPE_IFACE           (test_iface_get_type ())
-#define TEST_IFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE, TestIfaceClass))
-typedef struct _TestIfaceClass  TestIfaceClass;
-
-struct _TestIfaceClass
-{
-  GTypeInterface base_iface;
-  GString *history;
-};
-
-static void
-test_iface_base_init (TestIfaceClass *iface)
-{
-  iface->history = g_string_new (iface->history ? iface->history->str : NULL);
-}
-
-static DEFINE_IFACE(TestIface, test_iface, test_iface_base_init, NULL)
-
-/*
- * TestObject1
- */
-#define TEST_TYPE_OBJECT1         (test_object1_get_type ())
-typedef struct _GObject           TestObject1;
-typedef struct _GObjectClass      TestObject1Class;
-
-static DEFINE_TYPE_FULL (TestObject1, test_object1,
-			 NULL, NULL, NULL,
-			 G_TYPE_OBJECT,
-			 INTERFACE (NULL, TEST_TYPE_IFACE))
-     
-/*
- * TestObject2
- */
-#define TEST_TYPE_OBJECT2         (test_object2_get_type ())
-typedef struct _GObject           TestObject2;
-typedef struct _GObjectClass      TestObject2Class;
-
-static DEFINE_TYPE_FULL (TestObject2, test_object2,
-			 NULL, NULL, NULL,
-			 G_TYPE_OBJECT,
-			 INTERFACE (NULL, TEST_TYPE_IFACE))
-     
-/*
- * TestObject3
- */
-#define TEST_TYPE_OBJECT3         (test_object3_get_type ())
-typedef struct _GObject           TestObject3;
-typedef struct _GObjectClass      TestObject3Class;
-
-static DEFINE_TYPE_FULL (TestObject3, test_object3,
-			 NULL, NULL, NULL,
-			 G_TYPE_OBJECT,
-			 INTERFACE (NULL, TEST_TYPE_IFACE))
-     
-/*
- * TestObject4
- */
-#define TEST_TYPE_OBJECT4         (test_object4_get_type ())
-typedef struct _GObject           TestObject4;
-typedef struct _GObjectClass      TestObject4Class;
-
-
-static DEFINE_TYPE_FULL (TestObject4, test_object4,
-			 NULL, NULL, NULL,
-			 G_TYPE_OBJECT, {})
-
-static void
-check_func (gpointer check_data,
-	    gpointer g_iface)
-{
-  TestIfaceClass *iface = g_iface;
-
-  g_string_append (iface->history, check_data);
-}
-
-int
-main (int   argc,
-      char *argv[])
-{
-  TestIfaceClass *iface;
-  GObject *object;
-  char *string1 = "A";
-  char *string2 = "B";
-
-  /* Basic check of interfaces added before class_init time
-   */
-  g_type_add_interface_check (string1, check_func);
-
-  object = g_object_new (TEST_TYPE_OBJECT1, NULL);
-  iface = TEST_IFACE_GET_CLASS (object);
-    g_assert (strcmp (iface->history->str, "A") == 0);
-  g_object_unref (object);
-
-  /* Add a second check function
-   */
-  g_type_add_interface_check (string2, check_func);
-
-  object = g_object_new (TEST_TYPE_OBJECT2, NULL);
-  iface = TEST_IFACE_GET_CLASS (object);
-  g_assert (strcmp (iface->history->str, "AB") == 0);
-  g_object_unref (object);
-
-  /* Remove the first check function
-   */
-  g_type_remove_interface_check (string1, check_func);
-
-  object = g_object_new (TEST_TYPE_OBJECT3, NULL);
-  iface = TEST_IFACE_GET_CLASS (object);
-  g_assert (strcmp (iface->history->str, "B") == 0);
-  g_object_unref (object);
-
-  /* Test interfaces added after class_init time
-   */
-  g_type_class_ref (TEST_TYPE_OBJECT4);
-  {
-    GInterfaceInfo const iface = {
-      NULL, NULL, NULL
-    };
-    
-    g_type_add_interface_static (TEST_TYPE_OBJECT4, TEST_TYPE_IFACE, &iface);
-  }
-  
-  object = g_object_new (TEST_TYPE_OBJECT4, NULL);
-  iface = TEST_IFACE_GET_CLASS (object);
-  g_assert (strcmp (iface->history->str, "B") == 0);
-  g_object_unref (object);
-    
-  return 0;
-}
diff --git a/tests/gobject/ifaceinherit.c b/tests/gobject/ifaceinherit.c
deleted file mode 100644
index d86b32de9..000000000
--- a/tests/gobject/ifaceinherit.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001, 2003 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#undef	G_LOG_DOMAIN
-#define	G_LOG_DOMAIN "TestIfaceInherit"
-
-#undef G_DISABLE_ASSERT
-#undef G_DISABLE_CHECKS
-#undef G_DISABLE_CAST_CHECKS
-
-#include <glib-object.h>
-
-#include "testcommon.h"
-#include "testmodule.h"
-
-/* This test tests inheritance of interface. We two object
- * class BaseObject and DerivedObject we add an interface
- * to BaseObject:
- *
- * I1) Before DerivedObject is registered
- * I2) After DerivedObject is registered, but before
- *     DerivedObject is class initialized
- * I3) During DerivedObject's class_init
- * I4) After DerivedObject's class init
- *
- * We also do some tests of overriding.
- * 
- * I5) We add an interface to BaseObject, then add the same
- *     interface to DerivedObject. (Note that this is only legal
- *     before DerivedObject's class_init; the results of
- *     g_type_interface_peek() are not allowed to change from one
- *     non-NULL vtable to another non-NULL vtable)
- */
-   
-/*
- * BaseObject, a parent class for DerivedObject
- */
-#define BASE_TYPE_OBJECT          (base_object_get_type ())
-typedef struct _BaseObject        BaseObject;
-typedef struct _BaseObjectClass   BaseObjectClass;
-
-struct _BaseObject
-{
-  GObject parent_instance;
-};
-struct _BaseObjectClass
-{
-  GObjectClass parent_class;
-};
-
-static GType base_object_get_type (void);
-static GType derived_object_get_type (void);
-
-/*
- * DerivedObject, the child class of DerivedObject
- */
-#define DERIVED_TYPE_OBJECT          (derived_object_get_type ())
-typedef struct _DerivedObject        DerivedObject;
-typedef struct _DerivedObjectClass   DerivedObjectClass;
-
-struct _DerivedObject
-{
-  BaseObject parent_instance;
-};
-struct _DerivedObjectClass
-{
-  BaseObjectClass parent_class;
-};
-
-/*
- * The interfaces
- */
-typedef struct _TestIfaceClass TestIfaceClass;
-typedef struct _TestIfaceClass TestIface1Class;
-typedef struct _TestIfaceClass TestIface2Class;
-typedef struct _TestIfaceClass TestIface3Class;
-typedef struct _TestIfaceClass TestIface4Class;
-typedef struct _TestIfaceClass TestIface5Class;
-
-struct _TestIfaceClass
-{
-  GTypeInterface base_iface;
-  guint val;
-};
-
-static GType test_iface1_get_type (void);
-static GType test_iface2_get_type (void);
-static GType test_iface3_get_type (void);
-static GType test_iface4_get_type (void);
-static GType test_iface5_get_type (void);
-
-#define TEST_TYPE_IFACE1 (test_iface1_get_type ())
-#define TEST_TYPE_IFACE2 (test_iface2_get_type ())
-#define TEST_TYPE_IFACE3 (test_iface3_get_type ())
-#define TEST_TYPE_IFACE4 (test_iface4_get_type ())
-#define TEST_TYPE_IFACE5 (test_iface5_get_type ())
-
-static DEFINE_IFACE (TestIface1, test_iface1,  NULL, NULL)
-static DEFINE_IFACE (TestIface2, test_iface2,  NULL, NULL)
-static DEFINE_IFACE (TestIface3, test_iface3,  NULL, NULL)
-static DEFINE_IFACE (TestIface4, test_iface4,  NULL, NULL)
-static DEFINE_IFACE (TestIface5, test_iface5,  NULL, NULL)
-
-static void
-add_interface (GType              object_type,
-	       GType              iface_type,
-	       GInterfaceInitFunc init_func)
-{
-  GInterfaceInfo iface_info = {	NULL, NULL, NULL };
-
-  iface_info.interface_init = init_func;
-								
-  g_type_add_interface_static (object_type, iface_type, &iface_info);
-}
-
-static void
-init_base_interface (TestIfaceClass *iface)
-{
-  iface->val = 21;
-}
-
-static void
-add_base_interface (GType object_type,
-		    GType iface_type)
-{
-  add_interface (object_type, iface_type,
-		 (GInterfaceInitFunc)init_base_interface);
-}
-
-static gboolean
-interface_is_base (GType object_type,
-		   GType iface_type)
-{
-  gpointer g_class = g_type_class_peek (object_type);
-  TestIfaceClass *iface = g_type_interface_peek (g_class, iface_type);
-  return iface && iface->val == 21;
-}
-
-static void
-init_derived_interface (TestIfaceClass *iface)
-{
-  iface->val = 42;
-}
-
-static void
-add_derived_interface (GType object_type,
-		       GType iface_type)
-{
-  add_interface (object_type, iface_type,
-		 (GInterfaceInitFunc)init_derived_interface);
-}
-
-static gboolean
-interface_is_derived (GType object_type,
-		      GType iface_type)
-{
-  gpointer g_class = g_type_class_peek (object_type);
-  TestIfaceClass *iface = g_type_interface_peek (g_class, iface_type);
-  return iface && iface->val == 42;
-}
-
-static void
-derived_object_class_init (BaseObjectClass *class)
-{
-  add_base_interface (BASE_TYPE_OBJECT, TEST_TYPE_IFACE3);
-}
-
-static DEFINE_TYPE(BaseObject, base_object,
-		   NULL, NULL, NULL,
-		   G_TYPE_OBJECT)
-static DEFINE_TYPE(DerivedObject, derived_object,
-		   derived_object_class_init, NULL, NULL,
-		   BASE_TYPE_OBJECT)
-
-int
-main (int   argc,
-      char *argv[])
-{
-  g_log_set_always_fatal (g_log_set_always_fatal (G_LOG_FATAL_MASK) |
-			  G_LOG_LEVEL_WARNING |
-			  G_LOG_LEVEL_CRITICAL);
-
-  /* Register BaseObject */
-  BASE_TYPE_OBJECT;
-  
-  add_base_interface (BASE_TYPE_OBJECT, TEST_TYPE_IFACE5);
-
-  /* Class init BaseObject */
-  g_type_class_ref (BASE_TYPE_OBJECT);
-  
-  add_base_interface (BASE_TYPE_OBJECT, TEST_TYPE_IFACE1);
-
-  /* Register DerivedObject */
-  DERIVED_TYPE_OBJECT;
-
-  add_base_interface (BASE_TYPE_OBJECT, TEST_TYPE_IFACE2);
-  add_derived_interface (DERIVED_TYPE_OBJECT, TEST_TYPE_IFACE5);
-
-  /* Class init DerivedObject */
-  g_type_class_ref (DERIVED_TYPE_OBJECT);
-  
-  add_base_interface (BASE_TYPE_OBJECT, TEST_TYPE_IFACE4);
-
-  /* Check that all the non-overridden interfaces were properly inherited
-   */
-  g_assert (interface_is_base (DERIVED_TYPE_OBJECT, TEST_TYPE_IFACE1));
-  g_assert (interface_is_base (DERIVED_TYPE_OBJECT, TEST_TYPE_IFACE2));
-  g_assert (interface_is_base (DERIVED_TYPE_OBJECT, TEST_TYPE_IFACE3));
-  g_assert (interface_is_base (DERIVED_TYPE_OBJECT, TEST_TYPE_IFACE4));
-
-  /* Check that all the overridden interfaces were properly overridden
-   */
-  g_assert (interface_is_derived (DERIVED_TYPE_OBJECT, TEST_TYPE_IFACE5));
-
-  return 0;
-}
diff --git a/tests/gobject/ifaceinit.c b/tests/gobject/ifaceinit.c
deleted file mode 100644
index c69e943d5..000000000
--- a/tests/gobject/ifaceinit.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001, 2003 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#undef	G_LOG_DOMAIN
-#define	G_LOG_DOMAIN "TestIfaceInit"
-
-#undef G_DISABLE_ASSERT
-#undef G_DISABLE_CHECKS
-#undef G_DISABLE_CAST_CHECKS
-
-#include <glib-object.h>
-
-#include "testcommon.h"
-
-/* What this test tests is the ability to add interfaces dynamically; in
- * particular adding interfaces to a class while that class is being
- * initialized.
- *
- * The test defines 5 interfaces:
- * 
- * - TestIface1 is added before the class is initialized
- * - TestIface2 is added in base_object_base_init()
- * - TestIface3 is added in test_iface1_base_init()
- * - TestIface4 is added in test_object_class_init()
- * - TestIface5 is added in test_object_test_iface1_init()
- * - TestIface6 is added after the class is initialized
- */
-
-/* All 6 interfaces actually share the same class structure, though
- * we use separate typedefs
- */
-typedef struct _TestIfaceClass TestIfaceClass;
-
-struct _TestIfaceClass
-{
-  GTypeInterface base_iface;
-  guint val;
-  guint base_val;
-  guint default_val;
-};
-
-#define TEST_TYPE_IFACE1           (test_iface1_get_type ())
-#define TEST_IFACE1_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE1, TestIface1Class))
-typedef struct _TestIface1      TestIface1;
-typedef struct _TestIfaceClass  TestIface1Class;
-
-static void test_iface1_base_init    (TestIface1Class *iface);
-static void test_iface1_default_init (TestIface1Class *iface, gpointer class_data);
-
-static DEFINE_IFACE(TestIface1, test_iface1, test_iface1_base_init, test_iface1_default_init)
-
-#define TEST_TYPE_IFACE2           (test_iface2_get_type ())
-#define TEST_IFACE2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE2, TestIface2Class))
-typedef struct _TestIface2      TestIface2;
-typedef struct _TestIfaceClass  TestIface2Class;
-
-static void test_iface2_base_init (TestIface2Class *iface);
-
-static DEFINE_IFACE(TestIface2, test_iface2, test_iface2_base_init, NULL)
-
-#define TEST_TYPE_IFACE3           (test_iface3_get_type ())
-#define TEST_IFACE3_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE3, TestIface3Class))
-typedef struct _TestIface3      TestIface3;
-typedef struct _TestIfaceClass  TestIface3Class;
-
-static void  test_iface3_base_init (TestIface3Class *iface);
-
-static DEFINE_IFACE(TestIface3, test_iface3, test_iface3_base_init, NULL)
-
-#define TEST_TYPE_IFACE4           (test_iface4_get_type ())
-#define TEST_IFACE4_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE4, TestIface4Class))
-typedef struct _TestIface4      TestIface4;
-typedef struct _TestIfaceClass  TestIface4Class;
-
-static void  test_iface4_base_init (TestIface4Class *iface);
-
-static DEFINE_IFACE(TestIface4, test_iface4, test_iface4_base_init, NULL)
-
-#define TEST_TYPE_IFACE5           (test_iface5_get_type ())
-#define TEST_IFACE5_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE5, TestIface5Class))
-typedef struct _TestIface5      TestIface5;
-typedef struct _TestIfaceClass  TestIface5Class;
-
-static void  test_iface5_base_init (TestIface5Class *iface);
-
-static DEFINE_IFACE(TestIface5, test_iface5, test_iface5_base_init, NULL)
-
-#define TEST_TYPE_IFACE6           (test_iface6_get_type ())
-#define TEST_IFACE6_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TEST_TYPE_IFACE6, TestIface6Class))
-typedef struct _TestIface6      TestIface6;
-typedef struct _TestIfaceClass  TestIface6Class;
-
-static void  test_iface6_base_init (TestIface6Class *iface);
-
-static DEFINE_IFACE(TestIface6, test_iface6, test_iface6_base_init, NULL)
-
-/*
- * BaseObject, a parent class for TestObject
- */
-#define BASE_TYPE_OBJECT          (base_object_get_type ())
-typedef struct _BaseObject        BaseObject;
-typedef struct _BaseObjectClass   BaseObjectClass;
-
-struct _BaseObject
-{
-  GObject parent_instance;
-};
-struct _BaseObjectClass
-{
-  GObjectClass parent_class;
-};
-
-/*
- * TestObject, a parent class for TestObject
- */
-#define TEST_TYPE_OBJECT          (test_object_get_type ())
-typedef struct _TestObject        TestObject;
-typedef struct _TestObjectClass   TestObjectClass;
-
-struct _TestObject
-{
-  BaseObject parent_instance;
-};
-struct _TestObjectClass
-{
-  BaseObjectClass parent_class;
-};
-
-#define TEST_CALLED_ONCE() G_STMT_START { \
-  static gboolean called = 0;           \
-  g_assert (!called);                   \
-  called = TRUE;                        \
-} G_STMT_END
-
-#define CHECK_IFACE_TWICE(iface) G_STMT_START {                                 \
-  static guint n_calls = 0;                                                     \
-  n_calls++;                                                                    \
-  g_assert (n_calls <= 2);                                                      \
-  g_assert (G_TYPE_IS_INTERFACE (((GTypeInterface*) iface)->g_type));           \
-  if (n_calls == 1)                                                             \
-    g_assert (((GTypeInterface*) iface)->g_instance_type == 0);                 \
-  else                                                                          \
-    g_assert (G_TYPE_IS_OBJECT (((GTypeInterface*) iface)->g_instance_type));   \
-} G_STMT_END
-
-#define ADD_IFACE(n)  G_STMT_START {				\
-  GInterfaceInfo iface_info = {				\
-    (GInterfaceInitFunc)test_object_test_iface##n##_init,	\
-    NULL, NULL };						\
-								\
-  g_type_add_interface_static (TEST_TYPE_OBJECT,		\
-			       test_iface##n##_get_type (),	\
-			       &iface_info);			\
-								\
-} G_STMT_END
-
-static gboolean base1, base2, base3, base4, base5, base6;
-static gboolean iface1, iface2, iface3, iface4, iface5, iface6;
-
-static void test_object_test_iface1_init (TestIface1Class *iface);
-static void test_object_test_iface2_init (TestIface1Class *iface);
-static void test_object_test_iface3_init (TestIface3Class *iface);
-static void test_object_test_iface4_init (TestIface4Class *iface);
-static void test_object_test_iface5_init (TestIface5Class *iface);
-static void test_object_test_iface6_init (TestIface6Class *iface);
-
-static GType test_object_get_type (void);
-
-static void
-test_object_test_iface1_init (TestIface1Class *iface)
-{
-  TEST_CALLED_ONCE();
-
-  g_assert (iface->default_val == 0x111111);
-
-  iface->val = 0x10001;
-
-  ADD_IFACE(5);
-
-  iface1 = TRUE;
-}
-
-static void
-test_object_test_iface2_init (TestIface2Class *iface)
-{
-  TEST_CALLED_ONCE();
-  
-  iface->val = 0x20002;
-  
-  iface2 = TRUE;
-}
-
-static void
-test_object_test_iface3_init (TestIface3Class *iface)
-{
-  TEST_CALLED_ONCE();
-  
-  iface->val = 0x30003;
-  
-  iface3 = TRUE;
-}
-
-static void
-test_object_test_iface4_init (TestIface4Class *iface)
-{
-  TEST_CALLED_ONCE();
-
-  iface->val = 0x40004;
-  
-  iface4 = TRUE;
-}
-
-static void
-test_object_test_iface5_init (TestIface5Class *iface)
-{
-  TEST_CALLED_ONCE();
-
-  iface->val = 0x50005;
-  
-  iface5 = TRUE;
-}
-
-static void
-test_object_test_iface6_init (TestIface6Class *iface)
-{
-  TEST_CALLED_ONCE();
-
-  iface->val = 0x60006;
-  
-  iface6 = TRUE;
-}
-
-static void
-test_iface1_default_init (TestIface1Class *iface,
-                          gpointer         class_data)
-{
-  TEST_CALLED_ONCE();
-  g_assert (iface->base_iface.g_type == TEST_TYPE_IFACE1);
-  g_assert (iface->base_iface.g_instance_type == 0);
-  g_assert (iface->base_val == 0x110011);
-  g_assert (iface->val == 0);
-  g_assert (iface->default_val == 0);
-  iface->default_val = 0x111111;
-}
-
-static void
-test_iface1_base_init (TestIface1Class *iface)
-{
-  static guint n_calls = 0;
-  n_calls++;
-  g_assert (n_calls <= 2);
-
-  if (n_calls == 1)
-    {
-      iface->base_val = 0x110011;
-      g_assert (iface->default_val == 0);
-    }
-  else
-    {
-      g_assert (iface->base_val == 0x110011);
-      g_assert (iface->default_val == 0x111111);
-    }
-
-  if (n_calls == 1)
-    ADD_IFACE(3);
-  
-  base1 = TRUE;
-}
-
-static void
-test_iface2_base_init (TestIface2Class *iface)
-{
-  CHECK_IFACE_TWICE (iface);
-
-  iface->base_val = 0x220022;
-  
-  base2 = TRUE;
-}
-
-static void
-test_iface3_base_init (TestIface3Class *iface)
-{
-  CHECK_IFACE_TWICE (iface);
-
-  iface->base_val = 0x330033;
-  
-  base3 = TRUE;
-}
-
-static void
-test_iface4_base_init (TestIface4Class *iface)
-{
-  CHECK_IFACE_TWICE (iface);
-
-  iface->base_val = 0x440044;
-
-  base4 = TRUE;
-}
-
-static void
-test_iface5_base_init (TestIface5Class *iface)
-{
-  CHECK_IFACE_TWICE (iface);
-
-  iface->base_val = 0x550055;
-
-  base5 = TRUE;
-}
-
-static void
-test_iface6_base_init (TestIface6Class *iface)
-{
-  CHECK_IFACE_TWICE (iface);
-
-  iface->base_val = 0x660066;
-  
-  base6 = TRUE;
-}
-
-static void
-base_object_base_init (BaseObjectClass *class)
-{
-  static int n_called = 0;
-  n_called++;
-  
-  /* The second time this is called is for TestObject */
-  if (n_called == 2)
-    {
-      ADD_IFACE(2);
-      
-      /* No interface base init functions should have been called yet
-       */
-      g_assert (!base1 && !base2 && !base3 && !base4 && !base5 && !base6);
-      g_assert (!iface1 && !iface2 && !iface3 && !iface4 && !iface5 && !iface6);
-    }
-}
-
-static void
-test_object_class_init (TestObjectClass *class)
-{
-  ADD_IFACE(4);
-
-  /* At this point, the base init functions for all interfaces that have
-   * been added should be called, but no interface init functions.
-   */
-  g_assert (base1 && base2 && base3 && base4 && !base5 && !base6);
-  g_assert (!iface1 && !iface2 && !iface3 && !iface4 && !iface5 && !iface6);
-}
-
-static DEFINE_TYPE(BaseObject, base_object,
-		   NULL, base_object_base_init, NULL,
-		   G_TYPE_OBJECT)
-static DEFINE_TYPE(TestObject, test_object,
-		   test_object_class_init, NULL, NULL,
-		   BASE_TYPE_OBJECT)
-
-int
-main (int   argc,
-      char *argv[])
-{
-  TestObject *object;
-  TestObjectClass *object_class;
-  TestIfaceClass *iface;
-	
-  g_log_set_always_fatal (g_log_set_always_fatal (G_LOG_FATAL_MASK) |
-			  G_LOG_LEVEL_WARNING |
-			  G_LOG_LEVEL_CRITICAL);
-
-  /* We force the interfaces to be registered in a different order
-   * than we add them, so our logic doesn't always deal with interfaces
-   * added at the end.
-   */
-  (void)TEST_TYPE_IFACE4;
-  (void)TEST_TYPE_IFACE2;
-  (void)TEST_TYPE_IFACE6;
-  (void)TEST_TYPE_IFACE5;
-  (void)TEST_TYPE_IFACE3;
-  (void)TEST_TYPE_IFACE1;
-
-  ADD_IFACE(1);
-
-  object_class = g_type_class_ref (TEST_TYPE_OBJECT);
-
-  ADD_IFACE(6);
-
-  /* All base and interface init functions should have been called
-   */
-  g_assert (base1 && base2 && base3 && base4 && base5 && base6);
-  g_assert (iface1 && iface2 && iface3 && iface4 && iface5 && iface6);
-  
-  object = g_object_new (TEST_TYPE_OBJECT, NULL);
-
-  iface = TEST_IFACE1_GET_CLASS (object);
-  g_assert (iface && iface->val == 0x10001 && iface->base_val == 0x110011);
-  iface = TEST_IFACE3_GET_CLASS (object);
-  g_assert (iface && iface->val == 0x30003 && iface->base_val == 0x330033);
-  iface = TEST_IFACE4_GET_CLASS (object);
-  g_assert (iface && iface->val == 0x40004 && iface->base_val == 0x440044);
-  iface = TEST_IFACE5_GET_CLASS (object);
-  g_assert (iface && iface->val == 0x50005 && iface->base_val == 0x550055);
-  iface = TEST_IFACE6_GET_CLASS (object);
-  g_assert (iface && iface->val == 0x60006 && iface->base_val == 0x660066);
-
-  g_type_class_unref (object_class);
-
-  return 0;
-}
diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build
index 95212393b..494459921 100644
--- a/tests/gobject/meson.build
+++ b/tests/gobject/meson.build
@@ -48,6 +48,7 @@ foreach t : gobject_tests
   test_src = t.get(1, test_name + '.c')
   test_extra_cargs = t.get(2, [])
   test_timeout = t.get(3, 30)
+  test_suite = test_timeout == 30 ? ['gobject'] : ['gobject', 'slow']
 
   # FIXME? $(GLIB_DEBUG_FLAGS)
   exe = executable(test_name + '-gobject', test_src,
@@ -56,7 +57,7 @@ foreach t : gobject_tests
     install : false,
   )
   # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
-  test(test_name, exe, env : test_env, timeout : test_timeout)
+  test(test_name, exe, env : test_env, timeout : test_timeout, suite : test_suite)
 endforeach
 
 # Don't install these ones, and keep them out of 'make check' because they take too long...
diff --git a/tests/gobject/run-performance.sh b/tests/gobject/run-performance.sh
deleted file mode 100755
index f2d53dfef..000000000
--- a/tests/gobject/run-performance.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-DIR=`dirname $0`;
-(cd $DIR; make performance)
-ID=`git rev-list --max-count=1 HEAD`
-echo "Testing revision ${ID}"
-$DIR/performance | tee "perf-${ID}.log"
diff --git a/tests/gobject/testgobject.c b/tests/gobject/testgobject.c
index 391e01852..02cfc56f9 100644
--- a/tests/gobject/testgobject.c
+++ b/tests/gobject/testgobject.c
@@ -154,6 +154,13 @@ static gboolean	test_signal_accumulator	(GSignalInvocationHint	*ihint,
 static gchar*	test_object_test_signal	(TestObject		*tobject,
 					 TestIface		*iface_object,
 					 gpointer		 tdata);
+static gint TestObject_private_offset;
+static inline gpointer
+test_object_get_instance_private (TestObject *self)
+{
+  return (G_STRUCT_MEMBER_P (self, TestObject_private_offset));
+}
+
 static GType
 test_object_get_type (void)
 {
@@ -177,6 +184,9 @@ test_object_get_type (void)
 
       test_object_type = g_type_register_static (G_TYPE_OBJECT, "TestObject", &test_object_info, 0);
       g_type_add_interface_static (test_object_type, TEST_TYPE_IFACE, &iface_info);
+
+      TestObject_private_offset =
+        g_type_add_instance_private (test_object_type, sizeof (TestObjectPrivate));
     }
 
   return test_object_type;
@@ -185,6 +195,7 @@ static void
 test_object_class_init (TestObjectClass *class)
 {
   /*  GObjectClass *gobject_class = G_OBJECT_CLASS (class); */
+  g_type_class_adjust_private_offset (class, &TestObject_private_offset);
 
   class->test_signal = test_object_test_signal;
 
@@ -195,15 +206,11 @@ test_object_class_init (TestObjectClass *class)
 		test_signal_accumulator, NULL,
 		g_cclosure_marshal_STRING__OBJECT_POINTER,
 		G_TYPE_STRING, 2, TEST_TYPE_IFACE, G_TYPE_POINTER);
-
-  g_type_class_add_private (class, sizeof (TestObjectPrivate));
 }
 static void
 test_object_init (TestObject *tobject)
 {
-  TestObjectPrivate *priv;
-
-  priv = TEST_OBJECT_GET_PRIVATE (tobject);
+  TestObjectPrivate *priv = test_object_get_instance_private (tobject);
 
   g_assert (priv);
 
@@ -215,9 +222,7 @@ test_object_init (TestObject *tobject)
 static void
 test_object_check_private_init (TestObject *tobject)
 {
-  TestObjectPrivate *priv;
-
-  priv = TEST_OBJECT_GET_PRIVATE (tobject);
+  TestObjectPrivate *priv = test_object_get_instance_private (tobject);
 
   g_print ("private data during initialization: %u == %u\n", priv->dummy1, 54321);
   g_assert (priv->dummy1 == 54321);
@@ -317,6 +322,12 @@ struct _DerivedObjectPrivate
 };
 static void derived_object_class_init (DerivedObjectClass *class);
 static void derived_object_init       (DerivedObject      *dobject);
+static gint DerivedObject_private_offset;
+static inline gpointer
+derived_object_get_instance_private (DerivedObject *self)
+{
+  return (G_STRUCT_MEMBER_P (self, DerivedObject_private_offset));
+}
 static GType
 derived_object_get_type (void)
 {
@@ -340,6 +351,8 @@ derived_object_get_type (void)
 
       derived_object_type = g_type_register_static (TEST_TYPE_OBJECT, "DerivedObject", &derived_object_info, 0);
       g_type_add_interface_static (derived_object_type, TEST_TYPE_IFACE, &iface_info);
+      DerivedObject_private_offset =
+        g_type_add_instance_private (derived_object_type, sizeof (DerivedObjectPrivate));
     }
 
   return derived_object_type;
@@ -347,7 +360,7 @@ derived_object_get_type (void)
 static void
 derived_object_class_init (DerivedObjectClass *class)
 {
-  g_type_class_add_private (class, sizeof (DerivedObjectPrivate));
+  g_type_class_adjust_private_offset (class, &DerivedObject_private_offset);
 }
 static void
 derived_object_init (DerivedObject *dobject)
@@ -355,14 +368,13 @@ derived_object_init (DerivedObject *dobject)
   TestObjectPrivate *test_priv;
   DerivedObjectPrivate *derived_priv;
 
-  derived_priv = DERIVED_OBJECT_GET_PRIVATE (dobject);
+  derived_priv = derived_object_get_instance_private (dobject);
 
   g_assert (derived_priv);
 
-  test_priv = TEST_OBJECT_GET_PRIVATE (dobject);
+  test_priv = test_object_get_instance_private (TEST_OBJECT (dobject));
   
   g_assert (test_priv);
-
 }
 
 /* --- main --- */
@@ -411,7 +423,7 @@ main (int   argc,
   iface_print_string (TEST_IFACE (sigarg), "iface-string-from-test-type");
   iface_print_string (TEST_IFACE (dobject), "iface-string-from-derived-type");
 
-  priv = TEST_OBJECT_GET_PRIVATE (dobject);
+  priv = test_object_get_instance_private (TEST_OBJECT (dobject));
   g_print ("private data after initialization: %u == %u\n", priv->dummy1, 54321);
   g_assert (priv->dummy1 == 54321);
   
diff --git a/tests/meson.build b/tests/meson.build
index 03997a634..3beb4c68a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,11 +1,10 @@
 # tests
 
-test_env = [
-  'G_TEST_SRCDIR=' + meson.current_source_dir(),
-  'G_TEST_BUILDDIR=' + meson.current_build_dir(),
-  'G_DEBUG=gc-friendly',
-  'MALLOC_CHECK_=2',
-]
+test_env = environment()
+test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+test_env.set('G_DEBUG', 'gc-friendly')
+test_env.set('MALLOC_CHECK_', '2')
 
 test_cargs = ['-DG_LOG_DOMAIN="GLib"']
 
diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build
index 64c0cfbfd..9046bf7c7 100644
--- a/tests/refcount/meson.build
+++ b/tests/refcount/meson.build
@@ -1,9 +1,9 @@
 refcount_tests = [
  ['closures', 'closures.c', []],
  ['objects', 'objects.c', []],
- ['objects2', 'objects2.c', []],
+ ['objects2', 'objects2.c', [], 90],
  ['properties', 'properties.c', []],
- ['properties2', 'properties2.c', []],
+ ['properties2', 'properties2.c', [], 90],
  ['properties3', 'properties3.c', [], 90], # extra long timeout
  ['properties4', 'properties4.c', []],
  ['signal1', 'signals.c', ['-DTESTNUM=1']],
@@ -17,6 +17,7 @@ foreach t : refcount_tests
   test_src = t.get(1)
   test_extra_cargs = t.get(2)
   test_timeout = t.get(3, 30)
+  test_suite = test_timeout == 30 ? ['refcount'] : ['refcount', 'slow']
 
   # FIXME? $(GLIB_DEBUG_FLAGS)
   exe = executable(test_name + '-test', test_src,
@@ -25,5 +26,5 @@ foreach t : refcount_tests
     install : false,
   )
   # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
-  test(test_name, exe, env : test_env, timeout : test_timeout)
+  test(test_name, exe, env : test_env, timeout : test_timeout, suite : test_suite)
 endforeach
diff --git a/tests/refcount/objects.c b/tests/refcount/objects.c
index 265276901..963766d00 100644
--- a/tests/refcount/objects.c
+++ b/tests/refcount/objects.c
@@ -155,6 +155,7 @@ main (int argc, char **argv)
 
   g_object_unref (test1);
   g_object_unref (test2);
+  g_array_unref (test_threads);
 
   g_print ("stopped\n");
 
diff --git a/tests/testglib.c b/tests/testglib.c
index ca9153a13..f29bbc664 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -955,18 +955,18 @@ test_paths (void)
   if (g_test_verbose ())
     g_printerr ("checking g_canonicalize_filename() supports NULL...");
 
-    {
-      const gchar *relative_path = "./";
-      gchar *canonical_path = g_canonicalize_filename (relative_path, NULL);
-      gchar *cwd = g_get_current_dir ();
-      if (g_strcmp0 (canonical_path, cwd) != 0)
-        {
-          g_error ("\nfailed for \"%s\"==\"%s\" (returned: \"%s\")\n",
-                   relative_path, cwd, canonical_path);
-        }
-      g_free (cwd);
-      g_free (canonical_path);
-    }
+  {
+    const gchar *relative_path = "./";
+    gchar *canonical_path = g_canonicalize_filename (relative_path, NULL);
+    gchar *cwd = g_get_current_dir ();
+    if (g_strcmp0 (canonical_path, cwd) != 0)
+      {
+        g_error ("\nfailed for \"%s\"==\"%s\" (returned: \"%s\")\n",
+                 relative_path, cwd, canonical_path);
+      }
+    g_free (cwd);
+    g_free (canonical_path);
+  }
 
   if (g_test_verbose ())
     g_printerr ("ok\n");
diff --git a/tests/unicode-caseconv.c b/tests/unicode-caseconv.c
index affb55888..c124633d1 100644
--- a/tests/unicode-caseconv.c
+++ b/tests/unicode-caseconv.c
@@ -57,7 +57,7 @@ int main (int argc, char **argv)
       
       test = strings[1];
 
-      /* gen-casemap-txt.pl uses an empty string when a single character
+      /* gen-casemap-txt.py uses an empty string when a single character
        * doesn't have an equivalent in a particular case; since that behavior
        * is nonsense for multicharacter strings, it would make more sense
        * to put the expected result .. the original character unchanged. But 
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
deleted file mode 100644
index 3a91862b6..000000000
--- a/win32/Makefile-newvs.am
+++ /dev/null
@@ -1,55 +0,0 @@
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
-# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
-# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-
-if MSVC_BASE_NO_TOOLSET_SET
-MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-endif
-
-if MSVC_NO_TOOLSET_SET
-MSVC_TOOLSET = $(MSVC_VER)0
-endif
-
-%.sln:
-	sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt:
-	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
diff --git a/win32/Makefile.am b/win32/Makefile.am
deleted file mode 100644
index b19d5607d..000000000
--- a/win32/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15
-
-EXTRA_DIST = 		\
-	glibpc.py	\
-	pc_base.py	\
-	replace.py	\
-	gen_util_scripts.py
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
deleted file mode 100644
index 2e96e12bc..000000000
--- a/win32/Makefile.msvcproj
+++ /dev/null
@@ -1,153 +0,0 @@
-# Author: Fan, Chun-wei
-# Common Autotools file used to generate Visual Studio 2008+
-# Projects from their templates
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# * Input variables:
-#
-#   MSVCPROJS - List of Projects that should be generated
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   include <this Makefile.msvcproj>
-#   MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
-#   YourProject_FILES = $(libyourlib_1_0_SOURCES)
-#   YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none
-#   (the following 3 lines if headers need to be installed)
-#   YourProject_HEADERS_DIR = $(libyourlibincludedir)
-#   YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
-#   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none>
-#
-#   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process)
-#   	$(top_builddir)/win32/vs9/YourProject.vcproj	\
-#   	$(top_builddir)/win32/vs9/YourProject.headers	# if headers need to be installed
-#
-#   --or, if Visual Studio 2013 or later is required--
-#   dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process)
-#	$(top_builddir)/win32/vs12/YourProject.vcxproj	\
-#	$(top_builddir)/win32/vs12/YourProject.vs12.headers	# if headers need to be installed
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_proj_path=$(subst /,\\,$(_proj_path_raw))
-_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\)
-_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int))
-
-_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
-_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
-_proj_filters=$($(_proj_name)_EXCLUDES)
-
-_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
-_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
-_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
-
-_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
-_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
-
-#
-# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
-# $(1) - Base Name of the MSVC project files (outputs)
-#
-
-define msvcproj-builder
-
-$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
-$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-
-$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-
-
-	for F in $(_proj_files); do \
-		case $$$$F in \
-		$(_proj_filters)) \
-			;; \
-		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
-			;; \
-		esac;	\
-	done
-
-
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	$(RM) $(1).sourcefiles
-	$(RM) $(1).vs10.sourcefiles
-	$(RM) $(1).vs10.sourcefiles.filters
-
-$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
-
-$(top_builddir)/win32/vs9/$(1).headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).headers
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
-
-	for F in $(_proj_headers); do \
-		case $$$$F in \
-		$(_proj_headers_excludes)) \
-			;; \
-		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/$(1).headers && \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
-			;; \
-		esac;	\
-	done
-
-$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj
-
-$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-
-	for F in $(_proj_files); do \
-		case $$$$F in \
-		$(_proj_filters)) \
-			;; \
-		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
-			;; \
-		esac;	\
-	done
-
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	$(RM) $(1).vs12.sourcefiles
-	$(RM) $(1).vs12.sourcefiles.filters
-
-$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers
-
-	for F in $(_proj_headers); do \
-		case $$$$F in \
-		$(_proj_headers_excludes)) \
-			;; \
-		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \
-			;; \
-		esac;	\
-	done
-
-endef
-
-$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
deleted file mode 100644
index 6fd96ccc6..000000000
--- a/win32/detectenv-msvc.mak
+++ /dev/null
@@ -1,78 +0,0 @@
-# Common NMake Makefile module for checking the build environment
-# This can be copied from $(glib_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC, and can be used
-# for building test programs as well.
-
-# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
-# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
-!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
-MSG = ^
-This Makefile is only for Visual Studio 2008 and later.^
-You need to ensure that the Visual Studio Environment is properly set up^
-before running this Makefile.
-!error $(MSG)
-!endif
-
-ERRNUL  = 2>NUL
-_HASH=^#
-
-!if ![echo VCVERSION=_MSC_VER > vercl.x] \
-    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
-    && ![echo PLAT=Win32 >> vercl.x] \
-    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
-    && ![echo PLAT=x64 >> vercl.x] \
-    && ![echo $(_HASH)endif >> vercl.x] \
-    && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
-!include vercl.i
-!if ![echo VCVER= ^\> vercl.vc] \
-    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
-!include vercl.vc
-!endif
-!endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
-!endif
-
-!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
-VSVER = 9
-!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
-VSVER = 10
-!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
-VSVER = 11
-!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
-VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
-VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
-VSVER = 15
-!else
-VSVER = 0
-!endif
-
-!if "$(VSVER)" == "0"
-MSG = ^
-This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
-version is not supported.
-!error $(MSG)
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
-VALID_CFGSET = TRUE
-!endif
-
-# We want debugging symbols logged for all builds,
-# using .pdb files for release builds
-CFLAGS_BASE = /Zi
-
-!if "$(CFG)" == "release" || "$(CFG)" == "Release"
-CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE)
-!else
-CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
-!endif
-
-!if "$(PLAT)" == "x64"
-LDFLAGS_ARCH = /machine:x64
-!else
-LDFLAGS_ARCH = /machine:x86
-!endif
diff --git a/win32/gen_util_scripts.py b/win32/gen_util_scripts.py
deleted file mode 100644
index 2ecba4408..000000000
--- a/win32/gen_util_scripts.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Simple Python script to generate the full .schema.xml files
-
-import os
-import sys
-import argparse
-
-from replace import replace_multi
-
-def main(argv):
-    srcroot = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..')
-    parser = argparse.ArgumentParser(description='Generate Utility Scripts')
-    parser.add_argument('-t', '--type', help='Script Type (glib-mkenums or gdbus-codegen)', required=True)
-    parser.add_argument('--version', help='Package Version', required=True)
-    args = parser.parse_args()
-
-    replace_items = {'@PYTHON@': 'python',
-                     '@GLIB_VERSION@': args.version,
-                     '@VERSION@': args.version}
-
-    if args.type == 'glib-mkenums':
-        replace_multi(srcroot + '/gobject/glib-mkenums.in',
-                      srcroot + '/gobject/glib-mkenums',
-                      replace_items)
-    elif args.type == 'glib-genmarshal':
-        replace_multi(srcroot + '/gobject/glib-genmarshal.in',
-                      srcroot + '/gobject/glib-genmarshal',
-                      replace_items)
-    elif args.type == 'gdbus-codegen':
-        replace_multi(srcroot + '/gio/gdbus-2.0/codegen/gdbus-codegen.in',
-                      srcroot + '/gio/gdbus-2.0/codegen/gdbus-codegen',
-                      replace_items)
-
-    else:
-        raise ValueError('Type must be glib-mkenums, glib-genmarshal or gdbus-codegen')
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/glibpc.py b/win32/glibpc.py
deleted file mode 100644
index b04dc2433..000000000
--- a/win32/glibpc.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/python
-#
-# Utility script to generate .pc files for GLib
-# for Visual Studio builds, to be used for
-# building introspection files
-
-# Author: Fan, Chun-wei
-# Date: March 10, 2016
-
-import os
-import sys
-
-from replace import replace_multi
-from pc_base import BasePCItems
-
-def main(argv):
-    base_pc = BasePCItems()
-
-    base_pc.setup(argv)
-    pkg_replace_items = {'@G_THREAD_CFLAGS@': '',
-                         '@G_THREAD_LIBS@': '',
-                         '@CARBON_LIBS@': '',
-                         '@COCOA_LIBS@': ''}
-
-    glib_replace_items = {'glib-genmarshal': '${exec_prefix}/bin/glib-genmarshal',
-              	          'glib-mkenums': 'perl ${exec_prefix}/bin/glib-mkenums',
-              	          'gobject-query': '${exec_prefix}/bin/gobject-query',
-              	          '@PCRE_REQUIRES@': '',
-              	          '@INTLLIBS@': '-lintl',
-              	          '@G_LIBS_EXTRA@': '',
-              	          '@PCRE_LIBS@': '',
-              	          '@ICONV_LIBS@': '-liconv',
-              	          '@GLIB_EXTRA_CFLAGS@': ''}
-
-    pkg_replace_items.update(base_pc.base_replace_items)
-						 
-    glib_replace_items.update(pkg_replace_items)
-
-    # Generate glib-2.0.pc
-    replace_multi(base_pc.top_srcdir + '/glib-2.0.pc.in',
-                  base_pc.srcdir + '/glib-2.0.pc',
-                  glib_replace_items)
-
-    # Generate gthread-2.0.pc
-    replace_multi(base_pc.top_srcdir + '/gthread-2.0.pc.in',
-                  base_pc.srcdir + '/gthread-2.0.pc',
-                  pkg_replace_items)
-
-    # Generate gmodule*-2.0.pc
-    gmodule_replace_items = {'@G_MODULE_SUPPORTED@': 'yes',
-              	             '@G_MODULE_LDFLAGS@': '',
-              	             '@G_MODULE_LIBS@': ''}
-    gmodule_replace_items.update(pkg_replace_items)
-    replace_multi(base_pc.top_srcdir + '/gmodule-2.0.pc.in',
-                  base_pc.srcdir + '/gmodule-2.0.pc',
-                  gmodule_replace_items)
-    replace_multi(base_pc.top_srcdir + '/gmodule-export-2.0.pc.in',
-                  base_pc.srcdir + '/gmodule-export-2.0.pc',
-                  gmodule_replace_items)
-    replace_multi(base_pc.top_srcdir + '/gmodule-no-export-2.0.pc.in',
-                  base_pc.srcdir + '/gmodule-no-export-2.0.pc',
-                  gmodule_replace_items)
-
-    # Generate gobject-2.0.pc
-    gobject_replace_items = {'@LIBFFI_LIBS@': ''}
-    gobject_replace_items.update(pkg_replace_items)
-    replace_multi(base_pc.top_srcdir + '/gobject-2.0.pc.in',
-                  base_pc.srcdir + '/gobject-2.0.pc',
-                  gobject_replace_items)
-
-    # Generate gio*-2.0.pc
-    gio_replace_items = {'@GIO_MODULE_DIR@': '${exec_prefix}/bin/gio/modules',
-                         '@ZLIB_LIBS@': '-lzlib1',
-                         '@NETWORK_LIBS@': '-lws2_32',
-                         '@SELINUX_LIBS@': '',
-                         '@LIBMOUNT_LIBS@': '',
-                         'glib-compile-schemas': '${exec_prefix}/bin/glib-compile-schemas',
-                         'glib-compile-resources': '${exec_prefix}/bin/glib-compile-resources',
-                         'gdbus-codegen': 'python ${exec_prefix}/bin/gdbus-codegen'}
-    gio_replace_items.update(pkg_replace_items)
-    replace_multi(base_pc.top_srcdir + '/gio-2.0.pc.in',
-                  base_pc.srcdir + '/gio-2.0.pc',
-                  gio_replace_items)
-    replace_multi(base_pc.top_srcdir + '/gio-windows-2.0.pc.in',
-                  base_pc.srcdir + '/gio-windows-2.0.pc',
-                  pkg_replace_items)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/pc_base.py b/win32/pc_base.py
deleted file mode 100644
index f7976e8d2..000000000
--- a/win32/pc_base.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to generate the basic info
-# needed in a .pc (pkg-config) file, used especially
-# for introspection purposes
-
-# This can be used in various projects where
-# there is the need to generate .pc files,
-# and is copied from GLib's $(srcroot)/win32
-
-# Author: Fan, Chun-wei
-# Date: March 10, 2016
-
-import os
-import sys
-import argparse
-
-class BasePCItems:
-    def __init__(self):
-        self.base_replace_items = {}
-        self.exec_prefix = ''
-        self.includedir = ''
-        self.libdir = ''
-        self.prefix = ''
-        self.srcdir = os.path.dirname(__file__)
-        self.top_srcdir = self.srcdir + '\\..'
-        self.version = ''
-
-    def setup(self, argv, parser=None):
-        if parser is None:
-            parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-        parser.add_argument('--prefix', help='prefix of the installed library',
-                            required=True)
-        parser.add_argument('--exec-prefix',
-                            help='prefix of the installed programs, \
-                                  if different from the prefix')
-        parser.add_argument('--includedir',
-                            help='includedir of the installed library, \
-                                  if different from ${prefix}/include')
-        parser.add_argument('--libdir',
-                            help='libdir of the installed library, \
-                                  if different from ${prefix}/lib')
-        parser.add_argument('--version', help='Version of the package',
-                            required=True)
-        args = parser.parse_args()
-
-        self.version = args.version
-
-        # check whether the prefix and exec_prefix are valid
-        if not os.path.exists(args.prefix):
-            raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
-
-        # use absolute paths for prefix
-        self.prefix = os.path.abspath(args.prefix).replace('\\','/')
-
-        # check and setup the exec_prefix
-        if getattr(args, 'exec_prefix', None) is None:
-            exec_prefix_use_shorthand = True
-            self.exec_prefix = '${prefix}'
-        else:
-            if args.exec_prefix.startswith('${prefix}'):
-                exec_prefix_use_shorthand = True
-                input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):]
-            else:
-                exec_prefix_use_shorthand = False
-                input_exec_prefix = args.exec_prefix
-            if not os.path.exists(input_exec_prefix):
-                raise SystemExit('Specified exec_prefix \'%s\' is invalid' %
-                                  args.exec_prefix)
-            if exec_prefix_use_shorthand is True:
-                self.exec_prefix = args.exec_prefix.replace('\\','/')
-            else:
-                self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
-
-        # check and setup the includedir
-        if getattr(args, 'includedir', None) is None:
-            self.includedir = '${prefix}/include'
-        else:
-            if args.includedir.startswith('${prefix}'):
-                includedir_use_shorthand = True
-                input_includedir = args.prefix + args.includedir[len('${prefix}'):]
-            else:
-                if args.includedir.startswith('${exec_prefix}'):
-                    includedir_use_shorthand = True
-                    input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):]
-                else:
-                    includedir_use_shorthand = False
-                    input_includedir = args.includedir
-            if not os.path.exists(input_includedir):
-                raise SystemExit('Specified includedir \'%s\' is invalid' %
-                                  args.includedir)
-            if includedir_use_shorthand is True:
-                self.includedir = args.includedir.replace('\\','/')
-            else:
-                self.includedir = os.path.abspath(input_includedir).replace('\\','/')
-
-        # check and setup the libdir
-        if getattr(args, 'libdir', None) is None:
-            self.libdir = '${prefix}/lib'
-        else:
-            if args.libdir.startswith('${prefix}'):
-                libdir_use_shorthand = True
-                input_libdir = args.prefix + args.libdir[len('${prefix}'):]
-            else:
-                if args.libdir.startswith('${exec_prefix}'):
-                    libdir_use_shorthand = True
-                    input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):]
-                else:
-                    libdir_use_shorthand = False
-                    input_libdir = args.libdir
-            if not os.path.exists(input_libdir):
-                raise SystemExit('Specified libdir \'%s\' is invalid' %
-			                      args.libdir)
-            if libdir_use_shorthand is True:
-                self.libdir = args.libdir.replace('\\','/')
-            else:
-                self.libdir = os.path.abspath(input_libdir).replace('\\','/')
-
-        # setup dictionary for replacing items in *.pc.in
-        self.base_replace_items.update({'@VERSION@': self.version})
-        self.base_replace_items.update({'@prefix@': self.prefix})
-        self.base_replace_items.update({'@exec_prefix@': self.exec_prefix})
-        self.base_replace_items.update({'@libdir@': self.libdir})
-        self.base_replace_items.update({'@includedir@': self.includedir})
diff --git a/win32/replace.py b/win32/replace.py
deleted file mode 100644
index 3aeceb1f7..000000000
--- a/win32/replace.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to manipulate
-# certain types of strings in a file
-
-# This can be used in various projects where
-# there is the need to replace strings in files,
-# and is copied from GLib's $(srcroot)/win32
-
-# Author: Fan, Chun-wei
-# Date: September 03, 2014
-
-import os
-import sys
-import re
-import string
-import argparse
-
-valid_actions = ['remove-prefix',
-                 'replace-var',
-                 'replace-str',
-                 'remove-str']
-
-def open_file(filename, mode):
-    if sys.version_info[0] < 3:
-        return open(filename, mode=mode)
-    else:
-        return open(filename, mode=mode, encoding='utf-8')
-
-def replace_multi(src, dest, replace_items):
-    with open_file(src, 'r') as s:
-        with open_file(dest, 'w') as d:
-            for line in s:
-                replace_dict = dict((re.escape(key), value) \
-                               for key, value in replace_items.items())
-                replace_pattern = re.compile("|".join(replace_dict.keys()))
-                d.write(replace_pattern.sub(lambda m: \
-                        replace_dict[re.escape(m.group(0))], line))
-
-def replace(src, dest, instring, outstring):
-    replace_item = {instring: outstring}
-    replace_multi(src, dest, replace_item)
-
-def check_required_args(args, params):
-    for param in params:
-        if getattr(args, param, None) is None:
-            raise SystemExit('%s: error: --%s argument is required' % (__file__, param))
-
-def warn_ignored_args(args, params):
-    for param in params:
-        if getattr(args, param, None) is not None:
-            print('%s: warning: --%s argument is ignored' % (__file__, param))
-
-def main(argv):
-
-    parser = argparse.ArgumentParser(description='Process strings in a file.')
-    parser.add_argument('-a',
-                        '--action',
-                        help='Action to carry out.  Can be one of:\n'
-                             'remove-prefix\n'
-                             'replace-var\n'
-                             'replace-str\n'
-                             'remove-str',
-                        choices=valid_actions)
-    parser.add_argument('-i', '--input', help='Input file')
-    parser.add_argument('-o', '--output', help='Output file')
-    parser.add_argument('--instring', help='String to replace or remove')
-    parser.add_argument('--var', help='Autotools variable name to replace')
-    parser.add_argument('--outstring',
-                        help='New String to replace specified string or variable')
-    parser.add_argument('--removeprefix', help='Prefix of string to remove')
-
-    args = parser.parse_args()
-
-    input_string = ''
-    output_string = ''
-
-    # We must have action, input, output for all operations
-    check_required_args(args, ['action','input','output'])
-
-    # Build the arguments by the operation that is to be done,
-    # to be fed into replace()
-
-    # Get rid of prefixes from a string
-    if args.action == 'remove-prefix':
-        check_required_args(args, ['instring','removeprefix'])
-        warn_ignored_args(args, ['outstring','var'])
-        input_string = args.removeprefix + args.instring
-        output_string = args.instring
-
-    # Replace an m4-style variable (those surrounded by @...@)
-    if args.action == 'replace-var':
-        check_required_args(args, ['var','outstring'])
-        warn_ignored_args(args, ['instring','removeprefix'])
-        input_string = '@' + args.var + '@'
-        output_string = args.outstring
-
-    # Replace a string
-    if args.action == 'replace-str':
-        check_required_args(args, ['instring','outstring'])
-        warn_ignored_args(args, ['var','removeprefix'])
-        input_string = args.instring
-        output_string = args.outstring
-
-    # Remove a string
-    if args.action == 'remove-str':
-        check_required_args(args, ['instring'])
-        warn_ignored_args(args, ['var','outstring','removeprefix'])
-        input_string = args.instring
-        output_string = ''
-
-    replace(args.input, args.output, input_string, output_string)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/setup.py b/win32/setup.py
deleted file mode 100644
index 74e4a1312..000000000
--- a/win32/setup.py
+++ /dev/null
@@ -1,347 +0,0 @@
-#!/usr/bin/python
-# vim: encoding=utf-8
-#expand *.in files
-#this script is only intended for building from git, not for building from the released tarball, which already includes all necessary files
-import os
-import sys
-import re
-import string
-import subprocess
-import optparse
-
-def get_version(srcroot):
-    ver = {}
-    RE_VERSION = re.compile(r'^m4_define\(\[(glib_\w+)\],\s*\[(\d+)\]\)')
-    with open(os.path.join(srcroot, 'configure.ac'), 'r') as ac:
-        for i in ac:
-            mo = RE_VERSION.search(i)
-            if mo:
-                ver[mo.group(1).upper()] = int(mo.group(2))
-    ver['GLIB_BINARY_AGE'] = 100 * ver['GLIB_MINOR_VERSION'] + ver['GLIB_MICRO_VERSION']
-    ver['GLIB_VERSION'] = '%d.%d.%d' % (ver['GLIB_MAJOR_VERSION'],
-                                        ver['GLIB_MINOR_VERSION'],
-                                        ver['GLIB_MICRO_VERSION'])
-    ver['LT_RELEASE'] = '%d.%d' % (ver['GLIB_MAJOR_VERSION'], ver['GLIB_MINOR_VERSION'])
-    ver['LT_CURRENT'] = 100 * ver['GLIB_MINOR_VERSION'] + ver['GLIB_MICRO_VERSION'] - ver['GLIB_INTERFACE_AGE']
-    ver['LT_REVISION'] = ver['GLIB_INTERFACE_AGE']
-    ver['LT_AGE'] = ver['GLIB_BINARY_AGE'] - ver['GLIB_INTERFACE_AGE']
-    ver['LT_CURRENT_MINUS_AGE'] = ver['LT_CURRENT'] - ver['LT_AGE']
-    return ver
-
-def process_in(src, dest, vars):
-    RE_VARS = re.compile(r'@(\w+?)@')
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
-            for i in s:
-                i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i)
-                d.write(i)
-
-def get_srcroot():
-    if not os.path.isabs(__file__):
-        path = os.path.abspath(__file__)
-    else:
-        path = __file__
-    dirname = os.path.dirname(path)
-    return os.path.abspath(os.path.join(dirname, '..'))
-
-def process_include(src, dest, includes):
-    RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"')
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
-            for i in s:
-                mo = RE_INCLUDE.search(i)
-                if mo:
-                    target = ''
-                    for j in includes:
-                        #print "searching in ", j
-                        if mo.group(1) in os.listdir(j):
-                            target = os.path.join(j, mo.group(1))
-                            break
-                    if not target:
-                        raise Exception("Couldn't fine include file %s" % mo.group(1))
-                    else:
-                        with open(target, 'r') as t:
-                            for inc in t.readlines():
-                                d.write(inc)
-                else:
-                    d.write(i)
-
-def generate_libgio_sourcefiles(srcroot, dest, stype):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'gio', 'Makefile.am'),
-                             vars = {'top_srcdir': srcroot},
-                             conds = {'OS_WIN32': True},
-                             filters = ['libgio_2_0_la_SOURCES', 'win32_more_sources_for_vcproj'])
-
-    files = vars['libgio_2_0_la_SOURCES'].split() + \
-            vars['win32_more_sources_for_vcproj'].split()
-
-    sources = [i for i in files \
-                    if i != 'gdesktopappinfo.c' and \
-                       not (i.startswith('gunix') and i.endswith('.c')) \
-                       and i.endswith('.c') ]
-    if stype == '9':
-       with open(dest, 'w') as d:
-           for i in sources:
-               d.write('\t\t\t<File RelativePath="..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n')
-    elif stype == '10':
-       with open(dest, 'w') as d:
-           for i in sources:
-               d.write('\t\t\t<ClCompile Include="..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n')
-    elif stype == '10f':
-       with open(dest, 'w') as d:
-           for i in sources:
-               d.write('\t\t\t<ClCompile Include="..\\..\\gio\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
-    else:
-       raise Exception("Must specify project type (9, 10 or 10f)")
-
-def generate_libgio_enumtypes(srcroot, perl):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'gio', 'Makefile.am'),
-                             vars = {'top_srcdir': srcroot},
-                             conds = {'OS_WIN32': True},
-                             filters = ['gio_headers'])
-    cwd = os.getcwd()
-    os.chdir(os.path.join(srcroot, 'gio'))
-    for suffix in ['.c', '.h']:
-        cmd = [perl, os.path.join(srcroot, 'gobject', 'glib-mkenums'),
-               '--template', 'gioenumtypes' + suffix + '.template'] + vars['gio_headers'].split()
-        with open('gioenumtypes' + suffix, 'w') as d:
-            subprocess.Popen(cmd, stdout = d).communicate()
-    os.chdir(cwd)
-def generate_libglib_sourcefiles(srcroot, dest, stype):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'glib', 'Makefile.am'),
-                             vars = {'top_srcdir': srcroot},
-                             conds = {'OS_WIN32': True,
-                                      'ENABLE_REGEX': True},
-                             filters = ['libglib_2_0_la_SOURCES'])
-
-    files = vars['libglib_2_0_la_SOURCES'].split()
-
-    sources = [i for i in files \
-                    if not (i.endswith('-gcc.c') or i.endswith('-unix.c')) \
-                       and i.endswith('.c') ]
-    if stype == '9':
-        with open(dest, 'w') as d:
-            for i in sources:
-                d.write('\t\t\t<File RelativePath="..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n')
-    elif stype == '10':
-        with open(dest, 'w') as d:
-            for i in sources:
-                d.write('\t\t\t<ClCompile Include="..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n')
-    elif stype == '10f':
-        with open(dest, 'w') as d:
-            for i in sources:
-                d.write('\t\t\t<ClCompile Include="..\\..\\glib\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
-    else:
-        raise Exception("Must specify project type (9, 10 or 10f)")
-
-def generate_libgobject_sourcefiles(srcroot, dest, stype):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'gobject', 'Makefile.am'),
-                             vars = {'top_srcdir': srcroot},
-                             conds = {'OS_WIN32': True},
-                             filters = ['libgobject_2_0_la_SOURCES'])
-
-    files = vars['libgobject_2_0_la_SOURCES'].split()
-
-    sources = [i for i in files if i.endswith('.c') ]
-    if stype == '9':
-        with open(dest, 'w') as d:
-            for i in sources:
-                d.write('\t\t\t<File RelativePath="..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n')
-    elif stype == '10':
-        with open(dest, 'w') as d:
-            for i in sources:
-                d.write('\t\t\t<ClCompile Include="..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n')
-    elif stype == '10f':
-        with open(dest, 'w') as d:
-            for i in sources:
-                d.write('\t\t\t<ClCompile Include="..\\..\\gobject\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
-    else:
-        raise Exception("Must specify project type (9, 10 or 10f)")
-
-def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
-    '''
-    path: path to the Makefile.am
-    vars: predefined variables
-    conds: condition variables for Makefile
-    filters: if None, all variables defined are returned,
-             otherwise, it is a list contains that variables should be returned
-    '''
-    cur_vars = vars.copy()
-    RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
-    RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
-    RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
-    RE_AM_CONTINUING = re.compile(r'\\\s*$')
-    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
-    RE_AM_ELSE = re.compile(r'^\s*else')
-    RE_AM_ENDIF = re.compile(r'^\s*endif')
-    def am_eval(cont):
-        return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
-    with open(path, 'r') as f:
-        contents = f.readlines()
-    #combine continuing lines
-    i = 0
-    ncont = []
-    while i < len(contents):
-        line = contents[i]
-        if RE_AM_CONTINUING.search(line):
-            line = RE_AM_CONTINUING.sub('', line)
-            j = i + 1
-            while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
-                line += RE_AM_CONTINUING.sub('', contents[j])
-                j += 1
-            else:
-                if j < len(contents):
-                    line += contents[j]
-            i = j
-        else:
-            i += 1
-        ncont.append(line)
-
-    #include, var define, var evaluation
-    i = -1
-    skip = False
-    oldskip = []
-    while i < len(ncont) - 1:
-        i += 1
-        line = ncont[i]
-        mo = RE_AM_IF.search(line)
-        if mo:
-            oldskip.append(skip)
-            skip = False if mo.group(1) in conds and conds[mo.group(1)] \
-                         else True
-            continue
-        mo = RE_AM_ELSE.search(line)
-        if mo:
-            skip = not skip
-            continue
-        mo = RE_AM_ENDIF.search(line)
-        if mo:
-            skip = oldskip.pop()
-            continue
-        if not skip:
-            mo = RE_AM_INCLUDE.search(line)
-            if mo:
-                cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
-                continue
-            mo = RE_AM_VAR.search(line)
-            if mo:
-                cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
-                continue
-
-    #filter:
-    if filters != None:
-        ret = {}
-        for i in filters:
-            ret[i] = cur_vars.get(i, '')
-        return ret
-    else:
-        return cur_vars
-
-def main(argv):
-    parser = optparse.OptionParser()
-    parser.add_option('-p', '--perl', dest='perl', metavar='PATH', default='C:\\Perl\\bin\\perl.exe', action='store', help='path to the perl interpretor (default: C:\\Perl\\bin\\perl.exe)')
-    opt, args = parser.parse_args(argv)
-    srcroot = get_srcroot()
-    #print 'srcroot', srcroot
-    ver = get_version(srcroot)
-    #print 'ver', ver
-    config_vars = ver.copy()
-    config_vars['GETTEXT_PACKAGE'] = 'Glib'
-    process_in(os.path.join(srcroot, 'config.h.win32.in'),
-               os.path.join(srcroot, 'config.h'),
-               config_vars)
-    glibconfig_vars = ver.copy()
-    glibconfig_vars['GLIB_WIN32_STATIC_COMPILATION_DEFINE'] = ''
-    process_in(os.path.join(srcroot, 'glib', 'glibconfig.h.win32.in'),
-               os.path.join(srcroot, 'glib', 'glibconfig.h'),
-               glibconfig_vars)
-
-    for submodule in ['glib', 'gobject', 'gthread', 'gmodule', 'gio']:
-        process_in(os.path.join(srcroot, submodule, submodule + '.rc.in'),
-                   os.path.join(srcroot, submodule, submodule + '.rc'),
-                   ver)
-
-    #------------ submodule gobject -------------------
-    generate_libglib_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libglib.sourcefiles'), '9')
-    generate_libglib_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'), '10')
-    generate_libglib_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters'), '10f')
-    process_include(os.path.join(srcroot, 'win32', 'vs9', 'glib.vcprojin'),
-                    os.path.join(srcroot, 'win32', 'vs9', 'glib.vcproj'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxprojin'),
-                    os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filtersin'),
-                    os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filters'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    os.unlink(os.path.join(srcroot, 'win32', 'libglib.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters'))
-    with open(os.path.join(srcroot, 'glib', 'gspawn-win32-helper-console.c'), 'w') as c:
-        c.write('#define HELPER_CONSOLE\n')
-        c.write('#include "gspawn-win32-helper.c"\n')
-    with open(os.path.join(srcroot, 'glib', 'gspawn-win64-helper-console.c'), 'w') as c:
-        c.write('#define HELPER_CONSOLE\n')
-        c.write('#include "gspawn-win32-helper.c"\n')
-    with open(os.path.join(srcroot, 'glib', 'gspawn-win64-helper.c'), 'w') as c:
-        c.write('#include "gspawn-win32-helper.c"\n')
-    #------------ end of submodule glib -------------------
-
-    #------------ submodule gobject -------------------
-    mkenums_vars = ver.copy()
-    process_in(os.path.join(srcroot, 'gobject', 'glib-mkenums.in'),
-               os.path.join(srcroot, 'gobject', 'glib-mkenums'),
-               mkenums_vars)
-
-    generate_libgobject_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9')
-    generate_libgobject_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'), '10')
-    generate_libgobject_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters'), '10f')
-    process_include(os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcprojin'),
-                    os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcproj'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxprojin'),
-                    os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filtersin'),
-                    os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filters'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    os.unlink(os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters'))
-    #------------ end of submodule gobject -------------------
-
-    #------------ submodule gio -------------------
-    #depends on glib-mkenums
-    generate_libgio_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libgio.sourcefiles'), '9')
-    generate_libgio_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'), '10')
-    generate_libgio_sourcefiles(srcroot,
-                                os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters'), '10f')
-    process_include(os.path.join(srcroot, 'win32', 'vs9', 'gio.vcprojin'),
-                    os.path.join(srcroot, 'win32', 'vs9', 'gio.vcproj'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxprojin'),
-                    os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filtersin'),
-                    os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filters'),
-                    includes = [os.path.join(srcroot, 'win32')])
-    os.unlink(os.path.join(srcroot, 'win32', 'libgio.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters'))
-    generate_libgio_enumtypes(srcroot, opt.perl)
-    #------------ end of submodule gio -------------------
-
-    #------------ submodule gmodule -------------------
-    #------------ end of submodule gmodule -------------------
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/vs10/.gitignore b/win32/vs10/.gitignore
deleted file mode 100644
index 0bdbb5048..000000000
--- a/win32/vs10/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-gio.vcxproj
-gio.vcxproj.filters
-glib.vcxproj
-glib.vcxproj.filters
-gobject.vcxproj
-gobject.vcxproj.filters
-glib-compile-resources.vcxproj
-glib-compile-resources.vcxproj.filters
-glib-compile-schemas.vcxproj
-glib-compile-schemas.vcxproj.filters
-glib-version-paths.props
-glib-install.props
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
deleted file mode 100644
index cddbb444e..000000000
--- a/win32/vs10/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-GENERATED_ITEMS = \
-	glib.vcxproj	\
-	glib.vcxproj.filters	\
-	gobject.vcxproj	\
-	gobject.vcxproj.filters	\
-	gio.vcxproj	\
-	gio.vcxproj.filters	\
-	glib-compile-schemas.vcxproj	\
-	glib-compile-schemas.vcxproj.filters	\
-	glib-compile-resources.vcxproj	\
-	glib-compile-resources.vcxproj.filters	\
-	gio-tool.vcxproj	\
-	gio-tool.vcxproj.filters	\
-	glib-version-paths.props	\
-	glib-install.props
-
-MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
-
-EXTRA_DIST = \
-	README.txt			\
-	glib.sln			\
-	glib.vcxprojin			\
-	glib.vcxproj.filtersin		\
-	gspawn-win32-helper-console.vcxproj	\
-	gspawn-win32-helper-console.vcxproj.filters	\
-	gspawn-win32-helper.vcxproj		\
-	gspawn-win32-helper.vcxproj.filters	\
-	gmodule.vcxproj			\
-	gmodule.vcxproj.filters		\
-	gobject.vcxprojin		\
-	gobject.vcxproj.filtersin	\
-	gthread.vcxproj			\
-	gthread.vcxproj.filters		\
-	gio.vcxprojin			\
-	gio.vcxproj.filtersin		\
-	glib-compile-schemas.vcxprojin		\
-	glib-compile-schemas.vcxproj.filtersin		\
-	gsettings.vcxproj		\
-	gsettings.vcxproj.filters		\
-	glib-compile-resources.vcxprojin		\
-	glib-compile-resources.vcxproj.filtersin	\
-	gio-tool.vcxprojin	\
-	gio-tool.vcxproj.filtersin	\
-	gresource.vcxproj		\
-	gresource.vcxproj.filters		\
-	gio-querymodules.vcxproj		\
-	gio-querymodules.vcxproj.filters		\
-	gdbus.vcxproj			\
-	gdbus.vcxproj.filters		\
-	glib-install.vcxproj		\
-	glib-install.vcxproj.filters	\
-	glib-build-defines.props	\
-	glib-install.propsin		\
-	glib-version-paths.props.in	\
-	glib-gen-srcs.props		\
-	$(GENERATED_ITEMS)
-
-glib-install.props: $(top_srcdir)/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
-	-$(RM) $(top_builddir)/win32/vs11/glib-install.props
-	-$(RM) $(top_builddir)/win32/vs12/glib-install.props
-	-$(RM) $(top_builddir)/win32/vs14/glib-install.props
-	-$(RM) $(top_builddir)/win32/vs15/glib-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/glib-install.propsin >$@
-	rm $(MSVC10_HEADERS_LIST)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt
deleted file mode 100644
index e73fcc931..000000000
--- a/win32/vs10/README.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-Please do not compile this package (GLib) in paths that contain

-spaces in them-as strange problems may occur during compilation or during

-the use of the library.

-

-Please refer to the following GNOME Live! page for more detailed

-instructions on building GLib and its dependencies with Visual C++:

-

-https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack

-

-This VS10 solution and the projects it includes are intented to be used

-in a GLib source tree unpacked from a tarball. In a git checkout you

-first need to use some Unix-like environment or run build/win32/setup.py, 

-which will do the work for you:

-

-$python build/win32/setup.py --perl path_to_your_perl.exe

-

-for more usage on this script, run

-$python build/win32/setup.py -h/--help

-

-The required dependencies are zlib, proxy-libintl and LibFFI. Fetch the latest

-proxy-libintl-dev and zlib-dev zipfiles from

-http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ for 32-bit

-builds, and correspondingly

-http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ for 64-bit

-builds.

-

-A Python 2.7.x or 3.x interpreter is also required, in order to generate

-the utility scripts, as well as the pkg-config files for the build.  Please

-see the entry "PythonDir" in glib-version-paths.props to verify that

-it is correct.

-

-One may wish to build his/her own ZLib-It is recommended that ZLib is

-built using the win32/Makefile.msc makefile with VS10 with the ASM routines

-to avoid linking problems-see win32/Makefile.msc in ZLib for more details.

-

-For LibFFI, please use the Centricular fork of it, which can be found at

-https://github.com/centricular/libffi.  Please refer to the instructions

-there on building, as it involves using the Meson build system and possibly

-the Ninja build tool if the Visual Studio project generation is not used

-or is unavailable.

-

-Please note, although using one's own existing PCRE installation to build GLib

-is possible, it is still recommended to build PCRE during the process of building

-GLib (i.e. using the Debug or Release configurations), as GLib's bundled PCRE

-has been patched to work optimally with GLib.  If building against an existing

-PCRE is desired, use the(BuildType)_ExtPCRE configurations, but one needs to ensure

-that the existing PCRE is:

--Built with VS10

--Unicode support is built in (please see the CMake options for this)

--It is built with the Multithreaded DLL (/MD, for release builds) or the

- Multithreaded DLL Debug (/MDd, for debug builds)

-

-If using static builds of PCRE, please add PCRE_STATIC to the "Preprocessor

-Definitions" of the glib project settings.

-

-Please be aware that the GLib's regex test program will only pass with PCRE directly

-built into GLib.

-

-Set up the source tree as follows under some arbitrary top

-folder <root>:

-

-<root>\<this-glib-source-tree>

-<root>\vs10\<PlatformName>

-

-*this* file you are now reading is thus located at

-<root>\<this-glib-source-tree>\build\win32\vs10\README.

-

-<PlatformName> is either Win32 or x64, as in VS10 project files.

-

-You should unpack the proxy-libintl-dev zip file into

-<root>\vs10\<PlatformName>, so that for instance libintl.h end up at

-<root>\vs10\<PlatformName>\include\libintl.h.

-

-For LibFFI, one should also put the generated ffi.h and ffitarget.h

-into <root>\vs10\<PlatformName>\include\ and the compiled static libffi.lib

-(or copy libffi-convenience.lib into libffi.lib) into 

-<root>\vs10\<PlatformName>\lib\.

-

-The "install" project will copy build results and headers into their

-appropriate location under <root>\vs10\<PlatformName>. For instance,

-built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into

-<root>\vs10\<PlatformName>\lib and GLib headers into

-<root>\vs10\<PlatformName>\include\glib-2.0. This is then from where

-project files higher in the stack are supposed to look for them, not

-from a specific GLib source tree.

-

-Note: If you see C4819 errors and you are compiling GLib on a DBCS

-(Chinese/Korean/Japanese) version of Windows, you may need to switch

-to an English locale in Control Panel->Region and Languages->System->

-Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf,

-ATK and GTK+ is built correctly.  This is due to a bug in Visual C++ running

-on DBCS locales, and also affects many other opensource projects which are

-built with Visual C++, including but not limited to QT and the Mozilla apps.

-

---Tor Lillqvist <tml@iki.fi>

---Updated by Chun-wei Fan <fanc999@gmail.com>

diff --git a/win32/vs10/gdbus.vcxproj b/win32/vs10/gdbus.vcxproj
deleted file mode 100644
index 6ffc4eacf..000000000
--- a/win32/vs10/gdbus.vcxproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95A1571F-61BE-4C51-BE53-2F2DAB280687}</ProjectGuid>
-    <RootNamespace>gresource</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gdbus-tool.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gdbus.vcxproj.filters b/win32/vs10/gdbus.vcxproj.filters
deleted file mode 100644
index 1921c4967..000000000
--- a/win32/vs10/gdbus.vcxproj.filters
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gdbus-tool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gio-querymodules.vcxproj b/win32/vs10/gio-querymodules.vcxproj
deleted file mode 100644
index 2a6551fd6..000000000
--- a/win32/vs10/gio-querymodules.vcxproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95A1571F-61BE-4C51-BE53-2F2DAB280686}</ProjectGuid>
-    <RootNamespace>gresource</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gio-querymodules.c" />
-    <ClCompile Include="..\..\gio\giomodule-priv.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gmodule.vcxproj">
-      <Project>{4214047c-f5c1-40b3-8369-5dced8c32770}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gio-querymodules.vcxproj.filters b/win32/vs10/gio-querymodules.vcxproj.filters
deleted file mode 100644
index 7119db1b2..000000000
--- a/win32/vs10/gio-querymodules.vcxproj.filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gio-querymodules.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gio\giomodule-priv.c" >
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gio-tool.vcxproj.filtersin b/win32/vs10/gio-tool.vcxproj.filtersin
deleted file mode 100644
index 42b9cdb75..000000000
--- a/win32/vs10/gio-tool.vcxproj.filtersin
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gio-tool.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gio-tool.vcxprojin b/win32/vs10/gio-tool.vcxprojin
deleted file mode 100644
index 9a7905deb..000000000
--- a/win32/vs10/gio-tool.vcxprojin
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}</ProjectGuid>
-    <RootNamespace>glibtool</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gio.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <ProgramDatabaseFile>$(OutDir)gio.pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gio.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ProgramDatabaseFile>$(OutDir)gio.pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gio.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ProgramDatabaseFile>$(OutDir)gio.pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gio.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ProgramDatabaseFile>$(OutDir)gio.pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gio-tool.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gio.vcxproj.filtersin b/win32/vs10/gio.vcxproj.filtersin
deleted file mode 100644
index 72a62016f..000000000
--- a/win32/vs10/gio.vcxproj.filtersin
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gio.vs10.sourcefiles.filters"
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gio\gio.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gio.vcxprojin b/win32/vs10/gio.vcxprojin
deleted file mode 100644
index ae7d5f839..000000000
--- a/win32/vs10/gio.vcxprojin
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F3D1583C-5613-4809-BD98-7CC1C1276F92}</ProjectGuid>
-    <RootNamespace>gio</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gio.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gio\gnetworking.h.win32">
-      <Message>Copying gnetworking.h from gnetworking.h.win32...</Message>
-      <Command>$(GenGNetworkingH)</Command>
-      <Outputs>..\..\gio\gnetworking.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gio\gio.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gmodule.vcxproj">
-      <Project>{4214047c-f5c1-40b3-8369-5dced8c32770}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/glib-build-defines.props b/win32/vs10/glib-build-defines.props
deleted file mode 100644
index 86314a8c3..000000000
--- a/win32/vs10/glib-build-defines.props
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="glib-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GLibBundledPCREDefines>PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN="GLib-GRegex"</GLibBundledPCREDefines>
-    <GlibBundledPCREExportDefines>PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN=</GlibBundledPCREExportDefines>
-    <GLibBundledPCREUndefs>-UBSR_ANYCRLF -UEBCDIC</GLibBundledPCREUndefs>
-    <LocalCharsetDefs>LIBDIR="blah"</LocalCharsetDefs>
-    <DllExportDefines>DLL_EXPORT</DllExportDefines>
-    <UseSystemPCREDefines>USE_SYSTEM_PCRE</UseSystemPCREDefines>
-    <GLibInBuildMacro>GLIB_COMPILATION</GLibInBuildMacro>
-    <GioInBuildMacro>GIO_COMPILATION</GioInBuildMacro>
-    <GLibBuildDefines>$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib"</GLibBuildDefines>
-    <GThreadBuildDefines>G_LOG_DOMAIN="GThread"</GThreadBuildDefines>
-    <GModuleBuildDefines>G_LOG_DOMAIN="GModule"</GModuleBuildDefines>
-    <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject"</GObjectBuildDefines>
-    <GioBuildDefines>$(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines)</GioBuildDefines>
-    <WindowsNetworkingLibs>ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib</WindowsNetworkingLibs>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>glibbuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GLibBundledPCREDefines">
-      <Value>$(GLibBundledPCREDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibBundledPCREExportDefines">
-      <Value>$(GlibBundledPCREExportDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GLibBundledPCREUndefs">
-      <Value>$(GLibBundledPCREUndefs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LocalCharsetDefs">
-      <Value>$(LocalCharsetDefs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="DllExportDefines">
-      <Value>$(DllExportDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="UseSystemPCREDefines">
-      <Value>$(UseSystemPCREDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GLibInBuildMacro">
-      <Value>$(GLibInBuildMacro)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GioInBuildMacro">
-      <Value>$(GioInBuildMacro)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GLibBuildDefines">
-      <Value>$(GLibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GThreadBuildDefines">
-      <Value>$(GThreadBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GModuleBuildDefines">
-      <Value>$(GModuleBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GObjectBuildDefines">
-      <Value>$(GObjectBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GioBuildDefines">
-      <Value>$(GioBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="WindowsNetworkingLibs">
-      <Value>$(WindowsNetworkingLibs)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib-compile-resources.vcxproj.filtersin b/win32/vs10/glib-compile-resources.vcxproj.filtersin
deleted file mode 100644
index 68e8a5d52..000000000
--- a/win32/vs10/glib-compile-resources.vcxproj.filtersin
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "glib-compile-resources.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib-compile-resources.vcxprojin b/win32/vs10/glib-compile-resources.vcxprojin
deleted file mode 100644
index 31a6be13f..000000000
--- a/win32/vs10/glib-compile-resources.vcxprojin
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}</ProjectGuid>
-    <RootNamespace>glibcompileresources</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "glib-compile-resources.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/glib-compile-schemas.vcxproj.filtersin b/win32/vs10/glib-compile-schemas.vcxproj.filtersin
deleted file mode 100644
index 645779daa..000000000
--- a/win32/vs10/glib-compile-schemas.vcxproj.filtersin
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "glib-compile-schemas.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib-compile-schemas.vcxprojin b/win32/vs10/glib-compile-schemas.vcxprojin
deleted file mode 100644
index 239e662f4..000000000
--- a/win32/vs10/glib-compile-schemas.vcxprojin
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{015D69D0-8B42-438A-ADAE-052AC036E065}</ProjectGuid>
-    <RootNamespace>glibcompileschemas</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "glib-compile-schemas.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/glib-gen-srcs.props b/win32/vs10/glib-gen-srcs.props
deleted file mode 100644
index ff15ea0b3..000000000
--- a/win32/vs10/glib-gen-srcs.props
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\config.h.win32 ..\..\config.h</GenConfigH>
-    <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH>
-    <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
-    <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="GenConfigH">
-      <Value>$(GenConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGLibConfigH">
-      <Value>$(GenGLibConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGModuleConfH">
-      <Value>$(GenGModuleConfH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGNetworkingH">
-      <Value>$(GenGNetworkingH)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin
deleted file mode 100644
index 93762dfdb..000000000
--- a/win32/vs10/glib-install.propsin
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GlibDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\gspawn-win*-helper*.exe $(CopyDir)\bin
-copy $(BinDir)\gspawn-win*-helper*.pdb $(CopyDir)\bin
-copy $(BinDir)\glib-compile-schemas.exe $(CopyDir)\bin
-copy $(BinDir)\glib-compile-schemas.pdb $(CopyDir)\bin
-copy $(BinDir)\gsettings.exe $(CopyDir)\bin
-copy $(BinDir)\gsettings.pdb $(CopyDir)\bin
-copy $(BinDir)\glib-compile-resources.exe $(CopyDir)\bin
-copy $(BinDir)\glib-compile-resources.pdb $(CopyDir)\bin
-copy $(BinDir)\gresource.exe $(CopyDir)\bin
-copy $(BinDir)\gresource.pdb $(CopyDir)\bin
-copy $(BinDir)\gio-querymodules.exe $(CopyDir)\bin
-copy $(BinDir)\gio-querymodules.pdb $(CopyDir)\bin
-copy $(BinDir)\gdbus.exe $(CopyDir)\bin
-copy $(BinDir)\gdbus.pdb $(CopyDir)\bin
-copy $(BinDir)\gio.exe $(CopyDir)\bin
-copy $(BinDir)\gio.pdb $(CopyDir)\bin
-
-copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
-copy ..\..\gobject\glib-genmarshal $(CopyDir)\bin
-copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
-copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
-copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
-copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
-#include "glib.vs10.headers"
-
-copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject
-#include "gobject.vs10.headers"
-copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio
-#include "gio.vs10.headers"
-
-mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
-copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
-copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
-
-mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include
-copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
-copy $(BinDir)\glib-$(ApiVersion).lib $(CopyDir)\lib
-copy $(BinDir)\gthread-$(ApiVersion).lib $(CopyDir)\lib
-copy $(BinDir)\gmodule-$(ApiVersion).lib $(CopyDir)\lib
-copy $(BinDir)\gobject-$(ApiVersion).lib $(CopyDir)\lib
-copy $(BinDir)\gio-$(ApiVersion).lib $(CopyDir)\lib
-
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gio-windows-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gio-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gmodule-no-export-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gmodule-export-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gmodule-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig
-
-mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas
-copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
-
-mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen
-copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
-</GlibDoInstall>
-    <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gobject\glib-genmarshal;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts>
-    <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles>
-    <GenGLibMKEnums>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums>
-    <GenGLibGenmarshal>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal --version=$(GlibVersion)</GenGLibGenmarshal>
-    <GenGDBusCodegen>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen>
-    <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonDir)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>glibinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibDoInstall">
-      <Value>$(GlibDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibUtilScripts">
-      <Value>$(GlibUtilScripts)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibPCFiles">
-      <Value>$(GlibPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGLibMKEnums">
-      <Value>$(GenGLibMKEnums)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGLibGenmarshal">
-      <Value>$(GenGLibGenmarshal)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGDBusCodegen">
-      <Value>$(GenGDBusCodegen)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibGenPC">
-      <Value>$(GlibGenPC)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib-install.vcxproj b/win32/vs10/glib-install.vcxproj
deleted file mode 100644
index 3204bb0ba..000000000
--- a/win32/vs10/glib-install.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-    <RootNamespace>glibinstall</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\glibpc.py">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GlibGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gobject\glib-mkenums.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gobject\glib-genmarshal.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating glib-genmarshal...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibGenmarshal)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-genmarshal;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating glib-genmarshal...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGLibGenmarshal)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-genmarshal;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="glib_install_placeholder">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gmodule.vcxproj">
-      <Project>{4214047c-f5c1-40b3-8369-5dced8c32770}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gspawn-win32-helper-console.vcxproj">
-      <Project>{e40e8a7e-7cae-4659-9b8b-bc38898e3074}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gspawn-win32-helper.vcxproj">
-      <Project>{289240e7-e167-47ce-a20c-58d852e520ba}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gthread.vcxproj">
-      <Project>{c8afb8c3-fffd-460f-bc13-9ac25d7b117c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib-compile-schemas.vcxproj">
-      <Project>{015d69d0-8b42-438a-adae-052ac036e065}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gsettings.vcxproj">
-      <Project>{05041c63-f1c5-49ba-a7de-61ebb5307eaa}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib-compile-resources.vcxproj">
-      <Project>{b0cdec7f-dce1-4f7e-b8a4-a3009c18fb2a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gresource.vcxproj">
-      <Project>{95a1571f-61be-4c51-be53-2f2dab280685}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gio-querymodules.vcxproj">
-      <Project>{95a1571f-61be-4c51-be53-2f2dab280686}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gdbus.vcxproj">
-      <Project>{95a1571f-61be-4c51-be53-2f2dab280687}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gio-tool.vcxproj">
-      <Project>{d0403e9a-2b00-4fd3-b3dd-3c8f9cb9a338}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/glib-install.vcxproj.filters b/win32/vs10/glib-install.vcxproj.filters
deleted file mode 100644
index aae121554..000000000
--- a/win32/vs10/glib-install.vcxproj.filters
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gobject\glib-genmarshal.in"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in
deleted file mode 100644
index f55157c5e..000000000
--- a/win32/vs10/glib-version-paths.props.in
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <VSVer>10</VSVer>
-    <GlibVersion>@GLIB_VERSION@</GlibVersion>
-    <ApiVersion>2.0</ApiVersion>
-    <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <GlibDllPrefix></GlibDllPrefix>
-    <GlibDllSuffix>-2.0-0</GlibDllSuffix>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</PythonDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>glibversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibVersion">
-      <Value>$(GlibVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibDllPrefix">
-      <Value>$(GlibDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibDllSuffix">
-      <Value>$(GlibDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib.sln b/win32/vs10/glib.sln
deleted file mode 100644
index 71c671e4b..000000000
--- a/win32/vs10/glib.sln
+++ /dev/null
@@ -1,289 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcxproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcxproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcxproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcxproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcxproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcxproj", "{289240E7-E167-47CE-A20C-58D852E520BA}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcxproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "glib-compile-schemas.vcxproj", "{015D69D0-8B42-438A-ADAE-052AC036E065}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcxproj", "{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gresource", "gresource.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280685}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-resources", "glib-compile-resources.vcxproj", "{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-querymodules", "gio-querymodules.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280686}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280687}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcxproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug_BundledPCRE|Win32 = Debug_BundledPCRE|Win32

-		Debug_BundledPCRE|x64 = Debug_BundledPCRE|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release_BundledPCRE|Win32 = Release_BundledPCRE|Win32

-		Release_BundledPCRE|x64 = Release_BundledPCRE|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.ActiveCfg = Debug|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.Build.0 = Debug|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.ActiveCfg = Debug_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.Build.0 = Debug_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.ActiveCfg = Debug_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.Build.0 = Debug_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.ActiveCfg = Release_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.Build.0 = Release_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.ActiveCfg = Release_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.Build.0 = Release_BundledPCRE|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.ActiveCfg = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.Build.0 = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.ActiveCfg = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.Build.0 = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.ActiveCfg = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.Build.0 = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.ActiveCfg = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.Build.0 = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.ActiveCfg = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.Build.0 = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.ActiveCfg = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.Build.0 = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.Build.0 = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.ActiveCfg = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.Build.0 = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.ActiveCfg = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.Build.0 = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.ActiveCfg = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.Build.0 = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.ActiveCfg = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.Build.0 = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.Build.0 = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.ActiveCfg = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.Build.0 = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.ActiveCfg = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.Build.0 = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.Build.0 = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.ActiveCfg = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.Build.0 = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.ActiveCfg = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.Build.0 = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.ActiveCfg = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.Build.0 = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.Build.0 = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.ActiveCfg = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs10/glib.vcxproj.filtersin b/win32/vs10/glib.vcxproj.filtersin
deleted file mode 100644
index 7a5084c8e..000000000
--- a/win32/vs10/glib.vcxproj.filtersin
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\libcharset">
-      <UniqueIdentifier>{bb961775-fd45-4205-b1fd-901c3c8fd64c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\gnulib">
-      <UniqueIdentifier>{f630c518-4c58-4dfa-ab43-5fa0b0eb10f1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pcre">
-      <UniqueIdentifier>{9fef0e23-cf71-48aa-979b-7eb84df56143}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "glib.vs10.sourcefiles.filters"
-    <ClCompile Include="..\..\glib\giowin32.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gspawn-win32.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gthread-win32.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gwin32.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\libcharset\localcharset.c"><Filter>Source Files\libcharset</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gnulib\asnprintf.c"><Filter>Source Files\gnulib</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gnulib\printf-args.c"><Filter>Source Files\gnulib</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gnulib\printf-parse.c"><Filter>Source Files\gnulib</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gnulib\printf.c"><Filter>Source Files\gnulib</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\gnulib\vasnprintf.c"><Filter>Source Files\gnulib</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_byte_order.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_chartables.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_compile.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_config.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_dfa_exec.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_exec.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_fullinfo.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_get.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_globals.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_jit_compile.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_newline.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_ord2utf8.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_string_utils.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_study.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_tables.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_valid_utf8.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_version.c"><Filter>Source Files\pcre</Filter></ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_xclass.c"><Filter>Source Files\pcre</Filter></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\glib\glibconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\glib\glib.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/glib.vcxprojin b/win32/vs10/glib.vcxprojin
deleted file mode 100644
index ab6616778..000000000
--- a/win32/vs10/glib.vcxprojin
+++ /dev/null
@@ -1,525 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_BundledPCRE|Win32">
-      <Configuration>Debug_BundledPCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_BundledPCRE|x64">
-      <Configuration>Debug_BundledPCRE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_BundledPCRE|Win32">
-      <Configuration>Release_BundledPCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_BundledPCRE|x64">
-      <Configuration>Release_BundledPCRE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{12BCA020-EABF-429E-876A-A476BC9C10C0}</ProjectGuid>
-    <RootNamespace>glib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug_BundledPCRE'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)'=='Debug_BundledPCRE'">Debug\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release_BundledPCRE'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)'=='Release_BundledPCRE'">Release\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "glib.vs10.sourcefiles"
-    <ClCompile Include="..\..\glib\giowin32.c" />
-    <ClCompile Include="..\..\glib\gspawn-win32.c" />
-    <ClCompile Include="..\..\glib\gthread-win32.c" />
-    <ClCompile Include="..\..\glib\gwin32.c" />
-    <ClCompile Include="..\..\glib\libcharset\localcharset.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\gnulib\asnprintf.c" />
-    <ClCompile Include="..\..\glib\gnulib\printf-args.c" />
-    <ClCompile Include="..\..\glib\gnulib\printf-parse.c" />
-    <ClCompile Include="..\..\glib\gnulib\printf.c" />
-    <ClCompile Include="..\..\glib\gnulib\vasnprintf.c" />
-    <ClCompile Include="..\..\glib\pcre\pcre_byte_order.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_chartables.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_compile.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_config.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_dfa_exec.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_exec.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_fullinfo.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_get.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_globals.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_jit_compile.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_newline.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_ord2utf8.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_string_utils.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_study.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_tables.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_valid_utf8.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_version.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\glib\pcre\pcre_xclass.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug_BundledPCRE'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_BundledPCRE'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_BundledPCRE'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_BundledPCRE'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\glib\glibconfig.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug_BundledPCRE'">Copying glibconfig.h from glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GenGLibConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_BundledPCRE'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Debug'">Copying glibconfig.h from glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_BundledPCRE'">Copying glibconfig.h from glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GenGLibConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_BundledPCRE'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying glibconfig.h from glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGLibConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\glib\glib.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gmodule.vcxproj b/win32/vs10/gmodule.vcxproj
deleted file mode 100644
index abfbb5322..000000000
--- a/win32/vs10/gmodule.vcxproj
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4214047C-F5C1-40B3-8369-5DCED8C32770}</ProjectGuid>
-    <RootNamespace>gmodule</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GModuleBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GModuleBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GModuleBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GModuleBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gmodule\gmodule.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gmodule\gmoduleconf.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGModuleConfH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGModuleConfH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gmodule\gmodule.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gmodule.vcxproj.filters b/win32/vs10/gmodule.vcxproj.filters
deleted file mode 100644
index df97a6b67..000000000
--- a/win32/vs10/gmodule.vcxproj.filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gmodule\gmodule.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gmodule\gmoduleconf.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gmodule\gmodule.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gobject.vcxproj.filtersin b/win32/vs10/gobject.vcxproj.filtersin
deleted file mode 100644
index 85af63ff2..000000000
--- a/win32/vs10/gobject.vcxproj.filtersin
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gobject.vs10.sourcefiles.filters"
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gobject.vcxprojin b/win32/vs10/gobject.vcxprojin
deleted file mode 100644
index 50fe2038b..000000000
--- a/win32/vs10/gobject.vcxprojin
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F172EFFC-E30F-4593-809E-DB2024B1E753}</ProjectGuid>
-    <RootNamespace>gobject</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GObjectBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GObjectBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GObjectBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GObjectBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gobject.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gobject\gobject.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gthread.vcxproj">
-      <Project>{c8afb8c3-fffd-460f-bc13-9ac25d7b117c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gresource.vcxproj b/win32/vs10/gresource.vcxproj
deleted file mode 100644
index 766e371e8..000000000
--- a/win32/vs10/gresource.vcxproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95A1571F-61BE-4C51-BE53-2F2DAB280685}</ProjectGuid>
-    <RootNamespace>gresource</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gresource-tool.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gresource.vcxproj.filters b/win32/vs10/gresource.vcxproj.filters
deleted file mode 100644
index 2e373bb9f..000000000
--- a/win32/vs10/gresource.vcxproj.filters
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gresource-tool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gsettings.vcxproj b/win32/vs10/gsettings.vcxproj
deleted file mode 100644
index c0a366308..000000000
--- a/win32/vs10/gsettings.vcxproj
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}</ProjectGuid>
-    <RootNamespace>gsettings</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gsettings-tool.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gobject.vcxproj">
-      <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gio.vcxproj">
-      <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gsettings.vcxproj.filters b/win32/vs10/gsettings.vcxproj.filters
deleted file mode 100644
index 843c0cb2b..000000000
--- a/win32/vs10/gsettings.vcxproj.filters
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gio\gsettings-tool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gspawn-win32-helper-console.vcxproj b/win32/vs10/gspawn-win32-helper-console.vcxproj
deleted file mode 100644
index 6b31acf83..000000000
--- a/win32/vs10/gspawn-win32-helper-console.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}</ProjectGuid>
-    <RootNamespace>gspawnwin32helperconsole</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gspawn-win64-helper-console.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)gspawn-win64-helper-console.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gspawn-win64-helper-console.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)gspawn-win64-helper-console.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\glib\gspawn-win32-helper.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gspawn-win32-helper-console.vcxproj.filters b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
deleted file mode 100644
index 85fd3f6f3..000000000
--- a/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\glib\gspawn-win32-helper.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gspawn-win32-helper.vcxproj b/win32/vs10/gspawn-win32-helper.vcxproj
deleted file mode 100644
index dc30edc44..000000000
--- a/win32/vs10/gspawn-win32-helper.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{289240E7-E167-47CE-A20C-58D852E520BA}</ProjectGuid>
-    <RootNamespace>gspawnwin32helper</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gspawn-win64-helper.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)gspawn-win64-helper.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)gspawn-win64-helper.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)gspawn-win64-helper.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\glib\gspawn-win32-helper.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gspawn-win32-helper.vcxproj.filters b/win32/vs10/gspawn-win32-helper.vcxproj.filters
deleted file mode 100644
index 85fd3f6f3..000000000
--- a/win32/vs10/gspawn-win32-helper.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\glib\gspawn-win32-helper.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gthread.vcxproj b/win32/vs10/gthread.vcxproj
deleted file mode 100644
index 7dc57e7ef..000000000
--- a/win32/vs10/gthread.vcxproj
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}</ProjectGuid>
-    <RootNamespace>gthread</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GThreadBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GThreadBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GThreadBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GThreadBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gthread\gthread-impl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gthread\gthread.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gthread.vcxproj.filters b/win32/vs10/gthread.vcxproj.filters
deleted file mode 100644
index 82d30ab16..000000000
--- a/win32/vs10/gthread.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gthread\gthread-impl.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gthread\gthread.rc"><Filter>Resource Files</Filter></ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/.gitignore b/win32/vs11/.gitignore
deleted file mode 100644
index a7e3d4a30..000000000
--- a/win32/vs11/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-gio.vcxproj
-gio.vcxproj.filters
-glib-compile-resources.vcxproj
-glib-compile-resources.vcxproj.filters
-glib-compile-schemas.vcxproj
-glib-compile-schemas.vcxproj.filters
-glib-genmarshal.vcxproj
-glib-genmarshal.vcxproj.filters
-glib.vcxproj
-glib.vcxproj.filters
-gmodule.vcxproj
-gmodule.vcxproj.filters
-gobject.vcxproj
-gobject.vcxproj.filters
-gresource.vcxproj
-gresource.vcxproj.filters
-gsettings.vcxproj
-gsettings.vcxproj.filters
-gspawn-win32-helper-console.vcxproj
-gspawn-win32-helper-console.vcxproj.filters
-gspawn-win32-helper.vcxproj
-gspawn-win32-helper.vcxproj.filters
-gthread.vcxproj
-gthread.vcxproj.filters
-install.vcxproj
-glib.sln
-README.txt
-glib-build-defines.props
-glib-install.props
-glib-version-paths.props
-glibprepbuild.props
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
deleted file mode 100644
index b1fbcaec6..000000000
--- a/win32/vs11/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-EXTRA_DIST = \
-	README.txt \
-	glib.sln \
-	glib.vcxproj \
-	glib.vcxproj.filters \
-	gspawn-win32-helper-console.vcxproj \
-	gspawn-win32-helper-console.vcxproj.filters \
-	gspawn-win32-helper.vcxproj \
-	gspawn-win32-helper.vcxproj.filters \
-	gmodule.vcxproj \
-	gmodule.vcxproj.filters \
-	gobject.vcxproj \
-	gobject.vcxproj.filters \
-	gthread.vcxproj \
-	gthread.vcxproj.filters \
-	gio.vcxproj \
-	gio.vcxproj.filters \
-	glib-compile-schemas.vcxproj \
-	glib-compile-schemas.vcxproj.filters \
-	gsettings.vcxproj \
-	gsettings.vcxproj.filters \
-	glib-compile-resources.vcxproj \
-	glib-compile-resources.vcxproj.filters \
-	gio-tool.vcxproj	\
-	gio-tool.vcxproj.filters	\
-	gresource.vcxproj \
-	gresource.vcxproj.filters \
-	gio-querymodules.vcxproj \
-	gio-querymodules.vcxproj.filters \
-	gdbus.vcxproj \
-	gdbus.vcxproj.filters \
-	glib-install.vcxproj	\
-	glib-install.vcxproj.filters	\
-	glib-build-defines.props	\
-	glib-install.props	\
-	glib-version-paths.props	\
-	glib-gen-srcs.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 11
-MSVC_VER_LONG = 2012
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs12/.gitignore b/win32/vs12/.gitignore
deleted file mode 100644
index a7e3d4a30..000000000
--- a/win32/vs12/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-gio.vcxproj
-gio.vcxproj.filters
-glib-compile-resources.vcxproj
-glib-compile-resources.vcxproj.filters
-glib-compile-schemas.vcxproj
-glib-compile-schemas.vcxproj.filters
-glib-genmarshal.vcxproj
-glib-genmarshal.vcxproj.filters
-glib.vcxproj
-glib.vcxproj.filters
-gmodule.vcxproj
-gmodule.vcxproj.filters
-gobject.vcxproj
-gobject.vcxproj.filters
-gresource.vcxproj
-gresource.vcxproj.filters
-gsettings.vcxproj
-gsettings.vcxproj.filters
-gspawn-win32-helper-console.vcxproj
-gspawn-win32-helper-console.vcxproj.filters
-gspawn-win32-helper.vcxproj
-gspawn-win32-helper.vcxproj.filters
-gthread.vcxproj
-gthread.vcxproj.filters
-install.vcxproj
-glib.sln
-README.txt
-glib-build-defines.props
-glib-install.props
-glib-version-paths.props
-glibprepbuild.props
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
deleted file mode 100644
index a57df617b..000000000
--- a/win32/vs12/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-EXTRA_DIST = \
-	README.txt \
-	glib.sln \
-	glib.vcxproj \
-	glib.vcxproj.filters \
-	gspawn-win32-helper-console.vcxproj \
-	gspawn-win32-helper-console.vcxproj.filters \
-	gspawn-win32-helper.vcxproj \
-	gspawn-win32-helper.vcxproj.filters \
-	gmodule.vcxproj \
-	gmodule.vcxproj.filters \
-	gobject.vcxproj \
-	gobject.vcxproj.filters \
-	gthread.vcxproj \
-	gthread.vcxproj.filters \
-	gio.vcxproj \
-	gio.vcxproj.filters \
-	glib-compile-schemas.vcxproj \
-	glib-compile-schemas.vcxproj.filters \
-	gsettings.vcxproj \
-	gsettings.vcxproj.filters \
-	glib-compile-resources.vcxproj \
-	glib-compile-resources.vcxproj.filters \
-	gio-tool.vcxproj	\
-	gio-tool.vcxproj.filters	\
-	gresource.vcxproj \
-	gresource.vcxproj.filters \
-	gio-querymodules.vcxproj \
-	gio-querymodules.vcxproj.filters \
-	gdbus.vcxproj \
-	gdbus.vcxproj.filters \
-	glib-install.vcxproj	\
-	glib-install.vcxproj.filters	\
-	glib-build-defines.props	\
-	glib-install.props	\
-	glib-version-paths.props	\
-	glib-gen-srcs.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 12
-MSVC_VER_LONG = 2013
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
deleted file mode 100644
index c22d2ac73..000000000
--- a/win32/vs14/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-EXTRA_DIST = \
-	README.txt \
-	glib.sln \
-	glib.vcxproj \
-	glib.vcxproj.filters \
-	gspawn-win32-helper-console.vcxproj \
-	gspawn-win32-helper-console.vcxproj.filters \
-	gspawn-win32-helper.vcxproj \
-	gspawn-win32-helper.vcxproj.filters \
-	gmodule.vcxproj \
-	gmodule.vcxproj.filters \
-	gobject.vcxproj \
-	gobject.vcxproj.filters \
-	gthread.vcxproj \
-	gthread.vcxproj.filters \
-	gio.vcxproj \
-	gio.vcxproj.filters \
-	glib-compile-schemas.vcxproj \
-	glib-compile-schemas.vcxproj.filters \
-	gsettings.vcxproj \
-	gsettings.vcxproj.filters \
-	glib-compile-resources.vcxproj \
-	glib-compile-resources.vcxproj.filters \
-	gio-tool.vcxproj	\
-	gio-tool.vcxproj.filters	\
-	gresource.vcxproj \
-	gresource.vcxproj.filters \
-	gio-querymodules.vcxproj \
-	gio-querymodules.vcxproj.filters \
-	gdbus.vcxproj \
-	gdbus.vcxproj.filters \
-	glib-install.vcxproj	\
-	glib-install.vcxproj.filters	\
-	glib-build-defines.props	\
-	glib-install.props	\
-	glib-version-paths.props	\
-	glib-gen-srcs.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 14
-MSVC_VER_LONG = 14
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
deleted file mode 100644
index fcea2b3d7..000000000
--- a/win32/vs15/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-EXTRA_DIST = \
-	README.txt \
-	glib.sln \
-	glib.vcxproj \
-	glib.vcxproj.filters \
-	gspawn-win32-helper-console.vcxproj \
-	gspawn-win32-helper-console.vcxproj.filters \
-	gspawn-win32-helper.vcxproj \
-	gspawn-win32-helper.vcxproj.filters \
-	gmodule.vcxproj \
-	gmodule.vcxproj.filters \
-	gobject.vcxproj \
-	gobject.vcxproj.filters \
-	gthread.vcxproj \
-	gthread.vcxproj.filters \
-	gio.vcxproj \
-	gio.vcxproj.filters \
-	glib-compile-schemas.vcxproj \
-	glib-compile-schemas.vcxproj.filters \
-	gsettings.vcxproj \
-	gsettings.vcxproj.filters \
-	glib-compile-resources.vcxproj \
-	glib-compile-resources.vcxproj.filters \
-	gio-tool.vcxproj	\
-	gio-tool.vcxproj.filters	\
-	gresource.vcxproj \
-	gresource.vcxproj.filters \
-	gio-querymodules.vcxproj \
-	gio-querymodules.vcxproj.filters \
-	gdbus.vcxproj \
-	gdbus.vcxproj.filters \
-	glib-install.vcxproj	\
-	glib-install.vcxproj.filters	\
-	glib-build-defines.props	\
-	glib-install.props	\
-	glib-version-paths.props	\
-	glib-gen-srcs.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 15
-MSVC_VER_LONG = 15
-#MSVC_TOOLSET = 141
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs9/.gitignore b/win32/vs9/.gitignore
deleted file mode 100644
index c23b304ce..000000000
--- a/win32/vs9/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-glib.vcproj
-gobject.vcproj
-gio.vcproj
-glib-compile-resources.vcproj
-glib-compile-schemas.vcproj
-glib-version-paths.vsprops
-glib-install.vsprops
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
deleted file mode 100644
index 01fa052e6..000000000
--- a/win32/vs9/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-GENERATED_ITEMS = \
-	glib.vcproj		\
-	gobject.vcproj		\
-	gio.vcproj		\
-	glib-compile-schemas.vcproj	\
-	glib-compile-resources.vcproj	\
-	gio-tool.vcproj	\
-	glib-version-paths.vsprops	\
-	glib-install.vsprops
-
-MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers
-
-EXTRA_DIST = \
-	README.txt		\
-	glib.sln		\
-	glib.vcprojin		\
-	gspawn-win32-helper-console.vcproj 	\
-	gspawn-win32-helper.vcproj	\
-	gmodule.vcproj		\
-	gobject.vcprojin	\
-	gthread.vcproj		\
-	gio.vcprojin		\
-	gsettings.vcproj	\
-	gresource.vcproj	\
-	gio-querymodules.vcproj	\
-	gdbus.vcproj		\
-	glib-compile-schemas.vcprojin	\
-	glib-compile-resources.vcprojin	\
-	gio-tool.vcprojin	\
-	glib-install.vcproj	\
-	glib-build-defines.vsprops	\
-	glib-version-paths.vsprops.in	\
-	glib-gen-srcs.vsprops	\
-	glib-install.vspropsin	\
-	$(GENERATED_ITEMS)
-
-glib-install.vsprops: $(top_srcdir)/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST)
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/glib-install.vspropsin >$@
-	rm $(MSVC_HEADERS_LIST)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt
deleted file mode 100644
index 2dbd41bb1..000000000
--- a/win32/vs9/README.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-Please do not compile this package (GLib) in paths that contain

-spaces in them-as strange problems may occur during compilation or during

-the use of the library.

-

-Please refer to the following GNOME Live! page for more detailed

-instructions on building GLib and its dependencies with Visual C++:

-

-https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack

-

-This VS9 solution and the projects it includes are intented to be used

-in a GLib source tree unpacked from a tarball. In a git checkout you

-first need to use some Unix-like environment or run build/win32/setup.py, 

-which will do the work for you:

-

-$python build/win32/setup.py --perl path_to_your_perl.exe

-

-for more usage on this script, run

-$python build/win32/setup.py -h/--help

-

-The required dependencies are zlib and proxy-libintl. Fetch the latest

-proxy-libintl-dev and zlib-dev zipfiles from

-http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ for 32-bit

-builds, and correspondingly

-http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ for 64-bit

-builds.

-

-A Python 2.7.x or 3.x interpreter is also required, in order to generate

-the utility scripts, as well as the pkg-config files for the build.  Please

-see the entry "PythonDir" in glib-version-paths.vsprops to verify that

-it is correct.

-

-One may wish to build his/her own ZLib-It is recommended that ZLib is

-built using the win32/Makefile.msc makefile with VS9 with the ASM routines

-to avoid linking problems-see win32/Makefile.msc in ZLib for more details.

-

-For LibFFI, please use the Centricular fork of it, which can be found at

-https://github.com/centricular/libffi.  Please refer to the build instructions

-there on how to build it, which involves using the Meson build system, and

-the Ninja build tool.

-

-Please note, although using one's own existing PCRE installation to build GLib

-is possible, it is still recommended to build PCRE during the process of building

-GLib (i.e. using the Debug or Release configurations), as GLib's bundled PCRE

-has been patched to work optimally with GLib.  If building against an existing

-PCRE is desired, use the(BuildType)_ExtPCRE configurations, but one needs to ensure

-that the existing PCRE is:

--Built with VS9

--Unicode support is built in (please see the CMake options for this)

--It is built with the Multithreaded DLL (/MD, for release builds) or the

- Multithreaded DLL Debug (/MDd, for debug builds)

-

-If using static builds of PCRE, please add PCRE_STATIC to the "Preprocessor

-Definitions" of the glib project settings.

-

-Please be aware that the GLib's regex test program will only pass with PCRE directly

-built into GLib.

-

-Set up the source tree as follows under some arbitrary top

-folder <root>:

-

-<root>\<this-glib-source-tree>

-<root>\vs9\<PlatformName>

-

-*this* file you are now reading is thus located at

-<root>\<this-glib-source-tree>\build\win32\vs9\README.

-

-<PlatformName> is either Win32 or x64, as in VS9 project files.

-

-You should unpack the proxy-libintl-dev zip file into

-<root>\vs9\<PlatformName>, so that for instance libintl.h end up at

-<root>\vs9\<PlatformName>\include\libintl.h.

-

-For LibFFI, one should also put the generated ffi.h and ffitarget.h

-into <root>\vs9\<PlatformName>\include\ and the compiled static libffi.lib

-(or copy libffi-convenience.lib into libffi.lib) into 

-<root>\vs9\<PlatformName>\lib\.

-

-The "install" project will copy build results and headers into their

-appropriate location under <root>\vs9\<PlatformName>. For instance,

-built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into

-<root>\vs9\<PlatformName>\lib and GLib headers into

-<root>\vs9\<PlatformName>\include\glib-2.0. This is then from where

-project files higher in the stack are supposed to look for them, not

-from a specific GLib source tree.

-

-Note: If you see C4819 errors and you are compiling GLib on a DBCS

-(Chinese/Korean/Japanese) version of Windows, you may need to switch

-to an English locale in Control Panel->Region and Languages->System->

-Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf,

-ATK and GTK+ is built correctly.  This is due to a bug in Visual C++ running

-on DBCS locales, and also affects many other opensource projects which are

-built with Visual C++, including but not limited to QT and the Mozilla apps.

-

---Tor Lillqvist <tml@iki.fi>

---Updated by Chun-wei Fan <fanc999@gmail.com>

diff --git a/win32/vs9/gdbus.vcproj b/win32/vs9/gdbus.vcproj
deleted file mode 100644
index b95252f99..000000000
--- a/win32/vs9/gdbus.vcproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdbus"
-	ProjectGUID="{95A1571F-61BE-4C51-BE53-2F2DAB280687}"
-	RootNamespace="gdbus"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gio\gdbus-tool.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gio-querymodules.vcproj b/win32/vs9/gio-querymodules.vcproj
deleted file mode 100644
index d9cc29731..000000000
--- a/win32/vs9/gio-querymodules.vcproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gio-querymodules"
-	ProjectGUID="{95A1571F-61BE-4C51-BE53-2F2DAB280686}"
-	RootNamespace="gioquerymodules"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="$(GioInBuildMacro)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="$(GioInBuildMacro)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gio\gio-querymodules.c" />
-			<File RelativePath="..\..\gio\giomodule-priv.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gio-tool.vcprojin b/win32/vs9/gio-tool.vcprojin
deleted file mode 100644
index 05576acb5..000000000
--- a/win32/vs9/gio-tool.vcprojin
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gio-tool"
-	ProjectGUID="{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}"
-	RootNamespace="giotool"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gio.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				ProjectDebugDatabase="$(OutDir)\$(OutputFileName).pdb"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gio.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				ProjectDebugDatabase="$(OutDir)\$(OutputFileName).pdb"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(GioInBuildMacro)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gio.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ProjectDebugDatabase="$(OutDir)\$(OutputFileName).pdb"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GioInBuildMacro)"
-				AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gio.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ProjectDebugDatabase="$(OutDir)\$(OutputFileName).pdb"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gio-tool.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gio.vcprojin b/win32/vs9/gio.vcprojin
deleted file mode 100644
index 8abd220e2..000000000
--- a/win32/vs9/gio.vcprojin
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gio"
-	ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
-	RootNamespace="gio"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
-				PreprocessorDefinitions="$(GioBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
-				PreprocessorDefinitions="$(GioBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gio.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\gio\gnetworking.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gnetworking.h from gnetworking.h.win32..."
-						CommandLine="$(GenGNetworkingH)"
-						Outputs="..\..\gio\gnetworking.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gnetworking.h from gnetworking.h.win32..."
-						CommandLine="$(GenGNetworkingH)"
-						Outputs="..\..\gio\gnetworking.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gnetworking.h from gnetworking.h.win32..."
-						CommandLine="$(GenGNetworkingH)"
-						Outputs="..\..\gio\gnetworking.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gnetworking.h from gnetworking.h.win32..."
-						CommandLine="$(GenGNetworkingH)"
-						Outputs="..\..\gio\gnetworking.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\gio\gio.rc" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/glib-build-defines.vsprops b/win32/vs9/glib-build-defines.vsprops
deleted file mode 100644
index cccf36fe7..000000000
--- a/win32/vs9/glib-build-defines.vsprops
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="glibbuilddefinesprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
-	InheritedPropertySheets=".\glib-version-paths.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..;..\..\glib;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions=""
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-		AdditionalOptions="/MP"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="intl.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<UserMacro
-		Name="GLibBundledPCREDefines"
-		Value="PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN=\&quot;GLib-GRegex\&quot;"
-	/>
-	<UserMacro
-		Name="GlibBundledPCREExportDefines"
-		Value="PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN="
-	/>
-	<UserMacro
-		Name="GLibBundledPCREUndefs"
-		Value="-UBSR_ANYCRLF -UEBCDIC"
-	/>
-	<UserMacro
-		Name="LocalCharsetDefs"
-		Value="LIBDIR=&quot;blah&quot;"
-	/>
-	<UserMacro
-		Name="DllExportDefines"
-		Value="DLL_EXPORT"
-	/>
-	<UserMacro
-		Name="UseSystemPCREDefines"
-		Value="USE_SYSTEM_PCRE"
-	/>
-	<UserMacro
-		Name="GLibInBuildMacro"
-		Value="GLIB_COMPILATION"
-	/>
-	<UserMacro
-		Name="GioInBuildMacro"
-		Value="GIO_COMPILATION"
-	/>
-	<UserMacro
-		Name="GLibBuildDefines"
-		Value="$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN=\&quot;GLib\&quot;"
-	/>
-	<UserMacro
-		Name="GThreadBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;GThread\&quot;"
-	/>
-	<UserMacro
-		Name="GModuleBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;GModule\&quot;"
-	/>
-	<UserMacro
-		Name="GObjectBuildDefines"
-		Value="GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;"
-	/>
-	<UserMacro
-		Name="GioBuildDefines"
-		Value="$(GioInBuildMacro);G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;$(DllExportDefines)"
-	/>
-	<UserMacro
-		Name="WindowsNetworkingLibs"
-		Value="ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/glib-compile-resources.vcprojin b/win32/vs9/glib-compile-resources.vcprojin
deleted file mode 100644
index e76b485ad..000000000
--- a/win32/vs9/glib-compile-resources.vcprojin
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="glib-compile-resources"
-	ProjectGUID="{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}"
-	RootNamespace="glibcompileresources"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
-				PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
-				PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
-				PreprocessorDefinitions="$(GioInBuildMacro)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
-				PreprocessorDefinitions="$(GioInBuildMacro)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "glib-compile-resources.sourcefiles"
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/glib-compile-schemas.vcprojin b/win32/vs9/glib-compile-schemas.vcprojin
deleted file mode 100644
index f3f54d102..000000000
--- a/win32/vs9/glib-compile-schemas.vcprojin
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="glib-compile-schemas"
-	ProjectGUID="{015D69D0-8B42-438A-ADAE-052AC036E065}"
-	RootNamespace="glibcompileschemas"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "glib-compile-schemas.sourcefiles"
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/glib-gen-srcs.vsprops b/win32/vs9/glib-gen-srcs.vsprops
deleted file mode 100644
index 02a6a5a8c..000000000
--- a/win32/vs9/glib-gen-srcs.vsprops
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="glibgensrcsprops"
-	InheritedPropertySheets=".\glib-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GenConfigH"
-		Value="copy ..\..\config.h.win32 ..\..\config.h"
-	/>
-	<UserMacro
-		Name="GenGLibConfigH"
-		Value="copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h"
-	/>
-	<UserMacro
-		Name="GenGModuleConfH"
-		Value="copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h"
-	/>
-	<UserMacro
-		Name="GenGNetworkingH"
-		Value="copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/glib-install.vcproj b/win32/vs9/glib-install.vcproj
deleted file mode 100644
index 37a6a7c5f..000000000
--- a/win32/vs9/glib-install.vcproj
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="glib-install"
-	ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B10}"
-	RootNamespace="glibinstall"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GlibDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GlibDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GlibDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GlibDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\glibpc.py">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GlibGenPC)"
-						Outputs="..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GlibGenPC)"
-						Outputs="..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GlibGenPC)"
-						Outputs="..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GlibGenPC)"
-						Outputs="..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\gobject\glib-mkenums.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-mkenums..."
-						CommandLine="$(GenGLibMKEnums)"
-						Outputs="..\..\gobject\glib-mkenums"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-mkenums..."
-						CommandLine="$(GenGLibMKEnums)"
-						Outputs="..\..\gobject\glib-mkenums"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-mkenums..."
-						CommandLine="$(GenGLibMKEnums)"
-						Outputs="..\..\gobject\glib-mkenums"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-mkenums..."
-						CommandLine="$(GenGLibMKEnums)"
-						Outputs="..\..\gobject\glib-mkenums"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\gobject\glib-genmarshal.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-genmarshal..."
-						CommandLine="$(GenGLibGenmarshal)"
-						Outputs="..\..\gobject\glib-genmarshal"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-genmarshal..."
-						CommandLine="$(GenGLibGenmarshal)"
-						Outputs="..\..\gobject\glib-genmarshal"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-genmarshal..."
-						CommandLine="$(GenGLibGenmarshal)"
-						Outputs="..\..\gobject\glib-genmarshal"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib-genmarshal..."
-						CommandLine="$(GenGLibGenmarshal)"
-						Outputs="..\..\gobject\glib-genmarshal"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdbus-codegen..."
-						CommandLine="$(GenGDBusCodegen)"
-						Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdbus-codegen..."
-						CommandLine="$(GenGDBusCodegen)"
-						Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdbus-codegen..."
-						CommandLine="$(GenGDBusCodegen)"
-						Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdbus-codegen..."
-						CommandLine="$(GenGDBusCodegen)"
-						Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin
deleted file mode 100644
index c1e36d2c4..000000000
--- a/win32/vs9/glib-install.vspropsin
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="glibinstallprops"
-	InheritedPropertySheets=".\glib-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GlibDoInstall"
-		Value="
-mkdir $(CopyDir)&#x0D;&#x0A;
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)glib$(GlibDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)glib$(GlibDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gthread$(GlibDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gthread$(GlibDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gmodule$(GlibDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gmodule$(GlibDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gio$(GlibDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win*-helper*.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win*-helper*.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-schemas.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-schemas.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gsettings.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gsettings.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-resources.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-resources.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gresource.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gresource.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\gobject\glib-mkenums $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\gobject\glib-genmarshal $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
-copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
-copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
-copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
-copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
-#include "glib.headers"
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
-#include "gobject.headers"
-copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-#include "gio.headers"
-
-mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include&#x0D;&#x0A;
-copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include&#x0D;&#x0A;
-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gthread-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gmodule-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gobject-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gio-windows-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gio-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gobject-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gmodule-no-export-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gmodule-export-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gmodule-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas&#x0D;&#x0A;
-copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen&#x0D;&#x0A;
-copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="GenGLibMKEnums"
-		Value="$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)"
-	/>
-	<UserMacro
-		Name="GenGLibGenmarshal"
-		Value="$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal --version=$(GlibVersion)"
-	/>
-	<UserMacro
-		Name="GenGDBusCodegen"
-		Value="$(PythonDir)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)"
-	/>
-	<UserMacro
-		Name="GlibGenPC"
-		Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonDir)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/glib-version-paths.vsprops.in b/win32/vs9/glib-version-paths.vsprops.in
deleted file mode 100644
index c5c6c1b85..000000000
--- a/win32/vs9/glib-version-paths.vsprops.in
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="glibversionpathsprops"
-	>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GlibVersion"
-		Value="@GLIB_VERSION@"
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="2.0"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="GlibDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="GlibDllSuffix"
-		Value="-2.0-0"
-	/>
-	<UserMacro
-		Name="PythonDir"
-		Value="c:\python27"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/glib.sln b/win32/vs9/glib.sln
deleted file mode 100644
index 2add2077b..000000000
--- a/win32/vs9/glib.sln
+++ /dev/null
@@ -1,362 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} = {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcproj", "{289240E7-E167-47CE-A20C-58D852E520BA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "glib-compile-schemas.vcproj", "{015D69D0-8B42-438A-ADAE-052AC036E065}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcproj", "{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-resources", "glib-compile-resources.vcproj", "{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gresource", "gresource.vcproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280685}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-querymodules", "gio-querymodules.vcproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280686}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280687}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}"

-	ProjectSection(ProjectDependencies) = postProject

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"

-	ProjectSection(ProjectDependencies) = postProject

-		{12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92}

-		{4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770}

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074} = {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} = {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}

-		{289240E7-E167-47CE-A20C-58D852E520BA} = {289240E7-E167-47CE-A20C-58D852E520BA}

-		{F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753}

-		{015D69D0-8B42-438A-ADAE-052AC036E065} = {015D69D0-8B42-438A-ADAE-052AC036E065}

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA} = {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A} = {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685} = {95A1571F-61BE-4C51-BE53-2F2DAB280685}

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686} = {95A1571F-61BE-4C51-BE53-2F2DAB280686}

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687} = {95A1571F-61BE-4C51-BE53-2F2DAB280687}

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} = {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug_BundledPCRE|Win32 = Debug_BundledPCRE|Win32

-		Debug_BundledPCRE|x64 = Debug_BundledPCRE|x64

-		Release_BundledPCRE|Win32 = Release_BundledPCRE|Win32

-		Release_BundledPCRE|x64 = Release_BundledPCRE|x64

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.ActiveCfg = Debug_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.Build.0 = Debug_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.ActiveCfg = Debug_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.Build.0 = Debug_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.ActiveCfg = Release_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.Build.0 = Release_BundledPCRE|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.ActiveCfg = Release_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.Build.0 = Release_BundledPCRE|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.ActiveCfg = Debug|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.Build.0 = Debug|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64

-		{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.ActiveCfg = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.Build.0 = Debug|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.ActiveCfg = Release|x64

-		{4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.Build.0 = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.ActiveCfg = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.Build.0 = Debug|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.ActiveCfg = Release|x64

-		{F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.Build.0 = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.ActiveCfg = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.Build.0 = Debug|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.ActiveCfg = Release|x64

-		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.Build.0 = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.Build.0 = Debug|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.ActiveCfg = Release|x64

-		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.Build.0 = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.ActiveCfg = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.Build.0 = Debug|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.ActiveCfg = Release|x64

-		{289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.Build.0 = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.ActiveCfg = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.Build.0 = Debug|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64

-		{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.Build.0 = Debug|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.ActiveCfg = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.Build.0 = Release|Win32

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.ActiveCfg = Release|x64

-		{015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.Build.0 = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.Build.0 = Debug|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.ActiveCfg = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.Build.0 = Debug|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.ActiveCfg = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.Build.0 = Release|Win32

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.ActiveCfg = Release|x64

-		{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.Build.0 = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.Build.0 = Debug|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.ActiveCfg = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64

-		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.Build.0 = Debug|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.ActiveCfg = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.Build.0 = Debug|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.ActiveCfg = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64

-		{95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64

-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs9/glib.vcprojin b/win32/vs9/glib.vcprojin
deleted file mode 100644
index e92415373..000000000
--- a/win32/vs9/glib.vcprojin
+++ /dev/null
@@ -1,634 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="glib"
-	ProjectGUID="{12BCA020-EABF-429E-876A-A476BC9C10C0}"
-	RootNamespace="glib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug_BundledPCRE|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib pcred.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_BundledPCRE|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib pcred.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_BundledPCRE|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibBuildDefines);$(UseSystemPCREDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib pcre.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_BundledPCRE|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibBuildDefines);$(UseSystemPCREDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib pcre.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "glib.sourcefiles"
-			<File RelativePath="..\..\glib\giowin32.c" />
-			<File RelativePath="..\..\glib\gspawn-win32.c" />
-			<File RelativePath="..\..\glib\gthread-win32.c" />
-			<File RelativePath="..\..\glib\gwin32.c" />
-			<Filter
-				Name="libcharset"
-				>
-				<File RelativePath="..\..\glib\libcharset\localcharset.c">
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="gnulib"
-				>
-				<File RelativePath="..\..\glib\gnulib\asnprintf.c" />
-				<File RelativePath="..\..\glib\gnulib\printf-args.c" />
-				<File RelativePath="..\..\glib\gnulib\printf-parse.c" />
-				<File RelativePath="..\..\glib\gnulib\printf.c" />
-				<File RelativePath="..\..\glib\gnulib\vasnprintf.c" />
-			</Filter>
-			<Filter
-				Name="pcre"
-				>
-				<File RelativePath="..\..\glib\pcre\pcre_byte_order.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_chartables.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_compile.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_config.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_dfa_exec.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_exec.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_fullinfo.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_get.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_globals.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_jit_compile.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_newline.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_ord2utf8.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_string_utils.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_study.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_tables.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_valid_utf8.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_version.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\glib\pcre\pcre_xclass.c" >
-					<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\config.h.win32">
-				<FileConfiguration Name="Debug_BundledPCRE|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_BundledPCRE|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_BundledPCRE|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_BundledPCRE|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\glib\glibconfig.h.win32">
-				<FileConfiguration Name="Debug_BundledPCRE|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_BundledPCRE|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_BundledPCRE|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_BundledPCRE|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying glibconfig.h from glibconfig.h.win32..."
-						CommandLine="$(GenGLibConfigH)"
-						Outputs="..\..\glib\glibconfig.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\glib\glib.rc" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gmodule.vcproj b/win32/vs9/gmodule.vcproj
deleted file mode 100644
index 6ea16b438..000000000
--- a/win32/vs9/gmodule.vcproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gmodule"
-	ProjectGUID="{4214047C-F5C1-40B3-8369-5DCED8C32770}"
-	RootNamespace="gmodule"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GModuleBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GModuleBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GModuleBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GModuleBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gmodule\gmodule.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\gmodule\gmoduleconf.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gmoduleconf.h from gmoduleconf.h.win32..."
-						CommandLine="$(GenGModuleConfH)"
-						Outputs="..\..\gmodule\gmoduleconf.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gmoduleconf.h from gmoduleconf.h.win32..."
-						CommandLine="$(GenGModuleConfH)"
-						Outputs="..\..\gmodule\gmoduleconf.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gmoduleconf.h from gmoduleconf.h.win32..."
-						CommandLine="$(GenGModuleConfH)"
-						Outputs="..\..\gmodule\gmoduleconf.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying gmoduleconf.h from gmoduleconf.h.win32..."
-						CommandLine="$(GenGModuleConfH)"
-						Outputs="..\..\gmodule\gmoduleconf.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\gmodule\gmodule.rc" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gobject.vcprojin b/win32/vs9/gobject.vcprojin
deleted file mode 100644
index 1660f7216..000000000
--- a/win32/vs9/gobject.vcprojin
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gobject"
-	ProjectGUID="{F172EFFC-E30F-4593-809E-DB2024B1E753}"
-	RootNamespace="gobject"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GObjectBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GObjectBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GObjectBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GObjectBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gobject.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\gobject\gobject.rc" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gresource.vcproj b/win32/vs9/gresource.vcproj
deleted file mode 100644
index 1d7ae0a9d..000000000
--- a/win32/vs9/gresource.vcproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gresource"
-	ProjectGUID="{95A1571F-61BE-4C51-BE53-2F2DAB280685}"
-	RootNamespace="gresource"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gio\gresource-tool.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gsettings.vcproj b/win32/vs9/gsettings.vcproj
deleted file mode 100644
index 6a8c2f383..000000000
--- a/win32/vs9/gsettings.vcproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gsettings"
-	ProjectGUID="{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}"
-	RootNamespace="gsettings"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions="DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gmodule"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gio\gsettings-tool.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gspawn-win32-helper-console.vcproj b/win32/vs9/gspawn-win32-helper-console.vcproj
deleted file mode 100644
index 6f14391ff..000000000
--- a/win32/vs9/gspawn-win32-helper-console.vcproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gspawn-win32-helper-console"
-	ProjectGUID="{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}"
-	RootNamespace="gspawnwin32helperconsole"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibInBuildMacro);HELPER_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gspawn-win64-helper-console.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibInBuildMacro);HELPER_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gspawn-win64-helper-console.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\glib\gspawn-win32-helper.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gspawn-win32-helper.vcproj b/win32/vs9/gspawn-win32-helper.vcproj
deleted file mode 100644
index e846e4c88..000000000
--- a/win32/vs9/gspawn-win32-helper.vcproj
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gspawn-win32-helper"
-	ProjectGUID="{289240E7-E167-47CE-A20C-58D852E520BA}"
-	RootNamespace="gspawnwin32helper"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gspawn-win64-helper.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibInBuildMacro)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibInBuildMacro)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\gspawn-win64-helper.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\glib\gspawn-win32-helper.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gthread.vcproj b/win32/vs9/gthread.vcproj
deleted file mode 100644
index cc9e111c3..000000000
--- a/win32/vs9/gthread.vcproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gthread"
-	ProjectGUID="{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"
-	RootNamespace="gthread"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GThreadBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\glib-build-defines.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GThreadBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gthread\gthread-impl.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\gthread\gthread.rc" />
-		</Filter>
-	</Files>
-</VisualStudioProject>