Merge branch 'master' into 'master'

gio: icons should fallback to non-preferred style appropriately.

See merge request GNOME/glib!72
diff --git a/.gitignore b/.gitignore
index 4443f04..0caa0c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,13 +46,11 @@
 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 8a3dca7..a3634df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib/master:v3
+image: registry.gitlab.gnome.org/gnome/glib/master:v6
 
 stages:
   - build
@@ -11,8 +11,9 @@
 
 variables:
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  G_MESSAGES_DEBUG: all
 
-fedora-meson-x86_64:
+fedora-x86_64:
   stage: build
   except:
     - tags
@@ -21,9 +22,10 @@
   script:
     - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build .
     - ninja -C _build
-    - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
     - 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
@@ -31,33 +33,36 @@
       - "_build/meson-logs"
       - "_coverage"
 
-fedora-meson-android_ndk_r16_api21_arm64:
+.cross-template: &cross-template
   stage: build
   except:
     - tags
-  script:
-    # FIXME: add --werror
-    - meson --cross-file=/opt/cross-file-android_ndk_r16_api21_arm64.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build
-    - ninja -C _build
   artifacts:
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     paths:
       - "_build/meson-logs"
 
-fedora-meson-mingw64:
-  stage: build
-  except:
-    - tags
+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
-  artifacts:
-    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
-    when: always
-    paths:
-      - "_build/meson-logs"
 
 msys2-mingw32:
   stage: build
@@ -92,6 +97,44 @@
     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:
@@ -117,10 +160,10 @@
   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 cdb54eb..06d3a4a 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -25,6 +25,7 @@
     mingw64-gettext \
     mingw64-libffi \
     mingw64-zlib \
+    ncurses-compat-libs \
     ninja-build \
     pcre-devel \
     python3 \
@@ -36,13 +37,19 @@
     zlib-devel \
  && dnf clean all
 
-RUN pip3 install meson
-
-COPY setup-android-ndk.sh .
-RUN ./setup-android-ndk.sh
+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}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
diff --git a/.gitlab-ci/android-download-ndk.sh b/.gitlab-ci/android-download-ndk.sh
new file mode 100755
index 0000000..785ee01
--- /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 0000000..510056f
--- /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 49118d6..63e3051 100755
--- a/.gitlab-ci/coverage-docker.sh
+++ b/.gitlab-ci/coverage-docker.sh
@@ -5,9 +5,11 @@
 # 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/run-docker.sh b/.gitlab-ci/run-docker.sh
index 4fc59a1..91d3042 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/setup-android-ndk.sh b/.gitlab-ci/setup-android-ndk.sh
deleted file mode 100755
index 0bce26b..0000000
--- a/.gitlab-ci/setup-android-ndk.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/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
-
-cd /opt
-
-# Download Android NDK
-wget --quiet https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip
-echo "5b9ec70eac78f6cef8572dff9a133c9b18c83155dc6d980237a6925df4ae65b7b2adb3d8ea55b3ce9f3f75868f20eefdb8c87da110683c2dd1a1a27c44dc5b91  android-ndk-r16-linux-x86_64.zip" | sha512sum -c
-unzip android-ndk-r16-linux-x86_64.zip
-rm android-ndk-r16-linux-x86_64.zip
-
-# Setup cross build env
-export ANDROID_HOST=aarch64-linux-android
-export ANDROID_BUILD=linux-x86_64
-export ANDROID_ARCH=arm64
-export ANDROID_NDK=/opt/android-ndk-r16
-export ANDROID_VERSION=21
-export ANDROID_TOOLCHAIN_VERSION=4.9
-export ANDROID_SYSROOT=$ANDROID_NDK/platforms/android-$ANDROID_VERSION/arch-$ANDROID_ARCH
-export ANDROID_PREBUILT=$ANDROID_NDK/toolchains/$ANDROID_HOST-$ANDROID_TOOLCHAIN_VERSION/prebuilt/$ANDROID_BUILD/bin
-export CPPFLAGS="--sysroot=$ANDROID_SYSROOT -isystem $ANDROID_NDK/sysroot/usr/include/  -isystem $ANDROID_NDK/sysroot/usr/include/$ANDROID_HOST"
-export CFLAGS="$CPPFLAGS -D__ANDROID_API__=$ANDROID_VERSION"
-export AR=$ANDROID_HOST-ar
-export RANLIB=$ANDROID_HOST-ranlib
-export CPP=$ANDROID_HOST-cpp
-export PATH=$ANDROID_PREBUILT:$PATH
-
-# Cross build libiconv
-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
-rm libiconv-1.15.tar.gz
-pushd libiconv-1.15
-./configure --host=$ANDROID_HOST --prefix=/opt/$ANDROID_HOST  --libdir=/opt/$ANDROID_HOST/lib64
-make
-make install
-popd
-
-# 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
-rm libffi-3.3-rc0.tar.gz
-pushd libffi-3.3-rc0
-./configure --host=$ANDROID_HOST --prefix=/opt/$ANDROID_HOST --libdir=/opt/$ANDROID_HOST/lib64
-make
-make install
-popd
-
-# Create a pkg-config wrapper that won't pick fedora libraries
-export PKG_CONFIG=/opt/${ANDROID_HOST}/bin/pkg-config
-cat > $PKG_CONFIG <<- EOM
-#!/bin/sh
-SYSROOT=/opt/${ANDROID_HOST}
-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 > /opt/cross-file-android_ndk_r16_api21_arm64.txt <<- EOM
-[host_machine]
-system = 'android'
-cpu_family = 'arm64'
-cpu = 'arm64'
-endian = 'little'
-
-[properties]
-c_args = ['--sysroot=${ANDROID_SYSROOT}',
-          '-isystem', '/opt/${ANDROID_HOST}/include',
-          '-isystem', '${ANDROID_NDK}/sysroot/usr/include/',
-          '-isystem', '${ANDROID_NDK}/sysroot/usr/include/${ANDROID_HOST}',
-          '-D__ANDROID_API__=${ANDROID_VERSION}']
-c_link_args = ['--sysroot=${ANDROID_SYSROOT}',
-               '-L/opt/${ANDROID_HOST}/lib64',
-               '-fuse-ld=gold']
-
-[binaries]
-c = '${ANDROID_PREBUILT}/${ANDROID_HOST}-gcc'
-cpp = '${ANDROID_PREBUILT}/${ANDROID_HOST}-g++'
-ar = '${ANDROID_PREBUILT}/${ANDROID_HOST}-ar'
-strip = '${ANDROID_PREBUILT}/${ANDROID_HOST}-strip'
-pkgconfig = '${PKG_CONFIG}'
-EOM
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index a62882d..9b674f7 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -5,6 +5,7 @@
 @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
 
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 20c79e7..48e18e9 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -21,31 +21,41 @@
     mingw-w64-$MSYS2_ARCH-python3 \
     mingw-w64-$MSYS2_ARCH-python3-pip \
     mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-zlib
+    mingw-w64-$MSYS2_ARCH-zlib \
+    mingw-w64-$MSYS2_ARCH-libelf
 
+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
 
+"${LCOV}" \
+    --quiet \
+    --rc lcov_branch_coverage=1 \
+    --directory "${DIR}/_build" \
+    --capture \
+    --initial \
+    --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
+
 # FIXME: fix the test suite
 meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} || true
 
-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
-
-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 17814ca..16884db 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
similarity index 100%
rename from README.commits
rename to CONTRIBUTING.md
diff --git a/HACKING b/HACKING
index e04e0dc..7c130ab 100644
--- a/HACKING
+++ b/HACKING
@@ -33,5 +33,5 @@
 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 ae6cb3d..a888e6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,12 +34,11 @@
 	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		\
@@ -65,7 +64,6 @@
 	$(NULL)
 
 meson_build_files = \
-	config.h.meson \
 	meson_options.txt \
 	meson.build \
 	docs/reference/gio/meson.build \
@@ -78,7 +76,10 @@
 	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 \
@@ -109,7 +110,6 @@
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST += 		\
-	README			\
 	INSTALL			\
 	ChangeLog		\
 	$(NULL)
diff --git a/NEWS b/NEWS
index e9a88e4..9794c44 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 0000000..96dc92f
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+See README.md
diff --git a/README.in b/README.md
similarity index 96%
rename from README.in
rename to README.md
index 3e8b2e5..677f2dd 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 @@
 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 @@
 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 cd755e0..1683d54 100644
--- a/README.win32
+++ b/README.win32
@@ -80,6 +80,11 @@
 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+
 =======================================
 
@@ -171,7 +176,17 @@
 
 Meson is now the supported method of building GLib using Visual Studio.
 
-Note that you will need a libintl implementation, zlib, and libFFI.
+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
 
 You will also need the following items:
 -Python 3.6.x, you need the 32-bit version if you are building GLib
@@ -180,12 +195,45 @@
 -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.
 
-One can also refer to the following page for building the dependencies:
+To do a build using Meson, do the following:
 
-https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack
+-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.
 
-Note that if building the sources with Visual Studio 2008, note 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.
+
+-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.
+
+Note that if building the sources with Visual Studio 2008, note the following
+additional items:
 
 -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
@@ -197,6 +245,7 @@
 -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", 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
+ 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 4bbc00d..9e4ba4c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,10 +25,10 @@
         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
 
 autoreconf --force --install --verbose || exit $?
 
diff --git a/configure.ac b/configure.ac
index 5804d80..3fd519e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@
 
 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 @@
 
 
 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])
@@ -332,7 +332,6 @@
 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
@@ -480,7 +479,7 @@
 # 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_CHECK_SIZEOF(char)
@@ -665,6 +664,8 @@
 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
@@ -921,20 +922,22 @@
         AC_MSG_RESULT(no)
 ])
 
-AC_MSG_CHECKING([if ip_mreq_source.imr_interface has s_addr member])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-    [[
-        #include <netinet/in.h>
-    ]],
-    [[
-        struct ip_mreq_source mc_req_src;
-        mc_req_src.imr_interface.s_addr = 0;
-    ]])], [
-        AC_MSG_RESULT(yes)
-    ], [
-        AC_MSG_RESULT(no)
-        AC_DEFINE(BROKEN_IP_MREQ_SOURCE_STRUCT, 1, [struct ip_mreq_source definition is broken on Android NDK <= r16])
-])
+# See https://bugzilla.gnome.org/show_bug.cgi?id=740791
+AS_IF([test $glib_native_android = yes], [
+  AC_MSG_CHECKING([if ip_mreq_source.imr_interface has s_addr member])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[
+          #include <netinet/in.h>
+      ]],
+      [[
+          struct ip_mreq_source mc_req_src;
+          mc_req_src.imr_interface.s_addr = 0;
+      ]])], [
+          AC_MSG_RESULT(yes)
+      ], [
+          AC_MSG_RESULT(no)
+          AC_DEFINE(BROKEN_IP_MREQ_SOURCE_STRUCT, 1, [struct ip_mreq_source definition is broken on Android NDK <= r16])
+  ])])
 
 AS_IF([test $glib_native_win32 = yes], [
   # <wspiapi.h> in the Windows SDK and in mingw-w64 has wrappers for
@@ -1551,14 +1554,14 @@
 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 ***
@@ -1567,14 +1570,14 @@
 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 ***
@@ -1771,18 +1774,6 @@
 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)
@@ -2067,13 +2058,11 @@
            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)
@@ -2363,7 +2352,7 @@
 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,
@@ -3408,6 +3397,7 @@
 AS_IF([test "x$enable_compile_warnings" != xno], [
   CC_CHECK_FLAGS_APPEND([GLIB_WARN_CFLAGS], [CFLAGS], [\
    -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 \
@@ -3459,7 +3449,6 @@
 gio-2.0.pc
 gio-unix-2.0.pc
 gio-windows-2.0.pc
-glib-zip
 glib-gettextize
 Makefile
 build/Makefile
@@ -3511,8 +3500,7 @@
 # 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])
 
@@ -3522,7 +3510,6 @@
 if false; then
   AC_CONFIG_FILES([
     INSTALL
-    README
     glib/glib.rc
     gmodule/gmodule.rc
     gobject/gobject.rc
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index e04ab68..08093e8 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -8,6 +8,7 @@
 
 # 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 @@
 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 @@
 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 b1145e5..e419208 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 @@
   <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 efcec33..0e6c14d 100644
--- a/docs/reference/gio/gdbus.xml
+++ b/docs/reference/gio/gdbus.xml
@@ -399,7 +399,7 @@
   <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 9ae6d85..0eb5607 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -1497,6 +1497,12 @@
 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
@@ -1618,6 +1624,7 @@
 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 8ab7d91..0000000
--- 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 c3fd8f5..f2635d0 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 47046f2..c7ca62a 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -182,7 +182,6 @@
   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 ba3987c..27194aa 100644
--- a/docs/reference/gio/migrating-gnome-vfs.xml
+++ b/docs/reference/gio/migrating-gnome-vfs.xml
@@ -127,7 +127,7 @@
         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 6d1e295..6aeb745 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 b485a91..dfefa25 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -140,8 +140,6 @@
 CLEANFILES ?=
 CLEANFILES += $(man_MANS)
 
-EXTRA_DIST += $(man_MANS)
-
 dist-hook-local: all-local
 
 glib-docs-clean: clean
diff --git a/docs/reference/glib/cross.xml b/docs/reference/glib/cross.xml
index 35d169b..c452004 100644
--- a/docs/reference/glib/cross.xml
+++ b/docs/reference/glib/cross.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
                "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
-<refentry id="glib-cross-compiling" revision="8 Apr 2003">
+<refentry id="glib-cross-compiling" revision="7 Aug 2018">
 <refmeta>
 <refentrytitle>Cross-compiling the GLib package</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -28,181 +28,118 @@
       <para>
         These notes cover things specific to cross-compiling GLib;
         for general information about cross-compilation, see the
-        <application>autoconf</application> info pages.
+        <ulink url="http://mesonbuild.com/Cross-compilation.html">meson</ulink>
+        info pages.
       </para>
       <para>
         GLib tries to detect as much information as possible about
         the target system by compiling and linking programs without
         actually running anything; however, some information GLib
         needs is not available this way. This information needs
-        to be provided to the configure script via a "cache file"
-        or by setting the cache variables in your environment.
+        to be provided to meson via a ‘cross file’.
       </para>
       <para>
-        As an example of using a cache file, to cross compile for
-        the "MingW32" Win32 runtime environment on a Linux system,
-        create a file 'win32.cache' with the following contents:
+        As an example of using a cross file, to cross compile for
+        the ‘MingW32’ Win64 runtime environment on a Linux system,
+        create a file <filename>cross_file.txt</filename> with the following
+        contents:
       </para>
       <programlisting> 
-glib_cv_long_long_format=I64
-glib_cv_stack_grows=no
+[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'
       </programlisting>
       <para>
         Then execute the following commands:
       </para>
       <programlisting>
-PATH=/path/to/mingw32-compiler/bin:$PATH
-chmod a-w win32.cache   # prevent configure from changing it
-./configure --cache-file=win32.cache --host=mingw32
+meson --cross_file cross_file.txt builddir
       </programlisting>
       <para>
-        The complete list of cache file variables follows. Most
+        The complete list of cross properties follows. Most
          of these won't need to be set in most cases.
       </para>
     </refsect1>
-    <refsect1 id="cache-file-variables">
-      <title>Cache file variables</title>
+    <refsect1 id="cross-properties">
+      <title>Cross properties</title>
       <formalpara>
-        <title>glib_cv_long_long_format=[ll/q/I64]</title>
-        
+        <title>have_[function]</title>
+
         <para>
-           Format used by <function>printf()</function> and 
-           <function>scanf()</function> for 64 bit integers. "ll" is 
-           the C99 standard, and what is used by the 'trio' library
-           that GLib builds if your <function>printf()</function> is 
-           insufficiently capable.
-           Doesn't need to be set if you are compiling using trio.
+           When meson checks if a function is supported, the test can be
+           overridden by setting the
+           <literal>have_<replaceable>function</replaceable></literal> property
+           to <constant>true</constant> or <constant>false</constant>.
+           For example <programlisting>Checking for function "alloca" : YES</programlisting>
+           can be overridden by setting <programlisting>have_alloca = false</programlisting>
         </para>
       </formalpara>
       <formalpara>
-        <title>glib_cv_stack_grows=[yes/no]</title>
+        <title>growing_stack=[true/false]</title>
 
         <para>
-           Whether the stack grows up or down. Most places will want "no",
-           A few architectures, such as PA-RISC need "yes".
+           Whether the stack grows up or down. Most places will want
+           <constant>false</constant>.
+           A few architectures, such as PA-RISC need <constant>true</constant>.
         </para>
       </formalpara>
       <formalpara>
-        <title>glib_cv_working_bcopy=[yes/no]</title>
-
-        <para>
-           Whether your <function>bcopy()</function> can handle overlapping 
-           copies. Only needs to be set if you don't have 
-           <function>memmove()</function>. (Very unlikely)
-	</para>
-      </formalpara>
-      <formalpara>
-         <title>glib_cv_sane_realloc=[yes/no]</title>
-
-         <para>  
-            Whether your <function>realloc()</function> conforms to ANSI C 
-            and can handle <literal>NULL</literal> as the first argument. 
-            Defaults to "yes" and probably doesn't need to be set.
-	</para>
-      </formalpara>
-      <formalpara>
-         <title>glib_cv_have_strlcpy=[yes/no]</title>
+         <title>have_strlcpy=[true/false]</title>
 
          <para>
             Whether you have <function>strlcpy()</function> that matches 
-            OpenBSD. Defaults to "no", which is safe, since GLib uses a 
-            built-in version in that case.
+            OpenBSD. Defaults to <constant>false</constant>, which is safe,
+            since GLib uses a built-in version in that case.
 	</para>
       </formalpara>
       <formalpara>
-         <title>glib_cv_have_qsort_r=[yes/no]</title>
+         <title>va_val_copy=[true/false]</title>
 
          <para>
-           Whether you have <function>qsort_r()</function> that matches
-           BSD. Defaults to "no", which is safe, since GLib uses a
-           built-in version in that case.
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>glib_cv_va_val_copy=[yes/no]</title>
-   
-         <para>
             Whether <type>va_list</type> can be copied as a pointer. If set 
-            to "no", then <function>memcopy()</function> will be used. Only 
-            matters if you don't have <function>va_copy()</function> or 
-            <function>__va_copy()</function>. (So, doesn't matter for GCC.) 
-            Defaults to "yes" which is slightly more common than "no".
-	</para>
+            to <constant>false</constant>, then <function>memcopy()</function>
+            will be used. Only matters if you don't have
+            <function>va_copy()</function> or <function>__va_copy()</function>.
+            (So, doesn't matter for GCC.)
+            Defaults to <constant>true</constant> which is slightly more common
+            than <constant>false</constant>.
+        </para>
       </formalpara>
       <formalpara>
-         <title>glib_cv_rtldglobal_broken=[yes/no]</title>
- 
-         <para>
-            Whether you have a bug found in OSF/1 v5.0. Defaults to "no".
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>glib_cv_uscore=[yes/no]</title>
-
-         <para>
-            Whether an underscore needs to be prepended to symbols when
-            looking them up via <function>dlsym()</function>. Only needs to 
-            be set if your system uses
-	    <function>dlopen()</function>/<function>dlsym()</function>.
-	 </para>
-      </formalpara>
-      <formalpara>
-         <title>ac_cv_func_posix_getpwuid_r=[yes/no]</title>
-
-         <para>
-            Whether you have a getpwuid_r function (in your C library,
-	    not your thread library) that conforms to the POSIX spec.
-            (Takes a 'struct passwd **' as the final argument)
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>ac_cv_func_nonposix_getpwuid_r=[yes/no]</title>
- 
-         <para>
-            Whether you have some variant of <function>getpwuid_r()</function>
-            that doesn't conform to to the POSIX spec, but GLib might be able
-            to use (or might segfault.) Only needs to be set if 
-	    <literal>ac_cv_func_posix_getpwuid_r</literal> is not set. It's 
-            safest to set this to "no".
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>ac_cv_func_posix_getgrgid_r=[yes/no]</title>
- 
-         <para>
-            Whether you have a getgrgid_r function that conforms to
-            the POSIX spec.
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>glib_cv_use_pid_surrogate=[yes/no]</title>
-
-         <para>
-            Whether to use a <function>setpriority()</function> on the PID of 
-            the thread as a method for setting the priority of threads. This 
-            only needs to be set when using POSIX threads.
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>ac_cv_func_printf_unix98=[yes/no]</title>
-
-         <para>
-           Whether your <function>printf()</function> family supports Unix98 
-           style <literal>%N$</literal> positional parameters. Defaults to
-	"no".
-         </para>
-      </formalpara>
-      <formalpara>
-         <title>ac_cv_func_vsnprintf_c99=[yes/no]</title>
+         <title>have_c99_vsnprintf=[true/false]</title>
 
          <para>
             Whether you have a <function>vsnprintf()</function> with C99 
             semantics. (C99 semantics means returning the number of bytes 
             that would have been written had the output buffer had enough 
-            space.) Defaults to "no".
+            space.) Defaults to <constant>false</constant>.
+         </para>
+      </formalpara>
+      <formalpara>
+         <title>have_c99_snprintf=[true/false]</title>
+
+         <para>
+            Whether you have a <function>snprintf()</function> with C99 
+            semantics. (C99 semantics means returning the number of bytes 
+            that would have been written had the output buffer had enough 
+            space.) Defaults to <constant>false</constant>.
          </para>
       </formalpara>
 
-    </refsect1>    
+    </refsect1>
 
 </refentry>
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index a0716c1..afebbec 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 0183b08..8c733e0 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -621,6 +621,7 @@
 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
@@ -1232,6 +1233,7 @@
 G_SPAWN_ERROR
 GSpawnFlags
 GSpawnChildSetupFunc
+g_spawn_async_with_fds
 g_spawn_async_with_pipes
 g_spawn_async
 g_spawn_sync
@@ -3449,3 +3451,54 @@
 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 e69de29..0000000
--- 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 da80d17..d569f0c 100644
--- a/docs/reference/glib/gvariant-text.xml
+++ b/docs/reference/glib/gvariant-text.xml
@@ -563,7 +563,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,
@@ -576,7 +579,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 fbbbfcb..b60ab2a 100644
--- a/docs/reference/glib/gvariant-varargs.xml
+++ b/docs/reference/glib/gvariant-varargs.xml
@@ -984,7 +984,7 @@
 
    <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 319c267..fbe3422 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -108,7 +108,6 @@
                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 186bbf7..80e6f4c 100644
--- a/docs/reference/glib/resources.xml
+++ b/docs/reference/glib/resources.xml
@@ -21,11 +21,10 @@
 
 <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 @@
 </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 @@
 <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 6d1e295..6aeb745 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 430ab6d..6efe781 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -13,6 +13,7 @@
 
 # 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 @@
 
 # Other files to distribute
 EXTRA_DIST += 		\
-	gobject.cI	\
 	version.xml.in
 
 ########################################################################
@@ -95,8 +95,6 @@
 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 646d91a..f045df5 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 2976940..0000000
--- 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 bb4e7b8..0000000
--- 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 de46cf9..ac2da57 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -77,12 +77,12 @@
   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/xml/meson.build b/docs/reference/gobject/xml/meson.build
index 6d1e295..6aeb745 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 8e46d6f..e14cad2 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -288,6 +288,9 @@
 	gportalsupport.h	\
 	$(portal_sources)	\
 	$(NULL)
+nodist_unix_sources = \
+	$(nodist_portal_sources) \
+	$(NULL)
 
 giounixincludedir=$(includedir)/gio-unix-2.0/gio
 giounixinclude_HEADERS = \
@@ -316,6 +319,8 @@
 gdbus_daemon_sources = \
 	gdbusdaemon.c \
 	gdbusdaemon.h \
+	$(NULL)
+nodist_gdbus_daemon_sources = \
 	gdbus-daemon-generated.c \
 	gdbus-daemon-generated.h \
 	$(NULL)
@@ -336,6 +341,9 @@
 	gwin32networkmonitor.h \
 	gwin32notificationbackend.c \
 	$(NULL)
+nodist_win32_actual_sources = \
+	$(nodist_gdbus_daemon_sources) \
+	$(NULL)
 
 win32_more_sources_for_vcproj = \
 	gwin32appinfo.c \
@@ -353,6 +361,7 @@
 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 = \
@@ -369,7 +378,6 @@
 portal_interfaces = \
 	org.freedesktop.portal.Documents.xml \
 	org.freedesktop.portal.OpenURI.xml \
-	org.freedesktop.portal.NetworkMonitor.xml \
 	org.freedesktop.portal.ProxyResolver.xml \
 	$(NULL)
 
@@ -393,7 +401,9 @@
 	gnetworkmonitorportal.h		\
 	gproxyresolverportal.c		\
 	gproxyresolverportal.h		\
-	$(xdp_dbus_built_sources)	\
+	$(NULL)
+nodist_portal_sources = \
+	$(xdp_dbus_built_sources) \
 	$(NULL)
 
 if OS_UNIX
@@ -547,14 +557,16 @@
 	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)	\
@@ -564,6 +576,11 @@
 	$(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
 
@@ -762,12 +779,12 @@
 	$(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.
@@ -786,7 +803,6 @@
 	gioenumtypes.c.template	\
 	gio.rc.in		\
 	gschema.dtd		\
-	gconstructor_as_data.h	\
 	$(NULL)
 
 BUILT_EXTRA_DIST += 		\
@@ -819,8 +835,7 @@
 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
-EXTRA_DIST += gio-querymodules-wrapper.py
+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	\
@@ -841,16 +856,20 @@
 	$(top_builddir)/glib/libglib-2.0.la		\
 	$(NULL)
 
+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_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	\
@@ -928,6 +947,7 @@
 completion_DATA = \
 	completion/gapplication				\
 	completion/gdbus				\
+	completion/gio					\
 	completion/gsettings				\
 	completion/gresource
 EXTRA_DIST += $(completion_DATA)
diff --git a/gio/completion/.gitignore b/gio/completion/.gitignore
new file mode 100644
index 0000000..6930af9
--- /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 0000000..c1db985
--- /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/meson.build b/gio/fam/meson.build
index fdbdd15..d24670a 100644
--- a/gio/fam/meson.build
+++ b/gio/fam/meson.build
@@ -1,36 +1,36 @@
-# FIXME: We should use subdir_done() instead of if blocks, but it's broken in
-# meson 0.46.1. See https://github.com/mesonbuild/meson/issues/3700.
-if get_option('fam')
-  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
+if not get_option('fam')
+  subdir_done()
+endif
 
-  deps = [
-    fam_dep,
-    libglib_dep,
-    libgobject_dep,
-    libgio_dep,
-  ]
+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
 
-  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',
-  ])
+deps = [
+  fam_dep,
+  libglib_dep,
+  libgobject_dep,
+  libgio_dep,
+]
 
-  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,
-  )
+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',
+])
 
-  if not meson.is_cross_build()
-    meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
-  endif
+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 8b2bcdc..98bda50 100644
--- a/gio/gbufferedoutputstream.c
+++ b/gio/gbufferedoutputstream.c
@@ -699,7 +699,7 @@
   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 @@
   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/gcontenttype.c b/gio/gcontenttype.c
index af8ef44..57249d9 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -405,8 +405,8 @@
  *
  * 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 032a29e..e74131c 100644
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -613,6 +613,286 @@
 
 # ----------------------------------------------------------------------------------------------------
 
+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 @@
                            '\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 65876a2..03de1d1 100755
--- a/gio/gdbus-2.0/codegen/codegen_main.py
+++ b/gio/gdbus-2.0/codegen/codegen_main.py
@@ -63,38 +63,38 @@
             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 @@
     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 @@
                        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 @@
 
         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 @@
         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 @@
                                         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 bfc69f5..2ff736a 100644
--- a/gio/gdbus-2.0/codegen/dbustypes.py
+++ b/gio/gdbus-2.0/codegen/dbustypes.py
@@ -27,6 +27,25 @@
         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 @@
         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 @@
                 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 @@
         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 @@
         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 @@
         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 @@
 
         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 54a86b0..24d2527 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -10,7 +10,7 @@
 
 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 @@
   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 @@
                                             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 bdfa703..95ba107 100644
--- a/gio/gdbus-2.0/codegen/utils.py
+++ b/gio/gdbus-2.0/codegen/utils.py
@@ -116,21 +116,21 @@
 
 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 2191c11..f377378 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -418,6 +418,10 @@
         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 869946d..553bcdc 100644
--- a/gio/gdbusauthmechanismsha1.c
+++ b/gio/gdbusauthmechanismsha1.c
@@ -603,7 +603,7 @@
   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 @@
     }
 
   new_contents = g_string_new (NULL);
-  now = (guint64) time (NULL);
+  now = g_get_real_time () / G_USEC_PER_SEC;
   changed_file = FALSE;
 
   max_line_id = 0;
@@ -672,7 +672,7 @@
           gchar **tokens;
           gchar *endp;
           gint line_id;
-          guint64 line_when;
+          gint64 line_when;
           gboolean keep_entry;
 
           if (line[0] == '\0')
@@ -807,9 +807,9 @@
       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 ae463e4..543ca0b 100644
--- 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"
@@ -4121,7 +4112,7 @@
     {
       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);
@@ -4263,7 +4254,7 @@
     {
       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);
       g_object_unref (reply);
@@ -4275,7 +4266,7 @@
     {
       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);
       g_object_unref (reply);
@@ -4286,7 +4277,7 @@
     {
       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);
       g_object_unref (reply);
@@ -4306,7 +4297,7 @@
         {
           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);
@@ -4411,7 +4402,7 @@
       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);
       g_object_unref (reply);
@@ -4468,7 +4459,7 @@
     {
       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);
@@ -4619,7 +4610,7 @@
       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);
       g_object_unref (reply);
@@ -4837,7 +4828,7 @@
       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);
@@ -4935,7 +4926,7 @@
     {
       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);
       g_object_unref (reply);
@@ -4966,7 +4957,7 @@
 
       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);
@@ -5624,7 +5615,7 @@
           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);
@@ -6588,7 +6579,7 @@
           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);
@@ -6699,7 +6690,7 @@
       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));
@@ -7097,7 +7088,7 @@
   /* 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);
@@ -7149,7 +7140,7 @@
                            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/gdbusmessage.c b/gio/gdbusmessage.c
index be001ae..8de836b 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
@@ -1992,7 +1994,7 @@
 
 /**
  * g_dbus_message_new_from_blob:
- * @blob: (array length=blob_len) (element-type guint8): A blob represent a binary D-Bus message.
+ * @blob: (array length=blob_len) (element-type guint8): A blob representing a binary D-Bus message.
  * @blob_len: The length of @blob.
  * @capabilities: A #GDBusCapabilityFlags describing what protocol features are supported.
  * @error: Return location for error or %NULL.
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index a2aa760..d0ffbac 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -155,6 +155,7 @@
 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 @@
   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 @@
                                            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 @@
 
   char **argv, **envp;
   int argc;
-  ChildSetupData data;
 
   g_return_val_if_fail (info != NULL, FALSE);
 
@@ -2705,6 +2673,8 @@
       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 @@
           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_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_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 @@
                                          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 @@
   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 @@
                                                   launch_context,
                                                   _SPAWN_FLAGS_DEFAULT,
                                                   NULL, NULL, NULL, NULL,
+                                                  -1, -1, -1,
                                                   error);
 }
 
@@ -3029,6 +3016,61 @@
 }
 
 /**
+ * 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 @@
  * 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 @@
                                            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 @@
 
       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 a2df3dd..86a3caa 100644
--- a/gio/gdesktopappinfo.h
+++ b/gio/gdesktopappinfo.h
@@ -169,6 +169,20 @@
 						       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/gfdonotificationbackend.c b/gio/gfdonotificationbackend.c
index a0d4814..c4fa0dc 100644
--- a/gio/gfdonotificationbackend.c
+++ b/gio/gfdonotificationbackend.c
@@ -62,12 +62,12 @@
   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 @@
 }
 
 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 @@
   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 @@
           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 @@
                                               GNotification        *notification)
 {
   GFdoNotificationBackend *self = G_FDO_NOTIFICATION_BACKEND (backend);
-  FreedesktopNotification *n;
+  FreedesktopNotification *n, *tmp;
 
   if (self->notify_subscription == 0)
     {
@@ -391,24 +418,11 @@
                                             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 = freedesktop_notification_new (self, id, notification);
 
-      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);
-    }
-
-  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 c17aeb0..a5709a4 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -702,6 +702,11 @@
  * 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 @@
 
       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/gio-autocleanups.h b/gio/gio-autocleanups.h
index 6247022..dcba4d9 100644
--- a/gio/gio-autocleanups.h
+++ b/gio/gio-autocleanups.h
@@ -108,6 +108,7 @@
 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 0000000..03845df
--- /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-tool-mount.c b/gio/gio-tool-mount.c
index 224ff89..05647d9 100644
--- a/gio/gio-tool-mount.c
+++ b/gio/gio-tool-mount.c
@@ -39,6 +39,7 @@
 
 static int outstanding_mounts = 0;
 static GMainLoop *main_loop;
+static GVolumeMonitor *volume_monitor;
 
 static gboolean mount_mountable = FALSE;
 static gboolean mount_unmount = FALSE;
@@ -48,6 +49,9 @@
 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;
@@ -68,6 +72,9 @@
   { "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 }
 };
 
@@ -174,6 +181,16 @@
         }
     }
 
+  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)
@@ -468,12 +485,9 @@
 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)
     {
@@ -508,8 +522,6 @@
       print_error ("%s: %s", device_file, _("No drive for device file"));
       success = FALSE;
     }
-
-  g_object_unref (volume_monitor);
 }
 
 static gboolean
@@ -889,11 +901,8 @@
 static void
 list_monitor_items (void)
 {
-  GVolumeMonitor *volume_monitor;
   GList *drives, *volumes, *mounts;
 
-  volume_monitor = g_volume_monitor_get();
-
   /* populate gvfs network mounts */
   iterate_gmain();
 
@@ -908,19 +917,14 @@
   mounts = g_volume_monitor_get_mounts (volume_monitor);
   list_mounts (mounts, 0, TRUE);
   g_list_free_full (mounts, g_object_unref);
-
-  g_object_unref (volume_monitor);
 }
 
 static void
 unmount_all_with_scheme (const char *scheme)
 {
-  GVolumeMonitor *volume_monitor;
   GList *mounts;
   GList *l;
 
-  volume_monitor = g_volume_monitor_get();
-
   /* populate gvfs network mounts */
   iterate_gmain();
 
@@ -936,8 +940,6 @@
     g_object_unref (root);
   }
   g_list_free_full (mounts, g_object_unref);
-
-  g_object_unref (volume_monitor);
 }
 
 static void
@@ -988,12 +990,9 @@
 static void
 mount_with_device_file (const char *device_file)
 {
-  GVolumeMonitor *volume_monitor;
   GList *volumes;
   GList *l;
 
-  volume_monitor = g_volume_monitor_get();
-
   volumes = g_volume_monitor_get_volumes (volume_monitor);
   for (l = volumes; l != NULL; l = l->next)
     {
@@ -1028,8 +1027,6 @@
       print_error ("%s: %s", device_file, _("No volume for device file"));
       success = FALSE;
     }
-
-  g_object_unref (volume_monitor);
 }
 
 static void
@@ -1183,10 +1180,6 @@
 static void
 monitor (void)
 {
-  GVolumeMonitor *volume_monitor;
-
-  volume_monitor = g_volume_monitor_get ();
-
   g_signal_connect (volume_monitor, "mount-added", (GCallback) monitor_mount_added, NULL);
   g_signal_connect (volume_monitor, "mount-removed", (GCallback) monitor_mount_removed, NULL);
   g_signal_connect (volume_monitor, "mount-changed", (GCallback) monitor_mount_changed, NULL);
@@ -1239,6 +1232,7 @@
     }
 
   main_loop = g_main_loop_new (NULL, FALSE);
+  volume_monitor = g_volume_monitor_get ();
 
   if (mount_list)
     list_monitor_items ();
@@ -1268,6 +1262,7 @@
     {
       show_help (context, _("No locations given"));
       g_option_context_free (context);
+      g_object_unref (volume_monitor);
       return 1;
     }
 
@@ -1276,5 +1271,7 @@
   if (outstanding_mounts > 0)
     g_main_loop_run (main_loop);
 
+  g_object_unref (volume_monitor);
+
   return success ? 0 : 2;
 }
diff --git a/gio/gio-tool-move.c b/gio/gio-tool-move.c
index 89c1ed5..5755f59 100644
--- a/gio/gio-tool-move.c
+++ b/gio/gio-tool-move.c
@@ -106,6 +106,7 @@
   if (do_help)
     {
       show_help (context, NULL);
+      g_option_context_free (context);
       return 0;
     }
 
diff --git a/gio/gioenums.h b/gio/gioenums.h
index bc844b9..99b1c79 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -572,17 +572,19 @@
  * @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 30731f7..36c0cef 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -802,14 +802,29 @@
 }
 
 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 @@
       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 @@
       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 708f99c..bf88334 100644
--- a/gio/glib-compile-resources.c
+++ b/gio/glib-compile-resources.c
@@ -734,13 +734,13 @@
   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 },
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index f6e1b40..5e1bebb 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -179,6 +179,8 @@
   GString      *unparsed_default_value;
   GVariant     *default_value;
 
+  GVariantDict *desktop_overrides;
+
   GString      *strinfo;
   gboolean      is_enum;
   gboolean      is_flags;
@@ -731,6 +733,11 @@
             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 @@
   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 @@
       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 @@
       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 @@
 
               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 @@
 
                   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 @@
 
               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 @@
 
                   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 @@
                       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 @@
 
                       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 @@
                   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 @@
 
                       fprintf (stderr, _(" and --strict was specified; exiting.\n"));
                       g_key_file_free (key_file);
+                      g_strfreev (pieces);
                       g_strfreev (groups);
                       g_strfreev (keys);
 
@@ -2036,15 +2090,29 @@
                     }
                 }
 
-              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);
         }
 
       g_strfreev (groups);
+      g_key_file_free (key_file);
     }
 
   return TRUE;
@@ -2076,6 +2144,7 @@
 
     /* 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 3cd0137..30fa228 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -983,15 +983,20 @@
   block_size = statfs_buffer.f_bsize;
   
   /* Many backends can't report free size (for instance the gvfs fuse
-     backend for backend not supporting this), and set f_bfree to 0,
-     but it can be 0 for real too. We treat the available == 0 and
-     free == 0 case as "both of these are invalid".
-   */
-#ifndef G_OS_WIN32
+   * backend for backend not supporting this), and set f_bfree to 0,
+   *  but it can be 0 for real too. We treat the available == 0 and
+   * free == 0 case as "both of these are invalid", but only on file systems
+   * which are known to not support this (otherwise we can omit metadata for
+   * systems which are legitimately full). */
+#if defined(__linux__)
   if (statfs_result == 0 &&
-      statfs_buffer.f_bavail == 0 && statfs_buffer.f_bfree == 0)
+      statfs_buffer.f_bavail == 0 && statfs_buffer.f_bfree == 0 &&
+      (/* linux/ncp_fs.h: NCP_SUPER_MAGIC == 0x564c */
+       statfs_buffer.f_type == 0x564c ||
+       /* man statfs: FUSE_SUPER_MAGIC == 0x65735546 */
+       statfs_buffer.f_type == 0x65735546))
     no_size = TRUE;
-#endif /* G_OS_WIN32 */
+#endif  /* __linux__ */
   
 #elif defined(USE_STATVFS)
   statfs_result = statvfs (local->filename, &statfs_buffer);
@@ -1769,6 +1774,7 @@
   char uid_str[32];
   GStatBuf global_stat, trash_stat;
   gboolean res;
+  GUnixMountEntry *mount;
 
   if (g_once_init_enter (&home_dev_set))
     {
@@ -1787,6 +1793,17 @@
   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) &&
@@ -1881,8 +1898,9 @@
   char *original_name, *original_name_escaped;
   int i;
   char *data;
+  char *path;
   gboolean is_homedir_trash;
-  char delete_time[32];
+  char *delete_time = NULL;
   int fd;
   GStatBuf trash_stat, global_stat;
   char *dirname, *globaldir;
@@ -1905,6 +1923,24 @@
 
   is_homedir_trash = FALSE;
   trashdir = NULL;
+
+  /* On overlayfs, a file's st_dev will be different to the home directory's.
+   * We still want to create our trash directory under the home directory, so
+   * instead we should stat the directory that the file we're deleting is in as
+   * this will have the same st_dev.
+   */
+  if (!S_ISDIR (file_stat.st_mode))
+    {
+      path = g_path_get_dirname (local->filename);
+      /* If the parent is a symlink to a different device then it might have
+       * st_dev equal to the home directory's, in which case we will end up
+       * trying to rename across a filesystem boundary, which doesn't work. So
+       * we use g_stat here instead of g_lstat, to know where the symlink
+       * points to. */
+      g_stat (path, &file_stat);
+      g_free (path);
+    }
+
   if (file_stat.st_dev == home_stat.st_dev)
     {
       is_homedir_trash = TRUE;
@@ -1930,6 +1966,7 @@
     {
       uid_t uid;
       char uid_str[32];
+      GUnixMountEntry *mount;
 
       uid = geteuid ();
       g_snprintf (uid_str, sizeof (uid_str), "%lu", (unsigned long)uid);
@@ -1939,10 +1976,24 @@
 	{
           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 +2145,17 @@
   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 df0352a..58802fd 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -957,7 +957,8 @@
   else if (S_ISLNK (statbuf->st_mode))
     file_type = G_FILE_TYPE_SYMBOLIC_LINK;
 #elif defined (G_OS_WIN32)
-  if (statbuf->reparse_tag == IO_REPARSE_TAG_SYMLINK)
+  if (statbuf->reparse_tag == IO_REPARSE_TAG_SYMLINK ||
+      statbuf->reparse_tag == IO_REPARSE_TAG_MOUNT_POINT)
     file_type = G_FILE_TYPE_SYMBOLIC_LINK;
 #endif
 
@@ -1001,13 +1002,20 @@
 #elif defined (HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC)
   _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_USEC, statbuf->st_atim.tv_nsec / 1000);
 #endif
-  
+
+#ifndef G_OS_WIN32
+  /* Microsoft uses st_ctime for file creation time,
+   * instead of file change time:
+   * https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions#generic-text-routine-mappings
+   * Thank you, Microsoft!
+   */
   _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED, statbuf->st_ctime);
 #if defined (HAVE_STRUCT_STAT_ST_CTIMENSEC)
   _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED_USEC, statbuf->st_ctimensec / 1000);
 #elif defined (HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC)
   _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED_USEC, statbuf->st_ctim.tv_nsec / 1000);
 #endif
+#endif
 
 #if defined (HAVE_STRUCT_STAT_ST_BIRTHTIME) && defined (HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC)
   _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CREATED, statbuf->st_birthtime);
@@ -1019,6 +1027,8 @@
   _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CREATED, statbuf->st_birthtime);
 #elif defined (HAVE_STRUCT_STAT_ST_BIRTHTIM)
   _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CREATED, statbuf->st_birthtim);
+#elif defined (G_OS_WIN32)
+  _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CREATED, statbuf->st_ctime);
 #endif
 
   if (_g_file_attribute_matcher_matches_id (attribute_matcher,
@@ -1119,8 +1129,10 @@
   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);
 
@@ -1205,10 +1217,12 @@
 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);
 
@@ -1791,7 +1805,9 @@
   is_symlink = stat_ok && S_ISLNK (statbuf.st_mode);
 #elif defined (G_OS_WIN32)
   /* glib already checked the FILE_ATTRIBUTE_REPARSE_POINT for us */
-  is_symlink = stat_ok && statbuf.reparse_tag == IO_REPARSE_TAG_SYMLINK; 
+  is_symlink = stat_ok &&
+      (statbuf.reparse_tag == IO_REPARSE_TAG_SYMLINK ||
+       statbuf.reparse_tag == IO_REPARSE_TAG_MOUNT_POINT);
 #else
   is_symlink = FALSE;
 #endif
@@ -2174,7 +2190,9 @@
     GWin32PrivateStat statbuf;
 
     res = GLIB_PRIVATE_CALL (g_win32_lstat_utf8) (filename, &statbuf);
-    is_symlink = (res == 0 && statbuf.reparse_tag == IO_REPARSE_TAG_SYMLINK);
+    is_symlink = (res == 0 &&
+                  (statbuf.reparse_tag == IO_REPARSE_TAG_SYMLINK ||
+                   statbuf.reparse_tag == IO_REPARSE_TAG_MOUNT_POINT));
 #endif
     if (is_symlink)
       {
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index c19da3b..7b0a824 100644
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.c
@@ -648,6 +648,8 @@
   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/gmountoperation.c b/gio/gmountoperation.c
index 2a2b4ce..d59acb3 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 @@
   gboolean anonymous;
   GPasswordSave password_save;
   int choice;
+  gboolean hidden_volume;
+  gboolean system_volume;
+  guint pim;
 };
 
 enum {
@@ -77,7 +86,10 @@
   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_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_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 @@
                                                      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_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 24b96e0..1361fb8 100644
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.h
@@ -149,6 +149,21 @@
 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/gnetworkmonitorportal.c b/gio/gnetworkmonitorportal.c
index 856f8aa..bce8a33 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 @@
 
 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 @@
   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,191 @@
 }
 
 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
+update_properties (GDBusProxy *proxy,
+                   GNetworkMonitorPortal *nm)
+{
+  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_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)
+    {
+      update_properties (proxy, 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 +286,19 @@
       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,11 +312,34 @@
 
   g_free (name_owner);
 
-  g_signal_connect (proxy, "changed", G_CALLBACK (proxy_changed), nm);
-  nm->priv->proxy = proxy;
-  nm->priv->network_available = glib_network_available_in_sandbox ();
+  ret = g_dbus_proxy_get_cached_property (proxy, "version");
+  g_variant_get (ret, "u", &version);
+  g_variant_unref (ret);
 
-  return initable_parent_iface->init (initable, cancellable, error);
+  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->has_network = glib_network_available_in_sandbox ();
+  nm->priv->version = version;
+
+  if (!initable_parent_iface->init (initable, cancellable, error))
+    return FALSE;
+
+  if (nm->priv->has_network && nm->priv->version == 2)
+    update_properties (proxy, nm);
+
+  return TRUE;
 }
 
 static void
diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index b25eebf..d1de026 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.c
@@ -31,6 +31,9 @@
 #ifdef HAVE_LIBELF
 #include <libelf.h>
 #include <gelf.h>
+#endif
+
+#ifdef HAVE_MMAP
 #include <sys/mman.h>
 #endif
 
@@ -42,6 +45,10 @@
 #include "glib/glib-private.h"
 #endif
 
+#if defined(HAVE_LIBELF) && defined(HAVE_MMAP)
+#define USE_LIBELF
+#endif
+
 /* GResource functions {{{1 */
 static GResource *
 get_resource (const gchar *file)
@@ -133,7 +140,7 @@
 
 /* Elf functions {{{1 */
 
-#ifdef HAVE_LIBELF
+#ifdef USE_LIBELF
 
 static Elf *
 get_elf (const gchar *file,
@@ -353,7 +360,7 @@
   return TRUE;
 }
 
-#endif /* HAVE_LIBELF */
+#endif /* USE_LIBELF */
 
   /* Toplevel commands {{{1 */
 
@@ -365,7 +372,7 @@
 {
   GResource *resource;
 
-#ifdef HAVE_LIBELF
+#ifdef USE_LIBELF
 
   Elf *elf;
   gint fd;
@@ -388,7 +395,7 @@
   else
     {
       g_printerr ("Don't know how to handle %s\n", file);
-#ifndef HAVE_LIBELF
+#ifndef USE_LIBELF
       g_printerr ("gresource is built without elf support\n");
 #endif
     }
@@ -402,7 +409,7 @@
 {
   GResource *resource;
 
-#ifdef HAVE_LIBELF
+#ifdef USE_LIBELF
   Elf *elf;
   int fd;
 
@@ -424,7 +431,7 @@
   else
     {
       g_printerr ("Don't know how to handle %s\n", file);
-#ifndef HAVE_LIBELF
+#ifndef USE_LIBELF
       g_printerr ("gresource is built without elf support\n");
 #endif
     }
@@ -438,7 +445,7 @@
 {
   GResource *resource;
 
-#ifdef HAVE_LIBELF
+#ifdef USE_LIBELF
 
   Elf *elf;
   int fd;
@@ -461,7 +468,7 @@
   else
     {
       g_printerr ("Don't know how to handle %s\n", file);
-#ifndef HAVE_LIBELF
+#ifndef USE_LIBELF
       g_printerr ("gresource is built without elf support\n");
 #endif
     }
diff --git a/gio/gresource.c b/gio/gresource.c
index 8ead26b..2844f48 100644
--- a/gio/gresource.c
+++ b/gio/gresource.c
@@ -489,7 +489,7 @@
 {
   if (g_atomic_int_dec_and_test (&resource->ref_count))
     {
-      gvdb_table_unref (resource->table);
+      gvdb_table_free (resource->table);
       g_free (resource);
     }
 }
@@ -512,6 +512,19 @@
   return resource;
 }
 
+static void
+g_resource_error_from_gvdb_table_error (GError **g_resource_error,
+                                        GError  *gvdb_table_error  /* (transfer full) */)
+{
+  if (g_error_matches (gvdb_table_error, G_FILE_ERROR, G_FILE_ERROR_INVAL))
+    g_set_error_literal (g_resource_error,
+                         G_RESOURCE_ERROR, G_RESOURCE_ERROR_INTERNAL,
+                         gvdb_table_error->message);
+  else
+    g_propagate_error (g_resource_error, g_steal_pointer (&gvdb_table_error));
+  g_clear_error (&gvdb_table_error);
+}
+
 /**
  * g_resource_new_from_data:
  * @data: A #GBytes
@@ -528,6 +541,8 @@
  * Otherwise this function will internally create a copy of the memory since
  * GLib 2.56, or in older versions fail and exit the process.
  *
+ * If @data is empty or corrupt, %G_RESOURCE_ERROR_INTERNAL will be returned.
+ *
  * Returns: (transfer full): a new #GResource, or %NULL on error
  *
  * Since: 2.32
@@ -538,6 +553,7 @@
 {
   GvdbTable *table;
   gboolean unref_data = FALSE;
+  GError *local_error = NULL;
 
   if (((guintptr) g_bytes_get_data (data, NULL)) % sizeof (gpointer) != 0)
     {
@@ -546,19 +562,16 @@
       unref_data = TRUE;
     }
 
-  table = gvdb_table_new_from_data (g_bytes_get_data (data, NULL),
-                                    g_bytes_get_size (data),
-                                    TRUE,
-                                    g_bytes_ref (data),
-                                    (GvdbRefFunc)g_bytes_ref,
-                                    (GDestroyNotify)g_bytes_unref,
-                                    error);
+  table = gvdb_table_new_from_bytes (data, TRUE, &local_error);
 
   if (unref_data)
     g_bytes_unref (data);
 
   if (table == NULL)
-    return NULL;
+    {
+      g_resource_error_from_gvdb_table_error (error, g_steal_pointer (&local_error));
+      return NULL;
+    }
 
   return g_resource_new_from_table (table);
 }
@@ -574,6 +587,11 @@
  * If you want to use this resource in the global resource namespace you need
  * to register it with g_resources_register().
  *
+ * If @filename is empty or the data in it is corrupt,
+ * %G_RESOURCE_ERROR_INTERNAL will be returned. If @filename doesn’t exist, or
+ * there is an error in reading it, an error from g_mapped_file_new() will be
+ * returned.
+ *
  * Returns: (transfer full): a new #GResource, or %NULL on error
  *
  * Since: 2.32
@@ -583,31 +601,36 @@
                  GError      **error)
 {
   GvdbTable *table;
+  GError *local_error = NULL;
 
-  table = gvdb_table_new (filename, FALSE, error);
+  table = gvdb_table_new (filename, FALSE, &local_error);
   if (table == NULL)
-    return NULL;
+    {
+      g_resource_error_from_gvdb_table_error (error, g_steal_pointer (&local_error));
+      return NULL;
+    }
 
   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/gschema.dtd b/gio/gschema.dtd
index 8cd552d..1599f8d 100644
--- a/gio/gschema.dtd
+++ b/gio/gschema.dtd
@@ -49,8 +49,8 @@
 <!ELEMENT range EMPTY >
 <!-- min and max must be parseable as values of the key type and
      min must be less than or equal to max -->
-<!ATTLIST range min CDATA #REQUIRED
-                max CDATA #REQUIRED >
+<!ATTLIST range min CDATA #IMPLIED
+                max CDATA #IMPLIED >
 
 <!-- choices is only allowed for keys with string or string array type -->
 <!ELEMENT choices (choice+) >
diff --git a/gio/gsettings.c b/gio/gsettings.c
index e5ed54a..ab7f438 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1204,10 +1204,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
       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 @@
 
   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 @@
 
       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_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 f54de3b..5f996b4 100644
--- a/gio/gsettingsschema-internal.h
+++ b/gio/gsettingsschema-internal.h
@@ -37,6 +37,7 @@
   const GVariantType *type;
   GVariant *minimum, *maximum;
   GVariant *default_value;
+  GVariant *desktop_overrides;
 
   gint ref_count;
 };
@@ -58,6 +59,7 @@
 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 f1274a3..38c9d78 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
@@ -230,7 +231,7 @@
 
       if (source->parent)
         g_settings_schema_source_unref (source->parent);
-      gvdb_table_unref (source->table);
+      gvdb_table_free (source->table);
       g_free (source->directory);
 
       if (source->text_tables)
@@ -266,6 +267,9 @@
  * Generally, you should set @trusted to %TRUE for files installed by the
  * system and to %FALSE for files in the home directory.
  *
+ * In either case, an empty file or some types of corruption in the file will
+ * result in %G_FILE_ERROR_INVAL being returned.
+ *
  * If @parent is non-%NULL then there are two effects.
  *
  * First, if g_settings_schema_source_lookup() is called with the
@@ -801,7 +805,7 @@
               else
                 g_hash_table_add (reloc, schema);
 
-              gvdb_table_unref (table);
+              gvdb_table_free (table);
             }
         }
 
@@ -927,7 +931,7 @@
         g_settings_schema_unref (schema->extends);
 
       g_settings_schema_source_unref (schema->source);
-      gvdb_table_unref (schema->table);
+      gvdb_table_free (schema->table);
       g_free (schema->items);
       g_free (schema->id);
 
@@ -1187,7 +1191,7 @@
                   g_hash_table_iter_remove (&iter);
               }
 
-            gvdb_table_unref (child_table);
+            gvdb_table_free (child_table);
           }
 
       /* Now create the list */
@@ -1283,6 +1287,11 @@
           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 +1312,9 @@
   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 +1422,35 @@
   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 +1740,9 @@
   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 11be2e7..859e807 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2957,9 +2957,11 @@
 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_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 814ba94..4087543 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -52,7 +52,7 @@
  * where it was created (waiting until the next iteration of the main
  * loop first, if necessary). The caller will pass the #GTask back to
  * the operation's finish function (as a #GAsyncResult), and you can
- * can use g_task_propagate_pointer() or the like to extract the
+ * use g_task_propagate_pointer() or the like to extract the
  * return value.
  *
  * Here is an example for using GTask as a GAsyncResult:
@@ -1975,6 +1975,7 @@
   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 e89dc15..9e110cd 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -803,7 +803,9 @@
 
 #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 @@
 #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/gtlsclientconnection.c b/gio/gtlsclientconnection.c
index f80c625..b38fad6 100644
--- a/gio/gtlsclientconnection.c
+++ b/gio/gtlsclientconnection.c
@@ -105,14 +105,7 @@
    *
    * If %TRUE, forces the connection to use a fallback version of TLS
    * or SSL, rather than trying to negotiate the best version of TLS
-   * to use. This can be used when talking to servers that don't
-   * implement version negotiation correctly and therefore refuse to
-   * handshake at all with a modern TLS handshake.
-   *
-   * Despite the property name, the fallback version is usually not
-   * SSL 3.0, because SSL 3.0 is generally disabled by the #GTlsBackend.
-   * #GTlsClientConnection will use the next-highest available version
-   * as the fallback version.
+   * to use. See g_tls_client_connection_set_use_ssl3().
    *
    * Since: 2.28
    *
@@ -304,14 +297,19 @@
  * @conn: the #GTlsClientConnection
  * @use_ssl3: whether to use the lowest-supported protocol version
  *
- * If @use_ssl3 is %TRUE, this forces @conn to use the lowest-supported
- * TLS protocol version rather than trying to properly negotiate the
- * highest mutually-supported protocol version with the peer. This can
- * be used when talking to broken TLS servers that exhibit protocol
- * version intolerance.
+ * Since 2.42.1, if @use_ssl3 is %TRUE, this forces @conn to use the
+ * lowest-supported TLS protocol version rather than trying to properly
+ * negotiate the highest mutually-supported protocol version with the
+ * peer. Be aware that SSL 3.0 is generally disabled by the
+ * #GTlsBackend, so the lowest-supported protocol version is probably
+ * not SSL 3.0.
  *
- * Be aware that SSL 3.0 is generally disabled by the #GTlsBackend, so
- * the lowest-supported protocol version is probably not SSL 3.0.
+ * Since 2.58, this may additionally cause an RFC 7507 fallback SCSV to
+ * be sent to the server, causing modern TLS servers to immediately
+ * terminate the connection. You should generally only use this function
+ * if you need to connect to broken servers that exhibit TLS protocol
+ * version intolerance, and when an initial attempt to connect to a
+ * server normally has already failed.
  *
  * Since: 2.28
  *
diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c
index e13d986..b0353af 100644
--- a/gio/gtlsconnection.c
+++ b/gio/gtlsconnection.c
@@ -674,7 +674,8 @@
  * @conn: a #GTlsConnection
  * @mode: the rehandshaking mode
  *
- * Sets how @conn behaves with respect to rehandshaking requests.
+ * Sets how @conn behaves with respect to rehandshaking requests, when
+ * TLS 1.2 or older is in use.
  *
  * %G_TLS_REHANDSHAKE_NEVER means that it will never agree to
  * rehandshake after the initial handshake is complete. (For a client,
@@ -756,7 +757,8 @@
  * the beginning of the communication, you do not need to call this
  * function explicitly unless you want clearer error reporting.
  * However, you may call g_tls_connection_handshake() later on to
- * renegotiate parameters (encryption methods, etc) with the client.
+ * rehandshake, if TLS 1.2 or older is in use. With TLS 1.3, this will
+ * instead perform a rekey.
  *
  * #GTlsConnection::accept_certificate may be emitted during the
  * handshake.
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index f2db27e..355329c 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -307,7 +307,6 @@
     "autofs",
     "autofs4",
     "cgroup",
-    "cifs",
     "configfs",
     "cxfs",
     "debugfs",
@@ -329,8 +328,6 @@
     "mfs",
     "mqueue",
     "ncpfs",
-    "nfs",
-    "nfs4",
     "nfsd",
     "nullfs",
     "ocfs2",
@@ -343,7 +340,6 @@
     "rpc_pipefs",
     "securityfs",
     "selinuxfs",
-    "smbfs",
     "sysfs",
     "tmpfs",
     "usbfs",
diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c
index b0d3c8f..27e195e 100644
--- a/gio/gunixsocketaddress.c
+++ b/gio/gunixsocketaddress.c
@@ -66,7 +66,9 @@
   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/gunixvolume.c b/gio/gunixvolume.c
index b54d1fd..a3768e1 100644
--- a/gio/gunixvolume.c
+++ b/gio/gunixvolume.c
@@ -274,6 +274,7 @@
   GTask *task = user_data;
   GError *error = NULL;
   gchar *stderr_str;
+  GUnixVolume *unix_volume;
 
   if (!g_subprocess_communicate_utf8_finish (subprocess, result, NULL, &stderr_str, &error))
     {
@@ -286,8 +287,12 @@
         /* ...but bad exit code */
         g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "%s", stderr_str);
       else
-        /* ...and successful exit code */
-        g_task_return_boolean (task, TRUE);
+        {
+          /* ...and successful exit code */
+          unix_volume = G_UNIX_VOLUME (g_task_get_source_object (task));
+          _g_unix_volume_monitor_update (G_UNIX_VOLUME_MONITOR (unix_volume->volume_monitor));
+          g_task_return_boolean (task, TRUE);
+        }
 
       g_free (stderr_str);
     }
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index b7711ff..4b99423 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -183,15 +183,21 @@
   native_class->get_mount_for_mount_path = get_mount_for_mount_path;
 }
 
+void
+_g_unix_volume_monitor_update (GUnixVolumeMonitor *unix_monitor)
+{
+  /* Update both to make sure volumes are created before mounts */
+  update_volumes (unix_monitor);
+  update_mounts (unix_monitor);
+}
+
 static void
 mountpoints_changed (GUnixMountMonitor *mount_monitor,
 		     gpointer           user_data)
 {
   GUnixVolumeMonitor *unix_monitor = user_data;
 
-  /* Update both to make sure volumes are created before mounts */
-  update_volumes (unix_monitor);
-  update_mounts (unix_monitor);
+  _g_unix_volume_monitor_update (unix_monitor);
 }
 
 static void
@@ -200,9 +206,7 @@
 {
   GUnixVolumeMonitor *unix_monitor = user_data;
 
-  /* Update both to make sure volumes are created before mounts */
-  update_volumes (unix_monitor);
-  update_mounts (unix_monitor);
+  _g_unix_volume_monitor_update (unix_monitor);
 }
 
 static void
@@ -219,8 +223,7 @@
 		    "mountpoints-changed", G_CALLBACK (mountpoints_changed),
 		    unix_monitor);
 		    
-  update_volumes (unix_monitor);
-  update_mounts (unix_monitor);
+  _g_unix_volume_monitor_update (unix_monitor);
 }
 
 GVolumeMonitor *
diff --git a/gio/gunixvolumemonitor.h b/gio/gunixvolumemonitor.h
index 4f54fc2..14e07fb 100644
--- a/gio/gunixvolumemonitor.h
+++ b/gio/gunixvolumemonitor.h
@@ -55,6 +55,7 @@
 GVolumeMonitor * _g_unix_volume_monitor_new                          (void);
 GUnixVolume    * _g_unix_volume_monitor_lookup_volume_for_mount_path (GUnixVolumeMonitor *monitor,
                                                                       const char         *mount_path);
+void             _g_unix_volume_monitor_update                       (GUnixVolumeMonitor *monitor);
 
 G_END_DECLS
 
diff --git a/gio/gvdb/gvdb-builder.c b/gio/gvdb/gvdb-builder.c
index 8b9baa0..2383e60 100644
--- a/gio/gvdb/gvdb-builder.c
+++ b/gio/gvdb/gvdb-builder.c
@@ -339,6 +339,13 @@
 #undef chunk
 
   memset (*bloom_filter, 0, n_bloom_words * sizeof (guint32_le));
+
+  /* NOTE - the code to actually fill in the bloom filter here is missing.
+   * Patches welcome! 
+   *
+   * http://en.wikipedia.org/wiki/Bloom_filter
+   * http://0pointer.de/blog/projects/bloom.html
+   */
 }
 
 static void
diff --git a/gio/gvdb/gvdb-reader.c b/gio/gvdb/gvdb-reader.c
index 510eba2..aa3154f 100644
--- a/gio/gvdb/gvdb-reader.c
+++ b/gio/gvdb/gvdb-reader.c
@@ -23,15 +23,11 @@
 #include <string.h>
 
 struct _GvdbTable {
-  gint ref_count;
+  GBytes *bytes;
 
   const gchar *data;
   gsize size;
 
-  gpointer user_data;
-  GvdbRefFunc ref_user_data;
-  GDestroyNotify unref_user_data;
-
   gboolean byteswapped;
   gboolean trusted;
 
@@ -124,80 +120,81 @@
   file->n_hash_items = size / sizeof (struct gvdb_hash_item);
 }
 
-static GvdbTable *
-new_from_data (const void    *data,
-	       gsize          data_len,
-	       gboolean       trusted,
-	       gpointer       user_data,
-	       GvdbRefFunc    ref,
-	       GDestroyNotify unref,
-	       const char    *filename,
-	       GError       **error)
+/**
+ * gvdb_table_new_from_bytes:
+ * @bytes: the #GBytes with the data
+ * @trusted: if the contents of @bytes are trusted
+ * @error: %NULL, or a pointer to a %NULL #GError
+ *
+ * Creates a new #GvdbTable from the contents of @bytes.
+ *
+ * This call can fail if the header contained in @bytes is invalid or if @bytes
+ * is empty; if so, %G_FILE_ERROR_INVAL will be returned.
+ *
+ * You should call gvdb_table_free() on the return result when you no
+ * longer require it.
+ *
+ * Returns: a new #GvdbTable
+ **/
+GvdbTable *
+gvdb_table_new_from_bytes (GBytes    *bytes,
+                           gboolean   trusted,
+                           GError   **error)
 {
+  const struct gvdb_header *header;
   GvdbTable *file;
 
   file = g_slice_new0 (GvdbTable);
-  file->data = data;
-  file->size = data_len;
+  file->bytes = g_bytes_ref (bytes);
+  file->data = g_bytes_get_data (bytes, &file->size);
   file->trusted = trusted;
-  file->ref_count = 1;
-  file->ref_user_data = ref;
-  file->unref_user_data = unref;
-  file->user_data = user_data;
 
-  if (sizeof (struct gvdb_header) <= file->size)
-    {
-      const struct gvdb_header *header = (gpointer) file->data;
+  if (file->size < sizeof (struct gvdb_header))
+    goto invalid;
 
-      if (header->signature[0] == GVDB_SIGNATURE0 &&
-          header->signature[1] == GVDB_SIGNATURE1 &&
-          guint32_from_le (header->version) == 0)
-        file->byteswapped = FALSE;
+  header = (gpointer) file->data;
 
-      else if (header->signature[0] == GVDB_SWAPPED_SIGNATURE0 &&
-               header->signature[1] == GVDB_SWAPPED_SIGNATURE1 &&
-               guint32_from_le (header->version) == 0)
-        file->byteswapped = TRUE;
+  if (header->signature[0] == GVDB_SIGNATURE0 &&
+      header->signature[1] == GVDB_SIGNATURE1 &&
+      guint32_from_le (header->version) == 0)
+    file->byteswapped = FALSE;
 
-      else
-        {
-	  if (filename)
-	    g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-			 "%s: invalid header", filename);
-	  else
-	    g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-			 "invalid gvdb header");
-          g_slice_free (GvdbTable, file);
-	  if (unref)
-	    unref (user_data);
+  else if (header->signature[0] == GVDB_SWAPPED_SIGNATURE0 &&
+           header->signature[1] == GVDB_SWAPPED_SIGNATURE1 &&
+           guint32_from_le (header->version) == 0)
+    file->byteswapped = TRUE;
 
-          return NULL;
-        }
+  else
+    goto invalid;
 
-      gvdb_table_setup_root (file, &header->root);
-    }
+  gvdb_table_setup_root (file, &header->root);
 
   return file;
+
+invalid:
+  g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "invalid gvdb header");
+
+  g_bytes_unref (file->bytes);
+
+  g_slice_free (GvdbTable, file);
+
+  return NULL;
 }
 
 /**
  * gvdb_table_new:
- * @filename: the path to the hash file
- * @trusted: if the contents of @filename are trusted
+ * @filename: a filename
+ * @trusted: if the contents of @bytes are trusted
  * @error: %NULL, or a pointer to a %NULL #GError
  *
- * Creates a new #GvdbTable from the contents of the file found at
- * @filename.
+ * Creates a new #GvdbTable using the #GMappedFile for @filename as the
+ * #GBytes.
  *
- * The only time this function fails is if the file cannot be opened.
+ * This function will fail if the file cannot be opened.
  * In that case, the #GError that is returned will be an error from
  * g_mapped_file_new().
  *
- * An empty or otherwise corrupted file is considered to be a valid
- * #GvdbTable with no entries.
- *
- * You should call gvdb_table_unref() on the return result when you no
- * longer require it.
+ * An empty or corrupt file will result in %G_FILE_ERROR_INVAL.
  *
  * Returns: a new #GvdbTable
  **/
@@ -207,53 +204,21 @@
                 GError      **error)
 {
   GMappedFile *mapped;
+  GvdbTable *table;
+  GBytes *bytes;
 
-  if ((mapped = g_mapped_file_new (filename, FALSE, error)) == NULL)
+  mapped = g_mapped_file_new (filename, FALSE, error);
+  if (!mapped)
     return NULL;
 
-  return new_from_data (g_mapped_file_get_contents (mapped),
-			g_mapped_file_get_length (mapped),
-			trusted,
-			mapped,
-			(GvdbRefFunc)g_mapped_file_ref,
-			(GDestroyNotify)g_mapped_file_unref,
-			filename,
-			error);
-}
+  bytes = g_mapped_file_get_bytes (mapped);
+  table = gvdb_table_new_from_bytes (bytes, trusted, error);
+  g_mapped_file_unref (mapped);
+  g_bytes_unref (bytes);
 
-/**
- * gvdb_table_new_from_data:
- * @data: the data
- * @data_len: the length of @data in bytes
- * @trusted: if the contents of @data are trusted
- * @user_data: User supplied data that owns @data
- * @ref: Ref function for @user_data
- * @unref: Unref function for @user_data
- *
- * Creates a new #GvdbTable from the data in @data.
- *
- * An empty or otherwise corrupted data is considered to be a valid
- * #GvdbTable with no entries.
- *
- * You should call gvdb_table_unref() on the return result when you no
- * longer require it.
- *
- * Returns: a new #GvdbTable
- **/
-GvdbTable *
-gvdb_table_new_from_data (const void    *data,
-			  gsize          data_len,
-			  gboolean       trusted,
-			  gpointer       user_data,
-			  GvdbRefFunc    ref,
-			  GDestroyNotify unref,
-			  GError        **error)
-{
-  return new_from_data (data, data_len,
-			trusted,
-			user_data, ref, unref,
-			NULL,
-			error);
+  g_prefix_error (error, "%s: ", filename);
+
+  return table;
 }
 
 static gboolean
@@ -346,18 +311,6 @@
   return NULL;
 }
 
-static const struct gvdb_hash_item *
-gvdb_table_get_item (GvdbTable  *table,
-                     guint32_le  item_no)
-{
-  guint32 item_no_native = guint32_from_le (item_no);
-
-  if G_LIKELY (item_no_native < table->n_hash_items)
-    return table->hash_items + item_no_native;
-
-  return NULL;
-}
-
 static gboolean
 gvdb_table_list_from_item (GvdbTable                    *table,
                            const struct gvdb_hash_item  *item,
@@ -376,6 +329,155 @@
   return TRUE;
 }
 
+/**
+ * gvdb_table_get_names:
+ * @table: a #GvdbTable
+ * @length: the number of items returned, or %NULL
+ *
+ * Gets a list of all names contained in @table.
+ *
+ * No call to gvdb_table_get_table(), gvdb_table_list() or
+ * gvdb_table_get_value() will succeed unless it is for one of the
+ * names returned by this function.
+ *
+ * Note that some names that are returned may still fail for all of the
+ * above calls in the case of the corrupted file.  Note also that the
+ * returned strings may not be utf8.
+ *
+ * Returns: a %NULL-terminated list of strings, of length @length
+ **/
+gchar **
+gvdb_table_get_names (GvdbTable *table,
+                      gint      *length)
+{
+  gchar **names;
+  gint n_names;
+  gint filled;
+  gint total;
+  gint i;
+
+  /* We generally proceed by iterating over the list of items in the
+   * hash table (in order of appearance) recording them into an array.
+   *
+   * Each item has a parent item (except root items).  The parent item
+   * forms part of the name of the item.  We could go fetching the
+   * parent item chain at the point that we encounter each item but then
+   * we would need to implement some sort of recursion along with checks
+   * for self-referential items.
+   *
+   * Instead, we do a number of passes.  Each pass will build up one
+   * level of names (starting from the root).  We continue to do passes
+   * until no more items are left.  The first pass will only add root
+   * items and each further pass will only add items whose direct parent
+   * is an item added in the immediately previous pass.  It's also
+   * possible that items get filled if they follow their parent within a
+   * particular pass.
+   *
+   * At most we will have a number of passes equal to the depth of the
+   * tree.  Self-referential items will never be filled in (since their
+   * parent will have never been filled in).  We continue until we have
+   * a pass that fills in no additional items.
+   *
+   * This takes an O(n) algorithm and turns it into O(n*m) where m is
+   * the depth of the tree, but in all sane cases the tree won't be very
+   * deep and the constant factor of this algorithm is lower (and the
+   * complexity of coding it, as well).
+   */
+
+  n_names = table->n_hash_items;
+  names = g_new0 (gchar *, n_names + 1);
+
+  /* 'names' starts out all-NULL.  On each pass we record the number
+   * of items changed from NULL to non-NULL in 'filled' so we know if we
+   * should repeat the loop.  'total' counts the total number of items
+   * filled.  If 'total' ends up equal to 'n_names' then we know that
+   * 'names' has been completely filled.
+   */
+
+  total = 0;
+  do
+    {
+      /* Loop until we have filled no more entries */
+      filled = 0;
+
+      for (i = 0; i < n_names; i++)
+        {
+          const struct gvdb_hash_item *item = &table->hash_items[i];
+          const gchar *name;
+          gsize name_length;
+          guint32 parent;
+
+          /* already got it on a previous pass */
+          if (names[i] != NULL)
+            continue;
+
+          parent = guint32_from_le (item->parent);
+
+          if (parent == 0xffffffffu)
+            {
+              /* it's a root item */
+              name = gvdb_table_item_get_key (table, item, &name_length);
+
+              if (name != NULL)
+                {
+                  names[i] = g_strndup (name, name_length);
+                  filled++;
+                }
+            }
+
+          else if (parent < n_names && names[parent] != NULL)
+            {
+              /* It's a non-root item whose parent was filled in already.
+               *
+               * Calculate the name of this item by combining it with
+               * its parent name.
+               */
+              name = gvdb_table_item_get_key (table, item, &name_length);
+
+              if (name != NULL)
+                {
+                  const gchar *parent_name = names[parent];
+                  gsize parent_length;
+                  gchar *fullname;
+
+                  parent_length = strlen (parent_name);
+                  fullname = g_malloc (parent_length + name_length + 1);
+                  memcpy (fullname, parent_name, parent_length);
+                  memcpy (fullname + parent_length, name, name_length);
+                  fullname[parent_length + name_length] = '\0';
+                  names[i] = fullname;
+                  filled++;
+                }
+            }
+        }
+
+      total += filled;
+    }
+  while (filled && total < n_names);
+
+  /* If the table was corrupted then 'names' may have holes in it.
+   * Collapse those.
+   */
+  if G_UNLIKELY (total != n_names)
+    {
+      GPtrArray *fixed_names;
+
+      fixed_names = g_ptr_array_new ();
+      for (i = 0; i < n_names; i++)
+        if (names[i] != NULL)
+          g_ptr_array_add (fixed_names, names[i]);
+
+      g_free (names);
+      n_names = fixed_names->len;
+      g_ptr_array_add (fixed_names, NULL);
+      names = (gchar **) g_ptr_array_free (fixed_names, FALSE);
+    }
+
+  if (length)
+    *length = n_names;
+
+  return names;
+}
 
 /**
  * gvdb_table_list:
@@ -457,7 +559,15 @@
 gvdb_table_has_value (GvdbTable    *file,
                       const gchar  *key)
 {
-  return gvdb_table_lookup (file, key, 'v') != NULL;
+  static const struct gvdb_hash_item *item;
+  gsize size;
+
+  item = gvdb_table_lookup (file, key, 'v');
+
+  if (item == NULL)
+    return FALSE;
+
+  return gvdb_table_dereference (file, &item->value.pointer, 8, &size) != NULL;
 }
 
 static GVariant *
@@ -466,6 +576,7 @@
 {
   GVariant *variant, *value;
   gconstpointer data;
+  GBytes *bytes;
   gsize size;
 
   data = gvdb_table_dereference (table, &item->value.pointer, 8, &size);
@@ -473,12 +584,11 @@
   if G_UNLIKELY (data == NULL)
     return NULL;
 
-  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT,
-                                     data, size, table->trusted,
-                                     table->unref_user_data,
-                                     table->ref_user_data ? table->ref_user_data (table->user_data) : table->user_data);
+  bytes = g_bytes_new_from_bytes (table->bytes, ((gchar *) data) - table->data, size);
+  variant = g_variant_new_from_bytes (G_VARIANT_TYPE_VARIANT, bytes, table->trusted);
   value = g_variant_get_variant (variant);
   g_variant_unref (variant);
+  g_bytes_unref (bytes);
 
   return value;
 }
@@ -562,7 +672,7 @@
  * contained in the file.  This newly-created #GvdbTable does not depend
  * on the continued existence of @file.
  *
- * You should call gvdb_table_unref() on the return result when you no
+ * You should call gvdb_table_free() on the return result when you no
  * longer require it.
  *
  * Returns: a new #GvdbTable, or %NULL
@@ -580,14 +690,11 @@
     return NULL;
 
   new = g_slice_new0 (GvdbTable);
-  new->user_data = file->ref_user_data ? file->ref_user_data (file->user_data) : file->user_data;
-  new->ref_user_data = file->ref_user_data;
-  new->unref_user_data = file->unref_user_data;
+  new->bytes = g_bytes_ref (file->bytes);
   new->byteswapped = file->byteswapped;
   new->trusted = file->trusted;
   new->data = file->data;
   new->size = file->size;
-  new->ref_count = 1;
 
   gvdb_table_setup_root (new, &item->value.pointer);
 
@@ -595,38 +702,16 @@
 }
 
 /**
- * gvdb_table_ref:
+ * gvdb_table_free:
  * @file: a #GvdbTable
  *
- * Increases the reference count on @file.
- *
- * Returns: a new reference on @file
- **/
-GvdbTable *
-gvdb_table_ref (GvdbTable *file)
-{
-  g_atomic_int_inc (&file->ref_count);
-
-  return file;
-}
-
-/**
- * gvdb_table_unref:
- * @file: a #GvdbTable
- *
- * Decreases the reference count on @file, possibly freeing it.
- *
- * Since: 2.26
+ * Frees @file.
  **/
 void
-gvdb_table_unref (GvdbTable *file)
+gvdb_table_free (GvdbTable *file)
 {
-  if (g_atomic_int_dec_and_test (&file->ref_count))
-    {
-      if (file->unref_user_data)
-	file->unref_user_data (file->user_data);
-      g_slice_free (GvdbTable, file);
-    }
+  g_bytes_unref (file->bytes);
+  g_slice_free (GvdbTable, file);
 }
 
 /**
@@ -646,105 +731,3 @@
 {
   return !!*table->data;
 }
-
-/**
- * gvdb_table_walk:
- * @table: a #GvdbTable
- * @key: a key corresponding to a list
- * @open_func: the #GvdbWalkOpenFunc
- * @value_func: the #GvdbWalkValueFunc
- * @close_func: the #GvdbWalkCloseFunc
- * @user_data: data to pass to the callbacks
- *
- * Looks up the list at @key and iterate over the items in it.
- *
- * First, @open_func is called to signal that we are starting to iterate over
- * the list.  Then the list is iterated.  When all items in the list have been
- * iterated over, the @close_func is called.
- *
- * When iterating, if a given item in the list is a value then @value_func is
- * called.
- *
- * If a given item in the list is itself a list then @open_func is called.  If
- * that function returns %TRUE then the walk begins iterating the items in the
- * sublist, until there are no more items, at which point a matching
- * @close_func call is made.  If @open_func returns %FALSE then no iteration of
- * the sublist occurs and no corresponding @close_func call is made.
- **/
-void
-gvdb_table_walk (GvdbTable         *table,
-                 const gchar       *key,
-                 GvdbWalkOpenFunc   open_func,
-                 GvdbWalkValueFunc  value_func,
-                 GvdbWalkCloseFunc  close_func,
-                 gpointer           user_data)
-{
-  const struct gvdb_hash_item *item;
-  const guint32_le *pointers[64];
-  const guint32_le *enders[64];
-  gsize name_lengths[64];
-  gint index = 0;
-
-  item = gvdb_table_lookup (table, key, 'L');
-  name_lengths[0] = 0;
-  pointers[0] = NULL;
-  enders[0] = NULL;
-  goto start_here;
-
-  while (index)
-    {
-      close_func (name_lengths[index], user_data);
-      index--;
-
-      while (pointers[index] < enders[index])
-        {
-          const gchar *name;
-          gsize name_len;
-
-          item = gvdb_table_get_item (table, *pointers[index]++);
- start_here:
-
-          if (item != NULL &&
-              (name = gvdb_table_item_get_key (table, item, &name_len)))
-            {
-              if (item->type == 'L')
-                {
-                  if (open_func (name, name_len, user_data))
-                    {
-                      guint length = 0;
-
-                      index++;
-                      g_assert (index < 64);
-
-                      gvdb_table_list_from_item (table, item,
-                                                 &pointers[index],
-                                                 &length);
-                      enders[index] = pointers[index] + length;
-                      name_lengths[index] = name_len;
-                    }
-                }
-              else if (item->type == 'v')
-                {
-                  GVariant *value;
-
-                  value = gvdb_table_value_from_item (table, item);
-
-                  if (value != NULL)
-                    {
-                      if (table->byteswapped)
-                        {
-                          GVariant *tmp;
-
-                          tmp = g_variant_byteswap (value);
-                          g_variant_unref (value);
-                          value = tmp;
-                        }
-
-                      value_func (name, name_len, value, user_data);
-                      g_variant_unref (value);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/gio/gvdb/gvdb-reader.h b/gio/gvdb/gvdb-reader.h
index 449241e..3982773 100644
--- a/gio/gvdb/gvdb-reader.h
+++ b/gio/gvdb/gvdb-reader.h
@@ -24,27 +24,21 @@
 
 typedef struct _GvdbTable GvdbTable;
 
-typedef gpointer (*GvdbRefFunc) (gpointer data);
-
 G_BEGIN_DECLS
 
 G_GNUC_INTERNAL
+GvdbTable *             gvdb_table_new_from_bytes                       (GBytes       *bytes,
+                                                                         gboolean      trusted,
+                                                                         GError      **error);
+G_GNUC_INTERNAL
 GvdbTable *             gvdb_table_new                                  (const gchar  *filename,
                                                                          gboolean      trusted,
                                                                          GError      **error);
 G_GNUC_INTERNAL
-GvdbTable *             gvdb_table_new_from_data                        (const void   *data,
-									 gsize         data_len,
-                                                                         gboolean      trusted,
-									 gpointer      user_data,
-									 GvdbRefFunc   ref,
-									 GDestroyNotify unref,
-									 GError      **error);
+void                    gvdb_table_free                                 (GvdbTable    *table);
 G_GNUC_INTERNAL
-GvdbTable *             gvdb_table_ref                                  (GvdbTable    *table);
-G_GNUC_INTERNAL
-void                    gvdb_table_unref                                (GvdbTable    *table);
-
+gchar **                gvdb_table_get_names                            (GvdbTable    *table,
+                                                                         gint         *length);
 G_GNUC_INTERNAL
 gchar **                gvdb_table_list                                 (GvdbTable    *table,
                                                                          const gchar  *key);
@@ -61,28 +55,9 @@
 G_GNUC_INTERNAL
 gboolean                gvdb_table_has_value                            (GvdbTable    *table,
                                                                          const gchar  *key);
-
 G_GNUC_INTERNAL
 gboolean                gvdb_table_is_valid                             (GvdbTable    *table);
 
-typedef void          (*GvdbWalkValueFunc)                              (const gchar       *name,
-                                                                         gsize              name_len,
-                                                                         GVariant          *value,
-                                                                         gpointer           user_data);
-typedef gboolean      (*GvdbWalkOpenFunc)                               (const gchar       *name,
-                                                                         gsize              name_len,
-                                                                         gpointer           user_data);
-typedef void          (*GvdbWalkCloseFunc)                              (gsize              name_len,
-                                                                         gpointer           user_data);
-
-G_GNUC_INTERNAL
-void                    gvdb_table_walk                                 (GvdbTable         *table,
-                                                                         const gchar       *key,
-                                                                         GvdbWalkOpenFunc   open_func,
-                                                                         GvdbWalkValueFunc  value_func,
-                                                                         GvdbWalkCloseFunc  close_func,
-                                                                         gpointer           user_data);
-
 G_END_DECLS
 
 #endif /* __gvdb_reader_h__ */
diff --git a/gio/gvdb/gvdb.doap b/gio/gvdb/gvdb.doap
index b4ae60c..8c5f3e8 100644
--- a/gio/gvdb/gvdb.doap
+++ b/gio/gvdb/gvdb.doap
@@ -23,9 +23,34 @@
 
   <maintainer>
     <foaf:Person>
-      <foaf:name>Ryan Lortie</foaf:name>
-      <foaf:mbox rdf:resource='mailto:desrt@desrt.ca'/>
-      <gnome:userid>ryanl</gnome:userid>
+      <foaf:name>Matthias Clasen</foaf:name>
+      <foaf:mbox rdf:resource="mailto:mclasen@redhat.com"/>
+      <gnome:userid>matthiasc</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Allison Ryan Lortie</foaf:name>
+      <foaf:mbox rdf:resource="mailto:desrt@desrt.ca"/>
+      <gnome:userid>desrt</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Philip Withnall</foaf:name>
+      <foaf:mbox rdf:resource="mailto:philip@tecnocode.co.uk"/>
+      <foaf:mbox rdf:resource="mailto:withnall@endlessm.com"/>
+      <gnome:userid>pwithnall</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Emmanuele Bassi</foaf:name>
+      <foaf:mbox rdf:resource="mailto:ebassi@gnome.org"/>
+      <gnome:userid>ebassi</gnome:userid>
     </foaf:Person>
   </maintainer>
 
diff --git a/gio/gwin32notificationbackend.c b/gio/gwin32notificationbackend.c
index 7200fdf..602f3f3 100644
--- a/gio/gwin32notificationbackend.c
+++ b/gio/gwin32notificationbackend.c
@@ -59,12 +59,18 @@
                                                 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 8b4b3ae..6dd9136 100644
--- a/gio/inotify/Makefile.am
+++ b/gio/inotify/Makefile.am
@@ -26,3 +26,7 @@
 	-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 1fa8e04..8183f14 100644
--- a/gio/inotify/meson.build
+++ b/gio/inotify/meson.build
@@ -10,6 +10,6 @@
 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 d6fea41..3088296 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 @@
 #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 @@
 #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 @@
  * 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 @@
     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 @@
 {
   GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (object);
 
-  if (kqueue_monitor->sub)
+  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;
     }
 
 #ifndef O_EVTONLY
@@ -165,17 +209,51 @@
                              GFileMonitorSource *source)
 {
   GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor);
-  kqueue_sub *sub;
-  const gchar *path;
+  kqueue_sub *sub_dir = NULL, *sub_file = NULL;
+  gchar *path_dir, *path_file, *file_basename;
 
-  path = filename;
-  if (path == NULL)
-    path = dirname;
+  /* 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 @@
    * 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);
 
-  kqueue_monitor->sub = sub;
-  if (!_kqsub_start_watching (sub))
-    _km_add_missing (sub);
+  /* 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_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 @@
   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 @@
 {
   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 @@
 }
 
 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 @@
 
   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 @@
       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 497c30b..36a5b58 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 @@
 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 @@
   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 @@
   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 @@
 
 
 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 @@
   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 38a32a2..418b38c 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 93135b9..37af82e 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 @@
 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 @@
 
   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 @@
  * 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 @@
   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 @@
  *
  * 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 @@
       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 60b433c..4b2c8f2 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -152,6 +152,11 @@
     glib_conf.set('HAVE_SIOCGIFADDR', '/**/')
   endif
 
+endif
+
+if host_system.contains('android')
+  # struct ip_mreq_source definition is broken on Android NDK <= r16
+  # See https://bugzilla.gnome.org/show_bug.cgi?id=740791
   if not cc.compiles('''#include <netinet/in.h>
                         int main(int argc, char ** argv) {
                           struct ip_mreq_source mc_req_src;
@@ -161,7 +166,6 @@
                         name : 'ip_mreq_source.imr_interface has s_addr member')
     glib_conf.set('BROKEN_IP_MREQ_SOURCE_STRUCT', 1)
   endif
-
 endif
 
 gnetworking_h_conf.set('WSPIAPI_INCLUDE', gnetworking_h_wspiapi_include)
@@ -234,7 +238,6 @@
 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,
@@ -411,6 +414,12 @@
     contenttype_sources += files('gcontenttype.c')
     appinfo_sources += files('gdesktopappinfo.c')
     gio_unix_include_headers += files('gdesktopappinfo.h')
+
+    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')
@@ -757,6 +766,7 @@
   install_data([
     'completion/gapplication',
     'completion/gdbus',
+    'completion/gio',
     'completion/gsettings',
     'completion/gresource'
   ],
@@ -844,9 +854,26 @@
 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',
diff --git a/gio/org.freedesktop.portal.NetworkMonitor.xml b/gio/org.freedesktop.portal.NetworkMonitor.xml
deleted file mode 100644
index 8d3a471..0000000
--- 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 410f11d..e3e8da0 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -15,7 +15,9 @@
 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 @@
 	memory-input-stream			\
 	memory-output-stream			\
 	monitor					\
+	mount-operation				\
 	network-address				\
 	network-monitor				\
 	network-monitor-race			\
@@ -273,6 +276,7 @@
 	unix-mounts				\
 	unix-streams				\
 	g-file-info-filesystem-readonly		\
+	trash					\
 	$(NULL)
 
 test_extra_programs += \
@@ -368,12 +372,14 @@
 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 @@
 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 2e69da0..a52bc70 100644
--- a/gio/tests/appinfo.c
+++ b/gio/tests/appinfo.c
@@ -17,7 +17,7 @@
 
   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 @@
 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 @@
 
   g_setenv ("LANGUAGE", orig, TRUE);
   setlocale (LC_ALL, "");
+  g_free (orig);
 }
 
 static void
@@ -380,6 +381,7 @@
                                                 "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 ee73d58..8961a54 100644
--- a/gio/tests/dbus-appinfo.c
+++ b/gio/tests/dbus-appinfo.c
@@ -254,11 +254,14 @@
   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 669db57..4871d85 100644
--- a/gio/tests/desktop-app-info.c
+++ b/gio/tests/desktop-app-info.c
@@ -93,6 +93,8 @@
       res = g_app_info_delete (info);
       g_assert (!res);
     }
+
+  g_free (filename);
 }
 
 static void
@@ -115,6 +117,7 @@
   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 @@
   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 @@
   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 @@
 
   g_object_unref (info1);
   g_object_unref (info2);
+  g_object_unref (info3);
 }
 
 static void
@@ -324,6 +330,8 @@
 
   ret = TRUE;
  out:
+  g_clear_object (&enumerator);
+
   return ret;
 }
 
@@ -342,6 +350,7 @@
   (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 @@
   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 @@
   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 ccfcbcb..d2f1474 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -477,7 +477,15 @@
    * 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;
@@ -905,6 +913,13 @@
   gchar *result;
   gchar *endptr;
   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,
@@ -942,7 +957,7 @@
   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") || !get_size_from_du (path, &size))
+  if (!get_size_from_du (path, &size))
     {
       g_test_message ("du not found or fail to run, skipping byte measurement");
       size = 0;
@@ -1044,8 +1059,7 @@
   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") ||
-      !get_size_from_du (path, &data->expected_bytes))
+  if (!get_size_from_du (path, &data->expected_bytes))
     {
       g_test_message ("du not found or fail to run, skipping byte measurement");
       data->expected_bytes = 0;
diff --git a/gio/tests/g-file-info-filesystem-readonly.c b/gio/tests/g-file-info-filesystem-readonly.c
index c2b0aa5..123dcd8 100644
--- a/gio/tests/g-file-info-filesystem-readonly.c
+++ b/gio/tests/g-file-info-filesystem-readonly.c
@@ -45,6 +45,8 @@
     {
       /* 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 336135c..f5491ec 100644
--- a/gio/tests/gapplication.c
+++ b/gio/tests/gapplication.c
@@ -972,6 +972,8 @@
 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 2e662d0..0ab0566 100644
--- a/gio/tests/gdbus-addresses.c
+++ b/gio/tests/gdbus-addresses.c
@@ -39,65 +39,86 @@
   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));
+  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");
 
-  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_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 6f01409..9dbbeb2 100644
--- a/gio/tests/gdbus-connection-loss.c
+++ b/gio/tests/gdbus-connection-loss.c
@@ -136,7 +136,10 @@
 
   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 b954f74..179aabb 100644
--- a/gio/tests/gdbus-example-peer.c
+++ b/gio/tests/gdbus-example-peer.c
@@ -273,7 +273,8 @@
                "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 cf1330f..c676bcb 100644
--- a/gio/tests/gdbus-example-unix-fd-client.c
+++ b/gio/tests/gdbus-example-unix-fd-client.c
@@ -74,16 +74,14 @@
     }
   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 @@
       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 ef0ddde..4d6d3a4 100644
--- a/gio/tests/gdbus-export.c
+++ b/gio/tests/gdbus-export.c
@@ -813,7 +813,7 @@
                                   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 @@
                                   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 @@
                                   &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 @@
                                   &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 @@
                                   &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 933cc52..676c9f0 100644
--- a/gio/tests/gdbus-peer-object-manager.c
+++ b/gio/tests/gdbus-peer-object-manager.c
@@ -258,6 +258,8 @@
 
   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 101c2a8..7f35baa 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -875,6 +875,7 @@
                       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 @@
 
   g_main_loop_quit (service_loop);
   g_thread_join (service_thread);
+
+  g_ptr_array_unref (data.current_connections);
 }
 
 static void
@@ -1711,6 +1714,7 @@
    * 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 da28f1b..d2f0a6c 100644
--- a/gio/tests/gdbus-serialization.c
+++ b/gio/tests/gdbus-serialization.c
@@ -1085,6 +1085,7 @@
 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 746a7c2..531ce7a 100644
--- a/gio/tests/gdbus-unix-addresses.c
+++ b/gio/tests/gdbus-unix-addresses.c
@@ -128,6 +128,7 @@
       g_unsetenv ("DISPLAY");
       g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
       g_unsetenv ("XDG_RUNTIME_DIR");
+      g_unsetenv ("G_MESSAGES_DEBUG");
       set_up_mock_dbus_launch ();
 
       print_address ();
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 2f056ee..852a8b7 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -741,15 +741,18 @@
 
   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 @@
   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 @@
 
   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 @@
   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 @@
                             "org.gtk.test.range.direct",
                             "org.gtk.test.mapped",
                             "org.gtk.test.descriptions",
+                            "org.gtk.test.per-desktop",
                             NULL));
 }
 
@@ -2344,6 +2353,18 @@
   g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
   g_clear_error (&error);
 
+  /* Test error handling of corrupt compiled files. */
+  source = g_settings_schema_source_new_from_directory ("schema-source-corrupt", parent, TRUE, &error);
+  g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL);
+  g_assert_null (source);
+  g_clear_error (&error);
+
+  /* Test error handling of empty compiled files. */
+  source = g_settings_schema_source_new_from_directory ("schema-source-empty", parent, TRUE, &error);
+  g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL);
+  g_assert_null (source);
+  g_clear_error (&error);
+
   /* create a source with the parent */
   source = g_settings_schema_source_new_from_directory ("schema-source", parent, TRUE, &error);
   g_assert_no_error (error);
@@ -2629,6 +2650,100 @@
   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 +2764,7 @@
 main (int argc, char *argv[])
 {
   gchar *schema_text;
+  gchar *override_text;
   gchar *enums;
   gint result;
 
@@ -2666,11 +2782,18 @@
 
   if (!g_test_subprocess ())
     {
+      GError *local_error = NULL;
+      /* A GVDB header is 6 guint32s, and requires a magic number in the first
+       * two guint32s. A set of zero bytes of a greater length is considered
+       * corrupt. */
+      const guint8 gschemas_compiled_corrupt[sizeof (guint32) * 7] = { 0, };
+
       backend_set = g_getenv ("GSETTINGS_BACKEND") != NULL;
 
       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 +2816,10 @@
       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 +2828,8 @@
       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);
 
@@ -2711,6 +2839,21 @@
                                            "--schema-file=" SRCDIR "/org.gtk.schemasourcecheck.gschema.xml",
                                            NULL, NULL, &result, NULL));
       g_assert (result == 0);
+
+      g_remove ("schema-source-corrupt/gschemas.compiled");
+      g_mkdir ("schema-source-corrupt", 0777);
+      g_file_set_contents ("schema-source-corrupt/gschemas.compiled",
+                           (const gchar *) gschemas_compiled_corrupt,
+                           sizeof (gschemas_compiled_corrupt),
+                           &local_error);
+      g_assert_no_error (local_error);
+
+      g_remove ("schema-source-empty/gschemas.compiled");
+      g_mkdir ("schema-source-empty", 0777);
+      g_file_set_contents ("schema-source-empty/gschemas.compiled",
+                           "", 0,
+                           &local_error);
+      g_assert_no_error (local_error);
    }
 
   g_test_add_func ("/gsettings/basic", test_basic);
@@ -2782,6 +2925,8 @@
   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/meson.build b/gio/tests/meson.build
index 96229bd..4e5ad25 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -15,66 +15,73 @@
   command: [gengiotypefuncs_prog, '@OUTPUT@', '@INPUT@'])
 
 #  Test programs buildable on all platforms
-gio_tests = [
-  'appmonitor',
-  'async-close-output-stream',
-  'async-splice-output-stream',
-  'buffered-input-stream',
-  'buffered-output-stream',
-  'cancellable',
-  'contexts',
-  'contenttype',
-  'converter-stream',
-  'credentials',
-  'data-input-stream',
-  'data-output-stream',
-  'defaultvalue',
-  'fileattributematcher',
-  'filter-streams',
-  'giomodule',
-  'gsubprocess',
-  'g-file',
-  'g-file-info',
-  'g-icon',
-  'gdbus-addresses',
-  'gdbus-message',
-  'inet-address',
-  'io-stream',
-  'memory-input-stream',
-  'memory-output-stream',
-  'monitor',
-  'network-address',
-  'network-monitor',
-  'network-monitor-race',
-  'permission',
-  'pollable',
-  'proxy-test',
-  'readwrite',
-  'simple-async-result',
-  'simple-proxy',
-  'sleepy-stream',
-  'socket',
-  'socket-listener',
-  'socket-service',
-  'srvtarget',
-  'task',
-  'vfs',
-  'volumemonitor',
-  'glistmodel',
-  'testfilemonitor',
-  'thumbnail-verification',
-]
+# FIXME: We are using list of dictionnaries until we can depend on Meson 0.48.0
+# that supports '+=' operator on dictionnaries.
+gio_tests = [{
+  'appmonitor' : {},
+  'async-close-output-stream' : {},
+  'async-splice-output-stream' : {},
+  'buffered-input-stream' : {},
+  'buffered-output-stream' : {},
+  'cancellable' : {},
+  'contexts' : {},
+  'contenttype' : {},
+  'converter-stream' : {},
+  'credentials' : {},
+  'data-input-stream' : {},
+  'data-output-stream' : {},
+  'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]},
+  'fileattributematcher' : {},
+  'filter-streams' : {},
+  'giomodule' : {},
+  'gsubprocess' : {},
+  'g-file' : {},
+  'g-file-info' : {},
+  'g-icon' : {},
+  'gdbus-addresses' : {},
+  'gdbus-message' : {},
+  'inet-address' : {},
+  'io-stream' : {},
+  'memory-input-stream' : {},
+  'memory-output-stream' : {},
+  'monitor' : {},
+  'mount-operation' : {},
+  'network-address' : {},
+  'network-monitor' : {},
+  'network-monitor-race' : {},
+  'permission' : {},
+  'pollable' : {},
+  'proxy-test' : {},
+  'readwrite' : {},
+  'simple-async-result' : {},
+  'simple-proxy' : {},
+  'sleepy-stream' : {},
+  'socket' : {},
+  'socket-listener' : {},
+  'socket-service' : {},
+  'srvtarget' : {},
+  'task' : {},
+  'vfs' : {},
+  'volumemonitor' : {},
+  'glistmodel' : {},
+  'testfilemonitor' : {'suite' : ['slow']},
+  'thumbnail-verification' : {},
+  'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
+  'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
+}]
 
-test_extra_programs = [
-  ['gdbus-connection-flush-helper'],
-  ['gdbus-testserver'],
-]
+# FIXME: We are using list of dictionnaries until we can depend on Meson 0.48.0
+# that supports '+=' operator on dictionnaries.
+test_extra_programs = [{
+  'gdbus-connection-flush-helper' : {},
+  '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"',
@@ -101,48 +108,57 @@
 if dbus1_dep.found()
   glib_conf.set('HAVE_DBUS1', 1)
 
-  exe = executable('gdbus-serialization',
-      'gdbus-serialization.c', 'gdbus-tests.c',
-      install : false,
-      c_args : test_c_args,
-      dependencies : common_gio_tests_deps + [dbus1_dep])
-  test('gdbus-serialization', exe, env : test_env)
+  gio_tests += [{
+    'gdbus-serialization' : {
+      'extra_sources' : ['gdbus-tests.c'],
+      'dependencies' : [dbus1_dep],
+    }
+  }]
 endif
 
 #  Test programs buildable on UNIX only
 if host_machine.system() != 'windows'
-  gio_tests += [
-    'file',
-    'gdbus-peer',
-    'gdbus-peer-object-manager',
-    'live-g-file',
-    'socket-address',
-    'stream-rw_all',
-    'unix-fd',
-    'unix-mounts',
-    'unix-streams',
-    'g-file-info-filesystem-readonly',
-    'gschema-compile',
-  ]
+  gio_tests += [{
+    'file' : {},
+    'gdbus-peer' : {'dependencies' : [libgdbus_example_objectmanager_dep]},
+    'gdbus-peer-object-manager' : {},
+    'live-g-file' : {},
+    'socket-address' : {},
+    'stream-rw_all' : {},
+    'unix-fd' : {},
+    'unix-mounts' : {},
+    'unix-streams' : {},
+    'g-file-info-filesystem-readonly' : {},
+    'gschema-compile' : {'install' : false},
+    'trash' : {},
+  }]
 
   # Uninstalled because of the check-for-executable logic in DesktopAppInfo
   # unable to find the installed executable
   if not glib_have_cocoa
-    gio_tests += [
-      'appinfo',
-      'desktop-app-info',
-    ]
+    gio_tests += [{
+      'appinfo' : {
+        'install' : false,
+      },
+      'desktop-app-info' : {
+        'install' : false,
+      },
+    }]
   endif
 
-  test_extra_programs += [
-    ['basic-application'],
-    ['dbus-launch'],
-    ['appinfo-test'],
-  ]
+  test_extra_programs += [{
+    'basic-application' : {},
+    'dbus-launch' : {},
+    'appinfo-test' : {},
+  }]
 
   if not glib_have_cocoa
-    test_extra_programs += [['apps']]
-    gio_tests += ['mimeapps']
+    test_extra_programs += [{
+      'apps' : {},
+    }]
+    gio_tests += [{
+      'mimeapps' : {},
+    }]
   endif
 
   #  Test programs that need to bring up a session bus (requires dbus-daemon)
@@ -171,66 +187,61 @@
                    '--annotate', 'org.project.Bar::TestSignal[array_of_strings]', 'Key8', 'Value8',
                    '@INPUT@'])
 
-    gio_dbus_tests = [
-      ['actions', [], []],
-      ['gdbus-auth', [], []],
-      ['gdbus-bz627724', [], []],
-      ['gdbus-close-pending', [], []],
-      ['gdbus-connection', [], []],
-      ['gdbus-connection-loss', [], []],
-      ['gdbus-connection-slow', [], []],
-      ['gdbus-error', [], []],
-      ['gdbus-exit-on-close', [], []],
-      ['gdbus-export', [], []],
-      ['gdbus-introspection', [], []],
-      ['gdbus-names', [], []],
-      ['gdbus-proxy', [], []],
-      ['gdbus-proxy-threads', [], [dbus1_dep]],
-      ['gdbus-proxy-well-known-name', [], []],
-      ['gdbus-test-codegen', [gdbus_test_codegen_generated], []],
-      ['gdbus-threading', [], []],
-      ['gmenumodel', [], []],
-      ['gnotification', ['gnotification-server.c'], []],
-    ]
+    extra_sources = ['gdbus-sessionbus.c', 'gdbus-tests.c']
+
+    gio_tests += [{
+      'actions' : {
+        'extra_sources' : extra_sources,
+        'suite' : ['slow'],
+      },
+      'gdbus-auth' : {'extra_sources' : extra_sources},
+      'gdbus-bz627724' : {'extra_sources' : extra_sources},
+      'gdbus-close-pending' : {'extra_sources' : extra_sources},
+      'gdbus-connection' : {'extra_sources' : extra_sources},
+      'gdbus-connection-loss' : {'extra_sources' : extra_sources},
+      'gdbus-connection-slow' : {'extra_sources' : extra_sources},
+      'gdbus-error' : {'extra_sources' : extra_sources},
+      'gdbus-exit-on-close' : {'extra_sources' : extra_sources},
+      'gdbus-export' : {
+        'extra_sources' : extra_sources,
+        'suite' : ['slow'],
+      },
+      'gdbus-introspection' : {'extra_sources' : extra_sources},
+      'gdbus-names' : {'extra_sources' : extra_sources},
+      'gdbus-proxy' : {'extra_sources' : extra_sources},
+      'gdbus-proxy-threads' : {
+        'extra_sources' : extra_sources,
+        'dependencies' : [dbus1_dep],
+      },
+      'gdbus-proxy-well-known-name' : {'extra_sources' : extra_sources},
+      'gdbus-test-codegen' : {
+        'extra_sources' : [extra_sources, gdbus_test_codegen_generated],
+      },
+      'gdbus-threading' : {
+        'extra_sources' : extra_sources,
+        'suite' : ['slow'],
+      },
+      'gmenumodel' : {'extra_sources' : extra_sources},
+      'gnotification' : {
+        'extra_sources' : [extra_sources, 'gnotification-server.c'],
+      },
+      'gdbus-test-codegen-old' : {
+        'source' : 'gdbus-test-codegen.c',
+        'extra_sources' : [extra_sources, gdbus_test_codegen_generated],
+        'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36',
+                    '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36'],
+      },
+      'gapplication' : {'extra_sources' : extra_sources},
+      'gdbus-unix-addresses' : {},
+    }]
 
     if not glib_have_cocoa
-      gio_dbus_tests = [['dbus-appinfo', [], []]]
+      gio_tests += [{
+        'dbus-appinfo' : {
+          'extra_sources' : extra_sources,
+        },
+      }]
     endif
-
-    # separate loop because extra source files for each test
-    foreach dbus_test : gio_dbus_tests
-      test_name = dbus_test[0]
-      extra_src = dbus_test[1]
-      extra_deps = dbus_test[2]
-      exe = executable(test_name, '@0@.c'.format(test_name),
-          'gdbus-sessionbus.c', 'gdbus-tests.c', extra_src,
-          install : false,
-          c_args : test_c_args,
-          dependencies : common_gio_tests_deps + extra_deps)
-      test(test_name, exe, env : test_env)
-    endforeach
-
-    exe = executable('gdbus-test-codegen-old', 'gdbus-test-codegen.c',
-          'gdbus-sessionbus.c', 'gdbus-tests.c', gdbus_test_codegen_generated,
-          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)
-
-    # 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
-    # targets of the same name even if in different directories
-    # (FIXME: just rename source file to gapplication-test.c)
-    if not glib_have_cocoa
-      exe = executable('gapplication-test', 'gapplication.c',
-                       'gdbus-sessionbus.c', 'gdbus-tests.c',
-                       install : false,
-                       c_args : test_c_args,
-                       dependencies : common_gio_tests_deps)
-    endif
-    test('gapplication', exe, env : test_env)
-
-    gio_tests += ['gdbus-unix-addresses']
   endif # have_dbus_daemon
 
   # This test is currently unreliable
@@ -239,124 +250,100 @@
       c_args : test_c_args,
       dependencies : common_gio_tests_deps)
 
-  exe = executable('gdbus-connection-flush', 'gdbus-connection-flush.c',
-      'test-io-stream.c', 'test-pipe-unix.c',
-      install : false,
-      c_args : test_c_args,
-      dependencies : common_gio_tests_deps)
-  test('gdbus-connection-flush', exe, env : test_env)
-
-  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)
+  gio_tests += [{
+    'gdbus-connection-flush' : {
+      'extra_sources' : ['test-io-stream.c', 'test-pipe-unix.c'],
+    },
+    'gdbus-non-socket' : {
+      'extra_sources' : ['gdbus-tests.c', 'test-io-stream.c', 'test-pipe-unix.c'],
+    },
+  }]
 
   # Generate test.mo from de.po using msgfmt
   msgfmt = find_program('msgfmt', required : false)
   if msgfmt.found()
     subdir('de/LC_MESSAGES')
-    # gsettings target exe already exists in gio directory
-    exe = executable('gsettings-test', 'gsettings.c', test_mo,
-        install : false,
-        c_args : test_c_args + [
-                   '-DSRCDIR="@0@"'.format(meson.current_source_dir()),
-                   '-DTEST_LOCALE_PATH="@0@"'.format(test_mo_dir),
-                 ],
-        dependencies : common_gio_tests_deps)
-    test('gsettings', exe, env : test_env)
+    gio_tests += [{
+      'gsettings' : {
+        'extra_sources' : [test_mo],
+        'c_args' : ['-DSRCDIR="@0@"'.format(meson.current_source_dir()),
+                    '-DTEST_LOCALE_PATH="@0@"'.format(test_mo_dir)],
+        'install' : false,
+      },
+    }]
   endif
 endif # unix
 
 #  Test programs buildable on Windows only
 if host_machine.system() == 'windows'
-  gio_tests += ['win32-streams']
+  gio_tests += [{'win32-streams' : {}}]
 endif
 
 if cc.get_id() != 'msvc'
-  gio_tests += [ 'autoptr' ]
+  gio_tests += [{
+    'autoptr-gio' : {
+      'source' : 'autoptr.c',
+    },
+  }]
 endif
 
-foreach test_name : gio_tests
-  extra_deps = []
-  srcs = ['@0@.c'.format(test_name)]
-  # conflicts with glib/tests/autoptr, can't have two targets with same name
-  if test_name == 'autoptr'
-    test_name = 'autoptr-gio'
-  elif test_name == 'defaultvalue'
-    srcs += [giotypefuncs_inc]
-  elif test_name == 'gdbus-peer'
-    # 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]
-  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)
-  else
-    test(test_name, exe, env : test_env)
-  endif
-endforeach
-
-uninstalled_test_extra_programs = [
-  ['gio-du'],
-  ['echo-server'],
-  ['filter-cat'],
-  ['gapplication-example-actions'],
-  ['gapplication-example-cmdline'],
-  ['gapplication-example-cmdline2'],
-  ['gapplication-example-cmdline3'],
-  ['gapplication-example-cmdline4'],
-  ['gapplication-example-dbushooks'],
-  ['gapplication-example-open'],
-  ['gdbus-daemon', gdbus_daemon_sources],
-  ['gdbus-example-export'],
-  ['gdbus-example-own-name'],
-  ['gdbus-example-peer'],
-  ['gdbus-example-proxy-subclass'],
-  ['gdbus-example-server'],
-  ['gdbus-example-subtree'],
-  ['gdbus-example-watch-name'],
-  ['gdbus-example-watch-proxy'],
-  ['gsubprocess-testprog'],
-  ['httpd'],
-  ['proxy'],
-  ['resolver'],
-  ['send-data'],
-  ['socket-server'],
-  ['socket-client', ['gtlsconsoleinteraction.c']],
-  ['tls-certificate', ['gtesttlsbackend.c']],
-  ['tls-interaction', ['gtesttlsbackend.c']],
+test_extra_programs += [{
+  'gio-du' : {'install' : false},
+  'echo-server' : {'install' : false},
+  'filter-cat' : {'install' : false},
+  'gapplication-example-actions' : {'install' : false},
+  'gapplication-example-cmdline' : {'install' : false},
+  'gapplication-example-cmdline2' : {'install' : false},
+  'gapplication-example-cmdline3' : {'install' : false},
+  'gapplication-example-cmdline4' : {'install' : false},
+  'gapplication-example-dbushooks' : {'install' : false},
+  'gapplication-example-open' : {'install' : false},
+  'gdbus-daemon' : {
+    'extra_sources' : gdbus_daemon_sources,
+    'install' : false,
+  },
+  'gdbus-example-export' : {'install' : false},
+  'gdbus-example-own-name' : {'install' : false},
+  'gdbus-example-peer' : {'install' : false},
+  'gdbus-example-proxy-subclass' : {'install' : false},
+  'gdbus-example-server' : {'install' : false},
+  'gdbus-example-subtree' : {'install' : false},
+  'gdbus-example-watch-name' : {'install' : false},
+  'gdbus-example-watch-proxy' : {'install' : false},
+  'gsubprocess-testprog' : {'install' : false},
+  'httpd' : {'install' : false},
+  'proxy' : {'install' : false},
+  'resolver' : {'install' : false},
+  'send-data' : {'install' : false},
+  'socket-server' : {'install' : false},
+  'socket-client' : {
+    'extra_sources' : ['gtlsconsoleinteraction.c'],
+    'install' : false,
+  },
   # 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]],
-  ['gdbus-example-objectmanager-server', [], [libgdbus_example_objectmanager_dep]],
-  ['gdbus-test-fixture', [], [libgdbus_example_objectmanager_dep]],
-]
+  'gdbus-example-objectmanager-client' : {
+    'dependencies' : [libgdbus_example_objectmanager_dep],
+    'install' : false,
+  },
+  'gdbus-example-objectmanager-server' : {
+    'dependencies' : [libgdbus_example_objectmanager_dep],
+    'install' : false,
+  },
+  'gdbus-test-fixture' : {
+    'dependencies' : [libgdbus_example_objectmanager_dep],
+    'install' : false,
+  },
+}]
 
 if host_machine.system() != 'windows'
-  uninstalled_test_extra_programs += [['gdbus-example-unix-fd-client']]
+  test_extra_programs += [{
+    'gdbus-example-unix-fd-client' : {
+      'install' : false,
+    },
+  }]
 endif
 
-foreach extra_program : uninstalled_test_extra_programs + test_extra_programs
-  srcs = ['@0@.c'.format(extra_program[0])]
-  if extra_program.length() > 1
-    srcs += extra_program[1]
-  endif
-  extra_deps = []
-  if extra_program.length() > 2
-    extra_deps = extra_program[2]
-  endif
-  executable(extra_program[0], srcs,
-      install : false,
-      c_args : test_c_args,
-      dependencies : common_gio_tests_deps + extra_deps)
-endforeach
-
 if not meson.is_cross_build() or meson.has_exe_wrapper()
 
   plugin_resources_c = custom_target('plugin-resources.c',
@@ -375,7 +362,7 @@
     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,16 +409,61 @@
   # 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,
-      test_resources_c, test_resources2_c, test_resources2_h,
-      install : false,
-      c_args : test_c_args,
-      dependencies : common_gio_tests_deps)
-  test('resources', exe, env : test_env)
+  gio_tests += [{
+    'resources' : {
+      'extra_sources' : [test_gresource, test_resources_c, test_resources2_c,
+                         test_resources2_h],
+    },
+  }]
 endif
 
+foreach test_dict : gio_tests
+  foreach test_name, extra_args : test_dict
+    source = extra_args.get('source', test_name + '.c')
+    extra_sources = extra_args.get('extra_sources', [])
+    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, extra_sources],
+      c_args : test_c_args + extra_args.get('c_args', []),
+      dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
+      install_dir: installed_tests_execdir,
+      install: install,
+    )
+
+    suite = ['gio'] + extra_args.get('suite', [])
+    timeout = suite.contains('slow') ? 120 : 30
+    test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
+  endforeach
+endforeach
+
+foreach program_dict : test_extra_programs
+  foreach program_name, extra_args : program_dict
+    source = extra_args.get('source', program_name + '.c')
+    extra_sources = extra_args.get('extra_sources', [])
+    install = installed_tests_enabled and extra_args.get('install', true)
+    executable(program_name, [source, extra_sources],
+        c_args : test_c_args,
+        dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
+        install_dir : installed_tests_execdir,
+        install : install,
+    )
+  endforeach
+endforeach
+
 # FIXME: subdir('services')
 subdir('modules')
diff --git a/gio/tests/monitor.c b/gio/tests/monitor.c
index 69eae34..4d64fa8 100644
--- a/gio/tests/monitor.c
+++ b/gio/tests/monitor.c
@@ -84,6 +84,19 @@
   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 @@
     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 0000000..0f8566a
--- /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 0000000..6694baa
--- /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 3c9d7b7..aad4e54 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 8163aa1..70d8c03 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -32,14 +32,24 @@
   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 @@
   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 @@
   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 @@
   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",
@@ -279,6 +317,45 @@
   g_resource_unref (resource);
 }
 
+/* Test error handling for corrupt GResource files (specifically, a corrupt
+ * GVDB header). */
+static void
+test_resource_data_corrupt (void)
+{
+  /* A GVDB header is 6 guint32s, and requires a magic number in the first two
+   * guint32s. A set of zero bytes of a greater length is considered corrupt. */
+  static const guint8 data[sizeof (guint32) * 7] = { 0, };
+  GBytes *bytes = NULL;
+  GResource *resource = NULL;
+  GError *local_error = NULL;
+
+  bytes = g_bytes_new_static (data, sizeof (data));
+  resource = g_resource_new_from_data (bytes, &local_error);
+  g_bytes_unref (bytes);
+  g_assert_error (local_error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_INTERNAL);
+  g_assert_null (resource);
+
+  g_clear_error (&local_error);
+}
+
+/* Test handling for empty GResource files. They should also be treated as
+ * corrupt. */
+static void
+test_resource_data_empty (void)
+{
+  GBytes *bytes = NULL;
+  GResource *resource = NULL;
+  GError *local_error = NULL;
+
+  bytes = g_bytes_new_static (NULL, 0);
+  resource = g_resource_new_from_data (bytes, &local_error);
+  g_bytes_unref (bytes);
+  g_assert_error (local_error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_INTERNAL);
+  g_assert_null (resource);
+
+  g_clear_error (&local_error);
+}
+
 static void
 test_resource_registered (void)
 {
@@ -547,7 +624,8 @@
   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 +651,7 @@
   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);
 
@@ -745,6 +824,8 @@
   g_test_add_func ("/resource/file-path", test_resource_file_path);
   g_test_add_func ("/resource/data", test_resource_data);
   g_test_add_func ("/resource/data_unaligned", test_resource_data_unaligned);
+  g_test_add_func ("/resource/data-corrupt", test_resource_data_corrupt);
+  g_test_add_func ("/resource/data-empty", test_resource_data_empty);
   g_test_add_func ("/resource/registered", test_resource_registered);
   g_test_add_func ("/resource/manual", test_resource_manual);
   g_test_add_func ("/resource/manual2", test_resource_manual2);
diff --git a/gio/tests/simple-proxy.c b/gio/tests/simple-proxy.c
index f1eb6af..ffc16ed 100644
--- a/gio/tests/simple-proxy.c
+++ b/gio/tests/simple-proxy.c
@@ -77,6 +77,7 @@
   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 08d78e5..934262e 100644
--- a/gio/tests/task.c
+++ b/gio/tests/task.c
@@ -1902,6 +1902,7 @@
 
       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 6ef5d38..0fa72d3 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 @@
 /* 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 @@
 
 /* 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 @@
   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 @@
 
 /* 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 @@
   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 @@
 
 /* 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 @@
   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 @@
 }
 
 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 @@
   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 @@
 }
 
 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 @@
   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 @@
 }
 
 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 @@
 
   /* 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 0000000..176c4b9
--- /dev/null
+++ b/gio/tests/trash.c
@@ -0,0 +1,109 @@
+/*
+ * 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;
+  gchar *parent_dirname;
+  GStatBuf parent_stat, home_stat;
+
+  /* The test assumes that tmp file is located on system internal mount. */
+  file = g_file_new_tmp ("test-trashXXXXXX", &stream, &error);
+  parent_dirname = g_path_get_dirname (g_file_peek_path (file));
+  g_assert_no_error (error);
+  g_assert_cmpint (g_stat (parent_dirname, &parent_stat), ==, 0);
+  g_test_message ("File: %s (parent st_dev: %" G_GUINT64_FORMAT ")",
+                  g_file_peek_path (file), (guint64) parent_stat.st_dev);
+
+  g_assert_cmpint (g_stat (g_get_home_dir (), &home_stat), ==, 0);
+  g_test_message ("Home: %s (st_dev: %" G_GUINT64_FORMAT ")",
+                  g_get_home_dir (), (guint64) home_stat.st_dev);
+
+  if (parent_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_free (parent_dirname);
+      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_free (parent_dirname);
+  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 3d54047..67b8c8d 100644
--- a/gio/tests/unix-mounts.c
+++ b/gio/tests/unix-mounts.c
@@ -33,6 +33,12 @@
 {
   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 dafaf66..67a90d8 100644
--- a/gio/tests/unix-streams.c
+++ b/gio/tests/unix-streams.c
@@ -178,6 +178,7 @@
   if (g_cancellable_is_cancelled (main_cancel))
     {
       do_main_cancel (out);
+      g_clear_error (&err);
       return;
     }
 
@@ -214,6 +215,7 @@
   if (g_cancellable_is_cancelled (main_cancel))
     {
       do_main_cancel (out);
+      g_clear_error (&err);
       return;
     }
 
diff --git a/glib-gettextize.in b/glib-gettextize.in
index b07078b..af7052f 100755
--- a/glib-gettextize.in
+++ b/glib-gettextize.in
@@ -35,7 +35,7 @@
       --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 40d3c67..0000000
--- 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 0f43d3b..8743257 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 e3ce6bc..f64826b 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/Makefile.am b/glib/Makefile.am
index 0497061..8f6536c 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
 #
@@ -96,6 +98,7 @@
 libglib_2_0_la_SOURCES = 	\
 	$(deprecated_sources)	\
 	glib_probes.d		\
+	garcbox.c		\
 	garray.c		\
 	gasyncqueue.c		\
 	gasyncqueueprivate.h	\
@@ -149,6 +152,10 @@
 	gquark.c		\
 	gqueue.c		\
 	grand.c			\
+	grcbox.c		\
+	grcboxprivate.h		\
+	grefcount.c		\
+	grefstring.c		\
 	gregex.c		\
 	gscanner.c		\
 	gscripttable.h		\
@@ -156,6 +163,7 @@
 	gshell.c		\
 	gslice.c		\
 	gslist.c		\
+	gspawn-private.h	\
 	gstdio.c		\
 	gstdioprivate.h		\
 	gstrfuncs.c		\
@@ -215,12 +223,21 @@
 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 =   \
@@ -284,6 +301,9 @@
 	gquark.h	\
 	gqueue.h	\
 	grand.h		\
+	grcbox.h	\
+	grefcount.h	\
+	grefstring.h	\
 	gregex.h	\
 	gscanner.h	\
 	gsequence.h	\
@@ -349,16 +369,14 @@
 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
@@ -401,15 +419,26 @@
 	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 = -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 = -mwindows
 gspawn_win32_helper_console_LDADD = libglib-2.0.la
@@ -419,11 +448,9 @@
 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 
 
diff --git a/glib/garcbox.c b/glib/garcbox.c
new file mode 100644
index 0000000..9c1bd8f
--- /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 39c87ca..5b71c88 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 @@
   guint   elt_size;
   guint   zero_terminated : 1;
   guint   clear : 1;
-  gint    ref_count;
+  gatomicrefcount ref_count;
   GDestroyNotify clear_func;
 };
 
@@ -139,9 +139,9 @@
     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 @@
   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 @@
   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 @@
   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 @@
   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);
@@ -788,7 +789,7 @@
  * such power does not fit in a guint
  */
 static guint
-g_nearest_pow (gint num)
+g_nearest_pow (guint num)
 {
   guint n = 1;
 
@@ -800,7 +801,7 @@
 
 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);
@@ -882,7 +883,7 @@
   gpointer       *pdata;
   guint           len;
   guint           alloc;
-  gint            ref_count;
+  gatomicrefcount ref_count;
   GDestroyNotify  element_free_func;
 };
 
@@ -936,9 +937,10 @@
   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);
 
@@ -1041,7 +1043,7 @@
 
   g_return_val_if_fail (array, NULL);
 
-  g_atomic_int_inc (&rarray->ref_count);
+  g_atomic_ref_count_inc (&rarray->ref_count);
 
   return array;
 }
@@ -1066,7 +1068,7 @@
 
   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);
 }
 
@@ -1107,7 +1109,7 @@
   /* 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);
@@ -1187,27 +1189,31 @@
                        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 8529beb..3eb3839 100644
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.c
@@ -539,6 +539,8 @@
   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 @@
 {
   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 8e5efcc..971176e 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -109,7 +109,8 @@
 #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 @@
 #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_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_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/gbookmarkfile.c b/glib/gbookmarkfile.c
index bbbc66e..31706ba 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -210,7 +210,7 @@
 };
 
 /* parser state machine */
-enum
+typedef enum
 {
   STATE_STARTED        = 0,
   
@@ -228,7 +228,7 @@
   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 @@
 
 struct _ParseData
 {
-  gint state;
+  ParserState state;
   
   GHashTable *namespaces;
   
@@ -863,7 +863,8 @@
       item->metadata->applications = g_list_prepend (item->metadata->applications, ai);
       g_hash_table_replace (item->metadata->apps_by_name, ai->name, ai);
     }
-      
+
+  g_free (ai->exec);
   ai->exec = g_strdup (exec);
   
   if (count)
@@ -915,7 +916,8 @@
     
   if (!item->metadata)
     item->metadata = bookmark_metadata_new ();
-  
+
+  g_free (item->metadata->mime_type);
   item->metadata->mime_type = g_strdup (type);
 }
 
@@ -964,7 +966,9 @@
     
   if (!item->metadata)
     item->metadata = bookmark_metadata_new ();
-  
+
+  g_free (item->metadata->icon_href);
+  g_free (item->metadata->icon_mime);
   item->metadata->icon_href = g_strdup (href);
   item->metadata->icon_mime = g_strdup (type);
 }
@@ -1083,6 +1087,43 @@
 #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 +1304,23 @@
         	     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 +1830,7 @@
  * 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/gbytes.c b/glib/gbytes.c
index 3b14a51..7b72886 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>
 
@@ -69,7 +70,7 @@
 {
   gconstpointer data;  /* may be NULL iff (size == 0) */
   gsize size;  /* may be 0 */
-  gint ref_count;
+  gatomicrefcount ref_count;
   GDestroyNotify free_func;
   gpointer user_data;
 };
@@ -187,7 +188,7 @@
   bytes->size = size;
   bytes->free_func = free_func;
   bytes->user_data = user_data;
-  bytes->ref_count = 1;
+  g_atomic_ref_count_init (&bytes->ref_count);
 
   return (GBytes *)bytes;
 }
@@ -310,7 +311,7 @@
 {
   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;
 }
@@ -330,7 +331,7 @@
   if (bytes == NULL)
     return;
 
-  if (g_atomic_int_dec_and_test (&bytes->ref_count))
+  if (g_atomic_ref_count_dec (&bytes->ref_count))
     {
       if (bytes->free_func != NULL)
         bytes->free_func (bytes->user_data);
@@ -402,10 +403,18 @@
  *
  * Compares the two #GBytes values.
  *
- * This function can be used to sort GBytes instances in lexographical order.
+ * This function can be used to sort GBytes instances in lexicographical order.
  *
- * Returns: a negative value if bytes2 is lesser, a positive value if bytes2 is
- *          greater, and zero if bytes2 is equal to bytes1
+ * If @bytes1 and @bytes2 have different length but the shorter one is a
+ * prefix of the longer one then the shorter one is considered to be less than
+ * the longer one. Otherwise the first byte where both differ is used for
+ * comparison. If @bytes1 has a smaller value at that position it is
+ * considered less, otherwise greater than @bytes2.
+ *
+ * Returns: a negative value if @bytes1 is less than @bytes2, a positive value
+ *          if @bytes1 is greater than @bytes2, and zero if @bytes1 is equal to
+ *          @bytes2
+ *
  *
  * Since: 2.32
  */
@@ -438,7 +447,7 @@
     return NULL;
 
   /* Are we the only reference? */
-  if (g_atomic_int_get (&bytes->ref_count) == 1)
+  if (g_atomic_ref_count_compare (&bytes->ref_count, 1))
     {
       *size = bytes->size;
       result = (gpointer)bytes->data;
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index f151ced..5530aad 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -1118,46 +1118,46 @@
 
 /* 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 @@
 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 @@
 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 d0d3721..c2e69a5 100644
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -164,7 +164,7 @@
 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 bf146d1..6e163b8 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -1387,7 +1387,10 @@
  *
  * 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 380c8d1..1e7a771 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -1173,6 +1173,17 @@
  *   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 8721811..433004c 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 @@
 
   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 @@
    * (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 @@
 
   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_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_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 @@
  * @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 9f86bd9..ce1690b 100644
--- a/glib/glib-autocleanups.h
+++ b/glib/glib-autocleanups.h
@@ -87,3 +87,4 @@
 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 2e22966..6cb4e4a 100644
--- a/glib/glib-init.c
+++ b/glib/glib-init.c
@@ -292,6 +292,8 @@
       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 5da33c0..695dc04 100644
--- a/glib/glib-init.h
+++ b/glib/glib-init.h
@@ -34,6 +34,7 @@
 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 4f5a7f7..94a11fb 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 dc80e70..0577d8c 100644
--- a/glib/glib.stp.in
+++ b/glib/glib.stp.in
@@ -598,3 +598,48 @@
   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 38f101a..1cf2ed9 100644
--- a/glib/glib_gdb.py
+++ b/glib/glib_gdb.py
@@ -9,7 +9,7 @@
     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 @@
     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 29f7ff1..d6b1f8d 100644
--- a/glib/glib_probes.d
+++ b/glib/glib_probes.d
@@ -43,4 +43,8 @@
 	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/gmacros.h b/glib/gmacros.h
index cfeb9a0..9b8ef0e 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:
diff --git a/glib/gmain.c b/glib/gmain.c
index cdc8654..0a6857c 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1296,6 +1296,11 @@
  * 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 @@
  *
  * 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.
@@ -3301,25 +3307,10 @@
   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;
@@ -3328,18 +3319,6 @@
   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)
@@ -3355,10 +3334,10 @@
       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);
     }
@@ -3382,6 +3361,45 @@
 }
 
 /**
+ * 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
@@ -3858,9 +3876,9 @@
       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;
@@ -4067,9 +4085,9 @@
 	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)
 	{
@@ -5233,6 +5251,68 @@
     }
 }
 
+/* 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)
 {
@@ -5245,6 +5325,9 @@
   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);
@@ -5373,6 +5456,9 @@
   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
@@ -5559,6 +5645,9 @@
   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 2515d73..eca14d7 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -163,12 +163,34 @@
  * 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 @@
 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);
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index ed30ed2..f1ab94e 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -458,7 +458,7 @@
   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 @@
           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 @@
               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 @@
   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
@@ -557,11 +557,23 @@
   return buf;
 }
 
+/* Format the next UTF-8 character as a gchar* for printing in error output
+ * when we encounter a syntax error. This correctly handles invalid UTF-8,
+ * emitting it as hex escapes. */
 static gchar*
 utf8_str (const gchar *utf8,
           gchar       *buf)
 {
-  char_str (g_utf8_get_char (utf8), buf);
+  gunichar c = g_utf8_get_char_validated (utf8, -1);
+  if (c == (gunichar) -1 || c == (gunichar) -2)
+    {
+      gchar *temp = g_strdup_printf ("\\x%02x", (guint)(guchar)*utf8);
+      memset (buf, 0, 8);
+      memcpy (buf, temp, strlen (temp));
+      g_free (temp);
+    }
+  else
+    char_str (c, buf);
   return buf;
 }
 
@@ -672,10 +684,10 @@
                 {
                   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;
@@ -688,7 +700,7 @@
                                         "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
@@ -710,7 +722,7 @@
                     {
                       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;
@@ -748,7 +760,7 @@
               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
                 {
@@ -756,7 +768,7 @@
                   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,
@@ -764,7 +776,7 @@
                                         _("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;
             }
@@ -1207,8 +1219,8 @@
               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));
             }
@@ -1249,8 +1261,8 @@
               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));
             }
@@ -1330,8 +1342,8 @@
                   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));
@@ -1371,9 +1383,9 @@
                   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),
@@ -1415,9 +1427,9 @@
                   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));
@@ -1548,8 +1560,8 @@
               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));
@@ -1584,9 +1596,9 @@
                   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);
                 }
@@ -1595,7 +1607,7 @@
                   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);
                 }
@@ -1604,8 +1616,8 @@
                   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));
                 }
@@ -1771,7 +1783,7 @@
 
     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:
@@ -1779,8 +1791,8 @@
         {
           /* 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;
@@ -1824,17 +1836,22 @@
     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;
 
     case STATE_AFTER_CLOSE_TAG_SLASH:
     case STATE_INSIDE_CLOSE_TAG_NAME:
     case STATE_AFTER_CLOSE_TAG_NAME:
-      set_error (context, error, G_MARKUP_ERROR_PARSE,
-                 _("Document ended unexpectedly inside the close tag for "
-                   "element '%s'"), current_element (context));
+      if (context->tag_stack != NULL)
+        set_error (context, error, G_MARKUP_ERROR_PARSE,
+                   _("Document ended unexpectedly inside the close tag for "
+                     "element “%s”"), current_element (context));
+      else
+        set_error (context, error, G_MARKUP_ERROR_PARSE,
+                   _("Document ended unexpectedly inside the close tag for an "
+                     "unopened element"));
       break;
 
     case STATE_INSIDE_PASSTHROUGH:
diff --git a/glib/gmem.h b/glib/gmem.h
index 5cccb04..1860d01 100644
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -110,6 +110,16 @@
 			   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 @@
         _destroy (_p);                                                         \
       }                                                                        \
   } G_STMT_END
+#endif /* __GNUC__ */
 
 /**
  * g_steal_pointer:
diff --git a/glib/goption.c b/glib/goption.c
index dc9ec3b..4b2abc0 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -2028,7 +2028,7 @@
 
                   /* Now look for --<group>-<option> */
                   dash = strchr (arg, '-');
-                  if (dash)
+                  if (dash && arg < dash)
                     {
                       /* Try the groups */
                       list = context->groups;
@@ -2293,7 +2293,7 @@
  *
  * Increments the reference count of @group by one.
  *
- * Returns: a #GoptionGroup
+ * Returns: a #GOptionGroup
  *
  * Since: 2.44
  */
diff --git a/glib/gqueue.c b/glib/gqueue.c
index bf172f6..9f34790 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -372,7 +372,7 @@
 {
   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_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 @@
                        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 610fc69..fcbc6f4 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -388,7 +388,7 @@
                        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 0000000..f31db78
--- /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 0000000..e66f1ff
--- /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 0000000..8b0d8dd
--- /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 0000000..3708531
--- /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 0000000..dec9a5f
--- /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 0000000..f3ed4df
--- /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 0000000..65b391f
--- /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 c30d317..ed9542a 100644
--- a/glib/gscripttable.h
+++ b/glib/gscripttable.h
@@ -466,7 +466,6 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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 @@
  { 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/gspawn-private.h b/glib/gspawn-private.h
new file mode 100644
index 0000000..16f816c
--- /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 360f47e..045d90f 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -352,7 +352,12 @@
   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 636e9eb..b0cf5ab 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 @@
   CHILD_NO_ERROR,
   CHILD_CHDIR_FAILED,
   CHILD_SPAWN_FAILED,
+  CHILD_SPAWN_NOENT,
 };
 
 enum {
@@ -316,6 +318,7 @@
   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 @@
 
       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 @@
 		   _("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 @@
   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 @@
     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 @@
 }
 
 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 @@
 
   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 @@
       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 @@
    */
   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 @@
       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 @@
       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 @@
   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 @@
    */
   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 @@
   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 @@
 
   /* 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 @@
     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 @@
 }
 
 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 89824d1..e273e2a 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,34 @@
 #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
+
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#else
+#define HAVE_O_CLOEXEC 1
+#endif
+
 /**
  * SECTION:spawn
  * @Short_description: process launching
@@ -141,6 +175,27 @@
                                       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 +654,11 @@
  * 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 +733,21 @@
  * 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 +799,87 @@
 }
 
 /**
+ * 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 +1077,6 @@
   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 +1269,12 @@
         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 +1288,7 @@
         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 +1306,7 @@
         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 +1379,268 @@
   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;
+
+#ifndef HAVE_O_CLOEXEC
+      fcntl (read_null, F_SETFD, FD_CLOEXEC);
+#endif
+
+      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;
+
+#ifndef HAVE_O_CLOEXEC
+      fcntl (read_null, F_SETFD, FD_CLOEXEC);
+#endif
+
+      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;
+
+#ifndef HAVE_O_CLOEXEC
+      fcntl (read_null, F_SETFD, FD_CLOEXEC);
+#endif
+
+      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 +1678,12 @@
        */
       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 +1709,9 @@
             {
               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 +1739,9 @@
            */
 
           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 +1766,6 @@
       /* 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 +1808,7 @@
             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 +1878,6 @@
       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 +1906,92 @@
   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 055743e..d6b0be7 100644
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -215,6 +215,19 @@
                                    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 e158de2..ffbd371 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -544,6 +544,26 @@
   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 @@
 #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 @@
       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 @@
 #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 @@
       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/gtestutils.c b/glib/gtestutils.c
index 93f2ba0..7b29c27 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -87,14 +87,18 @@
  * 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_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() is that the assertion
+ * 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" -->
  * #include <glib.h>
@@ -473,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.
  */
 
 /**
@@ -484,7 +491,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.
  */
 
 /**
@@ -497,6 +505,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
@@ -512,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
@@ -527,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
@@ -542,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.40
@@ -935,7 +959,20 @@
       fail = result == G_TEST_RUN_FAILURE;
       if (test_tap_log)
         {
-          g_print ("%s %d %s", fail ? "not ok" : "ok", test_run_count, string1);
+          const gchar *ok;
+
+          /* The TAP representation for an expected failure starts with
+           * "not ok", even though it does not actually count as failing
+           * due to the use of the TODO directive. "ok # TODO" would mean
+           * a test that was expected to fail unexpectedly succeeded,
+           * for which GTestResult does not currently have a
+           * representation. */
+          if (fail || result == G_TEST_RUN_INCOMPLETE)
+            ok = "not ok";
+          else
+            ok = "ok";
+
+          g_print ("%s %d %s", ok, test_run_count, string1);
           if (result == G_TEST_RUN_INCOMPLETE)
             g_print (" # TODO %s\n", string2 ? string2 : "");
           else if (result == G_TEST_RUN_SKIPPED)
@@ -953,7 +990,7 @@
             g_print ("Bail out!\n");
           g_abort ();
         }
-      if (result == G_TEST_RUN_SKIPPED)
+      if (result == G_TEST_RUN_SKIPPED || result == G_TEST_RUN_INCOMPLETE)
         test_skipped_count++;
       break;
     case G_TEST_LOG_MIN_RESULT:
@@ -1247,12 +1284,18 @@
  *
  * - `--debug-log`: Debug test logging output.
  *
+ * Since 2.58, if tests are compiled with `G_DISABLE_ASSERT` defined,
+ * g_test_init() will print an error and exit. This is to prevent no-op tests
+ * from being executed, as g_assert() is commonly (erroneously) used in unit
+ * tests, and is a no-op when compiled with `G_DISABLE_ASSERT`. Ensure your
+ * tests are compiled without `G_DISABLE_ASSERT` defined.
+ *
  * 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;
@@ -1696,11 +1739,13 @@
  * particular code runs before or after a given test case, use
  * g_test_add(), which lets you specify setup and teardown functions.
  *
- * If all tests are skipped, this function will return 0 if
- * producing TAP output, or 77 (treated as "skip test" by Automake) otherwise.
+ * If all tests are skipped or marked as incomplete (expected failures),
+ * this function will return 0 if producing TAP output, or 77 (treated
+ * as "skip test" by Automake) otherwise.
  *
  * Returns: 0 on success, 1 on failure (assuming it returns at all),
- *   0 or 77 if all tests were skipped with g_test_skip()
+ *   0 or 77 if all tests were skipped with g_test_skip() and/or
+ *   g_test_incomplete()
  *
  * Since: 2.16
  */
@@ -2301,7 +2346,8 @@
   test_uri_base = old_base;
 
   return (success == G_TEST_RUN_SUCCESS ||
-          success == G_TEST_RUN_SKIPPED);
+          success == G_TEST_RUN_SKIPPED ||
+          success == G_TEST_RUN_INCOMPLETE);
 }
 
 static gboolean
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 02ab397..550e241 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -64,7 +64,7 @@
                                                  #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'); \
@@ -147,6 +147,29 @@
 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/gtimer.c b/glib/gtimer.c
index e95ac0e..2012255 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -345,6 +345,8 @@
  * zone indicator. (In the absence of any time zone indication, the
  * timestamp is assumed to be in local time.)
  *
+ * Any leading or trailing space in @iso_date is ignored.
+ *
  * Returns: %TRUE if the conversion was successful.
  *
  * Since: 2.12
@@ -355,6 +357,8 @@
 {
   struct tm tm = {0};
   long val;
+  long mday, mon, year;
+  long hour, min, sec;
 
   g_return_val_if_fail (iso_date != NULL, FALSE);
   g_return_val_if_fail (time_ != NULL, FALSE);
@@ -368,30 +372,42 @@
   if (*iso_date == '\0')
     return FALSE;
 
-  if (!g_ascii_isdigit (*iso_date) && *iso_date != '-' && *iso_date != '+')
+  if (!g_ascii_isdigit (*iso_date) && *iso_date != '+')
     return FALSE;
 
   val = strtoul (iso_date, (char **)&iso_date, 10);
   if (*iso_date == '-')
     {
       /* YYYY-MM-DD */
-      tm.tm_year = val - 1900;
+      year = val;
       iso_date++;
-      tm.tm_mon = strtoul (iso_date, (char **)&iso_date, 10) - 1;
-      
+
+      mon = strtoul (iso_date, (char **)&iso_date, 10);
       if (*iso_date++ != '-')
         return FALSE;
       
-      tm.tm_mday = strtoul (iso_date, (char **)&iso_date, 10);
+      mday = strtoul (iso_date, (char **)&iso_date, 10);
     }
   else
     {
       /* YYYYMMDD */
-      tm.tm_mday = val % 100;
-      tm.tm_mon = (val % 10000) / 100 - 1;
-      tm.tm_year = val / 10000 - 1900;
+      mday = val % 100;
+      mon = (val % 10000) / 100;
+      year = val / 10000;
     }
 
+  /* Validation. */
+  if (year < 1900 || year > G_MAXINT)
+    return FALSE;
+  if (mon < 1 || mon > 12)
+    return FALSE;
+  if (mday < 1 || mday > 31)
+    return FALSE;
+
+  tm.tm_mday = mday;
+  tm.tm_mon = mon - 1;
+  tm.tm_year = year - 1900;
+
   if (*iso_date != 'T')
     return FALSE;
 
@@ -405,34 +421,50 @@
   if (*iso_date == ':')
     {
       /* hh:mm:ss */
-      tm.tm_hour = val;
+      hour = val;
       iso_date++;
-      tm.tm_min = strtoul (iso_date, (char **)&iso_date, 10);
+      min = strtoul (iso_date, (char **)&iso_date, 10);
       
       if (*iso_date++ != ':')
         return FALSE;
       
-      tm.tm_sec = strtoul (iso_date, (char **)&iso_date, 10);
+      sec = strtoul (iso_date, (char **)&iso_date, 10);
     }
   else
     {
       /* hhmmss */
-      tm.tm_sec = val % 100;
-      tm.tm_min = (val % 10000) / 100;
-      tm.tm_hour = val / 10000;
+      sec = val % 100;
+      min = (val % 10000) / 100;
+      hour = val / 10000;
     }
 
+  /* Validation. Allow up to 2 leap seconds when validating @sec. */
+  if (hour > 23)
+    return FALSE;
+  if (min > 59)
+    return FALSE;
+  if (sec > 61)
+    return FALSE;
+
+  tm.tm_hour = hour;
+  tm.tm_min = min;
+  tm.tm_sec = sec;
+
   time_->tv_usec = 0;
   
   if (*iso_date == ',' || *iso_date == '.')
     {
       glong mul = 100000;
 
-      while (g_ascii_isdigit (*++iso_date))
+      while (mul >= 1 && g_ascii_isdigit (*++iso_date))
         {
           time_->tv_usec += (*iso_date - '0') * mul;
           mul /= 10;
         }
+
+      /* Skip any remaining digits after we’ve reached our limit of precision. */
+      while (g_ascii_isdigit (*iso_date))
+        iso_date++;
     }
     
   /* Now parse the offset and convert tm to a time_t */
@@ -448,11 +480,24 @@
       val = strtoul (iso_date + 1, (char **)&iso_date, 10);
       
       if (*iso_date == ':')
-        val = 60 * val + strtoul (iso_date + 1, (char **)&iso_date, 10);
+        {
+          /* hh:mm */
+          hour = val;
+          min = strtoul (iso_date + 1, (char **)&iso_date, 10);
+        }
       else
-        val = 60 * (val / 100) + (val % 100);
+        {
+          /* hhmm */
+          hour = val / 100;
+          min = val % 100;
+        }
 
-      time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * val * sign);
+      if (hour > 99)
+        return FALSE;
+      if (min > 59)
+        return FALSE;
+
+      time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * (gint64) (60 * hour + min) * sign);
     }
   else
     {
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 72a4916..b3220dc 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -1677,7 +1677,10 @@
               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 600638c..4d83ee9 100644
--- a/glib/gtranslit.c
+++ b/glib/gtranslit.c
@@ -314,12 +314,12 @@
  * 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 09d9bd1..67adb7f 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -510,6 +510,9 @@
   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 659e8cc..3b71b17 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 @@
     G_UNICODE_BREAK_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 @@
     G_UNICODE_BREAK_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 @@
     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 @@
     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 @@
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_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 @@
     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 @@
     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 @@
   { /* 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 @@
     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 @@
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_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 @@
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_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,41 +5035,41 @@
     G_UNICODE_BREAK_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, 
-    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_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_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_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_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 @@
     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,22 +5390,6 @@
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_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_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_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_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5417,6 +5403,7 @@
     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_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5449,12 +5436,25 @@
     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_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_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 @@
     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 @@
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_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 @@
     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 @@
     G_UNICODE_BREAK_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 @@
     G_UNICODE_BREAK_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 @@
     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 @@
     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 @@
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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,43 +16831,43 @@
     G_UNICODE_BREAK_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_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_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, 
@@ -16652,7 +16912,137 @@
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 291, index 128 */
+  { /* 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, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_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 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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_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 @@
     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 @@
     G_UNICODE_BREAK_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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
   112 /* page 266 */,
   113 /* page 267 */,
   114 /* page 268 */,
+  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,
-  115 /* page 270 */,
+  127 /* page 282 */,
   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,
+  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 @@
   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 @@
   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 @@
   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 */,
+  139 /* page 362 */,
+  140 /* page 363 */,
   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,
-  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 @@
   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 @@
   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 @@
   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,23 +23227,23 @@
   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 */,
+  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,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  153 /* page 480 */,
+  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,
@@ -22601,30 +23251,30 @@
   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 */,
+  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,
-  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 @@
 
 /* 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 c3332af..4bb6b57 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,7 @@
     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, 
@@ -719,7 +719,7 @@
     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_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     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 @@
     G_UNICODE_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 @@
     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 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_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 @@
     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 @@
     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_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_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_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_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 @@
   },
   { /* 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_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_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_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_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 @@
     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_OTHER_LETTER, G_UNICODE_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_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_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_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_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_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_OTHER_LETTER, G_UNICODE_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_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 @@
     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 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_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 @@
     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_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    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_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 @@
     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 @@
     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 @@
     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,52 +4356,50 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_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_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_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_UNASSIGNED, G_UNICODE_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_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_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_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, 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 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_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 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_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 @@
     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 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_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 @@
     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 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_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 @@
     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 @@
     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 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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,7 @@
     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, 
@@ -7946,7 +8143,7 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_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_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, 
@@ -7962,8 +8159,8 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_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 @@
     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 @@
     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,7 @@
     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, 
@@ -8196,7 +8393,7 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_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_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,7 +8476,30 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 280, index 83 */
+  { /* 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, 
@@ -8312,28 +8532,7 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_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 @@
     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 @@
     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 @@
     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 @@
     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,32 +8812,34 @@
     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_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_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, 
@@ -8668,7 +8869,96 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 291, index 87 */
+  { /* 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, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_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 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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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,6 @@
     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_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,38 +12327,40 @@
     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_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_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, 
+    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_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_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, 
@@ -11893,6 +12370,94 @@
     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
+  },
+  { /* 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, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_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_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, 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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
   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 */,
+  86 /* page 282 */,
   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 */,
-  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 @@
   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 @@
   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 @@
   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 */,
+  95 /* page 362 */,
+  96 /* page 363 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   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 @@
   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 @@
   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 @@
   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 @@
   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,30 +13872,30 @@
   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 */,
+  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,
   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_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,
@@ -13497,7 +14062,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 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 @@
     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 @@
     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 @@
     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 @@
     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 @@
   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 */,
+  43 /* page 276 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  42 /* page 276 */,
-  0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  43 /* page 278 */,
-  44 /* page 279 */,
-  45 /* page 280 */,
-  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 @@
   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 @@
   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 @@
   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 @@
 {0x3000, 0x303E},
 {0x3041, 0x3096},
 {0x3099, 0x30FF},
-{0x3105, 0x312E},
+{0x3105, 0x312F},
 {0x3131, 0x318E},
 {0x3190, 0x31BA},
 {0x31C0, 0x31E3},
@@ -17999,7 +18627,7 @@
 {0xFF01, 0xFF60},
 {0xFFE0, 0xFFE6},
 {0x16FE0, 0x16FE1},
-{0x17000, 0x187EC},
+{0x17000, 0x187F1},
 {0x18800, 0x18AF2},
 {0x1B000, 0x1B11E},
 {0x1B170, 0x1B2FB},
@@ -18034,13 +18662,15 @@
 {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 e6934d2..481bc52 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -415,6 +415,13 @@
  * @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 @@
   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 ab9f63d..02f2c91 100644
--- a/glib/gunidecomp.h
+++ b/glib/gunidecomp.h
@@ -83,7 +83,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, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     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 @@
     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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 @@
     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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 63e7ba5..7931031 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -1440,6 +1440,15 @@
     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/gvariant-parser.c b/glib/gvariant-parser.c
index 3261bc1..233a19f 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.c
@@ -260,6 +260,9 @@
   stream->this = stream->stream;
   stream->stream = end;
 
+  /* We must have at least one byte in a token. */
+  g_assert (stream->stream - stream->this >= 1);
+
   return TRUE;
 }
 
@@ -276,7 +279,8 @@
   if (!token_stream_prepare (stream))
     return FALSE;
 
-  return stream->this[0] == first_char;
+  return stream->stream - stream->this >= 1 &&
+         stream->this[0] == first_char;
 }
 
 static gboolean
@@ -287,7 +291,8 @@
   if (!token_stream_prepare (stream))
     return FALSE;
 
-  return stream->this[0] == first_char &&
+  return stream->stream - stream->this >= 2 &&
+         stream->this[0] == first_char &&
          stream->this[1] == second_char;
 }
 
@@ -297,7 +302,8 @@
   if (!token_stream_prepare (stream))
     return FALSE;
 
-  return g_ascii_isalpha (stream->this[0]) &&
+  return stream->stream - stream->this >= 2 &&
+         g_ascii_isalpha (stream->this[0]) &&
          g_ascii_isalpha (stream->this[1]);
 }
 
@@ -307,10 +313,11 @@
   if (!token_stream_prepare (stream))
     return FALSE;
 
-  return (g_ascii_isdigit (stream->this[0]) ||
-          stream->this[0] == '-' ||
-          stream->this[0] == '+' ||
-          stream->this[0] == '.');
+  return (stream->stream - stream->this >= 1 &&
+          (g_ascii_isdigit (stream->this[0]) ||
+           stream->this[0] == '-' ||
+           stream->this[0] == '+' ||
+           stream->this[0] == '.'));
 }
 
 static gboolean
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 8be9ce7..2c9f951 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -403,11 +403,11 @@
  * 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:
@@ -1105,7 +1105,7 @@
  * 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_DOUBLE: #gdouble
  *
@@ -1364,10 +1364,10 @@
  * 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
  *
@@ -4738,10 +4738,13 @@
           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);
 
@@ -4803,10 +4806,13 @@
 
     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);
 
@@ -5042,7 +5048,7 @@
           return;
 
         case 'y':
-          *(guchar *) ptr = g_variant_get_byte (value);
+          *(guint8 *) ptr = g_variant_get_byte (value);
           return;
 
         case 'n':
@@ -5083,7 +5089,7 @@
       switch (*(*str)++)
         {
         case 'y':
-          *(guchar *) ptr = 0;
+          *(guint8 *) ptr = 0;
           return;
 
         case 'n':
diff --git a/glib/gvariant.h b/glib/gvariant.h
index 3e13926..99e2470 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -80,7 +80,7 @@
 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
@@ -133,7 +133,7 @@
 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 9910dee..f473ad0 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -1054,7 +1054,7 @@
    * 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++)
@@ -1080,16 +1080,19 @@
   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;
@@ -1100,7 +1103,7 @@
       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 a176514..8a7ab3a 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 @@
 }
 
 #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 036d1f4..c05c694 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -76,6 +76,9 @@
   'gquark.h',
   'gqueue.h',
   'grand.h',
+  'grcbox.h',
+  'grefcount.h',
+  'grefstring.h',
   'gregex.h',
   'gscanner.h',
   'gsequence.h',
@@ -117,6 +120,7 @@
 )
 
 glib_sources = files(
+  'garcbox.c',
   'garray.c',
   'gasyncqueue.c',
   'gatomic.c',
@@ -159,6 +163,9 @@
   'gquark.c',
   'gqueue.c',
   'grand.c',
+  'grcbox.c',
+  'grefcount.c',
+  'grefstring.c',
   'gregex.c',
   'gscanner.c',
   'gsequence.c',
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 7289b41..b29b684 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -38,6 +38,7 @@
 
 test_extra_programs = \
 	test-spawn-echo			\
+	testing-helper			\
 	$(NULL)
 
 test_programs = \
@@ -89,7 +90,9 @@
 	protocol			\
 	queue				\
 	rand				\
+	rcbox				\
 	rec-mutex			\
+	refstring			\
 	regex				\
 	rwlock				\
 	scannerapi			\
@@ -141,6 +144,30 @@
 	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/fail-39.xbel \
+	bookmarks/fail-40.xbel \
+	bookmarks/fail-41.xbel \
 	bookmarks/valid-01.xbel \
 	bookmarks/valid-02.xbel \
 	bookmarks/valid-03.xbel \
@@ -156,7 +183,8 @@
 	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/atomic.c b/glib/tests/atomic.c
index 35fa705..84c13fb 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)
 {
@@ -87,7 +92,8 @@
   g_assert (ip == 0);
 
   g_atomic_pointer_set (&gs, 0);
-  gs2 = (gsize) g_atomic_pointer_get (&gs);
+  vp2 = g_atomic_pointer_get (&gs);
+  gs2 = (gsize) vp2;
   g_assert (gs2 == 0);
   res = g_atomic_pointer_compare_and_exchange (&gs, 0, 0);
   g_assert (res);
@@ -191,7 +197,8 @@
   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 c8c130d..5b3bce7 100644
--- a/glib/tests/autoptr.c
+++ b/glib/tests/autoptr.c
@@ -423,6 +423,13 @@
 }
 
 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;
@@ -539,6 +546,7 @@
   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 0000000..10f3d80
--- /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 0000000..ab4edbb
--- /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 0000000..a00e154
--- /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 0000000..cf7fbf4
--- /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 0000000..abc4ceb
--- /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 0000000..35324ad
--- /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 0000000..a8726e6
--- /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 0000000..e9bc439
--- /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 0000000..739aca2
--- /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 0000000..e402095
--- /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 0000000..131a97a
--- /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 0000000..2cdcf9f
--- /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 0000000..982ea10
--- /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 0000000..4b46cba
--- /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 0000000..d6de333
--- /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 0000000..a72c6ff
--- /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 0000000..88214d9
--- /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 0000000..2f8fd10
--- /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 0000000..7949a3b
--- /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 0000000..785f3b1
--- /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 0000000..9ef34f3
--- /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/bookmarks/fail-39.xbel b/glib/tests/bookmarks/fail-39.xbel
new file mode 100644
index 0000000..c57c837
--- /dev/null
+++ b/glib/tests/bookmarks/fail-39.xbel
@@ -0,0 +1 @@
+<xbel version="1.0"><bookmark href=""><info><metadata owner="http://freedesktop.org"><mime-type/><mime-type/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-40.xbel b/glib/tests/bookmarks/fail-40.xbel
new file mode 100644
index 0000000..9ce48a8
--- /dev/null
+++ b/glib/tests/bookmarks/fail-40.xbel
@@ -0,0 +1 @@
+<xbel version="1.0"><bookmark href=""><info><metadata owner="http://freedesktop.org"><applications><application name=""exec=""/><application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-41.xbel b/glib/tests/bookmarks/fail-41.xbel
new file mode 100644
index 0000000..8ac0c56
--- /dev/null
+++ b/glib/tests/bookmarks/fail-41.xbel
@@ -0,0 +1 @@
+<xbel version="1.0"><bookmark href=""added="2T0+819855292164632335">
diff --git a/glib/tests/date.c b/glib/tests/date.c
index 84c4869..b801ca7 100644
--- a/glib/tests/date.c
+++ b/glib/tests/date.c
@@ -89,11 +89,14 @@
 {
   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 */
@@ -193,6 +196,17 @@
 
   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.
@@ -209,15 +223,21 @@
   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
@@ -245,7 +265,7 @@
       TEST_DATE (1,  6, 2018,    "%Oh %Y",         "Jun 2018");
     }
   else
-    g_test_incomplete ("locale en_GB not available, skipping English month names test");
+    g_test_skip ("locale en_GB not available, skipping English month names test");
 
   setlocale (LC_ALL, "de_DE.utf-8");
 #ifdef G_OS_WIN32
@@ -261,7 +281,7 @@
       TEST_DATE ( 1, 12, 2018,    "%Oh %Y",      "Dez 2018");
     }
   else
-    g_test_incomplete ("locale de_DE not available, skipping German month names test");
+    g_test_skip ("locale de_DE not available, skipping German month names test");
 
 
   setlocale (LC_ALL, "es_ES.utf-8");
@@ -278,7 +298,7 @@
       TEST_DATE ( 1,  6, 2018,      "%Oh de %Y",         "jun de 2018");
     }
   else
-    g_test_incomplete ("locale es_ES not available, skipping Spanish month names test");
+    g_test_skip ("locale es_ES not available, skipping Spanish month names test");
 
   setlocale (LC_ALL, "fr_FR.utf-8");
 #ifdef G_OS_WIN32
@@ -294,7 +314,7 @@
       TEST_DATE ( 1, 12, 2018,   "%Oh %Y",       "déc. 2018");
     }
   else
-    g_test_incomplete ("locale fr_FR not available, skipping French month names test");
+    g_test_skip ("locale fr_FR not available, skipping French month names test");
 
   /* Make sure that there are visible changes in some European languages.  */
   setlocale (LC_ALL, "el_GR.utf-8");
@@ -313,7 +333,7 @@
       TEST_DATE ( 1,  8, 2018,   "%Ob %Y",            "Αฯγ 2018");
     }
   else
-    g_test_incomplete ("locale el_GR not available, skipping Greek month names test");
+    g_test_skip ("locale el_GR not available, skipping Greek month names test");
 
   setlocale (LC_ALL, "hr_HR.utf-8");
 #ifdef G_OS_WIN32
@@ -331,7 +351,7 @@
       TEST_DATE ( 1, 12, 2018,    "%Ob %Y",         "Pro 2018");
     }
   else
-    g_test_incomplete ("locale hr_HR not available, skipping Croatian month names test");
+    g_test_skip ("locale hr_HR not available, skipping Croatian month names test");
 
   setlocale (LC_ALL, "lt_LT.utf-8");
 #ifdef G_OS_WIN32
@@ -349,7 +369,7 @@
       TEST_DATE ( 1,  8, 2018,      "%Y m. %Ob",           "2018 m. Rgp");
     }
   else
-    g_test_incomplete ("locale lt_LT not available, skipping Lithuanian month names test");
+    g_test_skip ("locale lt_LT not available, skipping Lithuanian month names test");
 
   setlocale (LC_ALL, "pl_PL.utf-8");
 #ifdef G_OS_WIN32
@@ -367,7 +387,7 @@
       TEST_DATE ( 1, 12, 2018,   "%Ob %Y",         "gru 2018");
     }
   else
-    g_test_incomplete ("locale pl_PL not available, skipping Polish month names test");
+    g_test_skip ("locale pl_PL not available, skipping Polish month names test");
 
   setlocale (LC_ALL, "ru_RU.utf-8");
 #ifdef G_OS_WIN32
@@ -388,7 +408,7 @@
       TEST_DATE (20,  5, 2018, "%Ob, %d-ะต, %Y", "ะผะฐะน, 20-ะต, 2018");
     }
   else
-    g_test_incomplete ("locale ru_RU not available, skipping Russian month names test");
+    g_test_skip ("locale ru_RU not available, skipping Russian month names test");
 
   g_date_free (gdate);
 
diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c
index 0e67cd1..4772540 100644
--- a/glib/tests/fileutils.c
+++ b/glib/tests/fileutils.c
@@ -887,6 +887,7 @@
   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
@@ -920,7 +921,13 @@
   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);
 
@@ -952,6 +959,56 @@
   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[])
@@ -959,6 +1016,8 @@
   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);
@@ -974,6 +1033,7 @@
   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 79a131a..a028f6d 100644
--- a/glib/tests/gdatetime.c
+++ b/glib/tests/gdatetime.c
@@ -112,6 +112,7 @@
 
   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 @@
   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 @@
   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 @@
    * 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 @@
 {
   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)
@@ -2116,13 +2131,15 @@
   GTimeZone *tz;
   GDateTime *gdt1, *gdt2;
 
-  tz = g_time_zone_new ("PST");
+  /* Check that an unknown zone name falls back to UTC. */
+  tz = g_time_zone_new ("nonexistent");
   g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "UTC");
   g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "UTC");
   g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, 0);
   g_assert (!g_time_zone_is_dst (tz, 0));
   g_time_zone_unref (tz);
 
+  /* An existent zone name should not fall back to UTC. */
   tz = g_time_zone_new ("PST8");
   g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8");
   g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST");
diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
index fdaed1a..5aac3de 100644
--- a/glib/tests/gvariant.c
+++ b/glib/tests/gvariant.c
@@ -3889,27 +3889,48 @@
     "boolean 4",                "8-9:",            "can not parse as",
     "int32 true",               "6-10:",           "can not parse as",
     "[double 5, int32 5]",      "1-9,11-18:",      "common type",
-    "string 4",                 "7-8:",            "can not parse as"
+    "string 4",                 "7-8:",            "can not parse as",
+    "\x0a",                     "1:",              "expected value",
+    "((",                       "2:",              "expected value",
   };
   gint i;
 
   for (i = 0; i < G_N_ELEMENTS (test); i += 3)
     {
-      GError *error = NULL;
+      GError *error1 = NULL, *error2 = NULL;
       GVariant *value;
 
-      value = g_variant_parse (NULL, test[i], NULL, NULL, &error);
-      g_assert (value == NULL);
+      /* Copy the test string and drop its nul terminator, then use the @limit
+       * parameter of g_variant_parse() to set the length. This allows valgrind
+       * to catch 1-byte heap buffer overflows. */
+      gsize test_len = MAX (strlen (test[i]), 1);
+      gchar *test_blob = g_malloc0 (test_len);  /* no nul terminator */
 
-      if (!strstr (error->message, test[i+2]))
+      memcpy (test_blob, test[i], test_len);
+      value = g_variant_parse (NULL, test_blob, test_blob + test_len, NULL, &error1);
+      g_assert_null (value);
+
+      g_free (test_blob);
+
+      if (!strstr (error1->message, test[i+2]))
         g_error ("test %d: Can't find '%s' in '%s'", i / 3,
-                 test[i+2], error->message);
+                 test[i+2], error1->message);
 
-      if (!g_str_has_prefix (error->message, test[i+1]))
+      if (!g_str_has_prefix (error1->message, test[i+1]))
         g_error ("test %d: Expected location '%s' in '%s'", i / 3,
-                 test[i+1], error->message);
+                 test[i+1], error1->message);
 
-      g_error_free (error);
+      /* Test again with the nul terminator this time. The behaviour should be
+       * the same. */
+      value = g_variant_parse (NULL, test[i], NULL, NULL, &error2);
+      g_assert_null (value);
+
+      g_assert_cmpint (error1->domain, ==, error2->domain);
+      g_assert_cmpint (error1->code, ==, error2->code);
+      g_assert_cmpstr (error1->message, ==, error2->message);
+
+      g_clear_error (&error1);
+      g_clear_error (&error2);
     }
 }
 
diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
index 6b00740..cf114fd 100644
--- a/glib/tests/mainloop.c
+++ b/glib/tests/mainloop.c
@@ -1306,7 +1306,21 @@
 
   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 7761a22..6462cdf 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 3a7173d..f2331b7 100644
--- a/glib/tests/markups/fail-11.expected
+++ b/glib/tests/markups/fail-11.expected
@@ -4,4 +4,4 @@
   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 0aab7b5..c4176b0 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 60157fa..b2cdf9f 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 47e6847..2f0d641 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 380ab74..5b31870 100644
--- a/glib/tests/markups/fail-15.expected
+++ b/glib/tests/markups/fail-15.expected
@@ -5,4 +5,4 @@
     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 b9585de..a238253 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 99ab934..69392f0 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 3090f33..8d70804 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 e54ab66..fa1171c 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 ddc0090..d415961 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 e39f81c..dcb2a02 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 @@
  BIG5	--	ๅ…ƒๆฐฃ	้–‹็™ผ
 
 
-'
+”
diff --git a/glib/tests/markups/fail-30.expected b/glib/tests/markups/fail-30.expected
index 15169e3..fc8c6eb 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 a17ae97..67c0190 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 c3d9c45..564dd41 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 c485463..e84ed71 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 7fac38c..4cb1363 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 15169e3..fc8c6eb 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 2bd9fbb..3f806dc 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 f04ec35..edc683e 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 f25b4cd..3a5f865 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 de0e4b8..1b5d234 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 a2b5cbc..144c89c 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 ab476ef..33ca9fb 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 4fbf685..dbdc09f 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 57a7b02..64b42c2 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 533eef7..0cddd72 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 866b751..1899cdf 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 f3ab8ca..7124919 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 89dc4b4..1083489 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 e5fa740..ed546bf 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 fc3bacb..386e1a4 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 e519015..0105827 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 0000000..70d4498
--- /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 0000000..f110f15
--- /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 0000000..1c7e8d4
--- /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 0000000..860e1e6
--- /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 b722468..d41f00e 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 40b61c1..a2843cd 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 31651aa..121163d 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 9994eb3..f2d77cc 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 3a037b1..0af71b0 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -1,187 +1,193 @@
-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, 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)
 
-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 : 120)
-  else
-    test(test_name, exe, env : test_env)
+    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,
+)
+
+executable('testing-helper', 'testing-helper.c',
+  c_args : test_cargs,
+  dependencies : test_deps,
+  install_dir: installed_tests_execdir,
+  install: installed_tests_enabled,
 )
 
 # some testing of gtester functionality
@@ -190,12 +196,13 @@
   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 a1e7b05..34ebfaa 100644
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -1822,6 +1822,49 @@
   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 @@
 
   g_option_context_free (context);
   g_clear_error (&error);
+  g_strfreev (argv);
 
 }
 
@@ -2619,6 +2663,7 @@
   /* 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 0000000..b1a1342
--- /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 0000000..dfccc92
--- /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 0000000..4d58eec
--- /dev/null
+++ b/glib/tests/refstring.c
@@ -0,0 +1,117 @@
+/* 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);
+}
+
+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 f01738f..8e74d09 100644
--- a/glib/tests/sequence.c
+++ b/glib/tests/sequence.c
@@ -1379,6 +1379,8 @@
     }
 
   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 7985eef..909f702 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 @@
   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 @@
   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 @@
   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 @@
 
   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/test-printf.c b/glib/tests/test-printf.c
index 377e3b5..486ae6d 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 @@
     }
   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 @@
 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 @@
 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-helper.c b/glib/tests/testing-helper.c
new file mode 100644
index 0000000..43127e8
--- /dev/null
+++ b/glib/tests/testing-helper.c
@@ -0,0 +1,97 @@
+/*
+ * 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/>.
+ */
+
+#include <glib.h>
+
+static void
+test_pass (void)
+{
+}
+
+static void
+test_skip (void)
+{
+  g_test_skip ("not enough tea");
+}
+
+static void
+test_fail (void)
+{
+  g_test_fail ();
+}
+
+static void
+test_incomplete (void)
+{
+  g_test_incomplete ("mind reading not implemented yet");
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  char *argv1;
+
+  g_return_val_if_fail (argc > 1, 1);
+  argv1 = argv[1];
+
+  if (argc > 2)
+    memmove (&argv[1], &argv[2], (argc - 2) * sizeof (char *));
+
+  argc -= 1;
+  argv[argc] = NULL;
+
+  g_test_init (&argc, &argv, NULL);
+  g_test_set_nonfatal_assertions ();
+
+  if (g_strcmp0 (argv1, "pass") == 0)
+    {
+      g_test_add_func ("/pass", test_pass);
+    }
+  else if (g_strcmp0 (argv1, "skip") == 0)
+    {
+      g_test_add_func ("/skip", test_skip);
+    }
+  else if (g_strcmp0 (argv1, "incomplete") == 0)
+    {
+      g_test_add_func ("/incomplete", test_incomplete);
+    }
+  else if (g_strcmp0 (argv1, "fail") == 0)
+    {
+      g_test_add_func ("/fail", test_fail);
+    }
+  else if (g_strcmp0 (argv1, "all-non-failures") == 0)
+    {
+      g_test_add_func ("/pass", test_pass);
+      g_test_add_func ("/skip", test_skip);
+      g_test_add_func ("/incomplete", test_incomplete);
+    }
+  else if (g_strcmp0 (argv1, "all") == 0)
+    {
+      g_test_add_func ("/pass", test_pass);
+      g_test_add_func ("/skip", test_skip);
+      g_test_add_func ("/incomplete", test_incomplete);
+      g_test_add_func ("/fail", test_fail);
+    }
+  else
+    {
+      g_assert_not_reached ();
+    }
+
+  return g_test_run ();
+}
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index de95f26..716516e 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -20,6 +20,8 @@
  * if advised of the possibility of such damage.
  */
 
+#include "config.h"
+
 /* We want to distinguish between messages originating from libglib
  * and messages originating from this program.
  */
@@ -78,6 +80,7 @@
   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_true (TRUE);
   g_assert_cmpstr ("foo", !=, "faa");
   fuu = g_strdup_printf ("f%s", "uu");
   g_test_queue_free (fuu);
@@ -170,7 +173,7 @@
         g_usleep (1000 * 1000);
     }
   g_test_trap_assert_failed();
-  g_assert (g_test_trap_reached_timeout());
+  g_assert_true (g_test_trap_reached_timeout());
 }
 
 G_GNUC_END_IGNORE_DEPRECATIONS
@@ -233,7 +236,7 @@
   /* allow child to run for only a fraction of a second */
   g_test_trap_subprocess (NULL, 0.11 * 1000000, 0);
   g_test_trap_assert_failed ();
-  g_assert (g_test_trap_reached_timeout ());
+  g_assert_true (g_test_trap_reached_timeout ());
 }
 
 /* run a test with fixture setup and teardown */
@@ -246,7 +249,7 @@
 fixturetest_setup (Fixturetest  *fix,
                    gconstpointer test_data)
 {
-  g_assert (test_data == (void*) 0xc0cac01a);
+  g_assert_true (test_data == (void*) 0xc0cac01a);
   fix->seed = 18;
   fix->prime = 19;
   fix->msg = g_strdup_printf ("%d", fix->prime);
@@ -259,13 +262,13 @@
   g_assert_cmpint (prime, ==, fix->prime);
   prime = g_ascii_strtoull (fix->msg, NULL, 0);
   g_assert_cmpint (prime, ==, fix->prime);
-  g_assert (test_data == (void*) 0xc0cac01a);
+  g_assert_true (test_data == (void*) 0xc0cac01a);
 }
 static void
 fixturetest_teardown (Fixturetest  *fix,
                       gconstpointer test_data)
 {
-  g_assert (test_data == (void*) 0xc0cac01a);
+  g_assert_true (test_data == (void*) 0xc0cac01a);
   g_free (fix->msg);
 }
 
@@ -308,7 +311,7 @@
 static void
 test_data_test (gconstpointer test_data)
 {
-  g_assert (test_data == (void*) 0xc0c0baba);
+  g_assert_true (test_data == (void*) 0xc0c0baba);
 }
 
 static void
@@ -319,7 +322,7 @@
   char *err, *str = g_strdup_printf ("%d", vint);
   gint64 vint64 = g_ascii_strtoll (str, &err, 10);
   g_assert_cmphex (vint, ==, vint64);
-  g_assert (!err || *err == 0);
+  g_assert_true (!err || *err == 0);
   g_free (str);
 }
 
@@ -622,6 +625,10 @@
 test_skip (void)
 {
   g_test_skip ("Skipped should count as passed, not failed");
+  /* This function really means "the test concluded with a non-successful
+   * status" rather than "the test failed": it is documented to return
+   * true for skipped and incomplete tests, not just for failures. */
+  g_assert_true (g_test_failed ());
 }
 
 static void
@@ -630,12 +637,21 @@
 }
 
 static void
+subprocess_fail (void)
+{
+  /* Exit 1 instead of raising SIGABRT so that we can make assertions about
+   * how this combines with skipped/incomplete tests */
+  g_test_set_nonfatal_assertions ();
+  g_test_fail ();
+  g_assert_true (g_test_failed ());
+}
+
+static void
 test_fail (void)
 {
   if (g_test_subprocess ())
     {
-      g_test_fail ();
-      g_assert (g_test_failed ());
+      subprocess_fail ();
       return;
     }
   g_test_trap_subprocess (NULL, 0, 0);
@@ -643,15 +659,29 @@
 }
 
 static void
+subprocess_incomplete (void)
+{
+  g_test_incomplete ("not done");
+  /* This function really means "the test concluded with a non-successful
+   * status" rather than "the test failed": it is documented to return
+   * true for skipped and incomplete tests, not just for failures. */
+  g_assert_true (g_test_failed ());
+}
+
+static void
 test_incomplete (void)
 {
   if (g_test_subprocess ())
     {
-      g_test_incomplete ("not done");
-      g_assert (g_test_failed ());
+      subprocess_incomplete ();
       return;
     }
   g_test_trap_subprocess (NULL, 0, 0);
+  /* An incomplete test represents functionality that is known not to be
+   * implemented yet (an expected failure), so it does not cause test
+   * failure; but it does count as the test having been skipped, which
+   * causes nonzero exit status 77, which is treated as failure by
+   * g_test_trap_subprocess(). */
   g_test_trap_assert_failed ();
 }
 
@@ -664,18 +694,19 @@
       return;
     }
   g_test_trap_subprocess (NULL, 50000, 0);
-  g_assert (g_test_trap_reached_timeout ());
+  g_assert_true (g_test_trap_reached_timeout ());
 }
 
 static const char *argv0;
 
 static void
-test_skip_all (void)
+test_combining (void)
 {
   GPtrArray *argv;
   GError *error = NULL;
   int status;
 
+  g_test_message ("single test case skipped -> overall status 77");
   argv = g_ptr_array_new ();
   g_ptr_array_add (argv, (char *) argv0);
   g_ptr_array_add (argv, "--GTestSubprocess");
@@ -693,15 +724,16 @@
   g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
   g_clear_error (&error);
 
+  g_test_message ("each test case skipped -> overall status 77");
   g_ptr_array_set_size (argv, 0);
   g_ptr_array_add (argv, (char *) argv0);
   g_ptr_array_add (argv, "--GTestSubprocess");
   g_ptr_array_add (argv, "-p");
   g_ptr_array_add (argv, "/misc/skip");
   g_ptr_array_add (argv, "-p");
-  g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/skip1");
   g_ptr_array_add (argv, "-p");
-  g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip2");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/skip2");
   g_ptr_array_add (argv, NULL);
 
   g_spawn_sync (NULL, (char **) argv->pdata, NULL,
@@ -714,15 +746,260 @@
   g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
   g_clear_error (&error);
 
+  g_test_message ("single test case incomplete -> overall status 77");
+  g_ptr_array_set_size (argv, 0);
+  g_ptr_array_add (argv, (char *) argv0);
+  g_ptr_array_add (argv, "--GTestSubprocess");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/incomplete");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
+  g_clear_error (&error);
+
+  g_test_message ("one pass and some skipped -> overall status 0");
   g_ptr_array_set_size (argv, 0);
   g_ptr_array_add (argv, (char *) argv0);
   g_ptr_array_add (argv, "--GTestSubprocess");
   g_ptr_array_add (argv, "-p");
   g_ptr_array_add (argv, "/misc/skip");
   g_ptr_array_add (argv, "-p");
-  g_ptr_array_add (argv, "/misc/skip-all/subprocess/pass");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/pass");
   g_ptr_array_add (argv, "-p");
-  g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/skip1");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_test_message ("one pass and some incomplete -> overall status 0");
+  g_ptr_array_set_size (argv, 0);
+  g_ptr_array_add (argv, (char *) argv0);
+  g_ptr_array_add (argv, "--GTestSubprocess");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/pass");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/incomplete");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_test_message ("one pass and mix of skipped and incomplete -> overall status 0");
+  g_ptr_array_set_size (argv, 0);
+  g_ptr_array_add (argv, (char *) argv0);
+  g_ptr_array_add (argv, "--GTestSubprocess");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/pass");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/skip1");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/incomplete");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_test_message ("one fail and some skipped -> overall status fail");
+  g_ptr_array_set_size (argv, 0);
+  g_ptr_array_add (argv, (char *) argv0);
+  g_ptr_array_add (argv, "--GTestSubprocess");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/skip");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/fail");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/skip1");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_error (error, G_SPAWN_EXIT_ERROR, 1);
+  g_clear_error (&error);
+
+  g_test_message ("one fail and some incomplete -> overall status fail");
+  g_ptr_array_set_size (argv, 0);
+  g_ptr_array_add (argv, (char *) argv0);
+  g_ptr_array_add (argv, "--GTestSubprocess");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/fail");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/incomplete");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_error (error, G_SPAWN_EXIT_ERROR, 1);
+  g_clear_error (&error);
+
+  g_test_message ("one fail and mix of skipped and incomplete -> overall status fail");
+  g_ptr_array_set_size (argv, 0);
+  g_ptr_array_add (argv, (char *) argv0);
+  g_ptr_array_add (argv, "--GTestSubprocess");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/fail");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/skip1");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/misc/combining/subprocess/incomplete");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_error (error, G_SPAWN_EXIT_ERROR, 1);
+  g_clear_error (&error);
+
+  g_ptr_array_unref (argv);
+}
+
+/* Test the TAP output when a test suite is run with --tap. */
+static void
+test_tap (void)
+{
+  const char *testing_helper;
+  GPtrArray *argv;
+  GError *error = NULL;
+  int status;
+  gchar *output;
+
+  testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL);
+
+  g_test_message ("pass");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "pass");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (strstr (output, "\nok 1 /pass\n"));
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("skip");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "skip");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (strstr (output, "\nok 1 /skip # SKIP not enough tea\n"));
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("incomplete");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "incomplete");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (strstr (output, "\nnot ok 1 /incomplete # TODO mind reading not implemented yet\n"));
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("fail");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "fail");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_error (error, G_SPAWN_EXIT_ERROR, 1);
+  g_assert_nonnull (strstr (output, "\nnot ok 1 /fail\n"));
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("all");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "all");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, NULL, NULL, &status,
+                &error);
+  g_assert_error (error, G_SPAWN_EXIT_ERROR, 1);
+  g_clear_error (&error);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("all-non-failures");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "all-non-failures");
+  g_ptr_array_add (argv, "--tap");
   g_ptr_array_add (argv, NULL);
 
   g_spawn_sync (NULL, (char **) argv->pdata, NULL,
@@ -801,13 +1078,17 @@
   g_test_add_func ("/misc/nonfatal", test_nonfatal);
 
   g_test_add_func ("/misc/skip", test_skip);
-  g_test_add_func ("/misc/skip-all", test_skip_all);
-  g_test_add_func ("/misc/skip-all/subprocess/skip1", test_skip);
-  g_test_add_func ("/misc/skip-all/subprocess/skip2", test_skip);
-  g_test_add_func ("/misc/skip-all/subprocess/pass", test_pass);
+  g_test_add_func ("/misc/combining", test_combining);
+  g_test_add_func ("/misc/combining/subprocess/fail", subprocess_fail);
+  g_test_add_func ("/misc/combining/subprocess/skip1", test_skip);
+  g_test_add_func ("/misc/combining/subprocess/skip2", test_skip);
+  g_test_add_func ("/misc/combining/subprocess/incomplete", subprocess_incomplete);
+  g_test_add_func ("/misc/combining/subprocess/pass", test_pass);
   g_test_add_func ("/misc/fail", test_fail);
   g_test_add_func ("/misc/incomplete", test_incomplete);
   g_test_add_func ("/misc/timeout", test_subprocess_timed_out);
 
+  g_test_add_func ("/tap", test_tap);
+
   return g_test_run();
 }
diff --git a/glib/tests/thread.c b/glib/tests/thread.c
index b800190..b9f8796 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 @@
   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 @@
   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/timer.c b/glib/tests/timer.c
index cb9a268..5ee191d 100644
--- a/glib/tests/timer.c
+++ b/glib/tests/timer.c
@@ -115,6 +115,14 @@
   g_time_val_add (&time, 1000);
   g_assert_cmpint (time.tv_sec, ==, 1); 
   g_assert_cmpint (time.tv_usec, ==, 510);
+
+  g_time_val_add (&time, 0);
+  g_assert_cmpint (time.tv_sec, ==, 1);
+  g_assert_cmpint (time.tv_usec, ==, 510);
+
+  g_time_val_add (&time, -210);
+  g_assert_cmpint (time.tv_sec, ==, 1);
+  g_assert_cmpint (time.tv_usec, ==, 300);
 }
 
 typedef struct {
@@ -126,6 +134,7 @@
 static void
 test_timeval_from_iso8601 (void)
 {
+  gchar *old_tz = g_strdup (g_getenv ("TZ"));
   TimeValParseTest tests[] = {
     { TRUE, "1990-11-01T10:21:17Z", { 657454877, 0 } },
     { TRUE, "19901101T102117Z", { 657454877, 0 } },
@@ -144,13 +153,50 @@
     { FALSE, "2001-10-08Tx", { 0, 0 } },
     { FALSE, "2001-10-08T10:11x", { 0, 0 } },
     { FALSE, "Wed Dec 19 17:20:20 GMT 2007", { 0, 0 } },
-    { FALSE, "1980-02-22T10:36:00Zulu", { 0, 0 } }
+    { FALSE, "1980-02-22T10:36:00Zulu", { 0, 0 } },
+    { FALSE, "2T0+819855292164632335", { 0, 0 } },
+    { TRUE, "2018-08-03T14:08:05.446178377+01:00", { 1533301685, 446178 } },
+    { FALSE, "2147483648-08-03T14:08:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-13-03T14:08:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-00-03T14:08:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-08-00T14:08:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-08-32T14:08:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-08-03T24:08:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-08-03T14:60:05.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-08-03T14:08:63.446178377+01:00", { 0, 0 } },
+    { FALSE, "2018-08-03T14:08:05.446178377+100:00", { 0, 0 } },
+    { FALSE, "2018-08-03T14:08:05.446178377+01:60", { 0, 0 } },
+    { TRUE, "20180803T140805.446178377+0100", { 1533301685, 446178 } },
+    { FALSE, "21474836480803T140805.446178377+0100", { 0, 0 } },
+    { FALSE, "20181303T140805.446178377+0100", { 0, 0 } },
+    { FALSE, "20180003T140805.446178377+0100", { 0, 0 } },
+    { FALSE, "20180800T140805.446178377+0100", { 0, 0 } },
+    { FALSE, "20180832T140805.446178377+0100", { 0, 0 } },
+    { FALSE, "20180803T240805.446178377+0100", { 0, 0 } },
+    { FALSE, "20180803T146005.446178377+0100", { 0, 0 } },
+    { FALSE, "20180803T140863.446178377+0100", { 0, 0 } },
+    { FALSE, "20180803T140805.446178377+10000", { 0, 0 } },
+    { FALSE, "20180803T140805.446178377+0160", { 0, 0 } },
+    { TRUE, "+1980-02-22T12:36:00+02:00", { 320063760, 0 } },
+    { FALSE, "-0005-01-01T00:00:00Z", { 0, 0 } },
+    { FALSE, "2018-08-06", { 0, 0 } },
+    { FALSE, "2018-08-06 13:51:00Z", { 0, 0 } },
+    { TRUE, "20180803T140805,446178377+0100", { 1533301685, 446178 } },
+    { TRUE, "2018-08-03T14:08:05.446178377-01:00", { 1533308885, 446178 } },
+    { FALSE, "2018-08-03T14:08:05.446178377 01:00", { 0, 0 } },
+    { TRUE, "1990-11-01T10:21:17", { 657454877, 0 } },
+    { TRUE, "1990-11-01T10:21:17     ", { 657454877, 0 } },
   };
   GTimeVal out;
   gboolean success;
   gint i;
 
-  g_unsetenv ("TZ");
+  /* Always run in UTC so the comparisons of parsed values are valid. */
+  if (!g_setenv ("TZ", "UTC", TRUE))
+    {
+      g_test_skip ("Failed to set TZ=UTC");
+      return;
+    }
 
   for (i = 0; i < G_N_ELEMENTS (tests); i++)
     {
@@ -164,6 +210,13 @@
           g_assert_cmpint (out.tv_usec, ==, tests[i].val.tv_usec);
         }
     }
+
+  if (old_tz != NULL)
+    g_assert_true (g_setenv ("TZ", old_tz, TRUE));
+  else
+    g_unsetenv ("TZ");
+
+  g_free (old_tz);
 }
 
 typedef struct {
@@ -198,6 +251,22 @@
     }
 }
 
+/* Test error handling for g_time_val_to_iso8601() on dates which are too large. */
+static void
+test_timeval_to_iso8601_overflow (void)
+{
+  GTimeVal val;
+  gchar *out = NULL;
+
+  g_unsetenv ("TZ");
+
+  val.tv_sec = G_MAXLONG;
+  val.tv_usec = G_USEC_PER_SEC - 1;
+
+  out = g_time_val_to_iso8601 (&val);
+  g_assert_null (out);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -210,6 +279,7 @@
   g_test_add_func ("/timeval/add", test_timeval_add);
   g_test_add_func ("/timeval/from-iso8601", test_timeval_from_iso8601);
   g_test_add_func ("/timeval/to-iso8601", test_timeval_to_iso8601);
+  g_test_add_func ("/timeval/to-iso8601/overflow", test_timeval_to_iso8601_overflow);
 
   return g_test_run ();
 }
diff --git a/glib/tests/unicode.c b/glib/tests/unicode.c
index c81c9b8..34c6971 100644
--- a/glib/tests/unicode.c
+++ b/glib/tests/unicode.c
@@ -297,6 +297,13 @@
     { 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 @@
     { 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 7f8edd8..95c6138 100644
--- a/glib/tests/utils.c
+++ b/glib/tests/utils.c
@@ -517,6 +517,22 @@
   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 @@
   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 01f7c7f..159876b 100755
--- a/glib/update-gtranslit.py
+++ b/glib/update-gtranslit.py
@@ -104,7 +104,7 @@
         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 @@
             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/gobject/gbinding.c b/gobject/gbinding.c
index 899dc84..42dcb36 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.c
@@ -373,6 +373,7 @@
                            gboolean  unref_binding)
 {
   gboolean source_is_target = binding->source == binding->target;
+  gboolean binding_was_removed = FALSE;
 
   /* dispose of the transformation data */
   if (binding->notify != NULL)
@@ -392,6 +393,7 @@
 
       binding->source_notify = 0;
       binding->source = NULL;
+      binding_was_removed = TRUE;
     }
 
   if (binding->target != NULL)
@@ -404,9 +406,10 @@
 
       binding->target_notify = 0;
       binding->target = NULL;
+      binding_was_removed = TRUE;
     }
 
-  if (unref_binding)
+  if (binding_was_removed && unref_binding)
     g_object_unref (binding);
 }
 
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index fe9a107..985edd2 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -218,7 +218,7 @@
             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):
@@ -303,15 +303,15 @@
 parser.add_argument('--identifier-prefix', default='', dest='idprefix',
                     help='Identifier prefix')
 parser.add_argument('--symbol-prefix', default='', dest='symprefix',
-                    help='symbol-prefix')
+                    help='Symbol prefix')
 parser.add_argument('--fhead', default=[], dest='fhead', action='append',
                     help='Output file header')
 parser.add_argument('--ftail', default=[], dest='ftail', action='append',
-                    help='Per input file production')
+                    help='Output file footer')
 parser.add_argument('--fprod', default=[], dest='fprod', action='append',
-                    help='Put out TEXT everytime a new input file is being processed.')
+                    help='Put out TEXT every time a new input file is being processed.')
 parser.add_argument('--eprod', default=[], dest='eprod', action='append',
-                    help='Per enum text (produced prior to value iterations)')
+                    help='Per enum text, produced prior to value iterations')
 parser.add_argument('--vhead', default=[], dest='vhead', action='append',
                     help='Value header, produced before iterating over enum values')
 parser.add_argument('--vprod', default=[], dest='vprod', action='append',
@@ -324,8 +324,9 @@
                     help='Template file')
 parser.add_argument('--output', default=None, dest='output')
 parser.add_argument('--version', '-v', default=False, action='store_true', dest='version',
-                    help='Print version informations')
-parser.add_argument('args', nargs='*')
+                    help='Print version information')
+parser.add_argument('args', nargs='*',
+                    help='Input files')
 
 options = parser.parse_args()
 
@@ -415,12 +416,17 @@
     prod = prod.rstrip()
     return prod
 
+
+def warn_if_filename_basename_used(section, prod):
+    for substitution in ('\u0040filename\u0040',
+                         '\u0040basename\u0040'):
+        if substitution in prod:
+            print_warning('{} used in {} section.'.format(substitution,
+                                                          section))
+
 if len(fhead) > 0:
     prod = fhead
-    base = os.path.basename(options.args[0])
-
-    prod = prod.replace('\u0040filename\u0040', options.args[0])
-    prod = prod.replace('\u0040basename\u0040', base)
+    warn_if_filename_basename_used('file-header', prod)
     prod = replace_specials(prod)
     write_output(prod)
 
@@ -712,10 +718,7 @@
 
 if len(ftail) > 0:
     prod = ftail
-    base = os.path.basename(options.args[-1]) # FIXME, wrong
-
-    prod = prod.replace('\u0040filename\u0040', 'ARGV') # wrong too
-    prod = prod.replace('\u0040basename\u0040', base)
+    warn_if_filename_basename_used('file-tail', prod)
     prod = replace_specials(prod)
     write_output(prod)
 
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 555ca3f..534b4fb 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -498,7 +498,7 @@
    *                   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 @@
  **/
 #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 838046f..b5648f1 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -507,7 +507,7 @@
 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_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 1746576..263ac78 100644
--- a/gobject/gobject_gdb.py
+++ b/gobject/gobject_gdb.py
@@ -26,7 +26,7 @@
         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 @@
     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 @@
     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 @@
     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 @@
         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 75ff36c..1acc0a0 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -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.
@@ -4562,6 +4562,8 @@
  * ]|
  *
  * 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 cf77703..77e22a0 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -634,6 +634,8 @@
  * 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 @@
 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/gvaluecollector.h b/gobject/gvaluecollector.h
index d083084..177aa3d 100644
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -87,43 +87,43 @@
  */
 #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 @@
  * #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 @@
  */
 #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 @@
  */
 #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 d34a897..d8d421d 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -92,7 +92,7 @@
 
 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 @@
 
   # 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/binding.c b/gobject/tests/binding.c
index e088ca7..019fb28 100644
--- a/gobject/tests/binding.c
+++ b/gobject/tests/binding.c
@@ -460,6 +460,7 @@
   BindingSource *c = g_object_new (binding_source_get_type (), NULL);
   GBinding *binding_1, *binding_2;
 
+  g_test_bug_base ("http://bugzilla.gnome.org/");
   g_test_bug ("621782");
 
   /* A -> B, B -> C */
@@ -625,6 +626,83 @@
   g_object_unref (source);
 }
 
+/* When source or target die, so does the binding if there is no other ref */
+static void
+binding_unbind_weak (void)
+{
+  GBinding *binding;
+  BindingSource *source;
+  BindingTarget *target;
+
+  /* first source, then target */
+  source = g_object_new (binding_source_get_type (), NULL);
+  target = g_object_new (binding_target_get_type (), NULL);
+  binding = g_object_bind_property (source, "foo",
+                                    target, "bar",
+                                    G_BINDING_DEFAULT);
+  g_object_add_weak_pointer (G_OBJECT (binding), (gpointer *) &binding);
+  g_assert_nonnull (binding);
+  g_object_unref (source);
+  g_assert_null (binding);
+  g_object_unref (target);
+  g_assert_null (binding);
+
+  /* first target, then source */
+  source = g_object_new (binding_source_get_type (), NULL);
+  target = g_object_new (binding_target_get_type (), NULL);
+  binding = g_object_bind_property (source, "foo",
+                                    target, "bar",
+                                    G_BINDING_DEFAULT);
+  g_object_add_weak_pointer (G_OBJECT (binding), (gpointer *) &binding);
+  g_assert_nonnull (binding);
+  g_object_unref (target);
+  g_assert_null (binding);
+  g_object_unref (source);
+  g_assert_null (binding);
+
+  /* target and source are the same */
+  source = g_object_new (binding_source_get_type (), NULL);
+  binding = g_object_bind_property (source, "foo",
+                                    source, "bar",
+                                    G_BINDING_DEFAULT);
+  g_object_add_weak_pointer (G_OBJECT (binding), (gpointer *) &binding);
+  g_assert_nonnull (binding);
+  g_object_unref (source);
+  g_assert_null (binding);
+}
+
+/* Test that every call to unbind() after the first is a noop */
+static void
+binding_unbind_multiple (void)
+{
+  BindingSource *source = g_object_new (binding_source_get_type (), NULL);
+  BindingTarget *target = g_object_new (binding_target_get_type (), NULL);
+  GBinding *binding;
+  guint i;
+
+  g_test_bug ("1373");
+
+  binding = g_object_bind_property (source, "foo",
+                                    target, "bar",
+                                    G_BINDING_DEFAULT);
+  g_object_ref (binding);
+  g_object_add_weak_pointer (G_OBJECT (binding), (gpointer *) &binding);
+  g_assert_nonnull (binding);
+
+  /* this shouldn't crash */
+  for (i = 0; i < 50; i++)
+    {
+      g_binding_unbind (binding);
+      g_assert_nonnull (binding);
+    }
+
+  g_object_unref (binding);
+  g_assert_null (binding);
+
+  g_object_unref (source);
+  g_object_unref (target);
+}
+
 static void
 binding_fail (void)
 {
@@ -653,7 +731,7 @@
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_bug_base ("http://bugzilla.gnome.org/");
+  g_test_bug_base ("https://gitlab.gnome.org/GNOME/glib/issues/");
 
   g_test_add_func ("/binding/default", binding_default);
   g_test_add_func ("/binding/bidirectional", binding_bidirectional);
@@ -665,6 +743,8 @@
   g_test_add_func ("/binding/invert-boolean", binding_invert_boolean);
   g_test_add_func ("/binding/same-object", binding_same_object);
   g_test_add_func ("/binding/unbind", binding_unbind);
+  g_test_add_func ("/binding/unbind-weak", binding_unbind_weak);
+  g_test_add_func ("/binding/unbind-multiple", binding_unbind_multiple);
   g_test_add_func ("/binding/fail", binding_fail);
 
   return g_test_run ();
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 88eba19..cc83c5f 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -1,49 +1,3 @@
-gobject_tests = [
-  'qdata',
-  'boxed',
-  'enums',
-  'param',
-  'threadtests',
-  'dynamictests',
-  'binding',
-  'properties',
-  'reference',
-  'value',
-  'type',
-  'private',
-  'closure',
-  'object',
-  'signal-handler',
-  '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),
-]
-
-foreach test_name : gobject_tests
-  deps = [libm, thread_dep, libglib_dep, libgobject_dep]
-  test_src = '@0@.c'.format(test_name)
-  # private is an existing or reserved target it seems
-  if test_name == 'private'
-    test_name = 'gobject-private'
-  endif
-  exe = executable(test_name, test_src,
-      c_args : ['-DG_LOG_DOMAIN="GLib-GObject"'],
-      dependencies : deps,
-  )
-  test(test_name, exe, env : test_env)
-endforeach
-
 marshalers_h = custom_target('marshalers_h',
   output : 'marshalers.h',
   input : 'marshalers.list',
@@ -72,9 +26,76 @@
   ],
 )
 
-exe = executable('signals',
-    'signals.c', marshalers_h, marshalers_c,
-    c_args : ['-DG_LOG_DOMAIN="GLib-GObject"'],
-    dependencies : deps,
+gobject_tests = {
+  'qdata' : {},
+  'boxed' : {},
+  'enums' : {},
+  'param' : {},
+  'threadtests' : {},
+  'dynamictests' : {},
+  'binding' : {},
+  'properties' : {},
+  'reference' : {},
+  'value' : {},
+  'type' : {},
+  'gobject-private' : {
+    'source' : 'private.c',
+  },
+  'closure' : {},
+  'object' : {},
+  'signal-handler' : {},
+  'ifaceproperties' : {},
+  'signals' : {
+    'source' : ['signals.c', marshalers_h, marshalers_c],
+  },
+}
+
+# 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 = 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, libgobject_dep]
+test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"']
+
+foreach test_name, extra_args : gobject_tests
+  source = extra_args.get('source', test_name + '.c')
+  install = installed_tests_enabled and extra_args.get('install', true)
+
+  if install
+    test_conf = configuration_data()
+    test_conf.set('installed_tests_dir', installed_tests_execdir)
+    test_conf.set('program', test_name)
+    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 = ['gobject'] + extra_args.get('suite', [])
+  timeout = suite.contains('slow') ? 120 : 30
+  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
+endforeach
+
+test(
+  'mkenums.py',
+  python,
+  args: files('mkenums.py'),
+  env: test_env,
+  suite: ['gobject'],
 )
-test('signals', exe, env : test_env)
diff --git a/gobject/tests/mkenums.py b/gobject/tests/mkenums.py
new file mode 100644
index 0000000..bb54433
--- /dev/null
+++ b/gobject/tests/mkenums.py
@@ -0,0 +1,452 @@
+#!/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 collections
+import os
+import subprocess
+import tempfile
+import textwrap
+import unittest
+
+import taptestrunner
+
+
+Result = collections.namedtuple('Result', ('info', 'out', 'err', 'subs'))
+
+
+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)
+        info.check_returncode()
+        out = info.stdout.decode('utf-8').strip()
+        err = info.stderr.decode('utf-8').strip()
+
+        # Known substitutions for standard boilerplate
+        subs = {
+            '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'
+        }
+
+        result = Result(info, out, err, subs)
+
+        print('Output:', result.out)
+        return result
+
+    def runMkenumsWithTemplate(self, template_contents, *args):
+        with tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='.template') as template_file:
+            # Write out the template.
+            template_file.write(template_contents.encode('utf-8'))
+            print(template_file.name + ':', template_contents)
+            template_file.flush()
+
+            return self.runMkenums('--template', template_file.name, *args)
+
+    def runMkenumsWithAllSubstitutions(self, *args):
+        '''Run glib-mkenums with a template which outputs all substitutions.'''
+        template_contents = '''
+/*** BEGIN file-header ***/
+file-header
+/*** 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
+/*** END file-tail ***/
+'''
+        return self.runMkenumsWithTemplate(template_contents, *args)
+
+    def runMkenumsWithHeader(self, h_contents, encoding='utf-8'):
+        with tempfile.NamedTemporaryFile(dir=self.tmpdir.name,
+                                         suffix='.h') as h_file:
+            # Write out the header to be scanned.
+            h_file.write(h_contents.encode(encoding))
+            print(h_file.name + ':', h_contents)
+            h_file.flush()
+
+            # Run glib-mkenums with a template which outputs all substitutions.
+            result = self.runMkenumsWithAllSubstitutions(h_file.name)
+
+            # Known substitutions for generated filenames.
+            result.subs.update({
+                'filename': h_file.name,
+                'basename': os.path.basename(h_file.name),
+            })
+
+            return result
+
+    def assertSingleEnum(self, result, 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,
+        }, **result.subs)
+
+        self.assertEqual('''
+comment
+comment: {standard_top_comment}
+
+
+file-header
+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
+
+comment
+comment: {standard_bottom_comment}
+'''.format(**subs).strip(), result.out)
+
+    def test_help(self):
+        """Test the --help argument."""
+        result = self.runMkenums('--help')
+        self.assertIn('usage: glib-mkenums', result.out)
+
+    def test_no_args(self):
+        """Test running with no arguments at all."""
+        result = self.runMkenums()
+        self.assertEqual('', result.err)
+        self.assertEquals('''/* {standard_top_comment} */
+
+
+/* {standard_bottom_comment} */'''.format(**result.subs),
+                          result.out.strip())
+
+    def test_empty_template(self):
+        """Test running with an empty template and no header files."""
+        result = self.runMkenumsWithTemplate('')
+        self.assertEqual('', result.err)
+        self.assertEquals('''/* {standard_top_comment} */
+
+
+/* {standard_bottom_comment} */'''.format(**result.subs),
+                          result.out.strip())
+
+    def test_no_headers(self):
+        """Test running with a complete template, but no header files."""
+        result = self.runMkenumsWithAllSubstitutions()
+        self.assertEqual('', result.err)
+        self.assertEquals('''
+comment
+comment: {standard_top_comment}
+
+
+file-header
+file-tail
+
+comment
+comment: {standard_bottom_comment}
+'''.format(**result.subs).strip(), result.out)
+
+    def test_empty_header(self):
+        """Test an empty header."""
+        result = self.runMkenumsWithHeader('')
+        self.assertEqual('', result.err)
+        self.assertEqual('''
+comment
+comment: {standard_top_comment}
+
+
+file-header
+file-tail
+
+comment
+comment: {standard_bottom_comment}
+'''.format(**result.subs).strip(), result.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;
+        '''
+        result = self.runMkenumsWithHeader(h_contents)
+        self.assertEqual('', result.err)
+        self.assertSingleEnum(result, '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;
+        '''
+        result = self.runMkenumsWithHeader(h_contents, encoding='iso-8859-1')
+        self.assertIn('WARNING: UnicodeWarning: ', result.err)
+        self.assertSingleEnum(result, '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."""
+        template_contents = 'template'
+
+        h_contents1 = '''
+        typedef enum {
+          FIRST,
+        } Header1;
+        '''
+
+        h_contents2 = '''
+        typedef enum {
+          SECOND,
+        } Header2;
+        '''
+
+        with 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 headers.
+            h_file1.write(h_contents1.encode('utf-8'))
+            h_file2.write(h_contents2.encode('utf-8'))
+
+            h_file1.flush()
+            h_file2.flush()
+
+            # Run glib-mkenums with the headers in one order, and then again
+            # in another order.
+            result1 = self.runMkenumsWithTemplate(template_contents,
+                                                  h_file1.name, h_file2.name)
+            self.assertEqual('', result1.err)
+
+            result2 = self.runMkenumsWithTemplate(template_contents,
+                                                  h_file2.name, h_file1.name)
+            self.assertEqual('', result2.err)
+
+            # The output should be the same.
+            self.assertEqual(result1.out, result2.out)
+
+    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;
+        '''
+        result = self.runMkenumsWithHeader(h_contents)
+        self.assertEqual('', result.err)
+        self.assertSingleEnum(result, 'GeglSamplerType',
+                              'gegl_sampler_type', 'GEGL_SAMPLER_TYPE',
+                              'SAMPLER_TYPE', 'GEGL', 'enum', 'Enum',
+                              'ENUM', 'GEGL_SAMPLER_NEAREST', 'nearest', '0')
+
+    def test_filename_basename_in_fhead_ftail(self):
+        template_contents = '''
+/*** BEGIN file-header ***/
+file-header
+filename: @filename@
+basename: @basename@
+/*** END file-header ***/
+
+/*** BEGIN comment ***/
+comment
+comment: @comment@
+/*** END comment ***/
+
+/*** BEGIN file-tail ***/
+file-tail
+filename: @filename@
+basename: @basename@
+/*** END file-tail ***/'''
+        result = self.runMkenumsWithTemplate(template_contents)
+        self.assertEqual(
+            textwrap.dedent(
+                '''
+                WARNING: @filename@ used in file-header section.
+                WARNING: @basename@ used in file-header section.
+                WARNING: @filename@ used in file-tail section.
+                WARNING: @basename@ used in file-tail section.
+                ''').strip(),
+            result.err)
+        self.assertEqual('''
+comment
+comment: {standard_top_comment}
+
+
+file-header
+filename: @filename@
+basename: @basename@
+file-tail
+filename: @filename@
+basename: @basename@
+
+comment
+comment: {standard_bottom_comment}
+'''.format(**result.subs).strip(), result.out)
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner=taptestrunner.TAPTestRunner())
diff --git a/gobject/tests/private.c b/gobject/tests/private.c
index ecf5e7b..6782221 100644
--- a/gobject/tests/private.c
+++ b/gobject/tests/private.c
@@ -128,7 +128,9 @@
 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 a1af3f8..0aa325a 100644
--- a/gobject/tests/properties.c
+++ b/gobject/tests/properties.c
@@ -80,7 +80,10 @@
 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 @@
   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 @@
   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 e3f8631..9508ee7 100644
--- a/gobject/tests/reference.c
+++ b/gobject/tests/reference.c
@@ -132,7 +132,7 @@
 static void
 test_clear_function (void)
 {
-  volatile GObject *o = NULL;
+  GObject *o = NULL;
   GObject *tmp;
 
   (g_clear_object) (&o);
@@ -156,11 +156,14 @@
 {
   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 @@
   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 @@
 {
   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 @@
   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 0000000..efd41dd
--- /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/meson.build b/meson.build
index 2d6872e..f758365 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',
@@ -56,6 +56,7 @@
 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'))
@@ -66,6 +67,11 @@
 
 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;
@@ -90,7 +96,7 @@
 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')
@@ -207,7 +213,6 @@
   'linux/magic.h',
   'locale.h',
   'mach/mach_time.h',
-  'malloc.h',
   'memory.h',
   'mntent.h',
   'poll.h',
@@ -254,6 +259,13 @@
   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
@@ -298,6 +310,10 @@
   [ '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
@@ -323,6 +339,9 @@
     '-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',
@@ -414,6 +433,8 @@
   'wcrtomb',
   'wcslen',
   'wcsnlen',
+  'sysctlbyname',
+  '_NSGetEnviron',
 ]
 
 if glib_conf.has('HAVE_SYS_STATVFS_H')
@@ -475,6 +496,11 @@
   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
@@ -524,6 +550,8 @@
   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')
@@ -1499,7 +1527,6 @@
   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 = '''
@@ -1614,7 +1641,7 @@
   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
@@ -1753,7 +1780,29 @@
   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
@@ -1764,7 +1813,6 @@
 # (we add them for now to minimise the diff)
 glib_conf.set('HAVE_DLFCN_H', 1)
 glib_conf.set('STDC_HEADERS', 1)
-# THREADS_NONE
 glib_conf.set('SIZEOF___INT64', 8)
 
 # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
@@ -1860,8 +1908,6 @@
 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
diff --git a/meson_options.txt b/meson_options.txt
index 5245e0a..64accf6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -78,3 +78,8 @@
        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/de.po b/po/de.po
index b192428..80a14d1 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-08-10 13:36+0000\n"
+"PO-Revision-Date: 2018-08-15 11:52+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -26,130 +25,127 @@
 "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.1\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"
 
-#: ../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:495 gio/gsettings-tool.c:569
 msgid "Print help"
 msgstr "Hilfe ausgeben"
 
-#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489
-#: ../gio/gresource-tool.c:557
+#: gio/gapplication-tool.c:47 gio/gresource-tool.c:496 gio/gresource-tool.c:564
 msgid "[COMMAND]"
 msgstr "[BEFEHL]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
 msgstr "Version ausgeben"
 
-#: ../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 "Versionsinformationen anzeigen und beenden"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Anwendungen auflisten"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Die über D-Bus aktivierbaren Anwendungen auflisten (aus .desktop-Dateien)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Eine Anwendung starten"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Die Anwendung starten (mit optional zu öffnenden Dateien)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "ANWENDUNGSKENNUNG [DATEI …]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Eine Aktion starten"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Eine Aktion auf die Anwendung starten"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "ANWENDUNGSKENNUNG AKTION [PARAMETER]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Verfügbare Aktionen auflisten"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr "Statische Aktionen einer Anwendung auflisten (aus .desktop-Datei)"
 
-#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:65 gio/gapplication-tool.c:71
 msgid "APPID"
 msgstr "ANWENDUNGSKENNUNG"
 
-#: ../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 "BEFEHL"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "Der Befehl, für den eine detaillierte Hilfe ausgegeben wird"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 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/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:502 gio/gresource-tool.c:568
 msgid "FILE"
 msgstr "DATEI"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr ""
 "Optional relative oder absolute Dateinamen oder Adressen (URIs) zum Öffnen"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "AKTION"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "Der Name der aufzurufenden Aktion"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARAMETER"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "Optionaler Parameter für den Aufruf der Aktion, im GVariant-Format"
 
-#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:661
+#: gio/gapplication-tool.c:96 gio/gresource-tool.c:533 gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -158,26 +154,26 @@
 "Unbekannter Befehl %s\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Aufruf:\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:558
+#: 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 "[ARGUMENTE …]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Befehle:\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"
@@ -186,7 +182,7 @@
 "Rufen Sie »%s help BEFEHL« auf, um detaillierte Hilfe zu erhalten.\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"
@@ -195,13 +191,13 @@
 "Der Befehl %s erfordert eine unmittelbar folgende Anwendungskennung\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s”\n"
 msgstr "Ungültige Anwendungskennung: »%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"
@@ -210,22 +206,21 @@
 "»%s« akzeptiert keine Argumente\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "Verbindung mit D-Bus ist nicht möglich: %s\n"
 
-#: ../gio/gapplication-tool.c:286
+#: gio/gapplication-tool.c:286
 #, c-format
 msgid "error sending %s message to application: %s\n"
 msgstr "Fehler beim Senden der %s-Nachricht zur Anwendung: %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 "Der Aktionsname muss nach der Anwendungskennung angegeben werden\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s”\n"
@@ -234,27 +229,25 @@
 "Ungültiger Aktionsname: »%s«\n"
 "Aktionsnamen dürfen nur aus alphanumerischen Zeichen, »-« und ».« bestehen\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "Fehler bei der Verarbeitung des Aktionsparameters: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "Aktionen akzeptiert maximal einen Parameter\n"
 
-#: ../gio/gapplication-tool.c:411
-#, c-format
+#: gio/gapplication-tool.c:411
 msgid "list-actions command takes only the application id"
 msgstr "Der Befehl list-actions akzeptiert nur die Anwendungskennung"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "Die desktop-Datei für die Anwendung %s konnte nicht gefunden werden\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -263,122 +256,118 @@
 "Unbekannter Befehl: %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 "Zu großer Zählwert an %s übermittelt"
 
-#: ../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 "Suchen im Basis-Datenstrom nicht unterstützt"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "GBufferedInputStream konnte nicht abgeschnitten werden"
 
-#: ../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 "Datenstrom ist bereits geschlossen"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "Abschneiden wird vom Basis-Datenstrom nicht unterstützt"
 
-#: ../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 "Vorgang wurde abgebrochen"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Ungültiges Objekt, wurde nicht initialisiert"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Ungültige Multibyte-Folge in Eingabe"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Nicht genug Platz im Ziel"
 
-#: ../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 "Ungültige Bytefolge in Umwandlungseingabe"
 
-#: ../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 "Fehler bei der Umwandlung: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "Abbrechbare Initialisierung wird nicht unterstützt"
 
-#: ../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 "Umwandlung von Zeichensatz »%s« in »%s« wird nicht unterstützt"
 
-#: ../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 "Konverter von »%s« in »%s« konnte nicht geöffnet werden"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:358
 #, c-format
 msgid "%s type"
 msgstr "%s-Typ"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Unbekannter Typ"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 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"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Unerwartet frühes Datenstromende"
 
-#: ../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 "Nicht unterstützter Schlüssel »%s« im Adresseintrag »%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)"
@@ -386,27 +375,32 @@
 "Adresse »%s« ist ungültig (benötigt genau einen der Schlüssel path, tmpdir "
 "oder abstract)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr "Bedeutungsloses Schlüssel-Wert-Paar im Adresseintrag »%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 "Fehler in Adresse »%s« – Das Port-Attribut ist nicht korrekt"
 
-#: ../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 "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 +409,7 @@
 "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 +418,7 @@
 "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 +427,94 @@
 "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:7142
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -534,7 +523,7 @@
 "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:7151
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -542,21 +531,21 @@
 "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"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Unerwarteter Mangel an Inhalt beim Versuch, eine Zeile zu lesen"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 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,16 +553,16 @@
 "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"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s”: %s"
 msgstr "Fehler beim Holen der Informationen für Ordner »%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"
@@ -581,22 +570,22 @@
 "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 +593,7 @@
 "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,168 +601,159 @@
 "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) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "Verbindung ist geschlossen"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "Zeitüberschreitung wurde erreicht"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "Beim Erstellen einer client-seitigen Verbindung wurden nicht unterstützte "
 "Flags entdeckt"
 
-#: ../gio/gdbusconnection.c: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 ""
 "Keine derartige Schnittstelle »org.freedesktop.DBus.Properties« des Objekts "
 "im Pfad %s"
 
-#: ../gio/gdbusconnection.c:4266
+#: gio/gdbusconnection.c:4257
 #, c-format
-msgid "No such property '%s'"
+msgid "No such property “%s”"
 msgstr "Keine derartige Eigenschaft »%s«"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
+msgid "Property “%s” is not readable"
 msgstr "Eigenschaft »%s« ist nicht lesbar"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
+msgid "Property “%s” is not writable"
 msgstr "Eigenschaft »%s« ist nicht schreibbar"
 
-#: ../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 ""
 "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:4405 gio/gdbusconnection.c:4613
+#: gio/gdbusconnection.c:6582
 #, c-format
-msgid "No such interface '%s'"
+msgid "No such interface “%s”"
 msgstr "Keine derartige Schnittstelle »%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"
 msgstr "Keine derartige Schnittstelle »%s« des Objekts im Pfad %s"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
+msgid "No such method “%s”"
 msgstr "Keine derartige Methode »%s«"
 
-#: ../gio/gdbusconnection.c:4969
+#: gio/gdbusconnection.c:4960
 #, 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
+#: gio/gdbusconnection.c:5158
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Für die Schnittstelle %s auf %s wurde bereits ein Objekt exportiert"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "Eigenschaft kann nicht abgefragt werden: %s.%s"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "Eigenschaft kann nicht gesetzt werden: %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 "Methode »%s« gab Typ »%s« zurück, aber »%s« wurde erwartet"
 
-#: ../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 "Methode »%s« in Schnittstelle »%s« mit Signatur »%s« existiert nicht"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, c-format
 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 +761,7 @@
 "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 +769,21 @@
 "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 +793,17 @@
 "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 +816,7 @@
 "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 +825,12 @@
 "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 +838,7 @@
 "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 +847,25 @@
 "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 +876,11 @@
 "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 +888,7 @@
 "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 +896,18 @@
 "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,42 +916,42 @@
 "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"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Hardware-Profil konnte nicht ermittelt werden: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr ""
 "/var/lib/dbus/machine-id oder /etc/machine-id konnte nicht geladen werden: "
 
-#: ../gio/gdbusproxy.c:1612
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Fehler beim Aufruf von StartServiceByName für %s: "
 
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Unerwartete Antwort %d von der Methode 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"
@@ -980,30 +960,30 @@
 "bekannten Namen ohne Besitzer und der Proxy wurde mit dem Flag "
 "»G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START« erstellt"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "Abstrakter Namensraum wird nicht unterstützt"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr "Nonce-Datei kann beim Erstellen eines Servers nicht angegeben werden"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s”: %s"
 msgstr "Fehler beim Schreiben der Nonce-Datei auf »%s«: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "Die Zeichenkette »%s« ist keine gültige GUID für D-Bus"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "An nicht unterstützter Übertragung »%s« kann nicht gelauscht werden"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1026,54 +1006,54 @@
 "\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 +1061,7 @@
 "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 +1070,164 @@
 "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
-#, 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 "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
-#, c-format
+#: gio/gdbus-tool.c:740
 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
+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
-#, c-format
+#: gio/gdbus-tool.c:1043
 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
-#, c-format
+#: gio/gdbus-tool.c:1954
 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,140 +1235,135 @@
 "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
-#, c-format
+#: gio/gdbus-tool.c:2206
 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
-#, c-format
+#: gio/gdbus-tool.c:2211
 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
-#, c-format
+#: gio/gdbus-tool.c:2216
 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"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "Laufwerk unterstützt Auswerfen nicht"
 
 #. 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 "Laufwerk unterstützt weder ein Auswerfen noch »eject_with_operation«"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 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"
 
-#: ../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 "TLS-Unterstützung ist nicht verfügbar"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "DTLS-Unterstützung ist nicht verfügbar"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Version %d der GEmblem-Kodierung kann nicht verarbeitet werden"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Ungültige Symbolanzahl (%d) in GEmblem-Kodierung"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Version %d der GEmblemedIcon-Kodierung kann nicht verarbeitet werden"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Ungültige Symbolanzahl (%d) in GEmblemedIcon-Kodierung"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 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/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 "Vorgang wird nicht unterstützt"
 
@@ -1402,206 +1371,206 @@
 #. * 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:2391
 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"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "Datei-Enumerator ist geschlossen"
 
-#: ../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 "Datei-Enumerator hat noch einen ausstehenden Vorgang"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "Datei-Enumerator ist bereits geschlossen"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Version %d der GFileIcon-Kodierung kann nicht verarbeitet werden"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Ungültige Eingangsdaten für 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 "Datenstrom unterstützt query_info nicht"
 
-#: ../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 "Suchen im Datenstrom nicht unterstützt"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "Abschneiden des Eingabedatenstroms nicht erlaubt"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "Abschneiden wird vom Datenstrom nicht unterstützt"
 
-#: ../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 "Ungültiger Rechnername"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Ungültige Antwort vom HTTP-Proxy"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Verbindung zum ๏ปฟHTTP-Proxy nicht zugelassen"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Legitimierung am HTTP-Proxy ist fehlgeschlagen"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Legitimierung ist erforderlich am HTTP-Proxy"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Verbindung zum ๏ปฟHTTP-Proxy ist fehlgeschlagen: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "๏ปฟHTTP Proxy-Server hat die Verbindung unerwartet geschlossen."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Ungültige Symbolanzahl (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "Kein Typ für Klassenname %s"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "GIcon-Schnittstelle wird vom Typ %s nicht unterstützt"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
 msgstr "Typ %s ist keine Klasse"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Ungültige Versionsnummer: %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Typ %s implementiert nicht from_tokens() der GIcon-Schnittstelle"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Übergebene Version der Symbol-Kodierung kann nicht verarbeitet werden"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Keine Adresse angegeben"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "Länge %u ist zu groß für eine Adresse"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "Für die Adresse sind Bits außerhalb der Präfix-Länge gesetzt"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 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/ginetsocketaddress.c:203 gio/ginetsocketaddress.c:220
+#: gio/gnativesocketaddress.c:109 gio/gunixsocketaddress.c:220
 msgid "Not enough space for socket address"
 msgstr "Nicht genug Platz für eine Socket-Adresse"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Nicht unterstützte Socket-Adresse"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "Eingabedatenstrom unterstützt kein Lesen"
 
@@ -1611,129 +1580,122 @@
 #. 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 "Datenstrom hat noch einen ausstehenden Vorgang"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Mit Datei kopieren"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Zusammen mit Datei verschieben"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version” takes no arguments"
 msgstr "»version« akzeptiert keine Argumente"
 
-#: ../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 "Aufruf:"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 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
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Befehle:"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Dateien aneinander hängen und auf der Standardausgabe ausgeben"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Eine oder mehrere Dateien kopieren"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Informationen zu Orten anzeigen"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Den Inhalt der Orte auflisten"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "Anwendung für MIME-Typ ermitteln oder festlegen"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Ordner erstellen"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Dateien und Ordner auf Änderungen überwachen"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Die Orte ein- oder aushängen"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Eine oder mehrere Dateien verschieben"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Dateien mit der Standard-Anwendung öffnen"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Eine Datei umbenennen"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Eine oder mehrere Dateien löschen"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Aus der Standardeingabe lesen und speichern"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Ein Dateiattribut festlegen"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Dateien oder Ordner in den Papierkorb verschieben"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Den Inhalt der Orte in einer Baumstruktur auflisten"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "Verwenden Sie »%s«, um detaillierte Hilfe zu erhalten.\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Fehler beim Schreiben in die Standardausgabe"
 
 #. 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:1212 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 "ORT"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Dateien aneinander hängen und auf der Standardausgabe ausgeben."
 
-#: ../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"
@@ -1743,58 +1705,56 @@
 "jedoch werden GIO-Orte statt lokaler Dateien verwendet; z.B. können\n"
 "Sie als Ort etwas wie »smb://server/ressource/datei.txt« angeben."
 
-#: ../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:1263 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"
 
-#: ../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 "Kein Zielordner"
 
-#: ../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 "Fortschritt zeigen"
 
-#: ../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 "Vor Überschreiben nachfragen"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Alle Attribute übernehmen"
 
-#: ../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 "Vorhandene Zieldateien sichern"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Niemals symbolischen Verknüpfungen folgen"
 
-#: ../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 "%s von %s übertragen (%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 "QUELLE"
 
 #. 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 "ZIEL"
 
-#: ../gio/gio-tool-copy.c:103
+#: gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
 msgstr "Eine oder mehrere Dateien von QUELLE nach ZIEL kopieren."
 
-#: ../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"
@@ -1804,93 +1764,88 @@
 "jedoch werden GIO-Orte statt lokaler Dateien verwendet; z.B. können\n"
 "Sie als Ort etwas wie »smb://server/ressource/datei.txt« angeben."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "Das Ziel »%s« ist kein Ordner"
 
-#: ../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: Soll »%s« überschrieben werden? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Schreibbare Attribute auflisten"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Informationen zum Dateisystem erhalten"
 
-#: ../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 "Das einzulesende Attribut"
 
-#: ../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 "ATTRIBUTE"
 
-#: ../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 "Symbolischen Verknüpfungen nicht folgen"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "Attribute:\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 "Anzeigename: %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 "Name bearbeiten: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "Name: %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "Typ: %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
 msgstr "Größe: "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "verborgen\n"
 
-#: ../gio/gio-tool-info.c:159
+#: gio/gio-tool-info.c:159
 #, c-format
 msgid "uri: %s\n"
 msgstr "Adresse: %s\n"
 
-#: ../gio/gio-tool-info.c:228
-#, c-format
+#: gio/gio-tool-info.c:228
 msgid "Settable attributes:\n"
 msgstr "Setzbare Attribute:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Namensraum der schreibbaren Attribute:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Informationen zu Orten zeigen."
 
-#: ../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"
@@ -1905,23 +1860,23 @@
 "anhand des Namensraums, z.B. »unix«, oder durch »*« angegeben werden,\n"
 "was auf alle Attribute passt."
 
-#: ../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 "Verborgene Dateien zeigen"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Langes Listenformat verwenden"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Volle Adressen ausgeben"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Den Inhalt der Orte auflisten."
 
-#: ../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"
@@ -1934,19 +1889,19 @@
 "Dateiattribute werden mit dem GIO-Namen angegeben, z.B. standard::icon"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "MIME-TYP"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "BEHANDLUNGSROUTINE"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
 msgstr "Anwendung für MIME-Typ ermitteln oder festlegen."
 
-#: ../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"
@@ -1957,61 +1912,57 @@
 "routine angegeben ist, wird diese als Voreinstellung für den MIME-Typ "
 "gesetzt."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
 msgstr ""
 "Ein einzelner MIME-Typ und eventuell eine Behandlungsroutine müssen "
 "angegeben werden"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s”\n"
 msgstr "Keine Vorgabeanwendungen für »%s«\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s”: %s\n"
 msgstr "Standardanwendung für »%s«: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Registrierte Anwendungen:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Keine registrierten Anwendungen\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Empfohlene Anwendungen:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Keine empfohlenen Anwendungen\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s”"
 msgstr "Information zur Anwendung »%s« kann nicht geladen werden"
 
-#: ../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 "»%s« kann nicht als Vorgabeanwendung für »%s« gesetzt werden: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Elternordner erstellen"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Ordner erstellen."
 
-#: ../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"
@@ -2021,115 +1972,139 @@
 "jedoch werden GIO-Orte statt lokaler Dateien verwendet; z.B. können\n"
 "Sie als Ort etwas wie »smb://server/ressource/Ordner« angeben."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Einen Ordner überwachen (Vorgabe: abhängig vom Typ)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Eine Datei überwachen (Vorgabe: abhängig vom Typ)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 "Eine Datei direkt überwachen (erkennt über harte Verknüpfungen gemachte "
 "Änderungen)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Überwacht eine Datei direkt, aber berichtet nicht über Änderungen"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "Verschiebungen und Umbenennungen als einfache Lösch- oder Erzeugungsvorgänge "
 "melden"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Auf Einhängevorgänge überwachen"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 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:63
 msgid "Mount as mountable"
 msgstr "Als einhängbar einbinden"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:64
 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:64 gio/gio-tool-mount.c:67
 msgid "DEVICE"
 msgstr "GERÄT"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:65
 msgid "Unmount"
 msgstr "Aushängen"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:66
 msgid "Eject"
 msgstr "Auswerfen"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
+msgid "Stop drive with device file"
+msgstr "Datenträger über Gerätedatei stoppen"
+
+#: gio/gio-tool-mount.c:68
 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:68
 msgid "SCHEME"
 msgstr "SCHEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:69
 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:70
 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:72
 msgid "List"
 msgstr "Auflisten"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:73
 msgid "Monitor events"
 msgstr "Ereignisse überwachen"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:74
 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:75
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "Die numerische PIM beim Entsperren eines VeraCrypt-Datenträgers"
+
+#: gio/gio-tool-mount.c:75
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Einen verborgenen TCRYPT-Datenträger einhängen"
+
+#: gio/gio-tool-mount.c:77
+msgid "Mount a TCRYPT system volume"
+msgstr "Einen TCRYPT-Systemdatenträger einhängen"
+
+#: gio/gio-tool-mount.c:265 gio/gio-tool-mount.c:297
 msgid "Anonymous access denied"
 msgstr "Der anonyme Zugriff wurde verwehrt"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:522
+msgid "No drive for device file"
+msgstr "Kein Laufwerk für Gerätedatei"
+
+#: gio/gio-tool-mount.c:975
 #, 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:1027
 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:1216
 msgid "Mount or unmount the locations."
 msgstr "Die Orte ein- oder aushängen."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Ersatz für Kopieren und Löschen nicht verwenden"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Eine oder mehrere Dateien von QUELLE nach ZIEL verschieben."
 
-#: ../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"
@@ -2139,12 +2114,12 @@
 "jedoch werden GIO-Orte statt lokaler Dateien verwendet; z.B. können\n"
 "Sie als Ort etwas wie »smb://server/ressource/Datei.txt« angeben."
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "Das Ziel »%s« ist kein Ordner"
 
-#: ../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."
@@ -2152,249 +2127,254 @@
 "Dateien mit der Standard-Anwendung öffnen,\n"
 "die als Programm für diesen Dateityp eingestellt ist."
 
-#: ../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 "Nicht vorhandene Dateien ignorieren und niemals nachfragen"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Die gegebenen Dateien löschen."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "NAME"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Eine Datei umbenennen."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Fehlendes Argument"
 
-#: ../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 "Zu viele Argumente"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Umbenennung erfolgreich. Neue Adresse: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Nur erstellen, wenn nicht bereits vorhanden"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "An Dateiende anhängen"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Beim Erstellen Zugriff auf den aktuellen Benutzer beschränken"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr "Beim Ersetzen davon ausgehen, dass das Ziel nicht existiert"
 
 #. 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 "Neuen Etag am Ende drucken"
 
 #. 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 "Der Etag der Datei, die überschrieben wird"
 
-#: ../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 "Fehler beim Lesen von der Standardeingabe"
 
 #. 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 ist nicht verfügbar\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Aus der Standardeingabe lesen und in ZIEL speichern."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Kein Ziel vorgegeben"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Typ des Attributs"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "TYPE"
 msgstr "TYP"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
 msgstr "ATTRIBUT"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "WERT"
 
-#: ../gio/gio-tool-set.c:93
+#: gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr "Ein Dateiattribut von ORT festlegen."
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Kein Ort angegeben"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Kein Attribut angegeben"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Kein Wert angegeben"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s”"
 msgstr "Ungültiger Attributtyp »%s«"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Den Papierkorb leeren"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Dateien oder Ordner in den Papierkorb verschieben."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr ""
 "Symbolischen Verknüpfungen, Einhängepunkten und Schnellzugriffen folgen"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 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:1515
 #, 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"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "Datei %s tritt in der Ressource mehrfach auf"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s” in any source directory"
 msgstr "»%s« konnte in keinem Quellordner gefunden werden"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 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:2138
 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:2139
+#: gio/glib-compile-schemas.c:2168
 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,127 +2385,126 @@
 "haben,\n"
 "die Ressourcendateien die Erweiterung .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 "Sie sollten genau einen Dateinamen angeben\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 muss aus mindestens zwei Zeichen bestehen"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Ungültiger numerischer Wert"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'/> bereits angegeben"
 
 # Hier scheinen im Original die spitzen Klammern zu fehlen
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "<value='%s'> wurde bereits angegeben"
 
-#: ../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 "Für Flag-Werte darf höchstens 1 Bit gesetzt sein"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s> muss mindestens ein <value> enthalten"
 
-#: ../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> ist im angegebenen Bereich nicht enthalten"
 
-#: ../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> ist kein gültiges Element des angegebenen Aufzählungstyps"
 
-#: ../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> enthält eine Zeichenkette, die nicht den angegebenen Flag-Typ hat"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s> enthält eine Zeichenkette, die nicht in <choices> enthalten ist"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> wurde für diesen Schlüssel bereits angegeben"
 
-#: ../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> ist für Schlüssel des Typs »%s« nicht erlaubt"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "<range> angebenenes Minimum ist größer als das Maximum"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "Nicht unterstützte l10n-Kategorie: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n wurde angefordert, aber keine Gettext-Domain angegeben"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr ""
 "Übersetzungskontext wurde für den Wert angegeben, ohne dass l10n aktiviert "
 "ist"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s”: "
 msgstr "Der <default>-Wert des Typs »%s« konnte nicht ausgewertet werden: "
 
-#: ../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> kann nicht für Schlüssel angegeben werden, die als Aufzählungstyp "
 "markiert sind"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> wurde für diesen Schlüssel bereits angegeben"
 
-#: ../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> ist für Schlüssel des Typs »%s« nicht erlaubt"
 
-#: ../gio/glib-compile-schemas.c:529
+#: gio/glib-compile-schemas.c:531
 #, c-format
 msgid "<choice value='%s'/> already given"
 msgstr "<choice value='%s'> wurde bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices> muss mindestens ein <choice> enthalten"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> wurde für diesen Schlüssel bereits angegeben"
 
-#: ../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>"
@@ -2533,7 +2512,7 @@
 "<aliases> kann nur für Schlüssel mit Aufzählungs- oder Flag-Typ oder nach "
 "<choices> angebenden werden"
 
-#: ../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 "
@@ -2542,43 +2521,43 @@
 "<alias value='%s'/> wurde angegeben, wobei »%s« bereits ein Element des "
 "Aufzählungstyps ist"
 
-#: ../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'/> wurde angegeben, während <choice value='%s'/> bereits "
 "angegeben war"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'> bereits angegeben"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s” is not in enumerated type"
 msgstr "Alias-Ziel »%s« ist kein Aufzählungstyp"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s” is not in <choices>"
 msgstr "Alias-Ziel »%s« ist nicht in <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> muss mindestens einen <alias> enthalten"
 
-#: ../gio/glib-compile-schemas.c:786
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "Leere Namen sind nicht zulässig"
 
-#: ../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 "Ungültiger Name »%s«: Namen müssen mit einem Kleinbuchstaben beginnen"
 
-#: ../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 "
@@ -2587,39 +2566,39 @@
 "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:829
 #, 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:838
 #, 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:846
 #, 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:918
 #, 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:944
 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:955
 #, 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:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2628,7 +2607,7 @@
 "<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:984
 #, c-format
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
@@ -2637,57 +2616,57 @@
 "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:1003
 #, 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:1018
 #, 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:1048
 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:1061
 #, 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:1069
 #, 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:1142
 #, 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:1154
 #, 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:1170
 #, 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:1178
 #, 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:1188
 #, 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:1198
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2695,7 +2674,7 @@
 "<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:1208
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
@@ -2704,18 +2683,18 @@
 "<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:1225
 #, 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:1232
 #, 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:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2724,119 +2703,132 @@
 "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:1271
 #, 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:1421 gio/glib-compile-schemas.c:1437
 #, 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:1519
 #, 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:1537
 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:1627
 #, 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:1695
 #, 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:1834 gio/glib-compile-schemas.c:1910
+#: gio/glib-compile-schemas.c:2025
 #, 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:1844
 #, 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:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Diese Datei wird ignoriert.\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 ""
 "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: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 "; Ü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: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 " und --strict wurde angegeben; Abbruch.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+# Das habe ich nicht wirklich verstanden, bitte sorgfältig gegenlesen.
+#: gio/glib-compile-schemas.c:1984
+#, c-format
+#| msgid ""
+#| "error parsing key “%s” in schema “%s” as specified in override file “%s”: "
+#| "%s."
+msgid ""
+"cannot provide per-desktop overrides for localised key “%s” in schema "
+"“%s” (override file “%s”)"
+msgstr ""
+"Desktop-bezogenes Überschreiben kann für lokalisierten Schlüssel »%s« im "
+"Schema »%s« (überschreibende Datei »%s«) nicht bereitgestellt werden"
+
+#: 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 ""
 "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:2021
 #, 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: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 ""
 "Ü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: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 ""
 "Ü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:2139
 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:2140
 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:2141
 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:2142
 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:2171
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2846,32 +2838,32 @@
 "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:2192
 #, 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:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Keine Schema-Dateien gefunden: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "Nichts wird getan.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2240
 #, 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,321 +2872,328 @@
 #. * 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:2267 gio/glocalfile.c:2295
+#: gio/glocalfile.c:2452 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:1925
 #, 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:1948
 #, 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:1970
 #, 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:1979
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr ""
+"Papierkorbaktionen zwischen systeminternen Einhängepunkten werden nicht "
+"unterstützt"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, 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:2118
 #, 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:2178
 #, 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:2182 gio/glocalfile.c:2238
 #, 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:2244
 #, 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:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Fehler beim Erstellen des Ordners »%s«: %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, 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:2302
 #, 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:2308 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:2363 gio/glocalfile.c:2398 gio/glocalfile.c:2455
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Fehler beim Verschieben der Datei %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "Ordner kann nicht über Ordner verschoben werden"
 
-#: ../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 "Erstellen der Sicherungsdatei gescheitert"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Fehler beim Entfernen der Zieldatei: %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "Verschieben zwischen Einhängepunkten nicht unterstützt"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Konnte die Festplattenbelegung von %s nicht bestimmen: %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "Attributwert darf nicht NULL sein"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Ungültiger Attributtyp (»string« erwartet)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Ungültiger erweiterter Attributname"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Fehler beim Setzen des erweiterten Attributs »%s«: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1629
 msgid " (invalid encoding)"
 msgstr " (ungültige Kodierung)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: gio/glocalfileinfo.c:1793 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:2057
 #, 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:2102
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Ungültiger Attributtyp (»uint32« erwartet)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2120
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Ungültiger Attributtyp (»uint64« erwartet)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: gio/glocalfileinfo.c:2139 gio/glocalfileinfo.c:2158
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Ungültiger Attributtyp (»byte string« erwartet)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2205
 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:2221
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Fehler beim Setzen der Zugriffsrechte: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2272
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Fehler beim Setzen des Besitzers: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2295
 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:2305 gio/glocalfileinfo.c:2324
+#: gio/glocalfileinfo.c:2335
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Fehler beim Setzen der symbolischen Verknüpfung: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2314
 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:2440
 #, 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:2463
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux-Kontext darf nicht NULL sein"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2478
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Fehler beim Setzen des SELinux-Kontexts: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2485
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux ist auf diesem System nicht aktiviert"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2577
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Setzen des Attributs %s nicht unterstützt"
 
-#: ../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 "Fehler beim Lesen aus Datei: %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 "Fehler beim Suchen in Datei: %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 "Fehler beim Schließen der Datei: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr ""
 "Vorgegebener Überwachungstyp für lokale Dateien konnte nicht gefunden werden"
 
-#: ../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 "Fehler beim Schreiben in Datei: %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Fehler beim Entfernen der alten Sicherungsverknüpfung: %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 "Fehler beim Erzeugen der Sicherungskopie: %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Fehler beim Umbenennen der temporären Datei: %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 "Fehler beim Abschneiden der Datei: %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 "Fehler beim Öffnen der Datei »%s«: %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Zieldatei ist ein Ordner"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Zieldatei ist keine reguläre Datei"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "Die Datei wurde extern verändert"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Fehler beim Entfernen der alten Datei: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Ungültiger GSeekType übergeben"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Ungültige Suchanfrage"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "GMemoryInputStream konnte nicht abgeschnitten werden"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Größe des Speicherausgabestroms ist nicht änderbar"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Größe des Speicherausgabestroms konnte nicht geändert werden"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3202,32 +3201,32 @@
 "Für den Schreibvorgang erforderliche Speichermenge ist größer als der "
 "verfügbare Adressbereich"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "Angeforderte Suche vor dem Beginn des Datenstroms"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 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,108 +3234,107 @@
 #. 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"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 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"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "Ausgabedatenstrom unterstützt kein Schreiben"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Quelldatenstrom ist bereits geschlossen"
 
-#: ../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 "Fehler beim Auflösen von »%s«: %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Ungültige Domain"
 
-#: ../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 "Die Ressource auf »%s« existiert nicht"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s” failed to decompress"
 msgstr "Die Ressource auf »%s« konnte nicht entpackt werden"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s” is not a directory"
 msgstr "Die Ressource auf »%s« ist ein Ordner"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Eingabedatenstrom unterstützt kein Suchen"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:501
 msgid "List sections containing resources in an elf FILE"
 msgstr "Sektionen einer ELF-Datei auflisten, welche Ressourcen enthält"
 
-#: ../gio/gresource-tool.c:500
+#: gio/gresource-tool.c:507
 msgid ""
 "List resources\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3346,16 +3344,15 @@
 "Falls SEKTION angegeben ist, nur die Ressourcen dieser Sektion auflisten\n"
 "Falls PFAD angegeben ist, nur die betreffenden Ressourcen auflisten"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:510 gio/gresource-tool.c:520
 msgid "FILE [PATH]"
 msgstr "DATEI [PFAD]"
 
-#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514
-#: ../gio/gresource-tool.c:521
+#: gio/gresource-tool.c:511 gio/gresource-tool.c:521 gio/gresource-tool.c:528
 msgid "SECTION"
 msgstr "SEKTION"
 
-#: ../gio/gresource-tool.c:509
+#: gio/gresource-tool.c:516
 msgid ""
 "List resources with details\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3367,15 +3364,15 @@
 "Falls PFAD angegeben ist, nur die betreffenden Ressourcen auflisten\n"
 "Details enthalten Sektion, Größe und Kompression"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:526
 msgid "Extract a resource file to stdout"
 msgstr "Eine Ressourcendatei in stdout auspacken"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:527
 msgid "FILE PATH"
 msgstr "DATEIPFAD"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:541
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3403,7 +3400,7 @@
 "Rufen Sie »gresource help BEFEHL« auf, um detaillierte Hilfe zu erhalten.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:555
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3418,20 +3415,20 @@
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:562
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SEKTION   Ein (optionaler) Name einer ELF-Sektion\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:703
+#: gio/gresource-tool.c:566 gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  BEFEHL    Der (optionale) zu erklärende Befehl\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:572
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr ""
 "  DATEI     Eine ELF-Datei (ein Binary oder eine gemeinsame Bibliothek)\n"
 
-#: ../gio/gresource-tool.c:568
+#: gio/gresource-tool.c:575
 msgid ""
 "  FILE      An elf file (a binary or a shared library)\n"
 "            or a compiled resource file\n"
@@ -3439,93 +3436,85 @@
 "  DATEI     Eine ELF-Datei (ein Binary oder eine gemeinsame Bibliothek)\n"
 "            oder eine kompilierte Ressourcendatei\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:579
 msgid "[PATH]"
 msgstr "[PFAD]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:581
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr ""
 "  PFAD      Ein (optionaler) Ressourcenpfad (kann unvollständig sein)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:582
 msgid "PATH"
 msgstr "PFAD"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:584
 msgid "  PATH      A resource path\n"
 msgstr "  PFAD      Ein Ressourcenpfad\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 "Kein derartiges Schema »%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« ist nicht verschiebbar (Pfad darf nicht angegeben werden)\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« ist verschiebbar (Pfad muss angegeben werden)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Leerer Pfad angegeben.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "Pfad muss mit einem Schrägstrich beginnen (/)\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "Pfad muss mit einem Schrägstrich enden (/)\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr ""
 "Pfad darf nicht zwei aufeinander folgende Schrägstriche enthalten (//)\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 "Der angegebene Wert liegt außerhalb des gültigen Bereichs\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "Der Schlüssel ist nicht schreibbar\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Installierte (nicht verschiebbare) Schemata auflisten"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Installierte (verschiebbare) Schemata auflisten"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Schlüssel in SCHEMA auflisten"
 
-#: ../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[:PFAD]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Unterelemente von SCHEMA auflisten"
 
-#: ../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"
@@ -3533,49 +3522,48 @@
 "Schlüssel und Werte rekursiv auflisten\n"
 "Falls kein Schema angegeben, alle Schlüssel auflisten\n"
 
-#: ../gio/gsettings-tool.c:607
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHEMA[:PFAD]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Den Wert von SCHLÜSSEL ermitteln"
 
-#: ../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 "SCHEMA[:PFAD] SCHLÜSSEL"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Den Bereich gültiger Werte für SCHLÜSSEL abfragen"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Die Beschreibung für SCHLÜSSEL abfragen"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Den Wert von SCHLÜSSEL auf WERT setzen"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMA[:PFAD] SCHLÜSSEL WERT"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "SCHLÜSSEL auf Vorgabewert setzen"
 
-#: ../gio/gsettings-tool.c:642
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Alle Schlüssel in SCHEMA auf deren Vorgaben zurücksetzen"
 
-#: ../gio/gsettings-tool.c:648
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Prüfen, ob SCHLÜSSEL schreibgeschützt ist"
 
-#: ../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"
@@ -3586,11 +3574,11 @@
 "in SCHEMA überwacht.\n"
 "Drücken Sie ^C, um die Überwachung zu beenden.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:PFAD] [SCHLÜSSEL]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3640,7 +3628,7 @@
 "erhalten.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3655,11 +3643,11 @@
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  SCHEMADIR Ein Ordner zum Suchen nach zusätzlichen Schemas\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"
@@ -3667,281 +3655,275 @@
 "  SCHEMA      Die Kennung des Schemas\n"
 "  SCHLÜSSEL   Der Name des Schlüssels\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  SCHLÜSSEL Der (optionale) Schlüssel innerhalb des Schemas\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  SCHLÜSSEL Der Schlüssel innerhalb des Schemas\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  WERT      Der zu setzende Wert\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "Schemata von »%s« konnten nicht geladen werden: %s\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Keine Schemata installiert\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Leerer Schema-Name wurde angegeben\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s”\n"
 msgstr "Kein derartiger Schlüssel »%s«\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Ungültiger Socket, wurde nicht initialisiert"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ungültiger Socket, Initialisierung schlug fehl wegen: %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 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"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocket wird erstellt von Dateideskriptor: %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 "Socket kann nicht angelegt werden: %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Eine unbekannte Familie wurde angegeben"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Ein unbekanntes Protokoll wurde angegeben"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr ""
 "Datagramm-Operationen können nicht auf einem Nicht-Datagramm-Socket "
 "ausgeführt werden."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Datagramm-Operationen können nicht auf einem Socket mit gesetzter "
 "Zeitüberschreitung ausgeführt werden."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Lokale Adresse konnte nicht gelesen werden: %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Entfernte Adresse konnte nicht gelesen werden: %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "Es konnte nicht gelauscht werden: %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 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: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 "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: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 "Fehler beim Verlassen der Multicast-Gruppe: %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
 msgstr "Quellen-spezifisches Multicast wird nicht unterstützt"
 
-#: ../gio/gsocket.c:2375
+#: gio/gsocket.c:2375
 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"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Verbindung zum Proxy-Server %s konnte nicht aufgebaut werden: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Verbindung mit %s ist gescheitert: "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "Verbindung ist gescheitert: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Unbekannter Fehler bei Verbindungsversuch"
 
-#: ../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 "Nicht-TCP-Verbindung über Proxy wird nicht unterstützt."
 
-#: ../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 "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"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4 unterstützt die IPv6-Adresse »%s« nicht"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "Benutzername ist zu lang für das SOCKSv4-Protokoll"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "Rechnername »%s« ist zu lang für das SOCKSv4-Protokoll"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "Der Server ist kein SOCKSv4-Proxy-Server."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "Verbindung durch SOCKSv4-Server wurde abgewiesen"
 
-#: ../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 "Der Server ist kein SOCKSv5-Proxy-Server."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "Der SOCKSv5-Proxy erfordert Legitimierung."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
@@ -3949,109 +3931,109 @@
 "Der SOCKSv5 erfordert eine Legitimierungsmethode, die durch GLib nicht "
 "unterstützt wird."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr "Benutzername oder Passwort ist zu lang für das SOCKSv5-Protokoll."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "SOCKSv5-Legitimierung scheiterte wegen falschen Benutzernamens oder "
 "Passworts."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "Rechnername »%s« ist zu lang für das SOCKSv5-Protokoll"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "Der SOCKSv5-Proxy-Server verwendet einen unbekannten Adresstyp."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "Interner Fehler des SOCKSv5-Proxy-Servers."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "SOCKSv5-Verbindung ist aufgrund des Regelwerks nicht erlaubt."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "Rechner ist über den SOCKSv5-Server nicht erreichbar."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "Das Netzwerk ist durch den SOCKSv5-Proxy nicht erreichbar."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Verbindung wurde durch SOCKSv5-Proxy abgewiesen."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "SOCKSv5-Proxy unterstützt den Befehl »connect« nicht."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "SOCKSv5-Proxy unterstützt den angegebenen Adresstyp nicht."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Unbekannter Fehler im SOCKSv5-Proxy."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Version %d der GThemedIcon-Kodierung kann nicht verarbeitet werden"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "Es wurden keine gültigen Adressen gefunden"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "Fehler beim Rückwärtsauflösen von »%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 "Kein DNS-Datensatz des angeforderten Typs für »%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 "»%s« kann vorübergehend nicht aufgelöst werden"
 
-#: ../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 "Fehler beim Auflösen von »%s«"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "PEM-enkodierter geheimer Schlüssel konnte nicht entschlüsselt werden"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "Kein PEM-enkodierter geheimer Schlüssel gefunden"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "PEM-enkodierter geheimer Schlüssel konnte nicht verarbeitet werden"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "Kein PEM-enkodiertes Zertifikat gefunden"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "PEM-enkodiertes Zertifikat konnte nicht verarbeitet werden"
 
-#: ../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."
@@ -4061,7 +4043,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4069,308 +4051,307 @@
 "Passwörter wurden mehrfach inkorrekt eingegeben, daher wird Ihr Zugriff nach "
 "weiteren Fehleingaben gesperrt."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Das eingegebene Passwort ist ungültig."
 
-#: ../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] "1 Kontrollnachricht wird erwartet, %d wurde erhalten"
 msgstr[1] "1 Kontrollnachricht wird erwartet, %d wurden erhalten"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Unerwartete Art von Zusatzdaten"
 
-#: ../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] "Ein Dateideskriptor wird erwartet, aber %d wurde erhalten\n"
 msgstr[1] "Ein Dateideskriptor wird erwartet, aber %d wurden erhalten\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Ungültiger Dateideskriptor wurde erhalten"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Fehler beim Senden der Anmeldedaten: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr ""
 "Fehler bei der Überprüfung, ob SO_PASSCRED für Socket aktiviert ist: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Fehler beim Aktivieren von 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 ""
 "Erwartet wurde der Empfang eines einzelnen Bytes als Anmeldedaten, jedoch "
 "null Bytes gelesen"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Kontrollnachricht wurde nicht erwartet, %d wurde erhalten"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Fehler beim Deaktivieren von 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 "Fehler beim Lesen aus dem Dateideskriptor: %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 "Fehler beim Schließen des Dateideskriptors: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Wurzelordner des Dateisystems"
 
-#: ../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 "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«"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Fehler beim Lesen aus dem Handler: %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 "Fehler beim Schließen des Handlers: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Fehler beim Schreiben in das Handle: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Nicht genügend freier Speicher"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "Interner Fehler: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Weitere Eingaben erforderlich"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Ungültige komprimierte Daten"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Adresse, an der gelauscht werden soll"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Ignoriert (für Kompatibilität mit GTestDbus)"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Adresse ausgeben"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Adresse im Shell-Modus ausgeben"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Einen D-Bus-Dienst ausführen"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Falsche Argumente\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Unerwartetes Attribut »%s« des Elements »%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:955
 #, c-format
 msgid "Attribute “%s” of element “%s” not found"
 msgstr "Attribut »%s« des Elements »%s« konnte nicht gefunden werden"
 
-#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
-#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
+#: glib/gbookmarkfile.c:1164 glib/gbookmarkfile.c:1229
+#: glib/gbookmarkfile.c:1293 glib/gbookmarkfile.c:1303
 #, c-format
 msgid "Unexpected tag “%s”, tag “%s” expected"
 msgstr "Unerwarteter Tag »%s«; Tag »%s« wird erwartet"
 
-#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
-#: ../glib/gbookmarkfile.c:1230
+#: glib/gbookmarkfile.c:1189 glib/gbookmarkfile.c:1203
+#: glib/gbookmarkfile.c:1271 glib/gbookmarkfile.c:1317
 #, c-format
 msgid "Unexpected tag “%s” inside “%s”"
 msgstr "Unerwarteter Tag »%s« innerhalb von »%s«"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1813
 msgid "No valid bookmark file found in data dirs"
 msgstr "Es wurde keine gültige Lesezeichendatei in den Datenordnern gefunden"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:2014
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Es existiert bereits ein Lesezeichen für die Adresse »%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:2060 glib/gbookmarkfile.c:2218
+#: glib/gbookmarkfile.c:2303 glib/gbookmarkfile.c:2383
+#: glib/gbookmarkfile.c:2468 glib/gbookmarkfile.c:2551
+#: glib/gbookmarkfile.c:2629 glib/gbookmarkfile.c:2708
+#: glib/gbookmarkfile.c:2750 glib/gbookmarkfile.c:2847
+#: glib/gbookmarkfile.c:2968 glib/gbookmarkfile.c:3158
+#: glib/gbookmarkfile.c:3234 glib/gbookmarkfile.c:3402
+#: glib/gbookmarkfile.c:3491 glib/gbookmarkfile.c:3580
+#: glib/gbookmarkfile.c:3696
 #, c-format
 msgid "No bookmark found for URI “%s”"
 msgstr "Es konnte kein Lesezeichen für die Adresse »%s« gefunden werden."
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2392
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Es ist kein MIME-Typ im Lesezeichen für die Adresse »%s« definiert."
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2477
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr ""
 "Es konnte keine »privat«-Markierung für das Lesezeichen für die Adresse »%s« "
 "gefunden werden."
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2856
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr ""
 "Es wurden keine Gruppen für das Lesezeichen für die Adresse »%s« festgelegt."
 
-#: ../glib/gbookmarkfile.c:3199 ../glib/gbookmarkfile.c:3356
+#: glib/gbookmarkfile.c:3255 glib/gbookmarkfile.c:3412
 #, c-format
 msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr ""
 "Es wurde keine Anwendung namens »%s« gefunden, die ein Lesezeichen für »%s« "
 "registriert hat."
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3435
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr ""
 "Die Befehlszeile »%s« konnte nicht mit der Adresse »%s« verknüpft werden."
 
-#: ../glib/gconvert.c:473
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "Nicht darstellbares Zeichen in Umwandlungsausgabe"
 
-#: ../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 "Bruchstückhafte Zeichenfolge am Eingabeende"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Notnagel »%s« kann nicht in Kodierung »%s« umgewandelt werden"
 
-#: ../glib/gconvert.c:940
+#: glib/gconvert.c:940
 msgid "Embedded NUL byte in conversion input"
 msgstr "Eingebettetes NUL-Byte in Umwandlungseingabe"
 
-#: ../glib/gconvert.c:961
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "Eingebettetes NUL-Byte in Umwandlungsausgabe"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr ""
 "Die Adresse »%s« ist keine absolute Adresse, die das »file«-Schema verwendet"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "Die lokale Adresse »%s« darf kein »#« enthalten"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "Die Adresse »%s« ist ungültig"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "Der Rechnername der Adresse »%s« ist ungültig"
 
 # CHECK
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "Die Adresse »%s« enthält ungültige Escape-Zeichen"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 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 +4372,62 @@
 #. * 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 +4449,132 @@
 #. * 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 +4596,62 @@
 #. * (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,198 +4673,197 @@
 #. * 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."
 
-#: ../glib/gdir.c:155
+#: glib/gdir.c:155
 #, c-format
 msgid "Error opening directory “%s”: %s"
 msgstr "Fehler beim Öffnen des Ordners »%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] "%lu Byte konnte nicht zugeordnet werden, um Datei »%s« zu lesen"
 msgstr[1] "%lu Bytes konnten nicht zugeordnet werden, um Datei »%s« zu lesen"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "Fehler beim Lesen der Datei »%s«: %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s” is too large"
 msgstr "Datei »%s« ist zu groß"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "Aus der Datei »%s« konnte nicht gelesen werden: %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 "Datei »%s« konnte nicht geöffnet werden: %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr ""
 "Attribute der Datei »%s« konnten nicht ermittelt werden: fstat() "
 "gescheitert: %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr "Datei »%s« konnte nicht geöffnet werden: fdopen() gescheitert: %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr ""
 "Datei »%s« konnte nicht in »%s« umbenannt werden: g_rename() ist "
 "gescheitert: %s"
 
-#: ../glib/gfileutils.c: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"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr "Schreiben der Datei »%s« schlug fehl: write() ist gescheitert: %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr ""
 "Datei »%s« konnte nicht geschrieben werden: fsync() ist gescheitert: %s"
 
-#: ../glib/gfileutils.c: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"
 
-#: ../glib/giochannel.c:1389
+#: glib/giochannel.c:1389
 #, c-format
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Konverter von »%s« in »%s« konnte nicht geöffnet werden: %s"
 
-#: ../glib/giochannel.c:1734
+#: glib/giochannel.c:1734
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr "Raw-read in g_io_channel_read_line_string nicht möglich"
 
-#: ../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 "Nicht konvertierte Daten befinden sich noch im Lesepuffer"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "Kanal endet mit einem Teilzeichen"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Raw-read in g_io_channel_read_to_end nicht möglich"
 
-#: ../glib/gkeyfile.c:788
+#: glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr "Es wurde keine gültige Schlüsselwertedatei in den Suchordnern gefunden"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "Keine reguläre Datei"
 
-#: ../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"
@@ -4891,45 +4871,45 @@
 "Die Schlüsselwertedatei enthält die Zeile »%s«, welche kein zulässiges "
 "Schlüssel-Wert-Paar, keine Gruppe und kein Kommentar ist."
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Ungültiger Gruppenname: %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Die Schlüsselwertedatei beginnt nicht mit einer Gruppe"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Ungültiger Schlüsselname: %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "Die Schlüsselwertedatei enthält die nicht unterstützte Kodierung »%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 "Die Schlüsselwertedatei enthält nicht die Gruppe »%s«"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Die Schlüsselwertedatei hat keinen Schlüssel »%s« in der Gruppe »%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 ""
 "Die Schlüsselwertedatei enthält den Schlüssel »%s« mit dem Wert »%s«, der "
 "nicht in UTF-8 kodiert ist"
 
-#: ../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."
@@ -4937,7 +4917,7 @@
 "Die Schlüsselwertedatei enthält den Schlüssel »%s« mit einem Wert, der nicht "
 "interpretiert werden konnte."
 
-#: ../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 "
@@ -4946,229 +4926,229 @@
 "Die Schlüsselwertedatei enthält den Schlüssel »%s« in der Gruppe »%s« mit "
 "einem Wert, der nicht interpretiert werden konnte."
 
-#: ../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 ""
 "Der Schlüssel »%s« in der Gruppe »%s« enthält den Wert »%s«, obwohl %s "
 "erwartet wurde"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Die Schlüsselwertedatei enthält ein Escape-Zeichen am Zeilenende"
 
 # CHECK
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Die Schlüsselwertedatei enthält das ungültige Escape-Zeichen »%s«"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "Der Wert »%s« konnte nicht als Zahl interpretiert werden."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "Ganzzahliger Wert »%s« ist außerhalb des Wertebereiches"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "Der Wert »%s« konnte nicht als Gleitkommazahl interpretiert werden."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr ""
 "Der Wert »%s« konnte nicht als boolescher Ausdruck interpretiert werden."
 
-#: ../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 ""
 "Attribute der Datei »%s%s%s%s« konnten nicht ermittelt werden: fstat() "
 "gescheitert: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "»%s%s%s%s« konnte nicht abgebildet werden: mmap() ist gescheitert: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Datei »%s« konnte nicht geöffnet werden: open() ist gescheitert: %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 "Fehler in Zeile %d, Zeichen %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'"
-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
+#: 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
+#: 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
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Fehler in Zeile %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 ""
 "»%-.*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
+#: 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 ""
 "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
+#: 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 "Zeichenreferenz »%-.*s« kodiert kein zulässiges Zeichen"
 
-#: ../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 ""
 "Leere Entität »&;« gefunden; gültige Entitäten sind &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 "Entitätenname »%-.*s« ist unbekannt"
 
-#: ../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 ""
 "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
+#: glib/gmarkup.c:1182
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokument muss mit einem Element beginnen (e.g. <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« ist kein gültiges Zeichen nach einem »<«-Zeichen; es darf keinen "
 "Elementnamen beginnen"
 
-#: ../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 ""
 "Seltsames Zeichen »%s«, »>« erwartet um Start-Tag des leeren Elements »%s« "
 "abzuschließen"
 
-#: ../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 ""
 "Seltsames Zeichen »%s«, »=« wird nach dem Attributnamen »%s« des Elements "
 "»%s« erwartet"
 
-#: ../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 ""
 "Seltsames Zeichen »%s«, es wurde entweder ein Attribut oder aber »>« oder "
 "»/« erwartet, um das Start-Tag des Elements »%s« abzuschließen; vielleicht "
 "haben Sie ein ungültiges Zeichen in einem Attributnamen benutzt"
 
-#: ../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 ""
 "Seltsames Zeichen »%s«; bei der Wertangabe für das Attribut »%s« des "
 "Elements »%s« wurde ein Anführungszeichen nach dem Gleichheitszeichen "
 "erwartet"
 
-#: ../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« ist kein gültiges Zeichen, wenn es auf die Zeichen »</« folgt; »%s« "
 "darf keinen Elementnamen beginnen"
 
-#: ../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« ist kein gültiges Zeichen, wenn es auf den schließenden Elementnamen "
 "»%s« folgt; das erlaubte Zeichen ist »>«"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
 #, 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
+#: 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 ""
 "Element »%s« wurde geschlossen, aber das derzeit offene Element ist »%s«"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 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 '<'"
+#: glib/gmarkup.c:1786
+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
+#: 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 ""
-"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
+#: glib/gmarkup.c:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5177,19 +5157,19 @@
 "Dokument endete unerwartet, es wurde eine spitze Klammer »>«, die das Tag <"
 "%s/> schließt, erwartet"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Dokument endete unerwartet innerhalb eines Elementnamens"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Dokument endete unerwartet innerhalb eines Attributnamens"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "Dokument endete unerwartet innerhalb eines Element-öffnenden Tags."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1825
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5197,322 +5177,329 @@
 "Dokument endete unerwartet nach dem Gleichheitszeichen, das einem "
 "Attributnamen folgt; kein Attributwert"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Dokument endete unerwartet innerhalb eines Attributwertes"
 
-#: ../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 ""
 "Dokument endete unerwartet innerhalb eines schließenden Tags für das Element "
 "»%s«"
 
-#: ../glib/gmarkup.c:1842
+#: glib/gmarkup.c:1853
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
+msgstr ""
+"Dokument endete unerwartet innerhalb eines schließenden Tags für ein "
+"ungeöffnetes Element"
+
+#: glib/gmarkup.c:1859
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Dokument endete unerwartet innerhalb eines Kommentars oder "
 "Verarbeitungsanweisung"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[OPTION …]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Hilfeoptionen:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Hilfeoptionen anzeigen"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Alle Hilfeoptionen anzeigen"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Anwendungsoptionen:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Optionen:"
 
-#: ../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 "»%s« konnte nicht als ganzzahliger Wert für %s interpretiert werden"
 
-#: ../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 "Ganzzahliger Wert »%s« für %s ist außerhalb des Bereiches"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s” for %s"
 msgstr "»%s« konnte nicht als »double«-Wert für %s interpretiert werden"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s” for %s out of range"
 msgstr "»double«-Wert »%s« für %s ist außerhalb des Bereiches"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Fehler beim Verarbeiten der Option: %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 "Für %s wird ein Argument benötigt"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Unbekannte Option %s"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "Beschädigtes Objekt"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "Interner Fehler oder beschädigtes Objekt"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "Nicht genügend freier Speicher"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "Rückverfolgungsgrenze wurde erreicht"
 
-#: ../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 ""
 "Der Ausdruck enthält Elemente, die teilweise Übereinstimmung nicht "
 "unterstützen"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "Interner Fehler"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "Rückreferenzen als Bedingungen werden für teilweise Übereinstimmung nicht "
 "unterstützt"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "Rekursionslimit wurde erreicht"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "Ungültige Kombination von newline-Markierungen"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "fehlerhafter Versatz"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "Kurzes UTF-8"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "Rekursionsschleife"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ am Ende des Ausdrucks"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c am Ende des Ausdrucks"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "Unbekanntes Zeichen nach \\"
 
 # CHECK
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "Ziffern wirkungslos in {}-Quantifizierer"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "Ziffer zu groß in {}-Quantifizierer"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "Terminierendes ] für Zeichenklasse fehlt"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "Ungültige Escape-Sequenz in Zeichenklasse"
 
 # CHECK
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "Bereich wirkungslos in Zeichenklasse"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "Nichts zum Wiederholen"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "Unerwartete Wiederholung"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "Unbekanntes Zeichen nach (? oder (?-"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "POSIX-benannte Klassen werden nur innerhalb einer Klasse unterstützt"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "Abschließende ) fehlt"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "Referenz auf nicht existierenden Unterausdruck"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "fehlende ) nach Kommentar"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "Regulärer Ausdruck zu groß"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "Fehler beim Holen von Speicher"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") ohne öffnende ("
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "Code-Überlauf"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "Unbekanntes Zeichen nach (?<"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "Rückblickende Annahme hat keine feste Länge"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "Falsch formatierte Zahl oder Name nach (?("
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "Bedingte Gruppe enthält mehr als zwei Verzweigungen"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "Annahme erwartet nach (?("
 
 #. 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 "auf (?R oder (?[+-]Ziffern muss ) folgen"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "Unbekannter POSIX-Klassenname"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "POSIX-Elementverknüpfungen nicht unterstützt"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "Wert in \\x{…}-Sequenz ist zu groß"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "Ungültige Bedingung (?(0)"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C nicht erlaubt in rückblickender Annahme"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr ""
 "Escape-Sequenzen \\L, \\l, \\N{name}, \\U, und \\u werden nicht unterstützt"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "Rekursive Aufrufe könnten unendlich oft aufgerufen werden"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "Unbekanntes Zeichen nach (?P"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "Terminierung im Namen des Unterausdrucks fehlt"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "Zwei benannte Unterausdrücke haben den gleichen Namen"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "Fehlerhafte \\P- oder \\p-Sequenz"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "Unbekannte Eigenschaftsname nach \\P oder \\p"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "Name des Unterausdrucks ist zu lang (maximal 32 Zeichen)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "Zu viele benannte Unterausdrücke (maximal 10.000)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "Oktaler Wert ist größer als \\377"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "Überlauf beim Kompilieren des Arbeitsbereichs"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr ""
 "Bereits geprüfter, referenzierter Unterausdruck konnte nicht gefunden werden"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE-Gruppe enthält mehr als eine Verzweigung"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "Inkonsistente NEWLINE-Optionen"
 
-#: ../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"
@@ -5520,286 +5507,291 @@
 "Auf \\g folgt kein eingeklammerter, in eckigen Klammern eingeklammerter oder "
 "zitierter Name oder eine Zahl oder eine einfache Zahl"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "Eine nummerierte Referenz darf nicht Null sein"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "Ein Argument ist für (*ACCEPT), (*FAIL), oder (*COMMIT) nicht erlaubt"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) nicht erkannt"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "Zahl ist zu groß"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "Name des Unterausdrucks nach (?& fehlt"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "Ziffer erwartet nach (?+"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr "] ist ein ungültiges Datenzeichen im JavaScript-Kompatibilitätsmodus"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr ""
 "Verschiedene Namen für Unterausdrücke der gleichen Nummer sind nicht erlaubt"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) benötigt ein Argument"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "Auf \\c muss ein ASCII-Zeichen folgen"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "Auf \\k folgt kein eingeklammerter, in eckigen Klammern eingeklammerter oder "
 "zitierter Name"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N wird in einer Klasse nicht unterstützt"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "Zu viele Vorwärtsreferenzen"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "Name ist zu lang in (*MARK), (*PRUNE), (*SKIP), oder (*THEN)"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 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"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE-Bibliothek wurde ohne UTF8-Unterstützung kompiliert"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr ""
 "PCRE-Bibliothek wurde ohne Unterstützung für UTF8-Eigenschaften kompiliert"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr ""
 "PCRE-Bibliothek wurde mit Unterstützung für nicht-kompatible Optionen "
 "kompiliert"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Fehler beim Optimieren des regulären Ausdrucks %s: %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 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"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Zitierter Text beginnt nicht mit einem Anführungszeichen"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Unbalanciertes Anführungszeichen in Befehlszeile oder anderem Text in "
 "Shellquotes"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr "Text endete nach einem »\\«-Zeichen. (Der Text war »%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 ""
 "Text endete, bevor ein passendes Anführungszeichen für %c gefunden wurde. "
 "(Der Text war »%s«)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Text war leer (oder enthielt nur Leerraum)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, 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:450
 #, 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:535
 #, 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:1043 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:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Der Kindprozess wurde mit Signal %ld beendet"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Der Kindprozess wurde mit Signal %ld beendet"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, 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:1360 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:1596
+#, c-format
+msgid "Failed to spawn child process “%s” (%s)"
+msgstr "Abspalten des Kindprozesses »%s« gescheitert (%s)"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Abspalten gescheitert (%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 "In Ordner »%s« (%s) konnte nicht gewechselt werden"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, 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:1804
 #, 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:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Abspalten des Kindprozesses gescheitert (%s)"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, 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:1845
 #, 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"
@@ -5807,170 +5799,170 @@
 "Unerwarteter Fehler in g_io_channel_win32_poll() beim Lesen aus dem "
 "Kindprozess"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "Leere Zeichenkette ist keine Zahl"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s” is not a signed number"
 msgstr "»%s« ist keine vorzeichenbehaftete Zahl"
 
-#: ../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 "Zahl »%s« ist außerhalb des zulässigen Bereichs [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s” is not an unsigned number"
 msgstr "»%s« ist keine vorzeichenlose Zahl"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Fehler beim Anfordern von Speicher"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Zeichen außerhalb des Bereiches für 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 "Ungültige Folge in Umwandlungseingabe"
 
-#: ../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 "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 +5970,7 @@
 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 +5978,7 @@
 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 +5990,7 @@
 #. * 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 c999213..ff9efcd 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-05-28 14:04+0000\n"
-"PO-Revision-Date: 2018-05-28 17:54+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 @@
 "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 @@
 "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/gio-tool.c:224
+#: 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 @@
 "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 @@
 "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 @@
 "«%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 @@
 "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 @@
 "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:315 ../gio/gcredentials.c:574
+#: 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:470
+#: 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:516
+#: 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:568
+#: 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "Los permisos de la carpeta «%s» están mal formados. Se esperaba el modo "
 "0700, se obtuvo 0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:299
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s”: %s"
 msgstr "Error al crear la carpeta %s: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:346
+#: 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:369 ../gio/gdbusauthmechanismsha1.c:687
+#: 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:383 ../gio/gdbusauthmechanismsha1.c:701
+#: 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 @@
 "El primer token de la línea %d del depósito de claves en «%s» con contenido "
 "«%s» está mal formado"
 
-#: ../gio/gdbusauthmechanismsha1.c:397 ../gio/gdbusauthmechanismsha1.c:715
+#: 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 @@
 "El segundo token de la liฬnea %d del depoฬsito de claves en «%s» con contenido "
 "«%s» estaฬ mal formado"
 
-#: ../gio/gdbusauthmechanismsha1.c:421
+#: 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:503
+#: 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:535
+#: 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:566
+#: 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:577
+#: 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:654
+#: 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:850
+#: 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "\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 @@
 "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 @@
 "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 @@
 "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:2022 ../gio/gdesktopappinfo.c:4589
+#: gio/gdesktopappinfo.c:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: ../gio/gdesktopappinfo.c:2432
+#: 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:2722
+#: 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:3158
+#: 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:3162
+#: 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:3402 ../gio/gdesktopappinfo.c:3426
+#: 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:3660
+#: 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:3794
+#: 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: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
+#: 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 @@
 #. * 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:2347
+#: 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:3028
+#: 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:3144
+#: 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:3148
+#: 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:3153
+#: 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:3216
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "No se puede copiar el archivo especial"
 
-#: ../gio/gfile.c:4014
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "El valor del enlace simbólico dado no es válido"
 
-#: ../gio/gfile.c:4175
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "No se soporta mover a la papelera"
 
-#: ../gio/gfile.c:4287
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c”"
 msgstr "Los nombres de archivo no pueden contener «%c»"
 
-#: ../gio/gfile.c:6768 ../gio/gvolume.c:364
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "el volumen no implementa el montaje"
 
-#: ../gio/gfile.c:6877
+#: 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,127 +1590,124 @@
 #. 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: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: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
+#: 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"
@@ -1750,59 +1717,56 @@
 "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-mount.c:1269 ../gio/gio-tool-open.c:139
-#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136
+#: 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"
@@ -1812,94 +1776,88 @@
 "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"
@@ -1914,23 +1872,23 @@
 "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"
@@ -1944,84 +1902,78 @@
 "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"
@@ -2031,123 +1983,137 @@
 "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:59
+#: gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr "Montar como montable"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
 msgstr "Montar volumen con archivo de dispositivo"
 
-#: ../gio/gio-tool-mount.c:60 ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:63 gio/gio-tool-mount.c:66
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:64
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "Expulsar"
 
-#: ../gio/gio-tool-mount.c:63
-#| msgid "Mount volume with device file"
+#: gio/gio-tool-mount.c:66
 msgid "Stop drive with device file"
 msgstr "Detener unidad con archivo de dispositivo"
 
-#: ../gio/gio-tool-mount.c:64
+#: 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:64
+#: gio/gio-tool-mount.c:67
 msgid "SCHEME"
 msgstr "ESQUEMA"
 
-#: ../gio/gio-tool-mount.c:65
+#: 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:66
+#: 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:68
+#: gio/gio-tool-mount.c:71
 msgid "List"
 msgstr "Listar"
 
-#: ../gio/gio-tool-mount.c:69
+#: gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr "Monitorizar eventos"
 
-#: ../gio/gio-tool-mount.c:70
+#: gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr "Mostrar información adicional"
 
-#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:280
+#: 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:508
-#| msgid "No volume for device file"
+#: 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:973
+#: 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:1028
+#: 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:1223
+#: 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"
@@ -2157,12 +2123,12 @@
 "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."
@@ -2170,163 +2136,161 @@
 "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:1505
+#: 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»"
@@ -2335,92 +2299,92 @@
 #. * 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:2071
+#: 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:2072
-#: ../gio/glib-compile-schemas.c:2100
+#: 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"
@@ -2431,125 +2395,124 @@
 "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>"
@@ -2557,7 +2520,7 @@
 "<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 "
@@ -2565,42 +2528,42 @@
 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:788
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "No se permiten nombres vacíos"
 
-#: ../gio/glib-compile-schemas.c:798
+#: 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:810
+#: gio/glib-compile-schemas.c:820
 #, c-format
 msgid ""
 "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
@@ -2609,36 +2572,36 @@
 "Nombre «%s» no válido: el carácter «%c» no es válido; sólo se permiten "
 "nombres en minúscula, números y guión («-»)"
 
-#: ../gio/glib-compile-schemas.c:819
+#: 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:828
+#: 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:836
+#: 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:908
+#: 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:934
+#: 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:945
+#: 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:963
+#: gio/glib-compile-schemas.c:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2647,7 +2610,7 @@
 "<key name='%s'> eclipsa a <key name='%s'> en <schema id='%s'>; use "
 "<override> para modificar el valor"
 
-#: ../gio/glib-compile-schemas.c:974
+#: gio/glib-compile-schemas.c:984
 #, c-format
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
@@ -2656,56 +2619,56 @@
 "Se debe especificar exactamente uno de «type», «enum» o «flags» como "
 "atributo para <key>"
 
-#: ../gio/glib-compile-schemas.c:993
+#: 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:1008
+#: 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:1038
+#: 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:1051
+#: 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:1059
+#: 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:1132
+#: 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:1144
+#: 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:1160
+#: 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:1168
+#: 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:1178
+#: 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:1188
+#: gio/glib-compile-schemas.c:1198
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2713,7 +2676,7 @@
 "<schema id='%s'> es una lista, extendiendo <schema id='%s'> que no es una "
 "lista"
 
-#: ../gio/glib-compile-schemas.c:1198
+#: gio/glib-compile-schemas.c:1208
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
@@ -2722,17 +2685,17 @@
 "<schema id='%s' list-of='%s'> extiende <schema id='%s' list-of='%s'> pero "
 "«%s» no extiende «%s»"
 
-#: ../gio/glib-compile-schemas.c:1215
+#: 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:1222
+#: 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:1231
+#: gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2741,119 +2704,128 @@
 "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:1261
+#: 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:1411 ../gio/glib-compile-schemas.c:1427
+#: 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:1509
+#: 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:1527
+#: 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:1617
+#: 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:1685
+#: 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:1824 ../gio/glib-compile-schemas.c:1898
-#: ../gio/glib-compile-schemas.c:1974
+#: 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:1834
+#: 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:1894
+#: gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ignorando este archivo.\n"
 
-#: ../gio/glib-compile-schemas.c:1934
+#: 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:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: 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:1944 ../gio/glib-compile-schemas.c:2002
-#: ../gio/glib-compile-schemas.c:2030
+#: 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:1960
+#: 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:1970
+#: 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:1988
+#: 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:2016
+#: 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:2072
+#: 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:2073
+#: 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:2074
+#: 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:2075
+#: 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:2103
+#: 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"
@@ -2864,32 +2836,32 @@
 "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:2124
+#: 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:2166
+#: 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:2169
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "sin hacer nada.\n"
 
-#: ../gio/glib-compile-schemas.c:2172
+#: 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:544 ../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:1006
+#: 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"
@@ -2898,317 +2870,322 @@
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1145
+#: 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:1168
+#: gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "No se puede renombrar la carpeta raíz"
 
-#: ../gio/glocalfile.c:1186 ../gio/glocalfile.c:1209
+#: 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:1193
+#: 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:1206 ../gio/glocalfile.c:2223 ../gio/glocalfile.c:2251
-#: ../gio/glocalfile.c:2408 ../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:1374 ../gio/glocalfile.c:1389
+#: 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:1514
+#: gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Error al eliminar el archivo %s: %s"
 
-#: ../gio/glocalfile.c:1898
+#: 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:1921
+#: 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:1941
+#: 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:2020 ../gio/glocalfile.c:2040
+#: 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:2075
+#: 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:2134
+#: 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:2138 ../gio/glocalfile.c:2194
+#: 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:2200
+#: 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:2226
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Error al crear la carpeta %s: %s"
 
-#: ../gio/glocalfile.c:2255
+#: 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:2258
+#: 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:2264 ../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:2319 ../gio/glocalfile.c:2354 ../gio/glocalfile.c:2411
+#: 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:2342
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "No se puede mover una carpeta sobre una carpeta"
 
-#: ../gio/glocalfile.c:2368 ../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:2387
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Error al eliminar el archivo destino: %s"
 
-#: ../gio/glocalfile.c:2401
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "No se soporta mover archivos entre puntos de montaje"
 
-#: ../gio/glocalfile.c:2592
+#: 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:1609
+#: gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (codificación no válida)"
 
-#: ../gio/glocalfileinfo.c:1778 ../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:2040
+#: 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:2085
+#: gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Tipo de atributo no válido (se esperaba uint32)"
 
-#: ../gio/glocalfileinfo.c:2103
+#: gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Tipo de atributo no válido (se esperaba uint64)"
 
-#: ../gio/glocalfileinfo.c:2122 ../gio/glocalfileinfo.c:2141
+#: 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:2186
+#: gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "No se pueden establecer permisos en enlaces simbólicos"
 
-#: ../gio/glocalfileinfo.c:2202
+#: gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Error al establecer permisos: %s"
 
-#: ../gio/glocalfileinfo.c:2253
+#: gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Error al establecer el propietario: %s"
 
-#: ../gio/glocalfileinfo.c:2276
+#: gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "el enlace simbólico debe ser no nulo"
 
-#: ../gio/glocalfileinfo.c:2286 ../gio/glocalfileinfo.c:2305
-#: ../gio/glocalfileinfo.c:2316
+#: 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:2295
+#: 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:2421
+#: 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:2444
+#: gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "El contexto SELinux debe ser no nulo"
 
-#: ../gio/glocalfileinfo.c:2459
+#: gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Error al establecer el contexto SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2466
+#: gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux no está activado en este sistema"
 
-#: ../gio/glocalfileinfo.c:2558
+#: 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:852
+#: 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"
@@ -3216,32 +3193,32 @@
 "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:399
+#: 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:475
+#: 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:553
+#: 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 "
@@ -3250,7 +3227,7 @@
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:638
+#: gio/gmount.c: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 "
@@ -3259,102 +3236,101 @@
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:726
+#: 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:808
+#: 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:895
+#: 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:211 ../gio/gnetworkmonitorbase.c:315
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Red no alcanzable"
 
-#: ../gio/gnetworkmonitorbase.c:249 ../gio/gnetworkmonitorbase.c:279
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Equipo no alcanzable"
 
-#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
-#: ../gio/gnetworkmonitornetlink.c:128
+#: 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:118
+#: gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "No se pudo crear el monitor de red: "
 
-#: ../gio/gnetworkmonitornetlink.c:176
+#: 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"
@@ -3364,16 +3340,15 @@
 "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"
@@ -3385,15 +3360,15 @@
 "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"
@@ -3421,7 +3396,7 @@
 "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"
@@ -3436,20 +3411,20 @@
 "%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"
@@ -3457,90 +3432,82 @@
 "  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"
@@ -3548,50 +3515,49 @@
 "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"
@@ -3601,11 +3567,11 @@
 "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"
@@ -3654,7 +3620,7 @@
 "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"
@@ -3669,11 +3635,11 @@
 "%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"
@@ -3681,393 +3647,387 @@
 "  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:3020 ../gio/gsocket.c:4230
-#: ../gio/gsocket.c:4288
+#: 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:2398 ../gio/gsocket.c:2471 ../gio/gsocket.c:2529
-#: ../gio/gsocket.c:2547
+#: 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:2399 ../gio/gsocket.c:2472 ../gio/gsocket.c:2530
-#: ../gio/gsocket.c:2548
+#: 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:2400
+#: 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:2418 ../gio/gsocket.c:2447 ../gio/gsocket.c:2497
+#: 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:2434
+#: gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "El nombre de la interfaz es demasiado largo"
 
-#: ../gio/gsocket.c:2473
+#: 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:2531
+#: 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:2740
+#: gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error al aceptar la conexión: %s"
 
-#: ../gio/gsocket.c:2864
+#: gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Conexión en progreso"
 
-#: ../gio/gsocket.c:2913
+#: gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "No se pudo obtener el error pendiente: "
 
-#: ../gio/gsocket.c:3083
+#: gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Error al recibir los datos: %s"
 
-#: ../gio/gsocket.c:3278
+#: gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Error al enviar los datos: %s"
 
-#: ../gio/gsocket.c:3465
+#: gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "No se pudo desconectar el socket: %s"
 
-#: ../gio/gsocket.c:3546
+#: gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Error al cerrar el socket: %s"
 
-#: ../gio/gsocket.c:4223
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Esperando la condición del socket: %s"
 
-#: ../gio/gsocket.c:4697 ../gio/gsocket.c:4777 ../gio/gsocket.c:4955
+#: 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:4721
+#: gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage no está soportado en Windows"
 
-#: ../gio/gsocket.c:5174 ../gio/gsocket.c:5247 ../gio/gsocket.c:5473
+#: 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:5745
+#: 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:5754
+#: 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."
@@ -4077,7 +4037,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4085,300 +4045,299 @@
 "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:2593 ../gio/gunixmounts.c:2646
+#: 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:438
+#: 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:515
+#: 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"
@@ -4399,62 +4358,62 @@
 #. * 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"
@@ -4476,132 +4435,132 @@
 #. * 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"
@@ -4623,62 +4582,62 @@
 #. * (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"
@@ -4700,194 +4659,193 @@
 #. * 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"
@@ -4895,45 +4853,45 @@
 "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."
@@ -4941,7 +4899,7 @@
 "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 "
@@ -4950,227 +4908,227 @@
 "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 "
@@ -5179,21 +5137,21 @@
 "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"
@@ -5201,319 +5159,327 @@
 "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"
@@ -5521,283 +5487,288 @@
 "\\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:1983
+#: 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:2419
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}” expected"
 msgstr "se esperaba un dígito hexadecimal o «}»"
 
-#: ../glib/gregex.c:2435
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "se esperaba un dígito hexadecimal"
 
-#: ../glib/gregex.c:2475
+#: glib/gregex.c:2475
 msgid "missing “<” in symbolic reference"
 msgstr "falta «<» en la referencia simbólica"
 
-#: ../glib/gregex.c:2484
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "referencia de símbolo sin terminar"
 
-#: ../glib/gregex.c:2491
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "referencia simbólica de longitud cero"
 
-#: ../glib/gregex.c:2502
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "se esperaba un dígito"
 
-#: ../glib/gregex.c:2520
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "referencia simbólica ilegal"
 
-#: ../glib/gregex.c:2582
+#: glib/gregex.c:2582
 msgid "stray final “\\”"
 msgstr "«\\» al final de la cadena"
 
-#: ../glib/gregex.c:2586
+#: glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "secuencia de escape desconocida"
 
-#: ../glib/gregex.c:2596
+#: 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:1230
+#: 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:719
+#: 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:734
+#: 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:715
+#: glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Carpeta de trabajo no válido: %s"
 
-#: ../glib/gspawn-win32.c:780
+#: 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:994
+#: glib/gspawn-win32.c:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5805,170 +5776,170 @@
 "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: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"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
-#: ../glib/gutils.c:2308
+#: glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5976,7 +5947,7 @@
 msgstr[1] "%u bits"
 
 #. 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"
@@ -5984,7 +5955,7 @@
 msgstr[1] "%s bytes"
 
 #. 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"
@@ -5996,11 +5967,24 @@
 #. * 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 "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...]"
 
diff --git a/po/fr.po b/po/fr.po
index edde19f..f5df7a1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,10 +16,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 14:39+0000\n"
-"PO-Revision-Date: 2018-02-22 09:10+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2018-08-09 00:27+0000\n"
+"PO-Revision-Date: 2018-08-12 13:47+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -28,132 +27,129 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Options GApplication"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Afficher les options GApplication"
 
-#: ../gio/gapplication.c:540
+#: gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr ""
 "Entrer dans le mode de service GApplication (utiliser à partir des fichiers "
 "de service D-Bus)"
 
-#: ../gio/gapplication.c:552
+#: gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Remplacer l’identifiant d’application"
 
-#: ../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:495 gio/gsettings-tool.c:569
 msgid "Print help"
 msgstr "Afficher l’aide"
 
-#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489
-#: ../gio/gresource-tool.c:557
+#: gio/gapplication-tool.c:47 gio/gresource-tool.c:496 gio/gresource-tool.c:564
 msgid "[COMMAND]"
 msgstr "[COMMANDE]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
 msgstr "Afficher la version"
 
-#: ../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 "Afficher les informations de version et quitter"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Lister les applications"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Afficher la liste des applications installées activables par D-Bus (par "
 "fichiers .desktop)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Lancer une application"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Lancer l’application (avec d’éventuels fichiers à ouvrir)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "ID_APP [FICHIER…]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Activer une action"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Invoquer une action sur l’application"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "ID_APP ACTION [PARAMÈTRE]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Afficher les actions disponibles"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr ""
 "Afficher la liste des actions statiques d’une application (à partir du "
 "fichier .desktop)"
 
-#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:65 gio/gapplication-tool.c:71
 msgid "APPID"
 msgstr "ID_APP"
 
-#: ../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 "COMMANDE"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "La commande pour laquelle l’aide détaillée doit être affichée"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "Identifiant d’application au format D-Bus (ex. : 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:502 gio/gresource-tool.c:568
 msgid "FILE"
 msgstr "FICHIER"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr "Noms de fichiers relatifs ou absolus ou URI à ouvrir"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "ACTION"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "Nom de l’action à invoquer"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARAMÈTRE"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "Paramètre facultatif pour l’invocation de l’action, au format 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:533 gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -162,26 +158,26 @@
 "Commande inconnue %s\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Utilisation :\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:558
+#: gio/gsettings-tool.c:696
 msgid "Arguments:\n"
 msgstr "Paramètres :\n"
 
-#: ../gio/gapplication-tool.c:133
+#: gio/gapplication-tool.c:133 gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[PARAMS…]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Commandes :\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"
@@ -190,7 +186,7 @@
 "Utilisez « %s help COMMANDE » pour obtenir de l’aide détaillée.\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"
@@ -199,13 +195,13 @@
 "La commande %s exige un identifiant d’application à suivre directement\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s”\n"
 msgstr "identifiant d’application non valide : « %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"
@@ -214,22 +210,21 @@
 "« %s » n’accepte aucun paramètre\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "impossible de se connecter à 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 "erreur d’envoi du message %s à l’application : %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 "un nom d’action doit être indiqué après l’identifiant d’application\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s”\n"
@@ -239,27 +234,25 @@
 "les noms d’actions ne peuvent contenir que des caractères alphanumériques, "
 "« - » et « . »\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "erreur d’analyse du paramètre d’action : %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "les actions n’acceptent pas plus d’un paramètre\n"
 
-#: ../gio/gapplication-tool.c:411
-#, c-format
+#: gio/gapplication-tool.c:411
 msgid "list-actions command takes only the application id"
 msgstr "la commande list-actions n’accepte que l’identifiant de l’application"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "impossible de trouver le fichier desktop pour l’application %s\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -268,126 +261,122 @@
 "commande non reconnue : %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 "La valeur de comptage fournie à %s est trop grande"
 
-#: ../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 "Le positionnement n’est pas pris en charge sur le flux de base"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "Impossible de tronquer 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 "Le flux est déjà fermé"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "La troncature n’est pas prise en charge sur le flux de 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 "L’opération a été annulée"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Objet non valide, non initialisé"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Séquence multi-octet incomplète en entrée"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Espace insuffisant dans la destination"
 
-#: ../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 "Séquence d’octets incorrecte en entrée du convertisseur"
 
-#: ../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 "Erreur lors de la conversion : %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "Initialisation annulable non prise en charge"
 
-#: ../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 conversion du jeu de caractères « %s » vers « %s » n’est pas prise en "
 "charge"
 
-#: ../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 "Impossible d’ouvrir le convertisseur de « %s » vers « %s »"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:358
 #, c-format
 msgid "%s type"
 msgstr "Type %s"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Type inconnu"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 msgid "%s filetype"
 msgstr "Type de fichier %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 n’est pas implémenté sur ce système d’exploitation"
 
-#: ../gio/gcredentials.c:467
+#: gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Il n’y a pas de prise en charge de GCredentials pour votre plate-forme"
 
-#: ../gio/gcredentials.c:513
+#: gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr ""
 "GCredentials ne contient pas d’identifiant de processus sur ce système "
 "d’exploitation"
 
-#: ../gio/gcredentials.c:565
+#: gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr ""
 "L’usurpation d’identité n’est pas possible sur ce système d’exploitation"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Fin précoce de flux inattendue"
 
-#: ../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 "Clé « %s » non prise en charge dans l’élément d’adresse « %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)"
@@ -395,29 +384,34 @@
 "L’adresse « %s » n’est pas valide (nécessite exactement une des clés de "
 "« path », « tmpdir » ou « abstract »)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr ""
 "Combinaison clé/valeur sans signification dans l’élément d’adresse « %s »"
 
-#: ../gio/gdbusaddress.c: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 "Erreur dans l’adresse « %s » — l’attribut du port est mal formé"
 
-#: ../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 "Erreur dans l’adresse « %s » — l’attribut de la famille est mal formé"
 
-#: ../gio/gdbusaddress.c:463
+#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s” for address “%s”"
+msgstr "Transport « %s » inconnu ou non pris en charge pour l’adresse « %s »"
+
+#: gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s” does not contain a colon (:)"
 msgstr ""
 "L’élément d’adresse « %s » ne comporte pas de caractère deux-points (:)"
 
-#: ../gio/gdbusaddress.c:484
+#: gio/gdbusaddress.c:488
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
@@ -426,7 +420,7 @@
 "Le couple clé/valeur %d, « %s », dans l’élément d’adresse « %s » ne comporte "
 "pas de signe égal"
 
-#: ../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 "
@@ -435,7 +429,7 @@
 "Erreur lors du décodage de la clé ou de la valeur dans le couple clé/valeur "
 "%d, « %s », dans l’élément d’adresse « %s »"
 
-#: ../gio/gdbusaddress.c:576
+#: gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
@@ -444,106 +438,101 @@
 "Erreur dans l’adresse « %s » — le transport Unix requiert que soit "
 "exactement définie une des clés « path » ou « abstract »"
 
-#: ../gio/gdbusaddress.c:612
+#: gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s” — the host attribute is missing or malformed"
 msgstr ""
 "Erreur dans l’adresse « %s » — l’attribut de l’hôte est manquant ou mal formé"
 
-#: ../gio/gdbusaddress.c:626
+#: gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr ""
 "Erreur dans l’adresse « %s » — l’attribut du port est manquant ou mal formé"
 
-#: ../gio/gdbusaddress.c:640
+#: gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
 msgstr ""
 "Erreur dans l’adresse « %s » — l’attribut du fichier à dénomination unique "
 "est manquant ou mal formé"
 
-#: ../gio/gdbusaddress.c:661
+#: gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Erreur de lancement automatique :"
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s” for address “%s”"
-msgstr "Transport « %s » inconnu ou non pris en charge pour l’adresse « %s »"
-
-#: ../gio/gdbusaddress.c:714
+#: gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s”: %s"
 msgstr ""
 "Erreur lors de l’ouverture du fichier à dénomination unique « %s » : %s"
 
-#: ../gio/gdbusaddress.c:733
+#: gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Erreur de lecture du fichier à dénomination unique « %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 ""
 "Erreur de lecture du fichier à dénomination unique « %s », 16 octets "
 "attendus, %d reçus"
 
-#: ../gio/gdbusaddress.c:760
+#: gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr ""
 "Erreur d’écriture du contenu du fichier à numérotation unique « %s » sur le "
 "flux :"
 
-#: ../gio/gdbusaddress.c:969
+#: gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "L’adresse indiquée est vide"
 
-#: ../gio/gdbusaddress.c:1082
+#: gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr ""
 "Impossible de générer dynamiquement un bus messages quand le drapeau setuid "
 "est mis"
 
-#: ../gio/gdbusaddress.c:1089
+#: gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr ""
 "Impossible de générer dynamiquement un bus messages sans identifiant "
 "machine : "
 
-#: ../gio/gdbusaddress.c:1096
+#: gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "Impossible de lancer automatiquement D-Bus sans $DISPLAY X11"
 
-#: ../gio/gdbusaddress.c:1138
+#: gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "Erreur lors de la génération de la ligne de commande « %s » : "
 
-#: ../gio/gdbusaddress.c:1355
+#: gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(saisissez n’importe quel caractère pour fermer cette fenêtre)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr ""
 "La session dbus n’est pas lancée et autolaunch (le lancement automatique) a "
 "échoué"
 
-#: ../gio/gdbusaddress.c:1520
+#: gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Impossible de déterminer l’adresse du bus de session (non pris en charge "
 "pour ce système d’exploitation)"
 
-#: ../gio/gdbusaddress.c:1658
+#: gio/gdbusaddress.c:1662 gio/gdbusconnection.c:7142
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -552,7 +541,7 @@
 "Impossible de déterminer l’adresse du bus à partir de la variable "
 "d’environnement DBUS_STARTER_BUS_TYPE — valeur inconnue « %s »"
 
-#: ../gio/gdbusaddress.c: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"
@@ -560,22 +549,22 @@
 "Impossible de déterminer l’adresse du bus étant donné que la variable "
 "d’environnement DBUS_STARTER_BUS_TYPE n’est pas définie"
 
-#: ../gio/gdbusaddress.c:1677
+#: gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Type de bus %d inconnu"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Manque de contenu imprévu lors de la tentative de lecture d’une ligne"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr ""
 "Manque de contenu imprévu lors de la tentative de lecture (sécurisée) d’une "
 "ligne"
 
-#: ../gio/gdbusauth.c:508
+#: gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -583,17 +572,17 @@
 "Tous les mécanismes d’authentification disponibles ont été épuisés (tentés : "
 "%s) (disponibles : %s)"
 
-#: ../gio/gdbusauth.c:1171
+#: gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Annulé via GDBusAuthObserver::authorize-authenticated-peer"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s”: %s"
 msgstr ""
 "Erreur lors de la récupération d’information sur le répertoire « %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"
@@ -601,24 +590,24 @@
 "Les droits d’accès au répertoire « %s » sont mal formés. Mode 0700 attendu, "
 "0%o obtenu"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s”: %s"
 msgstr "Erreur lors de la création du répertoire « %s » : %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s” for reading: "
 msgstr "Erreur lors de l’ouverture du trousseau de clés « %s » en lecture : "
 
-#: ../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 ""
 "La ligne %d du trousseau de clés de « %s » avec le contenu « %s » est mal "
 "formée"
 
-#: ../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"
@@ -626,7 +615,7 @@
 "Le premier jeton de la ligne %d du trousseau de clés de « %s » avec le "
 "contenu « %s » est mal formé"
 
-#: ../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"
@@ -634,172 +623,163 @@
 "Le deuxième jeton de la ligne %d du trousseau de clés de « %s » avec le "
 "contenu « %s » est mal formé"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr ""
 "Impossible de trouver un cookie avec l’identifiant %d dans le trousseau de "
 "clés de « %s »"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Erreur lors de la destruction de l’ancien fichier verrou « %s » : %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s”: %s"
 msgstr "Erreur lors de la création du fichier verrou « %s » : %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Erreur lors de la fermeture du fichier verrou (non lié) « %s » : %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s”: %s"
 msgstr ""
 "Erreur lors de la suppression du lien avec le fichier verrou « %s » : %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s” for writing: "
 msgstr "Erreur lors de l’ouverture du trousseau de clés « %s » en écriture : "
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr "(en outre, le relèvement du verrou pour « %s » a aussi échoué : %s) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "La connexion est fermée"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "Le délai d’attente est dépassé"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "Marqueurs non pris en charge rencontrés lors de la construction d’une "
 "connexion côté client"
 
-#: ../gio/gdbusconnection.c: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 ""
 "Pas d’interface « org.freedesktop.DBus.Properties » pour l’objet à "
 "l’emplacement %s"
 
-#: ../gio/gdbusconnection.c:4266
+#: gio/gdbusconnection.c:4257
 #, c-format
-msgid "No such property '%s'"
+msgid "No such property “%s”"
 msgstr "La propriété « %s » n’existe pas"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
+msgid "Property “%s” is not readable"
 msgstr "La propriété « %s » ne peut pas être lue"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
+msgid "Property “%s” is not writable"
 msgstr "La propriété « %s » ne peut pas être écrite"
 
-#: ../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 ""
 "Erreur lors de la définition de la propriété « %s » : type attendu « %s », "
 "« %s » obtenu"
 
-#: ../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'"
-msgstr "Interface « %s » non reconnue"
+msgid "No such interface “%s”"
+msgstr "L’interface « %s » n’existe pas"
 
-#: ../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 "L’interface « %s » n’existe pas pour l’objet à l’emplacement %s"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
+msgid "No such method “%s”"
 msgstr "La méthode « %s » n’existe pas"
 
-#: ../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”"
 msgstr "Le type du message, « %s », ne correspond pas au type attendu « %s »"
 
-#: ../gio/gdbusconnection.c:5167
+#: gio/gdbusconnection.c:5158
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Un objet est déjà exporté pour l’interface « %s » en « %s »"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "Impossible d’obtenir le propriété %s.%s"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "Impossible de définir la propriété %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 "La méthode « %s » a renvoyé le type « %s », mais « %s » était attendu"
 
-#: ../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 ""
 "La méthode « %s » sur l’interface « %s » avec la signature « %s » n’existe "
 "pas"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Une sous-arborescence est déjà exportée pour « %s »"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Impossible de déterminer l’adresse du bus à partir de la variable "
-"d’environnement DBUS_STARTER_BUS_TYPE — valeur « %s » inconnue"
-
-#: ../gio/gdbusmessage.c:1246
+#: gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "le type est « INVALID »"
 
-#: ../gio/gdbusmessage.c:1257
+#: gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "Message de METHOD_CALL : champ d’en-tête PATH ou MEMBER manquant"
 
-#: ../gio/gdbusmessage.c:1268
+#: gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "Message de METHOD_RETURN : champ d’en-tête REPLY_SERIAL manquant"
 
-#: ../gio/gdbusmessage.c:1280
+#: gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "Message d’ERREUR : champ d’en-tête REPLY_SERIAL ou ERROR_NAME manquant"
 
-#: ../gio/gdbusmessage.c:1293
+#: gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "Message de SIGNAL : champ d’en-tête PATH, INTERFACE ou MEMBER manquant"
 
-#: ../gio/gdbusmessage.c:1301
+#: gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -807,7 +787,7 @@
 "Message de SIGNAL : le champ d’en-tête PATH utilise la valeur réservée /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"
@@ -815,21 +795,21 @@
 "Message de SIGNAL : le champ d’en-tête INTERFACE utilise la valeur réservée "
 "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] "Lecture de %lu octet demandée, mais seulement %lu reçu(s)"
 msgstr[1] "Lecture de %lu octets demandée, mais seulement %lu reçu(s)"
 
-#: ../gio/gdbusmessage.c:1371
+#: gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr ""
 "Octet 00 (NUL) attendu à la fin de la chaîne « %s » mais un octet %d a été "
 "trouvé"
 
-#: ../gio/gdbusmessage.c:1390
+#: gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -839,19 +819,19 @@
 "rencontrés à la position %d (longueur de la chaîne : %d octets). La chaîne "
 "UTF-8 valide jusqu’à cet endroit est « %s »"
 
-#: ../gio/gdbusmessage.c:1593
+#: gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus object path"
 msgstr ""
 "La valeur analysée « %s » n’est pas un chemin vers un objet D-Bus valide"
 
-#: ../gio/gdbusmessage.c:1615
+#: gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature"
 msgstr "La valeur analysée « %s » n’est pas une signature D-Bus valide"
 
 # 2<<26  donne 128 Mo, 2^26 donne 64 Mo, 1<<26 donne 64 Mo
-#: ../gio/gdbusmessage.c:1662
+#: gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -864,7 +844,7 @@
 "Un tableau de %u octets de long a été trouvé. La longueur maximale est de "
 "2<<26 octets (64 Mo)."
 
-#: ../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 "
@@ -873,14 +853,14 @@
 "Un tableau de type « a%c » a été trouvé, avec une longueur attendue multiple "
 "de %u octets, mais la longueur réelle est de %u octets"
 
-#: ../gio/gdbusmessage.c:1849
+#: gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
 msgstr ""
 "La valeur « %s » analysée en tant que variant n’est pas une signature valide "
 "de D-Bus"
 
-#: ../gio/gdbusmessage.c:1873
+#: gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s” from the D-Bus wire format"
@@ -888,7 +868,7 @@
 "Erreur en désérialisant le GVariant en chaîne de type « %s » à partir du "
 "format de transmission 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 "
@@ -897,26 +877,26 @@
 "Valeur de boutisme non valide. 0x6c (« l ») ou 0x42 (« B ») attendus, mais 0x"
 "%02x trouvé"
 
-#: ../gio/gdbusmessage.c:2068
+#: gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "Version majeure du protocole non valide. 1 attendu, %d trouvé"
 
-#: ../gio/gdbusmessage.c:2124
+#: gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s” found but message body is empty"
 msgstr ""
 "En-tête de signature trouvé avec la signature « %s », mais le corps du "
 "message est vide"
 
-#: ../gio/gdbusmessage.c:2138
+#: gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
 msgstr ""
 "La valeur analysée « %s » n’est pas une signature valide de D-Bus (pour le "
 "corps)"
 
-#: ../gio/gdbusmessage.c: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"
@@ -927,11 +907,11 @@
 "Pas de signature d’en-tête dans le message, mais le corps du message est de "
 "%u octets"
 
-#: ../gio/gdbusmessage.c:2178
+#: gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "Impossible de désérialiser le message : "
 
-#: ../gio/gdbusmessage.c:2519
+#: gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
@@ -939,7 +919,7 @@
 "Erreur en sérialisant le GVariant en chaîne de type « %s » dans le format de "
 "transmission 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)"
@@ -947,18 +927,18 @@
 "Le nombre de descripteurs de fichiers dans le message (%d) diffère de celui "
 "du champ d’en-tête (%d)"
 
-#: ../gio/gdbusmessage.c:2664
+#: gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "Impossible de sérialiser le message : "
 
-#: ../gio/gdbusmessage.c:2708
+#: gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s” but there is no signature header"
 msgstr ""
 "Le corps du message a la signature « %s », mais il n’y a pas d’en-tête de "
 "signature"
 
-#: ../gio/gdbusmessage.c:2718
+#: gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
@@ -967,44 +947,44 @@
 "Le corps du message a une signature de type « %s », mais celle dans le champ "
 "d’en-tête est « %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 ""
 "Le corps du message est vide mais sa signature dans le champ d’en-tête est "
 "« (%s) »"
 
-#: ../gio/gdbusmessage.c:3287
+#: gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s”"
 msgstr "Retour d’erreur avec un corps de type « %s »"
 
-#: ../gio/gdbusmessage.c:3295
+#: gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Retour d’erreur avec un corps vide"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Impossible d’obtenir le profil matériel : %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr ""
 "Chargement de /var/lib/dbus/machine-id ou /etc/machine-id impossible : "
 
-#: ../gio/gdbusproxy.c:1612
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Erreur lors de l’appel de StartServiceByName pour %s : "
 
 # Guillemets anglais laissés volontairement
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Réponse %d inattendue de la méthode 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"
@@ -1013,33 +993,33 @@
 "sans propriétaire alors que le proxy a été construit avec le marqueur "
 "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "L’espace de noms abstrait n’est pas pris en charge"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr ""
 "Impossible de définir un fichier à dénomination unique lors de la création "
 "d’un serveur"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s”: %s"
 msgstr ""
 "Erreur lors de l’écriture du fichier à dénomination unique à « %s » : %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "La chaîne « %s » n’est pas un GUID valide de D-Bus"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Impossible d’écouter sur le transport « %s » non pris en charge"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1062,54 +1042,54 @@
 "\n"
 "Utiliser « %s COMMANDE --help » pour obtenir une aide sur chaque commande.\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 "Erreur : %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 "Erreur lors de l’analyse du XML d’introspection : %s\n"
 
-#: ../gio/gdbus-tool.c:216
+#: gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Erreur : %s n’est pas un nom valide\n"
 
-#: ../gio/gdbus-tool.c:364
+#: gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Connexion au bus système"
 
-#: ../gio/gdbus-tool.c:365
+#: gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Connexion au bus de session"
 
-#: ../gio/gdbus-tool.c:366
+#: gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Connexion à l’adresse D-Bus donnée"
 
-#: ../gio/gdbus-tool.c:376
+#: gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Options de connexion au point terminal :"
 
-#: ../gio/gdbus-tool.c:377
+#: gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Options définissant la connexion au point terminal"
 
-#: ../gio/gdbus-tool.c:399
+#: gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Aucun point terminal de connexion défini"
 
-#: ../gio/gdbus-tool.c:409
+#: gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Plusieurs points terminaux de connexion définis"
 
-#: ../gio/gdbus-tool.c:479
+#: gio/gdbus-tool.c:497
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s” does not exist\n"
@@ -1117,7 +1097,7 @@
 "Avertissement : selon les données de l’examen interne, l’interface « %s » "
 "n’existe pas\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 "
@@ -1126,169 +1106,164 @@
 "Avertissement : selon les données de l’examen interne, la méthode « %s » "
 "n’existe pas sur l’interface « %s »\n"
 
-#: ../gio/gdbus-tool.c:550
+#: gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Destination facultative pour le signal (nom unique)"
 
-#: ../gio/gdbus-tool.c:551
+#: gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Chemin de l’objet sur lequel émettre le signal"
 
-#: ../gio/gdbus-tool.c:552
+#: gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Noms de signal et d’interface"
 
-#: ../gio/gdbus-tool.c:587
+#: gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Émet un signal."
 
-#: ../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 "Erreur de connexion : %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 "Erreur : la destination n’est pas précisée\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 "Erreur : %s n’est pas un nom unique de bus valide.\n"
 
-#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
-#, 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 "Erreur : le chemin pour l’objet n’est pas précisé\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 "Erreur : « %s » n’est pas un chemin d’objet valide\n"
 
-#: ../gio/gdbus-tool.c:720
-#, c-format
+#: gio/gdbus-tool.c:740
 msgid "Error: Signal name is not specified\n"
 msgstr "Erreur : le nom du signal n’est pas défini\n"
 
-#: ../gio/gdbus-tool.c:731
 # c-format
+#: gio/gdbus-tool.c:754
+#, c-format
 msgid "Error: Signal name “%s” is invalid\n"
 msgstr "Erreur : le nom de signal « %s » n’est pas valide\n"
 
-#: ../gio/gdbus-tool.c:743
+#: gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Erreur : %s n’est pas un nom d’interface valide\n"
 
-#: ../gio/gdbus-tool.c:749
+#: gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Erreur : %s n’est pas un nom de membre valide\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c: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 "Erreur lors de l’analyse du paramètre %d : %s\n"
 
-#: ../gio/gdbus-tool.c:818
+#: gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Erreur de purge de la connexion : %s\n"
 
-#: ../gio/gdbus-tool.c:845
+#: gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Nom de la destination sur laquelle appeler une méthode"
 
-#: ../gio/gdbus-tool.c:846
+#: gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Chemin de l’objet sur lequel appeler une méthode"
 
-#: ../gio/gdbus-tool.c:847
+#: gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Noms de méthode et d’interface"
 
-#: ../gio/gdbus-tool.c:848
+#: gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Délai d’attente en secondes"
 
-#: ../gio/gdbus-tool.c:889
+#: gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Appeler une méthode sur un objet distant."
 
-#: ../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
+msgid "Error: Destination is not specified\n"
+msgstr "Erreur : la destination n’est pas précisée\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 "Erreur : %s n’est pas un nom de bus valide\n"
 
-#: ../gio/gdbus-tool.c:1022
-#, c-format
+#: gio/gdbus-tool.c:1043
 msgid "Error: Method name is not specified\n"
 msgstr "Erreur : le nom de la méthode n’est pas défini\n"
 
-#: ../gio/gdbus-tool.c:1033
+#: gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s” is invalid\n"
 msgstr "Erreur : le nom de méthode « %s » n’est pas valide\n"
 
-#: ../gio/gdbus-tool.c:1111
+#: gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Erreur d’analyse du paramètre %d de type « %s » : %s\n"
 
-#: ../gio/gdbus-tool.c:1555
+#: gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Nom de la destination à examiner en interne"
 
-#: ../gio/gdbus-tool.c:1556
+#: gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "Chemin de l’objet à examiner en interne"
 
-#: ../gio/gdbus-tool.c:1557
+#: gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Imprimer le XML"
 
-#: ../gio/gdbus-tool.c:1558
+#: gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "Examiner en interne les enfants"
 
-#: ../gio/gdbus-tool.c:1559
+#: gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "N’afficher que les propriétés"
 
-#: ../gio/gdbus-tool.c:1650
+#: gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Examiner en interne un objet distant."
 
-#: ../gio/gdbus-tool.c:1853
+#: gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Nom de la destination à surveiller"
 
-#: ../gio/gdbus-tool.c:1854
+#: gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Chemin de l’objet à surveiller"
 
-#: ../gio/gdbus-tool.c:1883
+#: gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Surveiller un objet distant."
 
-#: ../gio/gdbus-tool.c:1941
-#, c-format
+#: gio/gdbus-tool.c:1954
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr ""
 "Erreur : impossible de surveiller une connexion qui n’est pas un bus de "
 "messages\n"
 
-#: ../gio/gdbus-tool.c:2065
+#: gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Service à activer avant d’attendre l’autre (nom bien connu)"
 
-#: ../gio/gdbus-tool.c:2068
+#: gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1296,141 +1271,136 @@
 "Délai d’attente avant de quitter avec une erreur (secondes) ; 0 pour aucun "
 "délai (par défaut)"
 
-#: ../gio/gdbus-tool.c:2116
+#: gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPTION…] NOM-DE-BUS"
 
-#: ../gio/gdbus-tool.c:2118
+#: gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Attend l’apparition d’un nom de bus."
 
-#: ../gio/gdbus-tool.c:2194
-#, c-format
+#: gio/gdbus-tool.c:2206
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Erreur : un service à activer doit être indiqué.\n"
 
-#: ../gio/gdbus-tool.c:2199
-#, c-format
+#: gio/gdbus-tool.c:2211
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Erreur : un service à attendre doit être indiqué.\n"
 
-#: ../gio/gdbus-tool.c:2204
-#, c-format
+#: gio/gdbus-tool.c:2216
 msgid "Error: Too many arguments.\n"
 msgstr "Erreur : trop de paramètres.\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 "Erreur : %s n’est pas un nom de bus bien connu valide\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: gio/gdesktopappinfo.c:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Sans nom"
 
 # Un fichier Desktop n’est pas forcément sur le bureau...
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Le fichier .desktop n’a pas précisé son champ Exec"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Impossible de trouver le terminal requis par l’application"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "Impossible de créer le dossier de configuration utilisateur d’application "
 "%s : %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr ""
 "Impossible de créer le dossier de configuration utilisateur MIME %s : %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: gio/gdesktopappinfo.c:3446 gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "Les informations de l’application ne comportent pas d’identifiant"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Impossible de créer le fichier .desktop utilisateur %s"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Définition personnalisée pour %s"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "le lecteur n’implémente pas l’éjection (« eject »)"
 
 #. 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 ""
 "le lecteur n’implémente pas l’éjection combinée ou non (« eject » ou "
 "« eject_with_operation »)"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 msgid "drive doesn’t implement polling for media"
 msgstr "le lecteur n’implémente pas la scrutation du média (« polling »)"
 
-#: ../gio/gdrive.c:776
+#: gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "le lecteur n’implémente pas le démarrage (« start »)"
 
-#: ../gio/gdrive.c:878
+#: gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "le lecteur n’implémente pas l’arrêt (« stop »)"
 
-#: ../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 "La prise en charge TLS n’est pas disponible"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "La prise en charge DTLS n’est pas disponible"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Impossible de gérer la version %d du codage GEmblem"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Nombre de jetons incorrect (%d) dans le codage GEmblem"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Impossible de gérer la version %d du codage GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Nombre de jetons incorrect (%d) dans le codage GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Un GEmblem est attendu pour le 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 "Opération non prise en charge"
 
@@ -1438,210 +1408,210 @@
 #. * 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 "Le point de montage conteneur n’existe pas"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: gio/gfile.c:2622 gio/glocalfile.c:2391
 msgid "Can’t copy over directory"
 msgstr "Impossible d’écraser un répertoire"
 
-#: ../gio/gfile.c:2677
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Impossible d’écraser un répertoire par un autre répertoire"
 
-#: ../gio/gfile.c:2685
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Le fichier cible existe"
 
-#: ../gio/gfile.c:2704
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Impossible de copier récursivement un répertoire"
 
 # http://en.wikipedia.org/wiki/Splice_(system_call)
-#: ../gio/gfile.c:2979
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "L’opération « splice » n’est pas prise en charge"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Erreur lors de l’opération de « splicing » sur le fichier : %s"
 
-#: ../gio/gfile.c:3136
+#: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr ""
 "La copie (reflink/clone) entre points de montage n’est pas prise en charge"
 
-#: ../gio/gfile.c:3140
+#: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "La copie (reflink/clone) n’est pas prise en charge ou n’est pas 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) n’est pas prise en charge ou n’a pas fonctionné"
 
-#: ../gio/gfile.c:3208
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Impossible de copier le fichier spécial"
 
-#: ../gio/gfile.c:4006
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Valeur de lien symbolique donnée non valide"
 
-#: ../gio/gfile.c:4167
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "La corbeille n’est pas prise en charge"
 
-#: ../gio/gfile.c:4279
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c”"
 msgstr "Les noms de fichiers ne peuvent comporter de « %c »"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "le volume n’implémente pas le montage"
 
-#: ../gio/gfile.c:6869
+#: gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "Aucune application n’est enregistrée pour gérer ce fichier"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "L’énumérateur est fermé"
 
-#: ../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 "L’énumérateur de fichiers est en cours d’opération"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "L’énumérateur de fichiers est déjà fermé"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Impossible de gérer la version %d du codage de GFileIcon"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Données d’entrée incorrectes pour 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 "Le flux ne prend pas en charge 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 "Le positionnement n’est pas pris en charge sur le flux"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "La troncature n’est pas autorisée sur un flux d’entrée"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "La troncature n’est pas prise en charge sur le flux"
 
-#: ../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 "Nom d’hôte non valide"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Mauvaise réponse du mandataire HTTP"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Connexion mandataire HTTP non autorisée"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "L’authentification auprès du mandataire HTTP a échoué"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Authentification obligatoire pour le mandataire HTTP"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "La connexion au mandataire HTTP a échoué : %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr ""
 "Le serveur mandataire HTTP a terminé la connexion de manière inattendue."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Nombre de jetons incorrect (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "Aucun type pour le nom de classe %s"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "Le type %s n’implémente pas l’interface GIcon"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
 msgstr "Le type %s n’est pas classé"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Numéro de version incorrect : %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr ""
 "Le type %s n’implémente pas la fonction from_tokens() de l’interface GIcon"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Impossible de gérer la version fournie du codage de l’icône"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Aucune adresse indiquée"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "La longueur %u est trop importante pour l’adresse"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "L’adresse possède des bits définis au-delà de la longueur du préfixe"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s” as IP address mask"
 msgstr "Impossible d’analyser « %s » comme masque d’adresse 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 "Espace insuffisant pour une adresse de connecteur réseau"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Adresse de connecteur réseau non prise en charge"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "Le flux en entrée n’implémente pas « read »"
 
@@ -1651,129 +1621,122 @@
 #. 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 "Le flux a une opération en cours"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Copier avec le fichier"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Conserver avec le fichier lors du déplacement"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version” takes no arguments"
 msgstr "« version » n’accepte aucun paramètre"
 
-#: ../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 "Utilisation :"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 msgid "Print version information and exit."
 msgstr "Afficher les informations de version et quitter."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[PARAMS...]"
-
-#: ../gio/gio-tool.c:226
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Commandes :"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Concaténer les fichiers vers la sortie standard"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Copier un ou plusieurs fichiers"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Afficher des informations à propos des emplacements"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Énumérer le contenu des emplacements"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "Obtenir ou définir le gestionaire d’un type MIME"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Créer des répertoires"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Surveiller les modifications de fichiers et de répertoires"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Monter ou démonter les emplacements"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Déplacer un ou plusieurs fichiers"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Ouvrir des fichiers avec l’application par défaut"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Renommer un fichier"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Supprimer un ou plusieurs fichiers"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Lire à partir de l’entrée standard et enregistrer"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Définir un attribut de fichier"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Déplacer des fichiers ou répertoires dans la corbeille"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Énumérer le contenu des emplacements dans une arborescence"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "Utilisez %s pour obtenir de l’aide détaillée.\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Erreur lors de l’écriture vers 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: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:1212 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 "EMPLACEMENT"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Concaténer des fichiers et afficher vers la sortie standard."
 
-#: ../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"
@@ -1783,58 +1746,56 @@
 "utilisant des emplacements GIO au lieu de fichiers locaux : par exemple,\n"
 "on peut indiquer un emplacement comme smb://serveur/ressource/fichier.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:1263 gio/gio-tool-open.c:139
+#: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Aucun emplacement indiqué"
 
-#: ../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 "Aucun répertoire cible"
 
-#: ../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 "Afficher la progression"
 
-#: ../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 "Demander avant d’écraser"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Préserver tous les attributs"
 
-#: ../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 "Créer une sauvegarde des fichiers de destination existants"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Ne jamais suivre les liens symboliques"
 
-#: ../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 "%s sur %s transféré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 "SOURCE"
 
 #. 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 "DESTINATION"
 
-#: ../gio/gio-tool-copy.c:103
+#: gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
 msgstr "Copier un ou plusieurs fichiers de SOURCE vers DESTINATION."
 
-#: ../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"
@@ -1844,93 +1805,88 @@
 "utilisant des emplacements GIO au lieu de fichiers locaux : par exemple,\n"
 "on peut indiquer un emplacement comme smb://serveur/ressource/fichier.txt."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "La destination « %s » n’est pas un répertoire"
 
-#: ../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 : écraser « %s » ? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Afficher les attributs en écriture"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Obtenir les informations du système de fichiers"
 
-#: ../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 "Les attributs à obtenir"
 
-#: ../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 "ATTRIBUTS"
 
-#: ../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 "Ne pas suivre les liens symboliques"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "attributs :\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 "nom d’affichage : %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 "nom d’édition : %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "nom : %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "type : %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
 msgstr "taille : "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "caché\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 "Attributs pouvant être définis :\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Espaces de noms des attributs en écriture :\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Afficher des informations à propos des emplacements."
 
-#: ../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"
@@ -1945,23 +1901,23 @@
 "standard::icon), par leur espace de nom (exemple : unix) ou par « * » qui\n"
 "correspond à tous les attributs"
 
-#: ../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 "Afficher les fichiers cachés"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Utiliser une mise en forme de liste étendue"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Afficher les URI complets"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Énumérer le contenu des emplacements."
 
-#: ../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"
@@ -1975,19 +1931,19 @@
 "standard::icon)"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "TYPE_MIME"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "GESTIONNAIRE"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
 msgstr "Obtient ou définit le gestionnaire d’un type 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"
@@ -1997,62 +1953,58 @@
 "et recommandées pour le type MIME. Si un gestionnaire est indiqué, il est\n"
 "défini comme gestionnaire par défaut pour le type MIME."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
 msgstr ""
 "Un seul type MIME doit être indiqué, et potentiellement un gestionnaire"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s”\n"
 msgstr "Aucune application par défaut pour « %s »\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s”: %s\n"
 msgstr "Application par défaut pour « %s » : %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Applications inscrites :\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Aucune application inscrite\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Applications recommandées :\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Aucune application recommandée\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s”"
 msgstr "Le chargement des informations du gestionnaire « %s » a échoué"
 
-#: ../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 ""
 "La définition de « %s » comme gestionnaire par défaut pour « %s » a échoué : "
 "%s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Créer les répertoires parents"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Créer des répertoires."
 
-#: ../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"
@@ -2062,114 +2014,138 @@
 "utilisant des emplacements GIO au lieu de fichiers locaux : par exemple,\n"
 "on peut indiquer un emplacement comme smb://serveur/ressource/répertoire."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Surveille un répertoire (par défaut : en fonction du type)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Surveille un fichier (par défaut : en fonction du type)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 "Surveille un fichier directement (détecte les modifications par liens durs)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr ""
 "Surveille un fichier directement, mais ne signale pas les modifications"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "Signale les déplacements et les renommages comme simples évènements "
 "suppression/création"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Surveille les événements de montage"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
 msgstr "Surveille les modifications de fichiers ou de répertoires."
 
-#: ../gio/gio-tool-mount.c:58
+#: gio/gio-tool-mount.c:63
 msgid "Mount as mountable"
 msgstr "Monter comme montable"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:64
 msgid "Mount volume with device file"
-msgstr "Monter le volume avec un fichier de périphérique"
+msgstr "Monter le volume selon le fichier de périphérique"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:64 gio/gio-tool-mount.c:67
 msgid "DEVICE"
 msgstr "PÉRIPHÉRIQUE"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:65
 msgid "Unmount"
 msgstr "Démonter"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:66
 msgid "Eject"
 msgstr "Éjecter"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
+msgid "Stop drive with device file"
+msgstr "Arrêter le disque selon le fichier de périphérique"
+
+#: gio/gio-tool-mount.c:68
 msgid "Unmount all mounts with the given scheme"
 msgstr "Démonter tous les montages du protocole donné"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:68
 msgid "SCHEME"
 msgstr "PROTOCOLE"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:69
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr ""
 "Ignorer les opérations de fichier en cours lors du démontage ou de l’éjection"
 
-#: ../gio/gio-tool-mount.c:64
+#: gio/gio-tool-mount.c:70
 msgid "Use an anonymous user when authenticating"
 msgstr "Utiliser un utilisateur anonyme lors de l’authentification"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../gio/gio-tool-mount.c:66
+#: gio/gio-tool-mount.c:72
 msgid "List"
 msgstr "Énumérer"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:73
 msgid "Monitor events"
 msgstr "Surveiller les évènements"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:74
 msgid "Show extra information"
 msgstr "Afficher des informations supplémentaires"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#: gio/gio-tool-mount.c:75
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "PIM numérique lors du déverrouillage du volume VeraCrypt"
+
+#: gio/gio-tool-mount.c:75
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Monter un volume caché TCRYPT"
+
+#: gio/gio-tool-mount.c:77
+msgid "Mount a TCRYPT system volume"
+msgstr "Monter un volume système TCRYPT"
+
+#: gio/gio-tool-mount.c:265 gio/gio-tool-mount.c:297
 msgid "Anonymous access denied"
 msgstr "Accès anonyme refusé"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:522
+msgid "No drive for device file"
+msgstr "Aucun disque correspondant au fichier de périphérique"
+
+#: gio/gio-tool-mount.c:975
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s a été monté sur %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: gio/gio-tool-mount.c:1027
 msgid "No volume for device file"
 msgstr "Aucun volume pour le fichier de périphérique"
 
-#: ../gio/gio-tool-mount.c:1145
+#: gio/gio-tool-mount.c:1216
 msgid "Mount or unmount the locations."
 msgstr "Monter ou démonter les emplacements."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Ne pas utiliser la copie ou la suppression de repli"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Déplacer un ou plusieurs fichiers de SOURCE vers DEST."
 
-#: ../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"
@@ -2179,12 +2155,12 @@
 "utilisant des emplacements GIO au lieu de fichiers locaux : par exemple,\n"
 "on peut indiquer un emplacement comme smb://serveur/ressource/fichier.txt"
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "La cible %s n’est pas un répertoire"
 
-#: ../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."
@@ -2192,252 +2168,257 @@
 "Ouvrir les fichiers avec l’application par défaut\n"
 "inscrite pour gérer les fichiers de ce type."
 
-#: ../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 "Ignorer les fichiers non existants, ne jamais demander"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Supprimer les fichiers indiqués."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "NOM"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Renommmer un fichier."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Paramètre manquant"
 
-#: ../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 "Trop de paramètres"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Le renommage a réussi. Nouvel uri : %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Créer seulement s’il n’existe pas"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "Ajouter à la fin du fichier"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Lors de la création, limiter l’accès à l’utilisateur actuel"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr ""
 "Lors d’un remplacement, remplacer comme si la destination n’existait pas"
 
 #. 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 "Afficher le nouvel etag à la fin"
 
 #. 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 "Le etag du fichier en cours d’écrasement"
 
-#: ../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 "Erreur de lecture à partir de l’entrée standard"
 
 #. 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 non disponible\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Lire à partir de l’entrée standard et enregistrer vers DEST."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Aucune destination indiquée"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Type de l’attribut"
 
-#: ../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 "ATTRIBUT"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "VALEUR"
 
-#: ../gio/gio-tool-set.c:93
+#: gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr "Définir un attribut de fichier de l’EMPLACEMENT."
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Emplacement non indiqué"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Attribut non indiqué"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Valeur non indiquée"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s”"
 msgstr "Type d’attribut « %s » non valide"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Vider la corbeille"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Déplacer des fichiers ou des répertoires vers la corbeille."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Suivre les liens symboliques, les montages et les raccourcis"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
 msgstr ""
 "Afficher la liste du contenu de répertoires dans 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 "Élément <%s> interdit dans <%s>"
 
-#: ../gio/glib-compile-resources.c:146
+#: gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Élément <%s> interdit au premier niveau"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "Le fichier %s apparaît plusieurs fois dans la ressource"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s” in any source directory"
 msgstr "La localisation de « %s » dans tous les répertoires source a échoué"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s” in current directory"
 msgstr "La localisation de « %s » dans le répertoire actuel a échoué"
 
-#: ../gio/glib-compile-resources.c:290
+#: gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s”"
 msgstr "Option de traitement inconnue « %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 "La création du fichier temporaire a échoué : %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr ""
+"Un prétraitement %s a été demandé, mais %s n'est pas défini et %s n’est pas "
+"dans le chemin PATH"
 
-#: ../gio/glib-compile-resources.c:382
+#: gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Erreur de lecture du fichier %s : %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Erreur à la compression du fichier %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "<%s> ne peut pas contenir du texte"
 
-#: ../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 "Affiche la version du programme et quitte"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
-msgstr "nom du fichier de sortie"
+#: gio/glib-compile-resources.c:737
+msgid "Name of the output file"
+msgstr "Nom du fichier de sortie"
 
-#: ../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 ""
-"Les répertoires à partir desquels les fichiers seront lus (par défaut le "
-"répertoire actuel)"
+"Les répertoires à partir desquels charger les fichiers référencés dans "
+"FICHIER (par défaut le répertoire actuel)"
 
-#: ../gio/glib-compile-resources.c: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 "RÉPERTOIRE"
 
-#: ../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 ""
 "Générer la sortie dans le format sélectionné par l’extension du nom de "
 "fichier cible"
 
-#: ../gio/glib-compile-resources.c:668
+#: gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Générer l’en-tête de la source"
 
-#: ../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 ""
 "Générer le code source utilisé pour lier vers le fichier ressource dans "
 "votre code"
 
-#: ../gio/glib-compile-resources.c:670
+#: gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Générer la liste des dépendances"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr "nom du fichier des dépendances à générer"
+#: gio/glib-compile-resources.c:743
+msgid "Name of the dependency file to generate"
+msgstr "Nom du fichier de dépendances à générer"
 
-#: ../gio/glib-compile-resources.c:672
+#: gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Inclure les cibles « phony » dans le fichier de dépendances généré"
 
-#: ../gio/glib-compile-resources.c:673
+#: gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "Ne pas créer et enregistrer automatiquement la ressource"
 
-#: ../gio/glib-compile-resources.c:674
+#: gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Ne pas exporter les fonctions ; les déclarer 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 "Nom d’identifiant C utilisé pour le code source généré"
 
-#: ../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"
@@ -2448,124 +2429,123 @@
 "xml\n"
 "et le fichier de ressource possède l’extension .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 "Vous devez indiquer un et un seul nom de fichier\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 "le pseudo doit contenir au minimum 2 caractères"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Valeur numérique non valide"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'> est déjà défini"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "value='%s' a déjà été défini"
 
-#: ../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 "les valeurs de drapeaux doivent avoir au moins un bit défini"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s> doit contenir au moins une <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’est pas contenu dans l’intervalle défini"
 
-#: ../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’est pas un membre valide du type énuméré défini"
 
-#: ../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> contient une chaîne absente du type drapeau défini"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s> contient une chaîne absente de <choices>"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> a déjà été défini pour cette clé"
 
-#: ../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> non autorisé pour les clés de type « %s »"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "le minimum de <range> est plus grand que son maximum"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "catégorie l10n non prise en charge : %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n demandée, mais aucun domaine gettext indiqué"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "contexte de traduction donné pour une valeur sans activation de 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 "L’analyse de la valeur <default> de type « %s » a échoué : "
 
-#: ../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> ne peut pas être défini pour des clés marquées comme étant du type "
 "énuméré"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> a déjà été défini pour cette clé"
 
-#: ../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> non autorisés pour des clés du type « %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'> a déjà été défini"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices> doit contenir au moins un <choice>"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> a déjà été défini pour cette clé"
 
-#: ../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>"
@@ -2573,7 +2553,7 @@
 "<aliases> ne peut être défini que pour des clés de type énuméré ou drapeau, "
 "ou après <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 "
@@ -2582,44 +2562,44 @@
 "<alias value='%s'/> a été donné alors que « %s » est déjà un membre du type "
 "énuméré"
 
-#: ../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'/> a été donné alors que <choice value='%s'/> est déjà "
 "présent"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'/> est déjà défini"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s” is not in enumerated type"
 msgstr "la cible d'alias « %s » n’est pas dans le type énuméré"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s” is not in <choices>"
 msgstr "la cible d'alias « %s » n’est pas dans <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> doit contenir au moins un <alias>"
 
-#: ../gio/glib-compile-schemas.c:786
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "Les noms vides ne sont pas autorisés"
 
-#: ../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 ""
 "Nom « %s » non valide : les noms doivent commencer par une lettre minuscule"
 
-#: ../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 "
@@ -2628,39 +2608,39 @@
 "Nom « %s » non valide : caractère « %c » non valide ; seuls les minuscules, "
 "les nombres et le tiret (« - ») sont autorisés"
 
-#: ../gio/glib-compile-schemas.c:817
+#: gio/glib-compile-schemas.c:829
 #, c-format
 msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted"
 msgstr ""
 "Nom « %s » non valide : deux tirets successifs (« -- ») ne sont pas autorisés"
 
-#: ../gio/glib-compile-schemas.c:826
+#: gio/glib-compile-schemas.c:838
 #, c-format
 msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)"
 msgstr ""
 "Nom « %s » non valide : le dernier caractère ne peut pas être un tiret (« -"
 " »)"
 
-#: ../gio/glib-compile-schemas.c:834
+#: gio/glib-compile-schemas.c:846
 #, c-format
 msgid "Invalid name “%s”: maximum length is 1024"
 msgstr "Nom « %s » non valide : la longueur maximale est 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> a déjà été défini"
 
-#: ../gio/glib-compile-schemas.c:930
+#: gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of” schema"
 msgstr "Impossible d’ajouter des clés à un schéma « list-of »"
 
-#: ../gio/glib-compile-schemas.c:941
+#: gio/glib-compile-schemas.c:955
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> a déjà été défini"
 
-#: ../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> "
@@ -2669,7 +2649,7 @@
 "<key name='%s'> masque <key name='%s'> dans <schema id='%s'> ; utilisez "
 "<override> pour modifier la valeur"
 
-#: ../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 "
@@ -2678,57 +2658,57 @@
 "<key> ne peut recevoir qu’un et un seul attribut parmi « type », « enum » ou "
 "« 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'> pas (encore) défini."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1018
 #, c-format
 msgid "Invalid GVariant type string “%s”"
 msgstr "Chaîne de type GVariant « %s » non valide"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
 msgstr "un <override> est donné mais son schéma n’étend rien du tout"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: gio/glib-compile-schemas.c:1061
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Aucune <key name='%s'> à redéfinir"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> déjà défini"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> déjà défini"
 
-#: ../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'> étend le schéma « %s » qui n’existe pas encore"
 
-#: ../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'> est une liste du schéma « %s » qui n’existe pas encore"
 
-#: ../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 "Un schéma avec un chemin ne peut contenir de liste"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: gio/glib-compile-schemas.c:1188
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Impossible d’étendre un schéma avec un chemin"
 
-#: ../gio/glib-compile-schemas.c: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"
@@ -2736,7 +2716,7 @@
 "<schema id='%s'> est une liste ; elle étend <schema id='%s'> qui n’est pas "
 "une liste"
 
-#: ../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” "
@@ -2745,18 +2725,18 @@
 "<schema id='%s' list-of='%s'> étend <schema id='%s' list-of='%s'> mais "
 "« %s » n’étend pas « %s »"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: gio/glib-compile-schemas.c:1225
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr ""
 "Si un chemin est indiqué, il doit commencer et finir par une barre oblique"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: gio/glib-compile-schemas.c:1232
 #, c-format
 msgid "The path of a list must end with “:/”"
 msgstr "Le chemin d’une liste doit finir par « :/ »"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2765,119 +2745,128 @@
 "Attention : le schéma « %s » comporte le chemin « %s ». Les chemins "
 "commençant par « /apps/ », « /desktop/ » ou « /system/ » sont obsolètes."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> est déjà défini"
 
-#: ../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 "Un seul élément <%s> est autorisé dans <%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 "Élément <%s> interdit au premier niveau"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
 msgstr "Élément <default> obligatoire dans <key>"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: gio/glib-compile-schemas.c:1627
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "<%s> ne peut pas contenir du texte"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: gio/glib-compile-schemas.c:1695
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Attention : reférence indéfinie vers <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 été spécifié ; sortie en cours.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Le fichier complet a été ignoré.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ce fichier est ignoré.\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 ""
 "Aucune clé nommée « %s » dans le schéma « %s » comme défini dans le fichier "
 "« %s » de redéfinition"
 
-#: ../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 " ; la redéfinition de cette clé a été ignorée.\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 " et --strict a été spécifié ; sortie en cours.\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 ""
-"Erreur d’analyse de la clé « %s » dans le schéma « %s » comme défini dans le "
+"impossible de fournir des redéfinitions par bureau pour la clé régionalisée "
+"« %s » dans le schéma « %s » (fichier de redéfinition « %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 ""
+"erreur d’analyse de la clé « %s » dans le schéma « %s » comme défini dans le "
 "fichier « %s » de redéfinition : %s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: gio/glib-compile-schemas.c:2021
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "La redéfinition de cette clé a été ignorée.\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 redéfinition de la clé « %s » dans le schéma « %s » du fichier de "
 "redéfinition « %s » n’est pas dans la plage indiquée par le schéma"
 
-#: ../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 redéfinition de la clé « %s » dans le schéma « %s » du fichier de "
 "redéfinition « %s » n’est pas dans la liste des choix valides"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr "endroit où enregistrer le fichier gschemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr "Annulation en cas d’erreurs dans des schémas"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr "Ne pas écrire de fichier gschema.compiled"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr "Ne pas appliquer les limitations de nom de clé"
 
-#: ../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"
@@ -2887,32 +2876,32 @@
 "L’extension .gschema.xml est requise pour les fichiers schémas,\n"
 "et le fichier cache est nommé gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: gio/glib-compile-schemas.c:2192
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Vous devez indiquer un et un seul nom de répertoire\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Aucun fichier schéma trouvé : "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "aucune action effectuée.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "fichier de sortie existant supprimé.\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 "Nom de fichier non valide : %s"
 
-#: ../gio/glocalfile.c:1105
+#: gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr ""
@@ -2922,322 +2911,329 @@
 #. * 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 "Le point de montage conteneur pour le fichier %s est introuvable"
 
-#: ../gio/glocalfile.c:1267
+#: gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Impossible de renommer le répertoire racine"
 
-#: ../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 "Erreur de renommage du fichier %s : %s"
 
-#: ../gio/glocalfile.c:1292
+#: gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Impossible de renommer le fichier car ce nom est déjà utilisé"
 
-#: ../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 "Nom de fichier non valide"
 
-#: ../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 "Erreur lors de l’ouverture du fichier %s : %s"
 
-#: ../gio/glocalfile.c:1613
+#: gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Erreur lors de la suppression du fichier %s : %s"
 
-#: ../gio/glocalfile.c:1997
+#: gio/glocalfile.c:1925
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Erreur lors de la mise à la corbeille du fichier %s : %s"
 
-#: ../gio/glocalfile.c:2020
+#: gio/glocalfile.c:1948
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Impossible de créer le répertoire de la corbeille %s : %s"
 
-#: ../gio/glocalfile.c:2040
+#: gio/glocalfile.c:1970
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr ""
 "Impossible de trouver le répertoire racine pour mettre %s à la corbeille"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: gio/glocalfile.c:1979
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr ""
+"La mise à la corbeille sur des montages systèmes internes n’est pas prise en "
+"charge"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Impossible de trouver ou créer le répertoire de la corbeille pour %s"
 
-#: ../gio/glocalfile.c:2174
+#: gio/glocalfile.c:2118
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr ""
 "Impossible de créer le fichier d’informations de mise à la corbeille pour "
 "%s : %s"
 
-#: ../gio/glocalfile.c:2233
+#: gio/glocalfile.c:2178
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 "Impossible de mettre à la corbeille le fichier %s au-delà des limites du "
 "système de fichiers"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: gio/glocalfile.c:2182 gio/glocalfile.c:2238
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Impossible de mettre à la corbeille le fichier %s : %s"
 
-#: ../gio/glocalfile.c:2299
+#: gio/glocalfile.c:2244
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Impossible de mettre à la corbeille le fichier %s"
 
-#: ../gio/glocalfile.c:2325
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Erreur lors de la création du répertoire %s : %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Le système de fichiers ne gère pas les liens symboliques"
 
-#: ../gio/glocalfile.c:2357
+#: gio/glocalfile.c:2302
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Erreur lors de la création du lien symbolique %s : %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: gio/glocalfile.c:2308 glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "Liens symboliques non pris en charge"
 
-#: ../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 "Erreur lors du déplacement du fichier %s : %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "Impossible de déplacer un répertoire par dessus un autre"
 
-#: ../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 "La création du fichier de sauvegarde a échoué"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Erreur lors de la suppression du fichier cible : %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "Le déplacement entre points de montage n’est pas pris en charge"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Impossible de déterminer l’utilisation disque de %s : %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "La valeur d’attribut ne doit pas être « NULL »"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Type d’attribut non valide (une chaîne est attendue)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Nom d’attribut étendu non valide"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Erreur lors de la définition de l’attribut étendu « %s » : %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1629
 msgid " (invalid encoding)"
 msgstr " (codage non valide)"
 
-#: ../gio/glocalfileinfo.c:1776 ../gio/glocalfileoutputstream.c:813
+#: gio/glocalfileinfo.c:1793 gio/glocalfileoutputstream.c:813
 #, c-format
 msgid "Error when getting information for file “%s”: %s"
 msgstr "Erreur lors de l’obtention des informations du fichier « %s » : %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: gio/glocalfileinfo.c:2057
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr ""
 "Erreur lors de l’obtention des informations du descripteur de fichier : %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: gio/glocalfileinfo.c:2102
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Type d’attribut non valide (uint32 attendu)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2120
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Type d’attribut non valide (uint64 attendu)"
 
-#: ../gio/glocalfileinfo.c:2120 ../gio/glocalfileinfo.c:2139
+#: gio/glocalfileinfo.c:2139 gio/glocalfileinfo.c:2158
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Type d’attribut non valide (chaîne d’octets attendue)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2205
 msgid "Cannot set permissions on symlinks"
 msgstr "Impossible de définir des permissions sur les liens symboliques"
 
-#: ../gio/glocalfileinfo.c:2200
+#: gio/glocalfileinfo.c:2221
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Erreur lors de la définition des permissions : %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2272
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Erreur lors de la définition du propriétaire : %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2295
 msgid "symlink must be non-NULL"
 msgstr "un lien symbolique ne doit pas être « NULL »"
 
-#: ../gio/glocalfileinfo.c:2284 ../gio/glocalfileinfo.c:2303
-#: ../gio/glocalfileinfo.c:2314
+#: gio/glocalfileinfo.c:2305 gio/glocalfileinfo.c:2324
+#: gio/glocalfileinfo.c:2335
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Erreur lors de la définition du lien symbolique : %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2314
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Erreur lors de la définition du lien symbolique : le fichier n’est pas un "
 "lien symbolique"
 
-#: ../gio/glocalfileinfo.c:2419
+#: gio/glocalfileinfo.c:2440
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr ""
 "Erreur lors de la définition de l’heure de modification ou d’accès : %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: gio/glocalfileinfo.c:2463
 msgid "SELinux context must be non-NULL"
 msgstr "Le contexte SELinux ne doit pas être « NULL »"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2478
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Erreur lors de la définition du contexte SELinux : %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2485
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux n’est pas activé sur ce système"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2577
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "La définition de l’attribut %s n’est pas prise en charge"
 
-#: ../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 "Erreur lors de la lecture du fichier : %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 "Erreur de positionnement dans le fichier : %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 "Erreur lors de la fermeture du fichier : %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr "Impossible de trouver le type de moniteur de fichier local par défaut"
 
-#: ../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 "Erreur lors de l’écriture du fichier : %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Erreur lors de la suppression de l’ancien lien de sauvegarde : %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 "Erreur lors de la création de la copie de sauvegarde : %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Erreur lors du renommage du fichier temporaire : %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 "Erreur lors de la troncature du fichier : %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 "Erreur lors de l’ouverture du fichier « %s » : %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Le fichier cible est un répertoire"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Le fichier cible n’est pas un fichier standard"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "Le fichier a été modifié extérieurement"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Erreur à la suppression de l’ancien fichier : %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Le type GSeekType fourni n’est pas valide"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Requête « seek » non valide"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "Impossible de tronquer GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Le flux de sortie mémoire n’est pas redimensionnable"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Le redimensionnement du flux de sortie mémoire a échoué"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3245,32 +3241,32 @@
 "La quantité de mémoire nécessaire pour effectuer l’écriture est plus grande "
 "que l’espace d’adressage disponible"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "Positionnement demandé avant le début du flux"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "Positionnement demandé après la fin du flux"
 
 #. 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 "mount n’implémente pas le démontage (« 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 "mount n’implémente pas l’éjection (« 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 ""
 "mount n’implémente pas le démontage (« unmount » ou "
@@ -3279,7 +3275,7 @@
 #. 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 ""
 "mount n’implémente pas l’éjection (« eject » ou « eject_with_operation »)"
@@ -3287,101 +3283,100 @@
 #. 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 "mount n’implémente pas le remontage (« 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 "mount n’implémente pas l’estimation du type de contenu"
 
 #. 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 "mount n’implémente pas la supposition d’un type de contenu synchrone"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "Le nom d’hôte « %s » comporte « [ » mais pas « ] »"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Réseau inaccessible"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Hôte inaccessible"
 
-#: ../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 "Impossible de créer le moniteur de réseau : %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "Impossible de créer le moniteur de réseau : "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Impossible d’obtenir le statut du réseau : "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "La version de NetworkManager est trop ancienne"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "Le flux de sortie n’implémente pas « write »"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Le flux source est déjà fermé"
 
-#: ../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 "Erreur de résolution de « %s » : %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Domaine non valide"
 
-#: ../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 "La ressource dans « %s » n’existe pas"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s” failed to decompress"
 msgstr "La décompression de la ressource dans « %s » n’a pas réussi"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s” is not a directory"
 msgstr "La ressource dans « %s » n’est pas un répertoire"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Le flux en entrée n’implémente pas « seek » (le positionnement)"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:501
 msgid "List sections containing resources in an elf FILE"
 msgstr "Énumère les sections contenant les ressources dans un fichier « elf »"
 
-#: ../gio/gresource-tool.c:500
+#: gio/gresource-tool.c:507
 msgid ""
 "List resources\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3391,16 +3386,15 @@
 "Si SECTION est fournie, énumère seulement les ressources de cette section\n"
 "Si CHEMIN est fourni, énumère seulement les ressources correspondantes"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:510 gio/gresource-tool.c:520
 msgid "FILE [PATH]"
 msgstr "FICHIER [CHEMIN]"
 
-#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514
-#: ../gio/gresource-tool.c:521
+#: gio/gresource-tool.c:511 gio/gresource-tool.c:521 gio/gresource-tool.c:528
 msgid "SECTION"
 msgstr "SECTION"
 
-#: ../gio/gresource-tool.c:509
+#: gio/gresource-tool.c:516
 msgid ""
 "List resources with details\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3412,15 +3406,15 @@
 "Si CHEMIN est fourni, énumère seulement les ressources correspondantes\n"
 "Les détails incluent la section, la taille et la compression"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:526
 msgid "Extract a resource file to stdout"
 msgstr "Extrait un fichier ressource vers la sortie standard"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:527
 msgid "FILE PATH"
 msgstr "CHEMIN DU FICHIER"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:541
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3448,7 +3442,7 @@
 "Utilisez « gresource help COMMANDE » pour obtenir de l’aide détaillée.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:555
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3463,20 +3457,20 @@
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:562
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SECTION   Un nom de section elf (facultatif)\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:703
+#: gio/gresource-tool.c:566 gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMMANDE   La commande (facultative) à expliquer\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:572
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr ""
 "  FICHIER      Un fichier elf (un binaire ou une bibliothèque partagée)\n"
 
-#: ../gio/gresource-tool.c:568
+#: gio/gresource-tool.c:575
 msgid ""
 "  FILE      An elf file (a binary or a shared library)\n"
 "            or a compiled resource file\n"
@@ -3484,93 +3478,85 @@
 "  FICHIER      Un fichier elf (un binaire ou une bibliothèque partagée)\n"
 "            ou un fichier ressource compilé\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:579
 msgid "[PATH]"
 msgstr "[CHEMIN]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:581
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr ""
 "  CHEMIN      Un chemin (facultatif) de ressource (peut être partiel)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:582
 msgid "PATH"
 msgstr "CHEMIN"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:584
 msgid "  PATH      A resource path\n"
 msgstr "  CHEMIN      Un chemin de ressource\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 "Le schéma « %s » n’existe pas\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 ""
 "Le schéma « %s » n’est pas réadressable (le chemin ne doit pas être "
 "indiqué)\n"
 
-#: ../gio/gsettings-tool.c:78
+#: gio/gsettings-tool.c:78
 #, c-format
 msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr "Le schéma « %s » est réadressable (le chemin doit être indiqué)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Chemin indiqué vide.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "Un chemin doit commencer par une barre oblique (/)\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "Un chemin doit se terminer par une barre oblique (/)\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Un chemin ne doit pas contenir deux barres obliques à la suite (//)\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 "La valeur donnée est en dehors du domaine de validité\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "La clé ne peut pas être écrite\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Lister les schémas (non-réadressables) installés"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Lister les schémas réadressables installés"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Lister les clés du SCHÉMA"
 
-#: ../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 "SCHÉMA[:CHEMIN]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Lister les enfants du SCHÉMA"
 
-#: ../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"
@@ -3578,49 +3564,48 @@
 "Lister les clés et les valeurs récursivement\n"
 "Si aucun SCHÉMA n’est indiqué, lister toutes les clés\n"
 
-#: ../gio/gsettings-tool.c:607
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHÉMA[:CHEMIN]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Obtenir la valeur de KEY"
 
-#: ../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 "SCHÉMA[:CHEMIN] CLÉ"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Demander la plage de validité des valeurs de la CLÉ"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Demander la description pour la CLÉ"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Définir la valeur de CLÉ à VALEUR"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHÉMA[:CHEMIN] CLÉ VALEUR"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Rétablir CLÉ à sa valeur par défaut"
 
-#: ../gio/gsettings-tool.c:642
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Réinitialiser toutes les clés de SCHÉMA à leurs valeurs par défaut"
 
-#: ../gio/gsettings-tool.c:648
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Tester si CLÉ est inscriptible"
 
-#: ../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"
@@ -3630,11 +3615,11 @@
 "Si CLÉ n’est pas défini, contrôle toutes les clés dans SCHÉMA.\n"
 "Presser ^C pour mettre fin au contrôle.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHÉMA[:CHEMIN] [CLÉ]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3683,7 +3668,7 @@
 "Saisissez « gsettings help COMMANDE » pour une aide détaillée.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3698,12 +3683,12 @@
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr ""
 "  RÉPERTOIRE2SCHÉMA Un répertoire de recherche de schémas supplémentaires\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"
@@ -3711,282 +3696,276 @@
 "  SCHÉMA      Le nom du schéma\n"
 "  CHEMIN      Le chemin, pour les schémas réadressables\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  CLÉ       La clé (optionnelle) dans le schéma\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  CLÉ       La clé dans le schéma\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  VALEUR    La valeur à définir\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "Impossible de charger les schémas depuis %s : %s\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Aucun schéma installé\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Nom de schéma fourni vide\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s”\n"
 msgstr "La clé « %s » n’existe pas\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Connecteur non valide, non initialisé"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Connecteur non valide, l’initialisation a échoué en raison de : %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 msgid "Socket is already closed"
 msgstr "Le connecteur est déjà fermé"
 
-#: ../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 "Entrées/sorties hors délai sur le connecteur"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "création de GSocket à partir du descripteur de fichier : %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 "Impossible de créer le connecteur : %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Indication d’une famille inconnue"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Indication d’un protocole inconnu"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr ""
 "Impossible d’utiliser des opérations datagramme sur un connecteur non "
 "datagramme."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Impossible d’utiliser des opérations datagramme sur un connecteur doté d’un "
 "délai d’expiration."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "impossible d’obtenir l’adresse locale : %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "impossible d’obtenir l’adresse distante : %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "impossible d’écouter : %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Erreur lors de liaison à l’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: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 "Erreur lors de la connexion au groupe 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 "Erreur lors de la déconnexion du groupe multicast : %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
 msgstr "Aucune prise en charge pour le multicast spécifique à la source"
 
-#: ../gio/gsocket.c:2375
+#: gio/gsocket.c:2375
 msgid "Unsupported socket family"
 msgstr "Famille de connecteur réseau non prise en charge"
 
-#: ../gio/gsocket.c:2393
+#: gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "source-specific n’est pas une adresse 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 "Interface introuvable : %s"
 
-#: ../gio/gsocket.c:2427
+#: gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Nom d’interface trop long"
 
-#: ../gio/gsocket.c:2463
+#: gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "Aucune prise en charge pour le multicast IPv4 spécifique à la source"
 
-#: ../gio/gsocket.c:2521
+#: gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "Aucune prise en charge pour le multicast IPv6 spécifique à la source"
 
-#: ../gio/gsocket.c:2730
+#: gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Erreur d’acceptation de la connexion : %s"
 
-#: ../gio/gsocket.c:2854
+#: gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Connexion en cours"
 
-#: ../gio/gsocket.c:2903
+#: gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Impossible d’obtenir l’erreur actuelle : "
 
-#: ../gio/gsocket.c:3073
+#: gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Erreur lors de la réception des données : %s"
 
-#: ../gio/gsocket.c:3268
+#: gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Erreur lors de l’envoi des données : %s"
 
-#: ../gio/gsocket.c:3455
+#: gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Impossible de fermer le connecteur : %s"
 
-#: ../gio/gsocket.c:3536
+#: gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Erreur lors de la fermeture du connecteur : %s"
 
-#: ../gio/gsocket.c:4213
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "En attente de l’état du connecteur : %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 "Erreur d’envoi de message : %s"
 
-#: ../gio/gsocket.c:4711
+#: gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage n’est pas pris en charge par 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 "Erreur lors de la réception du message : %s"
 
-#: ../gio/gsocket.c:5735
+#: gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Impossible de lire les données d’authentification du connecteur : %s"
 
-#: ../gio/gsocket.c:5744
+#: gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials n’est pas implémenté sur ce système d’exploitation"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Impossible de se connecter au serveur mandataire %s : "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Impossible de se connecter à %s : "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "Impossible de se connecter : "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Erreur inconnue à la connexion"
 
-#: ../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 ""
 "L’usage d’un proxy n’est pas pris en charge dans une connexion non-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 "Le protocole du proxy « %s » n’est pas pris en charge."
 
-#: ../gio/gsocketlistener.c:218
+#: gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Le processus d’écoute est déjà fermé"
 
-#: ../gio/gsocketlistener.c:264
+#: gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Le connecteur réseau ajouté est fermé"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4 ne prend pas en charge l’adresse IPv6 « %s »"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "Le nom d’utilisateur est trop long pour le protocole SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "Le nom d’hôte « %s » est trop long pour le protocole SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "Le serveur n’est pas un serveur mandataire SOCKSv4."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "La connexion à travers le serveur SOCKSv4 a été rejetée"
 
-#: ../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 "Le serveur n’est pas un serveur mandataire SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "Le serveur mandataire SOCKSv5 nécessite une authentification."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
@@ -3994,114 +3973,114 @@
 "Le protocole SOCKSv5 nécessite une méthode d’authentification qui n’est pas "
 "prise en charge par GLib."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr ""
 "Le nom d’utilisateur ou le mot de passe est trop long pour le protocole "
 "SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "L’authentification SOCKSv5 a échoué à cause d’un mauvais nom d’utilisateur "
 "ou mot de passe."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "Le nom d’hôte « %s » est trop long pour le protocole SOCKSv5"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "Le serveur mandataire SOCKSv5 utilise un type d’adresse inconnu."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "Erreur interne de serveur mandataire SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "La connexion SOCKSv5 n’est pas autorisée par la règle."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "L’hôte n’est pas accessible à travers le serveur SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "Le réseau n’est pas accessible à travers le proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Connexion à travers le serveur mandataire SOCKSv5 refusée."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr ""
 "Le serveur mandataire SOCKSv5 ne prend pas en charge la commande « connect »."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr ""
 "Le serveur mandataire SOCKSv5 ne prend pas en charge le type d’adresse "
 "fourni."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Erreur inconnue du serveur mandataire SOCKSv5."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Impossible de gérer la version %d du codage GThemedIcon"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "Aucune adresse valide n’a été trouvée"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "Erreur de résolution inverse de « %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 "Aucun enregistrement DNS du type demandé pour « %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 "Impossible temporairement de résoudre « %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 "Erreur de résolution de « %s »"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "Impossible de déchiffrer la clé privée codée-PEM"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "Aucune clé privée codée PEM trouvée"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "Impossible d’analyser la clé privée codée-PEM"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "Aucun certificat codé-PEM trouvé"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "Impossible d’analyser le certificat codé-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."
@@ -4111,7 +4090,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4119,307 +4098,306 @@
 "Plusieurs mots de passe saisis ont été incorrects, votre accès sera bloqué "
 "après quelques échecs de plus."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Le mot de passe saisi est incorrect."
 
-#: ../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] "1 message de contrôle attendu, %d reçu"
 msgstr[1] "1 message de contrôle attendu, %d reçus"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Type de données auxiliaires inattendu"
 
-#: ../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] "Un descripteur de fichier attendu, %d obtenu\n"
 msgstr[1] "Un descripteur de fichier attendu, %d obtenus\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Le descripteur de fichier reçu n’est pas valide"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Erreur lors de l’envoi de l’identification : "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr ""
 "Erreur lors de la vérification de l’activation de SO_PASSCRED pour le "
 "connecteur : %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Erreur lors de l’activation de 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 ""
 "Lecture d’un unique octet attendue à la réception de l’identification, mais "
 "aucun octet lu"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Pas de message de contrôle attendu, %d reçu(s)"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Erreur lors de la désactivation de 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 "Erreur de lecture à partir du descripteur de fichier : %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 "Erreur de fermeture du descripteur de fichier : %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Racine du système de fichiers"
 
-#: ../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 "Erreur d’écriture vers le descripteur de fichier : %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Les adresses abstraites de connecteur réseau de domaine UNIX ne sont pas "
 "prises en charge sur ce système"
 
-#: ../gio/gvolume.c:437
+#: gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "le volume n’implémente pas l’éjection (« 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 ""
 "le volume n’implémente pas l’éjection (« eject » ou « eject_with_operation »)"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Erreur de lecture à partir de l’identificateur : %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 "Erreur de fermeture de l’identificateur : %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Erreur lors de l’écriture vers l’identificateur : %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Mémoire insuffisante"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "Erreur interne : %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Entrée nécessitant plus de données"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Données compressées non valides"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Adresse à écouter"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Ignoré, pour compatibilité avec GTestDbus"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Imprimer l’adresse"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Imprimer l’adresse en mode shell"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Exécuter un service dbus"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Arguments incorrects\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Attribut « %s » inattendu pour l’élément « %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:955
 #, c-format
 msgid "Attribute “%s” of element “%s” not found"
 msgstr "L’attribut « %s » de l’élément « %s » est introuvable"
 
-#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
-#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
+#: glib/gbookmarkfile.c:1164 glib/gbookmarkfile.c:1229
+#: glib/gbookmarkfile.c:1293 glib/gbookmarkfile.c:1303
 #, c-format
 msgid "Unexpected tag “%s”, tag “%s” expected"
 msgstr "Balise « %s » inattendue. La balise « %s » était attendue"
 
-#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
-#: ../glib/gbookmarkfile.c:1230
+#: glib/gbookmarkfile.c:1189 glib/gbookmarkfile.c:1203
+#: glib/gbookmarkfile.c:1271 glib/gbookmarkfile.c:1317
 #, c-format
 msgid "Unexpected tag “%s” inside “%s”"
 msgstr "Balise « %s » inattendue à l’intérieur de « %s »"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1813
 msgid "No valid bookmark file found in data dirs"
 msgstr ""
 "Impossible de trouver un fichier de signets valide dans les répertoires de "
 "données"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:2014
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Un signet pour l’URI « %s » existe déjà"
 
-#: ../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:2060 glib/gbookmarkfile.c:2218
+#: glib/gbookmarkfile.c:2303 glib/gbookmarkfile.c:2383
+#: glib/gbookmarkfile.c:2468 glib/gbookmarkfile.c:2551
+#: glib/gbookmarkfile.c:2629 glib/gbookmarkfile.c:2708
+#: glib/gbookmarkfile.c:2750 glib/gbookmarkfile.c:2847
+#: glib/gbookmarkfile.c:2968 glib/gbookmarkfile.c:3158
+#: glib/gbookmarkfile.c:3234 glib/gbookmarkfile.c:3402
+#: glib/gbookmarkfile.c:3491 glib/gbookmarkfile.c:3580
+#: glib/gbookmarkfile.c:3696
 #, c-format
 msgid "No bookmark found for URI “%s”"
 msgstr "Aucun signet trouvé pour l’URI « %s »"
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2392
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Aucun type MIME défini dans le signet pour l’URI « %s »"
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2477
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "Aucun indicateur privé n’est défini dans le signet pour l’URI « %s »"
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2856
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "Aucun groupe n’est défini dans le signet pour l’URI « %s »"
 
-#: ../glib/gbookmarkfile.c:3199 ../glib/gbookmarkfile.c:3356
+#: glib/gbookmarkfile.c:3255 glib/gbookmarkfile.c:3412
 #, c-format
 msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr "Aucune application nommée « %s » n’a enregistré un signet pour « %s »"
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3435
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr ""
 "Échec du développement de la ligne de commande « %s » pour l’URI « %s »"
 
-#: ../glib/gconvert.c:473
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "Caractère non affichable dans l’entrée du convertisseur"
 
-#: ../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 "Séquence de caractères incomplète en fin d’entrée"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr ""
 "Impossible de convertir le caractère de repli « %s » dans le jeu de codes "
 "« %s »"
 
-#: ../glib/gconvert.c:940
+#: glib/gconvert.c:940
 msgid "Embedded NUL byte in conversion input"
 msgstr "Octet nul imbriqué dans l’entrée du convertisseur"
 
-#: ../glib/gconvert.c:961
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "Octet nul imbriqué dans la sortie du convertisseur"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "L’URI « %s » n’est pas une URI absolue utilisant le protocole « file »"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "L’URI de fichier local « %s » ne peut pas inclure un caractère « # »"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "L’URI « %s » n’est pas valide"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "Le nom d’hôte de l’URI « %s » n’est pas valide"
 
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "L’URI « %s » contient des caractères d’échappement incorrects"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 msgid "The pathname “%s” is not an absolute path"
 msgstr "Le nom de chemin « %s » n’est pas un chemin absolu"
 
 #. 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"
@@ -4440,62 +4418,62 @@
 #. * 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 "janvier"
 
-#: ../glib/gdatetime.c:253
+#: glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "février"
 
-#: ../glib/gdatetime.c:255
+#: glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "mars"
 
-#: ../glib/gdatetime.c:257
+#: glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "avril"
 
-#: ../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 "juin"
 
-#: ../glib/gdatetime.c:263
+#: glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "juillet"
 
-#: ../glib/gdatetime.c:265
+#: glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "août"
 
-#: ../glib/gdatetime.c:267
+#: glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "septembre"
 
-#: ../glib/gdatetime.c:269
+#: glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "octobre"
 
-#: ../glib/gdatetime.c:271
+#: glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "novembre"
 
-#: ../glib/gdatetime.c:273
+#: glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "décembre"
@@ -4517,132 +4495,132 @@
 #. * 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 "janv."
 
-#: ../glib/gdatetime.c:307
+#: glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "févr."
 
-#: ../glib/gdatetime.c:309
+#: glib/gdatetime.c:319
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "mars"
 
-#: ../glib/gdatetime.c:311
+#: glib/gdatetime.c:321
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "avril"
 
-#: ../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 "juin"
 
-#: ../glib/gdatetime.c:317
+#: glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "juil."
 
-#: ../glib/gdatetime.c:319
+#: glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "août"
 
-#: ../glib/gdatetime.c:321
+#: glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "sept."
 
-#: ../glib/gdatetime.c:323
+#: glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "oct."
 
-#: ../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 "déc."
 
-#: ../glib/gdatetime.c:342
+#: glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "lundi"
 
-#: ../glib/gdatetime.c:344
+#: glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "mardi"
 
-#: ../glib/gdatetime.c:346
+#: glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "mercredi"
 
-#: ../glib/gdatetime.c:348
+#: glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "jeudi"
 
-#: ../glib/gdatetime.c:350
+#: glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "vendredi"
 
-#: ../glib/gdatetime.c:352
+#: glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "samedi"
 
-#: ../glib/gdatetime.c:354
+#: glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "dimanche"
 
-#: ../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 "mer."
 
-#: ../glib/gdatetime.c:375
+#: glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "jeu."
 
-#: ../glib/gdatetime.c:377
+#: glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "ven."
 
-#: ../glib/gdatetime.c:379
+#: glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "sam."
 
-#: ../glib/gdatetime.c:381
+#: glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "dim."
@@ -4664,62 +4642,62 @@
 #. * (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 "janvier"
 
-#: ../glib/gdatetime.c:443
+#: glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "février"
 
-#: ../glib/gdatetime.c:445
+#: glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "mars"
 
-#: ../glib/gdatetime.c:447
+#: glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "avril"
 
-#: ../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 "juin"
 
-#: ../glib/gdatetime.c:453
+#: glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "juillet"
 
-#: ../glib/gdatetime.c:455
+#: glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "août"
 
-#: ../glib/gdatetime.c:457
+#: glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "septembre"
 
-#: ../glib/gdatetime.c:459
+#: glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "octobre"
 
-#: ../glib/gdatetime.c:461
+#: glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "novembre"
 
-#: ../glib/gdatetime.c:463
+#: glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "décembre"
@@ -4741,200 +4719,199 @@
 #. * 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 "janv."
 
-#: ../glib/gdatetime.c:526
+#: glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "févr."
 
-#: ../glib/gdatetime.c:528
+#: glib/gdatetime.c:546
 msgctxt "abbreviated month name with day"
 msgid "Mar"
 msgstr "mars"
 
-#: ../glib/gdatetime.c:530
+#: glib/gdatetime.c:548
 msgctxt "abbreviated month name with day"
 msgid "Apr"
 msgstr "avril"
 
-#: ../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 "juin"
 
-#: ../glib/gdatetime.c:536
+#: glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "juil."
 
-#: ../glib/gdatetime.c:538
+#: glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "août"
 
-#: ../glib/gdatetime.c:540
+#: glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "sept."
 
-#: ../glib/gdatetime.c:542
+#: glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "oct."
 
-#: ../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 "déc."
 
 #. 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 "Erreur à l’ouverture du répertoire « %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] "Impossible d’allouer %lu octet pour lire le fichier « %s »"
 msgstr[1] "Impossible d’allouer %lu octets pour lire le fichier « %s »"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "Erreur de lecture du fichier « %s » : %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s” is too large"
 msgstr "Le fichier « %s » est trop grand"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "La lecture depuis le fichier « %s » a échoué : %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 "L’ouverture du fichier « %s » a échoué : %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr ""
 "L’obtention des attributs du fichier « %s » a échoué : échec de fstat() : %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr "L’ouverture du fichier « %s » a échoué : échec de fdopen() : %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr ""
 "Le renommage du fichier « %s » vers « %s » a échoué : échec de g_rename() : "
 "%s"
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: glib/gfileutils.c:1057 glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s”: %s"
 msgstr "La création du fichier « %s » a échoué : %s"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr "L’écriture dans le fichier « %s » a échoué : échec de write() : %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr "L’écriture dans le fichier « %s » a échoué : échec de fsync() : %s"
 
-#: ../glib/gfileutils.c:1251
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr ""
 "Le fichier existant « %s » ne peut pas être supprimé : échec de g_unlink() : "
 "%s"
 
-#: ../glib/gfileutils.c:1530
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr ""
 "Le modèle « %s » n’est pas valide, il ne devrait pas contenir un « %s »"
 
-#: ../glib/gfileutils.c:1543
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Le modèle « %s » ne contient pas XXXXXX"
 
-#: ../glib/gfileutils.c:2105
+#: glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "La lecture du lien symbolique « %s » a échoué : %s"
 
-#: ../glib/giochannel.c:1389
+#: glib/giochannel.c:1389
 #, c-format
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Impossible d’ouvrir le convertisseur de « %s » vers « %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 ""
 "Lecture de données brutes impossible dans 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 "Données restantes non converties dans le tampon de lecture"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "La canal se termine avec un caractère partiel"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Lecture de données brutes impossible dans 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 ""
 "Impossible de trouver un fichier de clés valide dans les répertoires de "
 "recherche"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "N’est pas un fichier standard"
 
-#: ../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"
@@ -4942,46 +4919,46 @@
 "Le fichier de clés contient la ligne « %s » qui n’est ni une paire de "
 "valeurs de clé, ni un groupe, ni un commentaire"
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Nom de groupe non valide : %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Le fichier de clés ne débute pas par un groupe"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Nom de clé non valide : %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr ""
 "Le fichier de clés contient un codage de caractères non pris en charge « %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 "Le fichier de clés n’a pas de groupe « %s »"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Le fichier de clés ne contient pas de clé « %s » dans le groupe « %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 ""
 "Le fichier de clés contient la clé « %s » avec la valeur « %s » qui n’est "
 "pas codé en 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."
@@ -4989,7 +4966,7 @@
 "Le fichier de clés contient la clé « %s » dont une valeur est impossible à "
 "interpréter."
 
-#: ../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 "
@@ -4998,168 +4975,168 @@
 "Le fichier de clés contient la clé « %s » dans le groupe « %s » qui a une "
 "valeur impossible à interpréter."
 
-#: ../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 clé « %s » dans le groupe « %s » a une valeur « %s » alors que %s était "
 "attendu"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Le fichier de clés contient un caractère d’échappement en fin de ligne"
 
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr ""
 "Le fichier de clés contient une séquence d’échappement non valide « %s »"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "La valeur « %s » ne peut pas être interprétée comme un nombre."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "La valeur entière « %s » est hors plage"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr ""
 "La valeur « %s » ne peut pas être interprétée comme un nombre à virgule "
 "flottante."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "La valeur « %s » ne peut pas être interprétée comme un booléen."
 
-#: ../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 ""
 "L’obtention des attributs du fichier « %s%s%s%s » a échoué : échec de "
 "fstat() : %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "Le mappage %s%s%s%s a échoué : échec de mmap() : %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "L’ouverture du fichier « %s » a échoué : échec de open() : %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 "Erreur à la ligne %d, caractère %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 "Codage UTF-8 non valide dans le nom — « %s » n’est pas valide"
 
-#: ../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 » n’est pas un nom valide"
 
-#: ../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 » n’est pas un nom valide : « %c »"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Erreur à la ligne %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 ""
 "Échec de l’analyse de « %-.*s » qui devrait être un nombre dans la plage de "
 "référence des caractères (&#234; par exemple) — peut-être que le nombre est "
 "trop grand"
 
-#: ../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 ""
 "La référence du caractère ne se termine pas par un point-virgule ; vous avez "
 "vraisemblablement utilisé une esperluette sans intention d’écrire une entité "
 "— échappez l’esperluette avec &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 "La référence au caractère « %-.*s » ne code pas un caractère autorisé"
 
-#: ../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 ""
-"Entité vide « &; » rencontrée : les entités valides sont : &amp; &quot; &lt; "
+"Entité vide « &; » rencontrée ; les entités valides sont : &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 "L’entité nommée « %-.*s » est inconnue"
 
-#: ../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 ""
 "L’entité ne se termine pas par un point-virgule ; vous avez probablement "
 "utilisé une esperluette sans intention d’écrire une entité — échappez "
 "l’esperluette avec &amp;"
 
-#: ../glib/gmarkup.c:1170
+#: glib/gmarkup.c:1182
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Le document doit commencer avec un élément (par ex. <book>)"
 
-#: ../glib/gmarkup.c: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 » n’est pas un caractère valide à la suite du caractère « < » ; il ne "
 "semble pas commencer un nom d’élément"
 
-#: ../glib/gmarkup.c: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 ""
 "Caractère anormal « %s », un caractère « > » est requis pour terminer la "
 "balise d’élément vide « %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 ""
 "Caractère anormal « %s », un caractère « = » est requis après le nom de "
 "l’attribut « %s » de l’élément « %s »"
 
-#: ../glib/gmarkup.c: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 ""
 "Caractère anormal « %s », il est requis un caractère « > » ou « / », ou "
@@ -5167,64 +5144,64 @@
 "« %s » ; peut-être avez-vous utilisé un caractère non valide dans un nom "
 "d’attribut"
 
-#: ../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 ""
 "Caractère anormal « %s », un guillemet d’ouverture après le signe égal est "
 "requis quand on affecte une valeur à l’attribut « %s » de l’élément « %s »"
 
-#: ../glib/gmarkup.c: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 » n’est pas un caractère valide à la suite des caractères « </ » ; "
 "« %s » ne peut pas commencer un nom d’élément"
 
-#: ../glib/gmarkup.c: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 » n’est pas un caractère valide à la suite du nom d’élément « %s » à "
 "fermer ; le caractère autorisé est « > »"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
+msgid "Element “%s” was closed, no element is currently open"
 msgstr "L’élément « %s » a été fermé, aucun élément n’est actuellement ouvert"
 
-#: ../glib/gmarkup.c: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 ""
 "L’élément « %s » a été fermé, mais l’élément actuellement ouvert est « %s »"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 msgid "Document was empty or contained only whitespace"
 msgstr "Le document était vide ou ne contenait que des espaces"
 
-#: ../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 ""
 "Le document s’est terminé de manière inattendue juste après un crochet "
 "ouvrant « < »"
 
-#: ../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 ""
 "Le document s’est terminé de manière inattendue avec des éléments encore "
 "ouverts — « %s » était le dernier élément ouvert"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5233,25 +5210,25 @@
 "Le document s’est terminé de manière inattendue, un crochet fermant pour la "
 "balise <%s/> est requis"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr ""
 "Le document s’est terminé de manière inattendue à l’intérieur d’un nom "
 "d’élément"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr ""
 "Le document s’est terminé de manière inattendue à l’intérieur d’un nom "
 "d’attribut"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr ""
 "Le document s’est terminé de manière inattendue à l’intérieur d’une balise "
 "d’ouverture d’élément."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1825
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5259,323 +5236,330 @@
 "Le document s’est terminé de manière inattendue après le signe égal suivant "
 "un nom d’attribut ; aucune valeur d’attribut"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr ""
 "Le document s’est terminé de manière inattendue alors qu’il était à "
 "l’intérieur d’une valeur d’attribut"
 
-#: ../glib/gmarkup.c: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 ""
 "Le document s’est terminé de manière inattendue à l’intérieur de la balise "
 "de fermeture pour l’élément « %s »"
 
-#: ../glib/gmarkup.c:1842
+#: glib/gmarkup.c:1853
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
+msgstr ""
+"Le document s’est terminé de manière inattendue à l’intérieur de la balise "
+"de fermeture pour un élément non ouvert"
+
+#: glib/gmarkup.c:1859
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Le document s’est terminé de manière inattendue à l’intérieur d’un "
 "commentaire ou d’une instruction de traitement"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[OPTION…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Options de l’aide :"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Affiche les options de l’aide"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Affiche toutes les options de l’aide"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Options de l’application :"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Options :"
 
-#: ../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 "Impossible d’analyser la valeur entière « %s » pour %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 "La valeur entière « %s » pour %s est hors plage"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s” for %s"
 msgstr "Impossible d’analyser la valeur double « %s » pour %s"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s” for %s out of range"
 msgstr "La valeur double « %s » pour %s est hors plage"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Erreur lors de l’analyse de l’option %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 "Argument manquant pour %s"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Option inconnue %s"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "objet endommagé"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "erreur interne ou objet endommagé"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "mémoire insuffisante"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "limite de suivi arrière atteinte"
 
-#: ../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 ""
 "le motif contient des éléments non pris en charge pour une correspondance "
 "partielle"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "erreur interne"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "les références inverses utilisées comme conditions ne sont pas prises en "
 "charge pour une correspondance partielle"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "limite de récursivité atteinte"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "combinaison de marqueurs de nouvelle ligne non valide"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "mauvais décalage"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "utf8 court"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "boucle récursive"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ à la fin du motif"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c à la fin du motif"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "un caractère non reconnu suit \\"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "nombres en désordre dans le quantificateur {}"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "nombre trop grand dans le quantificateur {}"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "caractère terminaison ] manquant pour la classe de caractère"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "séquence d’échappement non valide dans la classe de caractère"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "plage déclassée dans la classe de caractère"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "rien à répéter"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "répétition inattendue"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "caractère non reconnu après (? ou (?-"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr ""
 "Les classes nommées selon la norme POSIX sont uniquement prises en charge "
 "dans une classe"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr ") de terminaison manquante"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "référence à un sous-motif inexistant"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "« ) » manquante après un commentaire"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "l’expression régulière est trop grande"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "l’obtention de la mémoire a échoué"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") sans ( d’ouverture"
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "dépassement de code"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "caractère non reconnu après (?<"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "l’assertion « lookbehind » n’a pas de longueur fixe"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "nom ou nombre non conforme après (?("
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "un groupe conditionnel contient plus de deux branches"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "une assertion est attendue après (?("
 
 #. 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 » ou « (?[+-]chiffres » doivent être suivis d’une « ) »"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "nom de classe POSIX inconnu"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "les éléments d’interclassement POSIX ne sont pas pris en charge"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "la valeur du caractère dans la séquence \\x{...} est trop grande"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "condition (?(0) non valide"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C n’est pas autorisé dans l’assertion « lookbehind »"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr ""
 "les échappements \\L, \\l, \\N{name}, \\U et \\u ne sont pas pris en charge"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "un appel récursif peut effectuer des boucles indéfiniment"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "caractère non reconnu après (?P"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "terminaison manquante dans le nom du sous-motif"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "deux sous-motifs nommés possèdent le même nom"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "séquence \\P ou \\p mal formée"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "nom de propriété inconnu après \\P ou \\p"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "le nom du sous-motif est trop long (32 caractères maximum)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "trop de sous-motifs nommés (10 000 maximum)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "la valeur octale est plus grande que \\377"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "dépassement de capacité en compilant l’espace de travail"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "un sous-motif référencé et précédemment vérifié n’a pas été trouvé"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "le groupe DEFINE contient plus d’une branche"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "options NEWLINE inconsistantes"
 
-#: ../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"
@@ -5583,292 +5567,297 @@
 "\\g n’est pas suivi d’un nom ou nombre entre accolades, chevrons, guillemets "
 "simples ou d’un nombre simple"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "une référence numérotée ne doit pas être zéro"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "un argument n’est pas permis pour (*ACCEPT), (*FAIL) ou (*COMMIT)"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) non reconnu"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "le nombre est trop grand"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "nom de sous-motif manquant après (?&"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "chiffre attendu après (?+"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
 "] est un caractère de données invalide en mode de compatibilité JavaScript"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr ""
 "il n’est pas permis d’avoir des noms différents pour des sous-motifs du même "
 "nombre"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) doit avoir un argument"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "\\c doit être suivi d’un caractère ASCII"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "\\k n’est pas suivi d’un nom entre accolades, chevrons ou guillemets simples"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N n’est pas pris en charge dans une classe"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "trop de références en avant"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "le nom est trop long dans (*MARK), (*PRUNE), (*SKIP) ou (*THEN)"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "la valeur du caractère dans la séquence \\u.... est trop grande"
 
-#: ../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 "Erreur lors de la correspondance de l’expression régulière %s : %s"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "La bibliothèque PCRE est compilée sans la prise en charge UTF-8"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr ""
 "La bibliothèque PCRE est compilée sans la prise en charge des propriétés "
 "UTF-8"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "La bibliothèque PCRE est compilée avec des options incompatibles"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Erreur lors de l’optimisation de l’expression régulière %s : %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr ""
 "Erreur à la compilation de l’expression régulière %s au caractère %d : %s"
 
-#: ../glib/gregex.c:2413
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}” expected"
 msgstr "chiffre hexadécimal ou « } » attendu"
 
-#: ../glib/gregex.c:2429
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "chiffre hexadécimal attendu"
 
-#: ../glib/gregex.c:2469
+#: glib/gregex.c:2475
 msgid "missing “<” in symbolic reference"
 msgstr "« < » manquant dans la référence symbolique"
 
-#: ../glib/gregex.c:2478
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "référence symbolique non terminée"
 
-#: ../glib/gregex.c:2485
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "référence symbolique de longueur nulle"
 
-#: ../glib/gregex.c:2496
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "chiffre attendu"
 
-#: ../glib/gregex.c:2514
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "référence symbolique illégale"
 
-#: ../glib/gregex.c:2576
+#: glib/gregex.c:2582
 msgid "stray final “\\”"
 msgstr "terminaison parasite « \\ »"
 
-#: ../glib/gregex.c:2580
+#: glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "séquence d’échappement inconnue"
 
-#: ../glib/gregex.c:2590
+#: glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr ""
 "Erreur lors de l’analyse du texte de substitution « %s » au caractère %lu : "
 "%s"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Le texte cité ne commence pas par des guillemets"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Guillemets de fermeture introuvables dans la ligne de commande ou autre "
 "texte rapporté"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr ""
 "Le texte s’est terminé juste après un caractère « \\ » (le texte était "
 "« %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 ""
 "Le texte s’est terminé avant que des guillemets correspondants ne soient "
 "rencontrés pour %c (le texte était « %s »)."
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Le texte était vide (ou ne contenait que des espaces)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "La lecture des données depuis le processus fils a échoué (%s)"
 
-#: ../glib/gspawn.c:401
+#: glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Erreur inattendue dans select() à la lecture des données depuis un processus "
 "fils (%s)"
 
-#: ../glib/gspawn.c:486
+#: glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Erreur inattendue dans 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 "Le processus fils s’est terminé avec le code %ld"
 
-#: ../glib/gspawn.c:905
+#: glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Le processus fils a été tué par le signal %ld"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Le processus fils a été arrêté par le signal %ld"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Le processus fils s’est terminé anormalement"
 
-#: ../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 "La lecture depuis un tube fils a échoué (%s)"
 
-#: ../glib/gspawn.c:1394
+#: glib/gspawn.c:1596
+#, c-format
+msgid "Failed to spawn child process “%s” (%s)"
+msgstr "L’exécution du processus fils « %s » a échoué (%s)"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Le clonage a échoué (%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 "Le changement de répertoire « %s » a échoué (%s)"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "L’exécution du processus fils « %s » a échoué (%s)"
 
-#: ../glib/gspawn.c:1563
+#: glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 "La redirection de la sortie ou de l’entrée du processus fils a échoué (%s)"
 
-#: ../glib/gspawn.c:1572
+#: glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Le clonage du processus fils a échoué (%s)"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s”"
 msgstr "Erreur inconnue à l’exécution du processus fils « %s »"
 
-#: ../glib/gspawn.c:1604
+#: glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Impossible de lire suffisamment de données depuis le tube du processus fils "
 "de pid (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "La lecture des données depuis le processus fils a échoué"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "La création du tube de communication avec le processus fils a échoué (%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 "L’exécution du processus fils a échoué (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Nom de programme non valide : %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 "Chaîne non valide dans l’argument vecteur à %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 "Chaîne non valide dans l’environnement : %s"
 
-#: ../glib/gspawn-win32.c:716
+#: glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Répertoire de travail non valide : %s"
 
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "L’exécution du programme d’aide a échoué (%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"
@@ -5876,170 +5865,170 @@
 "Erreur inattendue dans g_io_channel_win32_poll() lors de la lecture des "
 "données depuis un processus fils"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "Une chaîne vide n’est pas un nombre"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s” is not a signed number"
 msgstr "« %s » n’est pas un nom valide"
 
-#: ../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 "Le nombre « %s » est hors limites [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s” is not an unsigned number"
 msgstr "« %s » n’est pas un nombre non signé"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Impossible d’allouer de la mémoire"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Caractère hors plage pour 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 "Séquence non valide dans l’entrée du convertisseur"
 
-#: ../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 "Caractère hors plage pour UTF-16"
 
-#: ../glib/gutils.c:2229
+#: glib/gutils.c:2244
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f ko"
 
-#: ../glib/gutils.c:2230 ../glib/gutils.c:2436
+#: glib/gutils.c:2245 glib/gutils.c:2451
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f Mo"
 
-#: ../glib/gutils.c:2231 ../glib/gutils.c:2441
+#: glib/gutils.c:2246 glib/gutils.c:2456
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f Go"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2446
+#: glib/gutils.c:2247 glib/gutils.c:2461
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f To"
 
-#: ../glib/gutils.c:2233 ../glib/gutils.c:2451
+#: glib/gutils.c:2248 glib/gutils.c:2466
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f Po"
 
-#: ../glib/gutils.c:2234 ../glib/gutils.c:2456
+#: glib/gutils.c:2249 glib/gutils.c:2471
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f Eo"
 
-#: ../glib/gutils.c:2237
+#: glib/gutils.c:2252
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f Kio"
 
-#: ../glib/gutils.c:2238
+#: glib/gutils.c:2253
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f Mio"
 
-#: ../glib/gutils.c:2239
+#: glib/gutils.c:2254
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f Gio"
 
-#: ../glib/gutils.c:2240
+#: glib/gutils.c:2255
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f Tio"
 
-#: ../glib/gutils.c:2241
+#: glib/gutils.c:2256
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f Pio"
 
-#: ../glib/gutils.c:2242
+#: glib/gutils.c:2257
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f Eio"
 
-#: ../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 octet"
 msgstr[1] "%u octets"
 
-#: ../glib/gutils.c:2296
+#: glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -6047,7 +6036,7 @@
 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"
@@ -6055,7 +6044,7 @@
 msgstr[1] "%s octets"
 
 #. 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"
@@ -6067,7 +6056,7 @@
 #. * 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 Ko"
diff --git a/po/fur.po b/po/fur.po
index 4c2b027..68c080f 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 ""
+msgstr "Un sot-arbul al è za espuartât par %s"
 
-#: ../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"
-
-#: ../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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 
 #: ../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 @@
 "\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 @@
 "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: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 "Erôr: Destinazion no specificade\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 "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 @@
 "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 @@
 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 @@
 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 @@
 #. * 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 @@
 
 #: ../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 @@
 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 @@
 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 @@
 
 #: ../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 @@
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 #: ../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 @@
 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 @@
 
 #: ../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 @@
 #: ../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 @@
 
 #. 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 @@
 #: ../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 @@
 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 @@
 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 @@
 #: ../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 @@
 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 ""
-"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 ""
 
-#: ../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 ""
+
+#: ../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 @@
 #. * 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 @@
 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 @@
 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 @@
 #. 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 @@
 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 @@
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 #: ../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 @@
 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 @@
 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 @@
 #: ../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 @@
 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 @@
 
 #: ../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 @@
 #: ../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 @@
 
 #: ../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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #. * 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 @@
 #. * 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 @@
 #. * (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 @@
 #. * 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 @@
 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 @@
 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 @@
 
 #: ../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 @@
 #: ../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 @@
 #: ../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 @@
 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 @@
 
 #: ../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 @@
 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 @@
 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 @@
 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 @@
 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[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[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 @@
 #. * 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 afbff72..f9c42fe 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-30 18:46+0000\n"
+"PO-Revision-Date: 2018-08-05 23:25+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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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,153 @@
 "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"
+"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”"
 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"
 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"
 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”"
 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"
 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 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”"
 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”"
 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"
 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 +745,7 @@
 "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 +753,7 @@
 "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 +761,12 @@
 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 +775,17 @@
 "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 +798,7 @@
 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 +807,19 @@
 "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 +828,25 @@
 "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 +860,35 @@
 "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 +897,42 @@
 "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 +940,30 @@
 "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 +986,60 @@
 "\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 +1048,161 @@
 "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 +1210,133 @@
 "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 +1344,205 @@
 #. * 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 +1552,122 @@
 #. 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 +1677,56 @@
 "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 +1736,88 @@
 "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 +1831,23 @@
 "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 +1860,19 @@
 "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 +1882,55 @@
 "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 +1940,137 @@
 "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 "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
+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 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 +2080,12 @@
 "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 +2093,249 @@
 "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"
+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 "
+"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 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"
+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 +2345,123 @@
 "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 +2469,50 @@
 "<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 +2521,38 @@
 "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 +2561,7 @@
 "<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 +2570,56 @@
 "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 +2627,7 @@
 "<schema id='%s'> yra sฤ…rašas, išpleฤiantis <schema id='%s'>, kuris nฤ—ra "
 "sฤ…rašas"
 
-#: ../gio/glib-compile-schemas.c: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 +2636,17 @@
 "<schema id='%s' list-of='%s'> išpleฤia <schema id='%s' list-of='%s'>, bet "
 "„%s“ neišpleฤia „%s“"
 
-#: ../gio/glib-compile-schemas.c: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 +2655,126 @@
 "ฤฎ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”"
 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."
+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 "
+"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 "
+"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 +2784,32 @@
 "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 +2818,318 @@
 #. * 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 "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 +3137,32 @@
 "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 +3171,7 @@
 #. 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 +3180,100 @@
 #. 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 +3283,15 @@
 "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 +3303,15 @@
 "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 +3339,7 @@
 "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 +3354,20 @@
 "%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 +3375,82 @@
 "  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 +3458,48 @@
 "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 +3509,11 @@
 "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 +3561,7 @@
 "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 +3576,11 @@
 "%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 +3588,380 @@
 "  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 +3971,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4002,11 +3979,11 @@
 "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 +3991,11 @@
 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 +4003,274 @@
 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 +4291,62 @@
 #. * 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 +4368,132 @@
 #. * 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 +4515,62 @@
 #. * (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 +4592,84 @@
 #. * 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 +4677,106 @@
 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 +4784,49 @@
 "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 +4835,223 @@
 "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”"
 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"
 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”"
 msgstr "„%s“ nฤ—ra tinkamas vardas: „%c“"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Klaida eilutฤ—je %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 ""
 "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: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 ""
 "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:725
 #, c-format
-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: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 ""
 "Aptiktas tušฤias elementas '&;'; galimi elementai yra: &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 "Elemento vardas „%-.*s“ neลพinomas"
 
-#: ../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 ""
 "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:1182
 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: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“ negali bลซti rašomas po „<“ simbolio; jis nepradeda jokio elemento vardo"
 
-#: ../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 ""
 "Neฤฏprastas simbolis „%s“, tikฤ—tasi sulaukti „>“ simbolio, uลพbaigianฤio "
 "tušฤiฤ… ลพymฤ… „%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 ""
 "Neฤฏprastas simbolis „%1$s“, tikฤ—tasi sulaukti „=“ po elemento „%3$s“ "
 "atributo vardo „%2$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 ""
 "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: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 ""
 "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: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“ 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: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“ negali bลซti rašomas po uลพdaranฤio elemento vardo „%s“; leistinas "
 "simbolis yra „>“"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
 #, c-format
-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: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 ""
 "Sutiktas elemento „%s“ uลพdarymo simbolis, taฤiau šiuo metu atidarytas kitas "
 "elementas „%s“"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 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:1786
+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: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 ""
-"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:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5086,19 +5060,19 @@
 "Dokumentas netikฤ—tai pasibaigฤ—, tikฤ—tasi uลพdaranฤiลณ skliaustลณ simbolio, "
 "uลพbaigianฤio ลพymฤ… <%s/>"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Dokumentas netikฤ—tai pasibaigฤ— elemento varde"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Dokumentas netikฤ—tai pasibaigฤ— poลพymio varde"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 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:1825
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5106,311 +5080,317 @@
 "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:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Dokumentas netikฤ—tai pasibaigฤ— poลพymio verte"
 
-#: ../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 "Dokumentas netikฤ—tai pasibaigฤ— ลพymos „%s“ uลพdaranฤiame simbolyje"
 
-#: ../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 "Dokumentas netikฤ—tai pasibaigฤ— neatidaryto elemento uลพdarymo ลพymoje"
+
+#: glib/gmarkup.c:1859
 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 +5398,286 @@
 "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 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 +5685,163 @@
 "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 +5849,7 @@
 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 +5858,7 @@
 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 +5867,7 @@
 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 +5880,30 @@
 #. * 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 +5953,6 @@
 #~ 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/pl.po b/po/pl.po
index 9f252e8..e71f123 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,9 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-16 17:29+0100\n"
-"PO-Revision-Date: 2018-02-16 17:30+0100\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-08-12 01:20+0200\n"
 "Last-Translator: Piotr Drฤ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -24,131 +24,128 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Opcje GApplication"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Wyล›wietla opcje GApplication"
 
-#: ../gio/gapplication.c:540
+#: gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr "Przechodzi do trybu usล‚ugi GApplication (uลผywane z plików usล‚ug D-Bus)"
 
-#: ../gio/gapplication.c:552
+#: gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Zastฤ™puje identyfikator programu"
 
-#: ../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 "Wyล›wietla pomoc"
 
-#: ../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 "[POLECENIE]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
 msgstr "Wyล›wietla wersjฤ™"
 
-#: ../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 "Wyล›wietla informacjฤ™ o wersji i koล„czy dziaล‚anie"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Wyล›wietla listฤ™ programów"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Wyล›wietla listฤ™ zainstalowanych programów aktywowanych przez D-Bus (wedล‚ug "
 "plików .desktop)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Uruchamia program"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Uruchamia program (opcjonalnie z plikami do otwarcia)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "IDENTYFIKATOR-PROGRAMU [PLIK…]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Aktywuje dziaล‚anie"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Wywoล‚uje dziaล‚anie na programie"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "IDENTYFIKATOR-PROGRAMU DZIAลANIE [PARAMETR]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Wyล›wietla listฤ™ dostฤ™pnych dziaล‚aล„"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr "Wyล›wietla listฤ™ statycznych dziaล‚aล„ dla programu (z pliku .desktop)"
 
-#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:65 gio/gapplication-tool.c:71
 msgid "APPID"
 msgstr "IDENTYFIKATOR-PROGRAMU"
 
-#: ../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 "POLECENIE"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "Polecenie, dla którego wyล›wietliฤ‡ szczegóล‚owฤ… pomoc"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr ""
 "Identyfikator programu w formacie usล‚ugi D-Bus (np. org.przykล‚ad."
 "przeglฤ…darka)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c: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 "PLIK"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr ""
 "Opcjonalne wzglฤ™dne lub bezwzglฤ™dne nazwy plików albo adresy URI do otwarcia"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "DZIAลANIE"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "Nazwa dziaล‚ania do wywoล‚ania"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARAMETR"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "Opcjonalny parametr do wywoล‚ania dziaล‚ania w formacie 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"
@@ -157,26 +154,26 @@
 "Nieznane polecenie %s\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Uลผycie:\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 "Parametry:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: gio/gapplication-tool.c:133 gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[PARAMETRY…]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Polecenia:\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"
@@ -185,7 +182,7 @@
 "Polecenie „%s help POLECENIE” wyล›wietla szczegóล‚owฤ… pomoc.\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"
@@ -194,13 +191,13 @@
 "polecenie %s wymaga identyfikatora programu bezpoล›rednio po nim\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s”\n"
 msgstr "nieprawidล‚owy identyfikator programu: „%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"
@@ -209,22 +206,21 @@
 "polecenie „%s” nie przyjmuje ลผadnych parametrów\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "nie moลผna poล‚ฤ…czyฤ‡ z usล‚ugฤ… 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 "bล‚ฤ…d podczas wysyล‚ania komunikatu %s do programu: %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 "nazwa dziaล‚ania musi zostaฤ‡ podana po identyfikatorze programu\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s”\n"
@@ -233,27 +229,25 @@
 "nieprawidล‚owa nazwa dziaล‚ania: „%s”\n"
 "nazwy dziaล‚aล„ mogฤ… skล‚adaฤ‡ siฤ™ tylko ze znaków alfanumerycznych, „-” i „.”\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "bล‚ฤ…d podczas przetwarzania parametru dziaล‚ania: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "dziaล‚ania przyjmujฤ… maksymalnie jeden parametr\n"
 
-#: ../gio/gapplication-tool.c:411
-#, c-format
+#: gio/gapplication-tool.c:411
 msgid "list-actions command takes only the application id"
 msgstr "polecenie „list-actions” przyjmuje tylko identyfikator programu"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "nie moลผna odnaleลบฤ‡ pliku .desktop dla programu %s\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -262,124 +256,120 @@
 "nierozpoznane polecenie: %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 "Za duลผa wartoล›ฤ‡ licznika przekazana do %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 "Szukanie nie jest obsล‚ugiwane przez podstawowy potok"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "Nie moลผna skróciฤ‡ 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 "Potok jest juลผ zamkniฤ™ty"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "Skracanie nie jest dozwolone na podstawowym potoku"
 
-#: ../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 "Dziaล‚anie zostaล‚o anulowane"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Nieprawidล‚owy obiekt, nie zainicjowano"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Niepeล‚na sekwencja wielu bajtów na wejล›ciu"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Brak wystarczajฤ…cej iloล›ci miejsca w miejscu docelowym"
 
-#: ../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 "Nieprawidล‚owa sekwencja bajtów na wejล›ciu konwersji"
 
-#: ../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 "Bล‚ฤ…d podczas konwersji: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "Zainicjowanie, które moลผna anulowaฤ‡ nie jest obsล‚ugiwane"
 
-#: ../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 "Konwersja z zestawu znaków „%s” na zestaw „%s” nie jest obsล‚ugiwana"
 
-#: ../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 "Nie moลผna otworzyฤ‡ konwertera z „%s” na „%s”"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:358
 #, c-format
 msgid "%s type"
 msgstr "Typ %s"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Nieznany typ"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 msgid "%s filetype"
 msgstr "Typ pliku %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 nie jest zaimplementowane w tym systemie operacyjnym"
 
-#: ../gio/gcredentials.c:467
+#: gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Platforma nie obsล‚uguje GCredentials"
 
-#: ../gio/gcredentials.c:513
+#: gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr ""
 "GCredentials nie zawiera identyfikatora procesu w tym systemie operacyjnym"
 
-#: ../gio/gcredentials.c:565
+#: gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr ""
 "Faล‚szowanie danych uwierzytelniajฤ…cych nie jest moลผliwe w tym systemie "
 "operacyjnym"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Nieoczekiwany, przedwczesny koniec potoku"
 
-#: ../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 "Nieobsล‚ugiwany klucz „%s” we wpisie adresu „%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)"
@@ -387,27 +377,32 @@
 "Adres „%s” jest nieprawidล‚owy (wymaga dokล‚adnie jednej ล›cieลผki, katalogu "
 "tymczasowego lub kluczy abstrakcyjnych)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr "Para klucz/wartoล›ฤ‡ we wpisie adresu „%s” nie ma znaczenia"
 
-#: ../gio/gdbusaddress.c: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 "Bล‚ฤ…d w adresie „%s” — atrybut portu jest bล‚ฤ™dnie sformatowany"
 
-#: ../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 "Bล‚ฤ…d w adresie „%s” — atrybut rodziny jest bล‚ฤ™dnie sformatowany"
 
-#: ../gio/gdbusaddress.c:463
+#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s” for address “%s”"
+msgstr "Nieznany lub nieobsล‚ugiwany transport „%s” dla adresu „%s”"
+
+#: gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s” does not contain a colon (:)"
 msgstr "Element adresu „%s” nie zawiera dwukropka (:)"
 
-#: ../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 "
@@ -416,7 +411,7 @@
 "Para klucz/wartoล›ฤ‡ %d, „%s” w elemencie adresu „%s” nie zawiera znaku "
 "równoล›ci"
 
-#: ../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 "
@@ -425,7 +420,7 @@
 "Bล‚ฤ…d podczas usuwania znaku sterujฤ…cego klucza lub wartoล›ci w parze klucz/"
 "wartoล›ฤ‡ %d, „%s” w elemencie adresu „%s”"
 
-#: ../gio/gdbusaddress.c:576
+#: gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
@@ -434,101 +429,96 @@
 "Bล‚ฤ…d w adresie „%s” — transport systemu UNIX wymaga ustawienia dokล‚adnie "
 "jednego z kluczy „path” lub „abstract”"
 
-#: ../gio/gdbusaddress.c:612
+#: gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s” — the host attribute is missing or malformed"
 msgstr ""
 "Bล‚ฤ…d w adresie „%s” — brak atrybutu komputera lub jest bล‚ฤ™dnie sformatowany"
 
-#: ../gio/gdbusaddress.c:626
+#: gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr ""
 "Bล‚ฤ…d w adresie „%s” — brak atrybutu portu lub jest bล‚ฤ™dnie sformatowany"
 
-#: ../gio/gdbusaddress.c:640
+#: gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
 msgstr ""
 "Bล‚ฤ…d w adresie „%s” — brak atrybutu pliku nonce lub jest bล‚ฤ™dnie sformatowany"
 
-#: ../gio/gdbusaddress.c:661
+#: gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Bล‚ฤ…d podczas automatycznego uruchamiania: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s” for address “%s”"
-msgstr "Nieznany lub nieobsล‚ugiwany transport „%s” dla adresu „%s”"
-
-#: ../gio/gdbusaddress.c:714
+#: gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas otwierania pliku nonce „%s”: %s"
 
-#: ../gio/gdbusaddress.c:733
+#: gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas odczytywania pliku nonce „%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 ""
 "Bล‚ฤ…d podczas odczytywania pliku nonce „%s”, oczekiwano 16 bajtów, otrzymano "
 "%d"
 
-#: ../gio/gdbusaddress.c:760
+#: gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "Bล‚ฤ…d podczas zapisywania zawartoล›ci pliku nonce „%s” do potoku:"
 
-#: ../gio/gdbusaddress.c:969
+#: gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "Podany adres jest pusty"
 
-#: ../gio/gdbusaddress.c:1082
+#: gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "Nie moลผna wywoล‚aฤ‡ magistrali komunikatów, kiedy uลผywane jest setuid"
 
-#: ../gio/gdbusaddress.c:1089
+#: gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr ""
 "Nie moลผna wywoล‚aฤ‡ magistrali komunikatów bez identyfikatora komputera: "
 
-#: ../gio/gdbusaddress.c:1096
+#: gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr ""
 "Nie moลผna automatycznie uruchomiฤ‡ usล‚ugi D-Bus bez zmiennej $DISPLAY "
 "ล›rodowiska X11"
 
-#: ../gio/gdbusaddress.c:1138
+#: gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "Bล‚ฤ…d podczas wywoล‚ywania wiersza poleceล„ „%s”: "
 
-#: ../gio/gdbusaddress.c:1355
+#: gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Wpisanie dowolnego znaku zamknie to okno)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr ""
 "Magistrala D-Bus sesji nie jest uruchomiona, i automatyczne uruchomienie siฤ™ "
 "nie powiodล‚o"
 
-#: ../gio/gdbusaddress.c:1520
+#: gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Nie moลผna ustaliฤ‡ adresu magistrali sesji (nie jest zaimplementowane dla "
 "tego systemu operacyjnego)"
 
-#: ../gio/gdbusaddress.c:1658
+#: gio/gdbusaddress.c:1662 gio/gdbusconnection.c:7142
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -537,7 +527,7 @@
 "Nie moลผna ustaliฤ‡ adresu magistrali ze zmiennej ล›rodowiskowej "
 "DBUS_STARTER_BUS_TYPE — nieznana wartoล›ฤ‡ „%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"
@@ -545,21 +535,21 @@
 "Nie moลผna ustaliฤ‡ adresu magistrali, poniewaลผ nie ustawiono zmiennej "
 "ล›rodowiskowej DBUS_STARTER_BUS_TYPE"
 
-#: ../gio/gdbusaddress.c:1677
+#: gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Nieznany typ magistrali %d"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Oczekiwano braku zawartoล›ci podczas próby odczytania wiersza"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr ""
 "Oczekiwano braku zawartoล›ci podczas próby (bezpiecznego) odczytania wiersza"
 
-#: ../gio/gdbusauth.c:508
+#: gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -567,16 +557,16 @@
 "Wyczerpano wszystkie dostฤ™pne mechanizmy uwierzytelniania (próby: %s, "
 "dostฤ™pne: %s)"
 
-#: ../gio/gdbusauth.c:1171
+#: gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Anulowano przez GDBusAuthObserver::authorize-authenticated-peer"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s”: %s"
 msgstr "Bล‚ฤ…d podczas pobierania informacji o katalogu „%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"
@@ -584,23 +574,23 @@
 "Uprawnienia katalogu „%s” sฤ… bล‚ฤ™dnie sformatowane. Oczekiwano trybu 0700, "
 "otrzymano 0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s”: %s"
 msgstr "Bล‚ฤ…d podczas tworzenia katalogu „%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s” for reading: "
 msgstr "Bล‚ฤ…d podczas otwierania bazy kluczy „%s” do odczytania: "
 
-#: ../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. wiersz bazy kluczy w „%s” z zawartoล›ciฤ… „%s” jest bล‚ฤ™dnie sformatowany"
 
-#: ../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"
@@ -608,7 +598,7 @@
 "Pierwszy token %d. wiersza bazy kluczy w „%s” z zawartoล›ciฤ… „%s” jest "
 "bล‚ฤ™dnie sformatowany"
 
-#: ../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"
@@ -616,165 +606,156 @@
 "Drugi token %d. wiersza bazy kluczy w „%s” z zawartoล›ciฤ… „%s” jest bล‚ฤ™dnie "
 "sformatowany"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr "Nie odnaleziono ciasteczka z identyfikatorem %d w bazie kluczy w „%s”"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas usuwania starego pliku blokady „%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas tworzenia pliku blokady „%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas zamykania (niedowiฤ…zanego) pliku blokady „%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas odwiฤ…zywania pliku blokady „%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s” for writing: "
 msgstr "Bล‚ฤ…d podczas otwierania bazy kluczy „%s” do zapisania: "
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr "(Dodatkowo, uwolnienie blokady „%s” takลผe siฤ™ nie powiodล‚o: %s) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "Poล‚ฤ…czenie jest zamkniฤ™te"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "Przekroczono czas oczekiwania"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "Wystฤ…piล‚y nieobsล‚ugiwane flagi podczas tworzenia poล‚ฤ…czenia ze strony klienta"
 
-#: ../gio/gdbusconnection.c: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 ""
 "Brak interfejsu „org.freedesktop.DBus.Properties” w obiekcie w ล›cieลผce %s"
 
-#: ../gio/gdbusconnection.c:4266
+#: gio/gdbusconnection.c:4257
 #, c-format
-msgid "No such property '%s'"
-msgstr "Brak wล‚asnoล›ci „%s”"
+msgid "No such property “%s”"
+msgstr "Brak wล‚aล›ciwoล›ci „%s”"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
+msgid "Property “%s” is not readable"
 msgstr "Wล‚aล›ciwoล›ฤ‡ „%s” nie jest odczytywalna"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
+msgid "Property “%s” is not writable"
 msgstr "Wล‚aล›ciwoล›ฤ‡ „%s” nie jest zapisywalna"
 
-#: ../gio/gdbusconnection.c: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 ""
-"Bล‚ฤ…d podczas ustawiania wล‚asnoล›ci „%s”: oczekiwano typ „%s”, ale otrzymano "
+"Bล‚ฤ…d podczas ustawiania wล‚aล›ciwoล›ci „%s”: oczekiwano typ „%s”, ale otrzymano "
 "„%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 "Brak interfejsu „%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"
 msgstr "Brak interfejsu „%s” w obiekcie w ล›cieลผce %s"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
+msgid "No such method “%s”"
 msgstr "Brak metody „%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”"
 msgstr "Typ komunikatu, „%s”, nie pasuje do oczekiwanego typu „%s”"
 
-#: ../gio/gdbusconnection.c:5167
+#: gio/gdbusconnection.c:5158
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Obiekt zostaล‚ juลผ wyeksportowany dla interfejsu %s w %s"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "Nie moลผna pobraฤ‡ wล‚aล›ciwoล›ci %s.%s"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "Nie moลผna ustawiฤ‡ wล‚aล›ciwoล›ci %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 "Metoda „%s” zwróciล‚a typ „%s”, ale oczekiwano „%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 "Metoda „%s” w interfejsie „%s” z podpisem „%s” nie istnieje"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Poddrzewo zostaล‚o juลผ wyeksportowane dla %s"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Nie moลผna ustaliฤ‡ adresu magistrali ze zmiennej ล›rodowiskowej "
-"DBUS_STARTER_BUS_TYPE — nieznana wartoล›ฤ‡ „%s”"
-
-#: ../gio/gdbusmessage.c:1246
+#: gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "typ jest NIEPRAWIDลOWY"
 
-#: ../gio/gdbusmessage.c:1257
+#: gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "Komunikat METHOD_CALL: brak pola nagล‚ówka PATH lub MEMBER"
 
-#: ../gio/gdbusmessage.c:1268
+#: gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "Komunikat METHOD_RETURN: brak pola nagล‚ówka REPLY_SERIAL"
 
-#: ../gio/gdbusmessage.c:1280
+#: gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "Komunikat o Bลฤ˜DZIE: brak pola nagล‚ówka REPLY_SERIAL lub ERROR_NAME"
 
-#: ../gio/gdbusmessage.c:1293
+#: gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "Komunikat SYGNAลU: brak pola nagล‚ówka PATH, INTERFACE lub MEMBER"
 
-#: ../gio/gdbusmessage.c:1301
+#: gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -782,7 +763,7 @@
 "Komunikat SYGNAลU: pole nagล‚ówka PATH uลผywa zastrzeลผonej wartoล›ci /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"
@@ -790,7 +771,7 @@
 "Komunikat SYGNAลU: pole nagล‚ówka INTERFACE uลผywa zastrzeลผonej wartoล›ci 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"
@@ -798,12 +779,12 @@
 msgstr[1] "Chciano odczytaฤ‡ %lu bajty, ale otrzymano tylko %lu"
 msgstr[2] "Chciano odczytaฤ‡ %lu bajtów, ale otrzymano tylko %lu"
 
-#: ../gio/gdbusmessage.c:1371
+#: gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr "Oczekiwano bajtu NUL po ciฤ…gu „%s”, ale odnaleziono bajt %d"
 
-#: ../gio/gdbusmessage.c:1390
+#: gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -813,18 +794,18 @@
 "w wyrównaniu bajtu %d (dล‚ugoล›ฤ‡ ciฤ…gu wynosi %d). Prawidล‚owy ciฤ…g UTF-8 do "
 "tego miejsca to „%s”"
 
-#: ../gio/gdbusmessage.c:1593
+#: gio/gdbusmessage.c:1595
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus object path"
 msgstr ""
 "Przetworzona wartoล›ฤ‡ „%s” nie jest prawidล‚owฤ… ล›cieลผkฤ… do obiektu usล‚ugi D-Bus"
 
-#: ../gio/gdbusmessage.c:1615
+#: gio/gdbusmessage.c:1617
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature"
 msgstr "Przetworzona wartoล›ฤ‡ „%s” nie jest prawidล‚owym podpisem usล‚ugi D-Bus"
 
-#: ../gio/gdbusmessage.c:1662
+#: gio/gdbusmessage.c:1664
 #, c-format
 msgid ""
 "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -840,7 +821,7 @@
 "Wystฤ…piล‚a macierz o dล‚ugoล›ci %u bajtów. Maksymalna dล‚ugoล›ฤ‡ to 2<<26 bajtów "
 "(64 MiB)."
 
-#: ../gio/gdbusmessage.c:1682
+#: gio/gdbusmessage.c:1684
 #, c-format
 msgid ""
 "Encountered array of type “a%c”, expected to have a length a multiple of %u "
@@ -849,14 +830,14 @@
 "Wystฤ…piล‚a macierz typu „a%c”, której oczekiwana dล‚ugoล›ฤ‡ jest wielokrotnoล›ciฤ… "
 "%u B, ale wynosi %u B"
 
-#: ../gio/gdbusmessage.c:1849
+#: gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
 msgstr ""
 "Przetworzona wartoล›ฤ‡ „%s” dla wariantu nie jest prawidล‚owym podpisem usล‚ugi "
 "D-Bus"
 
-#: ../gio/gdbusmessage.c:1873
+#: gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s” from the D-Bus wire format"
@@ -864,7 +845,7 @@
 "Bล‚ฤ…d podczas deserializowania GVariant za pomocฤ… ciฤ…gu typu „%s” z formatu "
 "przewodu usล‚ugi 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 "
@@ -873,26 +854,26 @@
 "Nieprawidล‚owa wartoล›ฤ‡ kolejnoล›ci bajtów. Oczekiwano 0x6c („l”) lub 0x42 "
 "(„B”), ale odnaleziono wartoล›ฤ‡ 0x%02x"
 
-#: ../gio/gdbusmessage.c:2068
+#: gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr ""
 "Nieprawidล‚owa gล‚ówna wersja protokoล‚u. Oczekiwano 1, ale odnaleziono %d"
 
-#: ../gio/gdbusmessage.c:2124
+#: gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s” found but message body is empty"
 msgstr ""
 "Odnaleziono nagล‚ówek podpisu z podpisem „%s”, ale treล›ฤ‡ komunikatu jest pusta"
 
-#: ../gio/gdbusmessage.c:2138
+#: gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
 msgstr ""
 "Przetworzona wartoล›ฤ‡ „%s” nie jest prawidล‚owym podpisem usล‚ugi D-Bus (dla "
 "treล›ci)"
 
-#: ../gio/gdbusmessage.c: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"
@@ -903,11 +884,11 @@
 msgstr[2] ""
 "Brak nagล‚ówka podpisu w komunikacie, ale treล›ฤ‡ komunikatu liczy %u bajtów"
 
-#: ../gio/gdbusmessage.c:2178
+#: gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "Nie moลผna deserializowaฤ‡ komunikatu: "
 
-#: ../gio/gdbusmessage.c:2519
+#: gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
@@ -915,63 +896,63 @@
 "Bล‚ฤ…d podczas serializowania GVariant za pomocฤ… ciฤ…gu typu „%s” z formatu "
 "przewodu usล‚ugi 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)"
 msgstr ""
 "Liczba deskryptorów plików w komunikacie (%d) róลผni siฤ™ od pola nagล‚ówka (%d)"
 
-#: ../gio/gdbusmessage.c:2664
+#: gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "Nie moลผna serializowaฤ‡ komunikatu: "
 
-#: ../gio/gdbusmessage.c:2708
+#: gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s” but there is no signature header"
 msgstr "Treล›ฤ‡ komunikatu ma podpis „%s”, ale brak nagล‚ówka podpisu"
 
-#: ../gio/gdbusmessage.c:2718
+#: gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
 "“%s”"
 msgstr "Treล›ฤ‡ komunikatu ma podpis „%s”, ale podpis w polu nagล‚ówka to „%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 "Treล›ฤ‡ komunikatu jest pusta, ale podpis w polu nagล‚ówka to „(%s)”"
 
-#: ../gio/gdbusmessage.c:3287
+#: gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s”"
 msgstr "Bล‚ฤ…d zwrotu z treล›ciฤ… typu „%s”"
 
-#: ../gio/gdbusmessage.c:3295
+#: gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Bล‚ฤ…d zwrotu z pustฤ… treล›ciฤ…"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Nie moลผna pobraฤ‡ profilu sprzฤ™tu: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "Nie moลผna wczytaฤ‡ pliku /var/lib/dbus/machine-id lub /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1612
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Bล‚ฤ…d podczas wywoล‚ywania metody StartServiceByName dla %s: "
 
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Nieoczekiwana odpowiedลบ %d od metody 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"
@@ -980,30 +961,30 @@
 "a poล›rednik zostaล‚ utworzony za pomocฤ… flagi "
 "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "Przestrzeล„ nazw abstrakcyjnych nie jest obsล‚ugiwana"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr "Nie moลผna okreล›liฤ‡ pliku nonce podczas tworzenia serwera"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s”: %s"
 msgstr "Bล‚ฤ…d podczas zapisywania pliku nonce w „%s”: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "Ciฤ…g „%s” nie jest prawidล‚owym GUID usล‚ugi D-Bus"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Nie moลผna nasล‚uchiwaฤ‡ na nieobsล‚ugiwanym transporcie „%s”"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1026,60 +1007,60 @@
 "\n"
 "Polecenie „%s POLECENIE --help” wyล›wietla pomoc o kaลผdym poleceniu.\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 "Bล‚ฤ…d: %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 "Bล‚ฤ…d podczas przetwarzania kodu XML introspekcji: %s\n"
 
-#: ../gio/gdbus-tool.c:216
+#: gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… nazwฤ…\n"
 
-#: ../gio/gdbus-tool.c:364
+#: gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "ลฤ…czy z magistralฤ… systemowฤ…"
 
-#: ../gio/gdbus-tool.c:365
+#: gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "ลฤ…czy z magistralฤ… sesji"
 
-#: ../gio/gdbus-tool.c:366
+#: gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "ลฤ…czy z podanym adresem usล‚ugi D-Bus"
 
-#: ../gio/gdbus-tool.c:376
+#: gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Opcje punktów koล„cowych poล‚ฤ…czenia:"
 
-#: ../gio/gdbus-tool.c:377
+#: gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Opcje okreล›lajฤ…ce punkt koล„cowy poล‚ฤ…czenia"
 
-#: ../gio/gdbus-tool.c:399
+#: gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Nie okreล›lono ลผadnych punktów koล„cowych poล‚ฤ…czenia"
 
-#: ../gio/gdbus-tool.c:409
+#: gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Okreล›lono wiele punktów koล„cowych poล‚ฤ…czenia"
 
-#: ../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 "Ostrzeลผenie: wedล‚ug danych introspekcji, interfejs „%s” nie istnieje\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 "
@@ -1088,168 +1069,162 @@
 "Ostrzeลผenie: wedล‚ug danych introspekcji, metoda „%s” nie istnieje "
 "w interfejsie „%s”\n"
 
-#: ../gio/gdbus-tool.c:550
+#: gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Opcjonalny cel sygnaล‚u (unikalna nazwa)"
 
-#: ../gio/gdbus-tool.c:551
+#: gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "ลšcieลผka do obiektu do wyemitowania sygnaล‚u"
 
-#: ../gio/gdbus-tool.c:552
+#: gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Nazwa sygnaล‚u i interfejsu"
 
-#: ../gio/gdbus-tool.c:587
+#: gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Emituje sygnaล‚."
 
-#: ../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 "Bล‚ฤ…d podczas ล‚ฤ…czenia: %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 "Bล‚ฤ…d: nie podano celu\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 "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… unikalnฤ… nazwฤ… magistrali.\n"
 
-#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
-#, 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 "Bล‚ฤ…d: nie podano ล›cieลผki do obiektu\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 "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… ล›cieลผkฤ… do obiektu\n"
 
-#: ../gio/gdbus-tool.c:720
-#, c-format
+#: gio/gdbus-tool.c:740
 msgid "Error: Signal name is not specified\n"
 msgstr "Bล‚ฤ…d: nie podano nazwy sygnaล‚u\n"
 
-#: ../gio/gdbus-tool.c:731
+#: gio/gdbus-tool.c:754
 #, c-format
 msgid "Error: Signal name “%s” is invalid\n"
 msgstr "Bล‚ฤ…d: nazwa sygnaล‚u „%s” jest nieprawidล‚owa\n"
 
-#: ../gio/gdbus-tool.c:743
+#: gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… nazwฤ… interfejsu\n"
 
-#: ../gio/gdbus-tool.c:749
+#: gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… nazwฤ… elementu\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c: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 "Bล‚ฤ…d podczas przetwarzania parametru %d: %s\n"
 
-#: ../gio/gdbus-tool.c:818
+#: gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Bล‚ฤ…d podczas czyszczenia poล‚ฤ…czenia: %s\n"
 
-#: ../gio/gdbus-tool.c:845
+#: gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Nazwa docelowa do wywoล‚ania na niej metody"
 
-#: ../gio/gdbus-tool.c:846
+#: gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "ลšcieลผka do obiektu do wywoล‚ania na niej metody"
 
-#: ../gio/gdbus-tool.c:847
+#: gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Nazwa metody i interfejsu"
 
-#: ../gio/gdbus-tool.c:848
+#: gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Czas oczekiwania w sekundach"
 
-#: ../gio/gdbus-tool.c:889
+#: gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Wywoล‚uje metodฤ™ na zdalnym obiekcie."
 
-#: ../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
+msgid "Error: Destination is not specified\n"
+msgstr "Bล‚ฤ…d: nie podano celu\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 "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… nazwฤ… magistrali\n"
 
-#: ../gio/gdbus-tool.c:1022
-#, c-format
+#: gio/gdbus-tool.c:1043
 msgid "Error: Method name is not specified\n"
 msgstr "Bล‚ฤ…d: nie podano nazwy metody\n"
 
-#: ../gio/gdbus-tool.c:1033
+#: gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s” is invalid\n"
 msgstr "Bล‚ฤ…d: nazwa metody „%s” jest nieprawidล‚owa\n"
 
-#: ../gio/gdbus-tool.c:1111
+#: gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Bล‚ฤ…d podczas przetwarzania parametru %d typu „%s”: %s\n"
 
-#: ../gio/gdbus-tool.c:1555
+#: gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Nazwa docelowa do zbadania"
 
-#: ../gio/gdbus-tool.c:1556
+#: gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "ลšcieลผka do obiektu do zbadania"
 
-#: ../gio/gdbus-tool.c:1557
+#: gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Wyล›wietla kod XML"
 
-#: ../gio/gdbus-tool.c:1558
+#: gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "Bada elementy potomne"
 
-#: ../gio/gdbus-tool.c:1559
+#: gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Wyล›wietla tylko wล‚aล›ciwoล›ci"
 
-#: ../gio/gdbus-tool.c:1650
+#: gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Bada zdalny obiekt."
 
-#: ../gio/gdbus-tool.c:1853
+#: gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Nazwa docelowa do monitorowania"
 
-#: ../gio/gdbus-tool.c:1854
+#: gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "ลšcieลผka do obiektu do monitorowania"
 
-#: ../gio/gdbus-tool.c:1883
+#: gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Monitoruje zdalny obiekt."
 
-#: ../gio/gdbus-tool.c:1941
-#, c-format
+#: gio/gdbus-tool.c:1954
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr ""
 "Bล‚ฤ…d: nie moลผna monitorowaฤ‡ poล‚ฤ…czenia niebฤ™dฤ…cego magistralฤ… komunikatów\n"
 
-#: ../gio/gdbus-tool.c:2065
+#: gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Usล‚uga do aktywowania przed oczekiwaniem na drugฤ… (znanฤ… nazwฤ™)"
 
-#: ../gio/gdbus-tool.c:2068
+#: gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1257,136 +1232,131 @@
 "Czas oczekiwania przed zakoล„czeniem z bล‚ฤ™dem (w sekundach), 0 oznacza brak "
 "ograniczenia (domyล›lne)"
 
-#: ../gio/gdbus-tool.c:2116
+#: gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPCJA…] NAZWA-MAGISTRALI"
 
-#: ../gio/gdbus-tool.c:2118
+#: gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Oczekuje na pojawienie siฤ™ nazwy magistrali."
 
-#: ../gio/gdbus-tool.c:2194
-#, c-format
+#: gio/gdbus-tool.c:2206
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Bล‚ฤ…d: naleลผy podaฤ‡ usล‚ugฤ™, dla której aktywowaฤ‡.\n"
 
-#: ../gio/gdbus-tool.c:2199
-#, c-format
+#: gio/gdbus-tool.c:2211
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Bล‚ฤ…d: naleลผy podaฤ‡ usล‚ugฤ™, na którฤ… oczekiwaฤ‡.\n"
 
-#: ../gio/gdbus-tool.c:2204
-#, c-format
+#: gio/gdbus-tool.c:2216
 msgid "Error: Too many arguments.\n"
 msgstr "Bล‚ฤ…d: za duลผo parametrów.\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 "Bล‚ฤ…d: %s nie jest prawidล‚owฤ… znanฤ… nazwฤ… magistrali.\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: gio/gdesktopappinfo.c:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Plik .desktop nie okreล›la pola Exec"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Nie moลผna odnaleลบฤ‡ terminala wymaganego przez program"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "Nie moลผna utworzyฤ‡ katalogu uลผytkownika dla konfiguracji programu %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Nie moลผna utworzyฤ‡ katalogu uลผytkownika dla konfiguracji MIME %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: gio/gdesktopappinfo.c:3446 gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "Brak identyfikatora w informacjach o programie"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Nie moลผna utworzyฤ‡ pliku .desktop dla uลผytkownika %s"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
-msgstr "Wล‚asna definicja dla %s"
+msgstr "Niestandardowa definicja dla %s"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "napฤ™d nie obsล‚uguje wysuniฤ™cia"
 
 #. 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 "napฤ™d nie obsล‚uguje wysuniฤ™cia lub „eject_with_operation”"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 msgid "drive doesn’t implement polling for media"
 msgstr "napฤ™d nie obsล‚uguje wykrywania noล›nika"
 
-#: ../gio/gdrive.c:776
+#: gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "napฤ™d nie obsล‚uguje rozpoczฤ™cia"
 
-#: ../gio/gdrive.c:878
+#: gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "napฤ™d nie obsล‚uguje zatrzymania"
 
-#: ../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 "Obsล‚uga TLS jest niedostฤ™pna"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "Obsล‚uga DTLS jest niedostฤ™pna"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Nie moลผna obsล‚uลผyฤ‡ wersji %d kodowania GEmblem"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Bล‚ฤ™dna liczba elementów (%d) w kodowaniu GEmblem"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Nie moลผna obsล‚uลผyฤ‡ wersji %d kodowania GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Bล‚ฤ™dna liczba elementów (%d) w kodowaniu GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Oczekiwano obiektu GEmblem dla 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 "Dziaล‚anie nie jest obsล‚ugiwane"
 
@@ -1394,206 +1364,206 @@
 #. * 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 "Nie istnieje zawierajฤ…cy punkt montowania"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: gio/gfile.c:2622 gio/glocalfile.c:2391
 msgid "Can’t copy over directory"
 msgstr "Nie moลผna skopiowaฤ‡ na katalog"
 
-#: ../gio/gfile.c:2677
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Nie moลผna skopiowaฤ‡ katalogu na katalog"
 
-#: ../gio/gfile.c:2685
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Plik docelowy istnieje"
 
-#: ../gio/gfile.c:2704
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Nie moลผna skopiowaฤ‡ katalogu rekurencyjnie"
 
-#: ../gio/gfile.c:2979
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "Wywoล‚anie „splice” nie jest obsล‚ugiwane"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Bล‚ฤ…d podczas dzielenia pliku: %s"
 
-#: ../gio/gfile.c:3136
+#: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr ""
 "Kopiowanie (reflink/clone) miฤ™dzy punktami montowania nie jest obsล‚ugiwane"
 
-#: ../gio/gfile.c:3140
+#: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopiowanie (reflink/clone) nie jest obsล‚ugiwane lub jest nieprawidล‚owe"
 
-#: ../gio/gfile.c:3145
+#: gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Kopiowanie (reflink/clone) nie jest obsล‚ugiwane lub nie zadziaล‚aล‚o"
 
-#: ../gio/gfile.c:3208
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Nie moลผna skopiowaฤ‡ pliku specjalnego"
 
-#: ../gio/gfile.c:4006
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Wprowadzono nieprawidล‚owฤ… wartoล›ฤ‡ dowiฤ…zania symbolicznego"
 
-#: ../gio/gfile.c:4167
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Kosz nie jest obsล‚ugiwany"
 
-#: ../gio/gfile.c:4279
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c”"
 msgstr "Nazwy plików nie mogฤ… zawieraฤ‡ „%c”"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "wolumin nie obsล‚uguje montowania"
 
-#: ../gio/gfile.c:6869
+#: gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "ลปaden program nie jest zarejestrowany do obsล‚ugi tego pliku"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "Enumerator jest zamkniฤ™ty"
 
-#: ../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 "Enumerator plików ma zalegล‚e dziaล‚anie"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "Enumerator plików jest juลผ zamkniฤ™ty"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Nie moลผna obsล‚uลผyฤ‡ wersji %d kodowania GFileIcon"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Bล‚ฤ™dny format danych wejล›ciowych dla 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 "Potok nie obsล‚uguje dziaล‚ania 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 "Szukanie nie jest obsล‚ugiwane przez potok"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "Skracanie nie jest dozwolone na potoku wejล›ciowym"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "Skracanie nie jest dozwolone na potoku"
 
-#: ../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 "Nieprawidล‚owa nazwa komputera"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Bล‚ฤ™dna odpowiedลบ poล›rednika HTTP"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Poล‚ฤ…czenie poล›rednika HTTP nie jest dozwolone"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Uwierzytelnienie poล›rednika HTTP siฤ™ nie powiodล‚o"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Wymagane jest uwierzytelnienie poล›rednika HTTP"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Poล‚ฤ…czenie poล›rednika HTTP siฤ™ nie powiodล‚o: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "Serwer poล›rednika HTTP nieoczekiwanie zamknฤ…ล‚ poล‚ฤ…czenie."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Bล‚ฤ™dna liczba elementów (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "Brak typu dla nazwy klasy %s"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "Typ %s nie obsล‚uguje interfejsu GIcon"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
 msgstr "Typ %s nie jest klasowy"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Bล‚ฤ™dny format numeru wersji: %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Typ %s nie obsล‚uguje metody from_tokens() z interfejsu GIcon"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Nie moลผna obsล‚uลผyฤ‡ podanej wersji kodowania ikony"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Nie podano adresu"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "Dล‚ugoล›ฤ‡ %u jest za dล‚uga na adres"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "Adres ma bity ustawione poza dล‚ugoล›ciฤ… przedrostka"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s” as IP address mask"
 msgstr "Nie moลผna przetworzyฤ‡ „%s” jako maskฤ™ adresu IP"
 
-#: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c: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 "Brak wystarczajฤ…cej iloล›ci miejsca dla adresu gniazda"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Nieobsล‚ugiwany adres gniazda"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "Potok wejล›ciowy nie obsล‚uguje odczytu"
 
@@ -1603,130 +1573,123 @@
 #. 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 "Potok ma zalegล‚e dziaล‚anie"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Kopiuje za pomocฤ… pliku"
 
 # FIXME — co to w ogóle jest?
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Podฤ…ลผa za plikiem podczas przenoszenia"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version” takes no arguments"
 msgstr "„version” nie przyjmuje ลผadnych parametrów"
 
-#: ../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 "Uลผycie:"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 msgid "Print version information and exit."
 msgstr "Wyล›wietla informacjฤ™ o wersji i koล„czy dziaล‚anie."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[PARAMETRY…]"
-
-#: ../gio/gio-tool.c:226
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Polecenia:"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Doล‚ฤ…cza pliki na standardowym wyjล›ciu"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Kopiuje jeden lub wiฤ™cej plików"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Wyล›wietla informacje o poล‚oลผeniach"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Wyล›wietla listฤ™ zawartoล›ci poล‚oลผeล„"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "Pobiera lub ustawia program obsล‚ugujฤ…cy dla typu MIME"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Tworzy katalogi"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Monitoruje zmiany plików i katalogów"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Montuje lub odmontowuje poล‚oลผenia"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Przenosi jeden lub wiฤ™cej plików"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Otwiera pliki za pomocฤ… domyล›lnego programu"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Zmienia nazwฤ™ pliku"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Usuwa jeden lub wiฤ™cej plików"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Odczytuje ze standardowego wejล›cia i zapisuje"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Ustawia atrybut pliku"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Przenosi pliki lub katalogi do kosza"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Wyล›wietla listฤ™ zawartoล›ci poล‚oลผeล„ w drzewie"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "%s wyล›wietla szczegóล‚owฤ… pomoc.\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Bล‚ฤ…d podczas zapisywania do standardowego wyjล›cia"
 
 #. 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 "POลOลปENIE"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Doล‚ฤ…cza pliki i wyล›wietla je na standardowym wyjล›ciu."
 
-#: ../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"
@@ -1736,58 +1699,56 @@
 "GIO zamiast plików lokalnych: przykล‚adowo moลผna uลผyฤ‡ czegoล› takiego jak\n"
 "smb://serwer/zasób/plik.txt jako poล‚oลผenia."
 
-#: ../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 "Nie podano poล‚oลผeล„"
 
-#: ../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 "Brak katalogu docelowego"
 
-#: ../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 "Wyล›wietla postฤ™p"
 
-#: ../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 "Pyta przed zastฤ…pieniem"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Zachowuje wszystkie atrybuty"
 
-#: ../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 "Tworzy kopiฤ™ zapasowฤ… istniejฤ…cych plików docelowych"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Nigdy nie podฤ…ลผa za dowiฤ…zaniami symbolicznymi"
 
-#: ../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 "Przesล‚ano %s z %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 "PLIK-ลนRÓDลOWY"
 
 #. 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 "CEL"
 
-#: ../gio/gio-tool-copy.c:103
+#: gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
 msgstr "Kopiuje jeden lub wiฤ™cej PLIKÓW ลนRÓDลOWYCH do PLIKÓW DOCELOWYCH."
 
-#: ../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"
@@ -1797,93 +1758,88 @@
 "GIO zamiast plików lokalnych: przykล‚adowo moลผna uลผyฤ‡ czegoล› takiego jak\n"
 "smb://serwer/zasób/plik.txt jako poล‚oลผenia."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "Plik docelowy %s nie jest katalogiem"
 
-#: ../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: zastฤ…piฤ‡ „%s”? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Lista zapisywalnych atrybutów"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Pobiera informacje o systemie plików"
 
-#: ../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 "Atrybuty do pobrania"
 
-#: ../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 "ATRYBUTY"
 
-#: ../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 "Bez podฤ…ลผania za dowiฤ…zaniami symbolicznymi"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "atrybuty:\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 "wyล›wietlana nazwa: %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 "modyfikowana nazwa: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "nazwa: %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "typ: %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
 msgstr "rozmiar: "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "ukryty\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 "Atrybuty moลผliwe do ustawienia:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Przestrzeล„ nazw atrybutów moลผliwych do ustawienia:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Wyล›wietla informacje o poล‚oลผeniach."
 
-#: ../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"
@@ -1897,23 +1853,23 @@
 "podawane za pomocฤ… ich nazwy GIO, np. standard::icon, przestrzeni nazw,\n"
 "np. unix, albo „*”, co oznacza wszystkie atrybuty"
 
-#: ../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 "Wyล›wietla ukryte pliki"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Uลผywa dล‚ugiego formatu list"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Wyล›wietla peล‚ne adresy URI"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Wyล›wietla listฤ™ zawartoล›ci poล‚oลผenia."
 
-#: ../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"
@@ -1926,19 +1882,19 @@
 "podawane za pomocฤ… ich nazwy GIO, np. standard::icon"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "TYP-MIME"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "PROGRAM-OBSลUGUJฤ„CY"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
 msgstr "Pobiera lub ustawia program obsล‚ugujฤ…cy dla typu 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"
@@ -1949,60 +1905,56 @@
 "podano program obsล‚ugujฤ…cy, to jest on ustawiany jako domyล›lny\n"
 "program obsล‚ugujฤ…cy dla typu MIME."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
 msgstr "Naleลผy podaฤ‡ jeden typ MIME i opcjonalnie program obsล‚ugujฤ…cy"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s”\n"
 msgstr "Brak domyล›lnego programu dla „%s”\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s”: %s\n"
 msgstr "Domyล›lny program dla „%s”: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Zarejestrowane programy:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Brak zarejestrowanych programów\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Zalecane programy:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Brak zalecanych programów\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s”"
 msgstr "Wczytanie informacji o programie obsล‚ugujฤ…cym „%s” siฤ™ nie powiodล‚o"
 
-#: ../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 ""
 "Ustawienie „%s” jako domyล›lny program obsล‚ugujฤ…cy „%s” siฤ™ nie powiodล‚o: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Tworzy katalogi nadrzฤ™dne"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Tworzy katalogi."
 
-#: ../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"
@@ -2012,114 +1964,138 @@
 "GIO zamiast plików lokalnych: przykล‚adowo moลผna uลผyฤ‡ czegoล› takiego jak\n"
 "smb://serwer/zasób/plik.txt jako poล‚oลผenia."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Monitoruje katalog (domyล›lnie: zaleลผy od typu)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Monitoruje plik (domyล›lnie: zaleลผy od typu)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 "Monitoruje plik bezpoล›rednio (uwzglฤ™dnia zmiany wprowadzone przez twarde "
 "dowiฤ…zania)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Monitoruje plik bezpoล›rednio, ale nie zgล‚asza zmian"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "Zgล‚asza przeniesienia i zmiany nazw jako proste zdarzenia usuniฤ™cia/"
 "utworzenia"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Obserwuje zdarzenia montowania"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
 msgstr "Monitoruje zmiany plików lub katalogów."
 
-#: ../gio/gio-tool-mount.c:58
+#: gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr "Montuje jako montowalny"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
-msgstr "Montuje woluminy za pomocฤ… pliku urzฤ…dzenia"
+msgstr "Montuje wolumin za pomocฤ… pliku urzฤ…dzenia"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63 gio/gio-tool-mount.c:66
 msgid "DEVICE"
 msgstr "URZฤ„DZENIE"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:64
 msgid "Unmount"
 msgstr "Odmontowuje"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "Wysuwa"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:66
+msgid "Stop drive with device file"
+msgstr "Zatrzymuje napฤ™d za pomocฤ… pliku urzฤ…dzenia"
+
+#: gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
 msgstr "Odmontowuje wszystko za pomocฤ… podanego schematu"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
 msgid "SCHEME"
 msgstr "SCHEMAT"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:68
 msgid "Ignore outstanding file operations when unmounting or ejecting"
 msgstr ""
 "Ignoruje trwajฤ…ce dziaล‚ania na plikach podczas odmontowywania lub wysuwania"
 
-#: ../gio/gio-tool-mount.c:64
+#: gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
 msgstr "Uลผywa anonimowego uลผytkownika podczas uwierzytelniania"
 
 #. 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 "Wyล›wietla listฤ™"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr "Monitoruje zdarzenia"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr "Wyล›wietla dodatkowe informacje"
 
-#: ../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 "Numeryczny kod PIM podczas odblokowywania woluminu VeraCrypt"
+
+#: gio/gio-tool-mount.c:74
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:75
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Montuje ukryty wolumin TCRYPT"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr "Montuje systemowy wolumin TCRYPT"
+
+#: gio/gio-tool-mount.c:264 gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
 msgstr "Odmowa dostฤ™pu anonimowego"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:524
+msgid "No drive for device file"
+msgstr "Brak napฤ™du dla pliku urzฤ…dzenia"
+
+#: gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Zamontowano %s w %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
-msgstr "Brak woluminów dla pliku urzฤ…dzenia"
+msgstr "Brak woluminu dla pliku urzฤ…dzenia"
 
-#: ../gio/gio-tool-mount.c:1145
+#: gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
 msgstr "Montuje lub odmontowuje poล‚oลผenia."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Bez uลผywania zapasowego kopiowania i usuwania"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Przenosi jeden lub wiฤ™cej PLIKÓW ลนRÓDลOWYCH do PLIKÓW DOCELOWYCH."
 
-#: ../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"
@@ -2129,12 +2105,12 @@
 "GIO zamiast plików lokalnych: przykล‚adowo moลผna uลผyฤ‡ czegoล› takiego jak\n"
 "smb://serwer/zasób/plik.txt jako poล‚oลผenia"
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "Plik docelowy %s nie jest katalogiem"
 
-#: ../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."
@@ -2142,246 +2118,251 @@
 "Otwiera pliki za pomocฤ… domyล›lnego programu\n"
 "zarejestrowanego do obsล‚ugi pliku tego typu."
 
-#: ../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 "Ignoruje nieistniejฤ…ce pliki, nigdy nie pyta"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Usuwa podane pliki."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "NAZWA"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Zmienia nazwฤ™ pliku."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Brak parametru"
 
-#: ../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 "Za duลผo parametrów"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Zmiana nazwy zostaล‚a ukoล„czona powodzeniem. Nowy adres URI: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Tworzy tylko, jeล›li nie istnieje"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "Doล‚ฤ…cza do koล„ca pliku"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Podczas tworzenia ogranicza dostฤ™p do bieลผฤ…cego uลผytkownika"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr ""
 "Podczas zastฤ™powania zastฤ™puje tak, jakby miejsce docelowe nie istniaล‚o"
 
 #. 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 "Wyล›wietla nowฤ… etykietฤ™ etag na koล„cu"
 
 #. 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 "Etykieta etag pliku zostanie zastฤ…piona"
 
-#: ../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 "Bล‚ฤ…d podczas odczytywania ze standardowego wejล›cia"
 
 #. 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 "Etykieta etag jest niedostฤ™pna\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Odczytuje ze standardowego wejล›cia i zapisuje do PLIKU DOCELOWEGO."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Nie podano celu"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Typ atrybutu"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "TYPE"
 msgstr "TYP"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
 msgstr "ATRYBUT"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "WARTOลšฤ†"
 
-#: ../gio/gio-tool-set.c:93
+#: gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr "Ustawia atrybut pliku POลOลปENIA."
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Nie podano poล‚oลผenia"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Nie podano atrybutu"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Nie podano wartoล›ci"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s”"
 msgstr "Nieprawidล‚owy typ atrybutu „%s”"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Opróลผnia kosz"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Przenosi pliki lub katalogi do kosza."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Podฤ…ลผa za dowiฤ…zaniami symbolicznymi, punktami montowania i skrótami"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
 msgstr "Wyล›wietla listฤ™ zawartoล›ci katalogów w formacie drzewa."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1515
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Element <%s> nie jest dozwolony wewnฤ…trz <%s>"
 
-#: ../gio/glib-compile-resources.c:146
+#: gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Element <%s> nie jest dozwolony jako gล‚ówny element"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "Plik %s pojawia siฤ™ wiele razy w zasobie"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s” in any source directory"
 msgstr ""
 "Ustalenie poล‚oลผenia „%s” w dowolnym katalogu ลบródล‚owym siฤ™ nie powiodล‚o"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s” in current directory"
 msgstr "Ustalenie poล‚oลผenia „%s” w bieลผฤ…cym katalogu siฤ™ nie powiodล‚o"
 
-#: ../gio/glib-compile-resources.c:290
+#: gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s”"
 msgstr "Nieznana opcja przetwarzania „%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 "Utworzenie pliku tymczasowego siฤ™ nie powiodล‚o: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr ""
+"Zaลผฤ…dano wstฤ™pnego przetworzenia %s, ale %s nie jest ustawione, a %s nie "
+"jest w PATH"
 
-#: ../gio/glib-compile-resources.c:382
+#: gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Bล‚ฤ…d podczas odczytywania pliku %s: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Bล‚ฤ…d podczas kompresowania pliku %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "tekst nie moลผe znajdowaฤ‡ siฤ™ wewnฤ…trz <%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 "Wyล›wietla wersjฤ™ programu i koล„czy dziaล‚anie"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
-msgstr "nazwa pliku wyjล›ciowego"
+#: gio/glib-compile-resources.c:737
+msgid "Name of the output file"
+msgstr "Nazwa pliku wyjล›ciowego"
 
-#: ../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 "Katalog, z którego odczytywaฤ‡ pliki (domyล›lnie bieลผฤ…cy katalog)"
+msgstr "Katalog, z którego wczytywaฤ‡ PLIKI (domyล›lnie bieลผฤ…cy katalog)"
 
-#: ../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 "KATALOG"
 
-#: ../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 "Tworzy wyjล›cie w formacie wybranym przez rozszerzenie pliku docelowego"
 
-#: ../gio/glib-compile-resources.c:668
+#: gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Tworzy nagล‚ówek ลบródล‚a"
 
-#: ../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 "Tworzy kod ลบródล‚owy uลผywany do dowiฤ…zania pliku zasobu do kodu"
 
-#: ../gio/glib-compile-resources.c:670
+#: gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Tworzy listฤ™ zaleลผnoล›ci"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr "nazwa pliku zaleลผnoล›ci do utworzenia"
+#: gio/glib-compile-resources.c:743
+msgid "Name of the dependency file to generate"
+msgstr "Nazwa pliku zaleลผnoล›ci do utworzenia"
 
-#: ../gio/glib-compile-resources.c:672
+#: gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Doล‚ฤ…cza faล‚szywe cele w utworzonym pliku zaleลผnoล›ci"
 
-#: ../gio/glib-compile-resources.c:673
+#: gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "Bez automatycznego tworzenia i rejestrowania zasobu"
 
-#: ../gio/glib-compile-resources.c:674
+#: gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Bez eksportowania funkcji; deklaruje je jako G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:675
+#: gio/glib-compile-resources.c:747
 msgid "C identifier name used for the generated source code"
 msgstr "Nazwa identyfikatora jฤ™zyka C uลผywana dla utworzonego kodu ลบródล‚owego"
 
-#: ../gio/glib-compile-resources.c: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"
@@ -2391,124 +2372,123 @@
 "zasobów majฤ… rozszerzenie .gresource.xml, a pliki\n"
 "zasobów majฤ… rozszerzenie .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 "Naleลผy podaฤ‡ dokล‚adnie jednฤ… nazwฤ™ pliku\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 "pseudonim musi mieฤ‡ co najmniej 2 znaki"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Nieprawidล‚owa wartoล›ฤ‡ numeryczna"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'/> zostaล‚o juลผ okreล›lone"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "value='%s' zostaล‚o juลผ okreล›lone"
 
-#: ../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 "wartoล›ci flag mogฤ… mieฤ‡ ustawiony co najwyลผej 1 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> musi zawieraฤ‡ co najmniej jeden znacznik <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> nie jest zawarte w okreล›lonym zakresie"
 
-#: ../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> nie jest prawidล‚owym elementem okreล›lonego wyliczonego typu"
 
-#: ../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> zawiera ciฤ…g spoza okreล›lonego typu flag"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s> zawiera ciฤ…g, którego nie ma w znaczniku <choices>"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> zostaล‚o juลผ okreล›lone dla tego klucza"
 
-#: ../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> nie jest dozwolone dla kluczy typu „%s”"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "okreล›lony minimum <range> jest wyลผszy niลผ maksimum"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "nieobsล‚ugiwana kategoria lokalizacji: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "zaลผฤ…dano lokalizacji, ale nie podano domeny gettext"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "podano kontekst tล‚umaczenia dla wartoล›ci bez wล‚ฤ…czonej lokalizacji"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s”: "
 msgstr "Przetworzenie wartoล›ci <default> typu „%s” siฤ™ nie powiodล‚o: "
 
-#: ../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> nie moลผe byฤ‡ okreล›lane dla kluczy oznaczonych jako majฤ…ce "
 "wyliczony typ"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> zostaล‚o juลผ okreล›lone dla tego klucza"
 
-#: ../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> nie jest dozwolone dla kluczy typu „%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'/> zostaล‚o juลผ podane"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices> musi zawieraฤ‡ co najmniej jeden znacznik <choice>"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> zostaล‚o juลผ okreล›lone dla tego klucza"
 
-#: ../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>"
@@ -2516,7 +2496,7 @@
 "<aliases> moลผe byฤ‡ okreล›lane tylko dla kluczy z wyliczonym typem lub typem "
 "flag, albo po znaczniku <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 "
@@ -2524,41 +2504,41 @@
 msgstr ""
 "podano <alias value='%s'/>, kiedy „%s” jest juลผ elementem wyliczonego typu"
 
-#: ../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 "podano <alias value='%s'/>, kiedy juลผ podano <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'/> zostaล‚o juลผ okreล›lone"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s” is not in enumerated type"
 msgstr "cel aliasu „%s” nie jest w wyliczonym typie"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s” is not in <choices>"
 msgstr "cel aliasu „%s” nie jest w znaczniku <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> musi zawieraฤ‡ co najmniej jeden znacznik <alias>"
 
-#: ../gio/glib-compile-schemas.c:786
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "Puste nazwy nie sฤ… dozwolone"
 
-#: ../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 "Nieprawidล‚owa nazwa „%s”: nazwy muszฤ… rozpoczynaฤ‡ siฤ™ od maล‚ej litery"
 
-#: ../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 "
@@ -2567,36 +2547,36 @@
 "Nieprawidล‚owa nazwa „%s”: niedozwolony znak „%c”. Dozwolone sฤ… tylko maล‚e "
 "litery, liczby i myล›lniki („-”)"
 
-#: ../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 "Nieprawidล‚owa nazwa „%s”: dwa myล›lniki („--”) nie sฤ… dozwolone"
 
-#: ../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 "Nieprawidล‚owa nazwa „%s”: ostatni znak nie moลผe byฤ‡ myล›lnikiem („-”)"
 
-#: ../gio/glib-compile-schemas.c:834
+#: gio/glib-compile-schemas.c:846
 #, c-format
 msgid "Invalid name “%s”: maximum length is 1024"
 msgstr "Nieprawidล‚owa nazwa „%s”: maksymalna dล‚ugoล›ฤ‡ to 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> zostaล‚o juลผ okreล›lone"
 
-#: ../gio/glib-compile-schemas.c:930
+#: gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of” schema"
 msgstr "Nie moลผna dodaฤ‡ kluczy do schematu „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'> zostaล‚o juลผ okreล›lone"
 
-#: ../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> "
@@ -2605,7 +2585,7 @@
 "<key name='%s'> pokrywa <key name='%s'> w <schema id='%s'>; naleลผy uลผyฤ‡ "
 "znacznika <override>, aby zmodyfikowaฤ‡ wartoล›ฤ‡"
 
-#: ../gio/glib-compile-schemas.c:970
+#: gio/glib-compile-schemas.c:984
 #, c-format
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
@@ -2614,56 +2594,56 @@
 "Dokล‚adnie jedna z wartoล›ci „type”, „enum” lub „flags” musi zostaฤ‡ okreล›lona "
 "jako atrybut znacznika <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'> nie zostaล‚o (jeszcze) okreล›lone."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1018
 #, c-format
 msgid "Invalid GVariant type string “%s”"
 msgstr "Nieprawidล‚owy typ GVariant ciฤ…gu „%s”"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
 msgstr "Podano znacznik <override>, ale schemat nic nie rozszerza"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: gio/glib-compile-schemas.c:1061
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Brak znacznika <key name='%s'> do zastฤ…pienia"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> zostaล‚o juลผ okreล›lone"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> zostaล‚o juลผ okreล›lone"
 
-#: ../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'> rozszerza jeszcze nieistniejฤ…cy schemat „%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'> jest listฤ… jeszcze nieistniejฤ…cego schematu „%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 "Nie moลผna byฤ‡ listฤ… schematów ze ล›cieลผkami"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: gio/glib-compile-schemas.c:1188
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Nie moลผna rozszerzyฤ‡ schematu ze ล›cieลผkฤ…"
 
-#: ../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"
@@ -2671,7 +2651,7 @@
 "<schema id='%s'> jest listฤ… rozszerzajฤ…cฤ… znacznik <schema id='%s'>, który "
 "nie jest listฤ…"
 
-#: ../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” "
@@ -2680,18 +2660,18 @@
 "<schema id='%s' list-of='%s'> rozszerza znacznik <schema id='%s' list-"
 "of='%s'>, ale „%s” nie rozszerza „%s”"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: gio/glib-compile-schemas.c:1225
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr ""
 "ลšcieลผka, jeล›li zostanie podana, musi rozpoczynaฤ‡ siฤ™ i koล„czyฤ‡ ukoล›nikiem"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: gio/glib-compile-schemas.c:1232
 #, c-format
 msgid "The path of a list must end with “:/”"
 msgstr "ลšcieลผka do listy musi koล„czyฤ‡ siฤ™ „:/”"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2700,118 +2680,127 @@
 "Ostrzeลผenie: schemat „%s” ma ล›cieลผkฤ™ „%s”. ลšcieลผki zaczynajฤ…ce siฤ™ od „/"
 "apps/”, „/desktop/” i „/system/” sฤ… przestarzaล‚e."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> zostaล‚o juลผ okreล›lone"
 
-#: ../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 "Tylko jeden element <%s> jest dozwolony wewnฤ…trz <%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 "Element <%s> nie jest dozwolony jako gล‚ówny element"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
 msgstr "Element <default> jest wymagany w znaczniku <key>"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: gio/glib-compile-schemas.c:1627
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "Tekst nie moลผe znajdowaฤ‡ siฤ™ wewnฤ…trz <%s>"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: gio/glib-compile-schemas.c:1695
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Ostrzeลผenie: nieokreล›lone odniesienie do znacznika <schema id='%s'/>"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c: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 "Podano opcjฤ™ --strict; koล„czenie dziaล‚ania.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Caล‚y plik zostaล‚ zignorowany.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ignorowanie tego pliku.\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 ""
 "Brak klucza „%s” w schemacie „%s”, jak okreล›lono w pliku zastฤ…pienia „%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 "; ignorowanie zastฤ…pienia dla tego klucza.\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 " oraz podano opcjฤ™ --strict; koล„czenie dziaล‚ania.\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 ""
+"nie moลผna dostarczyฤ‡ zastฤ…pieล„ wedล‚ug ล›rodowiska dla lokalizowanego klucza "
+"„%s” w schemacie „%s” (plik zastฤ…pienia „%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 ""
 "bล‚ฤ…d podczas przetwarzania klucza „%s” w schemacie „%s”, jak okreล›lono "
 "w pliku zastฤ…pienia „%s”: %s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: gio/glib-compile-schemas.c:2021
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Ignorowanie zastฤ…pienia dla tego klucza.\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 ""
 "zastฤ…pienie dla klucza „%s” w schemacie „%s” w pliku zastฤ…pienia „%s” jest "
 "poza zakresem podanym w schemacie"
 
-#: ../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 ""
 "zastฤ…pienie dla klucza „%s” w schemacie „%s” w pliku zastฤ…pienia „%s” nie "
 "znajduje siฤ™ na liล›cie prawidล‚owych wyborów"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr "gdzie przechowywaฤ‡ plik schemas.compiled"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr "Przerywa po kaลผdym bล‚ฤ™dzie w schematach"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr "Bez zapisywania pliku gschema.compiled"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr "Bez wymuszania ograniczeล„ nazw kluczy"
 
-#: ../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"
@@ -2822,32 +2811,32 @@
 "rozszerzenie .gschema.xml, a pliki pamiฤ™ci podrฤ™cznej\n"
 "nazywajฤ… siฤ™ 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 "Naleลผy podaฤ‡ dokล‚adnie jednฤ… nazwฤ™ katalogu\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Nie odnaleziono plików schematów: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "nic.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "usuniฤ™to istniejฤ…cy plik wyjล›ciowy.\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 "Nieprawidล‚owa nazwa pliku %s"
 
-#: ../gio/glocalfile.c:1105
+#: gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Bล‚ฤ…d podczas pobierania informacji o systemie plików dla %s: %s"
@@ -2856,315 +2845,322 @@
 #. * 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 "Nie odnaleziono punktu montowania zawierajฤ…cego plik %s"
 
-#: ../gio/glocalfile.c:1267
+#: gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Nie moลผna zmieniฤ‡ nazwy katalogu gล‚ównego"
 
-#: ../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 "Bล‚ฤ…d podczas zmieniania nazwy pliku %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Nie moลผna zmieniฤ‡ nazwy pliku, plik o takiej nazwie juลผ istnieje"
 
-#: ../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 "Nieprawidล‚owa nazwa pliku"
 
-#: ../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 "Bล‚ฤ…d podczas otwierania pliku %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Bล‚ฤ…d podczas usuwania pliku %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: gio/glocalfile.c:1925
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Bล‚ฤ…d podczas przenoszenia pliku %s do kosza: %s"
 
-#: ../gio/glocalfile.c:2020
+#: gio/glocalfile.c:1948
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Nie moลผna utworzyฤ‡ katalogu kosza %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: gio/glocalfile.c:1970
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Nie moลผna odnaleลบฤ‡ gล‚ównego katalogu dla kosza %s"
 
-#: ../gio/glocalfile.c:2119 ../gio/glocalfile.c:2139
+#: gio/glocalfile.c:1979
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr ""
+"Przenoszenie do kosza na wewnฤ™trznych punktach montowania systemu nie jest "
+"obsล‚ugiwane"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Nie moลผna odnaleลบฤ‡ lub utworzyฤ‡ katalogu kosza dla %s"
 
-#: ../gio/glocalfile.c:2174
+#: gio/glocalfile.c:2118
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Nie moลผna utworzyฤ‡ pliku informacji o koszu dla %s: %s"
 
-#: ../gio/glocalfile.c:2233
+#: gio/glocalfile.c:2178
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr "Nie moลผna przenieล›ฤ‡ pliku %s do kosza pomiฤ™dzy systemami plików"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: gio/glocalfile.c:2182 gio/glocalfile.c:2238
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Nie moลผna przenieล›ฤ‡ pliku %s do kosza: %s"
 
-#: ../gio/glocalfile.c:2299
+#: gio/glocalfile.c:2244
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Nie moลผna przenieล›ฤ‡ pliku %s do kosza"
 
-#: ../gio/glocalfile.c:2325
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Bล‚ฤ…d podczas tworzenia katalogu %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "System plików nie obsล‚uguje dowiฤ…zaล„ symbolicznych"
 
-#: ../gio/glocalfile.c:2357
+#: gio/glocalfile.c:2302
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Bล‚ฤ…d podczas tworzenia dowiฤ…zania symbolicznego %s: %s"
 
-#: ../gio/glocalfile.c:2363 ../glib/gfileutils.c:2127
+#: gio/glocalfile.c:2308 glib/gfileutils.c:2138
 msgid "Symbolic links not supported"
 msgstr "Dowiฤ…zania symboliczne nie sฤ… obsล‚ugiwane"
 
-#: ../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 "Bล‚ฤ…d podczas przenoszenia pliku %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "Nie moลผna przenieล›ฤ‡ katalogu na katalog"
 
-#: ../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 "Utworzenie pliku kopii zapasowej siฤ™ nie powiodล‚o"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Bล‚ฤ…d podczas usuwania pliku docelowego: %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "Przenoszenie miฤ™dzy punktami montowania nie jest obsล‚ugiwane"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Nie moลผna ustaliฤ‡ wykorzystania dysku %s: %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "Wartoล›ฤ‡ atrybutu nie moลผe byฤ‡ pusta"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Nieprawidล‚owy typ atrybutu (oczekiwano „string”)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Nieprawidล‚owa nazwa rozszerzonego atrybutu"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Bล‚ฤ…d podczas ustawiania rozszerzonego atrybutu „%s”: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (nieprawidล‚owe kodowanie)"
 
-#: ../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 "Bล‚ฤ…d podczas pobierania informacji o pliku „%s”: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: gio/glocalfileinfo.c:2045
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Bล‚ฤ…d podczas pobierania informacji o deskryptorze pliku: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Nieprawidล‚owy typ atrybutu (oczekiwano „uint32”)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Nieprawidล‚owy typ atrybutu (oczekiwano „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 "Nieprawidล‚owy typ atrybutu (oczekiwano „byte string”)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "Nie moลผna ustawiฤ‡ uprawnieล„ na dowiฤ…zaniach symbolicznych"
 
-#: ../gio/glocalfileinfo.c:2200
+#: gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Bล‚ฤ…d podczas ustawiania uprawnieล„: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Bล‚ฤ…d podczas ustawiania wล‚aล›ciciela: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "dowiฤ…zanie symboliczne nie moลผe byฤ‡ puste"
 
-#: ../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 "Bล‚ฤ…d podczas ustawiania dowiฤ…zania symbolicznego: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 "Bล‚ฤ…d podczas ustawiania dowiฤ…zania symbolicznego: plik nie jest dowiฤ…zaniem "
 "symbolicznym"
 
-#: ../gio/glocalfileinfo.c:2419
+#: gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Bล‚ฤ…d podczas ustawiania czasu modyfikacji lub dostฤ™pu: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "Kontekst SELinux nie moลผe byฤ‡ pusty"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Bล‚ฤ…d podczas ustawiania kontekstu SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux nie jest wล‚ฤ…czony w tym systemie"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Ustawianie atrybutu %s nie jest obsล‚ugiwane"
 
-#: ../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 "Bล‚ฤ…d podczas odczytywania z pliku: %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 "Bล‚ฤ…d podczas wyszukiwania w pliku: %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 "Bล‚ฤ…d podczas zamykania pliku: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr "Nie moลผna odnaleลบฤ‡ domyล›lnego typu monitora pliku lokalnego"
 
-#: ../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 "Bล‚ฤ…d podczas zapisywania do pliku: %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Bล‚ฤ…d podczas usuwania odnoล›nika do starej kopii zapasowej: %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 "Bล‚ฤ…d podczas tworzenia kopii zapasowej: %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Bล‚ฤ…d podczas zmieniania nazwy pliku tymczasowego: %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 "Bล‚ฤ…d podczas skracania pliku: %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 "Bล‚ฤ…d podczas otwierania pliku „%s”: %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Plik docelowy jest katalogiem"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Plik docelowy nie jest zwykล‚ym plikiem"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "Plik zostaล‚ zmieniony poza programem"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Bล‚ฤ…d podczas usuwania starego pliku: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Podano nieprawidล‚owy obiekt GSeekType"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Nieprawidล‚owe ลผฤ…danie wyszukiwania"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "Nie moลผna skróciฤ‡ GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Potok wyjล›ciowy pamiฤ™ci nie obsล‚uguje zmiany rozmiaru"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Zmiana rozmiaru potoku wyjล›ciowego pamiฤ™ci siฤ™ nie powiodล‚a"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3172,32 +3168,32 @@
 "Iloล›ฤ‡ pamiฤ™ci wymagana dla przetworzenia zapisu jest wiฤ™ksza od dostฤ™pnej "
 "przestrzeni adresowej"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "Zaลผฤ…dano przejล›cia przed poczฤ…tkiem potoku"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "Zaลผฤ…dano przejล›cia poza koniec potoku"
 
 #. 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 "punkt montowania nie obsล‚uguje odmontowania"
 
 #. 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 "punkt montowania nie obsล‚uguje wysuniฤ™cia"
 
 #. 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 ""
 "punkt montowania nie obsล‚uguje odmontowania lub „unmount_with_operation”"
@@ -3205,109 +3201,108 @@
 #. 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 "punkt montowania nie obsล‚uguje wysuniฤ™cia lub „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 "punkt montowania nie obsล‚uguje ponownego montowania"
 
 #. 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 "punkt montowania nie obsล‚uguje rozpoznania typu zawartoล›ci"
 
 #. 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 ""
 "punkt montowania nie obsล‚uguje synchronicznego rozpoznania typu zawartoล›ci"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "Nazwa komputera „%s” zawiera „[”, ale nie „]”"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Sieฤ‡ jest niedostฤ™pna"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Komputer jest niedostฤ™pny"
 
-#: ../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 "Nie moลผna utworzyฤ‡ monitora sieci: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "Nie moลผna utworzyฤ‡ monitora sieci: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Nie moลผna uzyskaฤ‡ stanu sieci: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Wersja usล‚ugi NetworkManager jest za stara"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "Potok wyjล›ciowy nie obsล‚uguje zapisu"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Potok ลบródล‚owy jest juลผ zamkniฤ™ty"
 
-#: ../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 "Bล‚ฤ…d podczas rozwiฤ…zywania „%s”: %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Nieprawidล‚owa domena"
 
-#: ../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 "Zasób w „%s” nie istnieje"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s” failed to decompress"
 msgstr "Dekompresowanie zasobu w „%s” siฤ™ nie powiodล‚o"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s” is not a directory"
 msgstr "Zasób w „%s” nie jest katalogiem"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Potok wejล›ciowy nie obsล‚uguje szukania"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
 msgstr "Wyล›wietla listฤ™ sekcji zawierajฤ…cych zasoby w PLIKU w formacie 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"
@@ -3317,16 +3312,15 @@
 "Jeล›li podano SEKCJฤ˜, to wyล›wietla tylko zasoby w tej sekcji\n"
 "Jeล›li podano ลšCIEลปKฤ˜, to wyล›wietla tylko pasujฤ…ce zasoby"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:503 gio/gresource-tool.c:513
 msgid "FILE [PATH]"
 msgstr "PLIK [ลšCIEลปKA]"
 
-#: ../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 "SEKCJA"
 
-#: ../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"
@@ -3338,15 +3332,15 @@
 "Jeล›li podano ลšCIEลปKฤ˜, to wyล›wietla tylko pasujฤ…ce zasoby\n"
 "Szczegóล‚y zawierajฤ… sekcjฤ™, rozmiar i kompresjฤ™"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:519
 msgid "Extract a resource file to stdout"
 msgstr "Wydobywa plik zasobu do standardowego wyjล›cia"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:520
 msgid "FILE PATH"
 msgstr "PLIK ลšCIEลปKA"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:534
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3374,7 +3368,7 @@
 "Polecenie „gresource help POLECENIE” wyล›wietla szczegóล‚owฤ… pomoc.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:548
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3389,21 +3383,21 @@
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:555
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SEKCJA    (Opcjonalna) nazwa sekcji formatu 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 "  POLECENIE (Opcjonalne) polecenie do wyjaล›nienia\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:565
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr ""
 "  PLIK      Plik w formacie ELF (plik binarny lub\n"
 "            biblioteka wspóล‚dzielona)\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"
@@ -3411,91 +3405,83 @@
 "  PLIK      Plik w formacie ELF (plik binarny lub biblioteka\n"
 "            wspóล‚dzielona) lub skompilowany plik zasobów\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:572
 msgid "[PATH]"
 msgstr "[ลšCIEลปKA]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:574
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr "  ลšCIEลปKA   (Opcjonalna) ล›cieลผka do zasobu (moลผe byฤ‡ czฤ™ล›ciowa)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:575
 msgid "PATH"
 msgstr "ลšCIEลปKA"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:577
 msgid "  PATH      A resource path\n"
 msgstr "  ลšCIEลปKA   ลšcieลผka do zasobu\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 "Brak schematu „%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 "Nie moลผna przenosiฤ‡ schematu „%s” (nie moลผna podaฤ‡ ล›cieลผki)\n"
 
-#: ../gio/gsettings-tool.c:78
+#: gio/gsettings-tool.c:78
 #, c-format
 msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr "Moลผna przenosiฤ‡ schemat „%s” (naleลผy podaฤ‡ ล›cieลผkฤ™)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Podano pustฤ… ล›cieลผkฤ™.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "ลšcieลผka musi rozpoczynaฤ‡ siฤ™ od ukoล›nika (/)\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "ลšcieลผka musi koล„czyฤ‡ siฤ™ ukoล›nikiem (/)\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "ลšcieลผka nie moลผe zawieraฤ‡ dwóch sฤ…siadujฤ…cych ukoล›ników (//)\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 "Podana wartoล›ฤ‡ jest poza prawidล‚owym zakresem\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "Klucz nie jest zapisywalny\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr ""
 "Wyล›wietla listฤ™ zainstalowanych schematów (których nie moลผna przenosiฤ‡)"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Wyล›wietla listฤ™ zainstalowanych schematów (które moลผna przenosiฤ‡)"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Wyล›wietla listฤ™ kluczy w SCHEMACIE"
 
-#: ../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 "SCHEMAT[:ลšCIEลปKA]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Wyล›wietla listฤ™ elementów potomnych SCHEMATU"
 
-#: ../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"
@@ -3503,49 +3489,48 @@
 "Wyล›wietla listฤ™ kluczy i wartoล›ci, rekursywnie\n"
 "Jeล›li nie podano SCHEMATU, to wyล›wietla listฤ™ wszystkich kluczy\n"
 
-#: ../gio/gsettings-tool.c:607
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHEMAT[:ลšCIEลปKA]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Uzyskuje wartoล›ฤ‡ KLUCZA"
 
-#: ../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 "SCHEMAT[:ลšCIEลปKA] KLUCZ"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Odpytuje zakres prawidล‚owych wartoล›ci KLUCZA"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Odpytuje opis KLUCZA"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Ustawia wartoล›ฤ‡ KLUCZA na WARTOลšฤ†"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMAT[:ลšCIEลปKA] KLUCZ WARTOลšฤ†"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Przywraca KLUCZ na jego domyล›lnฤ… wartoล›ฤ‡"
 
-#: ../gio/gsettings-tool.c:642
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Przywraca wszystkie klucze w SCHEMACIE do domyล›lnych wartoล›ci"
 
-#: ../gio/gsettings-tool.c:648
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Sprawdza, czy KLUCZ jest zapisywalny"
 
-#: ../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"
@@ -3555,11 +3540,11 @@
 "Jeล›li nie podano KLUCZA, to monitoruje wszystkie klucze w SCHEMACIE.\n"
 "Uลผycie ^C zatrzymuje monitorowanie.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMAT[:ลšCIEลปKA] [KLUCZ]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3609,7 +3594,7 @@
 "Polecenie „gsettings help POLECENIE” wyล›wietla szczegóล‚owฤ… pomoc.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3624,11 +3609,11 @@
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  KATALOG-SCHEMATÓW Katalog do wyszukiwania dodatkowych schematów\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"
@@ -3636,389 +3621,383 @@
 "  SCHEMAT   Identyfikator schematu\n"
 "  ลšCIEลปKA   ลšcieลผka (dla schematów, które moลผna przenosiฤ‡)\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  KLUCZ     (Opcjonalny) klucz w schemacie\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  KLUCZ     Klucz w schemacie\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  WARTOลšฤ†   Wartoล›ฤ‡ do ustawienia\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "Nie moลผna wczytaฤ‡ schematów z %s: %s\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Nie zainstalowano schematów\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Podano pustฤ… nazwฤ™ schematu\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s”\n"
 msgstr "Brak klucza „%s”\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Nieprawidล‚owe gniazdo, nie zainicjowano"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Nieprawidล‚owe gniazdo, zainicjowanie siฤ™ nie powiodล‚o z powodu: %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 msgid "Socket is already closed"
 msgstr "Gniazdo jest juลผ zamkniฤ™te"
 
-#: ../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 "Przekroczono czas oczekiwania wejล›cia/wyjล›cia gniazda"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "tworzenie GSocket z 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 "Nie moลผna utworzyฤ‡ gniazda: %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Podano nieznanฤ… rodzinฤ™"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Podano nieznany protokóล‚"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr "Nie moลผna uลผywaฤ‡ dziaล‚aล„ datagramowych na niedatagramowych gniazdach."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Nie moลผna uลผywaฤ‡ dziaล‚aล„ datagramowych na gniazdach z ustawionym czasem "
 "oczekiwania."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nie moลผna uzyskaฤ‡ lokalnego adresu: %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nie moลผna uzyskaฤ‡ zdalnego adresu: %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "nie moลผna nasล‚uchiwaฤ‡: %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Bล‚ฤ…d podczas dowiฤ…zywania do adresu: %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 "Bล‚ฤ…d podczas doล‚ฤ…czania do grupy 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 "Bล‚ฤ…d podczas opuszczania grupy multicast: %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
 msgstr "Brak obsล‚ugi multicastu dla konkretnych ลบródeล‚"
 
-#: ../gio/gsocket.c:2375
+#: gio/gsocket.c:2375
 msgid "Unsupported socket family"
 msgstr "Nieobsล‚ugiwana rodzina gniazda"
 
-#: ../gio/gsocket.c:2393
+#: gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "konkretne ลบródล‚a nie sฤ… adresem 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 "Nie odnaleziono interfejsu: %s"
 
-#: ../gio/gsocket.c:2427
+#: gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Nazwa interfejsu jest za dล‚uga"
 
-#: ../gio/gsocket.c:2463
+#: gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "Brak obsล‚ugi multicastu IPv4 dla konkretnych ลบródeล‚"
 
-#: ../gio/gsocket.c:2521
+#: gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "Brak obsล‚ugi multicastu IPv6 dla konkretnych ลบródeล‚"
 
-#: ../gio/gsocket.c:2730
+#: gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Bล‚ฤ…d podczas akceptowania poล‚ฤ…czenia: %s"
 
-#: ../gio/gsocket.c:2854
+#: gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Trwa poล‚ฤ…czenie"
 
-#: ../gio/gsocket.c:2903
+#: gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Nie moลผna uzyskaฤ‡ oczekujฤ…cego bล‚ฤ™du: "
 
-#: ../gio/gsocket.c:3073
+#: gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Bล‚ฤ…d podczas pobierania danych: %s"
 
-#: ../gio/gsocket.c:3268
+#: gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Bล‚ฤ…d podczas wysyล‚ania danych: %s"
 
-#: ../gio/gsocket.c:3455
+#: gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Nie moลผna zamknฤ…ฤ‡ gniazda: %s"
 
-#: ../gio/gsocket.c:3536
+#: gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Bล‚ฤ…d podczas zamykania gniazda: %s"
 
-#: ../gio/gsocket.c:4213
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Oczekiwanie na warunek gniazda: %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 "Bล‚ฤ…d podczas wysyล‚ania komunikatu: %s"
 
-#: ../gio/gsocket.c:4711
+#: gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage nie jest obsล‚ugiwane w systemie 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 "Bล‚ฤ…d podczas pobierania komunikatu: %s"
 
-#: ../gio/gsocket.c:5735
+#: gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Nie moลผna odczytaฤ‡ danych uwierzytelniajฤ…cych gniazda: %s"
 
-#: ../gio/gsocket.c:5744
+#: gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials nie jest zaimplementowane dla tego systemu "
 "operacyjnego"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Nie moลผna poล‚ฤ…czyฤ‡ z serwerem poล›rednika %s: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Nie moลผna poล‚ฤ…czyฤ‡ z %s: "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "Nie moลผna poล‚ฤ…czyฤ‡: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Nieznany bล‚ฤ…d poล‚ฤ…czenia"
 
-#: ../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 "Poล›redniczenie przez poล‚ฤ…czenie niebฤ™dฤ…ce TCP nie jest obsล‚ugiwane."
 
-#: ../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 "Protokóล‚ poล›rednika „%s” nie jest obsล‚ugiwany."
 
-#: ../gio/gsocketlistener.c:218
+#: gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Nasล‚uch jest juลผ zamkniฤ™ty"
 
-#: ../gio/gsocketlistener.c:264
+#: gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Dodane gniazdo jest zamkniฤ™te"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4 nie obsล‚uguje adresu IPv6 „%s”"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "Nazwa uลผytkownika jest za dล‚uga dla protokoล‚u SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "Nazwa komputera „%s” jest za dล‚uga dla protokoล‚u SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "Serwer nie jest serwerem poล›rednika SOCKSv4."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "Poล‚ฤ…czenie przez serwer SOCKSv4 zostaล‚o odrzucone"
 
-#: ../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 "Serwer nie jest serwerem poล›rednika SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "Poล›rednik SOCKSv5 wymaga uwierzytelnienia."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
 msgstr ""
 "SOCKSv5 wymaga metody uwierzytelnienia nieobsล‚ugiwanฤ… przez bibliotekฤ™ GLib."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr "Nazwa uลผytkownika lub hasล‚o sฤ… za dล‚ugie dla protokoล‚u SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "Uwierzytelnienie SOCKSv5 siฤ™ nie powiodล‚o z powodu bล‚ฤ™dnej nazwy uลผytkownika "
 "lub hasล‚a."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "Nazwa komputera „%s” jest za dล‚uga dla protokoล‚u SOCKSv5"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "Serwer poล›rednika SOCKSv5 uลผywa nieznanego typu adresu."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "Wewnฤ™trzny bล‚ฤ…d serwera poล›rednika SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "Poล‚ฤ…czenia SOCKSv5 nie sฤ… dozwolone przez zestaw reguล‚."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "Komputer jest niedostฤ™pny przez serwer SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "Sieฤ‡ jest niedostฤ™pna przez serwer SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Poล‚ฤ…czenie przez poล›rednika SOCKSv5 zostaล‚o odrzucone."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "Poล›rednik SOCKSv5 nie obsล‚uguje polecenia „connect”."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "Poล›rednik SOCKSv5 nie obsล‚uguje podanego typu adresu."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Nieznany bล‚ฤ…d poล›rednika SOCKSv5."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Nie moลผna obsล‚uลผyฤ‡ wersji %d kodowania GThemedIcon"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "Nie odnaleziono prawidล‚owych adresów"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "Bล‚ฤ…d podczas odwrotnego rozwiฤ…zywania „%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 "Brak wpisu DNS ลผฤ…danego typu dla „%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 "Nie moลผna tymczasowo rozwiฤ…zaฤ‡ „%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 "Bล‚ฤ…d podczas rozwiฤ…zywania „%s”"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "Nie moลผna odszyfrowaฤ‡ klucza prywatnego zakodowanego za pomocฤ… PEM"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "Nie odnaleziono klucza prywatnego zakodowanego za pomocฤ… PEM"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "Nie moลผna przetworzyฤ‡ klucza prywatnego zakodowanego za pomocฤ… PEM"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "Nie odnaleziono certyfikatu zakodowanego za pomocฤ… PEM"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "Nie moลผna przetworzyฤ‡ certyfikatów zakodowanych za pomocฤ… 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."
@@ -4028,7 +4007,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4036,11 +4015,11 @@
 "Kilka podanych haseล‚ byล‚o niepoprawnych, dostฤ™p zostanie zablokowany po "
 "dalszych niepowodzeniach."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Podane hasล‚o jest niepoprawne."
 
-#: ../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"
@@ -4048,11 +4027,11 @@
 msgstr[1] "Oczekiwano jeden komunikat kontrolny, otrzymano %d"
 msgstr[2] "Oczekiwano jeden komunikat kontrolny, otrzymano %d"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Nieoczekiwany typ podrzฤ™dnych danych"
 
-#: ../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"
@@ -4060,280 +4039,279 @@
 msgstr[1] "Oczekiwano jedno fd, a otrzymano %d\n"
 msgstr[2] "Oczekiwano jedno fd, a otrzymano %d\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Pobrano nieprawidล‚owe fd"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Bล‚ฤ…d podczas wysyล‚ania danych uwierzytelniajฤ…cych: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr ""
 "Bล‚ฤ…d podczas sprawdzania, czy zmienna SO_PASSCRED zostaล‚a wล‚ฤ…czona dla "
 "gniazda: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Bล‚ฤ…d podczas wล‚ฤ…czania zmiennej 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 ""
 "Oczekiwano odczytania pojedynczego bajtu dla odbieranych danych "
 "uwierzytelniajฤ…cych, ale odczytano zero bajtów"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Nie oczekiwano komunikatu kontrolnego, a otrzymano %d"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Bล‚ฤ…d podczas wyล‚ฤ…czania zmiennej 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 "Bล‚ฤ…d podczas odczytywania z deskryptora pliku: %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 "Bล‚ฤ…d podczas zamykania deskryptora pliku: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Katalog gล‚ówny systemu plików"
 
-#: ../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 "Bล‚ฤ…d podczas zapisywania do deskryptora pliku: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Abstrakcyjne adresy gniazd domen systemu UNIX nie sฤ… obsล‚ugiwane w tym "
 "systemie"
 
-#: ../gio/gvolume.c:437
+#: gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "wolumin nie obsล‚uguje wysuniฤ™cia"
 
 #. 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 "wolumin nie obsล‚uguje wysuniฤ™cia lub „eject_with_operation”"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Bล‚ฤ…d podczas odczytywania z pliku obsล‚ugi: %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 "Bล‚ฤ…d podczas zamykania pliku obsล‚ugi: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Bล‚ฤ…d podczas zapisywania do pliku obsล‚ugi: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Brak wystarczajฤ…cej iloล›ci pamiฤ™ci"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "Bล‚ฤ…d wewnฤ™trzny: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Wymagane jest danych wejล›ciowych"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Nieprawidล‚owe skompresowane dane"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Adres, na którym nasล‚uchiwaฤ‡"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Ignorowane, dla zgodnoล›ci z GTestDbus"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Wyล›wietla adres"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Wyล›wietla adres w trybie powล‚oki"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Uruchamia usล‚ugฤ™ D-Bus"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Bล‚ฤ™dne parametry\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Nieoczekiwany atrybut „%s” dla elementu „%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 "Nie odnaleziono atrybutu „%s” dla elementu „%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 "Nieoczekiwany znacznik „%s”, oczekiwano znacznika „%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 "Nieoczekiwany znacznik „%s” wewnฤ…trz „%s”"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr "Nie moลผna odnaleลบฤ‡ prawidล‚owego pliku zakล‚adek w katalogach danych"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:1958
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Zakล‚adka dla adresu URI „%s” juลผ istnieje"
 
-#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
-#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
-#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
-#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
-#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
-#: ../glib/gbookmarkfile.c: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 "Nie odnaleziono zakล‚adki dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2336
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Nie zdefiniowano typu MIME w zakล‚adce dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2421
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "Nie zdefiniowano prywatnej flagi w zakล‚adce dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2800
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "Nie ustawiono grup w zakล‚adce dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c: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 "ลปaden program o nazwie „%s” nie zarejestrowaล‚ zakล‚adki dla „%s”"
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3379
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Rozwiniฤ™cie wiersza exec „%s” z adresem URI „%s” siฤ™ nie powiodล‚o"
 
-#: ../glib/gconvert.c:473
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "Nieprzedstawialny znak na wejล›ciu konwersji"
 
-#: ../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 "Na koล„cu wejล›cia wystฤ™puje sekwencja odpowiadajฤ…ca czฤ™ล›ci znaku"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Nie moลผna skonwertowaฤ‡ napisu zastฤ™pczego „%s” na zestaw znaków „%s”"
 
-#: ../glib/gconvert.c:940
+#: glib/gconvert.c:940
 msgid "Embedded NUL byte in conversion input"
 msgstr "Osadzony bajt NUL na wejล›ciu konwersji"
 
-#: ../glib/gconvert.c:961
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "Osadzony bajt NUL na wyjล›ciu konwersji"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr ""
 "Adres URI „%s” nie jest bezwzglฤ™dnym adresem URI, uลผywajฤ…cym schematu „file”"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "Adres URI lokalnego pliku „%s” nie moลผe zawieraฤ‡ znaku „#”"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "Adres URI „%s” jest nieprawidล‚owy"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "Nazwa komputera w adresie URI „%s” jest nieprawidล‚owa"
 
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "Adres URI „%s” zawiera nieprawidล‚owe znaki sterujฤ…ce"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 msgid "The pathname “%s” is not an absolute path"
 msgstr "ลšcieลผka „%s” nie jest ล›cieลผkฤ… bezwzglฤ™dnฤ…"
 
 #. 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, %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 "%-d %b %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"
@@ -4354,62 +4332,62 @@
 #. * 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 "styczeล„"
 
-#: ../glib/gdatetime.c:253
+#: glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "luty"
 
-#: ../glib/gdatetime.c:255
+#: glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "marzec"
 
-#: ../glib/gdatetime.c:257
+#: glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "kwiecieล„"
 
-#: ../glib/gdatetime.c:259
+#: glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "maj"
 
-#: ../glib/gdatetime.c:261
+#: glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "czerwiec"
 
-#: ../glib/gdatetime.c:263
+#: glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "lipiec"
 
-#: ../glib/gdatetime.c:265
+#: glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "sierpieล„"
 
-#: ../glib/gdatetime.c:267
+#: glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "wrzesieล„"
 
-#: ../glib/gdatetime.c:269
+#: glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "paลบdziernik"
 
-#: ../glib/gdatetime.c:271
+#: glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "listopad"
 
-#: ../glib/gdatetime.c:273
+#: glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "grudzieล„"
@@ -4431,132 +4409,132 @@
 #. * 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 "sty"
 
-#: ../glib/gdatetime.c:307
+#: glib/gdatetime.c:317
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "lut"
 
-#: ../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 "kwi"
 
-#: ../glib/gdatetime.c:313
+#: glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "maj"
 
-#: ../glib/gdatetime.c:315
+#: glib/gdatetime.c:325
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "cze"
 
-#: ../glib/gdatetime.c:317
+#: glib/gdatetime.c:327
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "lip"
 
-#: ../glib/gdatetime.c:319
+#: glib/gdatetime.c:329
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "sie"
 
-#: ../glib/gdatetime.c:321
+#: glib/gdatetime.c:331
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "wrz"
 
-#: ../glib/gdatetime.c:323
+#: glib/gdatetime.c:333
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "paลบ"
 
-#: ../glib/gdatetime.c:325
+#: glib/gdatetime.c:335
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "lis"
 
-#: ../glib/gdatetime.c:327
+#: glib/gdatetime.c:337
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "gru"
 
-#: ../glib/gdatetime.c:342
+#: glib/gdatetime.c:352
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "poniedziaล‚ek"
 
-#: ../glib/gdatetime.c:344
+#: glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "wtorek"
 
-#: ../glib/gdatetime.c:346
+#: glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "ล›roda"
 
-#: ../glib/gdatetime.c:348
+#: glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "czwartek"
 
-#: ../glib/gdatetime.c:350
+#: glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "piฤ…tek"
 
-#: ../glib/gdatetime.c:352
+#: glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "sobota"
 
-#: ../glib/gdatetime.c:354
+#: glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "niedziela"
 
-#: ../glib/gdatetime.c:369
+#: glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "pon"
 
-#: ../glib/gdatetime.c:371
+#: glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "wto"
 
-#: ../glib/gdatetime.c:373
+#: glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "ล›ro"
 
-#: ../glib/gdatetime.c:375
+#: glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "czw"
 
-#: ../glib/gdatetime.c:377
+#: glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "piฤ…"
 
-#: ../glib/gdatetime.c:379
+#: glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "sob"
 
-#: ../glib/gdatetime.c:381
+#: glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "nie"
@@ -4578,62 +4556,62 @@
 #. * (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 "stycznia"
 
-#: ../glib/gdatetime.c:443
+#: glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "lutego"
 
-#: ../glib/gdatetime.c:445
+#: glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "marca"
 
-#: ../glib/gdatetime.c:447
+#: glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "kwietnia"
 
-#: ../glib/gdatetime.c:449
+#: glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "maja"
 
-#: ../glib/gdatetime.c:451
+#: glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "czerwca"
 
-#: ../glib/gdatetime.c:453
+#: glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "lipca"
 
-#: ../glib/gdatetime.c:455
+#: glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "sierpnia"
 
-#: ../glib/gdatetime.c:457
+#: glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "wrzeล›nia"
 
-#: ../glib/gdatetime.c:459
+#: glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "paลบdziernika"
 
-#: ../glib/gdatetime.c:461
+#: glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "listopada"
 
-#: ../glib/gdatetime.c:463
+#: glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "grudnia"
@@ -4655,84 +4633,84 @@
 #. * 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 "sty"
 
-#: ../glib/gdatetime.c:526
+#: glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "lut"
 
-#: ../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 "kwi"
 
-#: ../glib/gdatetime.c:532
+#: glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "maj"
 
-#: ../glib/gdatetime.c:534
+#: glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "cze"
 
-#: ../glib/gdatetime.c:536
+#: glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "lip"
 
-#: ../glib/gdatetime.c:538
+#: glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "sie"
 
-#: ../glib/gdatetime.c:540
+#: glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "wrz"
 
-#: ../glib/gdatetime.c:542
+#: glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "paลบ"
 
-#: ../glib/gdatetime.c:544
+#: glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "lis"
 
-#: ../glib/gdatetime.c:546
+#: glib/gdatetime.c:564
 msgctxt "abbreviated month name with day"
 msgid "Dec"
 msgstr "gru"
 
 #. 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 "Bล‚ฤ…d podczas otwierania katalogu „%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”"
@@ -4740,118 +4718,117 @@
 msgstr[1] "Nie moลผna przydzieliฤ‡ %lu bajtów do odczytu pliku „%s”"
 msgstr[2] "Nie moลผna przydzieliฤ‡ %lu bajtów do odczytu pliku „%s”"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "Bล‚ฤ…d podczas odczytywania pliku „%s”: %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s” is too large"
 msgstr "Plik „%s” jest za duลผy"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "Odczytanie z pliku „%s” siฤ™ nie powiodล‚o: %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 "Otwarcie pliku „%s” siฤ™ nie powiodล‚o: %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr ""
 "Uzyskanie atrybutów pliku „%s” siฤ™ nie powiodล‚o: funkcja fstat() zwróciล‚a "
 "bล‚ฤ…d: %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr ""
 "Otwarcie pliku „%s” siฤ™ nie powiodล‚o: funkcja fdopen() zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr ""
 "Zmiana nazwy pliku „%s” na „%s” siฤ™ nie powiodล‚a: funkcja g_rename() "
 "zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: glib/gfileutils.c:1057 glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s”: %s"
 msgstr "Utworzenie pliku „%s” siฤ™ nie powiodล‚o: %s"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr ""
 "Zapisanie pliku „%s” siฤ™ nie powiodล‚o: funkcja write() zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr ""
 "Zapisanie pliku „%s” siฤ™ nie powiodล‚o: funkcja fsync() zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gfileutils.c:1251
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr ""
 "Nie moลผna usunฤ…ฤ‡ istniejฤ…cego pliku „%s”: funkcja g_unlink() zwróciล‚a bล‚ฤ…d: "
 "%s"
 
-#: ../glib/gfileutils.c:1530
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "Szablon „%s” jest nieprawidล‚owy, nie powinien on zawieraฤ‡ „%s”"
 
-#: ../glib/gfileutils.c:1543
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Szablon „%s” nie zawiera XXXXXX"
 
-#: ../glib/gfileutils.c:2105
+#: glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Odczytanie dowiฤ…zania symbolicznego „%s” siฤ™ nie powiodล‚o: %s"
 
-#: ../glib/giochannel.c:1389
+#: glib/giochannel.c:1389
 #, c-format
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Nie moลผna otworzyฤ‡ konwertera z „%s” na „%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 ""
 "Nie moลผna wykonaฤ‡ surowego odczytu w zmiennej 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 "W buforze odczytu pozostaล‚y nieskonwertowane dane"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "Na koล„cu kanaล‚u wystฤ™puje sekwencja odpowiadajฤ…ca czฤ™ล›ci znaku"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Nie moลผna wykonaฤ‡ surowego odczytu w zmiennej g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:788
+#: glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr ""
 "Nie moลผna odnaleลบฤ‡ prawidล‚owego pliku klucza w przeszukiwanych katalogach"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "To nie jest zwykล‚y plik"
 
-#: ../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"
@@ -4859,45 +4836,45 @@
 "Plik klucza zawiera wiersz „%s”, który nie jest parฤ… klucz-wartoล›ฤ‡, grupฤ… "
 "lub komentarzem"
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Nieprawidล‚owa nazwa grupy: %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Plik klucza nie rozpoczyna siฤ™ od grupy"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Nieprawidล‚owa nazwa klucza: %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "Plik klucza zawiera nieobsล‚ugiwane kodowanie „%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 "Plik klucza nie zawiera grupy „%s”"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Plik klucza nie zawiera klucza „%s” w grupie „%s”"
 
-#: ../glib/gkeyfile.c: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 ""
 "Plik klucza zawiera klucz „%s” o wartoล›ci „%s”, która nie jest zapisana "
 "w 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."
@@ -4905,7 +4882,7 @@
 "Plik klucza zawiera klucz „%s”, który ma wartoล›ฤ‡ niemoลผliwฤ… do "
 "zinterpretowania."
 
-#: ../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 "
@@ -4914,227 +4891,227 @@
 "Plik klucza zawiera klucz „%s” w grupie „%s”, która ma wartoล›ฤ‡ niemoลผliwฤ… do "
 "zinterpretowania."
 
-#: ../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 "Klucz „%s” w grupie „%s” ma wartoล›ฤ‡ „%s”, podczas gdy oczekiwano %s"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Plik klucza zawiera znak sterujฤ…cy na koล„cu linii"
 
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Plik klucza zawiera nieprawidล‚owฤ… sekwencjฤ™ sterujฤ…cฤ… „%s”"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "Nie moลผna zinterpretowaฤ‡ „%s” jako liczby."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "Wartoล›ฤ‡ caล‚kowita „%s” jest spoza dopuszczalnego zakresu"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "Nie moลผna zinterpretowaฤ‡ „%s” jako liczby zmiennoprzecinkowej."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "Nie moลผna zinterpretowaฤ‡ „%s” jako wartoล›ci logicznej."
 
-#: ../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 ""
 "Uzyskanie atrybutów pliku „%s%s%s%s” siฤ™ nie powiodล‚o: funkcja fstat() "
 "zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr ""
 "Zmapowanie pliku %s%s%s%s siฤ™ nie powiodล‚o: funkcja mmap() zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Otwarcie pliku „%s” siฤ™ nie powiodล‚o: funkcja open() zwróciล‚a bล‚ฤ…d: %s"
 
-#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
+#: glib/gmarkup.c:397 glib/gmarkup.c:439
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "Bล‚ฤ…d w %d. wierszu przy %d. znaku: "
 
-#: ../glib/gmarkup.c: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 ""
 "Nazwa zawiera nieprawidล‚owy tekst zakodowany za pomocฤ… UTF-8 — nieprawidล‚owe "
 "„%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"
 msgstr "„%s” nie jest prawidล‚owฤ… nazwฤ…"
 
-#: ../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” nie jest prawidล‚owฤ… nazwฤ…: „%c”"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Bล‚ฤ…d w %d. wierszu: %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 ""
 "Nie moลผna przetworzyฤ‡ znaku „%-.*s”, w którego miejscu powinna wystฤ…piฤ‡ "
 "liczba, bฤ™dฤ…ca czฤ™ล›ciฤ… odniesienia do znaku (np. &#234;) — byฤ‡ moลผe liczba "
 "jest za duลผa"
 
-#: ../glib/gmarkup.c: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 ""
 "Odniesienie do znaku nie jest zakoล„czone ล›rednikiem; najprawdopodobniej "
 "zostaล‚ uลผyty znak &, który nie miaล‚ oznaczaฤ‡ jednostki — naleลผy go zapisaฤ‡ "
 "jako &amp;"
 
-#: ../glib/gmarkup.c: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 "Odniesienie do znaku „%-.*s” nie jest zapisem dozwolonego znaku"
 
-#: ../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 ""
 "Napotkano pustฤ… jednostkฤ™ „&;”; poprawnymi jednostkami sฤ…: &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 "Nazwa jednostki „%-.*s” nie jest znana"
 
-#: ../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 ""
 "Jednostka nie jest zakoล„czona ล›rednikiem; najprawdopodobniej zostaล‚ uลผyty "
 "znak &, który nie miaล‚ oznaczaฤ‡ jednostki — naleลผy go zapisaฤ‡ jako &amp;"
 
-#: ../glib/gmarkup.c:1170
+#: glib/gmarkup.c:1182
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokument musi rozpoczynaฤ‡ siฤ™ jakimล› elementem (np. <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 ""
 "Znak „%s” nie powinien wystฤ™powaฤ‡ po znaku „<”; nie moลผe on rozpoczynaฤ‡ "
 "nazwy elementu"
 
-#: ../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 ""
-"Nieoczekiwany znak „%s”, oczekiwano znaku „>”, by zakoล„czyฤ‡ znacznik „%s” "
+"Nieoczekiwany znak „%s”, oczekiwano znaku „>”, aby zakoล„czyฤ‡ znacznik „%s” "
 "pustego elementu"
 
-#: ../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 ""
 "Nieoczekiwany znak „%s”; po nazwie atrybutu „%s” elementu „%s” oczekiwano "
 "znaku „=”"
 
-#: ../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 ""
 "Nieoczekiwany znak „%s”; oczekiwano znaku „>” lub „/”, koล„czฤ…cego znacznik "
 "poczฤ…tkowy elementu „%s” lub opcjonalnie atrybutu; byฤ‡ moลผe w nazwie "
 "atrybutu zostaล‚ uลผyty nieprawidล‚owy znak"
 
-#: ../glib/gmarkup.c: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 ""
 "Nieoczekiwany znak „%s”; oczekiwano otwierajฤ…cego znaku cudzysล‚owu po znaku "
 "równoล›ci podczas podawania wartoล›ci atrybutu „%s” elementu „%s”"
 
-#: ../glib/gmarkup.c: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 ""
 "Znak „%s” nie jest znakiem, który moลผe pojawiฤ‡ siฤ™ po sekwencji „</”; „%s” "
 "nie moลผe rozpoczynaฤ‡ nazwy elementu"
 
-#: ../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 ""
 "Znak „%s” nie jest znakiem, który moลผe wystฤ…piฤ‡ po domykajฤ…cej nazwie "
 "elementu „%s”; dopuszczalnym znakiem jest „>”"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
 #, 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” zostaล‚ zamkniฤ™ty, ale brak obecnie otwartego elementu"
 
-#: ../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 ""
 "Element „%s” zostaล‚ zamkniฤ™ty, ale obecnie otwartym elementem jest „%s”"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokument jest pusty lub zawiera tylko spacje"
 
-#: ../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 "Zaraz po znaku „<” nastฤ…piล‚ nieoczekiwany koniec dokumentu"
 
-#: ../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 ""
 "Nastฤ…piล‚ nieoczekiwany koniec dokumentu, gdy pewne elementy sฤ… wciฤ…ลผ otwarte "
 "— „%s” byล‚ ostatnim otwartym elementem"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5143,21 +5120,21 @@
 "Nastฤ…piล‚ nieoczekiwany koniec dokumentu; oczekiwano znaku „>”, koล„czฤ…cego "
 "znacznik <%s/>"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz nazwy elementu"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz nazwy atrybutu"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr ""
 "Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz znacznika otwierajฤ…cego "
 "element."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1825
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5165,316 +5142,323 @@
 "Nastฤ…piล‚ nieoczekiwany koniec dokumentu po znaku równoล›ci wystฤ™pujฤ…cym po "
 "nazwie atrybutu; brak wartoล›ci atrybutu"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz wartoล›ci atrybutu"
 
-#: ../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 ""
 "Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz znacznika domykajฤ…cego "
 "elementu „%s”"
 
-#: ../glib/gmarkup.c:1842
+#: glib/gmarkup.c:1853
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
+msgstr ""
+"Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz znacznika domykajฤ…cego "
+"nieotwartego elementu"
+
+#: glib/gmarkup.c:1859
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Nastฤ…piล‚ nieoczekiwany koniec dokumentu wewnฤ…trz komentarza lub instrukcji "
 "przetwarzania"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[OPCJA…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Opcje pomocy:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Wyล›wietla opcje pomocy"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Wyล›wietla wszystkie opcje pomocy"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Opcje programu:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Opcje:"
 
-#: ../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 "Nie moลผna przetworzyฤ‡ wartoล›ci caล‚kowitej „%s” dla %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 "Wartoล›ฤ‡ caล‚kowita „%s” dla %s jest spoza dopuszczalnego zakresu"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s” for %s"
 msgstr "Nie moลผna przetworzyฤ‡ podwójnej wartoล›ci liczbowej „%s” dla %s"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s” for %s out of range"
 msgstr ""
 "Podwójna wartoล›ฤ‡ liczbowa „%s” dla %s jest spoza dopuszczalnego zakresu"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Bล‚ฤ…d podczas przetwarzania opcji %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 "Brak parametru dla %s"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Nieznana opcja %s"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "uszkodzony obiekt"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "bล‚ฤ…d wewnฤ™trzny lub uszkodzony obiekt"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "brak pamiฤ™ci"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "osiฤ…gniฤ™to limit wyjฤ…tku"
 
-#: ../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 "wzorzec zawiera elementy nieobsล‚ugiwane w dopasowywaniu czฤ™ล›ciowym"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "bล‚ฤ…d wewnฤ™trzny"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "referencje wstecz jako warunki nie sฤ… obsล‚ugiwane w dopasowywaniu czฤ™ล›ciowym"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "osiฤ…gniฤ™to limit rekurencji"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "nieprawidล‚owa kombinacja flag nowych linii"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "bล‚ฤ™dne wyrównanie"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "krótki UTF-8"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "pฤ™tla rekurencji"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "nieznany bล‚ฤ…d"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ na koล„cu wzoru"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c na koล„cu wzoru"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "nierozpoznany znak po \\"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "liczby w operatorze {} nie sฤ… w kolejnoล›ci"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "liczba za duลผa w kwantyfikatorze {}"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "brak koล„czฤ…cego znaku „]” dla klasy znaku"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "nieprawidล‚owa sekwencja sterujฤ…ca w klasie znaku"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "zakres klasy znaków nie jest w kolejnoล›ci"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "nic do powtórzenia"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "nieoczekiwane powtórzenie"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "nierozpoznany znak po (? lub (?-"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "Klasy nazwane z uลผyciem POSIX sฤ… obsล‚ugiwane tylko wewnฤ…trz klasy"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "brak znaku koล„czฤ…cego )"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "nawiฤ…zanie do nieistniejฤ…cego podwzoru"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "brakujฤ…cy znak „)” po komentarzu"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "wyraลผenie regularne jest za duลผe"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "uzyskanie pamiฤ™ci siฤ™ nie powiodล‚o"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr "znak ) bez znaku otwierajฤ…cego ("
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "przepeล‚nienie kodu"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "nierozpoznany znak po (?<"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "asercja „lookbehind” nie ma staล‚ej dล‚ugoล›ci"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "bล‚ฤ™dna liczba lub nazwa za (?("
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "zaleลผna grupa zawiera wiฤ™cej niลผ dwie gaล‚ฤ™zie"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "za (?( oczekiwano asercji"
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: ../glib/gregex.c:409
+#: glib/gregex.c:409
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "po (?R lub (?[+-]cyfry musi nastฤ™powaฤ‡ znak )"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "nieznana nazwa klasy POSIX"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "elementy porównujฤ…ce POSIX nie sฤ… obsล‚ugiwane"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "wartoล›ฤ‡ znaku w sekwencji \\x{...} jest za duลผa"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "nieprawidล‚owy warunek (?(0)"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "znak \\C nie jest dozwolony w asercji „lookbehind”"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "znaki sterujฤ…ce \\L, \\l, \\N{nazwa}, \\U i \\u nie sฤ… obsล‚ugiwane"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "wywoล‚anie rekurencyjne mogล‚o prowadziฤ‡ do pฤ™tli nieskoล„czonej"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "nierozpoznany znak po (?P"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "brak terminatora w nazwie podwzoru"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "dwa podwzory majฤ… tฤ™ samฤ… nazwฤ™"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "bล‚ฤ™dna sekwencja \\P lub \\p"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "nieznana nazwa wล‚aล›ciwoล›ci za \\P lub \\p"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "nazwa podwzoru jest za dล‚uga (maksymalnie 32 znaki)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "za duลผo nazwanych podwzorów (maksymalnie 10000)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "wartoล›ฤ‡ ósemkowa jest wiฤ™ksza niลผ \\377"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "przekroczono przestrzeล„ roboczฤ… kompilacji"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "nie znaleziono wczeล›niej sprawdzonego podwzoru"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "grupa DEFINE zawiera wiฤ™cej niลผ jednฤ… gaล‚ฤ…ลบ"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "niespójne opcje NEWLINE"
 
-#: ../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"
@@ -5482,286 +5466,291 @@
 "po \\g nie nastฤ™puje nazwa lub liczba w nawiasach, nawiasach ostrych, "
 "cytowana, ani zwykล‚a liczba"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "liczbowe odniesienie nie moลผe wynosiฤ‡ zero"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "parametr nie jest dozwolony dla (*ACCEPT), (*FAIL) lub (*COMMIT)"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "nie rozpoznano (*VERB)"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "liczba jest za duลผa"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "brak nazwy podwzoru po (?&"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "oczekiwano cyfry po (?+"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
 "] jest nieprawidล‚owym znakiem danych w trybie zgodnoล›ci z jฤ™zykiem JavaScript"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "róลผne nazwy dla podwzorów tej samej liczby nie sฤ… dozwolone"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) musi mieฤ‡ parametr"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "po \\c musi byฤ‡ znak ASCII"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "po \\k nie nastฤ™puje nazwa w nawiasach, nawiasach ostrych, ani cytowana"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N nie jest obsล‚ugiwane w klasie"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "za duลผo odniesieล„ naprzód"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "nazwa jest za dล‚uga w (*MARK), (*PRUNE), (*SKIP) lub (*THEN)"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "wartoล›ฤ‡ znaku w sekwencji \\u.... jest za duลผa"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1977
+#: glib/gregex.c:745 glib/gregex.c:1983
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Bล‚ฤ…d podczas dopasowywania wyraลผenia regularnego %s: %s"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "Biblioteka PCRE zostaล‚a skompilowana bez obsล‚ugi UTF-8"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
-msgstr "Biblioteka PCRE zostaล‚a skompilowana bez obsล‚ugi wล‚asnoล›ci UTF-8"
+msgstr "Biblioteka PCRE zostaล‚a skompilowana bez obsล‚ugi wล‚aล›ciwoล›ci UTF-8"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "Biblioteka PCRE zostaล‚a skompilowana za pomocฤ… niezgodnych opcji"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Bล‚ฤ…d podczas optymalizowania wyraลผenia regularnego %s: %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Bล‚ฤ…d kompilacji wyraลผenia regularnego %s przy znaku %d: %s"
 
-#: ../glib/gregex.c:2413
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}” expected"
 msgstr "oczekiwano cyfry szesnastkowej lub znaku „}”"
 
-#: ../glib/gregex.c:2429
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "oczekiwano cyfry szesnastkowej"
 
-#: ../glib/gregex.c:2469
+#: glib/gregex.c:2475
 msgid "missing “<” in symbolic reference"
 msgstr "brak znaku „<” w odniesieniu symbolicznym"
 
-#: ../glib/gregex.c:2478
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "niezakoล„czona referencja symboliczna"
 
-#: ../glib/gregex.c:2485
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "referencja symboliczna o zerowej dล‚ugoล›ci"
 
-#: ../glib/gregex.c:2496
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "oczekiwano cyfry"
 
-#: ../glib/gregex.c:2514
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "niedozwolona referencja symboliczna"
 
-#: ../glib/gregex.c:2576
+#: glib/gregex.c:2582
 msgid "stray final “\\”"
 msgstr "pominiฤ™to koล„cowe „\\”"
 
-#: ../glib/gregex.c:2580
+#: glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "nieznana sekwencja sterujฤ…ca"
 
-#: ../glib/gregex.c:2590
+#: glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Bล‚ฤ…d podczas przetwarzania tekstu zastฤ™pczego „%s” przy znaku %lu: %s"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Cytowany znak nie rozpoczyna siฤ™ znakiem cytowania"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "W wierszu poleceล„ lub innym napisie cytowanym jak w powล‚oce wystฤ…piล‚ "
 "niesparowany znak cytowania"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr ""
 "Tekst zakoล„czyล‚ siฤ™ bezpoล›rednio po znaku „\\” (wartoล›ciฤ… tekstu byล‚o „%s”)."
 
-#: ../glib/gshell.c:587
+#: glib/gshell.c:587
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was “%s”)"
 msgstr ""
 "Tekst zakoล„czyล‚ siฤ™ przed odnalezieniem domykajฤ…cego znaku cytowania dla %c "
 "(tekstem jest „%s”)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Tekst jest pusty (lub zawiera tylko spacje)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Odczytanie danych z procesu potomnego (%s) siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn.c:401
+#: glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Nieoczekiwany bล‚ฤ…d w funkcji select() podczas odczytywania danych z procesu "
 "potomnego (%s)"
 
-#: ../glib/gspawn.c:486
+#: glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Nieoczekiwany bล‚ฤ…d w 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 "Proces potomny zostaล‚ zakoล„czony z kodem %ld"
 
-#: ../glib/gspawn.c:905
+#: glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Proces potomny zostaล‚ zakoล„czony sygnaล‚em %ld"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Proces potomny zostaล‚ zatrzymany sygnaล‚em %ld"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Proces potomny zostaล‚ nieprawidล‚owo zakoล„czony"
 
-#: ../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 ""
 "Odczytanie danych z potoku ล‚ฤ…czฤ…cego z procesem potomnym (%s) siฤ™ nie "
 "powiodล‚o"
 
-#: ../glib/gspawn.c:1394
+#: glib/gspawn.c:1596
+#, c-format
+msgid "Failed to spawn child process “%s” (%s)"
+msgstr "Wywoล‚anie procesu potomnego „%s” (%s) siฤ™ nie powiodล‚o"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Rozdzielenie procesu (%s) siฤ™ nie powiodล‚o"
 
-#: ../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 "Zmiana katalogu na „%s” (%s) siฤ™ nie powiodล‚a"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "Wykonanie procesu potomnego „%s” (%s) siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn.c:1563
+#: glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 "Przekierowanie wejล›cia lub wyjล›cia procesu potomnego (%s) siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn.c:1572
+#: glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Rozdzielenie procesu potomnego (%s) siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s”"
 msgstr "Podczas wykonywania procesu potomnego „%s” wystฤ…piล‚ nieznany bล‚ฤ…d"
 
-#: ../glib/gspawn.c:1604
+#: glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Odczytanie odpowiedniej liczby danych z potoku procesu potomnego (%s) siฤ™ "
 "nie powiodล‚o"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Odczytanie danych z procesu potomnego siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "Utworzenie potoku do komunikacji z procesem potomnym (%s) siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn-win32.c: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 "Wykonanie procesu potomnego (%s) siฤ™ nie powiodล‚o"
 
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Nieprawidล‚owa nazwa programu: %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 "Nieprawidล‚owy ciฤ…g w wektorze parametrów w %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 "Nieprawidล‚owa sekwencja w ล›rodowisku: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Nieprawidล‚owy katalog roboczy: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Wykonanie programu pomocniczego (%s) siฤ™ nie powiodล‚o"
 
-#: ../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"
@@ -5769,163 +5758,163 @@
 "Podczas odczytu danych z procesu potomnego w g_io_channel_win32_poll() "
 "wystฤ…piล‚ nieznany bล‚ฤ…d"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "Pusty ciฤ…g nie jest liczbฤ…"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s” is not a signed number"
 msgstr "„%s” nie jest liczbฤ… ze znakiem"
 
-#: ../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 "Liczba „%s” jest poza zakresem [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s” is not an unsigned number"
 msgstr "„%s” nie jest liczbฤ… bez znaku"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Przydzielenie pamiฤ™ci siฤ™ nie powiodล‚o"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Znak jest poza zakresem dla 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 "Nieprawidล‚owa sekwencja na wejล›ciu konwersji"
 
-#: ../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 "Znak jest poza zakresem dla 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"
@@ -5933,7 +5922,7 @@
 msgstr[1] "%u bajty"
 msgstr[2] "%u bajtów"
 
-#: ../glib/gutils.c:2296
+#: glib/gutils.c:2311
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -5942,7 +5931,7 @@
 msgstr[2] "%u bitów"
 
 #. 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"
@@ -5951,7 +5940,7 @@
 msgstr[2] "%s bajtów"
 
 #. 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"
@@ -5964,7 +5953,7 @@
 #. * 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/pt_BR.po b/po/pt_BR.po
index ace86ac..6a96b73 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,10 +19,9 @@
 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: 2018-02-16 14:39+0000\n"
-"PO-Revision-Date: 2018-02-16 13:11-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-08-17 05:22-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -33,132 +32,129 @@
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "GApplication options"
 msgstr "Opções do GApplication"
 
-#: ../gio/gapplication.c:495
+#: gio/gapplication.c:496
 msgid "Show GApplication options"
 msgstr "Mostra as opções do GApplication"
 
-#: ../gio/gapplication.c:540
+#: gio/gapplication.c:541
 msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr ""
 "Digite o modo de serviço do GApplication (usar dos arquivos de serviços do D-"
 "Bus)"
 
-#: ../gio/gapplication.c:552
+#: gio/gapplication.c:553
 msgid "Override the application’s ID"
 msgstr "Substitui ID do aplicativo"
 
-#: ../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 "Exibe a ajuda"
 
-#: ../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 "Exibe a versão"
 
-#: ../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 "Exibe a informação da versão e sai"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Lista aplicativos"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Lista os aplicativos instalados que ativam D-Bus (por arquivos .desktop)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Inicia um aplicativo"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Inicia o aplicativo (com arquivos opcionais a serem abertos)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "APPID [ARQUIVO…]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Ativa uma ação"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Invoca uma ação no aplicativo"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "APPID AÇÃO [PARÂMETRO]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Lista as ações disponíveis"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr "Lista as ações estáticas para um aplicativo (de arquivos .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 "O comando para exibir ajuda detalhada para"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr ""
 "Identificador do aplicativo em formato D-Bus (ex: org.exemplo.visualizador)"
 
-#: ../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 "ARQUIVO"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr "Nomes de arquivos relativo ou absoluto, ou URIs a abrir, opcionalmente"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "AÇÃO"
 
 # Espaço inicial acrescentado para alinhar o texto (gapplication help action) -- Rafael
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "  O nome da ação a ser invocada"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARÂMETRO"
 
 # Espaço inicial acrescentado para alinhar o texto (gapplication help action) -- Rafael
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr " Parâmetro opcional para a invocação da ação, em 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"
@@ -167,26 +163,26 @@
 "Comando desconhecido %s\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 "[ARGUMENTOS…]"
 
-#: ../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"
@@ -195,7 +191,7 @@
 "Use “%s help COMANDO” para obter ajuda detalhada.\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"
@@ -204,13 +200,13 @@
 "o comando %s necessita de um id de aplicativo para segui-lo diretamente\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s”\n"
 msgstr "id de aplicativo invá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"
@@ -219,22 +215,21 @@
 "“%s” não leva argumentos\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "não foi possível se conectar ao 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 "erro ao enviar %s mensagens ao aplicativo: %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 "o nome da ação deve ser fornecido após o id do aplicativo\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s”\n"
@@ -244,27 +239,25 @@
 "os nomes de ações devem consistir de apenas caracteres alfanuméricos, “-” e "
 "“.”\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "erro ao analisar o parâmetro da ação: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "as ações aceitam um máximo de um parâmetro\n"
 
-#: ../gio/gapplication-tool.c:411
-#, c-format
+#: gio/gapplication-tool.c:411
 msgid "list-actions command takes only the application id"
 msgstr "o comando list-actions leva apenas um id de aplicativo"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "não foi possível localizar o arquivo desktop para o aplicativo %s\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -273,123 +266,119 @@
 "comando não reconhecido: %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 "Valor muito alto passado para %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 "Não há suporte à busca no fluxo base"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "Não é possível 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 "O fluxo já está fechado"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "Não há suporte para truncar fluxo 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 "A operação foi cancelada"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Objeto inválido, não inicializado"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Sequência de bytes incompleta na entrada"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Espaço insuficiente no 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 "Sequência de bytes inválida na entrada de conversão"
 
-#: ../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 "Erro durante a conversão: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "Sem suporte a inicialização cancelável"
 
-#: ../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 "Não há suporte à conversão do conjunto de caracteres “%s” para “%s”"
 
-#: ../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 "Não foi possível abrir conversor de “%s” para “%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 desconhecido"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 msgid "%s filetype"
 msgstr "tipo de arquivo %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 não está implementado neste SO"
 
-#: ../gio/gcredentials.c:467
+#: gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Não há suporte ao GCredentials para sua plataforma"
 
-#: ../gio/gcredentials.c:513
+#: gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "GCredentials não contém um ID de processo neste SO"
 
-#: ../gio/gcredentials.c:565
+#: gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr ""
 "Não é possível fazer uso de falsificação de credenciais neste sistema "
 "operacional"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Fim do fluxo 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 "Não há suporte a chave “%s” na entrada de endereço “%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)"
@@ -397,28 +386,33 @@
 "O endereço “%s” é inválido (é necessário exatamente um dentre: caminho, "
 "diretório temporário ou chaves abstratas)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr ""
 "Combinação de pares chave/valor sem sentido na entrada de endereço “%s”"
 
-#: ../gio/gdbusaddress.c: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 "Erro no endereço “%s” — o atributo porta está malformada"
 
-#: ../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 "Erro no endereço “%s” — o atributo família está malformada"
 
-#: ../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 desconhecido ou sem suporte “%s” para o endereço “%s”"
+
+#: gio/gdbusaddress.c:467
 #, c-format
 msgid "Address element “%s” does not contain a colon (:)"
 msgstr "O elemento endereço “%s” não contém um caractere de dois-pontos (:)"
 
-#: ../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 "
@@ -427,7 +421,7 @@
 "O par chave/valor %d, “%s”, no elemento endereço “%s”, não contém um sinal "
 "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 "
@@ -436,7 +430,7 @@
 "Erro ao distinguir a chave sem escape ou valor no par chave/valor %d, “%s”, "
 "no elemento endereço “%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 "
@@ -445,97 +439,92 @@
 "Erro no endereço “%s” — o transporte Unix requer exatamente uma das chaves "
 "“path” ou “abstract” sejam definidas"
 
-#: ../gio/gdbusaddress.c:612
+#: gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s” — the host attribute is missing or malformed"
 msgstr ""
 "Erro no endereço “%s” — o atributo servidor está faltando ou malformado"
 
-#: ../gio/gdbusaddress.c:626
+#: gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr "Erro no endereço “%s” — o atributo porta está faltando ou malformado"
 
-#: ../gio/gdbusaddress.c:640
+#: gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
 msgstr ""
 "Erro no endereço “%s” — o atributo do arquivo de valor de uso único está "
 "faltando ou malformado"
 
-#: ../gio/gdbusaddress.c:661
+#: gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Erro ao iniciar automaticamente: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s” for address “%s”"
-msgstr "Transporte desconhecido ou sem suporte “%s” para o endereço “%s”"
-
-#: ../gio/gdbusaddress.c:714
+#: gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s”: %s"
 msgstr "Erro ao abrir arquivo de valor de uso único “%s”: %s"
 
-#: ../gio/gdbusaddress.c:733
+#: gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Erro ao ler arquivo de valor de uso único “%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 ""
 "Erro ao ler o arquivo de valor de uso único “%s”; era esperado 16 bytes, mas "
 "foi obtido %d"
 
-#: ../gio/gdbusaddress.c:760
+#: gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "Erro ao gravar o arquivo de valor de uso único “%s” no fluxo:"
 
-#: ../gio/gdbusaddress.c:969
+#: gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "O endereço fornecido está vazio"
 
-#: ../gio/gdbusaddress.c:1082
+#: gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "Não foi possível chamar um barramento de mensagens com setuid"
 
-#: ../gio/gdbusaddress.c:1089
+#: gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr ""
 "Não foi possível chamar um barramento de mensagens sem um ID de máquina: "
 
-#: ../gio/gdbusaddress.c:1096
+#: gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "Não foi possível iniciar automaticamente o D-Bus sem X11 $DISPLAY"
 
-#: ../gio/gdbusaddress.c:1138
+#: gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "Erro ao chamar a linha de comandos “%s”: "
 
-#: ../gio/gdbusaddress.c:1355
+#: gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Digite qualquer tecla para fechar esta janela)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "A sessão dbus não está em execução, e o início automático falhou"
 
-#: ../gio/gdbusaddress.c:1520
+#: gio/gdbusaddress.c:1524
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Não foi possível determinar o endereço de barramento da sessão (sem "
 "implementação 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 "
@@ -544,7 +533,7 @@
 "Não foi possível determinar o endereço de barramento da variável de ambiente "
 "DBUS_STARTER_BUS_TYPE — valor desconhecido “%s”"
 
-#: ../gio/gdbusaddress.c: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"
@@ -552,20 +541,20 @@
 "Não foi possível determinar o endereço do barramento porque a variável de "
 "ambiente DBUS_STARTER_BUS_TYPE não está definida"
 
-#: ../gio/gdbusaddress.c:1677
+#: gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Tipo de barramento %d desconhecido"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Falta de conteúdo inesperada ao tentar ler uma linha"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr "Falta de conteúdo inesperada ao tentar (seguramente) ler uma linha"
 
-#: ../gio/gdbusauth.c:508
+#: gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -573,16 +562,16 @@
 "Foram esgotados todos mecanismos de autenticação disponíveis (tentado: %s) "
 "(disponível: %s)"
 
-#: ../gio/gdbusauth.c:1171
+#: gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Cancelado via GDBusAuthObserver::authorize-authenticated-peer"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s”: %s"
 msgstr "Erro ao obter informação para o diretório “%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:274
+#: gio/gdbusauthmechanismsha1.c:274
 #, c-format
 msgid ""
 "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
@@ -590,22 +579,22 @@
 "As permissões no diretório “%s” estão malformadas. É esperado 0700, mas foi "
 "obtido 0%o"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s”: %s"
 msgstr "Erro ao criar o diretório “%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s” for reading: "
 msgstr "Erro ao abrir o chaveiro “%s” para leitura: "
 
-#: ../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 "A linha %d do chaveiro em “%s” com o conteúdo “%s” está malformado"
 
-#: ../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"
@@ -613,7 +602,7 @@
 "O primeiro símbolo da linha %d do chaveiro em “%s” com o conteúdo “%s” está "
 "malformado"
 
-#: ../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"
@@ -621,171 +610,174 @@
 "O segundo símbolo da linha %d do chaveiro em “%s” com o conteúdo “%s” está "
 "malformado"
 
-#: ../gio/gdbusauthmechanismsha1.c:454
+#: gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr "Não foi possível localizar um anexo com o ID %d no chaveiro em “%s”"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Erro ao excluir o arquivo de bloqueio anterior “%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s”: %s"
 msgstr "Erro ao criar o arquivo de bloqueio “%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:599
+#: gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Erro ao fechar o arquivo de bloqueio (desvinculado) “%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:610
+#: gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s”: %s"
 msgstr "Erro ao desvincular o arquivo de bloqueio “%s”: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:687
+#: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s” for writing: "
 msgstr "Erro ao abrir o chaveiro “%s” para escrita: "
 
-#: ../gio/gdbusauthmechanismsha1.c:883
+#: gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr "(Adicionalmente, liberar o bloqueio de “%s” também falhou: %s) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "A conexão está fechada"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "O tempo limite foi alcançado"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "Foram encontrados sinalizadores sem suporte ao construir uma conexão do lado "
 "do cliente"
 
-#: ../gio/gdbusconnection.c: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 ""
 "Nenhuma interface “org.freedesktop.DBus.Properties” no objeto no caminho %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 "Nenhuma propriedade “%s”"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
-msgstr "A propriedade “%s” está sem leitura"
+#| msgid "Property '%s' is not readable"
+msgid "Property “%s” is not readable"
+msgstr "A propriedade “%s” não pode ser lida"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
-msgstr "A propriedade “%s” está sem escrita"
+#| msgid "Property '%s' is not writable"
+msgid "Property “%s” is not writable"
+msgstr "A propriedade “%s” não pode ser escrita"
 
-#: ../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 ""
 "Erro ao definir a propriedade “%s”: o tipo esperado é “%s”, mas obteve “%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'"
+msgid "No such interface “%s”"
 msgstr "Nenhuma interface “%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 "Nenhuma interface “%s” no objeto no caminho %s"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
-msgstr "Método “%s” inexistente"
+#| msgid "No such key “%s”\n"
+msgid "No such method “%s”"
+msgstr "Método inexistente “%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 "O tipo da mensagem, “%s”, não equivale ao 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 "Um objeto já foi exportado para a interface %s em %s"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "Não foi possível obter a propriedade %s.%s"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "Não foi possível definir a propriedade %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 "O método “%s” retornou o tipo “%s”, mas é esperado “%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 "O método “%s” na interface “%s” com a assinatura “%s” não existe"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Uma subárvore já foi exportada para %s"
 
-#: ../gio/gdbusconnection.c:7151
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Não foi possível determinar o endereço de barramento da variável de ambiente "
-"DBUS_STARTER_BUS_TYPE - valor desconhecido “%s”"
-
-#: ../gio/gdbusmessage.c:1246
+#: gio/gdbusmessage.c:1248
 msgid "type is INVALID"
 msgstr "o tipo é INVALID"
 
-#: ../gio/gdbusmessage.c:1257
+#: gio/gdbusmessage.c:1259
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr ""
 "Mensagem de METHOD_CALL: O campo de cabeçalho PATH ou MEMBER está faltando"
 
-#: ../gio/gdbusmessage.c:1268
+#: gio/gdbusmessage.c:1270
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr ""
 "Mensagem de METHOD_RETURN: O campo de cabeçalho REPLY_SERIAL está faltando"
 
-#: ../gio/gdbusmessage.c:1280
+#: gio/gdbusmessage.c:1282
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr ""
 "Mensagem de ERROR: O campo de cabeçalho REPLY_SERIAL ou ERROR_NAME está "
 "faltando"
 
-#: ../gio/gdbusmessage.c:1293
+#: gio/gdbusmessage.c:1295
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr ""
 "Mensagem de SIGNAL: O campo de cabeçalho PATH, INTERFACE ou MEMBER está "
 "faltando"
 
-#: ../gio/gdbusmessage.c:1301
+#: gio/gdbusmessage.c:1303
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
@@ -793,7 +785,7 @@
 "Mensagem de SIGNAL: O campo de cabeçalho PATH está usando o 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"
@@ -801,21 +793,21 @@
 "Mensagem de SIGNAL: O campo de cabeçalho INTERFACE está usando o 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] "Ao tentar ler %lu byte obteve-se %lu"
 msgstr[1] "Ao tentar ler %lu bytes obteve-se %lu"
 
-#: ../gio/gdbusmessage.c:1371
+#: gio/gdbusmessage.c:1373
 #, c-format
 msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr ""
 "Era esperado um byte NUL (nulo) após o texto “%s”, mas foi localizado o byte "
 "%d"
 
-#: ../gio/gdbusmessage.c:1390
+#: gio/gdbusmessage.c:1392
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -825,17 +817,17 @@
 "posição %d (tamanho do texto é %d). O texto UTF-8 válido até este ponto 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 "O valor “%s” analisado não é um objeto de caminho 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 "O valor “%s” analisado não é uma assinatura 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)."
@@ -848,7 +840,7 @@
 "Foi encontrado um vetor com tamanho de %u bytes. O tamanho máximo é de 2<<26 "
 "bytes (64 MB)."
 
-#: ../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 "
@@ -858,12 +850,12 @@
 "comprimento múltiplo de %u bytes, porém foi localizado %u bytes em "
 "comprimento"
 
-#: ../gio/gdbusmessage.c:1849
+#: gio/gdbusmessage.c:1851
 #, c-format
 msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
 msgstr "O valor “%s” analisado para variante não é uma assinatura D-Bus válida"
 
-#: ../gio/gdbusmessage.c:1873
+#: gio/gdbusmessage.c:1875
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s” from the D-Bus wire format"
@@ -871,7 +863,7 @@
 "Erro ao desserializar GVariant com o texto de tipo “%s” do formato "
 "delimitado pelo 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 "
@@ -880,27 +872,27 @@
 "Valor identificador de endian inválido. Era esperado 0x6c (“l”) ou 0x42 "
 "(“B”), mas foi localizado o valor 0x%02x"
 
-#: ../gio/gdbusmessage.c:2068
+#: gio/gdbusmessage.c:2070
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr ""
 "Versão majoritária de protocolo inválida. Era esperado 1, mas foi localizado "
 "%d"
 
-#: ../gio/gdbusmessage.c:2124
+#: gio/gdbusmessage.c:2126
 #, c-format
 msgid "Signature header with signature “%s” found but message body is empty"
 msgstr ""
 "O cabeçalho de assinatura foi localizado com a assinatura “%s”, mas o corpo "
 "da mensagem está vazio"
 
-#: ../gio/gdbusmessage.c:2138
+#: gio/gdbusmessage.c:2140
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
 msgstr ""
 "O valor “%s” analisado não é uma assinatura D-Bus válida (para o corpo)"
 
-#: ../gio/gdbusmessage.c: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"
@@ -911,11 +903,11 @@
 "Nenhum cabeçalho de assinatura na mensagem, mas o corpo da mensagem tem %u "
 "bytes"
 
-#: ../gio/gdbusmessage.c:2178
+#: gio/gdbusmessage.c:2180
 msgid "Cannot deserialize message: "
 msgstr "Não foi possível desserializar a mensagem: "
 
-#: ../gio/gdbusmessage.c:2519
+#: gio/gdbusmessage.c:2521
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
@@ -923,7 +915,7 @@
 "Erro ao serializar GVariant com o texto de tipo “%s” para o formato "
 "delimitado pelo 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)"
@@ -931,18 +923,18 @@
 "O número de descritores de arquivo na mensagem (%d) difere do campo de "
 "cabeçalho (%d)"
 
-#: ../gio/gdbusmessage.c:2664
+#: gio/gdbusmessage.c:2666
 msgid "Cannot serialize message: "
 msgstr "Não foi possível serializar a mensagem: "
 
-#: ../gio/gdbusmessage.c:2708
+#: gio/gdbusmessage.c:2710
 #, c-format
 msgid "Message body has signature “%s” but there is no signature header"
 msgstr ""
 "O corpo da mensagem tem a assinatura “%s”, mas não há um cabeçalho de "
 "assinatura"
 
-#: ../gio/gdbusmessage.c:2718
+#: gio/gdbusmessage.c:2720
 #, c-format
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
@@ -951,43 +943,43 @@
 "O corpo da mensagem tem o tipo de assinatura “%s”, mas a assinatura no campo "
 "de cabeçalho é “%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 ""
 "O corpo da mensagem está vazio, mas a assinatura no campo de cabeçalho é "
 "“(%s)”"
 
-#: ../gio/gdbusmessage.c:3287
+#: gio/gdbusmessage.c:3289
 #, c-format
 msgid "Error return with body of type “%s”"
 msgstr "Retorno de erro com o corpo de tipo “%s”"
 
-#: ../gio/gdbusmessage.c:3295
+#: gio/gdbusmessage.c:3297
 msgid "Error return with empty body"
 msgstr "Retorno de erro com o corpo vazio"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Não foi possível obter o perfil da máquina: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr ""
 "Não foi possível carregar /var/lib/dbus/machine-id ou /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1612
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Erro ao chamar StartServiceByName para %s: "
 
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Resposta %d inesperada do 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"
@@ -996,32 +988,32 @@
 "e o proxy foi construído com o sinalizador "
 "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "Não há suporte a espaço de nome abstrato"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr ""
 "Não foi possível especificar o arquivo de valor de uso único ao criar um "
 "servidor"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s”: %s"
 msgstr "Erro ao gravar o arquivo de valor de uso único em “%s”: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "O texto “%s” não é válido para GUID D-Bus"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Não é possível escutar no transporte “%s” por falta de suporte"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1044,61 +1036,61 @@
 "\n"
 "Use “%s COMANDO --help” para obter ajuda de cada comando.\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 "Erro: %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 "Erro ao analisar XML de introspecção: %s\n"
 
-#: ../gio/gdbus-tool.c:216
+#: gio/gdbus-tool.c:234
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Erro: %s não é um nome válido\n"
 
-#: ../gio/gdbus-tool.c:364
+#: gio/gdbus-tool.c:382
 msgid "Connect to the system bus"
 msgstr "Conectar ao barramento de sistema"
 
-#: ../gio/gdbus-tool.c:365
+#: gio/gdbus-tool.c:383
 msgid "Connect to the session bus"
 msgstr "Conectar ao barramento de sessão"
 
-#: ../gio/gdbus-tool.c:366
+#: gio/gdbus-tool.c:384
 msgid "Connect to given D-Bus address"
 msgstr "Conectar ao endereço D-Bus escolhido"
 
-#: ../gio/gdbus-tool.c:376
+#: gio/gdbus-tool.c:394
 msgid "Connection Endpoint Options:"
 msgstr "Opções de conexão de ponto final:"
 
-#: ../gio/gdbus-tool.c:377
+#: gio/gdbus-tool.c:395
 msgid "Options specifying the connection endpoint"
 msgstr "Opções especificando a conexão de ponto final"
 
-#: ../gio/gdbus-tool.c:399
+#: gio/gdbus-tool.c:417
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Nenhuma conexão de ponto final especificada"
 
-#: ../gio/gdbus-tool.c:409
+#: gio/gdbus-tool.c:427
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Múltiplas conexões de ponto final especificadas"
 
-#: ../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 ""
 "Aviso: De acordo com os dados de introspecção a interface “%s” não existe\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 "
@@ -1107,169 +1099,163 @@
 "Aviso: De acordo com os dados de introspecção o método “%s” não existe na "
 "interface “%s”\n"
 
-#: ../gio/gdbus-tool.c:550
+#: gio/gdbus-tool.c:568
 msgid "Optional destination for signal (unique name)"
 msgstr "Destino opcional para o sinal (nome único)"
 
-#: ../gio/gdbus-tool.c:551
+#: gio/gdbus-tool.c:569
 msgid "Object path to emit signal on"
 msgstr "Caminho do objeto para emitir sinal"
 
-#: ../gio/gdbus-tool.c:552
+#: gio/gdbus-tool.c:570
 msgid "Signal and interface name"
 msgstr "Nome de sinal e de interface"
 
-#: ../gio/gdbus-tool.c:587
+#: gio/gdbus-tool.c:603
 msgid "Emit a signal."
 msgstr "Emitir um sinal."
 
-#: ../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 "Erro ao conectar: %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 "Erro: O destino não foi especificado\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 "Erro: %s não é um nome válido de barramento exclusivo.\n"
 
-#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
-#, 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 "Erro: O caminho do objeto não foi especificado\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 "Erro: %s não é um caminho de objeto válido\n"
 
-#: ../gio/gdbus-tool.c:720
-#, c-format
+#: gio/gdbus-tool.c:740
 msgid "Error: Signal name is not specified\n"
 msgstr "Erro: O nome do sinal não foi especificado\n"
 
-#: ../gio/gdbus-tool.c:731
+#: gio/gdbus-tool.c:754
 #, c-format
 msgid "Error: Signal name “%s” is invalid\n"
 msgstr "Erro: O nome do sinal “%s” é inválido\n"
 
-#: ../gio/gdbus-tool.c:743
+#: gio/gdbus-tool.c:766
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Erro: %s não é um nome de interface válido\n"
 
-#: ../gio/gdbus-tool.c:749
+#: gio/gdbus-tool.c:772
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Erro: %s não é um nome de membro válido\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c: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 "Erro ao analisar o parâmetro %d: %s\n"
 
-#: ../gio/gdbus-tool.c:818
+#: gio/gdbus-tool.c:841
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Erro limpando conexão: %s\n"
 
-#: ../gio/gdbus-tool.c:845
+#: gio/gdbus-tool.c:868
 msgid "Destination name to invoke method on"
 msgstr "Nome do destino para chamar um método"
 
-#: ../gio/gdbus-tool.c:846
+#: gio/gdbus-tool.c:869
 msgid "Object path to invoke method on"
 msgstr "Caminho do objeto para chamar um método"
 
-#: ../gio/gdbus-tool.c:847
+#: gio/gdbus-tool.c:870
 msgid "Method and interface name"
 msgstr "Nome de método e de interface"
 
-#: ../gio/gdbus-tool.c:848
+#: gio/gdbus-tool.c:871
 msgid "Timeout in seconds"
 msgstr "Tempo limite em segundos"
 
-#: ../gio/gdbus-tool.c:889
+#: gio/gdbus-tool.c:910
 msgid "Invoke a method on a remote object."
 msgstr "Chamar um método no objeto remoto."
 
-#: ../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
+msgid "Error: Destination is not specified\n"
+msgstr "Erro: O destino não foi especificado\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 "Erro: %s não é um nome de barramento válido\n"
 
-#: ../gio/gdbus-tool.c:1022
-#, c-format
+#: gio/gdbus-tool.c:1043
 msgid "Error: Method name is not specified\n"
 msgstr "Erro: O nome do método não foi especificado\n"
 
-#: ../gio/gdbus-tool.c:1033
+#: gio/gdbus-tool.c:1054
 #, c-format
 msgid "Error: Method name “%s” is invalid\n"
 msgstr "Erro: O nome do método “%s” é inválido\n"
 
-#: ../gio/gdbus-tool.c:1111
+#: gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Erro ao analisar o parâmetro %d do tipo “%s”: %s\n"
 
-#: ../gio/gdbus-tool.c:1555
+#: gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
 msgstr "Nome do destino para introspecção"
 
-#: ../gio/gdbus-tool.c:1556
+#: gio/gdbus-tool.c:1577
 msgid "Object path to introspect"
 msgstr "Caminho do objeto para introspecção"
 
-#: ../gio/gdbus-tool.c:1557
+#: gio/gdbus-tool.c:1578
 msgid "Print XML"
 msgstr "Exibir XML"
 
-#: ../gio/gdbus-tool.c:1558
+#: gio/gdbus-tool.c:1579
 msgid "Introspect children"
 msgstr "Auto-examinar filhos"
 
-#: ../gio/gdbus-tool.c:1559
+#: gio/gdbus-tool.c:1580
 msgid "Only print properties"
 msgstr "Apenas imprimir as propriedades"
 
-#: ../gio/gdbus-tool.c:1650
+#: gio/gdbus-tool.c:1667
 msgid "Introspect a remote object."
 msgstr "Introspecção de um objeto remoto."
 
-#: ../gio/gdbus-tool.c:1853
+#: gio/gdbus-tool.c:1870
 msgid "Destination name to monitor"
 msgstr "Nome do destino para monitorar"
 
-#: ../gio/gdbus-tool.c:1854
+#: gio/gdbus-tool.c:1871
 msgid "Object path to monitor"
 msgstr "Caminho do objeto para monitorar"
 
-#: ../gio/gdbus-tool.c:1883
+#: gio/gdbus-tool.c:1896
 msgid "Monitor a remote object."
 msgstr "Monitora um objeto remoto."
 
-#: ../gio/gdbus-tool.c:1941
-#, c-format
+#: gio/gdbus-tool.c:1954
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr ""
 "Erro: não é possível monitorar uma conexão que não seja de barramento de "
 "mensagem\n"
 
-#: ../gio/gdbus-tool.c:2065
+#: gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr "Serviço a ser ativado antes de esperar por uma outra (nome conhecido)"
 
-#: ../gio/gdbus-tool.c:2068
+#: gio/gdbus-tool.c:2081
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1277,136 +1263,131 @@
 "Tempo limite de espera antes de sair com um erro (segundos); 0 para nenhum "
 "tempo limite (padrão)"
 
-#: ../gio/gdbus-tool.c:2116
+#: gio/gdbus-tool.c:2129
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPÇÃO…] NOME-BARRAMENTO"
 
-#: ../gio/gdbus-tool.c:2118
+#: gio/gdbus-tool.c:2130
 msgid "Wait for a bus name to appear."
 msgstr "Espera por um nome de barramento para aparecer."
 
-#: ../gio/gdbus-tool.c:2194
-#, c-format
+#: gio/gdbus-tool.c:2206
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Erro: Um serviço a ser ativado deve ser especificado.\n"
 
-#: ../gio/gdbus-tool.c:2199
-#, c-format
+#: gio/gdbus-tool.c:2211
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Erro: Um serviço a ser esperado deve ser especificado.\n"
 
-#: ../gio/gdbus-tool.c:2204
-#, c-format
+#: gio/gdbus-tool.c:2216
 msgid "Error: Too many arguments.\n"
 msgstr "Erro: Número excessivo de argumentos.\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 "Erro: %s não é um nome válido de barramento conhecido.\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4566
+#: gio/gdesktopappinfo.c:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "O arquivo da área de trabalho não especifica o campo Exec"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Não é possível localizar o terminal requerido para o aplicativo"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: gio/gdesktopappinfo.c:3202
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "Não é possível criar pasta de configuração do aplicativo do usuário %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3139
+#: gio/gdesktopappinfo.c:3206
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Não é possível criar pasta de configuração MIME do usuário %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3379 ../gio/gdesktopappinfo.c:3403
+#: gio/gdesktopappinfo.c:3446 gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "A informação do aplicativo carece de um identificador"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: gio/gdesktopappinfo.c:3704
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Não é possível criar arquivo %s da área de trabalho do usuário"
 
-#: ../gio/gdesktopappinfo.c:3771
+#: gio/gdesktopappinfo.c:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Definição personalizada para %s"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "a unidade não implementa ejetar"
 
 #. 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 "a unidade não implementa ejetar ou eject_with_operation"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 msgid "drive doesn’t implement polling for media"
 msgstr "a unidade não implementa verificação por mídia"
 
-#: ../gio/gdrive.c:776
+#: gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "a unidade não implementa start"
 
-#: ../gio/gdrive.c:878
+#: gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "a unidade não implementa stop"
 
-#: ../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 "Suporte TLS não disponível"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "Suporte DTLS não disponível"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Não é possível lidar com a versão %d da codificação GEmblem"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Número inválido de tokens (%d) na codificação GEmblem"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Não é possível lidar com a versão %d da codificação GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Número inválido de tokens (%d) na codificação GEmblemedIcon"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Esperado um GEmblem para o 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 "Operação sem suporte"
 
@@ -1414,205 +1395,205 @@
 #. * 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 "Ponto de montagem contido não existe"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: gio/gfile.c:2622 gio/glocalfile.c:2391
 msgid "Can’t copy over directory"
 msgstr "Não é possível copiar sobre diretório"
 
-#: ../gio/gfile.c:2677
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Não é possível copiar diretório sobre diretório"
 
-#: ../gio/gfile.c:2685
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Arquivo alvo existe"
 
-#: ../gio/gfile.c:2704
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Não é possível copiar o diretório recursivamente"
 
-#: ../gio/gfile.c:2979
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "Não há suporte a união de arquivos"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Erro ao unir o arquivo: %s"
 
-#: ../gio/gfile.c:3136
+#: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "Não há suporte a copiar (reflink/clone) entre montagens"
 
-#: ../gio/gfile.c:3140
+#: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Não há suporte a copiar (reflink/clone) ou é inválido"
 
-#: ../gio/gfile.c:3145
+#: gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Não há suporte a copiar (reflink/clone) ou não funcionou"
 
-#: ../gio/gfile.c:3208
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Não é possível copiar o arquivo especial"
 
-#: ../gio/gfile.c:4006
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Fornecido valor inválido de link simbólico"
 
-#: ../gio/gfile.c:4167
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Não há suporte para lixeira"
 
-#: ../gio/gfile.c:4279
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c”"
 msgstr "Nomes de arquivo não podem conter “%c”"
 
-#: ../gio/gfile.c:6760 ../gio/gvolume.c:363
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "volume não implementa montagem"
 
-#: ../gio/gfile.c:6869
+#: gio/gfile.c:6882
 msgid "No application is registered as handling this file"
 msgstr "Nenhum aplicativo está registrado como manipulador deste arquivo"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "O enumerador está fechado"
 
-#: ../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 "O enumerador do arquivo tem operação pendente"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "O enumerador do arquivo já está fechado"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Não é possível lidar com a versão %d da codificação GFileIcon"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Dados de entrada malformados para o 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 "Fluxo não tem suporte para 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 "Não há suporte à busca no fluxo"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "Não é permitido truncar fluxo 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 "Não há suporte para truncar fluxo"
 
-#: ../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 "Nome de servidor inválido"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Resposta do proxy HTTP inválida"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Conexão do proxy HTTP não permitida"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Falha na autenticação com o proxy HTTP"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Autenticação necessária com o proxy HTTP"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Falha na conexão com o proxy HTTP: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "O servidor proxy HTTP fechou a conexão de forma inesperada."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Número errado de tokens (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "Sem tipo para a classe chamada %s"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:320
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "O tipo %s não implementa a interface GIcon"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:331
 #, c-format
 msgid "Type %s is not classed"
 msgstr "O tipo %s não tem classe"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Número de versão malformado: %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:359
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "O tipo %s não implementa from_tokens() na interface GIcon"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Não é possível lidar com a versão fornecida da codificação do ícone"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Nenhum endereço fornecido"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "O tamanho %u é muito longo para o endereço"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "O endereço contém bits ativos além do tamanho do prefixo (máscara)"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s” as IP address mask"
 msgstr "Não foi possível interpretar “%s” como uma máscara de endereço 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 "Sem espaço suficiente para o endereço do soquete"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Endereço de soquete não suportado"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "Fluxo de entrada não implementa leitura"
 
@@ -1622,129 +1603,122 @@
 #. 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 "O fluxo tem operação pendente"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Copiar com o arquivo"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Manter com o arquivo quando movido"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version” takes no arguments"
 msgstr "“version” não leva argumentos"
 
-#: ../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 "Exibe a informação da versão e sai."
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGUMENTOS…]"
-
-#: ../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 "Concatena arquivos para a saída padrão"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Copia um ou mais arquivos"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Mostra informações sobre locais"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Lista o conteúdo dos locais"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "Obtém ou define o manipulador para um tipo mime"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Cria diretórios"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Monitora arquivos e diretórios por alterações"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Monta ou desmonta os locais"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Move um ou mais arquivos"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Abre arquivos com o aplicativo padrão"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Renomeia um arquivo"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Exclui um ou mais arquivos"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Lê da entrada padrão e salva"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Define um atributo de arquivo"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Move arquivos ou diretórios para a lixeira"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Lista o conteúdo de locais em uma árvore"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "Use %s para obter ajuda detalhada.\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Erro ao gravar para a saída padrão"
 
 #. 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 "LOCAL"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Concatena arquivos e os envia para a saída padrão."
 
-#: ../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 +1728,56 @@
 "usando locais GIO em vez de arquivos locais: por exemplo, você pode\n"
 "usar alguma coisa como smb://servidor/recurso/arquivo.txt como local."
 
-#: ../gio/gio-tool-cat.c: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 "Nenhum local fornecido"
 
-#: ../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 "Nenhum diretório alvo"
 
-#: ../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 "Mostra progresso"
 
-#: ../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 "Pergunta antes de sobrescrever"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Preserva todos os 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 "Cria backup dos arquivos de destino existentes"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Nunca segue links 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) %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 "ORIGEM"
 
 #. 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 "Copia um ou mais arquivos de ORIGEM para 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,93 +1787,88 @@
 "GIO em vez de arquivos locais: por exemplo, você pode usar alguma\n"
 "coisa como smb://servidor/recurso/arquivo.txt como local."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "O destino %s não é um diretório"
 
-#: ../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: sobrescrever “%s”? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Lista os atributos graváveis"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Obtém informação de sistema de arquivos"
 
-#: ../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 "Os atributos a obter"
 
-#: ../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 "Não segue links 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 "nome de exibição: %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 "nome para edição: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "nome: %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 "tamanho: "
 
-#: ../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 definíveis:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Atributos graváveis no namespace:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Mostra informações sobre locais."
 
-#: ../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"
@@ -1916,23 +1883,23 @@
 "(ex.: standard::icon), ou apenas pelo espaço de nome (ex.: unix),\n"
 "ou por “*”, que corresponde a todos 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 "Mostra arquivos ocultos"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Usa um formato de listagem longa"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Imprimir URIs completas"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Lista o conteúdo dos locais."
 
-#: ../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"
@@ -1946,19 +1913,19 @@
 "(ex.: standard::icon)"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "TIPO MIME"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "MANIPULADOR"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
 msgstr "Obtém ou define o manipulador para um 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"
@@ -1968,59 +1935,55 @@
 "recomendados para o tipo mime. Se um manipulador for fornecido, ele é\n"
 "definido como o manipulador padrão para o 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 "Deve-se especificar um único tipo mime, e talvez um manipulado"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s”\n"
 msgstr "Nenhum aplicativo padrão 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 "Aplicativo padrão para “%s”: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Aplicativos registrados:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Nenhum aplicativo registrado\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Aplicativos recomendados:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Nenhum aplicativo recomendado\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s”"
 msgstr "Falha ao carregar informação para manipulador de “%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 "Falha ao definir “%s” como o manipulador padrão para “%s”: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Criar diretórios pais"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Cria diretórios."
 
-#: ../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"
@@ -2030,110 +1993,138 @@
 "locais GIO em vez de arquivos locais: por exemplo, você pode usar\n"
 "alguma coisa como smb://servidor/recurso/meudir.txt como local."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Monitora um diretório (padrão: depende do tipo)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Monitora um arquivo (padrão: depende do tipo)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr "Monitora um arquivo diretamente (note mudanças via links absolutos)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Monitora um arquivo diretamente, mas não relata alterações"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "Relata movimentos e renomeação como eventos de exclusão/criação simples"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Monitora eventos de montagem"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
 msgstr "Monitora arquivos ou diretórios por alterações."
 
-#: ../gio/gio-tool-mount.c:58
+#: gio/gio-tool-mount.c:62
 msgid "Mount as mountable"
 msgstr "Monta como montável"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:63
 msgid "Mount volume with device file"
-msgstr "Monta o volume como arquivo de dispositivo"
+msgstr "Monta o volume com o arquivo 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 "Desmonta"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:65
 msgid "Eject"
 msgstr "Ejeta"
 
-#: ../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 "Interrompe o volume com o arquivo de dispositivo"
+
+#: gio/gio-tool-mount.c:67
 msgid "Unmount all mounts with the given scheme"
 msgstr "Desmonta todas montagens com o 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 "Ignora operações pendentes de arquivos ao desmontar ou ejetar"
 
-#: ../gio/gio-tool-mount.c:64
+#: gio/gio-tool-mount.c:69
 msgid "Use an anonymous user when authenticating"
 msgstr "Usa um usuário anônimo ao 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 "Lista"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:72
 msgid "Monitor events"
 msgstr "Monitora eventos"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:73
 msgid "Show extra information"
 msgstr "Mostra informações extras"
 
-#: ../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 "O PIM numérico ao desbloquear um volume VeraCrypt"
+
+#: 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 "Mota um volume TCRYPT oculto"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT system volume"
+msgstr "Mota um volume TCRYPT de sistema"
+
+#: gio/gio-tool-mount.c:264 gio/gio-tool-mount.c:296
 msgid "Anonymous access denied"
 msgstr "Acesso anônimo negado"
 
-#: ../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 "Nenhuma unidade para o arquivo de dispositivo"
+
+#: gio/gio-tool-mount.c:989
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Montado %s em %s\n"
 
-#: ../gio/gio-tool-mount.c:950
+#: gio/gio-tool-mount.c:1044
 msgid "No volume for device file"
 msgstr "Nenhum volume para o arquivo de dispositivo"
 
-#: ../gio/gio-tool-mount.c:1145
+#: gio/gio-tool-mount.c:1239
 msgid "Mount or unmount the locations."
 msgstr "Monta ou desmontar os locais."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Não usa reserva de cópia ou exclusão"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Move um ou mais arquivos da ORIGEM para 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"
@@ -2143,12 +2134,12 @@
 "GIO em vez de arquivos locais: por exemplo, você pode usar alguma\n"
 "coisa como smb://servidor/recurso/arquivo.txt como local"
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "Alvo %s não é um diretório"
 
-#: ../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."
@@ -2156,244 +2147,257 @@
 "Abre arquivos com o aplicativo padrão que está\n"
 "registrado para manipular arquivos deste 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 "Ignora arquivos não existentes, nunca pergunta"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Exclui os arquivos dados."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "NOME"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Renomeia um arquivo."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Faltando 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 "Número excessivo de argumentos"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Renomeação realizada com sucesso. Nova uri: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Só cria se não existir"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "Adiciona ao final do arquivo"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Ao criar, restringe acesso ao usuário atual"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr "Ao substituir, substitui como se o destino não existe"
 
 #. 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 "Emite uma nova etag ao 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 "A etag do arquivo sendo sobrescrito"
 
-#: ../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 "Erro ao ler a partir da saída padrão"
 
 #. 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 não disponível\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Lê da entrada padrão e salva no DESTINO."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Nenhum destino dado"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Tipo do 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 "Define um atributo de arquivos de LOCAL."
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Local não especificado"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Atributo não especificado"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Valor não especificado"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s”"
 msgstr "Tipo de atributo inválido “%s”"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Esvazia a lixeira"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Move arquivos ou diretórios para a lixeira."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Segue links simbólicos, montagens e atalhos"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
 msgstr "Lista conteúdos de diretórios em um formato tipo árvore."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1515
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "O elemento <%s> não é permitido dentro de <%s>"
 
-#: ../gio/glib-compile-resources.c:146
+#: gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "O elemento <%s> não é permitido no nível mais alto"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "O arquivo %s aparece várias vezes no 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 "Falha ao localizar “%s” em todos os diretórios fontes"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s” in current directory"
 msgstr "Falha ao localizar “%s” no diretório atual"
 
-#: ../gio/glib-compile-resources.c:290
+#: gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s”"
 msgstr "Opção de processamento “%s” desconhecida"
 
-#: ../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 "Falha ao criar um arquivo temporário: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr ""
+"Pré-processamento de %s requisitado, mas %s não está definida e %s não está "
+"no PATH"
 
-#: ../gio/glib-compile-resources.c:382
+#: gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Ocorreu erro ao ler arquivo %s: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Ocorreu erro ao comprimir o arquivo %s"
 
-#: ../gio/glib-compile-resources.c:469
+#: gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "texto não pode aparecer dentro de <%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 "Mostra a versão do programa e sai"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
+#: gio/glib-compile-resources.c:737
+#| msgid "name of the output file"
+msgid "Name of the output file"
 msgstr "Nome do arquivo de saída"
 
-#: ../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 "Diretórios onde os arquivos serão lidos (o padrão é o diretório atual)"
+msgstr ""
+"Os diretórios do quais serão carregados arquivos referenciados em ARQUIVO "
+"(padrão: diretório atual)"
 
-#: ../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 "DIRETÓRIO"
 
-#: ../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 "Gera a saída no formato definido pela extensão do arquivo alvo"
 
-#: ../gio/glib-compile-resources.c:668
+#: gio/glib-compile-resources.c:740
 msgid "Generate source header"
 msgstr "Gera um cabeçalho"
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
-msgstr "Gera código fonte que vincula o recurso ao seu programa"
+#: 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 "Gera código-fonte que vincula o recurso ao seu programa"
 
-#: ../gio/glib-compile-resources.c:670
+#: gio/glib-compile-resources.c:742
 msgid "Generate dependency list"
 msgstr "Gera uma lista de dependência"
 
-#: ../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"
+msgid "Name of the dependency file to generate"
 msgstr "Nome do arquivo de dependências para gerar"
 
-#: ../gio/glib-compile-resources.c:672
+#: gio/glib-compile-resources.c:744
 msgid "Include phony targets in the generated dependency file"
 msgstr "Inclui alvos falsos no arquivo de dependência gerado"
 
-#: ../gio/glib-compile-resources.c:673
+#: gio/glib-compile-resources.c:745
 msgid "Don’t automatically create and register resource"
 msgstr "Não cria e registra o recurso automaticamente"
 
-#: ../gio/glib-compile-resources.c:674
+#: gio/glib-compile-resources.c:746
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Não exporta funções; declara-as 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 "Nome do identificador C usado no código fonte gerado"
+msgstr "Nome do identificador C usado no código-fonte gerado"
 
-#: ../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"
@@ -2403,124 +2407,123 @@
 "Arquivos de especificação de recurso têm a extensão .gresource.xml,\n"
 "e um arquivo de recurso tem a extensão .gresource."
 
-#: ../gio/glib-compile-resources.c:723
-#, c-format
+#: gio/glib-compile-resources.c:795
 msgid "You should give exactly one file name\n"
 msgstr "Você deve fornecer exatamente um arquivo\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 "o apelido deve ter um mínimo de 2 caracteres"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Valor numérico invá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'/> já especificado"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "value=\"%s\" já 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 "valores de sinalizadores devem ter no máximo 1 bit definido"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s> deve conter pelo menos um <value>"
 
-#: ../gio/glib-compile-schemas.c:315
+#: gio/glib-compile-schemas.c:317
 #, c-format
 msgid "<%s> is not contained in the specified range"
 msgstr "<%s> não está contido no intervalo especificado"
 
-#: ../gio/glib-compile-schemas.c:327
+#: gio/glib-compile-schemas.c:329
 #, c-format
 msgid "<%s> is not a valid member of the specified enumerated type"
 msgstr "<%s> não é um membro válido do tipo enumerado especificado"
 
-#: ../gio/glib-compile-schemas.c:333
+#: gio/glib-compile-schemas.c:335
 #, c-format
 msgid "<%s> contains string not in the specified flags type"
-msgstr "<%s> contém string ausente no tipo de sinalizadores especilizados"
+msgstr "<%s> contém string ausente no tipo de sinalizadores especializados"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s> contém uma string ausente em <choices>"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> já especificado para essa chave"
 
-#: ../gio/glib-compile-schemas.c:391
+#: gio/glib-compile-schemas.c:393
 #, c-format
 msgid "<range> not allowed for keys of type “%s”"
 msgstr "<range> não permitido para as chaves de tipo “%s”"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "o mínimo do <range> especificado é maior que o máximo"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "categoria de l10n sem suporte: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n requisitado, mas nenhum domínio gettext dado"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "contexto de tradução dado para o valor sem l10n habilitado"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s”: "
 msgstr "Falha ao analisar o valor <default> de tipo “%s”: "
 
-#: ../gio/glib-compile-schemas.c:492
+#: gio/glib-compile-schemas.c:494
 msgid ""
 "<choices> cannot be specified for keys tagged as having an enumerated type"
 msgstr ""
 "<choices> não pode ser especificado para chaves marcadas como tendo um tipo "
 "enumerado"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> já especificado para essa chave"
 
-#: ../gio/glib-compile-schemas.c:513
+#: gio/glib-compile-schemas.c:515
 #, c-format
 msgid "<choices> not allowed for keys of type “%s”"
 msgstr "<choices> não permitido para as chaves de tipo “%s”"
 
-#: ../gio/glib-compile-schemas.c:529
+#: gio/glib-compile-schemas.c:531
 #, c-format
 msgid "<choice value='%s'/> already given"
 msgstr "<choice value='%s'/> já dado"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices> deve conter pelo menos um <choice>"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> já especificado para essa chave"
 
-#: ../gio/glib-compile-schemas.c:562
+#: gio/glib-compile-schemas.c:564
 msgid ""
 "<aliases> can only be specified for keys with enumerated or flags types or "
 "after <choices>"
@@ -2528,49 +2531,49 @@
 "<aliases> só pode ser especificado para chaves com tipos enumerados ou "
 "sinalizadores ou após <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'/> dado quando “%s” já é um membro do 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 quando <choice value='%s'/> já tinha sido dado"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'/> já especificado"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s” is not in enumerated type"
 msgstr "o alvo do alias “%s” não é um tipo enumerado"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s” is not in <choices>"
 msgstr "o alvo alias “%s” não está em <choices>"
 
-#: ../gio/glib-compile-schemas.c:621
+#: gio/glib-compile-schemas.c:623
 #, c-format
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> deve conter pelo menos um <alias>"
 
-#: ../gio/glib-compile-schemas.c:786
+#: gio/glib-compile-schemas.c:798
 msgid "Empty names are not permitted"
 msgstr "Nomes vazios não são permitidos"
 
-#: ../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 "Nome inválido “%s”: nomes precisam começar com uma 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 "
@@ -2579,36 +2582,36 @@
 "Nome inválido “%s”: caractere inválido “%c”; apenas é permitido letras "
 "minúsculas, números e traços (”-”)"
 
-#: ../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 "Nome inválido “%s”: dois hifens (”--”) consecutivos não são permitidos"
 
-#: ../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 "Nome inválido “%s”: o último caractere não pode ser um hífen (”-”)"
 
-#: ../gio/glib-compile-schemas.c:834
+#: gio/glib-compile-schemas.c:846
 #, c-format
 msgid "Invalid name “%s”: maximum length is 1024"
 msgstr "Nome inválido “%s”: o tamanho máximo é 1024"
 
-#: ../gio/glib-compile-schemas.c:904
+#: gio/glib-compile-schemas.c:918
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> já especificado"
 
-#: ../gio/glib-compile-schemas.c:930
+#: gio/glib-compile-schemas.c:944
 msgid "Cannot add keys to a “list-of” schema"
 msgstr "Não é possível adicionar chaves ao esquema “list-of”"
 
-#: ../gio/glib-compile-schemas.c:941
+#: gio/glib-compile-schemas.c:955
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> já especificado"
 
-#: ../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> "
@@ -2617,7 +2620,7 @@
 "<key name='%s'> oculta <key name='%s'> em <schema id='%s'>; use <override> "
 "para modificar o 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 "
@@ -2626,63 +2629,63 @@
 "Apenas um entre “type”, “enum” ou “flags” deve ser especificado 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'> não está (ainda) definido."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1018
 #, c-format
 msgid "Invalid GVariant type string “%s”"
 msgstr "Tipo inválido de texto GVariant “%s”"
 
-#: ../gio/glib-compile-schemas.c:1034
+#: gio/glib-compile-schemas.c:1048
 msgid "<override> given but schema isn’t extending anything"
 msgstr "<override> determinado, mas o esquema não está estendendo nada"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: gio/glib-compile-schemas.c:1061
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Nenhum <key name='%s'> para sobrescrever"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: gio/glib-compile-schemas.c:1069
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> já especificado"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: gio/glib-compile-schemas.c:1142
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> já 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'> estende um esquema ainda não existente “%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'> é uma lista de esquema ainda não existente “%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 "Não pode ser uma lista de um esquema com um caminho"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: gio/glib-compile-schemas.c:1188
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Não é possível estender um esquema com um caminho"
 
-#: ../gio/glib-compile-schemas.c: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 ""
 "<schema id='%s'> é uma lista, estendendo <schema id='%s'> que não é uma 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” "
@@ -2691,17 +2694,17 @@
 "<schema id='%s' list-of='%s'> estende <schema id='%s' list-of='%s'>, mas "
 "“%s” não estende “%s”"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: gio/glib-compile-schemas.c:1225
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr "Um caminho, se determinado, precisa começar e terminar com uma barra"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: gio/glib-compile-schemas.c:1232
 #, c-format
 msgid "The path of a list must end with “:/”"
 msgstr "O caminho de uma lista precisa terminar com “:/”"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: gio/glib-compile-schemas.c:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2710,119 +2713,138 @@
 "Aviso: Esquema “%s” possui caminho “%s”. Caminhos iniciando com “/apps/”, “/"
 "desktop/” ou “/system/” são obsoletos."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: gio/glib-compile-schemas.c:1271
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> já 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 "Apenas um elemento <%s> é permitido dentro de um <%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 "O elemento <%s> não é permitido no nível mais alto"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: gio/glib-compile-schemas.c:1537
 msgid "Element <default> is required in <key>"
 msgstr "O elemento <default> é exigido por <key>"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: gio/glib-compile-schemas.c:1627
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "Texto não pode 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 "Aviso: referência indefinida a <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 foi especificado; saindo.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: gio/glib-compile-schemas.c:1844
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Este arquivo todo foi ignorado.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: gio/glib-compile-schemas.c:1906
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ignorando este arquivo.\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 ""
 "Nenhuma chave “%s” no esquema “%s” como especificado no arquivo de "
 "sobrescrita “%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 sobrescrita para esta chave.\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 " e --strict foi especificado; saindo.\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 ""
+"não foi possível fornecer substituição por-desktop para chave localizada “%s”"
+" no esquema “%s” (arquivo de substituição “%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 ""
 "erro ao analisar chave “%s” no esquema “%s” como especificado no arquivo de "
 "sobrescrita “%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 sobrescrita para esta chave.\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 ""
 "sobrescrita para chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” "
 "está fora dos limites dado pelo 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 "
+#| "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 ""
 "sobrescrita para a chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” "
 "não está na lista de escolhas válidas"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: gio/glib-compile-schemas.c:2139
 msgid "where to store the gschemas.compiled file"
 msgstr "onde armazenar o arquivo gschemas compilado"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2140
 msgid "Abort on any errors in schemas"
 msgstr "Aborta se ocorrer erros nos esquemas"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: gio/glib-compile-schemas.c:2141
 msgid "Do not write the gschema.compiled file"
 msgstr "Não escreve o arquivo gschema compilado"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: gio/glib-compile-schemas.c:2142
 msgid "Do not enforce key name restrictions"
 msgstr "Não força restrições de nome de chave"
 
-#: ../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"
@@ -2832,32 +2854,32 @@
 "É necessário que os arquivos schema tenham a extensão\n"
 ".gschema.xml, e o arquivo de cache é chamado gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: gio/glib-compile-schemas.c:2192
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Você deveria dar exatamente um nome de diretório\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: gio/glib-compile-schemas.c:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Nenhum arquivo schema localizado: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "doing nothing.\n"
 msgstr "fazendo nada.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "arquivo de saída existente removido.\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 "Nome de arquivo inválido: %s"
 
-#: ../gio/glocalfile.c:1105
+#: gio/glocalfile.c:1006
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Erro ao obter informações do sistema de arquivos para %s: %s"
@@ -2866,315 +2888,321 @@
 #. * 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 "Ponto de montagem contido para arquivo %s não existe"
 
-#: ../gio/glocalfile.c:1267
+#: gio/glocalfile.c:1168
 msgid "Can’t rename root directory"
 msgstr "Não é possível renomear o diretório root"
 
-#: ../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 "Erro ao renomear arquivo %s: %s"
 
-#: ../gio/glocalfile.c:1292
+#: gio/glocalfile.c:1193
 msgid "Can’t rename file, filename already exists"
 msgstr "Não é possível renomear o arquivo, o nome do arquivo já existe"
 
-#: ../gio/glocalfile.c: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 "Nome de arquivo invá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 "Erro ao abrir arquivo %s: %s"
 
-#: ../gio/glocalfile.c:1613
+#: gio/glocalfile.c:1514
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Erro ao remover arquivo %s: %s"
 
-#: ../gio/glocalfile.c:1997
+#: gio/glocalfile.c:1925
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Erro ao mover para a lixeira o arquivo %s: %s"
 
-#: ../gio/glocalfile.c:2020
+#: gio/glocalfile.c:1948
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Não é possível criar o diretório da lixeira %s: %s"
 
-#: ../gio/glocalfile.c:2040
+#: gio/glocalfile.c:1970
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Não é possível localizar diretório de nível superior para a lixeira %s"
 
-#: ../gio/glocalfile.c: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 "Não há suporte a mover para lixeira em montagens internas do sistema"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Não é possível localizar ou criar o diretório da lixeira para %s"
 
-#: ../gio/glocalfile.c:2174
+#: gio/glocalfile.c:2118
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Não é possível criar o arquivo de informações da lixeira para %s: %s"
 
-#: ../gio/glocalfile.c:2233
+#: gio/glocalfile.c:2178
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 "Não é possível mover para a lixeira o arquivo %s entre os limites de sistema "
 "de arquivos"
 
-#: ../gio/glocalfile.c:2237 ../gio/glocalfile.c:2293
+#: gio/glocalfile.c:2182 gio/glocalfile.c:2238
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Não é possível mover para a lixeira o arquivo %s: %s"
 
-#: ../gio/glocalfile.c:2299
+#: gio/glocalfile.c:2244
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Não é possível mover para a lixeira o arquivo %s"
 
-#: ../gio/glocalfile.c:2325
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Erro ao criar o diretório %s: %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "O sistema de arquivos não tem suporte a links simbólicos"
 
-#: ../gio/glocalfile.c:2357
+#: gio/glocalfile.c:2302
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Erro ao criar link 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 "Não há suporte a links simbólicos"
 
-#: ../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 "Erro ao mover arquivo %s: %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "Não é possível mover diretório sobre diretório"
 
-#: ../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 "Falha ao criar arquivo de backup"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Erro ao remover arquivo alvo: %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "Não há suporte a mover entre montagens"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Não foi possível determinar a utilização de disco de %s: %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "Valor de atributo deve ser não-NULO"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Tipo de atributo inválido (esperava-se expressão)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Nome de atributo estendido inválido"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Erro ao definir atributo estendido “%s”: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (codificação invá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 "Erro ao obter informação para o arquivo “%s”: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: gio/glocalfileinfo.c:2045
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Erro ao obter informação para o descritor de arquivo: %s"
 
-#: ../gio/glocalfileinfo.c:2083
+#: gio/glocalfileinfo.c:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Tipo de atributo inválido (esperado uint32)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2108
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Tipo de atributo inválido (esperado 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 inválido (expressão de byte esperada)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "Não foi possível definir permissões aos links simbólicos"
 
-#: ../gio/glocalfileinfo.c:2200
+#: gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Erro ao definir permissões: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Erro ao definir proprietário: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2281
 msgid "symlink must be non-NULL"
 msgstr "o link simbólico deve ser não-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 "Erro ao definir link simbólico: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2300
 msgid "Error setting symlink: file is not a symlink"
 msgstr "Erro ao definir link simbólico: o arquivo não é um link simbólico"
 
-#: ../gio/glocalfileinfo.c:2419
+#: gio/glocalfileinfo.c:2426
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Erro ao definir data/hora de modificação ou acesso: %s"
 
-#: ../gio/glocalfileinfo.c:2442
+#: gio/glocalfileinfo.c:2449
 msgid "SELinux context must be non-NULL"
 msgstr "O contexto SELinux deve ser não-NULO"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Erro ao definir o contexto SELinux: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux não está habilitado neste sistema"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Não há suporte à definição do atributo %s"
 
-#: ../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 "Erro ao ler do arquivo: %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 "Erro ao buscar no arquivo: %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 "Erro ao fechar arquivo: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr "Não é possível localizar o tipo de arquivo monitor local padrão"
 
-#: ../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 "Erro ao gravar o arquivo: %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Erro ao remover link antigo de backup: %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 "Erro ao criar cópia de backup: %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Erro ao renomear arquivo temporário: %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 "Erro ao truncar arquivo: %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 "Erro ao abrir arquivo “%s”: %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Arquivo alvo é um diretório"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Arquivo alvo não é um arquivo comum"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "O arquivo foi modificado externamente"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Erro ao remover arquivo antigo: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "GSeekType fornecido inválido"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Solicitação de busca inválida"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "Não é possível truncar GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Fluxo de saída da memória não redimensionável"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Falha ao redimensionar fluxo de saída da memória"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3182,32 +3210,32 @@
 "Quantidade de memória necessária para processar a escrita é maior que a "
 "disponível"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "Solicitada uma busca antes do começo do fluxo"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "Solicitada uma busca além do fim do fluxo"
 
 #. 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 "objeto de montagem não implementa “umount”"
 
 #. 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 "objeto de montagem não implementa “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 ""
 "objeto de montagem não implementa “unmount” ou “unmount_with_operation”"
@@ -3215,110 +3243,108 @@
 #. 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 "objeto de montagem não implementa “eject” ou “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 "objeto de montagem não implementa “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 "objeto de montagem não implementa estimativa de tipo de conteúdo"
 
 #. 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 ""
 "objeto de montagem não implementa estimativa de tipo de conteúdo síncrono"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "Nome da máquina “%s” contém “[” mas não “]”"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Rede inalcançável"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Máquina inalcançável"
 
-#: ../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 "Não foi possível criar o monitor de rede: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: gio/gnetworkmonitornetlink.c:118
 msgid "Could not create network monitor: "
 msgstr "Não foi possível criar o monitor de rede: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: gio/gnetworkmonitornetlink.c:176
 msgid "Could not get network status: "
 msgstr "Não foi possível obter o estado da rede: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: gio/gnetworkmonitornm.c:322
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "A versão do NetworkManager é muito antiga"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "Fluxo de saída não implementa escrita"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "A fonte do fluxo já está fechada"
 
-#: ../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 "Erro ao resolver “%s”: %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
-#| msgid "Invalid hostname"
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Domínio invá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 "O recurso em “%s” não existe"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s” failed to decompress"
 msgstr "Falha ao descompactar o recurso em “%s”"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s” is not a directory"
 msgstr "O recurso em “%s” não é um diretório"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Fluxo de entrada não implementa busca"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
 msgstr "Lista as seções contendo recursos no arquivo elf ARQUIVO"
 
-#: ../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"
@@ -3328,16 +3354,15 @@
 "Se SEÇÃO é fornecida, só lista os recursos dentro desta seção\n"
 "Se CAMINHO é fornecido, só lista recursos que casam com o caminho"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:503 gio/gresource-tool.c:513
 msgid "FILE [PATH]"
 msgstr "ARQUIVO [CAMINHO]"
 
-#: ../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 "SEÇÃO"
 
-#: ../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"
@@ -3349,15 +3374,15 @@
 "Se CAMINHO é fornecido, só lista recursos que casam com o caminho\n"
 "Detalhes incluem a seção, tamanho e compactação"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:519
 msgid "Extract a resource file to stdout"
 msgstr "Extrai um arquivo de recurso para a saída padrão"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:520
 msgid "FILE PATH"
 msgstr "ARQUIVO CAMINHO"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:534
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3385,7 +3410,7 @@
 "Use “gresource help COMANDO” para obter uma ajuda detalhada.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:548
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3400,19 +3425,19 @@
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:555
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SEÇÃO     Um nome de seção elf (opcional)\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   O comando a ser explicado (opcional)\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:565
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr "  ARQUIVO    Um arquivo elf (binário ou biblioteca compartilhada)\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"
@@ -3420,90 +3445,82 @@
 "  ARQUIVO   Um arquivo elf (binário ou biblioteca compartilhada)\n"
 "            ou um arquivo de recurso compilado\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:572
 msgid "[PATH]"
 msgstr "[CAMINHO]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:574
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr "  CAMINHO   Um caminho (opcional) do recurso (pode ser parcial)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:575
 msgid "PATH"
 msgstr "CAMINHO"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:577
 msgid "  PATH      A resource path\n"
 msgstr "  CAMINHO   Um caminho do 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 "Nenhum 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 "Esquema “%s” não é recolocável (o caminho não deve ser especificado)\n"
 
-#: ../gio/gsettings-tool.c:78
+#: gio/gsettings-tool.c:78
 #, c-format
 msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr "Esquema “%s” é recolocável (o caminho deve ser especificado)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Caminho fornecido está vazio.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "O caminho deve começar com uma barra (/)\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "O caminho deve terminar com uma barra (/)\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "O caminho não pode conter duas barras adjacentes (//)\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 "O valor fornecido está fora do intervalo válido\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "A chave não é gravável\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Lista os esquemas instalados (não-recolocáveis)"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Lista os esquemas recolocáveis instalados"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Lista as chaves no 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[:CAMINHO]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Lista os filhos do 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"
@@ -3511,49 +3528,48 @@
 "Lista as chaves e valores, recursivamente\n"
 "Se nenhum ESQUEMA for fornecido, lista todas as chaves\n"
 
-#: ../gio/gsettings-tool.c:607
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[ESQUEMA[:CAMINHO]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Obtém o valor de CHAVE"
 
-#: ../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[:CAMINHO] CHAVE"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Consulta o intervalo de valores válidos para CHAVE"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Consulta a descrição para a CHAVE"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Define o valor de CHAVE para VALOR"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "ESQUEMA[:CAMINHO] CHAVE VALOR"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Restaurar CHAVE para seu valor padrão"
 
-#: ../gio/gsettings-tool.c:642
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Restaurar todas as chaves no ESQUEMA para seus padrões"
 
-#: ../gio/gsettings-tool.c:648
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Verifica se CHAVE é gravável"
 
-#: ../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"
@@ -3563,11 +3579,11 @@
 "Se nenhuma CHAVE for especificada, monitora todas as chaves no ESQUEMA.\n"
 "Use ^C para parar o monitoramento.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "ESQUEMA[:CAMINHO] [CHAVE]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3616,7 +3632,7 @@
 "Use “gsettings help COMANDO” para obter ajuda detalhada.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3631,11 +3647,11 @@
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  SCHEMADIR Um diretório para procurar por esquemas adicionais\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"
@@ -3643,387 +3659,381 @@
 "  ESQUEMA   O nome do esquema\n"
 "  CAMINHO   O caminho, para esquemas recolocáveis\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  CHAVE     A chave (opcional) com o esquema\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  CHAVE     A chave com o esquema\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  VALOR     O valor para definir\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "Não foi possível carregar esquemas de %s: %s\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Nenhum esquema instalado\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Nome de esquema vazio\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s”\n"
 msgstr "Nenhuma chave “%s”\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Soquete inválido, não inicializado"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Soquete inválido, inicialização falhou devido a: %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 msgid "Socket is already closed"
 msgstr "O soquete já está fechado"
 
-#: ../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 "Tempo de E/S do soquete foi esgotado"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "criando GSocket a partir do 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 "Não é possível criar soquete: %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Foi especificada uma família desconhecida"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Foi especificado um protocolo desconhecido"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr ""
 "Não foi possível usar operações de datagrama em um soquete não-datagrama."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Não foi possível usar operações de datagrama em um soquete com um tempo "
 "limite definido."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "não foi possível obter endereço local: %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "não foi possível obter endereço remoto: %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "não foi possível escutar: %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Erro ao vincular ao endereço: %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 "Erro ao entrar no grupo 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 "Erro ao sair do grupo multicast: %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 msgid "No support for source-specific multicast"
 msgstr "Não há suporte para multicast específico da origem"
 
-#: ../gio/gsocket.c:2375
+#: gio/gsocket.c:2375
 msgid "Unsupported socket family"
 msgstr "Família de soquete sem suporte"
 
-#: ../gio/gsocket.c:2393
+#: gio/gsocket.c:2400
 msgid "source-specific not an IPv4 address"
 msgstr "a origem específica não é um endereço 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 "Interface não localizada: %s"
 
-#: ../gio/gsocket.c:2427
+#: gio/gsocket.c:2434
 #, c-format
 msgid "Interface name too long"
 msgstr "Nome de interface grande demais"
 
-#: ../gio/gsocket.c:2463
+#: gio/gsocket.c:2473
 msgid "No support for IPv4 source-specific multicast"
 msgstr "Não há suporte para multicast específico da origem IPv4"
 
-#: ../gio/gsocket.c:2521
+#: gio/gsocket.c:2531
 msgid "No support for IPv6 source-specific multicast"
 msgstr "Não há suporte para multicast específico da origem IPv6"
 
-#: ../gio/gsocket.c:2730
+#: gio/gsocket.c:2740
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Erro ao aceitar a conexão: %s"
 
-#: ../gio/gsocket.c:2854
+#: gio/gsocket.c:2864
 msgid "Connection in progress"
 msgstr "Conexão em progresso"
 
-#: ../gio/gsocket.c:2903
+#: gio/gsocket.c:2913
 msgid "Unable to get pending error: "
 msgstr "Não é possível obter erro pendente: "
 
-#: ../gio/gsocket.c:3073
+#: gio/gsocket.c:3097
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Erro ao receber dados: %s"
 
-#: ../gio/gsocket.c:3268
+#: gio/gsocket.c:3292
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Erro ao enviar dados: %s"
 
-#: ../gio/gsocket.c:3455
+#: gio/gsocket.c:3479
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Não é possível encerrar soquete: %s"
 
-#: ../gio/gsocket.c:3536
+#: gio/gsocket.c:3560
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Erro ao fechar soquete: %s"
 
-#: ../gio/gsocket.c:4213
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Aguardando pela condição do soquete: %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 "Erro ao enviar mensagem: %s"
 
-#: ../gio/gsocket.c:4711
+#: gio/gsocket.c:4735
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "Não há suporte a GSocketControlMessage no 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 "Erro ao receber mensagem: %s"
 
-#: ../gio/gsocket.c:5735
+#: gio/gsocket.c:5759
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Não é possível ler as credenciais do soquete: %s"
 
-#: ../gio/gsocket.c:5744
+#: gio/gsocket.c:5768
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials não está implementado para este SO"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Não foi possível conectar-se ao servidor proxy %s: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Não foi possível conectar-se a %s: "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "Não foi possível conectar: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "Erro desconhecido ao 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 "Não há suporte ao uso de proxy sobre uma conexão não 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 "Não há suporte ao protocolo de proxy “%s”."
 
-#: ../gio/gsocketlistener.c:218
+#: gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "O ouvinte já está fechado"
 
-#: ../gio/gsocketlistener.c:264
+#: gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "O soquete adicionado está fechado"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "Não há suporte ao endereço IPv6 “%s” pelo SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "O nome de usuário é muito longo para o protocolo SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "O nome “%s” é muito longo para o protocolo SOCKSv4"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "O servidor não é um servidor proxy SOCKSv4."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "A conexão ao servidor por meio de SOCKSv4 foi rejeitada"
 
-#: ../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 "O servidor não é um servidor proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "O proxy SOCKSv5 requer autenticação."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
 msgstr "O SOCKSv5 requer um método de autenticação sem suporte pelo GLib."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr ""
 "O nome de usuário ou a senha são muito longos para o protocolo SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "A autenticação SOCKSv5 falhou devido a um nome de usuário ou senha errados."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "O nome “%s” é muito longo para o protocolo SOCKSv5"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "O servidor proxy SOCKSv5 está usando um tipo de endereço desconhecido."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "Erro interno de servidor proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "A conexão SOCKSv5 não foi permitida pelo conjunto de regras."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "Servidor inalcançável por meio do servidor SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "Rede inalcançável por meio do proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Conexão recusada por meio do proxy SOCKSv5."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "Proxy SOCKSv5 sem suporte ao comando “connect”."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "Proxy SOCKSv5 sem suporte ao tipo de endereço fornecido."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Erro de proxy SOCKSv5 desconhecido."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Não é possível lidar com a versão %d da codificação GThemedIcon"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "Nenhum endereço válido foi localizado"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "Erro ao resolver reversamente “%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 "Nenhum registro DNS do tipo de requisição 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 "Temporariamente sem condições de resolver “%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 "Erro ao resolver “%s”"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "Não foi possível decodificar uma chave privada codificada com PEM"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "Chave privada codificada com PEM não localizada"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "Não foi possível analisar chave privada codificada com PEM"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "Certificado codificado com PEM não localizado"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "Não foi possível analisar certificado codificado com 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."
@@ -4033,7 +4043,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -4041,302 +4051,300 @@
 "Várias das senhas digitadas estavam incorretas, e o seu acesso será "
 "bloqueado se houverem mais falhas."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "A senha digitada está incorreta."
 
-#: ../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] "Esperando 1 mensagem de controle, obtive %d"
 msgstr[1] "Esperando 1 mensagem de controle, obtive %d"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Tipo de dado auxiliar não esperado"
 
-#: ../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] "Esperando um fd, mas obtive %d\n"
 msgstr[1] "Esperando um fd, mas obtive %d\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Recebido fd inválido"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Erro ao enviar credenciais: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Erro ao verificar se SO_PASSCRED está habilitado pelo soquete: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Erro ao habilitar 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 ""
 "Era esperado ler apenas um byte para receber credenciais, mas foi lido zero "
 "byte"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Não esperava mensagem de controle, mas recebeu %d"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Erro ao desabilitar 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 "Erro ao ler do descritor de arquivo: %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 "Erro ao fechar o descritor de arquivo: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Sistema de arquivos root"
 
-#: ../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 "Erro ao gravar o descritor de arquivo: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Não há suporte a endereços de soquetes de domínio UNIX abstratos neste "
 "sistema"
 
-#: ../gio/gvolume.c:437
+#: gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "volume não implementa ejetar"
 
 #. 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 "volume não implementa eject ou eject_with_operation"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Erro ao ler do manipulador: %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 "Erro ao fechar manipulador: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Erro ao gravar o manipulador: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Memória insuficiente"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "Erro interno: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Precisa de mais entrada"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Dados comprimidos inválidos"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Endereço para escutar"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Ignorado, para compatibilidade com GTesTDbus"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Exibe o endereço"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Imprime endereço no modo shell"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Executa um serviço dbus"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Args. incorretos\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Atributo “%s” inesperado para o 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 "Atributo “%s” do elemento “%s” não localizado"
 
-#: ../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 "Marca “%s” inesperada, esperava marca “%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 "Marca “%s” inesperada dentro de “%s”"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr ""
 "Nenhum arquivo de marcadores válido foi localizado nos diretórios de dados"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:1958
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Já existe um marcador para o 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 "Nenhum marcador localizado para o URI “%s”"
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2336
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Não foi definido tipo MIME no marcador para o URI “%s”"
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2421
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "Não foi definido sinal de particular no marcador para o URI “%s”"
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2800
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "Não há grupos definidos no marcador para o URI “%s”"
 
-#: ../glib/gbookmarkfile.c: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 "Nenhum aplicativo chamado “%s” registrou um marcador para “%s”"
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3379
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Falha em expandir linha de execução “%s” com URI “%s”"
 
-#: ../glib/gconvert.c:473
-#| msgid "Invalid sequence in conversion input"
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "Caractere não representável na conversão da entrada"
 
-#: ../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 "Sequência de caracteres parcial no final da entrada"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr ""
 "Não é possível converter a sequência “%s” para conjunto caracteres “%s”"
 
-#: ../glib/gconvert.c:940
+#: glib/gconvert.c:940
 msgid "Embedded NUL byte in conversion input"
 msgstr "Byte NULO embutido na entrada de conversão"
 
-#: ../glib/gconvert.c:961
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "Byte NULO embutido na saída de conversão"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "O URI “%s” não é um URI absoluto que utilize o esquema “file”"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "O URI de arquivo local “%s” não pode incluir um “#”"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "O URI “%s” é inválido"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "O nome de servidor do URI “%s” é inválido"
 
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "O URI “%s” contém caracteres com escape inválido"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 msgid "The pathname “%s” is not an absolute path"
 msgstr "O nome de caminho “%s” não é um caminho absoluto"
 
 #. 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 de %b %H:%M:%S %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"
@@ -4357,62 +4365,62 @@
 #. * 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 "janeiro"
 
-#: ../glib/gdatetime.c:253
+#: glib/gdatetime.c:263
 msgctxt "full month name"
 msgid "February"
 msgstr "fevereiro"
 
-#: ../glib/gdatetime.c:255
+#: glib/gdatetime.c:265
 msgctxt "full month name"
 msgid "March"
 msgstr "março"
 
-#: ../glib/gdatetime.c:257
+#: glib/gdatetime.c:267
 msgctxt "full month name"
 msgid "April"
 msgstr "abril"
 
-#: ../glib/gdatetime.c:259
+#: glib/gdatetime.c:269
 msgctxt "full month name"
 msgid "May"
 msgstr "maio"
 
-#: ../glib/gdatetime.c:261
+#: glib/gdatetime.c:271
 msgctxt "full month name"
 msgid "June"
 msgstr "junho"
 
-#: ../glib/gdatetime.c:263
+#: glib/gdatetime.c:273
 msgctxt "full month name"
 msgid "July"
 msgstr "julho"
 
-#: ../glib/gdatetime.c:265
+#: glib/gdatetime.c:275
 msgctxt "full month name"
 msgid "August"
 msgstr "agosto"
 
-#: ../glib/gdatetime.c:267
+#: glib/gdatetime.c:277
 msgctxt "full month name"
 msgid "September"
 msgstr "setembro"
 
-#: ../glib/gdatetime.c:269
+#: glib/gdatetime.c:279
 msgctxt "full month name"
 msgid "October"
 msgstr "outubro"
 
-#: ../glib/gdatetime.c:271
+#: glib/gdatetime.c:281
 msgctxt "full month name"
 msgid "November"
 msgstr "novembro"
 
-#: ../glib/gdatetime.c:273
+#: glib/gdatetime.c:283
 msgctxt "full month name"
 msgid "December"
 msgstr "dezembro"
@@ -4434,132 +4442,132 @@
 #. * 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 "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 "abr"
 
-#: ../glib/gdatetime.c:313
+#: glib/gdatetime.c:323
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "maio"
 
-#: ../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 "ago"
 
-#: ../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 "out"
 
-#: ../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 "segunda-feira"
 
-#: ../glib/gdatetime.c:344
+#: glib/gdatetime.c:354
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "terça-feira"
 
-#: ../glib/gdatetime.c:346
+#: glib/gdatetime.c:356
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "quarta-feira"
 
-#: ../glib/gdatetime.c:348
+#: glib/gdatetime.c:358
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "quinta-feira"
 
-#: ../glib/gdatetime.c:350
+#: glib/gdatetime.c:360
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "sexta-feira"
 
-#: ../glib/gdatetime.c:352
+#: glib/gdatetime.c:362
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../glib/gdatetime.c:354
+#: glib/gdatetime.c:364
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../glib/gdatetime.c:369
+#: glib/gdatetime.c:379
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "seg"
 
-#: ../glib/gdatetime.c:371
+#: glib/gdatetime.c:381
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "ter"
 
-#: ../glib/gdatetime.c:373
+#: glib/gdatetime.c:383
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "qua"
 
-#: ../glib/gdatetime.c:375
+#: glib/gdatetime.c:385
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "qui"
 
-#: ../glib/gdatetime.c:377
+#: glib/gdatetime.c:387
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "sex"
 
-#: ../glib/gdatetime.c:379
+#: glib/gdatetime.c:389
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "sáb"
 
-#: ../glib/gdatetime.c:381
+#: glib/gdatetime.c:391
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "dom"
@@ -4581,86 +4589,62 @@
 #. * (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 "janeiro"
 
-#: ../glib/gdatetime.c:443
-#| msgctxt "full month name"
-#| msgid "February"
+#: glib/gdatetime.c:457
 msgctxt "full month name with day"
 msgid "February"
 msgstr "fevereiro"
 
-#: ../glib/gdatetime.c:445
-#| msgctxt "full month name"
-#| msgid "March"
+#: glib/gdatetime.c:459
 msgctxt "full month name with day"
 msgid "March"
 msgstr "março"
 
-#: ../glib/gdatetime.c:447
-#| msgctxt "full month name"
-#| msgid "April"
+#: glib/gdatetime.c:461
 msgctxt "full month name with day"
 msgid "April"
 msgstr "abril"
 
-#: ../glib/gdatetime.c:449
-#| msgctxt "full month name"
-#| msgid "May"
+#: glib/gdatetime.c:463
 msgctxt "full month name with day"
 msgid "May"
 msgstr "maio"
 
-#: ../glib/gdatetime.c:451
-#| msgctxt "full month name"
-#| msgid "June"
+#: glib/gdatetime.c:465
 msgctxt "full month name with day"
 msgid "June"
 msgstr "junho"
 
-#: ../glib/gdatetime.c:453
-#| msgctxt "full month name"
-#| msgid "July"
+#: glib/gdatetime.c:467
 msgctxt "full month name with day"
 msgid "July"
 msgstr "julho"
 
-#: ../glib/gdatetime.c:455
-#| msgctxt "full month name"
-#| msgid "August"
+#: glib/gdatetime.c:469
 msgctxt "full month name with day"
 msgid "August"
 msgstr "agosto"
 
-#: ../glib/gdatetime.c:457
-#| msgctxt "full month name"
-#| msgid "September"
+#: glib/gdatetime.c:471
 msgctxt "full month name with day"
 msgid "September"
 msgstr "setembro"
 
-#: ../glib/gdatetime.c:459
-#| msgctxt "full month name"
-#| msgid "October"
+#: glib/gdatetime.c:473
 msgctxt "full month name with day"
 msgid "October"
 msgstr "outubro"
 
-#: ../glib/gdatetime.c:461
-#| msgctxt "full month name"
-#| msgid "November"
+#: glib/gdatetime.c:475
 msgctxt "full month name with day"
 msgid "November"
 msgstr "novembro"
 
-#: ../glib/gdatetime.c:463
-#| msgctxt "full month name"
-#| msgid "December"
+#: glib/gdatetime.c:477
 msgctxt "full month name with day"
 msgid "December"
 msgstr "dezembro"
@@ -4682,217 +4666,192 @@
 #. * 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 "jan"
 
-#: ../glib/gdatetime.c:526
-#| msgctxt "abbreviated month name"
-#| msgid "Feb"
+#: glib/gdatetime.c:544
 msgctxt "abbreviated month name with day"
 msgid "Feb"
 msgstr "fev"
 
-#: ../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 "abr"
 
-#: ../glib/gdatetime.c:532
-#| msgctxt "full month name"
-#| msgid "May"
+#: glib/gdatetime.c:550
 msgctxt "abbreviated month name with day"
 msgid "May"
 msgstr "maio"
 
-#: ../glib/gdatetime.c:534
-#| msgctxt "abbreviated month name"
-#| msgid "Jun"
+#: glib/gdatetime.c:552
 msgctxt "abbreviated month name with day"
 msgid "Jun"
 msgstr "jun"
 
-#: ../glib/gdatetime.c:536
-#| msgctxt "abbreviated month name"
-#| msgid "Jul"
+#: glib/gdatetime.c:554
 msgctxt "abbreviated month name with day"
 msgid "Jul"
 msgstr "jul"
 
-#: ../glib/gdatetime.c:538
-#| msgctxt "abbreviated month name"
-#| msgid "Aug"
+#: glib/gdatetime.c:556
 msgctxt "abbreviated month name with day"
 msgid "Aug"
 msgstr "ago"
 
-#: ../glib/gdatetime.c:540
-#| msgctxt "abbreviated month name"
-#| msgid "Sep"
+#: glib/gdatetime.c:558
 msgctxt "abbreviated month name with day"
 msgid "Sep"
 msgstr "set"
 
-#: ../glib/gdatetime.c:542
-#| msgctxt "abbreviated month name"
-#| msgid "Oct"
+#: glib/gdatetime.c:560
 msgctxt "abbreviated month name with day"
 msgid "Oct"
 msgstr "out"
 
-#: ../glib/gdatetime.c:544
-#| msgctxt "abbreviated month name"
-#| msgid "Nov"
+#: glib/gdatetime.c:562
 msgctxt "abbreviated month name with day"
 msgid "Nov"
 msgstr "nov"
 
-#: ../glib/gdatetime.c:546
-#| msgctxt "abbreviated month name"
-#| msgid "Dec"
+#: 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 "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 "Erro ao abrir o diretório “%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] "Não foi possível alocar %lu byte para ler arquivo “%s”"
 msgstr[1] "Não foi possível alocar %lu bytes para ler arquivo “%s”"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "Ocorreu erro ao ler arquivo “%s”: %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s” is too large"
 msgstr "Arquivo “%s” é muito grande"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "Falha ao ler do arquivo “%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 "Falha ao abrir arquivo “%s”: %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr "Falha ao obter atributos do arquivo “%s”: fstat() falhou: %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr "Falha ao abrir arquivo “%s”: fdopen() falhou: %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr "Falha ao renomear arquivo “%s” para “%s”: g_rename() falhou: %s"
 
-#: ../glib/gfileutils.c:1057 ../glib/gfileutils.c:1564
+#: glib/gfileutils.c:1057 glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s”: %s"
 msgstr "Falha ao criar arquivo “%s”: %s"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr "Falha ao gravar o arquivo “%s”: write() falhou: %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr "Falha ao gravar o arquivo “%s”: fsync() falhou: %s"
 
-#: ../glib/gfileutils.c:1251
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr "O arquivo “%s” não pôde ser removido: g_unlink() falhou: %s"
 
-#: ../glib/gfileutils.c:1530
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "Modelo “%s” inválido, não deveria conter um “%s”"
 
-#: ../glib/gfileutils.c:1543
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Modelo “%s” não contém XXXXXX"
 
-#: ../glib/gfileutils.c:2105
+#: glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Falha ao ler link 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 "Não foi possível abrir conversor de “%s” para “%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 ""
 "Não é possível fazer uma leitura em bruto em 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 "Dados residuais não convertidos no buffer de leitura"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "Canal termina em um caractere parcial"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Não é possível fazer uma leitura em bruto de g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:788
+#: glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr ""
 "Não foi possível localizar arquivo de chave válido nos diretórios pesquisados"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "Não é um arquivo comum"
 
-#: ../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"
@@ -4900,50 +4859,50 @@
 "Arquivo de chave contém a linha “%s” que não é um par chave-valor, grupo ou "
 "comentário"
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Nome de grupo inválido: %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Arquivo de chave não começa com um grupo"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Nome de chave inválido: %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "Arquivo de chave contém codificação “%s” sem suporte"
 
-#: ../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 "Arquivo de chave não tem grupo “%s”"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Arquivo de chave não tem chave “%s” no grupo “%s”"
 
-#: ../glib/gkeyfile.c: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 "Arquivo de chave contém chave “%s” com valor “%s” que não é 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 ""
 "Arquivo de chave contém chave “%s” cujo valor não pode ser interpretado."
 
-#: ../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 "
@@ -4952,220 +4911,265 @@
 "Arquivo de chave contém chave “%s” no grupo “%s” que tem um valor que não "
 "pode ser interpretado."
 
-#: ../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 "Chave “%s” no grupo “%s” tem o valor “%s” onde %s era esperado"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Arquivo de chave contém caractere de escape no fim da linha"
 
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Arquivo de chave contém sequência de escape “%s” inválida"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "O valor “%s” não pode ser interpretado como um número."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "Valor inteiro “%s” fora dos limites"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "O valor “%s” não pode ser interpretado como ponto flutuante."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "O valor “%s” não pode ser interpretado como um booleano."
 
-#: ../glib/gmappedfile.c:129
+#: glib/gmappedfile.c:129
 #, c-format
 msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"
 msgstr "Falha ao obter atributos do arquivo “%s%s%s%s”: fstat() falhou: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "Falha ao mapear arquivo “%s%s%s%s”: mmap() falhou: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Falha ao abrir arquivo “%s”: open() falhou: %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 "Erro na linha %d caractere %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'"
-msgstr "Texto do nome codificado em UTF-8 inválido - “%s” não válido"
+#| msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s”"
+msgstr "Texto do nome codificado em UTF-8 inválido — “%s” não válido"
 
-#: ../glib/gmarkup.c: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ão é um nome 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'"
+msgid "“%s” is not a valid name: “%c”"
 msgstr "“%s” não é um nome válido: “%c”"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Erro na linha %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"
 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 ""
 "Falha ao analisar “%-.*s”, que deveria ter sido um dígito dentro de uma "
-"referência de caractere (&#234; por exemplo) - talvez o dígito seja grande "
+"referência de caractere (&#234; por exemplo) — talvez o dígito seja grande "
 "demais"
 
-#: ../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 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 ""
 "Referência de caractere não terminou com um ponto e vírgula; provavelmente "
-"utilizou um caractere “e comercial” sem desejar iniciar uma entidade - "
+"utilizou um caractere “e comercial” sem desejar iniciar uma entidade — "
 "escape-o com &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"
+msgid "Character reference “%-.*s” does not encode a permitted character"
 msgstr "Referência de caractere “%-.*s” não codifica um caractere permitido"
 
-#: ../glib/gmarkup.c:751
+#: glib/gmarkup.c:763
+#| 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 ""
 "Entidade “&;” vazia; as entidades válidas são: &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"
+msgid "Entity name “%-.*s” is not known"
 msgstr "Nome de entidade “%-.*s” não é conhecido"
 
-#: ../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;"
 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 ""
-"Entidade não termina com um ponto e vírgula; provavelmente você utilizou um "
-"“e comercial” sem desejar iniciar uma entidade - escape-o com &amp;"
+"Entidade não termina com um ponto e vírgula; provavelmente você utilizou um “"
+"e comercial” sem desejar iniciar uma entidade — escape-o com &amp;"
 
-#: ../glib/gmarkup.c:1170
+#: glib/gmarkup.c:1182
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Documento tem de começar com um elemento (ex. <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 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” não é um caractere válido após um caractere “<”; não poderá começar um "
 "nome 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'"
 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 ""
 "Caractere estranho “%s”, esperado um caractere “>” para finalizar a marca "
 "“%s” de elemento vazio"
 
-#: ../glib/gmarkup.c:1333
+#: glib/gmarkup.c:1345
 #, 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 ""
 "Caractere estranho “%s”, esperava-se um “=” após o nome do atributo “%s” do "
 "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 "
+#| "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 ""
 "Caractere estranho “%s”, esperava-se um caractere “>” ou “/” para terminar a "
 "marca inicial do elemento “%s”, ou opcionalmente um atributo; talvez tenha "
 "utilizado um caractere inválido no nome 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'"
 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 ""
 "Caractere estranho “%s”, esperava-se uma abertura de aspas após o sinal de "
 "igual ao atribuir o valor ao atributo “%s” do elemento “%s”"
 
-#: ../glib/gmarkup.c:1551
+#: glib/gmarkup.c:1563
 #, 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” não é um caractere válido após os caracteres “</”; “%s” não poderá "
 "começar o nome de um 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 '>'"
 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” não é um caractere válido após o nome do elemento de fecho “%s”; o "
 "caractere permitido é “>”"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
 #, 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” foi fechado, nenhum elemento está atualmente aberto"
 
-#: ../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'"
+msgid "Element “%s” was closed, but the currently open element is “%s”"
 msgstr "Elemento “%s” foi fechado, mas o elemento atualmente aberto é “%s”"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 msgid "Document was empty or contained only whitespace"
 msgstr "Documento estava vazio ou apenas continha espaços"
 
-#: ../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 '<'"
+msgid "Document ended unexpectedly just after an open angle bracket “<”"
 msgstr "Documento terminou inesperadamente logo após um menor que “<”"
 
-#: ../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 "
+#| "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 ""
-"Documento terminou inesperadamente com elementos ainda abertos - “%s” foi o "
+"Documento terminou inesperadamente com elementos ainda abertos — “%s” foi o "
 "último elemento aberto"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5174,21 +5178,21 @@
 "Documento terminou inesperadamente, esperava-se ver um sinal de maior (“>”) "
 "para terminar a marca <%s/>"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Documento terminou inesperadamente dentro de um nome de elemento"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Documento terminou inesperadamente dentro de um nome de atributo"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr ""
 "Documento terminou inesperadamente dentro de uma marca de abertura 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"
@@ -5196,318 +5200,326 @@
 "Documento terminou inesperadamente após o sinal de igual que se seguiu a um "
 "nome de atributo; nenhum valor de atributo"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Documento terminou inesperadamente dentro de um valor de 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'"
+msgid "Document ended unexpectedly inside the close tag for element “%s”"
 msgstr ""
 "Documento terminou inesperadamente dentro da marca de fechamento do elemento "
 "“%s”"
 
-#: ../glib/gmarkup.c: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 ""
+"Documento terminou inesperadamente dentro da marca de um elemento não aberto"
+
+#: glib/gmarkup.c:1859
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Documento terminou inesperadamente dentro de um comentário ou instrução de "
 "processamento"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[OPÇÃO…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Opções de ajuda:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Mostra opções de ajuda"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Mostra todas as opções de ajuda"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Opções de aplicativo:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Opções:"
 
-#: ../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 "Não é possível converter o valor inteiro “%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 "Valor inteiro “%s” para %s fora dos limites"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s” for %s"
 msgstr ""
 "Não é possível converter o ponto flutuante com dupla precisão “%s” para %s"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s” for %s out of range"
 msgstr "Ponto flutuante com dupla precisão “%s” para %s fora dos limites"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Erro ao ler a opção %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 argumento para %s"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Opção %s desconhecida"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "objeto corrompido"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "erro interno ou objeto corrompido"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "memória insuficiente"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "limite de backtracking alcançado"
 
-#: ../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 "o padrão contém itens sem suporte para correspondência parcial"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "erro interno"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "não há suporte à referência retroativa como condição para correspondência "
 "parcial"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "limite de recursão alcançado"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "combinação inválida de sinalizador de nova linha"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "deslocamento ruim"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "utf8 curto"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "recursão infinita"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ no fim do padrão"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c no fim do padrão"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "caractere não reconhecido seguindo \\"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "números fora de ordem no quantificador {}"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "número grande demais no quantificador {}"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "terminação ] em falta para classe de caracteres"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "sequência de escape inválida na classe de caracteres"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "intervalo fora de ordem na classe de caracteres"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "nada a repetir"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "repetição inesperada"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "caractere não reconhecido após (? ou (?-"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "classes nomeadas POSIX têm suporte apenas dentro de uma classe"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "faltando terminação )"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "referência a subpadrão não existente"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "faltando ) após o comentário"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "expressão regular é grande demais"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "falha ao obter memória"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") sem abrir ("
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "estouro de código"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "caractere não reconhecido após (?<"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "declaração de verificação anterior não é de largura fixa"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "número mal formado ou nome após (?("
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "grupo condicional contém mais que duas ramificações"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "esperava-se declaração após (?("
 
 #. 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 ou (?[+-]dígitos devem ser seguidos por )"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "nome de classe POSIX desconhecido"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "elementos de arranjo POSIX sem suporte"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "valor de caractere na sequência \\x{...} é grande demais"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "condição inválida (?(0)"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C não permitido na declaração de verificação anterior"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "não há suporte a escapes \\L, \\l, \\N{nome}, \\U e \\u"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "chamada recursiva pode causar uma repetição indefinidamente"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "caractere não reconhecido após (?P"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "terminação em falta no nome do subpadrão"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "dois subpadrões nomeados têm o mesmo nome"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "sequência \\P ou \\p mal formada"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "nome de propriedade desconhecido após \\P ou \\p"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "nome de subpadrão é grande demais (máximo 32 caracteres)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "excesso de subpadrões nomeados (máximo 10.000)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "valor octal é maior que \\377"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "espaço de trabalho de compilação invadido"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "subpadrão de referência verificado anteriormente não localizado"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "O grupo DEFINE contém mais que uma ramificação"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "opções do NEWLINE inconsistentes"
 
 # obs.: "angle-brackets" não existe no Brasil, mas existe brackets, que é '<' e '>'
-#: ../glib/gregex.c: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"
@@ -5515,277 +5527,283 @@
 "\\g não é seguido por um número ou nome entre aspas, chaves ou sinais de "
 "menor que ou maior que um número diferente de zero opcionalmente entre chaves"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "uma referência numerada não pode ser zero"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "um argumento não é permitido para (*ACCEPT), (*FAIL) ou (*COMMIT)"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) não reconhecido"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "número é muito grande"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "faltando o nome do subpadrão após (?&"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "esperava-se dígito após (?+"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
 "] é um caractere de dados inválido no modo de compatibilidade do JavaScript"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "não é permitido dois subpadrões nomeados com o mesmo nome"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) deve possuir um argumento"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "\\c pode ser seguido por um caractere ASCII"
 
 # obs.: "angle-brackets" não existe no Brasil, mas existe brackets, que é '<' e '>'
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "\\k não é seguido por um nome entre aspas, chaves ou sinais de menor que ou "
 "maior que"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N não é suportado em uma classe"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "muitas referências de encaminhamento"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "nome é muito cumprido em (*MARK), (*PRUNE), (*SKIP) ou (*THEN)"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "valor de caractere na sequência \\u.... é grande demais"
 
-#: ../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 "Erro ao coincidir expressão regular %s: %s"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "Biblioteca PCRE compilada sem suporte a UTF-8"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "Biblioteca PCRE compilada sem suporte às propriedades UTF-8"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "Biblioteca PCRE compilada com opções incompatíveis"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Erro ao otimizar expressão 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 "Erro ao compilar expressão regular %s no caractere %d: %s"
 
-#: ../glib/gregex.c:2413
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}” expected"
 msgstr "esperava-se dígito hexadecimal ou “}”"
 
-#: ../glib/gregex.c:2429
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "esperava-se dígito hexadecimal"
 
-#: ../glib/gregex.c:2469
+#: glib/gregex.c:2475
 msgid "missing “<” in symbolic reference"
 msgstr "“<” em falta na referência simbólica"
 
-#: ../glib/gregex.c:2478
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "referência simbólica inacabada"
 
-#: ../glib/gregex.c:2485
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "referência simbólica de comprimento zero"
 
-#: ../glib/gregex.c:2496
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "esperava-se dígito"
 
-#: ../glib/gregex.c:2514
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "referência simbólica ilegal"
 
-#: ../glib/gregex.c:2576
+#: glib/gregex.c:2582
 msgid "stray final “\\”"
 msgstr "“\\” final errado"
 
-#: ../glib/gregex.c:2580
+#: glib/gregex.c:2586
 msgid "unknown escape sequence"
 msgstr "sequência de escape desconhecida"
 
-#: ../glib/gregex.c:2590
+#: glib/gregex.c:2596
 #, c-format
 msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Erro ao analisar texto de substituição “%s” no caractere %lu: %s"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Texto citado não começa com uma aspa"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr "Aspa sem par na linha de comando ou outro texto de console"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr "Texto terminou logo após um caractere “\\”. (O 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 ""
 "Texto terminou antes da aspa equivalente ter sido localizada para %c. (texto "
 "era “%s”)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Texto estava vazio (ou apenas continha espaços)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Falha ao ler dados de processo filho (%s)"
 
-#: ../glib/gspawn.c:401
+#: glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Erro inesperado no select() ao ler dados de processo filho (%s)"
 
-#: ../glib/gspawn.c:486
+#: glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Erro inesperado em 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 "Processo filho concluiu com código %ld"
 
-#: ../glib/gspawn.c:905
+#: glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Processo filho foi terminado pelo sinal %ld"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Processo filho foi parado pelo sinal %ld"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Processo filho concluiu anormalmente"
 
-#: ../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 "Falha ao ler de canal filho (%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 "Falha ao criar processo filho “%s” (%s)"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Falha no 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 "Falha ao ir para diretório “%s” (%s)"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "Falha ao executar processo filho “%s” (%s)"
 
-#: ../glib/gspawn.c:1563
+#: glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Falha ao redirecionar saída ou entrada do processo filho (%s)"
 
-#: ../glib/gspawn.c:1572
+#: glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Falha no fork de processo filho (%s)"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s”"
 msgstr "Erro desconhecido ao executar processo filho “%s”"
 
-#: ../glib/gspawn.c:1604
+#: glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Falha ao ler dados suficientes de canal pid do filho (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Falha ao ler dados de processo filho"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Falha ao criar canal para comunicar com processo filho (%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 "Falha ao executar processo filho (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:450
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Nome de programa invá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 "String inválida no vetor de argumentos em %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 "String inválida no ambiente: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: glib/gspawn-win32.c:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Diretório de trabalho inválido: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:772
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Falha ao executar 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"
@@ -5793,170 +5811,170 @@
 "Erro inesperado no g_io_channel_win32_poll() ao ler dados de um processo "
 "filho"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "Texto vazio não é um número"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s” is not a signed number"
 msgstr "“%s” não é um número assinado"
 
-#: ../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 "O número “%s” está fora dos limites [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s” is not an unsigned number"
 msgstr "“%s” não é um número não assinado"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Falha ao alocar memória"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Caractere fora do limite 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 "Sequência inválida na conversão da entrada"
 
-#: ../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 "Caractere fora do limite 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"
@@ -5964,7 +5982,7 @@
 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"
@@ -5972,7 +5990,7 @@
 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"
@@ -5984,11 +6002,27 @@
 #. * 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 "Método “%s” inexistente"
+
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable - unknown value '%s'"
+#~ msgstr ""
+#~ "Não foi possível determinar o endereço de barramento da variável de "
+#~ "ambiente DBUS_STARTER_BUS_TYPE - valor desconhecido “%s”"
+
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGUMENTOS…]"
+
+#~ msgid "Failed to create temp file: %s"
+#~ msgstr "Falha ao criar um arquivo temporário: %s"
+
 #~ msgid ""
 #~ "Message has %d file descriptors but the header field indicates %d file "
 #~ "descriptors"
diff --git a/po/ro.po b/po/ro.po
index 07853b4..93d3fcb 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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 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 @@
 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 @@
 "\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 @@
 "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 @@
 "%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 @@
 "“%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 @@
 "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 @@
 #: ../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 @@
 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 @@
 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:460
-#, fuzzy, c-format
-#| msgid "Address element '%s', does not contain a colon (:)"
+#: ../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: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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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"
-msgid "Unable to set property %s.%s"
-msgstr "Nu s-a putut crea socket-ul: %s"
-
-#: ../gio/gdbusconnection.c:5625
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
+msgid "Unable to set property %s.%s"
+msgstr "Nu se poate stabili proprietatea %s.%s"
+
+#: ../gio/gdbusconnection.c:5627
+#, c-format
+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”"
+msgstr "S-a aศ™teptat un octet NUL dupฤƒ ศ™irul „%s”, dar s-a gฤƒsit 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'"
+#: ../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 @@
 "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 @@
 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 @@
 "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"
-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:678
 #, 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: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:651
-#, fuzzy, c-format
-msgid "Error: %s is not a valid interface name\n"
-msgstr "Eroare: calea %s cฤƒtre obiect nu este validฤƒ\n"
-
-#: ../gio/gdbus-tool.c:657
-#, fuzzy, 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 magistralฤƒ unic valid.\n"
 
-#. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:700 ../gio/gdbus-tool.c:1037
-#, 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
-msgid "Error flushing connection: %s\n"
-msgstr "Eroare la acceptarea conexiunii: %s"
-
-#: ../gio/gdbus-tool.c:759
-msgid "Destination name to invoke method on"
-msgstr "Numele destinaศ›iei pe care se va invoca metoda"
-
-#: ../gio/gdbus-tool.c:760
-msgid "Object path to invoke method on"
-msgstr "Calea cฤƒtre obiectul pe care se va invoca metoda"
-
-#: ../gio/gdbus-tool.c:761
-msgid "Method and interface name"
-msgstr "Metoda ศ™i numele interfeศ›ei"
-
-#: ../gio/gdbus-tool.c:762
-#, fuzzy
-msgid "Timeout in seconds"
-msgstr "Limita de timp a fost atinsฤƒ"
-
-#: ../gio/gdbus-tool.c:803
-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
-#, 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: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:940
+#: ../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: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: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:766
+#, c-format
+msgid "Error: %s is not a valid interface name\n"
+msgstr "Eroare: %s nu este un nume de interfaศ›ฤƒ valid\n"
+
+#: ../gio/gdbus-tool.c:772
+#, c-format
+msgid "Error: %s is not a valid member name\n"
+msgstr "Eroare: %s nu este un nume de membru valid\n"
+
+#. Use the original non-"parse-me-harder" error
+#: ../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:841
+#, c-format
+msgid "Error flushing connection: %s\n"
+msgstr "Eroare la golirea conexiunii: %s\n"
+
+#: ../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:869
+msgid "Object path to invoke method on"
+msgstr "Calea cฤƒtre obiectul pe care se va invoca metoda"
+
+#: ../gio/gdbus-tool.c:870
+msgid "Method and interface name"
+msgstr "Metoda ศ™i numele interfeศ›ei"
+
+#: ../gio/gdbus-tool.c:871
+msgid "Timeout in seconds"
+msgstr "Limita de timp în secunde"
+
+#: ../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: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:993 ../gio/gdbus-tool.c:1749 ../gio/gdbus-tool.c:1980
+#, c-format
+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: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"
-
-#: ../gio/gdesktopappinfo.c:3131
-#, fuzzy, c-format
-#| msgid "Can't create user MIME configuration folder %s: %s"
-msgid "Can’t create user MIME configuration folder %s: %s"
-msgstr "Nu se poate crea dosarul pentru opศ›iunile MIME %s: %s"
-
-#: ../gio/gdesktopappinfo.c:3371 ../gio/gdesktopappinfo.c:3395
-msgid "Application information lacks an identifier"
 msgstr ""
+"Nu se poate crea dosarul de configurare pentru aplicaศ›iile utilizatorului "
+"%s: %s"
 
-#: ../gio/gdesktopappinfo.c:3629
-#, fuzzy, c-format
-#| msgid "Can't create user desktop file %s"
+#: ../gio/gdesktopappinfo.c:3206
+#, c-format
+msgid "Can’t create user MIME configuration folder %s: %s"
+msgstr "Nu se poate crea dosarul de configurare MIME al utilizatorului %s: %s"
+
+#: ../gio/gdesktopappinfo.c:3446 ../gio/gdesktopappinfo.c:3470
+msgid "Application information lacks an identifier"
+msgstr "Informaศ›iile despre aplicaศ›ie nu au un indentificator"
+
+#: ../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 @@
 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 @@
 #. * 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 @@
 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 @@
 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 @@
 #: ../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 @@
 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 @@
 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 @@
 #. * 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 @@
 
 #: ../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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 ""
-
-#: ../gio/gio-tool-mount.c:59
-msgid "Mount volume with device file"
-msgstr ""
-
-#: ../gio/gio-tool-mount.c:59
-msgid "DEVICE"
-msgstr ""
-
-#: ../gio/gio-tool-mount.c:60
-msgid "Unmount"
-msgstr ""
-
-#: ../gio/gio-tool-mount.c:61
-msgid "Eject"
-msgstr ""
-
-#: ../gio/gio-tool-mount.c:62
-msgid "Unmount all mounts with the given scheme"
-msgstr ""
-
-#: ../gio/gio-tool-mount.c:62
-msgid "SCHEME"
-msgstr ""
+msgstr "Monteazฤƒ ca montabil"
 
 #: ../gio/gio-tool-mount.c:63
-msgid "Ignore outstanding file operations when unmounting or ejecting"
-msgstr ""
+msgid "Mount volume with device file"
+msgstr "Monteazฤƒ volumul cu fiศ™ier de dispozitiv"
+
+#: ../gio/gio-tool-mount.c:63 ../gio/gio-tool-mount.c:66
+msgid "DEVICE"
+msgstr "DISPOZITIV"
 
 #: ../gio/gio-tool-mount.c:64
-msgid "Use an anonymous user when authenticating"
-msgstr ""
+msgid "Unmount"
+msgstr "Demonteazฤƒ"
 
-#. Translator: List here is a verb as in 'List all mounts'
+#: ../gio/gio-tool-mount.c:65
+msgid "Eject"
+msgstr "Scoate"
+
 #: ../gio/gio-tool-mount.c:66
-msgid "List"
-msgstr ""
+msgid "Stop drive with device file"
+msgstr "Opreศ™te unitatea cu fiศ™ierul de dispozitiv"
 
 #: ../gio/gio-tool-mount.c:67
-msgid "Monitor events"
-msgstr ""
+msgid "Unmount all mounts with the given scheme"
+msgstr "Demonteazฤƒ toate montฤƒrile cu schema datฤƒ"
+
+#: ../gio/gio-tool-mount.c:67
+msgid "SCHEME"
+msgstr "SCHEMA"
 
 #: ../gio/gio-tool-mount.c:68
-#, fuzzy
-#| msgid "Show help options"
-msgid "Show extra information"
-msgstr "Aratฤƒ opศ›iunile de ajutor"
-
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
-msgid "Anonymous access denied"
+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:897
+#: ../gio/gio-tool-mount.c:69
+msgid "Use an anonymous user when authenticating"
+msgstr "Utilizeazฤƒ un utilizator anonim la autentificare"
+
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../gio/gio-tool-mount.c:71
+msgid "List"
+msgstr "Listeazฤƒ"
+
+#: ../gio/gio-tool-mount.c:72
+msgid "Monitor events"
+msgstr "Monitorizeazฤƒ evenimente"
+
+#: ../gio/gio-tool-mount.c:73
+msgid "Show extra information"
+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: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 "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: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 @@
 "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 @@
 #: ../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"
-
-#: ../gio/glib-compile-schemas.c:796
-#, fuzzy, c-format
-#| msgid "invalid name '%s': names must begin with a lowercase letter"
-msgid "Invalid name “%s”: names must begin with a lowercase letter"
-msgstr "nume nevalid „%s”: numele trebuie sฤƒ înceapฤƒ cu o literฤƒ micฤƒ"
+msgstr "Numele goale nu sunt permise"
 
 #: ../gio/glib-compile-schemas.c:808
-#, fuzzy, c-format
-#| msgid ""
-#| "invalid name '%s': invalid character '%c'; only lowercase letters, "
-#| "numbers and dash ('-') are permitted."
+#, 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ฤƒ"
+
+#: ../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 @@
 "<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 @@
 "<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 @@
 "<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 @@
 "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 @@
 
 #: ../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 @@
 #. 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 @@
 
 #: ../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 @@
 "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 @@
 "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 @@
 "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 @@
 "\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 @@
 
 #: ../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 @@
 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 @@
 "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 @@
 "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 @@
 "\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 @@
 "\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 @@
 "  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 ""
+msgstr "Nu existฤƒ niciun suport pentru difuzarea multiplฤƒ specificฤƒ sursei"
 
-#: ../gio/gsocket.c:2488
+#: ../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: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 @@
 #: ../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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 "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 @@
 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 @@
 
 #: ../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"
+msgstr "%I:%M:%S %p"
 
-#: ../glib/gdatetime.c:224
+#. 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
-msgctxt "full month name"
-msgid "May"
-msgstr "Mai"
-
-#: ../glib/gdatetime.c:234
-msgctxt "full month name"
-msgid "June"
-msgstr "Iunie"
-
-#: ../glib/gdatetime.c:236
-msgctxt "full month name"
-msgid "July"
-msgstr "Iulie"
-
-#: ../glib/gdatetime.c:238
-msgctxt "full month name"
-msgid "August"
-msgstr "August"
-
-#: ../glib/gdatetime.c:240
-msgctxt "full month name"
-msgid "September"
-msgstr "Septembrie"
-
-#: ../glib/gdatetime.c:242
-msgctxt "full month name"
-msgid "October"
-msgstr "Octombrie"
-
-#: ../glib/gdatetime.c:244
-msgctxt "full month name"
-msgid "November"
-msgstr "Noiembrie"
-
-#: ../glib/gdatetime.c:246
-msgctxt "full month name"
-msgid "December"
-msgstr "Decembrie"
-
-#: ../glib/gdatetime.c:261
-msgctxt "abbreviated month name"
-msgid "Jan"
-msgstr "Ian"
-
-#: ../glib/gdatetime.c:263
-msgctxt "abbreviated month name"
-msgid "Feb"
-msgstr "Feb"
-
-#: ../glib/gdatetime.c:265
-msgctxt "abbreviated month name"
-msgid "Mar"
-msgstr "Mar"
-
-#: ../glib/gdatetime.c:267
-msgctxt "abbreviated month name"
-msgid "Apr"
-msgstr "Apr"
-
 #: ../glib/gdatetime.c:269
-msgctxt "abbreviated month name"
+msgctxt "full month name"
 msgid "May"
 msgstr "Mai"
 
 #: ../glib/gdatetime.c:271
+msgctxt "full month name"
+msgid "June"
+msgstr "Iunie"
+
+#: ../glib/gdatetime.c:273
+msgctxt "full month name"
+msgid "July"
+msgstr "Iulie"
+
+#: ../glib/gdatetime.c:275
+msgctxt "full month name"
+msgid "August"
+msgstr "August"
+
+#: ../glib/gdatetime.c:277
+msgctxt "full month name"
+msgid "September"
+msgstr "Septembrie"
+
+#: ../glib/gdatetime.c:279
+msgctxt "full month name"
+msgid "October"
+msgstr "Octombrie"
+
+#: ../glib/gdatetime.c:281
+msgctxt "full month name"
+msgid "November"
+msgstr "Noiembrie"
+
+#: ../glib/gdatetime.c:283
+msgctxt "full month name"
+msgid "December"
+msgstr "Decembrie"
+
+#. 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:317
+msgctxt "abbreviated month name"
+msgid "Feb"
+msgstr "Feb"
+
+#: ../glib/gdatetime.c:319
+msgctxt "abbreviated month name"
+msgid "Mar"
+msgstr "Mar"
+
+#: ../glib/gdatetime.c:321
+msgctxt "abbreviated month name"
+msgid "Apr"
+msgstr "Apr"
+
+#: ../glib/gdatetime.c:323
+msgctxt "abbreviated month name"
+msgid "May"
+msgstr "Mai"
+
+#: ../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 @@
 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 @@
 
 #: ../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 @@
 #: ../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 @@
 #: ../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 @@
 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 @@
 #: ../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 @@
 
 #: ../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 @@
 "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 @@
 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 @@
 
 #: ../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 @@
 
 #: ../glib/gregex.c:305
 msgid "recursion loop"
-msgstr ""
+msgstr "buclฤƒ de recursivitate"
 
 #: ../glib/gregex.c:309
 msgid "unknown error"
@@ -5403,10 +5352,8 @@
 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 @@
 
 #: ../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 @@
 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 @@
 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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 
 #: ../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 @@
 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 @@
 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,45 +5820,161 @@
 
 #: ../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 "%.1f kB"
+msgstr "%.1f kB"
+
+#: ../glib/gutils.c:2245 ../glib/gutils.c:2451
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../glib/gutils.c:2246 ../glib/gutils.c:2456
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../glib/gutils.c:2247 ../glib/gutils.c:2461
+#, c-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
+
+#: ../glib/gutils.c:2248 ../glib/gutils.c:2466
+#, c-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
+
+#: ../glib/gutils.c:2249 ../glib/gutils.c:2471
+#, c-format
+msgid "%.1f EB"
+msgstr "%.1f EB"
+
+#: ../glib/gutils.c:2252
+#, c-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
+
+#: ../glib/gutils.c:2253
+#, c-format
+msgid "%.1f MiB"
+msgstr "%.1f MiB"
+
+#: ../glib/gutils.c:2254
+#, c-format
+msgid "%.1f GiB"
+msgstr "%.1f GiB"
+
+#: ../glib/gutils.c:2255
+#, c-format
+msgid "%.1f TiB"
+msgstr "%.1f TiB"
+
+#: ../glib/gutils.c:2256
+#, c-format
+msgid "%.1f PiB"
+msgstr "%.1f PiB"
+
+#: ../glib/gutils.c:2257
+#, c-format
+msgid "%.1f EiB"
+msgstr "%.1f EiB"
+
+#: ../glib/gutils.c:2260
+#, c-format
+msgid "%.1f kb"
+msgstr "%.1f kb"
+
+#: ../glib/gutils.c:2261
+#, c-format
+msgid "%.1f Mb"
+msgstr "%.1f Mb"
+
+#: ../glib/gutils.c:2262
+#, c-format
+msgid "%.1f Gb"
+msgstr "%.1f Gb"
+
+#: ../glib/gutils.c:2263
+#, c-format
+msgid "%.1f Tb"
+msgstr "%.1f Tb"
+
+#: ../glib/gutils.c:2264
+#, c-format
+msgid "%.1f Pb"
+msgstr "%.1f Pb"
+
+#: ../glib/gutils.c:2265
+#, c-format
+msgid "%.1f Eb"
+msgstr "%.1f Eb"
+
+#: ../glib/gutils.c:2268
+#, c-format
+msgid "%.1f Kib"
+msgstr "%.1f Kib"
+
+#: ../glib/gutils.c:2269
+#, c-format
+msgid "%.1f Mib"
+msgstr "%.1f Mib"
+
+#: ../glib/gutils.c:2270
+#, c-format
+msgid "%.1f Gib"
+msgstr "%.1f Gib"
+
+#: ../glib/gutils.c:2271
+#, c-format
+msgid "%.1f Tib"
+msgstr "%.1f Tib"
+
+#: ../glib/gutils.c:2272
+#, c-format
+msgid "%.1f Pib"
+msgstr "%.1f Pib"
+
+#: ../glib/gutils.c:2273
+#, c-format
+msgid "%.1f Eib"
+msgstr "%.1f Eib"
+
+#: ../glib/gutils.c:2307 ../glib/gutils.c:2433
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -5948,180 +5982,77 @@
 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"
-
-#: ../glib/gutils.c:2245 ../glib/gutils.c:2360
+#: ../glib/gutils.c:2311
 #, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../glib/gutils.c:2248 ../glib/gutils.c:2365
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../glib/gutils.c:2250 ../glib/gutils.c:2370
-#, c-format
-msgid "%.1f TB"
-msgstr "%.1f TB"
-
-#: ../glib/gutils.c:2253 ../glib/gutils.c:2375
-#, c-format
-msgid "%.1f PB"
-msgstr "%.1f PB"
-
-#: ../glib/gutils.c:2256 ../glib/gutils.c:2380
-#, c-format
-msgid "%.1f EB"
-msgstr "%.1f EB"
+msgid "%u bit"
+msgid_plural "%u bits"
+msgstr[0] "%u bit"
+msgstr[1] "%u biศ›i"
+msgstr[2] "%u de biศ›i"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2293
-#, fuzzy, c-format
+#: ../glib/gutils.c:2378
+#, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
-msgstr[0] "%u octet"
-msgstr[1] "%u octeศ›i"
-msgstr[2] "%u de octeศ›i"
+msgstr[0] "%s octet"
+msgstr[1] "%s octeศ›i"
+msgstr[2] "%s de octeศ›i"
+
+#. 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"
 
 #. 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:2446
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-msgctxt "full month name with day"
-msgid "January"
-msgstr "Ianuarie"
+#~ msgid "No such method '%s'"
+#~ msgstr "Nu existฤƒ metoda „%s”"
 
-msgctxt "full month name with day"
-msgid "February"
-msgstr "Februarie"
+#~ 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 "full month name with day"
-msgid "March"
-msgstr "Martie"
+#~ msgid "[ARGS...]"
+#~ msgstr "[ARGUMENTE…]"
 
-msgctxt "full month name with day"
-msgid "April"
-msgstr "Aprilie"
+#, 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"
 
-msgctxt "full month name with day"
-msgid "May"
-msgstr "Mai"
+#, fuzzy
+#~ msgid "Error: object path not specified.\n"
+#~ msgstr "Eroare: calea cฤƒtre obiect nu a fost specificatฤƒ\n"
 
-msgctxt "full month name with day"
-msgid "June"
-msgstr "Iunie"
+#, fuzzy
+#~ msgid "Error: signal not specified.\n"
+#~ msgstr "Eroare: destinaศ›ia nu a fost specificatฤƒ\n"
 
-msgctxt "full month name with day"
-msgid "July"
-msgstr "Iulie"
+#, fuzzy
+#~ msgid "Error: signal must be the fully-qualified name.\n"
+#~ msgstr "Eroare: destinaศ›ia nu a fost specificatฤƒ\n"
 
-msgctxt "full month name with day"
-msgid "August"
-msgstr "August"
-
-msgctxt "full month name with day"
-msgid "September"
-msgstr "Septembrie"
-
-msgctxt "full month name with day"
-msgid "October"
-msgstr "Octombrie"
-
-msgctxt "full month name with day"
-msgid "November"
-msgstr "Noiembrie"
-
-msgctxt "full month name with day"
-msgid "December"
-msgstr "Decembrie"
-
-msgctxt "abbreviated month name with day"
-msgid "Jan"
-msgstr "Ian"
-
-msgctxt "abbreviated month name with day"
-msgid "Feb"
-msgstr "Feb"
-
-msgctxt "abbreviated month name with day"
-msgid "Mar"
-msgstr "Mar"
-
-msgctxt "abbreviated month name with day"
-msgid "Apr"
-msgstr "Apr"
-
-msgctxt "abbreviated month name with day"
-msgid "May"
-msgstr "Mai"
-
-msgctxt "abbreviated month name with day"
-msgid "Jun"
-msgstr "Iun"
-
-msgctxt "abbreviated month name with day"
-msgid "Jul"
-msgstr "Iul"
-
-msgctxt "abbreviated month name with day"
-msgid "Aug"
-msgstr "Aug"
-
-msgctxt "abbreviated month name with day"
-msgid "Sep"
-msgstr "Sep"
-
-msgctxt "abbreviated month name with day"
-msgid "Oct"
-msgstr "Oct"
-
-msgctxt "abbreviated month name with day"
-msgid "Nov"
-msgstr "Noi"
-
-msgctxt "abbreviated month name with day"
-msgid "Dec"
-msgstr "Dec"
+#, 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 9a3d542..c6d9220 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #: ../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 @@
 
 #: ../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 @@
 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 @@
 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 @@
 #. * 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 @@
 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 @@
 #. 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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[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[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[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 @@
 #. * 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 2cb4b1c..706b0f5 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-08-05 20:28+0000\n"
+"PO-Revision-Date: 2018-08-08 20:35+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,127 +27,124 @@
 "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"
 
-#: ../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:495 gio/gsettings-tool.c:569
 msgid "Print help"
 msgstr "Yardฤฑmฤฑ yazdฤฑr"
 
-#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489
-#: ../gio/gresource-tool.c:557
+#: gio/gapplication-tool.c:47 gio/gresource-tool.c:496 gio/gresource-tool.c:564
 msgid "[COMMAND]"
 msgstr "[KOMUT]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
 msgstr "Sürüm yazdฤฑr"
 
-#: ../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 "Sürüm bilgisini yazdฤฑr ve çฤฑk"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Uygulamalarฤฑ listele"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
 msgstr ""
 "Yüklü D-Bus aktive edilebilir uygulamalarฤฑ listele (.desktop dosyalarฤฑ ile)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Bir uygulama baลŸlat"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Uygulamayฤฑ baลŸlat (açmak için isteฤŸe baฤŸlฤฑ dosyalarla)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "APPID [DOSYA…]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Eylemi etkinleลŸtir"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Uygulama üzerinde bir eylem çalฤฑลŸtฤฑr"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "APPID EYLEM [PARAMETRE]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Kullanฤฑlabilir eylemleri listele"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr "Uygulama için deฤŸiลŸmeyen eylemleri listele (.desktop dosyalarฤฑndan)"
 
-#: ../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 "KOMUT"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "Ayrฤฑntฤฑlฤฑ yardฤฑm yazdฤฑrmak için komut"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 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/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:502 gio/gresource-tool.c:568
 msgid "FILE"
 msgstr "DOSYA"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr "Açฤฑlacak isteฤŸe baฤŸlฤฑ göreli ya da mutlak dosya adlarฤฑ veya URI’ler"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "EYLEM"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "ÇalฤฑลŸtฤฑrฤฑlacak eylem adฤฑ"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARAMETRE"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "GVariant biçiminde baลŸlatma eylemi için isteฤŸe baฤŸlฤฑ parametre"
 
-#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:661
+#: gio/gapplication-tool.c:96 gio/gresource-tool.c:533 gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -157,26 +153,26 @@
 "Bilinmeyen komut %s\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Kullanฤฑm:\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:558
+#: gio/gsettings-tool.c:696
 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…]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Komutlar:\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"
@@ -185,7 +181,7 @@
 "Ayrฤฑntฤฑlฤฑ yardฤฑm almak için “%s help KOMUT” kullanฤฑn.\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"
@@ -194,13 +190,13 @@
 "%s komutu doฤŸrudan takip için uygulama kimliฤŸi gerektirir\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s”\n"
 msgstr "geçersiz uygulama kimliฤŸi: “%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"
@@ -209,22 +205,21 @@
 "“%s” hiçbir argüman almaz\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "D-Bus veri yoluna baฤŸlanฤฑlamฤฑyor: %s\n"
 
-#: ../gio/gapplication-tool.c:286
+#: gio/gapplication-tool.c:286
 #, c-format
 msgid "error sending %s message to application: %s\n"
 msgstr "uygulamaya %s iletisi gönderilirken hata: %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 "uygulama kimliฤŸinden sonra eylem adฤฑ verilmelidir\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s”\n"
@@ -233,27 +228,25 @@
 "geçersiz eylem adฤฑ: “%s”\n"
 "eylem adlarฤฑ yalnฤฑzca “-”, “.”, harfler ve sayฤฑlardan oluลŸmalฤฑdฤฑr\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "eylem parametresi ayrฤฑลŸtฤฑrฤฑlฤฑrken hata: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "eylemler maksimum bir parametre kabul eder\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 komutu yalnฤฑzca uygulama kimliฤŸi deฤŸiลŸkenini alฤฑr"
 
-#: ../gio/gapplication-tool.c:421
+#: 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
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
@@ -262,148 +255,149 @@
 "bilinmeyen komut: %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 "%s için çok büyük sayaç deฤŸeri geçildi"
 
-#: ../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 "Taban akฤฑลŸ üzerinde arama desteklenmez"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "GBufferedInputStreamsonu kesilemiyor"
 
-#: ../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 "AkฤฑลŸ zaten kapalฤฑ"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "Taban akฤฑลŸ üzerinde sonunun kesilmesi desteklenmiyor"
 
-#: ../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 "ฤฐลŸlem iptal edildi"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Geçersiz nesne, ilklendirilmemiลŸ"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Girdide tamamlanmamฤฑลŸ çokbaytlฤฑ dizi"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Hedefte yeterli alan yok"
 
-#: ../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 "DönüลŸüm girdisinde geçersiz bayt dizisi"
 
-#: ../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 "DönüลŸüm sฤฑrasฤฑnda hata oluลŸtu: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1104
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1104
 msgid "Cancellable initialization not supported"
 msgstr "ฤฐptal edilebilir baลŸlatma desteklenmiyor"
 
-#: ../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 "“%s” karakter kümesinden “%s” karakter kümesine dönüลŸüm desteklenmiyor"
 
-#: ../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 "“%s”den “%s”e dönüลŸtürücü açฤฑlamฤฑyor"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:358
 #, c-format
 msgid "%s type"
 msgstr "%s türü"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Bilinmeyen tür"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 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"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Beklenmeyen erken akฤฑลŸ-sonu"
 
-#: ../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 "“%2$s” adres girdisinde desteklenmeyen anahtar “%1$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)"
 msgstr ""
 "“%s” adresi geçersiz (tam bir yol, tmpdir veya soyut anahtarlar gerekir)"
 
-#: ../gio/gdbusaddress.c:198
+#: gio/gdbusaddress.c:198
 #, c-format
 msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr "“%s” adres girdisinde anlamsฤฑz anahtar/deฤŸer çifti birleลŸimi"
 
-#: ../gio/gdbusaddress.c: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 "“%s” adresinde hata — baฤŸlantฤฑ noktasฤฑ özniteliฤŸi hatalฤฑ oluลŸturulmuลŸ"
 
-#: ../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 "“%s” adresinde hata — grup özniteliฤŸi hatalฤฑ oluลŸturulmuลŸ"
 
-#: ../gio/gdbusaddress.c:463
+#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:673
+#, c-format
+msgid "Unknown or unsupported transport “%s” for address “%s”"
+msgstr "“%2$s” adresi için bilinmeyen ya da desteklenmeyen aktarฤฑm “%1$s”"
+
+#: gio/gdbusaddress.c:467
 #, 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
+#: gio/gdbusaddress.c:488
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
@@ -412,7 +406,7 @@
 "“%3$s” adres ögesi içindeki, Anahtar/DeฤŸer çifti %1$d, “%2$s” eลŸittir "
 "iลŸareti içermiyor"
 
-#: ../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 "
@@ -421,7 +415,7 @@
 "“%3$s” adres ögesindeki, Anahtar/DeฤŸer çifti %1$d, “%2$s” içinde ters kaçฤฑลŸ "
 "tuลŸu veya deฤŸeri hatasฤฑ"
 
-#: ../gio/gdbusaddress.c:576
+#: gio/gdbusaddress.c:580
 #, c-format
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
@@ -430,93 +424,88 @@
 "“%s” adresinde hata — unix aktarฤฑmฤฑ, “path” veya “abstract” anahtarlarฤฑndan "
 "bir tanesinin kesinlikle ayarlanmฤฑลŸ olmasฤฑnฤฑ gerektirir"
 
-#: ../gio/gdbusaddress.c:612
+#: gio/gdbusaddress.c:616
 #, c-format
 msgid "Error in address “%s” — the host attribute is missing or malformed"
 msgstr "“%s” adresinde hata — host özniteliฤŸi eksik ya da hatalฤฑ oluลŸturulmuลŸ"
 
-#: ../gio/gdbusaddress.c:626
+#: gio/gdbusaddress.c:630
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr ""
 "“%s” adresinde hata — baฤŸlantฤฑ noktasฤฑ özniteliฤŸi eksik ya da hatalฤฑ "
 "oluลŸturulmuลŸ"
 
-#: ../gio/gdbusaddress.c:640
+#: gio/gdbusaddress.c:644
 #, c-format
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
 msgstr ""
 "“%s” adresinde hata — noncefile özniteliฤŸi eksik ya da hatalฤฑ oluลŸturulmuลŸ"
 
-#: ../gio/gdbusaddress.c:661
+#: gio/gdbusaddress.c:665
 msgid "Error auto-launching: "
 msgstr "Otomatik baลŸlatmada hata: "
 
-#: ../gio/gdbusaddress.c:669
-#, c-format
-msgid "Unknown or unsupported transport “%s” for address “%s”"
-msgstr "“%2$s” adresi için bilinmeyen ya da desteklenmeyen aktarฤฑm “%1$s”"
-
-#: ../gio/gdbusaddress.c:714
+#: gio/gdbusaddress.c:718
 #, c-format
 msgid "Error opening nonce file “%s”: %s"
 msgstr "Tek seferlik dosya “%s” açฤฑlฤฑrken hata: %s"
 
-#: ../gio/gdbusaddress.c:733
+#: gio/gdbusaddress.c:737
 #, c-format
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Tek seferlik dosya “%s” okunurken hata: %s"
 
-#: ../gio/gdbusaddress.c:742
+#: gio/gdbusaddress.c:746
 #, c-format
 msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
 msgstr "Tek seferlik dosya “%s” okunurken hata, beklenen 16 bayt, alฤฑnan %d"
 
-#: ../gio/gdbusaddress.c:760
+#: gio/gdbusaddress.c:764
 #, c-format
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "“%s” tek seferlik dosyasฤฑnฤฑn akฤฑลŸ için içeriklerini yazmada hata:"
 
-#: ../gio/gdbusaddress.c:969
+#: gio/gdbusaddress.c:973
 msgid "The given address is empty"
 msgstr "Verilen adres boลŸ"
 
-#: ../gio/gdbusaddress.c:1082
+#: gio/gdbusaddress.c:1086
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "setuid gerektiฤŸinde ileti veri yolu oluลŸturulamฤฑyor"
 
-#: ../gio/gdbusaddress.c:1089
+#: gio/gdbusaddress.c:1093
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "machine-id olmadan ileti veri yolu oluลŸturulamฤฑyor: "
 
-#: ../gio/gdbusaddress.c:1096
+#: gio/gdbusaddress.c:1100
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "X11 $DISPLAY olmadan D-BUS kendiliฤŸinden baลŸlatฤฑlamaz"
 
-#: ../gio/gdbusaddress.c:1138
+#: gio/gdbusaddress.c:1142
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "“%s” komut satฤฑrฤฑ oluลŸturulurken hata: "
 
-#: ../gio/gdbusaddress.c:1355
+#: gio/gdbusaddress.c:1359
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Pencereyi kapatmak için herhangi bir karakter girin)\n"
 
-#: ../gio/gdbusaddress.c:1509
+#: gio/gdbusaddress.c:1513
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "Dbus oturumu çalฤฑลŸmฤฑyor ve otomatik baลŸlatma baลŸarฤฑsฤฑz oldu"
 
-#: ../gio/gdbusaddress.c:1520
+#: gio/gdbusaddress.c:1524
 #, c-format
 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:1662 gio/gdbusconnection.c:7142
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -525,7 +514,7 @@
 "DBUS_STARTER_BUS_TYPE ortam deฤŸiลŸkeninden veri yolu adresi saptanamฤฑyor — "
 "bilinmeyen deฤŸer “%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"
@@ -533,20 +522,20 @@
 "DBUS_STARTER_BUS_TYPE ortam deฤŸiลŸkenine deฤŸer atanmadฤฑฤŸฤฑndan dolayฤฑ veri "
 "yolu adresi belirlenemiyor"
 
-#: ../gio/gdbusaddress.c:1677
+#: gio/gdbusaddress.c:1681
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Bilinmeyen veriyolu türü %d"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Satฤฑr okunmaya çalฤฑลŸฤฑlฤฑrken beklenmeyen içerik eksikliฤŸi"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 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,16 +543,16 @@
 "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"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s”: %s"
 msgstr "“%s” dizini için bilgi alฤฑnฤฑrken hata: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:274
+#: gio/gdbusauthmechanismsha1.c:274
 #, c-format
 msgid ""
 "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
@@ -571,22 +560,22 @@
 "“%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 +583,7 @@
 "“%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,163 +591,154 @@
 "“%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) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2369
 msgid "The connection is closed"
 msgstr "BaฤŸlantฤฑ kapalฤฑ"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1870
 msgid "Timeout was reached"
 msgstr "Zaman aลŸฤฑmฤฑ gerçekleลŸti"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2491
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "ฤฐstemci taraflฤฑ baฤŸlantฤฑ kurulurken desteklenmeyen etiketlerle karลŸฤฑlaลŸฤฑldฤฑ"
 
-#: ../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 ""
-"%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
+#: gio/gdbusconnection.c:4257
 #, c-format
-msgid "No such property '%s'"
-msgstr "'%s' gibi bir özellik yok"
+msgid "No such property “%s”"
+msgstr "“%s” gibi bir özellik yok"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4269
 #, c-format
-msgid "Property '%s' is not readable"
-msgstr "'%s' özelliฤŸi okunabilir deฤŸil"
+msgid "Property “%s” is not readable"
+msgstr "“%s” özelliฤŸi okunabilir deฤŸil"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4280
 #, c-format
-msgid "Property '%s' is not writable"
-msgstr "'%s' özelliฤŸi yazฤฑlabilir deฤŸil"
+msgid "Property “%s” is not writable"
+msgstr "“%s” özelliฤŸi yazฤฑlabilir deฤŸil"
 
-#: ../gio/gdbusconnection.c:4309
+#: gio/gdbusconnection.c:4300
 #, 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”"
+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:4405 gio/gdbusconnection.c:4613
+#: gio/gdbusconnection.c:6582
 #, c-format
-msgid "No such interface '%s'"
-msgstr "'%s' gibi bir arayüz yok"
+msgid "No such interface “%s”"
+msgstr "“%s” gibi bir arabirim yok"
 
-#: ../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"
-msgstr "%2$s yolundaki nesnede '%1$s' gibi bir arayüz yok"
+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
+#: gio/gdbusconnection.c:4929
 #, c-format
-msgid "No such method '%s'"
-msgstr "'%s' gibi bir yöntem yok"
+msgid "No such method “%s”"
+msgstr "“%s” gibi bir anahtar yok"
 
-#: ../gio/gdbusconnection.c:4969
+#: gio/gdbusconnection.c:4960
 #, 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”"
+msgstr "“%s” iletisinin türü, beklenen “%s” türü ile örtüลŸmüyor"
 
-#: ../gio/gdbusconnection.c:5167
+#: gio/gdbusconnection.c:5158
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "%2$s konumundaki %1$s arayüzü için bir nesne zaten dฤฑลŸa aktarฤฑldฤฑ"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5384
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "%s.%s özelliฤŸi alฤฑnamadฤฑ"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5440
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "%s.%s özelliฤŸi ayarlanamadฤฑ"
 
-#: ../gio/gdbusconnection.c:5627
+#: gio/gdbusconnection.c:5618
 #, 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”"
+msgstr "“%s” yöntemi “%s” türü döndürdü, ancak “%s” bekleniyordu"
 
-#: ../gio/gdbusconnection.c:6702
+#: gio/gdbusconnection.c:6693
 #, 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"
+msgstr "“%3$s” imzalฤฑ “%2$s” arayüzü üzerinde “%1$s” yöntemi yok"
 
-#: ../gio/gdbusconnection.c:6823
+#: gio/gdbusconnection.c:6814
 #, 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 +746,7 @@
 "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 +754,18 @@
 "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 +774,17 @@
 "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 +794,7 @@
 "%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 +803,19 @@
 "“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 +824,53 @@
 "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,42 +878,41 @@
 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ฤฑ"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Donanฤฑm profili alฤฑnamฤฑyor: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: 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
+#: gio/gdbusproxy.c:1612
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "%s için StartServiceByName çaฤŸrฤฑsฤฑnda hata: "
 
-#: ../gio/gdbusproxy.c:1635
+#: gio/gdbusproxy.c:1635
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "StartServiceByName %d yönteminden beklenmeyen yanฤฑt (\"%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"
@@ -941,30 +920,30 @@
 "Yöntem çaฤŸrฤฑlamฤฑyor; vekil sunucu, sahibi olmayan bilindik bir ad için "
 "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START bayraฤŸฤฑ ile oluลŸturuldu"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "Soyut ad alanฤฑ desteklenmiyor"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr "Bir sunucu oluลŸturulurken nonce dosyasฤฑ belirtilemez"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s”: %s"
 msgstr "“%s” konumundaki tek seferlik dosyaya yazma hatasฤฑ: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "“%s” dizgesi, geçerli bir D-Bus GUID deฤŸil"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Desteklenmeyen araç “%s” üzerinde dinlenemiyor"
 
-#: ../gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:95
 #, c-format
 msgid ""
 "Commands:\n"
@@ -987,229 +966,221 @@
 "\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
-#, 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 "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
-#, c-format
-#| msgid "Error: Method name is not specified\n"
+#: gio/gdbus-tool.c:740
 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
+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
-#, c-format
+#: gio/gdbus-tool.c:1043
 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
-#, c-format
+#: gio/gdbus-tool.c:1954
 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,135 +1188,130 @@
 "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
-#, c-format
+#: gio/gdbus-tool.c:2206
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Hata: AktifleลŸtirilecek bir hizmet belirtilmelidir.\n"
 
-#: ../gio/gdbus-tool.c:2199
-#, c-format
+#: gio/gdbus-tool.c:2211
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Hata: Beklenecek bir hizmet belirtilmelidir.\n"
 
-#: ../gio/gdbus-tool.c:2204
-#, c-format
+#: gio/gdbus-tool.c:2216
 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:2023 gio/gdesktopappinfo.c:4633
 msgid "Unnamed"
 msgstr "AdlandฤฑrฤฑlmamฤฑลŸ"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2433
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Desktop dosyasฤฑ Exec alanฤฑ belirtmemiลŸ"
 
-#: ../gio/gdesktopappinfo.c:2701
+#: gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Uygulama için gerekli uçbirim bulunamadฤฑ"
 
-#: ../gio/gdesktopappinfo.c:3135
+#: gio/gdesktopappinfo.c:3202
 #, 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:3206
 #, 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:3446 gio/gdesktopappinfo.c:3470
 msgid "Application information lacks an identifier"
 msgstr "Uygulama bilgisi bir tanฤฑmlayฤฑcฤฑya sahip deฤŸildir"
 
-#: ../gio/gdesktopappinfo.c:3637
+#: gio/gdesktopappinfo.c:3704
 #, 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:3838
 #, c-format
 msgid "Custom definition for %s"
 msgstr "%s için özel tanฤฑm"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "sürücü çฤฑkartmayฤฑ uygulamฤฑyor"
 
 #. 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 "sürücü eject veya eject_with_operation uygulamฤฑyor"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 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"
 
-#: ../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 "TLS desteฤŸi kullanฤฑlabilir deฤŸil"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "DTLS desteฤŸi kullanฤฑlabilir deฤŸil"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "GEmblem kodlamasฤฑnฤฑn %d sürümü iลŸlenemiyor"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "GEmblem kodlamasฤฑ içerisinde bozuk sayฤฑda token (%d)"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "GEmblemedIcon kodlamasฤฑnฤฑn %d sürümü iลŸlenemiyor"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "GEmblemedIcon kodlamasฤฑ içerisinde bozuk sayฤฑda token (%d)"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 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/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 "ฤฐลŸlem desteklenmiyor"
 
@@ -1353,207 +1319,207 @@
 #. * 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 "BaฤŸlama yok"
 
-#: ../gio/gfile.c:2617 ../gio/glocalfile.c:2446
+#: gio/gfile.c:2622 gio/glocalfile.c:2391
 msgid "Can’t copy over directory"
 msgstr "Dizin üzerine kopyalanamฤฑyor"
 
-#: ../gio/gfile.c:2677
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Dizin dizin üzerine kopyalanamฤฑyor"
 
-#: ../gio/gfile.c:2685
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Hedef dosya var"
 
-#: ../gio/gfile.c:2704
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Dizin iç içe kopyalanamฤฑyor"
 
-#: ../gio/gfile.c:2979
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "Splice desteklenmiyor"
 
-#: ../gio/gfile.c:2983 ../gio/gfile.c:3027
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Dosya uç uca eklenirken hata: %s"
 
-#: ../gio/gfile.c:3136
+#: gio/gfile.c:3149
 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:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopyalama desteklenmiyor ya da geçersiz"
 
-#: ../gio/gfile.c:3145
+#: gio/gfile.c:3158
 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:3221
 msgid "Can’t copy special file"
 msgstr "Özel dosya kopyalanamฤฑyor"
 
-#: ../gio/gfile.c:4006
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Geçersiz simgesel baฤŸ deฤŸeri verildi"
 
-#: ../gio/gfile.c:4167
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Çöp desteklenmiyor"
 
-#: ../gio/gfile.c:4279
+#: gio/gfile.c:4292
 #, 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:6773 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:6882
 msgid "No application is registered as handling this file"
 msgstr "Bu dosyayฤฑ iลŸlemek için hiçbir uygulama kayฤฑtlฤฑ deฤŸil"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "Enumerator kapalฤฑ"
 
-#: ../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 "Dosya numaralandฤฑrฤฑcฤฑ sฤฑradฤฑลŸฤฑ iลŸleme sahip"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "Dosya numaralandฤฑrฤฑcฤฑ zaten kapalฤฑ"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "GFileIcon kodlamasฤฑnฤฑn %d sürümü iลŸlenemiyor"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "GFileIcon için bozuk girdi verisi"
 
-#: ../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 "AkฤฑลŸ query_info desteklemiyor"
 
-#: ../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 "Atlama akฤฑลŸta desteklenmiyor"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "Sonunu kesmeye giriลŸ akฤฑลŸฤฑnda izin verilmiyor"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "AkฤฑลŸ üzerinde sonunun kesilmesi desteklenmiyor"
 
-#: ../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 "Geçersiz makine adฤฑ"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Bozuk HTTP vekil sunucu yanฤฑtฤฑ"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "HTTP vekil sunucu baฤŸlantฤฑsฤฑna izin verilmiyor"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "HTTP vekil sunucu kimlik doฤŸrulamasฤฑ baลŸarฤฑsฤฑz"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "HTTP vekil sunucu kimlik doฤŸrulamasฤฑ gerekli"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "HTTP vekil sunucu baฤŸlantฤฑsฤฑ baลŸarฤฑsฤฑz: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "HTTP vekil sunucusu baฤŸlantฤฑyฤฑ beklenmedik ลŸekilde kesti."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:290
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "YanlฤฑลŸ sayฤฑda token (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:310
 #, c-format
 msgid "No type for class name %s"
 msgstr "Sฤฑnฤฑf adฤฑ %s için tür yok"
 
-#: ../gio/gicon.c:320
+#: 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
+#: 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
+#: gio/gicon.c:345
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Bozuk sürüm numarasฤฑ: %s"
 
-#: ../gio/gicon.c:359
+#: 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
+#: gio/gicon.c:461
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Simge kodlamasฤฑnฤฑn verilen sürümü iลŸlenemiyor"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Belirtilen hiçbir adres yok"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "Adres için %u uzunluฤŸu çok uzun"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "Adres önek uzunluฤŸundan daha çok bite sahiptir"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s” as IP address mask"
 msgstr "“%s”, IP adresi maskesi olarak ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
 
-#: ../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 "Soket adresi için yeterli alan yok"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Desteklenmeyen soket adresi"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "GiriลŸ akฤฑmฤฑ okumayฤฑ uygulamฤฑyor"
 
@@ -1563,129 +1529,122 @@
 #. 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 "AkฤฑลŸฤฑn sฤฑradฤฑลŸฤฑ iลŸlemi var"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Dosyayla kopyala"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "TaลŸฤฑndฤฑฤŸฤฑnda dosyayla tut"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version” takes no arguments"
 msgstr "“version” hiçbir argüman almaz"
 
-#: ../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 "Kullanฤฑm:"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 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
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Komutlar:"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Dosyalarฤฑ standart çฤฑktฤฑya bitiลŸtir"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Bir veya daha çok dosya kopyala"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Konumlar hakkฤฑnda bilgi göster"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Konumlarฤฑn içeriklerini listele"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "MIME türü için iลŸleyici belirle veya al"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Dizinler oluลŸtur"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Dosyalarฤฑ ve dizinleri deฤŸiลŸiklikler için gözlemle"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Konumlarฤฑ baฤŸla veya ayฤฑr"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Bir veya daha çok dosya taลŸฤฑ"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Dosyalarฤฑ öntanฤฑmlฤฑ uygulamayla aç"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Bir dosyayฤฑ yeniden adlandฤฑr"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Bir veya daha çok dosya sil"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Standart girdiden oku ve kaydet"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Bir dosya özniteliฤŸi belirle"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Dosyalarฤฑ veya dizinleri çöpe taลŸฤฑ"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Konumlarฤฑn içeriklerini bir aฤŸaçta listele"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "Ayrฤฑntฤฑlฤฑ yardฤฑm almak için %s kullan.\n"
 
-#: ../gio/gio-tool-cat.c:87
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "stdout’a yazฤฑlฤฑrken hata"
 
 #. 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:1212 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 "KONUM"
 
-#: ../gio/gio-tool-cat.c:138
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Dosyalarฤฑ bitiลŸtir ve standart çฤฑktฤฑya yazdฤฑr."
 
-#: ../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"
@@ -1695,58 +1654,56 @@
 "yerine GIO konumlarฤฑnฤฑ kullanฤฑr: örneฤŸin, smb://server/resource/file.txt\n"
 "gibi bir ลŸeyi konum olarak kullanabilirsiniz."
 
-#: ../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:1263 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"
 
-#: ../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 "Hedef dizin yok"
 
-#: ../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 "ฤฐlerlemeyi göster"
 
-#: ../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 "Üzerine yazmadan önce onay iste"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Tüm öznitelikleri koru"
 
-#: ../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 "Var olan hedef dosyalarฤฑ yedekle"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Simgesel baฤŸlantฤฑlarฤฑ asla takip etme"
 
-#: ../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 "%s/%s aktarฤฑldฤฑ (%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 "KAYNAK"
 
 #. 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 "HEDEF"
 
-#: ../gio/gio-tool-copy.c:103
+#: 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
+#: 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"
@@ -1756,93 +1713,88 @@
 "yerine GIO konumlarฤฑnฤฑ kullanฤฑr: örneฤŸin, smb://server/resource/file.txt\n"
 "gibi bir ลŸeyi konum olarak kullanabilirsiniz."
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "%s konumu bir dizin deฤŸildir"
 
-#: ../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: “%s” üzerine yaz?"
+msgstr "%s: “%s” üzerine yaz? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Yazฤฑlabilir öznitelikleri listele"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Dosya sistemi bilgisi al"
 
-#: ../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 "Alฤฑnacak öznitelikler"
 
-#: ../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 "ÖZNฤฐTELฤฐKLER"
 
-#: ../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 "Simgesel baฤŸlantฤฑlarฤฑ takip etme"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "öznitelikler:\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 "gösterme adฤฑ: %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 "düzenleme adฤฑ: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "ad: %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "tür: %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
-msgstr "boyut:"
+msgstr "boyut: "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "gizli\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 "Belirlenebilir öznitelikler:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Yazฤฑlabilir öznitelik ad boลŸluklarฤฑ:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Konumlar hakkฤฑnda bilgi göster."
 
-#: ../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"
@@ -1856,23 +1808,23 @@
 "GIO adฤฑyla birlikte belirtilebilir, örneฤŸin standard::icon; veya yalnฤฑzca\n"
 "ad boลŸluฤŸu, örneฤŸin unix; veya tüm öznitelikleri eลŸleyen “*” gibi"
 
-#: ../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 "Gizli dosyalarฤฑ göster"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Uzun listeleme biçimini kullan"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Tam URI’leri yazdฤฑr"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Konumlarฤฑn içeriklerini listele."
 
-#: ../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"
@@ -1885,19 +1837,19 @@
 "GIO adฤฑyla birlikte belirtilebilir, örneฤŸin standard::icon"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "MIMETÜRÜ"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "ฤฐลžLEYฤฐCฤฐ"
 
-#: ../gio/gio-tool-mime.c:76
+#: 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
+#: 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"
@@ -1907,59 +1859,55 @@
 "uygulamalarฤฑ listeler. EฤŸer iลŸleyici verildiyse, onu MIME türü için\n"
 "öntanฤฑmlฤฑ olarak belirler."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
 msgstr "Bir MIME türünü belirtmelidir, ve belki bir iลŸleyiciyi"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s”\n"
 msgstr "“%s” için öntanฤฑmlฤฑ uygulama yok\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s”: %s\n"
 msgstr "“%s” için öntanฤฑmlฤฑ uygulama: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Kayฤฑtlฤฑ uygulamalar:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Kayฤฑtlฤฑ uygulama yok\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Önerilen uygulamalar:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Önerilen uygulama yok\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
 msgid "Failed to load info for handler “%s”"
 msgstr "“%s” iลŸleyicisinin bilgileri yüklenemedi"
 
-#: ../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 "“%s”, “%s” için öntanฤฑmlฤฑ iลŸleyici olarak belirlenemedi: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Üst dizinler oluลŸtur"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Dizinler oluลŸtur."
 
-#: ../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"
@@ -1969,113 +1917,139 @@
 "yerine GIO konumlarฤฑnฤฑ kullanฤฑr: örneฤŸin, smb://server/resource/mydir\n"
 "gibi bir ลŸeyi konum olarak kullanabilirsiniz."
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Bir dizini gözlemle (öntanฤฑmlฤฑ: türe baฤŸlฤฑdฤฑr)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Bir dosyayฤฑ gözlemle (öntanฤฑmlฤฑ: türe baฤŸlฤฑdฤฑr)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 "Bir dosyayฤฑ doฤŸrudan gözlemle (hard link’ler aracฤฑlฤฑฤŸฤฑyla yapฤฑlan "
 "deฤŸiลŸiklikleri bildirir)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Bir dosyayฤฑ doฤŸrudan gözlemler ama deฤŸiลŸiklikleri bildirmez"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr ""
 "TaลŸฤฑmalarฤฑ ve yeniden adlandฤฑrmalarฤฑ, basit silindi/oluลŸturuldu eylemleri "
 "olarak bildir"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "BaฤŸlama eylemlerini gözlemle"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 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:63
 msgid "Mount as mountable"
 msgstr "BaฤŸlanabilir olarak baฤŸla"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:64
 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:64 gio/gio-tool-mount.c:67
 msgid "DEVICE"
 msgstr "AYGIT"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:65
 msgid "Unmount"
 msgstr "Ayฤฑr"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:66
 msgid "Eject"
 msgstr "Çฤฑkart"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
+msgid "Stop drive with device file"
+msgstr "Aygฤฑt dosyasฤฑyla sürücüyü durdur"
+
+#: gio/gio-tool-mount.c:68
 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:68
 msgid "SCHEME"
 msgstr "ลžEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:69
 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:70
 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:72
 msgid "List"
 msgstr "Listele"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:73
 msgid "Monitor events"
 msgstr "Eylemleri gözlemle"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:74
 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:75
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "VeraCrypt bölümünün kilidini kaldฤฑrฤฑrkenki sayฤฑsal PIM"
+
+#: gio/gio-tool-mount.c:75
+#| msgctxt "GDateTime"
+#| msgid "PM"
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT hidden volume"
+msgstr "TCRYPT gizli bölümü baฤŸla"
+
+#: gio/gio-tool-mount.c:77
+msgid "Mount a TCRYPT system volume"
+msgstr "TCRYPT sistem bölümü baฤŸla"
+
+#: gio/gio-tool-mount.c:265 gio/gio-tool-mount.c:297
 msgid "Anonymous access denied"
 msgstr "Anonim eriลŸim engellendi"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:522
+msgid "No drive for device file"
+msgstr "Aygฤฑt dosyasฤฑ için sürücü yok"
+
+#: gio/gio-tool-mount.c:975
 #, 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:1027
 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:1216
 msgid "Mount or unmount the locations."
 msgstr "Konumlarฤฑ baฤŸla veya ayฤฑr."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Kopyayฤฑ kullanma ve geridönüลŸü sil"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Bir veya daha çok dosyayฤฑ KAYNAK’tan HEDEF’e taลŸฤฑ."
 
-#: ../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"
@@ -2083,14 +2057,14 @@
 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
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "%s hedefi bir dizin deฤŸil"
 
-#: ../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."
@@ -2098,246 +2072,250 @@
 "Dosyalarฤฑ, bu türden dosyalarฤฑ iลŸlemek için\n"
 "kaydedilen öntanฤฑmlฤฑ uygulama ile aç."
 
-#: ../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 "Var olmayan dosyalarฤฑ yok say, asla onay isteme"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Verilen dosyalarฤฑ sil."
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "AD"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Bir dosyayฤฑ yeniden adlandฤฑr."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Eksik argüman"
 
-#: ../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 "Fazla argüman"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Yeniden adlandฤฑrma baลŸarฤฑlฤฑ. Yeni uri: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Yalnฤฑzca yoksa oluลŸtur"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "Dosyanฤฑn sonuna iliลŸtir"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "OluลŸtururken, eriลŸimi ลŸimdiki kullanฤฑcฤฑya kฤฑsฤฑtla"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr "Yerine koyarken, hedef yokmuลŸçasฤฑna yerine koy"
 
 #. 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 "Sonda yeni bir etag yazdฤฑr"
 
 #. 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 "Dosyanฤฑn etag’inin üzerine yazฤฑlฤฑyor"
 
-#: ../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 "Standart girdiden okuma hatasฤฑ"
 
 #. 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 kullanฤฑlabilir deฤŸil\n"
 
-#: ../gio/gio-tool-save.c:163
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Standart girdiden oku ve HEDEF’e kaydet."
 
-#: ../gio/gio-tool-save.c:183
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Verilen hedef yok"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "ÖzniteliฤŸin türü"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "TYPE"
 msgstr "TÜR"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
 msgstr "ÖZNฤฐTELฤฐK"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "DEฤžER"
 
-#: ../gio/gio-tool-set.c:93
+#: 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
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Konum belirtilmedi"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Öznitelik belirtilmedi"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "DeฤŸer belirtilmedi"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
 msgid "Invalid attribute type “%s”"
 msgstr "Geçersiz öznitelik türü “%s”"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Çöpü temizle"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Dosyalarฤฑ veya dizinleri çöpe taลŸฤฑ."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Simgesel baฤŸlantฤฑlarฤฑ, baฤŸlarฤฑ ve kฤฑsayollarฤฑ takip et"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 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:1515
 #, 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"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "Dosya %s kaynakta birden çok kez görünüyor"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s” in any source directory"
 msgstr "Herhangi bir kaynak dizinde “%s” konumlanamadฤฑ"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 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:2138
 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"
+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 "
+"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:2139
+#: gio/glib-compile-schemas.c:2168
 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 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"
+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,126 +2323,125 @@
 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
-#, c-format
+#: gio/glib-compile-resources.c:795
 msgid "You should give exactly one file name\n"
 msgstr "Tam olarak bir adet dosya adฤฑ vermelisiniz\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 "takma ad en az 2 karakterden oluลŸmalฤฑdฤฑr"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
 msgid "Invalid numeric value"
 msgstr "Geçersiz sayฤฑsal deฤŸer"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'/> zaten belirtilmiลŸ"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
 msgid "value='%s' already specified"
 msgstr "value='%s' zaten belirtilmiลŸ"
 
-#: ../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 "bayrak deฤŸerlerinin en çok 1 bit seti olmalฤฑdฤฑr"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s> en az bir <value> içermelidir"
 
-#: ../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>, belirlenen aralฤฑk içinde deฤŸil"
 
-#: ../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>, belirtilen numaralandฤฑrฤฑlmฤฑลŸ türün geçerli bir üyesi deฤŸildir"
 
-#: ../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> belirtilen bayrak türlerinden olmayan dizge içeriyor"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s>, <choices> içinde olmayan bir dizge içeriyor"
 
-#: ../gio/glib-compile-schemas.c:373
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> bu anahtar için zaten belirtilmiลŸ"
 
-#: ../gio/glib-compile-schemas.c:391
+#: gio/glib-compile-schemas.c:393
 #, c-format
 msgid "<range> not allowed for keys of type “%s”"
 msgstr "“%s” türünün anahtarlarฤฑ için <range> izin verilmiyor"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
 msgstr "<range> belirlenen asgari, azamiden büyük"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "desteklenmeyen l10n kategorisi: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n istendi, ama verilen gettext alanฤฑ yok"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "l10n etkinleลŸtirilmeden deฤŸer için verilen çeviri baฤŸlamฤฑ"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
 msgid "Failed to parse <default> value of type “%s”: "
 msgstr "“%s” türünün <default> deฤŸeri ayrฤฑลŸtฤฑrฤฑlamadฤฑ:"
 
-#: ../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>, numaralandฤฑrฤฑlmฤฑลŸ türü olan olarak etiketlenmiลŸ anahatarlar için "
 "belirtilemez"
 
-#: ../gio/glib-compile-schemas.c:501
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> bu anahtar için zaten belirtilmiลŸ"
 
-#: ../gio/glib-compile-schemas.c:513
+#: gio/glib-compile-schemas.c:515
 #, c-format
 msgid "<choices> not allowed for keys of type “%s”"
 msgstr "“%s” türünün anahtarlarฤฑ için <choices> izin verilmemektedir"
 
-#: ../gio/glib-compile-schemas.c:529
+#: gio/glib-compile-schemas.c:531
 #, c-format
 msgid "<choice value='%s'/> already given"
 msgstr "<choice value='%s'/> zaten verilmiลŸ"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices>, en az bir <choice> içermelidir"
 
-#: ../gio/glib-compile-schemas.c:558
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> bu anahtar için zaten belirtilmiลŸ"
 
-#: ../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>"
@@ -2472,7 +2449,7 @@
 "<aliases> yalnฤฑzca numaralandฤฑrฤฑlmฤฑลŸ anahtarlar için veya bayrak türleri "
 "veya <choices> ardฤฑnda belirtilebilir"
 
-#: ../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 "
@@ -2481,42 +2458,42 @@
 "“%2$s” zaten numaralandฤฑrฤฑlmฤฑลŸ türün bir üyesiyken <alias value='%1$s'/> "
 "verildi"
 
-#: ../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 ""
 "<choice value='%2$s'/> zaten verildiฤŸinde <alias value='%1$s'/> verildi"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'/> zaten belirtilmiลŸ"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
 msgid "alias target “%s” is not in enumerated type"
 msgstr "takma ad hedefi “%s”, numaralandฤฑrฤฑlmฤฑลŸ tür içinde deฤŸil"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s” is not in <choices>"
 msgstr "takma ad hedefi “%s”, <choices> içinde deฤŸil"
 
-#: ../gio/glib-compile-schemas.c:621
+#: gio/glib-compile-schemas.c:623
 #, c-format
 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:798
 msgid "Empty names are not permitted"
 msgstr "BoลŸ adlara izin verilmiyor"
 
-#: ../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 "Geçersiz ad “%s”: adlar küçük harf ile baลŸlamalฤฑdฤฑr"
 
-#: ../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 "
@@ -2525,36 +2502,36 @@
 "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:829
 #, 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:838
 #, 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:846
 #, 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:918
 #, 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:944
 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:955
 #, 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:973
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2563,7 +2540,7 @@
 "<key name='%1$s'> dizgesi <schema id='%3$s'> içindeki <key name='%2$s'> "
 "dizgesini gölgeler; deฤŸerleri deฤŸiลŸtirmek için <override> kullanฤฑn"
 
-#: ../gio/glib-compile-schemas.c:970
+#: gio/glib-compile-schemas.c:984
 #, c-format
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
@@ -2572,63 +2549,63 @@
 "<key>’e “type”, “enum”, ya da “flags” özniteliklerinden bir tanesi "
 "kesinlikle belirtilmelidir"
 
-#: ../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'> (henüz) tanฤฑmlanmamฤฑลŸ."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1018
 #, 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:1048
 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:1061
 #, 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:1069
 #, 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:1142
 #, 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:1154
 #, 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:1170
 #, 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:1178
 #, 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:1188
 #, 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:1198
 #, 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:1208
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
@@ -2637,17 +2614,17 @@
 "<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:1225
 #, 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:1232
 #, 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:1241
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2656,119 +2633,129 @@
 "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:1271
 #, 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:1421 gio/glib-compile-schemas.c:1437
 #, 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:1519
 #, 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:1537
 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:1627
 #, 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:1695
 #, 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:1834 gio/glib-compile-schemas.c:1910
+#: gio/glib-compile-schemas.c:2025
 #, 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:1844
 #, 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:1906
 #, 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: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 ""
-"'%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: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 "; 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: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 " ve --strict belirtilmiลŸ; çฤฑkฤฑlฤฑyor.\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."
+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 ""
-"'%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:2021
 #, 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: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 ""
-"'%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: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 ""
-"'%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:2139
 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:2140
 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:2141
 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:2142
 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:2171
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2778,32 +2765,32 @@
 "ลž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:2192
 #, 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:2234
 #, c-format
 msgid "No schema files found: "
 msgstr "Hiç ลŸema dosyasฤฑ bulunamadฤฑ: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2237
 #, 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:2240
 #, 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,313 +2799,318 @@
 #. * 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:2267 gio/glocalfile.c:2295
+#: gio/glocalfile.c:2452 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:1925
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "%s dosyasฤฑ çöpe atฤฑlฤฑrken hata: %s"
 
-#: ../gio/glocalfile.c:2020
+#: gio/glocalfile.c:1948
 #, 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:1970
 #, 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:1979
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr "Sistem iç baฤŸlarฤฑna çöpleme desteklenmiyor"
+
+#: gio/glocalfile.c:2063 gio/glocalfile.c:2083
 #, 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:2118
 #, 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:2178
 #, 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:2182 gio/glocalfile.c:2238
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "%s dosyasฤฑ çöpe atฤฑlamฤฑyor: %s"
 
-#: ../gio/glocalfile.c:2299
+#: gio/glocalfile.c:2244
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "%s dosyasฤฑ çöpe atฤฑlamฤฑyor"
 
-#: ../gio/glocalfile.c:2325
+#: gio/glocalfile.c:2270
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "%s dizini oluลŸturulurken hata: %s"
 
-#: ../gio/glocalfile.c:2354
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Dosya sistemi simgesel baฤŸlarฤฑ desteklemiyor"
 
-#: ../gio/glocalfile.c:2357
+#: gio/glocalfile.c:2302
 #, 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:2308 glib/gfileutils.c:2138
 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:2363 gio/glocalfile.c:2398 gio/glocalfile.c:2455
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "%s dosyasฤฑ taลŸฤฑnฤฑrken hata: %s"
 
-#: ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2386
 msgid "Can’t move directory over directory"
 msgstr "Dizin dizin üzerine taลŸฤฑnamฤฑyor"
 
-#: ../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 "Yedek dosyasฤฑ oluลŸturma baลŸarฤฑsฤฑz oldu"
 
-#: ../gio/glocalfile.c:2486
+#: gio/glocalfile.c:2431
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Hedef dosya silerken hata: %s"
 
-#: ../gio/glocalfile.c:2500
+#: gio/glocalfile.c:2445
 msgid "Move between mounts not supported"
 msgstr "BaฤŸlฤฑ sistemler arasฤฑnda taลŸฤฑma desteklenmiyor"
 
-#: ../gio/glocalfile.c:2691
+#: gio/glocalfile.c:2636
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "%s’in disk kullanฤฑmฤฑ saptanamadฤฑ: %s"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:745
 msgid "Attribute value must be non-NULL"
 msgstr "Öznitelik deฤŸeri NULL olmamalฤฑ"
 
-#: ../gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:752
 msgid "Invalid attribute type (string expected)"
 msgstr "Geçersiz öznitelik türü (dizgi beklendi)"
 
-#: ../gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:759
 msgid "Invalid extended attribute name"
 msgstr "Geçersiz geniลŸletilmiลŸ öznitelik adฤฑ"
 
-#: ../gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:799
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "“%s” geniลŸletilmiลŸ özniteliฤŸi atanฤฑrken hata: %s"
 
-#: ../gio/glocalfileinfo.c:1607
+#: gio/glocalfileinfo.c:1619
 msgid " (invalid encoding)"
 msgstr " (geçersiz kodlama)"
 
-#: ../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 "“%s” dosyasฤฑ için bilgi alฤฑnฤฑrken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2038
+#: gio/glocalfileinfo.c:2045
 #, 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:2090
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Geçersiz öznitelik türü (uint32 beklendi)"
 
-#: ../gio/glocalfileinfo.c:2101
+#: gio/glocalfileinfo.c:2108
 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:2127 gio/glocalfileinfo.c:2146
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Geçersiz öznitelik türü (byte dizisi beklendi)"
 
-#: ../gio/glocalfileinfo.c:2184
+#: gio/glocalfileinfo.c:2191
 msgid "Cannot set permissions on symlinks"
 msgstr "Simgesel baฤŸlar üzerindeki yetkiler ayarlanamฤฑyor"
 
-#: ../gio/glocalfileinfo.c:2200
+#: gio/glocalfileinfo.c:2207
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "ฤฐzinler atanฤฑrken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2251
+#: gio/glocalfileinfo.c:2258
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Sahip atanฤฑrken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2281
 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:2291 gio/glocalfileinfo.c:2310
+#: gio/glocalfileinfo.c:2321
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Simgesel baฤŸ atanฤฑrken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2293
+#: gio/glocalfileinfo.c:2300
 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:2426
 #, 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:2449
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux baฤŸlamฤฑ NULL olmamalฤฑ"
 
-#: ../gio/glocalfileinfo.c:2457
+#: gio/glocalfileinfo.c:2464
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "SELinux baฤŸlamฤฑ atanฤฑrken hata: %s"
 
-#: ../gio/glocalfileinfo.c:2464
+#: gio/glocalfileinfo.c:2471
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux bu sistede etkin deฤŸil"
 
-#: ../gio/glocalfileinfo.c:2556
+#: gio/glocalfileinfo.c:2563
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Öznitelik %s atamasฤฑ desteklenmiyor"
 
-#: ../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 "Dosyadan okunurken hata: %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 "Dosya içinde atlama yapฤฑlฤฑrken hata: %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 "Dosya kapatฤฑlฤฑrken hata: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:854
 msgid "Unable to find default local file monitor type"
 msgstr "Öntanฤฑmlฤฑ yerel dosya izleme türü bulunamadฤฑ"
 
-#: ../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 "Dosyaya yazฤฑlฤฑrken hata: %s"
 
-#: ../gio/glocalfileoutputstream.c:275
+#: gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Eski yedek baฤŸฤฑ silinirken hata: %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 "Yedek kopyasฤฑ oluลŸturulurken hata: %s"
 
-#: ../gio/glocalfileoutputstream.c:320
+#: gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Geçici dosya yeniden adlandฤฑrฤฑlฤฑrken hata: %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 "Dosyanฤฑn sonu kesilirken hata: %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 "“%s” dosyasฤฑ açฤฑlฤฑrken hata: %s"
 
-#: ../gio/glocalfileoutputstream.c:826
+#: gio/glocalfileoutputstream.c:826
 msgid "Target file is a directory"
 msgstr "Hedef dosya bir dizin"
 
-#: ../gio/glocalfileoutputstream.c:831
+#: gio/glocalfileoutputstream.c:831
 msgid "Target file is not a regular file"
 msgstr "Hedef dosya normal dosya deฤŸil"
 
-#: ../gio/glocalfileoutputstream.c:843
+#: gio/glocalfileoutputstream.c:843
 msgid "The file was externally modified"
 msgstr "Dosya dฤฑลŸarฤฑdan deฤŸiลŸtirilmiลŸ"
 
-#: ../gio/glocalfileoutputstream.c:1029
+#: gio/glocalfileoutputstream.c:1029
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Eski dosya silinirken hata: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Geçersiz GSeekType saฤŸlandฤฑ"
 
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Geçersiz atlama isteฤŸi"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "GMemoryInputStream sonu silinemiyor"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Bellek çฤฑktฤฑ akฤฑลŸฤฑ yeniden boyutlandฤฑrฤฑlamaz"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Hafฤฑz çฤฑktฤฑ açฤฑลŸฤฑ yeniden boyutlandฤฑrma baลŸarฤฑsฤฑz oldu"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -3126,32 +3118,32 @@
 "Yazma iลŸlemi için gereken bellek miktarฤฑ, kullanฤฑlabilir adres uzayฤฑndan "
 "daha büyük"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "AkฤฑลŸ baลŸlamadan önce arama istendi"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 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 +3151,7 @@
 #. 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,102 +3159,100 @@
 #. 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"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:378
 #, c-format
 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"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:212 gio/goutputstream.c:560
 msgid "Output stream doesn’t implement write"
 msgstr "Çฤฑktฤฑ akฤฑลŸฤฑ yazmayฤฑ yerine getirmiyor"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:521 gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Kaynak akฤฑลŸฤฑ zaten kapalฤฑ"
 
-#: ../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 "“%s” çözülürken hata: %s"
 
-#: ../gio/gresolver.c:729 ../gio/gresolver.c:781
-#| msgid "Invalid hostname"
+#: gio/gresolver.c:729 gio/gresolver.c:781
 msgid "Invalid domain"
 msgstr "Geçersiz alan adฤฑ"
 
-#: ../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 "“%s” konumundaki kaynak yok"
 
-#: ../gio/gresource.c:786
+#: gio/gresource.c:787
 #, c-format
 msgid "The resource at “%s” failed to decompress"
 msgstr "“%s” konumundaki kaynak açฤฑlamadฤฑ"
 
-#: ../gio/gresourcefile.c:732
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s” is not a directory"
 msgstr "“%s” konumundaki kaynak bir dizin deฤŸildir"
 
-#: ../gio/gresourcefile.c:940
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Girdi akฤฑลŸฤฑ aramayฤฑ yerine getirmiyor"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:501
 msgid "List sections containing resources in an elf FILE"
 msgstr "Kaynaklarฤฑ içeren bölümleri bir elf DOSYASINDA listele"
 
-#: ../gio/gresource-tool.c:500
+#: gio/gresource-tool.c:507
 msgid ""
 "List resources\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3272,16 +3262,15 @@
 "EฤŸer BÖLÜM verilirse, yalnฤฑzca bu bölümün kaynaklarฤฑnฤฑ listele\n"
 "EฤŸer YOL verilirse, yalnฤฑzca eลŸleลŸen kaynaklarฤฑ listele"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:510 gio/gresource-tool.c:520
 msgid "FILE [PATH]"
 msgstr "DOSYA [YOL]"
 
-#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514
-#: ../gio/gresource-tool.c:521
+#: gio/gresource-tool.c:511 gio/gresource-tool.c:521 gio/gresource-tool.c:528
 msgid "SECTION"
 msgstr "[BÖLÜM]"
 
-#: ../gio/gresource-tool.c:509
+#: gio/gresource-tool.c:516
 msgid ""
 "List resources with details\n"
 "If SECTION is given, only list resources in this section\n"
@@ -3293,15 +3282,15 @@
 "EฤŸer YOL verilirse, yalnฤฑzca eลŸleลŸen kaynaklarฤฑ listele\n"
 "Ayrฤฑntฤฑlar bölüm, boyut, sฤฑkฤฑลŸtฤฑrma bilgilerini içerir"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:526
 msgid "Extract a resource file to stdout"
 msgstr "Bir kaynak dosyasฤฑnฤฑ stdout konumuna çฤฑkar"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:527
 msgid "FILE PATH"
 msgstr "DOSYA YOLU"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:541
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3329,7 +3318,7 @@
 "Ayrฤฑntฤฑlฤฑ yardฤฑm almak için “gresource help KOMUT” komutunu kullan.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:555
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3344,19 +3333,19 @@
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:562
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  BÖLÜM   (ฤฐsteฤŸe BaฤŸlฤฑ) Bir elf bölüm adฤฑ\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:703
+#: gio/gresource-tool.c:566 gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  KOMUT   (ฤฐsteฤŸe BaฤŸlฤฑ) Açฤฑklanacak komut\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:572
 msgid "  FILE      An elf file (a binary or a shared library)\n"
 msgstr "  DOSYA      Bir elf dosyasฤฑ (ikili ya da paylaลŸฤฑmlฤฑ bir kütüphane)\n"
 
-#: ../gio/gresource-tool.c:568
+#: gio/gresource-tool.c:575
 msgid ""
 "  FILE      An elf file (a binary or a shared library)\n"
 "            or a compiled resource file\n"
@@ -3364,142 +3353,133 @@
 "  DOSYA      Bir elf dosyasฤฑ (ikili ya da paylaลŸฤฑmlฤฑ bir kütüphane)\n"
 "            ya da derlenmiลŸ bir kaynak dosyasฤฑ\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:579
 msgid "[PATH]"
 msgstr "[YOL]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:581
 msgid "  PATH      An (optional) resource path (may be partial)\n"
 msgstr "  YOL      (isteฤŸe baฤŸlฤฑ) kaynak yolu (kฤฑsmi olabilir)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:582
 msgid "PATH"
 msgstr "YOL"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:584
 msgid "  PATH      A resource path\n"
 msgstr "  YOL      Kaynak yolu\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 "“%s” gibi bir ลŸema yok\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 ""
 "“%s” ลŸemasฤฑ yeniden konumlandฤฑrฤฑlabilir deฤŸildir (yol belirtilmemelidir)\n"
 
-#: ../gio/gsettings-tool.c:78
+#: gio/gsettings-tool.c:78
 #, c-format
 msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr ""
 "“%s” ลŸemasฤฑ yer deฤŸiลŸtirebilirdir (yol mutlaka belirtilmiลŸ olmalฤฑdฤฑr)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "BoลŸ bir yol girildi.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "Yol, mutlaka taksim (/) ile baลŸlamalฤฑdฤฑr\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "Yol, mutlaka bir taksim (/) ile bitmelidir\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Yol, ardฤฑลŸฤฑk olan iki taksim (//) içeremez\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 "SaฤŸlanan deฤŸer, geçerli aralฤฑฤŸฤฑn dฤฑลŸฤฑnda\n"
 
-#: ../gio/gsettings-tool.c:545
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "Anahtar yazฤฑlabilir deฤŸildir\n"
 
-#: ../gio/gsettings-tool.c:581
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Yüklü (yeniden konumlandฤฑrฤฑlamaz) ลŸemalarฤฑ listele"
 
-#: ../gio/gsettings-tool.c:587
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Yeniden yer deฤŸiลŸtirebilir ลŸemalarฤฑ listele"
 
-#: ../gio/gsettings-tool.c:593
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "ลžEMA içindeki anahtarlarฤฑ listele"
 
-#: ../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 "ลžEMA[:YOL]"
 
-#: ../gio/gsettings-tool.c:599
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Alt ลžEMALARI listele"
 
-#: ../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"
 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
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[ลžEMA[:YOL]]"
 
-#: ../gio/gsettings-tool.c:612
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "ANAHTAR deฤŸerini al"
 
-#: ../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 "ลžEMA[:YOL] ANAHTAR"
 
-#: ../gio/gsettings-tool.c:618
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "ANAHTAR için geçerli deฤŸerler aralฤฑฤŸฤฑnฤฑ sorgula"
 
-#: ../gio/gsettings-tool.c:624
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "ANAHTAR için açฤฑklamayฤฑ sorgula"
 
-#: ../gio/gsettings-tool.c:630
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "ANAHTAR’ฤฑn deฤŸerini DEฤžER’e ata"
 
-#: ../gio/gsettings-tool.c:631
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "ลžEMA[:YOL] ANAHTAR DEฤžER"
 
-#: ../gio/gsettings-tool.c:636
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "ANAHTAR’ฤฑ öntanฤฑmlฤฑ deฤŸerine döndür"
 
-#: ../gio/gsettings-tool.c:642
+#: 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
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "ANAHTAR’ฤฑn yazฤฑlabilir olup olmadฤฑฤŸฤฑnฤฑ denetle"
 
-#: ../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"
@@ -3509,11 +3489,11 @@
 "EฤŸer hiçbir ANAHTAR belirtilmemiลŸse, ลžEMA’daki tüm anahtarlarฤฑ izleyin.\n"
 "ฤฐzlemeyi durdurmak için ^C kullanฤฑn.\n"
 
-#: ../gio/gsettings-tool.c:657
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "ลžEMA[:YOL] [ANAHTAR]"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3561,7 +3541,7 @@
 "Ayrฤฑntฤฑlฤฑ yardฤฑm için “gsettings help KOMUT” komutunu çalฤฑลŸtฤฑrฤฑn.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:693
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3576,11 +3556,11 @@
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:699
+#: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  ลžEMADฤฐZฤฐNฤฐ Ek ลŸemalarฤฑ aramak için bir dizin\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"
@@ -3588,280 +3568,271 @@
 "  ลžEMA    ลžemanฤฑn adฤฑ\n"
 "  YOL     Yol, yeniden konumlandฤฑrฤฑlabilir ลŸemalar için\n"
 
-#: ../gio/gsettings-tool.c:712
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  ANAHTAR       ลžema içinde (isteฤŸe baฤŸlฤฑ) anahtar\n"
 
-#: ../gio/gsettings-tool.c:716
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  ANAHTAR       ลžema içindeki anahtar\n"
 
-#: ../gio/gsettings-tool.c:720
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  DEฤžER     Ayarlanacak deฤŸer\n"
 
-#: ../gio/gsettings-tool.c:775
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "%s’den ลŸemalar yüklenemedi: %s\n"
 
-#: ../gio/gsettings-tool.c:787
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Hiçbir ลŸema kurulmadฤฑ\n"
 
-#: ../gio/gsettings-tool.c:866
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "BoลŸ ลŸema adฤฑ verildi\n"
 
-#: ../gio/gsettings-tool.c:921
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s”\n"
 msgstr "“%s” gibi bir anahtar yok\n"
 
-#: ../gio/gsocket.c:384
+#: gio/gsocket.c:384
 msgid "Invalid socket, not initialized"
 msgstr "Geçersiz soket, baลŸlatฤฑlmamฤฑลŸ"
 
-#: ../gio/gsocket.c:391
+#: gio/gsocket.c:391
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Geçersiz soket, baลŸlatma baลŸarฤฑsฤฑz oldu: %s"
 
-#: ../gio/gsocket.c:399
+#: gio/gsocket.c:399
 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ฤฑ"
 
-#: ../gio/gsocket.c:549
+#: gio/gsocket.c:549
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd’den GSocket oluลŸturuluyor: %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 "Soket oluลŸturulamadฤฑ: %s"
 
-#: ../gio/gsocket.c:632
+#: gio/gsocket.c:632
 msgid "Unknown family was specified"
 msgstr "Bilinmeyen grup belirtildi"
 
-#: ../gio/gsocket.c:639
+#: gio/gsocket.c:639
 msgid "Unknown protocol was specified"
 msgstr "Bilinmeyen iletiลŸim kuralฤฑ belirtildi"
 
-#: ../gio/gsocket.c:1130
+#: gio/gsocket.c:1130
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr "Datagram olmayan bir yuva üzerinde datagram iลŸlemleri kullanฤฑlamaz."
 
-#: ../gio/gsocket.c:1147
+#: gio/gsocket.c:1147
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "ZamanaลŸฤฑmฤฑ ayarlanmฤฑลŸ bir yuva üzerinde datagram iลŸlemleri kullanฤฑlamaz."
 
-#: ../gio/gsocket.c:1954
+#: gio/gsocket.c:1954
 #, c-format
 msgid "could not get local address: %s"
 msgstr "yerel adres alฤฑnamadฤฑ: %s"
 
-#: ../gio/gsocket.c:2000
+#: gio/gsocket.c:2000
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "uzaktaki adres alฤฑnamadฤฑ: %s"
 
-#: ../gio/gsocket.c:2066
+#: gio/gsocket.c:2066
 #, c-format
 msgid "could not listen: %s"
 msgstr "dinlenemedi: %s"
 
-#: ../gio/gsocket.c:2168
+#: gio/gsocket.c:2168
 #, c-format
 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: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 "Ç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: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 "Çok yöne yayฤฑn grubundan ayrฤฑlฤฑrken hata: %s"
 
-#: ../gio/gsocket.c:2228
+#: gio/gsocket.c:2228
 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"
+#: gio/gsocket.c:2375
 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ฤฑ"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:176
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "%s vekil sunucusuna baฤŸlanฤฑlamadฤฑ: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:190
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "%s baฤŸlantฤฑsฤฑ gerçekleลŸtirilemedi:  "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:192
 msgid "Could not connect: "
 msgstr "BaฤŸlanฤฑlamadฤฑ: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1027 gio/gsocketclient.c:1599
 msgid "Unknown error on connect"
 msgstr "BaฤŸlanฤฑrken bilinmeyen bir hata"
 
-#: ../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 "TCP olmayan baฤŸlantฤฑlar üzerinden vekil sunucusu desteklenmiyor."
 
-#: ../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 "“%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ฤฑ"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4, “%s” IPv6 adresini desteklemiyor"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "Kullanฤฑcฤฑ adฤฑ SOCKSv4 iletiลŸim kuralฤฑ için çok uzun"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "“%s” makine adฤฑ SOCKSv4 iletiลŸim kuralฤฑ için çok uzun"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "Bu sunucu bir SOCKSv4 vekil sunucusu deฤŸil."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "SOCKSv4 sunucusu ile baฤŸlantฤฑ, reddedildi"
 
-#: ../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 "Sunucu, bir SOCKSv5 vekil sunucusu deฤŸil."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "SOCKSv5 vekil sunucusu kimlik doฤŸrulamasฤฑ gerektiriyor."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
@@ -3869,109 +3840,109 @@
 "SOCKSv5 vekil sunucusu, Glib tarafฤฑndan desteklenmeyen bir kimlik doฤŸrulama "
 "yöntemi istiyor."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr "Kullanฤฑcฤฑ adฤฑ ya da parola SOCKSv5 iletiลŸim kuralฤฑ için çok uzun."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
 msgstr ""
 "YanlฤฑลŸ kullanฤฑcฤฑ adฤฑ ya da paroladan dolayฤฑ SOCKSv5 kimlik doฤŸrulamasฤฑ "
 "baลŸarฤฑsฤฑz oldu."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "“%s” makine adฤฑ SOCKSv5 iletiลŸim kuralฤฑ için çok uzun"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "SOCKSv5 vekil sunucusu, bilinmeyen bir adres türü kullanฤฑyor."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "ฤฐç SOCKSv5 vekil sunucu hatasฤฑ."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "Kural kümesi tarafฤฑndan SOCKSv5 baฤŸlantฤฑsฤฑna izin verilmiyor."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "SOCKSv5 sunucusu üzerinden makineye ulaลŸฤฑlamฤฑyor."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "SOCKSv5 vekil sunucusu üzerinden aฤŸa ulaลŸฤฑlamฤฑyor."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "SOCKSv5 vekil sunucusu üzerinden baฤŸlantฤฑ reddedildi."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "SOCKSv5 vekil sunucusu “connect” komutunu desteklemiyor."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "SOCKSv5 vekil sunucusu verilen adres türünü desteklemiyor."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Bilinmeyen SOCKSv5 vekil hatasฤฑ."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:518
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "GThemedIcon kodlamasฤฑ %d sürümü iลŸlenemiyor"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:118
 msgid "No valid addresses were found"
 msgstr "Geçersiz adresler bulundu"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "“%s” tersine çözülürken hata: %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 "“%s” için talep edilen türün DNS kaydฤฑ yok"
 
-#: ../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 "Geçici olarak “%s” çözülemiyor"
 
-#: ../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 "“%s” çözerken hata"
 
-#: ../gio/gtlscertificate.c:250
+#: gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
 msgstr "PEM-kodlamalฤฑ özel anahtar ลŸifresi çözülemiyor"
 
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:255
 msgid "No PEM-encoded private key found"
 msgstr "Hiçbir PEM-kodlamalฤฑ özel anahtar bulunamadฤฑ"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:265
 msgid "Could not parse PEM-encoded private key"
 msgstr "PEM-kodlamalฤฑ özel anahtar ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:290
 msgid "No PEM-encoded certificate found"
 msgstr "PEM-kodlamalฤฑ sertifika bulunamadฤฑ"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:299
 msgid "Could not parse PEM-encoded certificate"
 msgstr "PEM-kodlamalฤฑ sertifika ayrฤฑลŸtฤฑrฤฑlamadฤฑ"
 
-#: ../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."
@@ -3980,7 +3951,7 @@
 
 #. Translators: This is not the 'This is the last chance' string. It is
 #. * displayed when more than one attempt is allowed.
-#: ../gio/gtlspassword.c:115
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
@@ -3988,298 +3959,294 @@
 "Girilen birkaç parola hatalฤฑ olmuลŸtur ve daha çok hatalฤฑ giriลŸten sonra "
 "eriลŸiminiz kilitlenecektir."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Girilen parola hatalฤฑ."
 
-#: ../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] "Beklenen 1 denetim iletisi, alฤฑnan %d"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Yardฤฑmcฤฑ verinin beklenmeyen türü"
 
-#: ../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] "Beklenen bir fd, fakat alฤฑnan %d\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Geçersiz fd alฤฑndฤฑ"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Kimlik bilgileri gönderilirken hata oluลŸtu: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Soket için SO_PASSCRED’in etkin olup olmadฤฑฤŸฤฑnฤฑ denetleme hatasฤฑ: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "SO_PASSCRED etkinleลŸtirmede hata: %s"
 
-#: ../gio/gunixconnection.c:549
+#: gio/gunixconnection.c:549
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
 msgstr ""
 "Kimlik bilgileri almak için bir bayt okunmasฤฑ bekleniyordu, sฤฑfฤฑr bayt okundu"
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Beklenen denetim iletisi yok fakat %d alฤฑndฤฑ"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "SO_PASSCRED devre dฤฑลŸฤฑ bฤฑrakฤฑlฤฑrken hata: %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 "Dosya tanฤฑmlayฤฑcฤฑdan okuma hatasฤฑ: %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 "Dosya tanฤฑmlayฤฑcฤฑ kapatฤฑlฤฑrken hata: %s"
 
-#: ../gio/gunixmounts.c:2556 ../gio/gunixmounts.c:2609
+#: gio/gunixmounts.c:2589 gio/gunixmounts.c:2642
 msgid "Filesystem root"
 msgstr "Dosya sistemi kök dizini"
 
-#: ../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 "Dosya tanฤฑmlayฤฑcฤฑya yazmada hata: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 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"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "ฤฐลŸleyiciden okumada hata: %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 "ฤฐลŸleyici kapatฤฑlฤฑrken hata: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "ฤฐลŸleyiciye yazmada hata: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Yeterli bellek yok"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "ฤฐç hata: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Daha çok girdi gerekli"
 
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Geçersiz sฤฑkฤฑลŸtฤฑrฤฑlmฤฑลŸ veri"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Dinlemek için adres"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Yok sayฤฑlmฤฑลŸ, GTestDBUS ile compat için"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Adres yazdฤฑr"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Kabuk kipinde adres yazdฤฑr"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Bir dbus servisi çalฤฑลŸtฤฑr"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "YanlฤฑลŸ deฤŸiลŸkenler\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "“%2$s” ögesi için beklenmeyen “%1$s” özniteliฤŸi"
 
-#: ../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:954
 #, c-format
 msgid "Attribute “%s” of element “%s” not found"
 msgstr "“%2$s” ögesinde “%1$s” özniteliฤŸi bulunamadฤฑ"
 
-#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
-#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
+#: glib/gbookmarkfile.c:1163 glib/gbookmarkfile.c:1228
+#: glib/gbookmarkfile.c:1292 glib/gbookmarkfile.c:1302
 #, c-format
 msgid "Unexpected tag “%s”, tag “%s” expected"
 msgstr "Beklenmeyen etiket “%s”, “%s” bekleniyordu"
 
-#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
-#: ../glib/gbookmarkfile.c:1230
+#: glib/gbookmarkfile.c:1188 glib/gbookmarkfile.c:1202
+#: glib/gbookmarkfile.c:1270 glib/gbookmarkfile.c:1316
 #, c-format
 msgid "Unexpected tag “%s” inside “%s”"
 msgstr "“%2$s” içinde beklenmeyen etiket “%1$s”"
 
-#: ../glib/gbookmarkfile.c:1757
+#: glib/gbookmarkfile.c:1812
 msgid "No valid bookmark file found in data dirs"
 msgstr "Veri dizinlerinde geçerli bir yer imi dosyasฤฑ bulunamadฤฑ"
 
-#: ../glib/gbookmarkfile.c:1958
+#: glib/gbookmarkfile.c:2013
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "“%s” URI’si için bir yer imi zaten var"
 
-#: ../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:2059 glib/gbookmarkfile.c:2217
+#: glib/gbookmarkfile.c:2302 glib/gbookmarkfile.c:2382
+#: glib/gbookmarkfile.c:2467 glib/gbookmarkfile.c:2550
+#: glib/gbookmarkfile.c:2628 glib/gbookmarkfile.c:2707
+#: glib/gbookmarkfile.c:2749 glib/gbookmarkfile.c:2846
+#: glib/gbookmarkfile.c:2967 glib/gbookmarkfile.c:3157
+#: glib/gbookmarkfile.c:3233 glib/gbookmarkfile.c:3401
+#: glib/gbookmarkfile.c:3490 glib/gbookmarkfile.c:3579
+#: glib/gbookmarkfile.c:3695
 #, c-format
 msgid "No bookmark found for URI “%s”"
 msgstr "“%s” URI’si için bir yer imi bulunamadฤฑ"
 
-#: ../glib/gbookmarkfile.c:2336
+#: glib/gbookmarkfile.c:2391
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "“%s” URI’si için yer iminde hiçbir MIME türü belirtilmedi"
 
-#: ../glib/gbookmarkfile.c:2421
+#: glib/gbookmarkfile.c:2476
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "“%s” URI’si için yer iminde özel bayrak tanฤฑmlanmadฤฑ"
 
-#: ../glib/gbookmarkfile.c:2800
+#: glib/gbookmarkfile.c:2855
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "“%s” URI’si için yer iminde grup tanฤฑmlanmadฤฑ"
 
-#: ../glib/gbookmarkfile.c:3199 ../glib/gbookmarkfile.c:3356
+#: glib/gbookmarkfile.c:3254 glib/gbookmarkfile.c:3411
 #, c-format
 msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr "“%s” adฤฑnda hiçbir uygulama “%s” için yer imi kaydetmedi"
 
-#: ../glib/gbookmarkfile.c:3379
+#: glib/gbookmarkfile.c:3434
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Exec satฤฑrฤฑ “%s”, “%s” URI’si ile geniลŸletilirken baลŸarฤฑsฤฑz olundu"
 
-#: ../glib/gconvert.c:473
-#| msgid "Invalid sequence in conversion input"
+#: glib/gconvert.c:473
 msgid "Unrepresentable character in conversion input"
 msgstr "DönüลŸüm girdisi içinde temsil edilemez karakter"
 
-#: ../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 "Girdinin sonunda parçalฤฑ karakter dizisi"
 
-#: ../glib/gconvert.c:769
+#: glib/gconvert.c:769
 #, c-format
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 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"
+#: glib/gconvert.c:940
 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"
+#: glib/gconvert.c:961
 msgid "Embedded NUL byte in conversion output"
 msgstr "DönüลŸüm çฤฑktฤฑsฤฑnda gömülü NUL baytฤฑ"
 
-#: ../glib/gconvert.c:1649
+#: glib/gconvert.c:1649
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "“%s” URI’si, “file” ลŸemasฤฑnฤฑ kullanan kesin bir URI deฤŸil"
 
-#: ../glib/gconvert.c:1659
+#: glib/gconvert.c:1659
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "Yerel dosya URI’si “%s”, “#” içeremez"
 
-#: ../glib/gconvert.c:1676
+#: glib/gconvert.c:1676
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "“%s” URI’si geçersiz"
 
-#: ../glib/gconvert.c:1688
+#: glib/gconvert.c:1688
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "“%s” URI’sinin ana makine adฤฑ geçersiz"
 
-#: ../glib/gconvert.c:1704
+#: glib/gconvert.c:1704
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "“%s” URI’si geçersiz olarak çฤฑkฤฑลŸ yapฤฑlmฤฑลŸ karakterler içeriyor"
 
-#: ../glib/gconvert.c:1776
+#: glib/gconvert.c:1776
 #, c-format
 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 +4267,62 @@
 #. * 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 "Sฬง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 +4344,132 @@
 #. * 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 +4491,62 @@
 #. * (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 "Sฬง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,217 +4568,192 @@
 #. * 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 "OฬˆOฬˆ"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:566
+#: glib/gdatetime.c:584
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "OฬˆS"
 
-#: ../glib/gdir.c:155
+#: glib/gdir.c:155
 #, c-format
 msgid "Error opening directory “%s”: %s"
 msgstr "“%s” dizini açฤฑlamadฤฑ: %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] "%lu bayt “%s” dosyasฤฑnฤฑ okumak için ayrฤฑlamadฤฑ"
 
-#: ../glib/gfileutils.c:733
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "“%s” dosyasฤฑ okuma hatasฤฑ: %s"
 
-#: ../glib/gfileutils.c:769
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s” is too large"
 msgstr "“%s” dosyasฤฑ çok büyük"
 
-#: ../glib/gfileutils.c:833
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "“%s” dosyasฤฑndan okuma baลŸarฤฑsฤฑz: %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 "“%s” dosyasฤฑnฤฑ açma baลŸarฤฑsฤฑz: %s"
 
-#: ../glib/gfileutils.c:893
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr ""
 "“%s” dosyasฤฑnฤฑn özniteliklerini alma baลŸarฤฑsฤฑz: fstat() baลŸarฤฑsฤฑzlฤฑฤŸฤฑ: %s"
 
-#: ../glib/gfileutils.c:923
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr "“%s” dosyasฤฑnฤฑ açma baลŸarฤฑsฤฑz: fdopen() baลŸarฤฑsฤฑzlฤฑฤŸฤฑ: %s"
 
-#: ../glib/gfileutils.c:1022
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr ""
 "“%s” dosyasฤฑnฤฑn adฤฑ “%s” olarak deฤŸiลŸtirilirken hata: g_rename() "
 "baลŸarฤฑsฤฑzlฤฑฤŸฤฑ: %s"
 
-#: ../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 "“%s” dosyasฤฑnฤฑ oluลŸturma baลŸarฤฑsฤฑz: %s"
 
-#: ../glib/gfileutils.c:1084
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr "“%s” dosyasฤฑna yazฤฑlamadฤฑ: write() baลŸarฤฑsฤฑz: %s"
 
-#: ../glib/gfileutils.c:1127
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr "“%s” dosyasฤฑna yazฤฑlamadฤฑ: fsync() baลŸarฤฑsฤฑz: %s"
 
-#: ../glib/gfileutils.c:1251
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr "Var olan dosya “%s” kaldฤฑrฤฑlamadฤฑ: g_unlink() baลŸarฤฑsฤฑzlฤฑฤŸฤฑ: %s"
 
-#: ../glib/gfileutils.c:1530
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "“%s” ลŸablonu geçersiz, “%s” içermemeli"
 
-#: ../glib/gfileutils.c:1543
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "“%s” ลŸablonu XXXXXX içermiyor"
 
-#: ../glib/gfileutils.c:2105
+#: glib/gfileutils.c:2116
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "“%s” simgesel baฤŸฤฑnฤฑ okuma baลŸarฤฑsฤฑz: %s"
 
-#: ../glib/giochannel.c:1389
+#: glib/giochannel.c:1389
 #, c-format
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "“%s”-“%s” dönüลŸtürücüsü açฤฑlamฤฑyor: %s"
 
-#: ../glib/giochannel.c:1734
+#: glib/giochannel.c:1734
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr "g_io_channel_read_line_string içinde okuma yapฤฑlamฤฑyor"
 
-#: ../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 "Okuma tampon belleฤŸinde kalฤฑntฤฑ çevrilmemiลŸ veri"
 
-#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
+#: glib/giochannel.c:1862 glib/giochannel.c:1939
 msgid "Channel terminates in a partial character"
 msgstr "Kanal kฤฑsmi bir karakterde sonlanฤฑyor"
 
-#: ../glib/giochannel.c:1925
+#: glib/giochannel.c:1925
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "g_io_channel_read_to_end içinde okuma baลŸarฤฑsฤฑz"
 
-#: ../glib/gkeyfile.c:788
+#: glib/gkeyfile.c:788
 msgid "Valid key file could not be found in search dirs"
 msgstr "Arama dizinlerinde geçerli anahtar dosyasฤฑ bulunamadฤฑ"
 
-#: ../glib/gkeyfile.c:825
+#: glib/gkeyfile.c:825
 msgid "Not a regular file"
 msgstr "Normal dosya deฤŸil"
 
-#: ../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"
@@ -4843,50 +4761,50 @@
 "Anahtar dosyasฤฑ; anahtar-deฤŸer çifti, grup veya yorum olmayan “%s” satฤฑrฤฑnฤฑ "
 "içeriyor"
 
-#: ../glib/gkeyfile.c:1327
+#: glib/gkeyfile.c:1327
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Geçersiz grup adฤฑ: %s"
 
-#: ../glib/gkeyfile.c:1349
+#: glib/gkeyfile.c:1349
 msgid "Key file does not start with a group"
 msgstr "Anahtar dosyasฤฑ bir grupla baลŸlamฤฑyor"
 
-#: ../glib/gkeyfile.c:1375
+#: glib/gkeyfile.c:1375
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Geçersiz anahtar adฤฑ: %s"
 
-#: ../glib/gkeyfile.c:1402
+#: glib/gkeyfile.c:1402
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "Anahtar dosya desteklenmeyen “%s” kodlamasฤฑnฤฑ içeriyor"
 
-#: ../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 "Anahtar dosyasฤฑnda “%s” grubu yok"
 
-#: ../glib/gkeyfile.c:1773
+#: glib/gkeyfile.c:1773
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Anahtar dosyasฤฑ, “%2$s” grubunda “%1$s” anahtarฤฑ içermiyor"
 
-#: ../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 "Anahtar dosyasฤฑ, UTF-8 olmayan “%s” anahtarฤฑnฤฑ “%s” deฤŸeriyle içeriyor"
 
-#: ../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 ""
 "Anahtar dosyasฤฑ yorumlanamayan bir deฤŸere sahip olan “%s” anahtarฤฑnฤฑ içerir."
 
-#: ../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 "
@@ -4894,224 +4812,224 @@
 msgstr ""
 "“%2$s” grubundaki anahtar dosyasฤฑ, yorumlanamayan “%1$s” anahtarฤฑnฤฑ içeriyor."
 
-#: ../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 ""
 "“%2$s” grubundaki “%1$s” anahtarฤฑ “%4$s” deฤŸerine sahip olmasฤฑ beklenirken "
 "“%3$s” deฤŸerine sahip"
 
-#: ../glib/gkeyfile.c:4274
+#: glib/gkeyfile.c:4274
 msgid "Key file contains escape character at end of line"
 msgstr "Anahtar dosyasฤฑ satฤฑr sonunda çฤฑkฤฑลŸ karakteri içeriyor"
 
-#: ../glib/gkeyfile.c:4296
+#: glib/gkeyfile.c:4296
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "“%s” anahtar dosyasฤฑ geçersiz çฤฑkฤฑลŸ dizisi içeriyor"
 
-#: ../glib/gkeyfile.c:4440
+#: glib/gkeyfile.c:4440
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "“%s” deฤŸeri bir sayฤฑ olarak yorumlanamฤฑyor."
 
-#: ../glib/gkeyfile.c:4454
+#: glib/gkeyfile.c:4454
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "“%s”, tamsayฤฑ deฤŸeri aralฤฑk dฤฑลŸฤฑnda"
 
-#: ../glib/gkeyfile.c:4487
+#: glib/gkeyfile.c:4487
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "“%s” deฤŸeri bir gerçel sayฤฑ olarak yorumlanamฤฑyor."
 
-#: ../glib/gkeyfile.c:4526
+#: glib/gkeyfile.c:4526
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "“%s” deฤŸeri mantฤฑksal deฤŸer olarak yorumlanamฤฑyor."
 
-#: ../glib/gmappedfile.c:129
+#: glib/gmappedfile.c:129
 #, c-format
 msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"
 msgstr ""
 "“%s%s%s%s” dosyasฤฑnฤฑn özniteliklerini alma baลŸarฤฑsฤฑz: fstat() hatasฤฑ: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "%s%s%s%s için eลŸleme oluลŸturulamadฤฑ: mmap() hatasฤฑ: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "“%s” dosyasฤฑ açฤฑlamadฤฑ: open() baลŸarฤฑsฤฑzlฤฑฤŸฤฑ: %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 "Satฤฑr %d karakter %d hatalฤฑ: "
 
-#: ../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'"
-msgstr "Adda geçersiz UTF-8 kodlu metin - geçerli olmayan “%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
+#: 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"
+msgstr "“%s” geçerli bir ad deฤŸil"
 
-#: ../glib/gmarkup.c:488
+#: 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”"
+msgstr "“%s” geçerli bir ad deฤŸil: “%c”"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:610
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Satฤฑr %d hata içeriyor: %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 ""
-"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
+#: 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 ""
 "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
+#: glib/gmarkup.c:725
 #, 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"
+msgstr "Karakter referansฤฑ “%-.*s” izin verilen karakteri kodlamฤฑyor"
 
-#: ../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 ""
-"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
+#: glib/gmarkup.c:771
 #, c-format
-msgid "Entity name '%-.*s' is not known"
-msgstr "Varlฤฑk adฤฑ '%-.*s' bilinmiyor"
+msgid "Entity name “%-.*s” is not known"
+msgstr "Varlฤฑk adฤฑ “%-.*s” bilinmiyor"
 
-#: ../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 ""
 "Ö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
+#: glib/gmarkup.c:1182
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Belge bir öge ile baลŸlamalฤฑdฤฑr (örneฤŸin <kitap>)"
 
-#: ../glib/gmarkup.c: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 ""
-"'<' 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
+#: 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 ""
-"Tuhaf karakter '%s', '%s' boลŸ öge etiketinin sonunda '>' karakteri beklendi"
+"Tuhaf karakter “%s”, “%s” boลŸ öge etiketinin sonunda “>” karakteri bekledi"
 
-#: ../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 ""
-"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
+#: 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 ""
-"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
+#: 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 ""
-"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
+#: 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 ""
-"'</' 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
+#: 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', 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
+#: glib/gmarkup.c:1610
 #, 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"
+msgstr "“%s” ögesi kapatฤฑlmฤฑลŸ, hiçbir öge ลŸu anda açฤฑk deฤŸil"
 
-#: ../glib/gmarkup.c:1607
+#: glib/gmarkup.c:1619
 #, 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”"
+msgstr "“%s” ögesi kapatฤฑlmฤฑลŸ, ancak “%s” ลŸu an açฤฑk olan ögedir"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
 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 '<'"
+#: glib/gmarkup.c:1786
+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
+#: 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 ""
 "Belge, ögeleri hala açฤฑkken beklenmedik bir ลŸekilde bitti - son açฤฑlan öge: "
-"'%s'"
+"“%s”"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1802
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5120,19 +5038,19 @@
 "Belge beklenmedik bir ลŸekilde bitti, etiketi bitiren kapalฤฑ açฤฑ parantezi "
 "ile biten <%s/> beklendi"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Belge bir öge adฤฑnฤฑn içinde beklenmedik bir ลŸekilde bitti"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Belge bir öznitelik adฤฑ içinde beklenmedik bir ลŸekilde bitti"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "Belge bir öge-açma etiketi içinde beklenmedik bir ลŸekilde bitti."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1825
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -5140,312 +5058,320 @@
 "Belge öznitelik adฤฑnฤฑ takip eden eลŸittir iลŸaretinden sonra beklenmedik bir "
 "ลŸekilde bitti; öznitelik deฤŸeri yok"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Belge bir öznitelik deฤŸeri içinde iken beklenmedik bir ลŸekilde bitti"
 
-#: ../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 ""
-"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
+#: 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 ""
+"Belge, açฤฑk olmayan bir öge için kapatma etiketi içinde beklenmedik bir "
+"ลŸekilde bitti"
+
+#: glib/gmarkup.c:1859
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Belge bir yorum veya iลŸlem talimatฤฑ içindeyken beklenmedik bir ลŸekilde bitti"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:861
 msgid "[OPTION…]"
 msgstr "[SEÇENEK…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:977
 msgid "Help Options:"
 msgstr "Yardฤฑm Seçenekleri:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:978
 msgid "Show help options"
 msgstr "Yardฤฑm seçeneklerini göster"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:984
 msgid "Show all help options"
 msgstr "Tüm yardฤฑm seçeneklerini göster"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1047
 msgid "Application Options:"
 msgstr "Uygulama Seçenekleri:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1049
 msgid "Options:"
 msgstr "Seçenekler:"
 
-#: ../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 "%2$s için tamsayฤฑ deฤŸeri “%1$s” ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
 
-#: ../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 "%2$s için tamsayฤฑ deฤŸeri “%1$s” aralฤฑk dฤฑลŸฤฑnda"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value “%s” for %s"
 msgstr "%2$s için double deฤŸeri “%1$s” ayrฤฑลŸtฤฑrฤฑlamฤฑyor"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1156
 #, c-format
 msgid "Double value “%s” for %s out of range"
 msgstr "%2$s için double deฤŸeri “%1$s” aralฤฑk dฤฑลŸฤฑnda"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1448 glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "%s seçeneฤŸi iลŸlenirken hata"
 
-#: ../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 için argüman eksik"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "Bilinmeyen seçenek %s"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "bozuk nesne"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "iç hata ya da bozuk nesne"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "yetersiz bellek"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "geri takip sฤฑnฤฑrฤฑna ulaลŸฤฑldฤฑ"
 
-#: ../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 "doku (pattern), kฤฑsmi eลŸleme için desteklenmeyen ögeler içeriyor"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "iç hata"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr "koลŸul olarak geri referanslar kฤฑsmi eลŸleme için desteklenmiyor"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "iç içe yineleme sฤฑnฤฑrฤฑna ulaลŸฤฑldฤฑ"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "yeni satฤฑr iลŸaretlerinin geçersiz kombinasyonu"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "geçersiz ofset"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "kฤฑsa utf8"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "yineleme döngüsü"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ desenin sonunda"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c desenin sonunda"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "anlaลŸฤฑlamayan karakter \\ takip ediyor"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "sayฤฑlar {} niceliฤŸi içerisinde sฤฑra dฤฑลŸฤฑ"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "sayฤฑlar {} niceliฤŸi içerisinde çok büyük"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "karakter sฤฑnฤฑfฤฑ için eksik sonlanan ]"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "karakter sฤฑnฤฑfฤฑnda geçersiz dizi"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "karakter sฤฑnฤฑfฤฑnda sฤฑra dฤฑลŸฤฑ kapsam"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "yinelenecek bir ลŸey yok"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "beklenmeyen yineleme"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "(? ya da (?-  sonrasฤฑ tanฤฑnmayan karakter"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "POSIX adlandฤฑrฤฑlmฤฑลŸ sฤฑnฤฑflar yalnฤฑzca bir sฤฑnฤฑf içinde desteklenir"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "eksik sonlandฤฑran )"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "var olmayan alt desene referans"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "açฤฑklama sonrasฤฑ eksik )"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "düzenli ifade çok uzun"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "bellek alma baลŸarฤฑsฤฑz oldu"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr "açma ( olmayan )"
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "kod akฤฑลŸ taลŸmasฤฑ"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "(?< sonrasฤฑ tanฤฑmlanmayan karakter"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "geribakma iddiasฤฑ sabit uzunlukta deฤŸil"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "(?( sonrasฤฑ bozuk rakam ya da ad"
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "koลŸul grubu ikiden daha çok branลŸ içeriyor"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "(?( sonrasฤฑ iddia bekleniyor"
 
 #. 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 ya da (?[+-]basamaklarฤฑ ) ile takip etmelidir"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "bilinmeyen POSIX sฤฑnฤฑf adฤฑ"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "POSIX karลŸฤฑlaลŸtฤฑrma ögeleri desteklenmiyor"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "\\x{...} dizisi içerisinde karakter deฤŸeri çok büyük"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "geçersiz koลŸul (?(0)"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C geriye bakma iddiasฤฑ içerisinde izin verilmiyor"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "kaçฤฑลŸ karakterleri \\L, \\l, \\N{ad}, \\U ve \\u desteklenmiyor"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "yinelemeli çaฤŸrฤฑ sonsuz döngü yapamadฤฑ"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "(?P sonrasฤฑ tanฤฑmlanmayan karakter"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "alt desen adฤฑ içerisinde eksik sonlandฤฑrฤฑcฤฑ"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "iki adlฤฑ alt desenler aynฤฑ ada sahip"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "bozulmuลŸ \\P ya da \\p dizisi"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "\\P ya da \\p sonrasฤฑ bilinmeyen özellik adฤฑ"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "alt desen adฤฑ çok uzun (en çok 32 karakter)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "çok fazla adlandฤฑrฤฑlmฤฑลŸ alt desen (en çok 10.000)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "sekizlik deฤŸer \\377’den daha büyük"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "derleme çalฤฑลŸma alanฤฑ kaplandฤฑ"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "önceden denetlenmiลŸ referanslฤฑ alt desen bulunamadฤฑ"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE grubu birden daha çok branลŸ içeriyor"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "kararsฤฑz NEWLINE seçenekleri"
 
-#: ../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"
@@ -5453,274 +5379,280 @@
 "\\g bir parantezli ad ya da tercihten parentezli sฤฑfฤฑr olmayan sayฤฑ "
 "tarafฤฑndan takip edilmiyor"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "numaralandฤฑrฤฑlmฤฑลŸ kaynak sฤฑfฤฑr olmamalฤฑdฤฑr"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "(*ACCEPT), (*FAIL) ya da (*COMMIT) için bir argümana izin verilmez"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) tanฤฑnamadฤฑ"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "sayฤฑ çok büyük"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "(?& den sonra eksik alt desen adฤฑ"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "(?+ den sonra sayฤฑ beklendi"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr "] JavaScript uyumluluk kipinde geçersiz bir veri karakteri"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "aynฤฑ sayฤฑya izin verilmeyen alt desenler için farklฤฑ adlar"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) bir argüman almalฤฑ"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "\\c karakteri ASCII karakterleri tarafฤฑndan takip edilmelidir"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "\\k bir parantezli ad ya da tercihten parentezli sฤฑfฤฑr olmayan sayฤฑ "
 "tarafฤฑndan takip edilmiyor"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N bir sฤฑnฤฑfta desteklenmez"
 
-#: ../glib/gregex.c:516
+#: 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
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "(*MARK), (*PRUNE), (*SKIP) ya da (*THEN) içinde ad çok uzun"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 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"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE kütüphanesi UTF8 desteฤŸi olmadan derlenmiลŸ"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE kütüphanesi UTF8 özellikleri desteฤŸi olmadan derlenmiลŸ"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "PCRE kütüphanesi uyuลŸmayan seçenekler ile derlenmiลŸ"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Düzenli ifade %s eniyilemesinde (optimization) hata: %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 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"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Alฤฑntฤฑlฤฑ metin tฤฑrnak iลŸareti ile baลŸlamฤฑyor"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Komut satฤฑrฤฑnda veya diฤŸer kabuk alฤฑntฤฑsฤฑ metinde eลŸlenmemiลŸ tฤฑrnak iลŸareti"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr "Metin “\\” karakterinden hemen sonra bitti. (Metin: “%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 "%c için eลŸleลŸen alฤฑntฤฑ bulunmadan metin bitti. (Metin: “%s”)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Metin boลŸtu (veya yalnฤฑzca boลŸluk içeriyordu)"
 
-#: ../glib/gspawn.c:253
+#: glib/gspawn.c:302
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Alt süreçten bilgi okuma baลŸarฤฑsฤฑzlฤฑฤŸฤฑ (%s)"
 
-#: ../glib/gspawn.c:401
+#: glib/gspawn.c:450
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Alt süreçten bilgi okurken select()’te beklenmeyen hata oluลŸtu (%s)"
 
-#: ../glib/gspawn.c:486
+#: glib/gspawn.c:535
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid()’de beklenmeyen hata (%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 "Alt iลŸlem %ld kodu ile sonlandฤฑ"
 
-#: ../glib/gspawn.c:905
+#: glib/gspawn.c:1051
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Alt iลŸlem, %ld sinyali ile sonlandฤฑ"
 
-#: ../glib/gspawn.c:912
+#: glib/gspawn.c:1058
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Alt iลŸlem %ld sinyali ile durduruldu"
 
-#: ../glib/gspawn.c:919
+#: glib/gspawn.c:1065
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Alt iลŸlem anormal bir biçimde sonlandฤฑ"
 
-#: ../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 "Alt süreç borusundan okuma baลŸarฤฑsฤฑzlฤฑฤŸฤฑ (%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 "“%s” alt süreci üretme baลŸarฤฑsฤฑz (%s)"
+
+#: glib/gspawn.c:1635
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Çatallama baลŸarฤฑsฤฑzlฤฑฤŸฤฑ (%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 "“%s” dizinine deฤŸiลŸtirme baลŸarฤฑsฤฑzlฤฑฤŸฤฑ (%s)"
 
-#: ../glib/gspawn.c:1553
+#: glib/gspawn.c:1794
 #, c-format
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "“%s” alt süreci çalฤฑลŸtฤฑrฤฑlฤฑrken hata oluลŸtu (%s)"
 
-#: ../glib/gspawn.c:1563
+#: glib/gspawn.c:1804
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Alt sürecin girdisi veya çฤฑktฤฑsฤฑ yönlendirilemedi (%s)"
 
-#: ../glib/gspawn.c:1572
+#: glib/gspawn.c:1813
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Alt süreç çatallanamadฤฑ (%s)"
 
-#: ../glib/gspawn.c:1580
+#: glib/gspawn.c:1821
 #, c-format
 msgid "Unknown error executing child process “%s”"
 msgstr "Alt süreç “%s” çalฤฑลŸtฤฑrฤฑlฤฑrken bilinmeyen hata oluลŸtu"
 
-#: ../glib/gspawn.c:1604
+#: glib/gspawn.c:1845
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Alt süreç borusundan yeterli bilgi okunamadฤฑ (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Alt süreçten bilgi okuma baลŸarฤฑsฤฑzlฤฑฤŸฤฑ"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Alt süreçle haberleลŸme için boru yaratฤฑlamadฤฑ (%s)"
 
-#: ../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 "Alt süreç yürütme baลŸarฤฑsฤฑzlฤฑฤŸฤฑ (%s)"
 
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:450
 #, c-format
 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:460 glib/gspawn-win32.c:714
 #, 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:471 glib/gspawn-win32.c:729
 #, 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:710
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Geçersiz çalฤฑลŸma dizini: %s"
 
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:772
 #, 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:1045
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5728,200 +5660,184 @@
 "Alt süreçten bilgi okurken g_io_channel_win32_poll() iลŸleminde beklenmeyen "
 "hata"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3247 glib/gstrfuncs.c:3348
 msgid "Empty string is not a number"
 msgstr "BoลŸ dizge bir sayฤฑ deฤŸildir"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3271
 #, c-format
 msgid "“%s” is not a signed number"
 msgstr "“%s” iลŸaretli bir sayฤฑ deฤŸil"
 
-#: ../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 "“%s” sayฤฑsฤฑ sฤฑnฤฑrlarฤฑn dฤฑลŸฤฑndadฤฑr [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3374
 #, c-format
 msgid "“%s” is not an unsigned number"
 msgstr "“%s” iลŸaretsiz bir sayฤฑ deฤŸil"
 
-#: ../glib/gutf8.c:811
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Bellek ayrฤฑlamadฤฑ"
 
-#: ../glib/gutf8.c:944
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Karakter UTF-8 için sฤฑnฤฑrlarฤฑnฤฑn dฤฑลŸฤฑnda"
 
-#: ../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 "DönüลŸüm girdisi içinde geçersiz dizi"
 
-#: ../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 "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 +5847,30 @@
 #. * 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 "'%s' gibi bir arayüz yok"
+
+#~ 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 +5888,6 @@
 #~ 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 5f6e66e..44ae7f1 100755
--- a/sanity_check
+++ b/sanity_check
@@ -13,7 +13,7 @@
 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/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
index f32522e..b53c8f7 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 de1e861..6aff13f 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 0000000..f701627
--- /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 de3ddb4..fba1865 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -146,8 +146,8 @@
 
 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 f7b47ab..f59c48e 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 @@
 แฒ†	ัŠ
 แฒ‡	ัฃ
 แฒˆ	๊™‹
+แฒ	แƒ
+แฒ‘	แƒ‘
+แฒ’	แƒ’
+แฒ“	แƒ“
+แฒ”	แƒ”
+แฒ•	แƒ•
+แฒ–	แƒ–
+แฒ—	แƒ—
+แฒ˜	แƒ˜
+แฒ™	แƒ™
+แฒš	แƒš
+แฒ›	แƒ›
+แฒœ	แƒœ
+แฒ	แƒ
+แฒž	แƒž
+แฒŸ	แƒŸ
+แฒ 	แƒ 
+แฒก	แƒก
+แฒข	แƒข
+แฒฃ	แƒฃ
+แฒค	แƒค
+แฒฅ	แƒฅ
+แฒฆ	แƒฆ
+แฒง	แƒง
+แฒจ	แƒจ
+แฒฉ	แƒฉ
+แฒช	แƒช
+แฒซ	แƒซ
+แฒฌ	แƒฌ
+แฒญ	แƒญ
+แฒฎ	แƒฎ
+แฒฏ	แƒฏ
+แฒฐ	แƒฐ
+แฒฑ	แƒฑ
+แฒฒ	แƒฒ
+แฒณ	แƒณ
+แฒด	แƒด
+แฒต	แƒต
+แฒถ	แƒถ
+แฒท	แƒท
+แฒธ	แƒธ
+แฒน	แƒน
+แฒบ	แƒบ
+แฒฝ	แƒฝ
+แฒพ	แƒพ
+แฒฟ	แƒฟ
 แธ€	แธ
 แธ‚	แธƒ
 แธ„	แธ…
@@ -1097,6 +1143,7 @@
 ๊žณ	๊ญ“
 ๊žด	๊žต
 ๊žถ	๊žท
+๊žธ	๊žน
 ๊ญฐ	แŽ 
 ๊ญฑ	แŽก
 ๊ญฒ	แŽข
@@ -1374,6 +1421,38 @@
 ๐‘ขฝ	๐‘ฃ
 ๐‘ขพ	๐‘ฃž
 ๐‘ขฟ	๐‘ฃŸ
+๐–น€	๐–น 
+๐–น	๐–นก
+๐–น‚	๐–นข
+๐–นƒ	๐–นฃ
+๐–น„	๐–นค
+๐–น…	๐–นฅ
+๐–น†	๐–นฆ
+๐–น‡	๐–นง
+๐–นˆ	๐–นจ
+๐–น‰	๐–นฉ
+๐–นŠ	๐–นช
+๐–น‹	๐–นซ
+๐–นŒ	๐–นฌ
+๐–น	๐–นญ
+๐–นŽ	๐–นฎ
+๐–น	๐–นฏ
+๐–น	๐–นฐ
+๐–น‘	๐–นฑ
+๐–น’	๐–นฒ
+๐–น“	๐–นณ
+๐–น”	๐–นด
+๐–น•	๐–นต
+๐–น–	๐–นถ
+๐–น—	๐–นท
+๐–น˜	๐–นธ
+๐–น™	๐–นน
+๐–นš	๐–นบ
+๐–น›	๐–นป
+๐–นœ	๐–นผ
+๐–น	๐–นฝ
+๐–นž	๐–นพ
+๐–นŸ	๐–นฟ
 ๐žค€	๐žคข
 ๐žค	๐žคฃ
 ๐žค‚	๐žคค
diff --git a/tests/casemap.txt b/tests/casemap.txt
index 5e983f7..5bc76ba 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 @@
 	ี”	ึ„		ี”	#  554
 	ี•	ึ…		ี•	#  555
 	ี–	ึ†		ี–	#  556
+	ี 	ี 			#  560
 	ีก	ีก	ิฑ	ิฑ	#  561
 	ีข	ีข	ิฒ	ิฒ	#  562
 	ีฃ	ีฃ	ิณ	ิณ	#  563
@@ -1085,6 +1086,7 @@
 	ึ…	ึ…	ี•	ี•	#  585
 	ึ†	ึ†	ี–	ี–	#  586
 	ึ‡	ึ‡	ิตึ‚	ิตี’	#  587
+	ึˆ	ึˆ			#  588
 	แ‚ 	โด€		แ‚ 	# 10A0
 	แ‚ก	โด		แ‚ก	# 10A1
 	แ‚ข	โด‚		แ‚ข	# 10A2
@@ -1125,6 +1127,52 @@
 	แƒ…	โดฅ		แƒ…	# 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 @@
 	แฒ†	แฒ†	ะช	ะช	# 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 @@
 	๊žฌ	ษก		๊žฌ	# A7AC
 	๊žญ	ษฌ		๊žญ	# A7AD
 	๊žฎ	ษช		๊žฎ	# A7AE
+	๊žฏ	๊žฏ			# A7AF
 	๊žฐ	สž		๊žฐ	# A7B0
 	๊žฑ	ส‡		๊žฑ	# A7B1
 	๊žฒ	ส		๊žฒ	# A7B2
@@ -2324,6 +2419,8 @@
 	๊žต	๊žต	๊žด	๊žด	# A7B5
 	๊žถ	๊žท		๊žถ	# A7B6
 	๊žท	๊žท	๊žถ	๊žถ	# A7B7
+	๊žธ	๊žน		๊žธ	# A7B8
+	๊žน	๊žน	๊žธ	๊žธ	# A7B9
 	๊Ÿบ	๊Ÿบ			# A7FA
 	๊ฌฐ	๊ฌฐ			# AB30
 	๊ฌฑ	๊ฌฑ			# AB31
@@ -2836,6 +2933,70 @@
 	๐‘ฃ	๐‘ฃ	๐‘ขฝ	๐‘ขฝ	# 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 2a6a0d4..0000000
--- 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 0000000..3c55828
--- /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 3ae419c..0000000
--- 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 0000000..98f6bc9
--- /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/gobject/Makefile.am b/tests/gobject/Makefile.am
index aa5dbb6..0e60987 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -40,7 +40,8 @@
 	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 @@
 	&& 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/meson.build b/tests/gobject/meson.build
index 9521239..4944599 100644
--- a/tests/gobject/meson.build
+++ b/tests/gobject/meson.build
@@ -48,6 +48,7 @@
   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 @@
     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/testgobject.c b/tests/gobject/testgobject.c
index 391e018..02cfc56 100644
--- a/tests/gobject/testgobject.c
+++ b/tests/gobject/testgobject.c
@@ -154,6 +154,13 @@
 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_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 @@
 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_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 @@
 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 @@
 };
 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_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 @@
 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 @@
   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 @@
   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 03997a6..3beb4c6 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 39722de..9046bf7 100644
--- a/tests/refcount/meson.build
+++ b/tests/refcount/meson.build
@@ -3,7 +3,7 @@
  ['objects', 'objects.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 @@
   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 @@
     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 2652769..963766d 100644
--- a/tests/refcount/objects.c
+++ b/tests/refcount/objects.c
@@ -155,6 +155,7 @@
 
   g_object_unref (test1);
   g_object_unref (test2);
+  g_array_unref (test_threads);
 
   g_print ("stopped\n");
 
diff --git a/tests/unicode-caseconv.c b/tests/unicode-caseconv.c
index affb558..c124633 100644
--- a/tests/unicode-caseconv.c
+++ b/tests/unicode-caseconv.c
@@ -57,7 +57,7 @@
       
       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