Imported Upstream version 2.61.1

112 files changed, 12816 insertions, 8627 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9cd70f32..d78f8cdb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: registry.gitlab.gnome.org/gnome/glib/master:v11
-
 stages:
   - build
   - coverage
@@ -15,6 +13,7 @@ variables:
   MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings"
 
 fedora-x86_64:
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
   stage: build
   except:
     - tags
@@ -54,7 +53,37 @@ fedora-x86_64:
       - "_build/${CI_JOB_NAME}-report.xml"
       - "_coverage"
 
+debian-stable-x86_64:
+  image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v1
+  stage: build
+  except:
+    - tags
+  script:
+    - meson ${MESON_COMMON_OPTIONS}
+            --werror
+            --default-library=both
+            --prefix=$HOME/glib-installed
+            --libdir=lib
+            -Dsystemtap=true
+            -Ddtrace=true
+            -Dfam=true
+            -Dinstalled_tests=true
+            _build
+    - ninja -C _build
+    - .gitlab-ci/run-tests.sh
+  artifacts:
+    reports:
+      junit: "_build/${CI_JOB_NAME}-report.xml"
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
+    paths:
+      - "_build/config.h"
+      - "_build/glib/glibconfig.h"
+      - "_build/meson-logs"
+      - "_build/${CI_JOB_NAME}-report.xml"
+
 G_DISABLE_ASSERT:
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
   stage: build
   except:
     - tags
@@ -93,6 +122,7 @@ G_DISABLE_ASSERT:
 
 cross-android_api21_arm64:
   <<: *cross-template
+  image: registry.gitlab.gnome.org/gnome/glib/android-ndk:v1
   script:
     # FIXME: add --werror
     # We use -Diconv=auto to test that we successfully detect that iconv is not
@@ -102,6 +132,7 @@ cross-android_api21_arm64:
 
 cross-android_api28_arm64:
   <<: *cross-template
+  image: registry.gitlab.gnome.org/gnome/glib/android-ndk:v1
   script:
     # FIXME: add --werror
     - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_28.txt -Dinternal_pcre=true _build
@@ -109,6 +140,7 @@ cross-android_api28_arm64:
 
 cross-mingw64:
   <<: *cross-template
+  image: registry.gitlab.gnome.org/gnome/glib/mingw:v1
   script:
     # FIXME: Add --werror
     - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build
@@ -195,6 +227,7 @@ freebsd-11-x86_64:
       - "_build/${CI_JOB_NAME}-report.xml"
 
 coverage:
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
   stage: coverage
   except:
     - tags
@@ -217,6 +250,7 @@ pages:
       - public
 
 dist-job:
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
   stage: build
   only:
     - tags
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/android-ndk.Dockerfile
index c03a9abff..0f8840168 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/android-ndk.Dockerfile
@@ -1,9 +1,11 @@
-FROM fedora:27
+FROM fedora:28
 
 RUN dnf -y install \
     autoconf \
     automake \
     bindfs \
+    clang \
+    clang-analyzer \
     desktop-file-utils \
     elfutils-libelf-devel \
     findutils \
@@ -39,11 +41,6 @@ RUN dnf -y install \
     libtool \
     libxslt \
     make \
-    mingw64-gcc \
-    mingw64-gcc-c++ \
-    mingw64-gettext \
-    mingw64-libffi \
-    mingw64-zlib \
     ncurses-compat-libs \
     ninja-build \
     pcre-devel \
@@ -66,8 +63,6 @@ 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.48.0
 
 ARG HOST_USER_ID=5555
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
new file mode 100644
index 000000000..f10ebc071
--- /dev/null
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -0,0 +1,73 @@
+FROM debian:stretch
+
+RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
+    bindfs \
+    clang \
+    clang-tools-4.0 \
+    dbus \
+    desktop-file-utils \
+    elfutils \
+    findutils \
+    fuse \
+    gcc \
+    g++ \
+    gettext \
+    git \
+    libc6-dev \
+    gtk-doc-tools \
+    itstool \
+    lcov \
+    libattr1-dev \
+    libelf-dev \
+    libffi-dev \
+    libgamin-dev \
+    libmount-dev \
+    libpcre2-dev \
+    libselinux1-dev \
+    libxml2-utils \
+    libxslt1-dev \
+    libz3-dev \
+    locales \
+    ninja-build \
+    python3 \
+    python3-pip \
+    python3-setuptools \
+    python3-wheel \
+    shared-mime-info \
+    systemtap-sdt-dev \
+    unzip \
+    wget \
+    xsltproc \
+    xz-utils \
+    zlib1g-dev \
+ && rm -rf /usr/share/doc/* /usr/share/man/*
+
+# Locale for our build
+RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8
+
+# Locales for our tests
+RUN locale-gen de_DE.UTF-8 \
+ && locale-gen el_GR.UTF-8 \
+ && locale-gen en_US.UTF-8 \
+ && locale-gen es_ES.UTF-8 \
+ && locale-gen fa_IR.UTF-8 \
+ && locale-gen fr_FR.UTF-8 \
+ && locale-gen hr_HR.UTF-8 \
+ && locale-gen ja_JP.UTF-8 \
+ && locale-gen lt_LT.UTF-8 \
+ && locale-gen pl_PL.UTF-8 \
+ && locale-gen ru_RU.UTF-8 \
+ && locale-gen tr_TR.UTF-8
+
+ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
+
+RUN pip3 install meson==0.48.0
+
+ARG HOST_USER_ID=5555
+ENV HOST_USER_ID ${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
new file mode 100644
index 000000000..debec6812
--- /dev/null
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -0,0 +1,64 @@
+FROM fedora:29
+
+RUN dnf -y install \
+    bindfs \
+    clang \
+    clang-analyzer \
+    dbus-daemon \
+    desktop-file-utils \
+    elfutils-libelf-devel \
+    findutils \
+    fuse \
+    gamin-devel \
+    gcc \
+    gcc-c++ \
+    gettext \
+    git \
+    glibc-devel \
+    glibc-headers \
+    glibc-langpack-de \
+    glibc-langpack-el \
+    glibc-langpack-el \
+    glibc-langpack-en \
+    glibc-langpack-es \
+    glibc-langpack-es \
+    glibc-langpack-fa \
+    glibc-langpack-fr \
+    glibc-langpack-hr \
+    glibc-langpack-ja \
+    glibc-langpack-lt \
+    glibc-langpack-pl \
+    glibc-langpack-ru \
+    glibc-langpack-tr \
+    gtk-doc \
+    itstool \
+    lcov \
+    libattr-devel \
+    libffi-devel \
+    libmount-devel \
+    libselinux-devel \
+    libxslt \
+    ncurses-compat-libs \
+    ninja-build \
+    pcre-devel \
+    python3 \
+    python3-pip \
+    python3-wheel \
+    shared-mime-info \
+    systemtap-sdt-devel \
+    unzip \
+    wget \
+    xz \
+    zlib-devel \
+ && dnf clean all
+
+RUN pip3 install meson==0.48.0
+
+ARG HOST_USER_ID=5555
+ENV HOST_USER_ID ${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG C.UTF-8
diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py
index ea4928248..09b89a499 100755
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -1,5 +1,13 @@
 #!/usr/bin/env python3
 
+# Turns a Meson testlog.json file into a JUnit XML report
+#
+# Copyright 2019  GNOME Foundation
+#
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# Original author: Emmanuele Bassi
+
 import argparse
 import datetime
 import json
@@ -33,7 +41,7 @@ outfile = args.output
 testsuites = ET.Element('testsuites')
 testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
 testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
+testsuites.set('timestamp', datetime.datetime.utcnow().isoformat())
 
 suites = {}
 for line in args.infile:
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
new file mode 100644
index 000000000..6bc5c5dd0
--- /dev/null
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -0,0 +1,70 @@
+FROM fedora:29
+
+RUN dnf -y install \
+    bindfs \
+    clang \
+    clang-analyzer \
+    desktop-file-utils \
+    elfutils-libelf-devel \
+    findutils \
+    fuse \
+    gamin-devel \
+    gcc \
+    gcc-c++ \
+    gettext \
+    git \
+    glibc-devel \
+    glibc-headers \
+    glibc-langpack-de \
+    glibc-langpack-el \
+    glibc-langpack-el \
+    glibc-langpack-en \
+    glibc-langpack-es \
+    glibc-langpack-es \
+    glibc-langpack-fa \
+    glibc-langpack-fr \
+    glibc-langpack-hr \
+    glibc-langpack-ja \
+    glibc-langpack-lt \
+    glibc-langpack-pl \
+    glibc-langpack-ru \
+    glibc-langpack-tr \
+    gtk-doc \
+    itstool \
+    lcov \
+    libattr-devel \
+    libffi-devel \
+    libmount-devel \
+    libselinux-devel \
+    libxslt \
+    mingw64-gcc \
+    mingw64-gcc-c++ \
+    mingw64-gettext \
+    mingw64-libffi \
+    mingw64-zlib \
+    ncurses-compat-libs \
+    ninja-build \
+    pcre-devel \
+    python3 \
+    python3-pip \
+    python3-wheel \
+    systemtap-sdt-devel \
+    unzip \
+    wget \
+    xz \
+    zlib-devel \
+ && dnf clean all
+
+WORKDIR /opt
+COPY cross_file_mingw64.txt /opt
+
+RUN pip3 install meson==0.48.0
+
+ARG HOST_USER_ID=5555
+ENV HOST_USER_ID ${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG C.UTF-8
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index b7f1a9a0d..2f2693bc7 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -1,18 +1,120 @@
 #!/bin/bash
 
+read_arg() {
+    # $1 = arg name
+    # $2 = arg value
+    # $3 = arg parameter
+    local rematch='^[^=]*=(.*)$'
+    if [[ $2 =~ $rematch ]]; then
+        read "$1" <<< "${BASH_REMATCH[1]}"
+    else
+        read "$1" <<< "$3"
+        # There is no way to shift our callers args, so
+        # return 1 to indicate they should do it instead.
+        return 1
+    fi
+}
+
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/glib/master:v11"
+build=0
+run=0
+push=0
+list=0
+print_help=0
+no_login=0
+
+while (($# > 0)); do
+        case "${1%%=*}" in
+                build) build=1;;
+                run) run=1;;
+                push) push=1;;
+                list) list=1;;
+                help) print_help=1;;
+                --base|-b) read_arg base "$@" || shift;;
+                --base-version) read_arg base_version "$@" || shift;;
+                --no-login) no_login=1;;
+                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
+        esac
+        shift
+done
+
+if [ $print_help == 1 ]; then
+        echo "$0 - Build and run Docker images"
+        echo ""
+        echo "Usage: $0 <command> [options] [basename]"
+        echo ""
+        echo "Available commands"
+        echo ""
+        echo "  build --base=<BASENAME> - Build Docker image <BASENAME>.Dockerfile"
+        echo "  run --base=<BASENAME>   - Run Docker image <BASENAME>"
+        echo "  push --base=<BASENAME>  - Push Docker image <BASENAME> to the registry"
+        echo "  list                    - List available images"
+        echo "  help                    - This help message"
+        echo ""
+        exit 0
+fi
 
 cd "$(dirname "$0")"
-docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
-    --file "Dockerfile" .
 
-if [ "$1" = "--push" ]; then
-  docker login registry.gitlab.gnome.org
-  docker push $TAG
+if [ $list == 1 ]; then
+        echo "Available Docker images:"
+        for f in *.Dockerfile; do
+                filename=$( basename -- "$f" )
+                basename="${filename%.*}"
+
+                echo -e "  \e[1;39m$basename\e[0m"
+        done
+        exit 0
+fi
+
+# All commands after this require --base to be set
+if [ -z $base ]; then
+        echo "Usage: $0 <command>"
+        exit 1
+fi
+
+if [ ! -f "$base.Dockerfile" ]; then
+        echo -e "\e[1;31mERROR\e[0m: Dockerfile for '$base' not found"
+        exit 1
+fi
+
+if [ -z $base_version ]; then
+        base_version="latest"
 else
-  docker run --rm \
-      --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-      --tty --interactive "${TAG}" bash
+        base_version="v$base_version"
+fi
+
+TAG="registry.gitlab.gnome.org/gnome/glib/${base}:${base_version}"
+
+if [ $build == 1 ]; then
+        echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
+        sudo docker build \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
+        exit $?
+fi
+
+if [ $push == 1 ]; then
+        echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}"
+
+        if [ $no_login == 0 ]; then
+                sudo docker login registry.gitlab.gnome.org
+        fi
+
+        sudo docker push $TAG
+        exit $?
+fi
+
+if [ $run == 1 ]; then
+        echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
+        sudo docker run \
+                --rm \
+                --volume "$(pwd)/..:/home/user/app" \
+                --workdir "/home/user/app" \
+                --tty \
+                --interactive "${TAG}" \
+                bash
+        exit $?
 fi
diff --git a/NEWS b/NEWS
index 923177660..d16ff8006 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,109 @@
+Overview of changes in GLib 2.61.1
+==================================
+
+* `g_unichar_isxdigit()` and `g_unichar_xdigit_value()` now handle full-width
+  characters (U+FF21–U+FF26 and U+FF41–U+FF46) (#58)
+
+* Deprecate `gtester` utility and its test reporting format and enable TAP
+  output by default instead — the `--tap` option to tests is now a no-op
+  (#1441, #1619)
+
+* Add `g_test_summary()` to allow test authors to programmatically summarise
+  what each unit test in a test suite does (#1450)
+
+* Upgrade to Unicode Character Database v12.1 (#1713, !822)
+
+* More IPv6 Happy Eyeballs fixes to `GNetworkAddress` and `GSocketClient`
+  (#1747, #1771, #1774)
+
+* Fix valgrind and gdb support for the new `GHashTable` changes (#1749, #1780)
+
+* Fix GTask wait times growing faster than the number of task threads (#1683)
+
+* Change `GApplication` to ignore `-psn_*` arguments on the macOS command line,
+  as they are irrelevant (#1784)
+
+* Add `g_autoqueue()` helper macros, similar to `g_autolist()` (!474)
+
+* Add pre-allocated link helpers for `GList` and `GQueue`:
+ - `g_list_insert_before_link()`
+ - `g_queue_insert_before_link()`
+ - `g_queue_insert_after_link()`
+
+* Improve network availability detection with NetworkManager to treat lower
+  levels of connectivity as having reduced availability (!781)
+
+* Add `g_clear_signal_handler()` to allow disconnecting from a `GObject` signal
+  and clearing the signal handler ID to zero in a single call (!819)
+
+* Add `g_autoptr()` support for `GRWLock` (!825)
+
+* Define `G_OS_UNIX`, not `G_OS_WIN32`, when GLib is built agains Cygwin (!862)
+
+* Bugs fixed:
+ - #29 GScanner: should explicitly document modifiable fields (value, next_value, ...)
+ - #58 g_unichar_isxdigit() and g_unichar_xdigit_value() should deal with full-width a-fA-F
+ - #106 Boxed types should be documented better
+ - #135 g_unichar_totitle(0) returns 0x00001F88 instead of 0
+ - #429 g_format_size() is broken on Windows
+ - #1441 Deprecate gtester
+ - #1450 Add API for tests to describe what they're checking
+ - #1619 GTest should have a way to default to TAP
+ - #1683 GTask: task_wait_time is increased constantly when the number of running thread is greather than 10
+ - #1713 Upgrade to Unicode Character Database v12
+ - #1739 meson build failure libdl
+ - #1747 Critical in g_socket_client_async_connect_complete
+ - #1749 New GHashTable implementation confuses valgrind
+ - #1753 Remove memory leaks from gio/test/resolver.c
+ - #1755 Please revert #535 gmacros: Try to use the standard __func__ first in G_STRFUNC
+ - #1759 test_month_names: assertion failed
+ - #1760 Document for g_resolver_lookup_records why it returns a list of list of gchar*.
+ - #1763 tests: -p runs tests in the reverse of the specified order
+ - #1768 g_strlcat(): Possible buffer overflow in implementation
+ - #1771 GNetworkAddressAddressEnumerator unsafely modifies cache in GNetworkAddress
+ - #1774 Leaks in gsocketclient.c connection code
+ - #1776 glib/date test fails
+ - #1780 GDB pretty-printer for GHashTable no longer works
+ - #1782 Error in documentation for cross-compile.
+ - #1784 MacOS adds a -psn_X_XXXXXX parameter to the command line
+ - !474 Add g_autoqueue
+ - !476 Add pre-allocated link helpers for GList and GQueue
+ - !556 gtestutils: Make --tap compatible with -p and --GTestSkipCount
+ - !732 gsocket: Clarify in docs that `flags` arguments can be platform specific
+ - !766 W32: swap special g_get_prgname() for platform_get_argv0()
+ - !774 Only build tests if certain conditions are met.
+ - !780 Add copyright and licensing terms to test report generator
+ - !781 gnetworkmonitornm: Fix network available detection
+ - !782 build: Fix check for RTLD_NEXT
+ - !785 Remove monitor test
+ - !787 build: Remove */.gitignore files
+ - !791 glib/gconstructor.h: Include stdlib.h for MSVC builds
+ - !792 general: Remove a few unhelpful references to ‘master’
+ - !795 gdesktopappinfo: Add support for MATE and Xfce4 terminals
+ - !802 gio: tests, don't check for libdl on OpenBSD
+ - !806 Get to 100% coverage on GQueue tests
+ - !808 Update the Docker images used for CI
+ - !809 Modified version of !784 — Adding tests cases for a better coverage of glib/tests/strfuncs.c
+ - !813 gappinfo: Add precondition checks to GAppLaunchContext env methods
+ - !814 gschema.dtd: Add target attribute to alias
+ - !819 Clear signal handler
+ - !820 ci: Keep JUnit report script working on Debian stable
+ - !821 Various minor cleanups to autoptrs
+ - !822 glib: Update Unicode Character Database to version 12.1.0
+ - !825 Add autoptr support for GRWLock
+ - !831 build: (Long time after) post-release version bump
+ - !835 Fix typo in German translation
+ - !836 Document the best practices for binding GInitiallyUnowned
+ - !862 build: define G_OS_UNIX, not G_OS_WIN32 under cygwin
+
+* Translation updates:
+ - Basque
+ - Catalan
+ - German
+ - Indonesian
+ - Spanish
+
+
 Overview of changes in GLib 2.61.0
 ==================================
 
diff --git a/docs/reference/glib/cross.xml b/docs/reference/glib/cross.xml
index aba4c75ef..50e7ba675 100644
--- a/docs/reference/glib/cross.xml
+++ b/docs/reference/glib/cross.xml
@@ -67,7 +67,7 @@ windres = 'x86_64-w64-mingw32-windres'
         Then execute the following commands:
       </para>
       <programlisting>
-meson --cross_file cross_file.txt builddir
+meson --cross-file cross_file.txt builddir
       </programlisting>
       <para>
         The complete list of cross properties follows. Most
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index 6d5c2ad4f..fa43eaff7 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -136,6 +136,10 @@
   <chapter id="tools">
     <title>GLib Tools</title>
     <xi:include href="glib-gettextize.xml" />
+  </chapter>
+
+  <chapter id="deprecated-tools">
+    <title>Deprecated Tools</title>
     <xi:include href="gtester.xml" />
     <xi:include href="gtester-report.xml" />
   </chapter>
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index d847d21e1..0f5d88142 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -419,6 +419,7 @@ g_autoptr
 g_autofree
 g_autolist
 g_autoslist
+g_autoqueue
 G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC
 G_DEFINE_AUTO_CLEANUP_FREE_FUNC
@@ -743,6 +744,16 @@ g_rec_mutex_locker_new
 g_rec_mutex_locker_free
 
 <SUBSECTION>
+GRWLockWriterLocker
+g_rw_lock_writer_locker_new
+g_rw_lock_writer_locker_free
+
+<SUBSECTION>
+GRWLockReaderLocker
+g_rw_lock_reader_locker_new
+g_rw_lock_reader_locker_free
+
+<SUBSECTION>
 GRWLock
 g_rw_lock_init
 g_rw_lock_clear
@@ -2268,6 +2279,7 @@ g_list_append
 g_list_prepend
 g_list_insert
 g_list_insert_before
+g_list_insert_before_link
 g_list_insert_sorted
 g_list_remove
 g_list_remove_link
@@ -2389,7 +2401,9 @@ g_queue_index
 g_queue_remove
 g_queue_remove_all
 g_queue_insert_before
+g_queue_insert_before_link
 g_queue_insert_after
+g_queue_insert_after_link
 g_queue_insert_sorted
 g_queue_push_head_link
 g_queue_push_tail_link
@@ -3148,6 +3162,7 @@ g_test_failed
 g_test_message
 g_test_bug_base
 g_test_bug
+g_test_summary
 GTestLogFatalFunc
 g_test_log_set_fatal_handler
 
diff --git a/docs/reference/glib/gtester-report.xml b/docs/reference/glib/gtester-report.xml
index 4fd0685c0..eee933784 100644
--- a/docs/reference/glib/gtester-report.xml
+++ b/docs/reference/glib/gtester-report.xml
@@ -35,6 +35,9 @@
 <para><command>gtester-report</command> is a script which converts
 the XML output generated by gtester into HTML.
 </para>
+<para>Since GLib 2.62, <command>gtester-report</command> is deprecated. Use
+TAP for reporting test results instead, and feed it to the test harness provided
+by your build system.</para>
 </refsect1>
 
 <refsect1><title>Options</title>
diff --git a/docs/reference/glib/gtester.xml b/docs/reference/glib/gtester.xml
index b1c126bd9..5626d4df8 100644
--- a/docs/reference/glib/gtester.xml
+++ b/docs/reference/glib/gtester.xml
@@ -40,6 +40,9 @@
 <para><command>gtester</command> is a utility to run unit tests that have
 been written using the GLib test framework.
 </para>
+<para>Since GLib 2.62, <command>gtester-report</command> is deprecated. Use
+TAP for reporting test results instead, and feed it to the test harness provided
+by your build system.</para>
 <para>
 When called with the <option>-o</option> option, <command>gtester</command>
 writes an XML report of the test results, which can be converted
diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt
index d1fc4bdc1..2247888d1 100644
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@ -861,6 +861,7 @@ g_signal_get_invocation_hint
 g_signal_type_cclosure_new
 g_signal_accumulator_first_wins
 g_signal_accumulator_true_handled
+g_clear_signal_handler
 <SUBSECTION Private>
 g_signal_handlers_destroy
 </SECTION>
diff --git a/docs/reference/gobject/tut_tools.xml b/docs/reference/gobject/tut_tools.xml
index 000366f19..f1076e832 100644
--- a/docs/reference/gobject/tut_tools.xml
+++ b/docs/reference/gobject/tut_tools.xml
@@ -94,7 +94,7 @@ break g_object_unref if _object == 0xcafebabe
     libraries is built with a combination of complex tools. Typically, the part of 
     the documentation which describes the behavior of each function is extracted
     from the specially-formatted source code comments by a tool named gtk-doc which
-    generates DocBook XML and merges this DocBook XML with a set of master XML 
+    generates DocBook XML and merges this DocBook XML with a set of template XML
     DocBook files. These XML DocBook files are finally processed with xsltproc
     (a small program part of the libxslt library) to generate the final HTML
     output. Other tools can be used to generate PDF output from the source XML.
diff --git a/gio/.gitignore b/gio/.gitignore
deleted file mode 100644
index e88411eff..000000000
--- a/gio/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-gapplication
-gconstructor_as_data.h
-gdbus
-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml
-objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml
-objectmanager-gen.[ch]
-gdbus-daemon-generated.[ch]
-gio
-gio_probes.h
-gio-marshal.[ch]
-gio-public-headers.txt
-gio-querymodules
-gioenumtypes.[ch]
-glib-compile-resources
-glib-compile-schemas
-gnetworking.h
-gresource
-gschema-compile
-gsettings
-xdp-dbus.[ch]
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 1fd0a7ad7..b2135e644 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -1204,6 +1204,10 @@ g_app_launch_context_setenv (GAppLaunchContext *context,
                              const char        *variable,
                              const char        *value)
 {
+  g_return_if_fail (G_IS_APP_LAUNCH_CONTEXT (context));
+  g_return_if_fail (variable != NULL);
+  g_return_if_fail (value != NULL);
+
   if (!context->priv->envp)
     context->priv->envp = g_get_environ ();
 
@@ -1225,6 +1229,9 @@ void
 g_app_launch_context_unsetenv (GAppLaunchContext *context,
                                const char        *variable)
 {
+  g_return_if_fail (G_IS_APP_LAUNCH_CONTEXT (context));
+  g_return_if_fail (variable != NULL);
+
   if (!context->priv->envp)
     context->priv->envp = g_get_environ ();
 
@@ -1249,6 +1256,8 @@ g_app_launch_context_unsetenv (GAppLaunchContext *context,
 char **
 g_app_launch_context_get_environment (GAppLaunchContext *context)
 {
+  g_return_val_if_fail (G_IS_APP_LAUNCH_CONTEXT (context), NULL);
+
   if (!context->priv->envp)
     context->priv->envp = g_get_environ ();
 
diff --git a/gio/gapplication.c b/gio/gapplication.c
index 2d2ab48e3..b154cbe6a 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2458,6 +2458,28 @@ g_application_run (GApplication  *application,
                  sizeof (arguments[0]) * (argc + 1));
       }
   }
+#elif defined(__APPLE__)
+  {
+    gint i, j;
+
+    /*
+     * OSX adds an unexpected parameter on the format -psn_X_XXXXXX
+     * when opening the application using Launch Services. In order
+     * to avoid that GOption fails to parse this parameter we just
+     * skip it if it was provided.
+     * See: https://gitlab.gnome.org/GNOME/glib/issues/1784
+     */
+    arguments = g_new (gchar *, argc + 1);
+    for (i = 0, j = 0; i < argc; i++)
+      {
+        if (!g_str_has_prefix (argv[i], "-psn_"))
+          {
+            arguments[j] = g_strdup (argv[i]);
+            j++;
+          }
+      }
+    arguments[j] = NULL;
+  }
 #else
   {
     gint i;
diff --git a/gio/gcocoanotificationbackend.m b/gio/gcocoanotificationbackend.m
index 9d632b4a5..42cf8abcf 100644
--- a/gio/gcocoanotificationbackend.m
+++ b/gio/gcocoanotificationbackend.m
@@ -258,7 +258,6 @@ g_cocoa_notification_backend_withdraw_notification (GNotificationBackend *backen
         }
     }
 
-  [notifications release];
   [str_id release];
 }
 
diff --git a/gio/gdbusobjectmanager.c b/gio/gdbusobjectmanager.c
index 0eaec3f8c..3ef622a33 100644
--- a/gio/gdbusobjectmanager.c
+++ b/gio/gdbusobjectmanager.c
@@ -188,7 +188,7 @@ g_dbus_object_manager_get_objects (GDBusObjectManager *manager)
 /**
  * g_dbus_object_manager_get_object:
  * @manager: A #GDBusObjectManager.
- * @object_path: Object path to lookup.
+ * @object_path: Object path to look up.
  *
  * Gets the #GDBusObjectProxy at @object_path, if any.
  *
@@ -209,8 +209,8 @@ g_dbus_object_manager_get_object (GDBusObjectManager *manager,
 /**
  * g_dbus_object_manager_get_interface:
  * @manager: A #GDBusObjectManager.
- * @object_path: Object path to lookup.
- * @interface_name: D-Bus interface name to lookup.
+ * @object_path: Object path to look up.
+ * @interface_name: D-Bus interface name to look up.
  *
  * Gets the interface proxy for @interface_name at @object_path, if
  * any.
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 07757f40f..026d4ee6b 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -608,8 +608,7 @@ g_dbus_server_stop (GDBusServer *server)
   /* Right now we don't have any transport not using the listener... */
   g_assert (server->is_using_listener);
   g_assert (server->run_signal_handler_id > 0);
-  g_signal_handler_disconnect (server->listener, server->run_signal_handler_id);
-  server->run_signal_handler_id = 0;
+  g_clear_signal_handler (&server->run_signal_handler_id, server->listener);
   g_socket_service_stop (G_SOCKET_SERVICE (server->listener));
   server->active = FALSE;
   g_object_notify (G_OBJECT (server), "active");
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 238141158..77e385aa5 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2514,6 +2514,10 @@ prepend_terminal_to_vector (int    *argc,
   term_argv = g_new0 (char *, 3);
 
   check = g_find_program_in_path ("gnome-terminal");
+  if (check == NULL)
+    check = g_find_program_in_path ("mate-terminal");
+  if (check == NULL)
+    check = g_find_program_in_path ("xfce4-terminal");
   if (check != NULL)
     {
       term_argv[0] = check;
diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c
index c3a8ebf4b..0e4bfc28f 100644
--- a/gio/gfileattribute.c
+++ b/gio/gfileattribute.c
@@ -917,7 +917,7 @@ g_file_attribute_info_list_bsearch (GFileAttributeInfoList *list,
 /**
  * g_file_attribute_info_list_lookup:
  * @list: a #GFileAttributeInfoList.
- * @name: the name of the attribute to lookup.
+ * @name: the name of the attribute to look up.
  *
  * Gets the file attribute with the name @name from @list.
  *
diff --git a/gio/gioenums.h b/gio/gioenums.h
index 2fc69b6be..d3ada454a 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -715,11 +715,11 @@ typedef enum {
 
 /**
  * GResolverRecordType:
- * @G_RESOLVER_RECORD_SRV: lookup DNS SRV records for a domain
- * @G_RESOLVER_RECORD_MX: lookup DNS MX records for a domain
- * @G_RESOLVER_RECORD_TXT: lookup DNS TXT records for a name
- * @G_RESOLVER_RECORD_SOA: lookup DNS SOA records for a zone
- * @G_RESOLVER_RECORD_NS: lookup DNS NS records for a domain
+ * @G_RESOLVER_RECORD_SRV: look up DNS SRV records for a domain
+ * @G_RESOLVER_RECORD_MX: look up DNS MX records for a domain
+ * @G_RESOLVER_RECORD_TXT: look up DNS TXT records for a name
+ * @G_RESOLVER_RECORD_SOA: look up DNS SOA records for a zone
+ * @G_RESOLVER_RECORD_NS: look up DNS NS records for a domain
  *
  * The type of record that g_resolver_lookup_records() or
  * g_resolver_lookup_records_async() should retrieve. The records are returned
@@ -727,24 +727,30 @@ typedef enum {
  * the variant tuples returned.
  *
  * %G_RESOLVER_RECORD_SRV records are returned as variants with the signature
- * '(qqqs)', containing a guint16 with the priority, a guint16 with the
- * weight, a guint16 with the port, and a string of the hostname.
+ * `(qqqs)`, containing a `guint16` with the priority, a `guint16` with the
+ * weight, a `guint16` with the port, and a string of the hostname.
  *
  * %G_RESOLVER_RECORD_MX records are returned as variants with the signature
- * '(qs)', representing a guint16 with the preference, and a string containing
+ * `(qs)`, representing a `guint16` with the preference, and a string containing
  * the mail exchanger hostname.
  *
  * %G_RESOLVER_RECORD_TXT records are returned as variants with the signature
- * '(as)', representing an array of the strings in the text record.
+ * `(as)`, representing an array of the strings in the text record. Note: Most TXT
+ * records only contain a single string, but
+ * [RFC 1035](https://tools.ietf.org/html/rfc1035#section-3.3.14) does allow a
+ * record to contain multiple strings. The RFC which defines the interpretation
+ * of a specific TXT record will likely require concatenation of multiple
+ * strings if they are present, as with
+ * [RFC 7208](https://tools.ietf.org/html/rfc7208#section-3.3).
  *
  * %G_RESOLVER_RECORD_SOA records are returned as variants with the signature
- * '(ssuuuuu)', representing a string containing the primary name server, a
- * string containing the administrator, the serial as a guint32, the refresh
- * interval as guint32, the retry interval as a guint32, the expire timeout
- * as a guint32, and the ttl as a guint32.
+ * `(ssuuuuu)`, representing a string containing the primary name server, a
+ * string containing the administrator, the serial as a `guint32`, the refresh
+ * interval as a `guint32`, the retry interval as a `guint32`, the expire timeout
+ * as a `guint32`, and the TTL as a `guint32`.
  *
  * %G_RESOLVER_RECORD_NS records are returned as variants with the signature
- * '(s)', representing a string of the hostname of the name server.
+ * `(s)`, representing a string of the hostname of the name server.
  *
  * Since: 2.34
  */
diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c
index df1bc3158..4d8d74bd4 100644
--- a/gio/gnetworkaddress.c
+++ b/gio/gnetworkaddress.c
@@ -52,6 +52,10 @@
  * then attempt to connect to that host, handling the possibility of
  * multiple IP addresses and multiple address families.
  *
+ * The enumeration results of resolved addresses *may* be cached as long
+ * as this object is kept alive which may have unexpected results if
+ * alive for too long.
+ *
  * See #GSocketConnectable for an example of using the connectable
  * interface.
  */
@@ -66,7 +70,7 @@
 struct _GNetworkAddressPrivate {
   gchar *hostname;
   guint16 port;
-  GList *sockaddrs;
+  GList *cached_sockaddrs;
   gchar *scheme;
 
   gint64 resolver_serial;
@@ -105,7 +109,7 @@ g_network_address_finalize (GObject *object)
 
   g_free (addr->priv->hostname);
   g_free (addr->priv->scheme);
-  g_list_free_full (addr->priv->sockaddrs, g_object_unref);
+  g_list_free_full (addr->priv->cached_sockaddrs, g_object_unref);
 
   G_OBJECT_CLASS (g_network_address_parent_class)->finalize (object);
 }
@@ -220,30 +224,51 @@ g_network_address_get_property (GObject    *object,
 
 }
 
-/*
- * g_network_address_add_addresses:
- * @addr: A #GNetworkAddress
- * @addresses: (transfer full): List of #GSocketAddress
- * @resolver_serial: Serial of #GResolver used
+/**
+ * inet_addresses_to_inet_socket_addresses:
+ * @addresses: (transfer full): #GList of #GInetAddress
  *
- * Consumes address list and adds them to internal list.
+ * Returns: (transfer full): #GList of #GInetSocketAddress
  */
-static void
-g_network_address_add_addresses (GNetworkAddress *addr,
-                                 GList           *addresses,
-                                 guint64          resolver_serial)
+static GList *
+inet_addresses_to_inet_socket_addresses (GNetworkAddress *addr,
+                                         GList           *addresses)
 {
-  GList *a;
-  GSocketAddress *sockaddr;
+  GList *a, *socket_addresses = NULL;
 
   for (a = addresses; a; a = a->next)
     {
-      sockaddr = g_inet_socket_address_new (a->data, addr->priv->port);
-      addr->priv->sockaddrs = g_list_append (addr->priv->sockaddrs, sockaddr);
+      GSocketAddress *sockaddr = g_inet_socket_address_new (a->data, addr->priv->port);
+      socket_addresses = g_list_append (socket_addresses, g_steal_pointer (&sockaddr));
       g_object_unref (a->data);
     }
+
   g_list_free (addresses);
+  return socket_addresses;
+}
 
+/*
+ * g_network_address_set_cached_addresses:
+ * @addr: A #GNetworkAddress
+ * @addresses: (transfer full): List of #GInetAddress or #GInetSocketAddress
+ * @resolver_serial: Serial of #GResolver used
+ *
+ * Consumes @addresses and uses them to replace the current internal list.
+ */
+static void
+g_network_address_set_cached_addresses (GNetworkAddress *addr,
+                                        GList           *addresses,
+                                        guint64          resolver_serial)
+{
+  g_assert (addresses != NULL);
+
+  if (addr->priv->cached_sockaddrs)
+    g_list_free_full (addr->priv->cached_sockaddrs, g_object_unref);
+
+  if (G_IS_INET_SOCKET_ADDRESS (addresses->data))
+    addr->priv->cached_sockaddrs = g_steal_pointer (&addresses);
+  else
+    addr->priv->cached_sockaddrs = inet_addresses_to_inet_socket_addresses (addr, g_steal_pointer (&addresses));
   addr->priv->resolver_serial = resolver_serial;
 }
 
@@ -252,11 +277,13 @@ g_network_address_parse_sockaddr (GNetworkAddress *addr)
 {
   GSocketAddress *sockaddr;
 
+  g_assert (addr->priv->cached_sockaddrs == NULL);
+
   sockaddr = g_inet_socket_address_new_from_string (addr->priv->hostname,
                                                     addr->priv->port);
   if (sockaddr)
     {
-      addr->priv->sockaddrs = g_list_append (addr->priv->sockaddrs, sockaddr);
+      addr->priv->cached_sockaddrs = g_list_append (addr->priv->cached_sockaddrs, sockaddr);
       return TRUE;
     }
   else
@@ -325,7 +352,7 @@ g_network_address_new_loopback (guint16 port)
 
   addrs = g_list_append (addrs, g_inet_address_new_loopback (AF_INET6));
   addrs = g_list_append (addrs, g_inet_address_new_loopback (AF_INET));
-  g_network_address_add_addresses (addr, g_steal_pointer (&addrs), 0);
+  g_network_address_set_cached_addresses (addr, g_steal_pointer (&addrs), 0);
 
   return G_SOCKET_CONNECTABLE (addr);
 }
@@ -894,7 +921,6 @@ typedef struct {
 
   GNetworkAddress *addr; /* (owned) */
   GList *addresses; /* (owned) (nullable) */
-  GList *last_tail; /* (unowned) (nullable) */
   GList *current_item; /* (unowned) (nullable) */
   GTask *queued_task; /* (owned) (nullable) */
   GTask *waiting_task; /* (owned) (nullable) */
@@ -927,8 +953,8 @@ g_network_address_address_enumerator_finalize (GObject *object)
   g_clear_object (&addr_enum->waiting_task);
   g_clear_error (&addr_enum->last_error);
   g_object_unref (addr_enum->addr);
-  g_clear_pointer (&addr_enum->addresses, g_list_free);
   g_clear_pointer (&addr_enum->context, g_main_context_unref);
+  g_list_free_full (addr_enum->addresses, g_object_unref);
 
   G_OBJECT_CLASS (_g_network_address_address_enumerator_parent_class)->finalize (object);
 }
@@ -1014,16 +1040,19 @@ list_copy_interleaved (GList *list)
 }
 
 /* list_concat_interleaved:
- * @current_item: (transfer container): Already existing list
- * @new_list: (transfer none): New list to be interleaved and concatenated
+ * @parent_list: (transfer container): Already existing list
+ * @current_item: (transfer container): Item after which to resort
+ * @new_list: (transfer container): New list to be interleaved and concatenated
  *
  * This differs from g_list_concat() + list_copy_interleaved() in that it sorts
- * items in the previous list starting from @current_item.
+ * items in the previous list starting from @current_item and concats the results
+ * to @parent_list.
  *
  * Returns: (transfer container): New start of list
  */
 static GList *
-list_concat_interleaved (GList *current_item,
+list_concat_interleaved (GList *parent_list,
+                         GList *current_item,
                          GList *new_list)
 {
   GList *ipv4 = NULL, *ipv6 = NULL, *interleaved, *trailing = NULL;
@@ -1040,6 +1069,7 @@ list_concat_interleaved (GList *current_item,
 
   list_split_families (trailing, &ipv4, &ipv6);
   list_split_families (new_list, &ipv4, &ipv6);
+  g_list_free (new_list);
 
   if (trailing)
     g_list_free (trailing);
@@ -1049,7 +1079,73 @@ list_concat_interleaved (GList *current_item,
   else
     interleaved = list_interleave_families (ipv4, ipv6);
 
-  return g_list_concat (current_item, interleaved);
+  return g_list_concat (parent_list, interleaved);
+}
+
+static void
+maybe_update_address_cache (GNetworkAddressAddressEnumerator *addr_enum,
+                            GResolver                        *resolver)
+{
+  GList *addresses, *p;
+
+  /* Only cache complete results */
+  if (addr_enum->state & RESOLVE_STATE_WAITING_ON_IPV4 || addr_enum->state & RESOLVE_STATE_WAITING_ON_IPV6)
+    return;
+
+  /* The enumerators list will not necessarily be fully sorted */
+  addresses = list_copy_interleaved (addr_enum->addresses);
+  for (p = addresses; p; p = p->next)
+    g_object_ref (p->data);
+
+  g_network_address_set_cached_addresses (addr_enum->addr, g_steal_pointer (&addresses), g_resolver_get_serial (resolver));
+}
+
+static void
+g_network_address_address_enumerator_add_addresses (GNetworkAddressAddressEnumerator *addr_enum,
+                                                    GList                            *addresses,
+                                                    GResolver                        *resolver)
+{
+  GList *new_addresses = inet_addresses_to_inet_socket_addresses (addr_enum->addr, addresses);
+
+  if (addr_enum->addresses == NULL)
+    addr_enum->addresses = g_steal_pointer (&new_addresses);
+  else
+    addr_enum->addresses = list_concat_interleaved (addr_enum->addresses, addr_enum->current_item, g_steal_pointer (&new_addresses));
+
+  maybe_update_address_cache (addr_enum, resolver);
+}
+
+static gpointer
+copy_object (gconstpointer src,
+             gpointer      user_data)
+{
+  return g_object_ref (G_OBJECT (src));
+}
+
+static GSocketAddress *
+init_and_query_next_address (GNetworkAddressAddressEnumerator *addr_enum)
+{
+  GList *next_item;
+
+  if (addr_enum->addresses == NULL)
+    addr_enum->addresses = g_list_copy_deep (addr_enum->addr->priv->cached_sockaddrs,
+                                             copy_object, NULL);
+
+  /* We always want to look at the next item at call time to get the latest results.
+     That means that sometimes ->next is NULL this call but is valid next call.
+   */
+  if (addr_enum->current_item == NULL)
+    next_item = addr_enum->current_item = addr_enum->addresses;
+  else
+    next_item = g_list_next (addr_enum->current_item);
+
+  if (next_item)
+    {
+      addr_enum->current_item = next_item;
+      return g_object_ref (addr_enum->current_item->data);
+    }
+  else
+    return NULL;
 }
 
 static GSocketAddress *
@@ -1059,7 +1155,6 @@ g_network_address_address_enumerator_next (GSocketAddressEnumerator  *enumerator
 {
   GNetworkAddressAddressEnumerator *addr_enum =
     G_NETWORK_ADDRESS_ADDRESS_ENUMERATOR (enumerator);
-  GSocketAddress *sockaddr;
 
   if (addr_enum->addresses == NULL)
     {
@@ -1071,13 +1166,13 @@ g_network_address_address_enumerator_next (GSocketAddressEnumerator  *enumerator
           addr->priv->resolver_serial != serial)
         {
           /* Resolver has reloaded, discard cached addresses */
-          g_list_free_full (addr->priv->sockaddrs, g_object_unref);
-          addr->priv->sockaddrs = NULL;
+          g_list_free_full (addr->priv->cached_sockaddrs, g_object_unref);
+          addr->priv->cached_sockaddrs = NULL;
         }
 
-      if (!addr->priv->sockaddrs)
+      if (!addr->priv->cached_sockaddrs)
         g_network_address_parse_sockaddr (addr);
-      if (!addr->priv->sockaddrs)
+      if (!addr->priv->cached_sockaddrs)
         {
           GList *addresses;
 
@@ -1090,62 +1185,13 @@ g_network_address_address_enumerator_next (GSocketAddressEnumerator  *enumerator
               return NULL;
             }
 
-          g_network_address_add_addresses (addr, g_steal_pointer (&addresses), serial);
+          g_network_address_set_cached_addresses (addr, g_steal_pointer (&addresses), serial);
         }
 
-      addr_enum->current_item = addr_enum->addresses = list_copy_interleaved (addr->priv->sockaddrs);
-      addr_enum->last_tail = g_list_last (addr->priv->sockaddrs);
       g_object_unref (resolver);
     }
 
-  if (addr_enum->current_item == NULL)
-    return NULL;
-
-  sockaddr = addr_enum->current_item->data;
-  addr_enum->current_item = g_list_next (addr_enum->current_item);
-  return g_object_ref (sockaddr);
-}
-
-/*
- * Each enumeration lazily initializes the internal address list from the
- * master list. It does this since addresses come in asynchronously and
- * they need to be resorted into the list already in use.
- */
-static GSocketAddress *
-init_and_query_next_address (GNetworkAddressAddressEnumerator *addr_enum)
-{
-  GNetworkAddress *addr = addr_enum->addr;
-  GSocketAddress *sockaddr;
-
-  if (addr_enum->addresses == NULL)
-    {
-      addr_enum->current_item = addr_enum->addresses = list_copy_interleaved (addr->priv->sockaddrs);
-      addr_enum->last_tail = g_list_last (addr_enum->addr->priv->sockaddrs);
-      if (addr_enum->current_item)
-        sockaddr = g_object_ref (addr_enum->current_item->data);
-      else
-        sockaddr = NULL;
-    }
-  else
-    {
-      GList *parent_tail = g_list_last (addr_enum->addr->priv->sockaddrs);
-
-      if (addr_enum->last_tail != parent_tail)
-        {
-          addr_enum->current_item = list_concat_interleaved (addr_enum->current_item, g_list_next (addr_enum->last_tail));
-          addr_enum->last_tail = parent_tail;
-        }
-
-      if (addr_enum->current_item->next)
-        {
-          addr_enum->current_item = g_list_next (addr_enum->current_item);
-          sockaddr = g_object_ref (addr_enum->current_item->data);
-        }
-      else
-        sockaddr = NULL;
-    }
-
-  return sockaddr;
+  return init_and_query_next_address (addr_enum);
 }
 
 static void
@@ -1153,12 +1199,13 @@ complete_queued_task (GNetworkAddressAddressEnumerator *addr_enum,
                       GTask                            *task,
                       GError                           *error)
 {
-  GSocketAddress *sockaddr = init_and_query_next_address (addr_enum);
-
   if (error)
     g_task_return_error (task, error);
   else
-    g_task_return_pointer (task, sockaddr, g_object_unref);
+    {
+      GSocketAddress *sockaddr = init_and_query_next_address (addr_enum);
+      g_task_return_pointer (task, g_steal_pointer (&sockaddr), g_object_unref);
+    }
   g_object_unref (task);
 }
 
@@ -1197,13 +1244,7 @@ got_ipv6_addresses (GObject      *source_object,
 
   addresses = g_resolver_lookup_by_name_with_flags_finish (resolver, result, &error);
   if (!error)
-    {
-      /* Regardless of which responds first we add them to the enumerator
-       * which does mean the timing of next_async() will potentially change
-       * the results */
-      g_network_address_add_addresses (addr_enum->addr, g_steal_pointer (&addresses),
-                                       g_resolver_get_serial (resolver));
-    }
+    g_network_address_address_enumerator_add_addresses (addr_enum, g_steal_pointer (&addresses), resolver);
   else
     g_debug ("IPv6 DNS error: %s", error->message);
 
@@ -1264,10 +1305,7 @@ got_ipv4_addresses (GObject      *source_object,
 
   addresses = g_resolver_lookup_by_name_with_flags_finish (resolver, result, &error);
   if (!error)
-    {
-      g_network_address_add_addresses (addr_enum->addr, g_steal_pointer (&addresses),
-                                       g_resolver_get_serial (resolver));
-    }
+    g_network_address_address_enumerator_add_addresses (addr_enum, g_steal_pointer (&addresses), resolver);
   else
     g_debug ("IPv4 DNS error: %s", error->message);
 
@@ -1331,11 +1369,11 @@ g_network_address_address_enumerator_next_async (GSocketAddressEnumerator  *enum
           addr->priv->resolver_serial != serial)
         {
           /* Resolver has reloaded, discard cached addresses */
-          g_list_free_full (addr->priv->sockaddrs, g_object_unref);
-          addr->priv->sockaddrs = NULL;
+          g_list_free_full (addr->priv->cached_sockaddrs, g_object_unref);
+          addr->priv->cached_sockaddrs = NULL;
         }
 
-      if (addr->priv->sockaddrs == NULL)
+      if (addr->priv->cached_sockaddrs == NULL)
         {
           if (g_network_address_parse_sockaddr (addr))
             complete_queued_task (addr_enum, task, NULL);
@@ -1347,7 +1385,7 @@ g_network_address_address_enumerator_next_async (GSocketAddressEnumerator  *enum
 
               addr_enum->state = RESOLVE_STATE_WAITING_ON_IPV4 | RESOLVE_STATE_WAITING_ON_IPV6;
               addr_enum->queued_task = g_steal_pointer (&task);
-              /* Lookup in parallel as per RFC 8305 */
+              /* Look up in parallel as per RFC 8305 */
               g_resolver_lookup_by_name_with_flags_async (resolver,
                                                           addr->priv->hostname,
                                                           G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY,
diff --git a/gio/gnetworkmonitornm.c b/gio/gnetworkmonitornm.c
index 4e2a35e8a..7bb480f54 100644
--- a/gio/gnetworkmonitornm.c
+++ b/gio/gnetworkmonitornm.c
@@ -52,6 +52,19 @@ typedef enum {
   NM_CONNECTIVITY_FULL
 } NMConnectivityState;
 
+/* Copied from https://developer.gnome.org/libnm-util/stable/libnm-util-NetworkManager.html#NMState;
+ * used inline to avoid a NetworkManager dependency from GLib. */
+typedef enum {
+  NM_STATE_UNKNOWN          = 0,
+  NM_STATE_ASLEEP           = 10,
+  NM_STATE_DISCONNECTED     = 20,
+  NM_STATE_DISCONNECTING    = 30,
+  NM_STATE_CONNECTING       = 40,
+  NM_STATE_CONNECTED_LOCAL  = 50,
+  NM_STATE_CONNECTED_SITE   = 60,
+  NM_STATE_CONNECTED_GLOBAL = 70,
+} NMState;
+
 struct _GNetworkMonitorNMPrivate
 {
   GDBusProxy *proxy;
@@ -155,11 +168,19 @@ sync_properties (GNetworkMonitorNM *nm,
                  gboolean           emit_signals)
 {
   GVariant *v;
+  NMState nm_state;
   NMConnectivityState nm_connectivity;
   gboolean new_network_available;
   gboolean new_network_metered;
   GNetworkConnectivity new_connectivity;
 
+  v = g_dbus_proxy_get_cached_property (nm->priv->proxy, "State");
+  if (!v)
+    return;
+
+  nm_state = g_variant_get_uint32 (v);
+  g_variant_unref (v);
+
   v = g_dbus_proxy_get_cached_property (nm->priv->proxy, "Connectivity");
   if (!v)
     return;
@@ -167,14 +188,26 @@ sync_properties (GNetworkMonitorNM *nm,
   nm_connectivity = g_variant_get_uint32 (v);
   g_variant_unref (v);
 
-  if (nm_connectivity == NM_CONNECTIVITY_UNKNOWN ||
-      nm_connectivity == NM_CONNECTIVITY_NONE)
+  if (nm_state <= NM_STATE_CONNECTED_LOCAL)
     {
       new_network_available = FALSE;
       new_network_metered = FALSE;
       new_connectivity = G_NETWORK_CONNECTIVITY_LOCAL;
     }
-  else
+  else if (nm_state <= NM_STATE_CONNECTED_SITE)
+    {
+      new_network_available = FALSE;
+      new_network_metered = FALSE;
+      if (nm_connectivity == NM_CONNECTIVITY_PORTAL)
+        {
+          new_connectivity = G_NETWORK_CONNECTIVITY_PORTAL;
+        }
+      else
+        {
+          new_connectivity = G_NETWORK_CONNECTIVITY_LIMITED;
+        }
+    }
+  else /* nm_state == NM_STATE_CONNECTED_FULL */
     {
 
       /* this is only available post NM 1.0 */
diff --git a/gio/gproxy.c b/gio/gproxy.c
index b7e322101..60bb5b8e5 100644
--- a/gio/gproxy.c
+++ b/gio/gproxy.c
@@ -52,8 +52,8 @@ g_proxy_default_init (GProxyInterface *iface)
  * g_proxy_get_default_for_protocol:
  * @protocol: the proxy protocol name (e.g. http, socks, etc)
  *
- * Lookup "gio-proxy" extension point for a proxy implementation that supports
- * specified protocol.
+ * Find the `gio-proxy` extension point for a proxy implementation that supports
+ * the specified protocol.
  *
  * Returns: (transfer full): return a #GProxy or NULL if protocol
  *               is not supported.
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 7f064322b..3e61ccaff 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -1041,8 +1041,8 @@ g_resolver_free_targets (GList *targets)
 /**
  * g_resolver_lookup_records:
  * @resolver: a #GResolver
- * @rrname: the DNS name to lookup the record for
- * @record_type: the type of DNS record to lookup
+ * @rrname: the DNS name to look up the record for
+ * @record_type: the type of DNS record to look up
  * @cancellable: (nullable): a #GCancellable, or %NULL
  * @error: return location for a #GError, or %NULL
  *
@@ -1086,8 +1086,8 @@ g_resolver_lookup_records (GResolver            *resolver,
 /**
  * g_resolver_lookup_records_async:
  * @resolver: a #GResolver
- * @rrname: the DNS name to lookup the record for
- * @record_type: the type of DNS record to lookup
+ * @rrname: the DNS name to look up the record for
+ * @record_type: the type of DNS record to look up
  * @cancellable: (nullable): a #GCancellable, or %NULL
  * @callback: (scope async): callback to call after resolution completes
  * @user_data: (closure): data for @callback
diff --git a/gio/gschema.dtd b/gio/gschema.dtd
index 1599f8de7..3a903e7ab 100644
--- a/gio/gschema.dtd
+++ b/gio/gschema.dtd
@@ -62,7 +62,8 @@
 <!ELEMENT aliases (alias+) >
 <!-- each alias element specifies an alias for one of the possible values -->
 <!ELEMENT alias EMPTY >
-<!ATTLIST alias value CDATA #REQUIRED >
+<!ATTLIST alias value  CDATA #REQUIRED
+                target CDATA #REQUIRED >
 
 <!ELEMENT child EMPTY >
 <!ATTLIST child name   CDATA #REQUIRED
diff --git a/gio/gsettings-mapping.c b/gio/gsettings-mapping.c
index bba8a8f7c..8c64b02a5 100644
--- a/gio/gsettings-mapping.c
+++ b/gio/gsettings-mapping.c
@@ -498,7 +498,7 @@ g_settings_get_mapping (GValue   *value,
              return TRUE;
             }
 
-          g_warning ("Unable to lookup enum nick '%s' via GType", nick);
+          g_warning ("Unable to look up enum nick ‘%s’ via GType", nick);
           return FALSE;
         }
     }
diff --git a/gio/gsocket.c b/gio/gsocket.c
index d4372c544..06514d102 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -4540,7 +4540,8 @@ input_message_from_msghdr (const struct msghdr  *msg,
  * @messages: (array length=num_messages) (nullable): a pointer to an
  *   array of #GSocketControlMessages, or %NULL.
  * @num_messages: number of elements in @messages, or -1.
- * @flags: an int containing #GSocketMsgFlags flags
+ * @flags: an int containing #GSocketMsgFlags flags, which may additionally
+ *    contain [other platform specific flags](http://man7.org/linux/man-pages/man2/recv.2.html)
  * @cancellable: (nullable): a %GCancellable or %NULL
  * @error: #GError for error reporting, or %NULL to ignore.
  *
@@ -4629,7 +4630,8 @@ g_socket_send_message (GSocket                *socket,
  * @messages: (array length=num_messages) (nullable): a pointer to an
  *   array of #GSocketControlMessages, or %NULL.
  * @num_messages: number of elements in @messages, or -1.
- * @flags: an int containing #GSocketMsgFlags flags
+ * @flags: an int containing #GSocketMsgFlags flags, which may additionally
+ *    contain [other platform specific flags](http://man7.org/linux/man-pages/man2/recv.2.html)
  * @timeout_us: the maximum time (in microseconds) to wait, or -1
  * @bytes_written: (out) (optional): location to store the number of bytes that were written to the socket
  * @cancellable: (nullable): a %GCancellable or %NULL
@@ -4862,7 +4864,8 @@ g_socket_send_message_with_timeout (GSocket                *socket,
  * @socket: a #GSocket
  * @messages: (array length=num_messages): an array of #GOutputMessage structs
  * @num_messages: the number of elements in @messages
- * @flags: an int containing #GSocketMsgFlags flags
+ * @flags: an int containing #GSocketMsgFlags flags, which may additionally
+ *    contain [other platform specific flags](http://man7.org/linux/man-pages/man2/recv.2.html)
  * @cancellable: (nullable): a %GCancellable or %NULL
  * @error: #GError for error reporting, or %NULL to ignore.
  *
@@ -5362,7 +5365,9 @@ g_socket_receive_message_with_timeout (GSocket                 *socket,
  * @socket: a #GSocket
  * @messages: (array length=num_messages): an array of #GInputMessage structs
  * @num_messages: the number of elements in @messages
- * @flags: an int containing #GSocketMsgFlags flags for the overall operation
+ * @flags: an int containing #GSocketMsgFlags flags for the overall operation,
+ *    which may additionally contain
+ *    [other platform specific flags](http://man7.org/linux/man-pages/man2/recv.2.html)
  * @cancellable: (nullable): a %GCancellable or %NULL
  * @error: #GError for error reporting, or %NULL to ignore
  *
@@ -5648,7 +5653,9 @@ g_socket_receive_messages_with_timeout (GSocket        *socket,
  *    which may be filled with an array of #GSocketControlMessages, or %NULL
  * @num_messages: (out): a pointer which will be filled with the number of
  *    elements in @messages, or %NULL
- * @flags: (inout): a pointer to an int containing #GSocketMsgFlags flags
+ * @flags: (inout): a pointer to an int containing #GSocketMsgFlags flags,
+ *    which may additionally contain
+ *    [other platform specific flags](http://man7.org/linux/man-pages/man2/recv.2.html)
  * @cancellable: a %GCancellable or %NULL
  * @error: a #GError pointer, or %NULL
  *
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 83cb945c7..59af25abf 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -1427,15 +1427,24 @@ g_socket_client_async_connect_complete (GSocketClientAsyncConnectData *data)
       data->connection = (GIOStream *)wrapper_connection;
     }
 
-  if (!g_task_return_error_if_cancelled (data->task))
+  if (!data->completed)
     {
-      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, data->connection);
-      g_task_return_pointer (data->task, g_steal_pointer (&data->connection), g_object_unref);
+      GError *error = NULL;
+
+      if (g_cancellable_set_error_if_cancelled (g_task_get_cancellable (data->task), &error))
+        {
+          g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
+          g_task_return_error (data->task, g_steal_pointer (&error));
+        }
+      else
+        {
+          g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, data->connection);
+          g_task_return_pointer (data->task, g_steal_pointer (&data->connection), g_object_unref);
+        }
+
+      data->completed = TRUE;
     }
-  else
-    g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
 
-  data->completed = TRUE;
   g_object_unref (data->task);
 }
 
@@ -1607,6 +1616,7 @@ g_socket_client_connected_callback (GObject      *source,
           set_last_error (data, error);
           connection_attempt_remove (attempt);
           enumerator_next_async (data, FALSE);
+          connection_attempt_unref (attempt);
         }
       else
         {
diff --git a/gio/gtask.c b/gio/gtask.c
index f6c89c974..9950bb36b 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -626,11 +626,14 @@ static gint tasks_running;
  * The base and multiplier below gives us 10 extra threads after about
  * a second of blocking, 30 after 5 seconds, 100 after a minute, and
  * 200 after 20 minutes.
+ *
+ * We specify maximum pool size of 330 to increase the waiting time up
+ * to around 30 minutes.
  */
 #define G_TASK_POOL_SIZE 10
 #define G_TASK_WAIT_TIME_BASE 100000
 #define G_TASK_WAIT_TIME_MULTIPLIER 1.03
-#define G_TASK_WAIT_TIME_MAX (30 * 60 * 1000000)
+#define G_TASK_WAIT_TIME_MAX_POOL_SIZE 330
 
 static void
 g_task_init (GTask *task)
@@ -1366,7 +1369,7 @@ g_task_thread_setup (void)
 
   if (tasks_running == G_TASK_POOL_SIZE)
     task_wait_time = G_TASK_WAIT_TIME_BASE;
-  else if (tasks_running > G_TASK_POOL_SIZE && task_wait_time < G_TASK_WAIT_TIME_MAX)
+  else if (tasks_running > G_TASK_POOL_SIZE && tasks_running < G_TASK_WAIT_TIME_MAX_POOL_SIZE)
     task_wait_time *= G_TASK_WAIT_TIME_MULTIPLIER;
 
   if (tasks_running >= G_TASK_POOL_SIZE)
@@ -1388,6 +1391,9 @@ g_task_thread_cleanup (void)
   else if (tasks_running + tasks_pending < G_TASK_POOL_SIZE)
     g_source_set_ready_time (task_pool_manager, -1);
 
+  if (tasks_running > G_TASK_POOL_SIZE && tasks_running < G_TASK_WAIT_TIME_MAX_POOL_SIZE)
+    task_wait_time /= G_TASK_WAIT_TIME_MULTIPLIER;
+
   tasks_running--;
   g_mutex_unlock (&task_pool_mutex);
   g_private_set (&task_private, GUINT_TO_POINTER (FALSE));
diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c
index 58da11df3..f06dabf0a 100644
--- a/gio/gtlsdatabase.c
+++ b/gio/gtlsdatabase.c
@@ -35,7 +35,7 @@
  * @short_description: TLS database type
  * @include: gio/gio.h
  *
- * #GTlsDatabase is used to lookup certificates and other information
+ * #GTlsDatabase is used to look up certificates and other information
  * from a certificate or key store. It is an abstract base class which
  * TLS library specific subtypes override.
  *
@@ -658,7 +658,7 @@ g_tls_database_create_certificate_handle (GTlsDatabase            *self,
  * @cancellable: (nullable): a #GCancellable, or %NULL
  * @error: (nullable): a #GError, or %NULL
  *
- * Lookup a certificate by its handle.
+ * Look up a certificate by its handle.
  *
  * The handle should have been created by calling
  * g_tls_database_create_certificate_handle() on a #GTlsDatabase object of
@@ -709,7 +709,7 @@ g_tls_database_lookup_certificate_for_handle (GTlsDatabase            *self,
  * @callback: callback to call when the operation completes
  * @user_data: the data to pass to the callback function
  *
- * Asynchronously lookup a certificate by its handle in the database. See
+ * Asynchronously look up a certificate by its handle in the database. See
  * g_tls_database_lookup_certificate_for_handle() for more information.
  *
  * Since: 2.30
@@ -777,7 +777,7 @@ g_tls_database_lookup_certificate_for_handle_finish (GTlsDatabase            *se
  * @cancellable: (nullable): a #GCancellable, or %NULL
  * @error: (nullable): a #GError, or %NULL
  *
- * Lookup the issuer of @certificate in the database.
+ * Look up the issuer of @certificate in the database.
  *
  * The #GTlsCertificate:issuer property
  * of @certificate is not modified, and the two certificates are not hooked
@@ -823,7 +823,7 @@ g_tls_database_lookup_certificate_issuer (GTlsDatabase           *self,
  * @callback: callback to call when the operation completes
  * @user_data: the data to pass to the callback function
  *
- * Asynchronously lookup the issuer of @certificate in the database. See
+ * Asynchronously look up the issuer of @certificate in the database. See
  * g_tls_database_lookup_certificate_issuer() for more information.
  *
  * Since: 2.30
@@ -889,7 +889,7 @@ g_tls_database_lookup_certificate_issuer_finish (GTlsDatabase          *self,
  * @cancellable: (nullable): a #GCancellable, or %NULL
  * @error: (nullable): a #GError, or %NULL
  *
- * Lookup certificates issued by this issuer in the database.
+ * Look up certificates issued by this issuer in the database.
  *
  * This function can block, use g_tls_database_lookup_certificates_issued_by_async() to perform
  * the lookup operation asynchronously.
@@ -931,7 +931,7 @@ g_tls_database_lookup_certificates_issued_by (GTlsDatabase           *self,
  * @callback: callback to call when the operation completes
  * @user_data: the data to pass to the callback function
  *
- * Asynchronously lookup certificates issued by this issuer in the database. See
+ * Asynchronously look up certificates issued by this issuer in the database. See
  * g_tls_database_lookup_certificates_issued_by() for more information.
  *
  * The database may choose to hold a reference to the issuer byte array for the duration
diff --git a/gio/gvfs.h b/gio/gvfs.h
index 46ad792c8..72fe2dd32 100644
--- a/gio/gvfs.h
+++ b/gio/gvfs.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
 /**
  * GVfsFileLookupFunc:
  * @vfs: a #GVfs
- * @identifier: the identifier to lookup a #GFile for. This can either
+ * @identifier: the identifier to look up a #GFile for. This can either
  *     be an URI or a parse name as returned by g_file_get_parse_name()
  * @user_data: user data passed to the function
  *
diff --git a/gio/meson.build b/gio/meson.build
index 4e5e021e9..f0e08b40f 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -994,4 +994,8 @@ if enable_systemtap
 endif
 
 subdir('fam')
-subdir('tests')
+# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
+build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
+if build_tests
+    subdir('tests')
+endif
\ No newline at end of file
diff --git a/gio/strinfo.c b/gio/strinfo.c
index cd47215da..f5e92a41d 100644
--- a/gio/strinfo.c
+++ b/gio/strinfo.c
@@ -61,24 +61,24 @@
  *
  * The operations that someone may want to perform with the map:
  *
- *   - lookup if a string is valid (and not an alias)
- *   - lookup the integer value for a enum 'nick'
- *   - lookup the integer value for the target of an alias
- *   - lookup an alias and convert it to its target string
- *   - lookup the enum nick for a given value
+ *   - look up if a string is valid (and not an alias)
+ *   - look up the integer value for a enum 'nick'
+ *   - look up the integer value for the target of an alias
+ *   - look up an alias and convert it to its target string
+ *   - look up the enum nick for a given value
  *
- * In order to lookup if a string is valid, it is padded on either side
+ * In order to look up if a string is valid, it is padded on either side
  * (as described) and scanned for in the array.  For example, you might
  * look for "foo":
  *
  *                   xff 'f' 'o' 'o'   x00 x00 x00 xff
  *
- * In order to lookup the integer value for a nick, the string is padded
+ * In order to look up the integer value for a nick, the string is padded
  * on either side and scanned for in the array, as above.  Instead of
  * merely succeeding, we look at the integer value to the left of the
  * match.  This is the enum value.
  *
- * In order to lookup an alias and convert it to its target enum value,
+ * In order to look up an alias and convert it to its target enum value,
  * the string is padded on either side (as described, with 0xfe) and
  * scanned for.  For example, you might look for "baz":
  *
@@ -92,7 +92,7 @@
  * added past the start of the integer value to find the start of the
  * string.
  *
- * To lookup the enum nick for a given value, the value is searched for
+ * To look up the enum nick for a given value, the value is searched for
  * in the array.  To ensure that the value isn't matching the inside of a
  * string, we must check that it is either the first item in the array or
  * immediately preceded by the byte 0xff.  It must also be immediately
diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
index ed2f89111..f4e509a59 100644
--- a/gio/tests/desktop-app-info.c
+++ b/gio/tests/desktop-app-info.c
@@ -659,7 +659,7 @@ test_search (void)
   assert_search ("konq", "kde4-konqbrowser.desktop\n", TRUE, TRUE, NULL, NULL);
   assert_search ("kate", "kde4-kate.desktop\n", TRUE, TRUE, NULL, NULL);
 
-  /* make sure we can lookup apps by name properly */
+  /* make sure we can look up apps by name properly */
   assert_info ("kde4-kate.desktop",
                "kde4-kate.desktop\n"
                "Kate\n"
diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
index ec57977a5..900e7ac97 100644
--- a/gio/tests/gapplication.c
+++ b/gio/tests/gapplication.c
@@ -140,7 +140,7 @@ basic (void)
 
   main_loop = g_main_loop_new (NULL, 0);
 
-  /* spawn the master */
+  /* spawn the main instance */
   spawn ("activated\n"
          "open file:///a file:///b\n"
          "exit status: 0\n", NULL,
@@ -191,7 +191,7 @@ test_remote_command_line (void)
                          NULL);
   g_object_unref (file);
 
-  /* spawn the master */
+  /* spawn the main instance */
   spawn (replies, NULL,
          "./cmd", NULL);
 
@@ -255,7 +255,7 @@ test_remote_actions (void)
 
   main_loop = g_main_loop_new (NULL, 0);
 
-  /* spawn the master */
+  /* spawn the main instance */
   spawn ("got ./cmd 0\n"
          "activate action1\n"
          "change action2 1\n"
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index f13458181..a0c09444b 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -54,7 +54,6 @@ gio_tests = {
   'io-stream' : {},
   'memory-input-stream' : {},
   'memory-output-stream' : {},
-  'monitor' : {},
   'mount-operation' : {},
   'network-address' : {'extra_sources': ['mock-resolver.c']},
   'network-monitor' : {},
@@ -141,13 +140,17 @@ if host_machine.system() != 'windows'
   }
 
   if have_rtld_next
+    # FIXME: This list will probably grow; see
+    # https://gitlab.gnome.org/GNOME/glib/issues/1739
+    no_libdl_systems = ['freebsd', 'netbsd', 'openbsd']
+
     gio_tests += {
       'gsocketclient-slow' : {
         'depends' : [
           shared_library('slow-connect-preload',
             'slow-connect-preload.c',
             name_prefix : '',
-            dependencies: cc.find_library('dl'),
+            dependencies: cc.find_library('dl', required: not no_libdl_systems.contains(host_machine.system())),
             install_dir : installed_tests_execdir,
             install: installed_tests_enabled,
           )
@@ -675,7 +678,6 @@ foreach test_name, extra_args : gio_tests
     env : local_test_env,
     timeout : timeout,
     suite : suite,
-    args : ['--tap'],
     is_parallel : extra_args.get('is_parallel', true),
     depends : extra_args.get('depends', []),
   )
diff --git a/gio/tests/monitor.c b/gio/tests/monitor.c
deleted file mode 100644
index 4d64fa826..000000000
--- a/gio/tests/monitor.c
+++ /dev/null
@@ -1,220 +0,0 @@
-#include <gio/gio.h>
-#include <gstdio.h>
-
-typedef struct
-{
-  gchar *tmp_dir;
-} Fixture;
-
-static void
-setup (Fixture       *fixture,
-       gconstpointer  user_data)
-{
-  GError *error = NULL;
-
-  fixture->tmp_dir = g_dir_make_tmp ("gio-test-file-monitor_XXXXXX", &error);
-  g_assert_no_error (error);
-
-  g_test_message ("Using temporary directory: %s", fixture->tmp_dir);
-}
-
-static void
-teardown (Fixture       *fixture,
-          gconstpointer  user_data)
-{
-  g_assert_cmpint (g_rmdir (fixture->tmp_dir), ==, 0);
-  g_clear_pointer (&fixture->tmp_dir, g_free);
-}
-
-typedef struct {
-  GFile *file;
-  GOutputStream *stream;
-  GMainLoop *loop;
-  gint state;
-} MonitorData;
-
-static gboolean
-create_file_idle (gpointer data)
-{
-  MonitorData *d = data;
-  GError *error = NULL;
-
-  g_assert (d->state == 0);
-
-  d->stream = (GOutputStream*)g_file_create (d->file, 0, NULL, &error);
-  g_assert_no_error (error);
-
-  d->state = 1;
-
-  return G_SOURCE_REMOVE;
-}
-
-static gboolean
-write_file_idle (gpointer data)
-{
-  MonitorData *d = data;
-  GError *error = NULL;
-
-  g_assert (d->state == 2);
-
-  g_output_stream_write (d->stream, "abcd", 4, NULL, &error);
-  g_assert_no_error (error);
-  g_object_unref (d->stream);
-  d->stream = NULL;
-
-  d->state = 3;
-
-
-  return G_SOURCE_REMOVE;
-}
-
-static gboolean
-delete_file_idle (gpointer data)
-{
-  MonitorData *d = data;
-  GError *error = NULL;
-
-  g_assert (d->state == 4);
-
-  g_file_delete (d->file, NULL, &error);
-  g_assert_no_error (error);
-
-  d->state = 5;
-
-  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,
-            GFile             *other_file,
-            GFileMonitorEvent  event,
-            gpointer           data)
-{
-  MonitorData *d = data;
-
-  switch (d->state)
-    {
-    case 1:
-      g_assert (event == G_FILE_MONITOR_EVENT_CREATED);
-      d->state = 2;
-      g_idle_add (write_file_idle, data);
-      break;
-    case 3:
-      g_assert (event == G_FILE_MONITOR_EVENT_CHANGED ||
-                event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT);
-      if (event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
-        {
-          d->state = 4;
-          g_idle_add (delete_file_idle, data);
-        }
-      break;
-    case 5:
-      g_assert (event == G_FILE_MONITOR_EVENT_DELETED);
-      d->state = 6;
-      g_idle_add (stop_loop_idle, data);
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-}
-
-static void
-file_changed_cb (GFileMonitor      *monitor,
-                 GFile             *file,
-                 GFile             *other_file,
-                 GFileMonitorEvent  event,
-                 gpointer           data)
-{
-  gint *state = data;
-
-  switch (*state)
-    {
-    case 0:
-      g_assert (event == G_FILE_MONITOR_EVENT_CREATED);
-      *state = 1;
-      break;
-    case 1:
-      g_assert (event == G_FILE_MONITOR_EVENT_CHANGED ||
-                event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT);
-      if (event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
-        *state = 2;
-      break;
-    case 2:
-      g_assert (event == G_FILE_MONITOR_EVENT_DELETED);
-      *state = 3;
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-}
-
-static void
-test_directory_monitor (Fixture       *fixture,
-                        gconstpointer  user_data)
-{
-  GFile *file;
-  GFile *child;
-  GFileMonitor *dir_monitor;
-  GFileMonitor *file_monitor;
-  GError *error = NULL;
-  MonitorData data;
-  gint state;
-  GMainLoop *loop;
-
-  file = g_file_new_for_path (fixture->tmp_dir);
-  dir_monitor = g_file_monitor_directory (file, 0, NULL, &error);
-  g_assert_no_error (error);
-
-  child = g_file_get_child (file, "test-file");
-  file_monitor = g_file_monitor_file (child, 0, NULL, &error);
-  g_assert_no_error (error);
-
-  loop = g_main_loop_new (NULL, FALSE);
-
-  g_signal_connect (dir_monitor, "changed", G_CALLBACK (changed_cb), &data);
-  g_signal_connect (file_monitor, "changed", G_CALLBACK (file_changed_cb), &state);
-
-  data.loop = loop;
-  data.file = child;
-  data.state = 0;
-  state = 0;
-
-  g_idle_add (create_file_idle, &data);
-
-  g_main_loop_run (loop);
-
-  g_assert_cmpint (data.state, ==, 6);
-  g_assert_cmpint (state, ==, 3);
-
-  g_main_loop_unref (loop);
-  g_object_unref (dir_monitor);
-  g_object_unref (file_monitor);
-  g_object_unref (child);
-  g_object_unref (file);
-}
-
-int
-main (int argc, char *argv[])
-{
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add ("/monitor/directory", Fixture, NULL, setup, test_directory_monitor, teardown);
-
-  return g_test_run ();
-}
diff --git a/gio/tests/network-address.c b/gio/tests/network-address.c
index c62afccd2..0dcd7b292 100644
--- a/gio/tests/network-address.c
+++ b/gio/tests/network-address.c
@@ -426,7 +426,9 @@ typedef struct {
 } AsyncData;
 
 static void
-got_addr (GObject *source_object, GAsyncResult *result, gpointer user_data)
+got_addr (GObject      *source_object,
+          GAsyncResult *result,
+          gpointer      user_data)
 {
   GSocketAddressEnumerator *enumerator;
   AsyncData *data;
@@ -466,6 +468,30 @@ got_addr (GObject *source_object, GAsyncResult *result, gpointer user_data)
 }
 
 static void
+got_addr_ignored (GObject      *source_object,
+                  GAsyncResult *result,
+                  gpointer      user_data)
+{
+  GSocketAddressEnumerator *enumerator;
+  GSocketAddress *a;  /* owned */
+  GError *error = NULL;
+
+  /* This function simply ignores the returned addresses but keeps enumerating */
+
+  enumerator = G_SOCKET_ADDRESS_ENUMERATOR (source_object);
+
+  a = g_socket_address_enumerator_next_finish (enumerator, result, &error);
+  g_assert_no_error (error);
+  if (a != NULL)
+    {
+      g_object_unref (a);
+      g_socket_address_enumerator_next_async (enumerator, NULL,
+                                              got_addr_ignored, user_data);
+    }
+}
+
+
+static void
 test_loopback_async (void)
 {
   GSocketConnectable *addr;  /* owned */
@@ -647,6 +673,39 @@ test_happy_eyeballs_basic (HappyEyeballsFixture *fixture,
 }
 
 static void
+test_happy_eyeballs_parallel (HappyEyeballsFixture *fixture,
+                              gconstpointer         user_data)
+{
+  AsyncData data = { 0 };
+  GSocketAddressEnumerator *enumerator2;
+
+  enumerator2 = g_socket_connectable_enumerate (fixture->addr);
+
+  data.delay_ms = FAST_DELAY_LESS_THAN_TIMEOUT;
+  data.loop = fixture->loop;
+
+  /* We run multiple enumerations at once, the results shouldn't be affected. */
+
+  g_socket_address_enumerator_next_async (enumerator2, NULL, got_addr_ignored, &data);
+  g_socket_address_enumerator_next_async (fixture->enumerator, NULL, got_addr, &data);
+  g_main_loop_run (fixture->loop);
+
+  assert_list_matches_expected (data.addrs, fixture->input_all_results);
+
+  /* Run again to ensure the cache from the previous one is correct */
+
+  data.addrs = NULL;
+  g_object_unref (enumerator2);
+
+  enumerator2 = g_socket_connectable_enumerate (fixture->addr);
+  g_socket_address_enumerator_next_async (enumerator2, NULL, got_addr, &data);
+  g_main_loop_run (fixture->loop);
+
+  assert_list_matches_expected (data.addrs, fixture->input_all_results);
+  g_object_unref (enumerator2);
+}
+
+static void
 test_happy_eyeballs_slow_ipv4 (HappyEyeballsFixture *fixture,
                                gconstpointer         user_data)
 {
@@ -958,6 +1017,8 @@ main (int argc, char *argv[])
 
   g_test_add ("/network-address/happy-eyeballs/basic", HappyEyeballsFixture, NULL,
               happy_eyeballs_setup, test_happy_eyeballs_basic, happy_eyeballs_teardown);
+  g_test_add ("/network-address/happy-eyeballs/parallel", HappyEyeballsFixture, NULL,
+              happy_eyeballs_setup, test_happy_eyeballs_parallel, happy_eyeballs_teardown);
   g_test_add ("/network-address/happy-eyeballs/slow-ipv4", HappyEyeballsFixture, NULL,
               happy_eyeballs_setup, test_happy_eyeballs_slow_ipv4, happy_eyeballs_teardown);
   g_test_add ("/network-address/happy-eyeballs/slow-ipv6", HappyEyeballsFixture, NULL,
diff --git a/gio/tests/resolver.c b/gio/tests/resolver.c
index 85d512428..c57b81867 100644
--- a/gio/tests/resolver.c
+++ b/gio/tests/resolver.c
@@ -49,7 +49,7 @@ usage (void)
 	fprintf (stderr, "       Use -s to do synchronous lookups.\n");
 	fprintf (stderr, "       Use -c NUMBER (and only a single resolvable argument) to test GSocketConnectable.\n");
 	fprintf (stderr, "       The given NUMBER determines how many times the connectable will be enumerated.\n");
-	fprintf (stderr, "       Use -t with MX, TXT, NS or SOA to lookup DNS records of those types.\n");
+	fprintf (stderr, "       Use -t with MX, TXT, NS or SOA to look up DNS records of those types.\n");
 	exit (1);
 }
 
@@ -222,6 +222,7 @@ print_resolved_txt (const char *rrname,
           for (i = 0; contents[i] != NULL; i++)
             printf ("%s\n", contents[i]);
           g_variant_unref (t->data);
+          g_free (contents);
         }
       g_list_free (records);
     }
@@ -739,6 +740,7 @@ main (int argc, char **argv)
   g_source_remove (watch);
 #endif
   g_object_unref (cancellable);
+  g_option_context_free (context);
 
   return 0;
 }
diff --git a/gio/tests/socket-client.c b/gio/tests/socket-client.c
index 803f4d6e9..8df1c28f3 100644
--- a/gio/tests/socket-client.c
+++ b/gio/tests/socket-client.c
@@ -431,7 +431,7 @@ main (int argc,
     {
       if (!g_socket_close (socket, &error))
 	{
-	  g_printerr ("Error closing master socket: %s\n",
+	  g_printerr ("Error closing socket: %s\n",
 		      error->message);
 	  return 1;
 	}
diff --git a/gio/tests/socket-server.c b/gio/tests/socket-server.c
index decf3ecd1..24cf0182e 100644
--- a/gio/tests/socket-server.c
+++ b/gio/tests/socket-server.c
@@ -356,7 +356,7 @@ main (int argc,
 
   if (!g_socket_close (socket, &error))
     {
-      g_printerr ("Error closing master socket: %s\n",
+      g_printerr ("Error closing socket: %s\n",
 		  error->message);
       return 1;
     }
diff --git a/glib/.gitignore b/glib/.gitignore
deleted file mode 100644
index f79e130df..000000000
--- a/glib/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-glibconfig.h
-glibconfig-stamp
-
-gtester
-libglib-gdb.py
-gspawn-win32-helper-console.c
-gspawn-win64-helper-console.c
-gspawn-win64-helper.c
-glib_probes.h
-glib-public-headers.txt
diff --git a/glib/docs.c b/glib/docs.c
index 729497afd..5d09f433e 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -2224,7 +2224,7 @@
  * This macro can be used to avoid having to do explicit cleanups of
  * local variables when exiting functions.  It often vastly simplifies
  * handling of error conditions, removing the need for various tricks
- * such as 'goto out' or repeating of cleanup code.  It is also helpful
+ * such as `goto out` or repeating of cleanup code.  It is also helpful
  * for non-error cases.
  *
  * Consider the following example:
@@ -2251,8 +2251,8 @@
  * }
  * ]|
  *
- * You must initialize the variable in some way -- either by use of an
- * initialiser or by ensuring that an _init function will be called on
+ * You must initialize the variable in some way — either by use of an
+ * initialiser or by ensuring that an `_init` function will be called on
  * it unconditionally before it goes out of scope.
  *
  * Since: 2.44
@@ -2273,12 +2273,12 @@
  *
  * This is meant to be used to declare pointers to types with cleanup
  * functions.  The type of the variable is a pointer to @TypeName.  You
- * must not add your own '*'.
+ * must not add your own `*`.
  *
  * This macro can be used to avoid having to do explicit cleanups of
  * local variables when exiting functions.  It often vastly simplifies
  * handling of error conditions, removing the need for various tricks
- * such as 'goto out' or repeating of cleanup code.  It is also helpful
+ * such as `goto out` or repeating of cleanup code.  It is also helpful
  * for non-error cases.
  *
  * Consider the following example:
@@ -2308,7 +2308,7 @@
  * }
  * ]|
  *
- * You must initialise the variable in some way -- either by use of an
+ * You must initialise the variable in some way — either by use of an
  * initialiser or by ensuring that it is assigned to unconditionally
  * before it goes out of scope.
  *
@@ -2330,7 +2330,7 @@
  * This means it's useful for any type that is returned from
  * g_malloc().
  *
- * Otherwise, this macro has similar constraints as g_autoptr() - only
+ * Otherwise, this macro has similar constraints as g_autoptr(): only
  * supported on GCC and clang, the variable must be initialized, etc.
  *
  * |[
@@ -2365,13 +2365,13 @@
  * are intended to be portable to those compilers.
  *
  * This is meant to be used to declare lists of a type with a cleanup
- * function.  The type of the variable is a GList *.  You
- * must not add your own '*'.
+ * function.  The type of the variable is a `GList *`.  You
+ * must not add your own `*`.
  *
  * This macro can be used to avoid having to do explicit cleanups of
  * local variables when exiting functions.  It often vastly simplifies
  * handling of error conditions, removing the need for various tricks
- * such as 'goto out' or repeating of cleanup code.  It is also helpful
+ * such as `goto out` or repeating of cleanup code.  It is also helpful
  * for non-error cases.
  *
  * See also g_autoslist(), g_autoptr() and g_steal_pointer().
@@ -2393,13 +2393,13 @@
  * are intended to be portable to those compilers.
  *
  * This is meant to be used to declare lists of a type with a cleanup
- * function.  The type of the variable is a GSList *.  You
- * must not add your own '*'.
+ * function.  The type of the variable is a `GSList *`.  You
+ * must not add your own `*`.
  *
  * This macro can be used to avoid having to do explicit cleanups of
  * local variables when exiting functions.  It often vastly simplifies
  * handling of error conditions, removing the need for various tricks
- * such as 'goto out' or repeating of cleanup code.  It is also helpful
+ * such as `goto out` or repeating of cleanup code.  It is also helpful
  * for non-error cases.
  *
  * See also g_autolist(), g_autoptr() and g_steal_pointer().
@@ -2408,6 +2408,35 @@
  */
 
 /**
+ * g_autoqueue:
+ * @TypeName: a supported variable type
+ *
+ * Helper to declare a double-ended queue variable with automatic deep cleanup.
+ *
+ * The queue is deeply freed, in a way appropriate to the specified type, when the
+ * variable goes out of scope.  The type must support this.
+ *
+ * This feature is only supported on GCC and clang.  This macro is not
+ * defined on other compilers and should not be used in programs that
+ * are intended to be portable to those compilers.
+ *
+ * This is meant to be used to declare queues of a type with a cleanup
+ * function.  The type of the variable is a `GQueue *`.  You
+ * must not add your own `*`.
+ *
+ * This macro can be used to avoid having to do explicit cleanups of
+ * local variables when exiting functions.  It often vastly simplifies
+ * handling of error conditions, removing the need for various tricks
+ * such as `goto out` or repeating of cleanup code.  It is also helpful
+ * for non-error cases.
+ *
+ * See also g_autolist(), g_autoptr() and g_steal_pointer().
+ *
+ * Since: 2.62
+ */
+
+
+/**
  * G_DEFINE_AUTOPTR_CLEANUP_FUNC:
  * @TypeName: a type name to define a g_autoptr() cleanup function for
  * @func: the cleanup function
@@ -2417,7 +2446,7 @@
  * The function will not be called if the variable to be cleaned up
  * contains %NULL.
  *
- * This will typically be the _free() or _unref() function for the given
+ * This will typically be the `_free()` or `_unref()` function for the given
  * type.
  *
  * With this definition, it will be possible to use g_autoptr() with
@@ -2440,7 +2469,7 @@
  *
  * Defines the appropriate cleanup function for a type.
  *
- * This will typically be the _clear() function for the given type.
+ * This will typically be the `_clear()` function for the given type.
  *
  * With this definition, it will be possible to use g_auto() with
  * @TypeName.
@@ -2472,7 +2501,7 @@
  * and file descriptors.
  *
  * @none specifies the "none" value for the type in question.  It is
- * probably something like %NULL or -1.  If the variable is found to
+ * probably something like %NULL or `-1`.  If the variable is found to
  * contain this value then the free function will not be called.
  *
  * |[
diff --git a/glib/gconstructor.h b/glib/gconstructor.h
index dccb0314c..603c2dde6 100644
--- a/glib/gconstructor.h
+++ b/glib/gconstructor.h
@@ -28,6 +28,8 @@
 #elif defined (_MSC_VER) && (_MSC_VER >= 1500)
 /* Visual studio 2008 and later has _Pragma */
 
+#include <stdlib.h>
+
 #define G_HAS_CONSTRUCTORS 1
 
 /* We do some weird things to avoid the constructors being optimized
diff --git a/glib/ghash.c b/glib/ghash.c
index 1f3a5ed36..c7b7139a3 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -38,6 +38,7 @@
 #include "gtestutils.h"
 #include "gslice.h"
 #include "grefcount.h"
+#include "gvalgrind.h"
 
 /* The following #pragma is here so we can do this...
  *
@@ -56,7 +57,9 @@
  *
  * ...and still compile successfully when -Werror=duplicated-branches is passed. */
 
+#if defined(__GNUC__) && __GNUC__ > 6
 #pragma GCC diagnostic ignored "-Wduplicated-branches"
+#endif
 
 /**
  * SECTION:hash_tables
@@ -86,7 +89,7 @@
  * To insert a key and value into a #GHashTable, use
  * g_hash_table_insert().
  *
- * To lookup a value corresponding to a given key, use
+ * To look up a value corresponding to a given key, use
  * g_hash_table_lookup() and g_hash_table_lookup_extended().
  *
  * g_hash_table_lookup_extended() can also be used to simply
@@ -428,7 +431,7 @@ g_hash_table_hash_to_index (GHashTable *hash_table, guint hash)
 /*
  * g_hash_table_lookup_node:
  * @hash_table: our #GHashTable
- * @key: the key to lookup against
+ * @key: the key to look up against
  * @hash_return: key hash return location
  *
  * Performs a lookup in the hash table, preserving extra information
@@ -555,15 +558,58 @@ g_hash_table_remove_node (GHashTable   *hash_table,
 }
 
 /*
+ * g_hash_table_setup_storage:
+ * @hash_table: our #GHashTable
+ *
+ * Initialise the hash table size, mask, mod, and arrays.
+ */
+static void
+g_hash_table_setup_storage (GHashTable *hash_table)
+{
+  gboolean small;
+
+  /* We want to use small arrays only if:
+   *   - we are running on a system where that makes sense (64 bit); and
+   *   - we are not running under valgrind.
+   */
+  small = FALSE;
+
+#ifdef USE_SMALL_ARRAYS
+  small = TRUE;
+
+# ifdef ENABLE_VALGRIND
+  if (RUNNING_ON_VALGRIND)
+    small = FALSE;
+# endif
+#endif
+
+  g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT);
+
+  hash_table->have_big_keys = !small;
+  hash_table->have_big_values = !small;
+
+  hash_table->keys   = g_hash_table_realloc_key_or_value_array (NULL, hash_table->size, hash_table->have_big_keys);
+  hash_table->values = hash_table->keys;
+  hash_table->hashes = g_new0 (guint, hash_table->size);
+}
+
+/*
  * g_hash_table_remove_all_nodes:
  * @hash_table: our #GHashTable
  * @notify: %TRUE if the destroy notify handlers are to be called
  *
- * Removes all nodes from the table.  Since this may be a precursor to
- * freeing the table entirely, no resize is performed.
+ * Removes all nodes from the table.
  *
  * If @notify is %TRUE then the destroy notify functions are called
  * for the key and value of the hash node.
+ *
+ * Since this may be a precursor to freeing the table entirely, we'd
+ * ideally perform no resize, and we can indeed avoid that in some
+ * cases.  However: in the case that we'll be making callbacks to user
+ * code (via destroy notifies) we need to consider that the user code
+ * might call back into the table again.  In this case, we setup a new
+ * set of arrays so that any callers will see an empty (but valid)
+ * table.
  */
 static void
 g_hash_table_remove_all_nodes (GHashTable *hash_table,
@@ -577,6 +623,8 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
   gpointer *old_keys;
   gpointer *old_values;
   guint    *old_hashes;
+  gboolean  old_have_big_keys;
+  gboolean  old_have_big_values;
 
   /* If the hash table is already empty, there is nothing to be done. */
   if (hash_table->nnodes == 0)
@@ -585,6 +633,7 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
   hash_table->nnodes = 0;
   hash_table->noccupied = 0;
 
+  /* Easy case: no callbacks, so we just zero out the arrays */
   if (!notify ||
       (hash_table->key_destroy_func == NULL &&
        hash_table->value_destroy_func == NULL))
@@ -605,43 +654,52 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
       return;
     }
 
-  /* Keep the old storage space around to iterate over it. */
+  /* Hard case: we need to do user callbacks.  There are two
+   * possibilities here:
+   *
+   *   1) there are no outstanding references on the table and therefore
+   *   nobody should be calling into it again (destroying == true)
+   *
+   *   2) there are outstanding references, and there may be future
+   *   calls into the table, either after we return, or from the destroy
+   *   notifies that we're about to do (destroying == false)
+   *
+   * We handle both cases by taking the current state of the table into
+   * local variables and replacing it with something else: in the "no
+   * outstanding references" cases we replace it with a bunch of
+   * null/zero values so that any access to the table will fail.  In the
+   * "may receive future calls" case, we reinitialise the struct to
+   * appear like a newly-created empty table.
+   *
+   * In both cases, we take over the references for the current state,
+   * freeing them below.
+   */
   old_size = hash_table->size;
-  old_keys   = hash_table->keys;
-  old_values = hash_table->values;
-  old_hashes = hash_table->hashes;
-
-  /* Now create a new storage space; If the table is destroyed we can use the
-   * shortcut of not creating a new storage. This saves the allocation at the
-   * cost of not allowing any recursive access.
-   * However, the application doesn't own any reference anymore, so access
-   * is not allowed. If accesses are done, then either an assert or crash
-   * *will* happen. */
-  g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT);
+  old_have_big_keys = hash_table->have_big_keys;
+  old_have_big_values = hash_table->have_big_values;
+  old_keys   = g_steal_pointer (&hash_table->keys);
+  old_values = g_steal_pointer (&hash_table->values);
+  old_hashes = g_steal_pointer (&hash_table->hashes);
+
   if (!destruction)
-    {
-      hash_table->keys   = g_hash_table_realloc_key_or_value_array (NULL, hash_table->size, FALSE);
-      hash_table->values = hash_table->keys;
-      hash_table->hashes = g_new0 (guint, hash_table->size);
-    }
+    /* Any accesses will see an empty table */
+    g_hash_table_setup_storage (hash_table);
   else
-    {
-      hash_table->keys   = NULL;
-      hash_table->values = NULL;
-      hash_table->hashes = NULL;
-    }
+    /* Will cause a quick crash on any attempted access */
+    hash_table->size = hash_table->mod = hash_table->mask = 0;
 
+  /* Now do the actual destroy notifies */
   for (i = 0; i < old_size; i++)
     {
       if (HASH_IS_REAL (old_hashes[i]))
         {
-          key = g_hash_table_fetch_key_or_value (old_keys, i, hash_table->have_big_keys);
-          value = g_hash_table_fetch_key_or_value (old_values, i, hash_table->have_big_values);
+          key = g_hash_table_fetch_key_or_value (old_keys, i, old_have_big_keys);
+          value = g_hash_table_fetch_key_or_value (old_values, i, old_have_big_values);
 
           old_hashes[i] = UNUSED_HASH_VALUE;
 
-          g_hash_table_assign_key_or_value (old_keys, i, hash_table->have_big_keys, NULL);
-          g_hash_table_assign_key_or_value (old_values, i, hash_table->have_big_values, NULL);
+          g_hash_table_assign_key_or_value (old_keys, i, old_have_big_keys, NULL);
+          g_hash_table_assign_key_or_value (old_values, i, old_have_big_values, NULL);
 
           if (hash_table->key_destroy_func != NULL)
             hash_table->key_destroy_func (key);
@@ -651,9 +709,6 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
         }
     }
 
-  hash_table->have_big_keys = FALSE;
-  hash_table->have_big_values = FALSE;
-
   /* Destroy old storage space. */
   if (old_keys != old_values)
     g_free (old_values);
@@ -1016,7 +1071,6 @@ g_hash_table_new_full (GHashFunc      hash_func,
   GHashTable *hash_table;
 
   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;
@@ -1027,17 +1081,8 @@ g_hash_table_new_full (GHashFunc      hash_func,
 #endif
   hash_table->key_destroy_func   = key_destroy_func;
   hash_table->value_destroy_func = value_destroy_func;
-  hash_table->keys               = g_hash_table_realloc_key_or_value_array (NULL, hash_table->size, FALSE);
-  hash_table->values             = hash_table->keys;
-  hash_table->hashes             = g_new0 (guint, hash_table->size);
 
-#ifdef USE_SMALL_ARRAYS
-  hash_table->have_big_keys = FALSE;
-  hash_table->have_big_values = FALSE;
-#else
-  hash_table->have_big_keys = TRUE;
-  hash_table->have_big_values = TRUE;
-#endif
+  g_hash_table_setup_storage (hash_table);
 
   return hash_table;
 }
diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h
index d89c8d2fe..efa4a99ab 100644
--- a/glib/glib-autocleanups.h
+++ b/glib/glib-autocleanups.h
@@ -76,6 +76,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GThread, g_thread_unref)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GMutex, g_mutex_clear)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GMutexLocker, g_mutex_locker_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRecMutexLocker, g_rec_mutex_locker_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRWLockWriterLocker, g_rw_lock_writer_locker_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRWLockReaderLocker, g_rw_lock_reader_locker_free)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GCond, g_cond_clear)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTimer, g_timer_destroy)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTimeZone, g_time_zone_unref)
diff --git a/glib/glib_gdb.py b/glib/glib_gdb.py
index 1cf2ed936..37d01cb76 100644
--- a/glib/glib_gdb.py
+++ b/glib/glib_gdb.py
@@ -86,11 +86,27 @@ class GHashPrinter:
     "Prints a GHashTable"
 
     class _iterator:
+        class _pointer_array:
+            def __init__(self, ptr, big_items):
+                self._big_items = big_items
+                self._gpointer_type = gdb.lookup_type("gpointer")
+                item_type = self._gpointer_type if self._big_items else gdb.lookup_type("guint")
+
+                self._items = ptr.cast(item_type.pointer())
+
+            def __getitem__(self, item):
+                item = self._items[item]
+
+                if not self._big_items:
+                    item = item.cast(self._gpointer_type)
+
+                return item
+
         def __init__(self, ht, keys_are_strings):
             self.ht = ht
             if ht != 0:
-                self.keys = ht["keys"]
-                self.values = ht["values"]
+                self.keys = self._pointer_array(ht["keys"], ht["have_big_keys"])
+                self.values = self._pointer_array(ht["values"], ht["have_big_values"])
                 self.hashes = ht["hashes"]
                 self.size = ht["size"]
             self.pos = 0
diff --git a/glib/glist.c b/glib/glist.c
index 51adeb058..39143fa7e 100644
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -368,6 +368,64 @@ g_list_insert (GList    *list,
 }
 
 /**
+ * g_list_insert_before_link:
+ * @list: a pointer to a #GList, this must point to the top of the list
+ * @sibling: (nullable): the list element before which the new element
+ *     is inserted or %NULL to insert at the end of the list
+ * @link_: the list element to be added, which must not be part of
+ *     any other list
+ *
+ * Inserts @link_ into the list before the given position.
+ *
+ * Returns: the (possibly changed) start of the #GList
+ *
+ * Since: 2.62
+ */
+GList *
+g_list_insert_before_link (GList *list,
+                           GList *sibling,
+                           GList *link_)
+{
+  g_return_val_if_fail (link_ != NULL, list);
+  g_return_val_if_fail (link_->prev == NULL, list);
+  g_return_val_if_fail (link_->next == NULL, list);
+
+  if (list == NULL)
+    {
+      g_return_val_if_fail (sibling == NULL, list);
+      return link_;
+    }
+  else if (sibling != NULL)
+    {
+      link_->prev = sibling->prev;
+      link_->next = sibling;
+      sibling->prev = link_;
+      if (link_->prev != NULL)
+        {
+          link_->prev->next = link_;
+          return list;
+        }
+      else
+        {
+          g_return_val_if_fail (sibling == list, link_);
+          return link_;
+        }
+    }
+  else
+    {
+      GList *last;
+
+      for (last = list; last->next != NULL; last = last->next) {}
+
+      last->next = link_;
+      last->next->prev = last;
+      last->next->next = NULL;
+
+      return list;
+    }
+}
+
+/**
  * g_list_insert_before:
  * @list: a pointer to a #GList, this must point to the top of the list
  * @sibling: the list element before which the new element 
@@ -383,14 +441,14 @@ g_list_insert_before (GList    *list,
                       GList    *sibling,
                       gpointer  data)
 {
-  if (!list)
+  if (list == NULL)
     {
       list = g_list_alloc ();
       list->data = data;
       g_return_val_if_fail (sibling == NULL, list);
       return list;
     }
-  else if (sibling)
+  else if (sibling != NULL)
     {
       GList *node;
 
@@ -399,7 +457,7 @@ g_list_insert_before (GList    *list,
       node->prev = sibling->prev;
       node->next = sibling;
       sibling->prev = node;
-      if (node->prev)
+      if (node->prev != NULL)
         {
           node->prev->next = node;
           return list;
@@ -414,9 +472,7 @@ g_list_insert_before (GList    *list,
     {
       GList *last;
 
-      last = list;
-      while (last->next)
-        last = last->next;
+      for (last = list; last->next != NULL; last = last->next) {}
 
       last->next = _g_list_alloc ();
       last->next->data = data;
diff --git a/glib/glist.h b/glib/glist.h
index af35cd52c..8b4703e17 100644
--- a/glib/glist.h
+++ b/glib/glist.h
@@ -78,6 +78,10 @@ GLIB_AVAILABLE_IN_ALL
 GList*   g_list_insert_before           (GList            *list,
 					 GList            *sibling,
 					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
+GLIB_AVAILABLE_IN_2_62
+GList*   g_list_insert_before_link      (GList            *list,
+					 GList            *sibling,
+					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
 GLIB_AVAILABLE_IN_ALL
 GList*   g_list_concat                  (GList            *list1,
 					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/glib/gmacros.h b/glib/gmacros.h
index cde9f6b43..db5f0b087 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -733,10 +733,10 @@
 #endif
 
 /* Provide a string identifying the current function, non-concatenatable */
-#if defined (__func__)
-#define G_STRFUNC     ((const char*) (__func__))
-#elif defined (__GNUC__) && defined (__cplusplus)
+#if defined (__GNUC__) && defined (__cplusplus)
 #define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
+#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#define G_STRFUNC     ((const char*) (__func__))
 #elif defined (__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1300))
 #define G_STRFUNC     ((const char*) (__FUNCTION__))
 #else
@@ -957,12 +957,15 @@
 #define _GLIB_AUTOPTR_LIST_TYPENAME(TypeName)  TypeName##_listautoptr
 #define _GLIB_AUTOPTR_SLIST_FUNC_NAME(TypeName) glib_slistautoptr_cleanup_##TypeName
 #define _GLIB_AUTOPTR_SLIST_TYPENAME(TypeName)  TypeName##_slistautoptr
+#define _GLIB_AUTOPTR_QUEUE_FUNC_NAME(TypeName) glib_queueautoptr_cleanup_##TypeName
+#define _GLIB_AUTOPTR_QUEUE_TYPENAME(TypeName)  TypeName##_queueautoptr
 #define _GLIB_AUTO_FUNC_NAME(TypeName)    glib_auto_cleanup_##TypeName
 #define _GLIB_CLEANUP(func)               __attribute__((cleanup(func)))
 #define _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(TypeName, ParentName, cleanup) \
   typedef TypeName *_GLIB_AUTOPTR_TYPENAME(TypeName);                                                           \
   typedef GList *_GLIB_AUTOPTR_LIST_TYPENAME(TypeName);                                                         \
   typedef GSList *_GLIB_AUTOPTR_SLIST_TYPENAME(TypeName);                                                       \
+  typedef GQueue *_GLIB_AUTOPTR_QUEUE_TYPENAME(TypeName);                                                       \
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS                                                                              \
   static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) (TypeName *_ptr)                     \
     { if (_ptr) (cleanup) ((ParentName *) _ptr); }                                                              \
@@ -972,6 +975,8 @@
     { g_list_free_full (*_l, (GDestroyNotify) (void(*)(void)) cleanup); }                                       \
   static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_SLIST_FUNC_NAME(TypeName) (GSList **_l)                        \
     { g_slist_free_full (*_l, (GDestroyNotify) (void(*)(void)) cleanup); }                                      \
+  static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_QUEUE_FUNC_NAME(TypeName) (GQueue **_q)                        \
+    { if (*_q) g_queue_free_full (*_q, (GDestroyNotify) (void(*)(void)) cleanup); }                             \
   G_GNUC_END_IGNORE_DEPRECATIONS
 #define _GLIB_DEFINE_AUTOPTR_CHAINUP(ModuleObjName, ParentName) \
   _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(ModuleObjName, ParentName, _GLIB_AUTOPTR_CLEAR_FUNC_NAME(ParentName))
@@ -991,6 +996,7 @@
 #define g_autoptr(TypeName) _GLIB_CLEANUP(_GLIB_AUTOPTR_FUNC_NAME(TypeName)) _GLIB_AUTOPTR_TYPENAME(TypeName)
 #define g_autolist(TypeName) _GLIB_CLEANUP(_GLIB_AUTOPTR_LIST_FUNC_NAME(TypeName)) _GLIB_AUTOPTR_LIST_TYPENAME(TypeName)
 #define g_autoslist(TypeName) _GLIB_CLEANUP(_GLIB_AUTOPTR_SLIST_FUNC_NAME(TypeName)) _GLIB_AUTOPTR_SLIST_TYPENAME(TypeName)
+#define g_autoqueue(TypeName) _GLIB_CLEANUP(_GLIB_AUTOPTR_QUEUE_FUNC_NAME(TypeName)) _GLIB_AUTOPTR_QUEUE_TYPENAME(TypeName)
 #define g_auto(TypeName) _GLIB_CLEANUP(_GLIB_AUTO_FUNC_NAME(TypeName)) TypeName
 #define g_autofree _GLIB_CLEANUP(g_autoptr_cleanup_generic_gfree)
 
diff --git a/glib/gmain.c b/glib/gmain.c
index 6b98f8c0c..43b0250e9 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2203,7 +2203,7 @@ g_source_unref (GSource *source)
  *
  * Finds a #GSource given a pair of context and ID.
  *
- * It is a programmer error to attempt to lookup a non-existent source.
+ * It is a programmer error to attempt to look up a non-existent source.
  *
  * More specifically: source IDs can be reissued after a source has been
  * destroyed and therefore it is never valid to use this function with a
diff --git a/glib/goption.c b/glib/goption.c
index 8494ca739..183e9d9d3 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -194,6 +194,10 @@
 #include "gprintf.h"
 #include "glibintl.h"
 
+#if defined G_OS_WIN32
+#include <windows.h>
+#endif
+
 #define TRANSLATE(group, str) (((group)->translate_func ? (* (group)->translate_func) ((str), (group)->translate_data) : (str)))
 
 #define NO_ARG(entry) ((entry)->arg == G_OPTION_ARG_NONE ||       \
@@ -1860,6 +1864,51 @@ platform_get_argv0 (void)
   base_arg0 = g_path_get_basename (*cmdline);
   g_free (cmdline);
   return base_arg0;
+#elif defined G_OS_WIN32
+  const wchar_t *cmdline;
+  wchar_t **wargv;
+  int wargc;
+  gchar *utf8_buf = NULL;
+  char *base_arg0 = NULL;
+
+  /* Pretend it's const, since we're not allowed to free it */
+  cmdline = (const wchar_t *) GetCommandLineW ();
+  if (G_UNLIKELY (cmdline == NULL))
+    return NULL;
+
+  /* Skip leading whitespace. CommandLineToArgvW() is documented
+   * to behave weirdly with that. The character codes below
+   * correspond to the *only* unicode characters that are
+   * considered to be spaces by CommandLineToArgvW(). The rest
+   * (such as 0xa0 - NO-BREAK SPACE) are treated as
+   * normal characters.
+   */
+  while (cmdline[0] == 0x09 ||
+         cmdline[0] == 0x0a ||
+         cmdline[0] == 0x0c ||
+         cmdline[0] == 0x0d ||
+         cmdline[0] == 0x20)
+    cmdline++;
+
+  wargv = CommandLineToArgvW (cmdline, &wargc);
+  if (G_UNLIKELY (wargv == NULL))
+    return NULL;
+
+  if (wargc > 0)
+    utf8_buf = g_utf16_to_utf8 (wargv[0], -1, NULL, NULL, NULL);
+
+  LocalFree (wargv);
+
+  if (G_UNLIKELY (utf8_buf == NULL))
+    return NULL;
+
+  /* We could just return cmdline, but I think it's better
+   * to hold on to a smaller malloc block; the arguments
+   * could be large.
+   */
+  base_arg0 = g_path_get_basename (utf8_buf);
+  g_free (utf8_buf);
+  return base_arg0;
 #endif
 
   return NULL;
diff --git a/glib/gqueue.c b/glib/gqueue.c
index 76541f493..0cc7ab200 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -519,8 +519,10 @@ g_queue_push_nth_link (GQueue *queue,
   if (queue->head->prev)
     queue->head = queue->head->prev;
 
-  if (queue->tail->next)
-    queue->tail = queue->tail->next;
+  /* The case where we’re pushing @link_ at the end of @queue is handled above
+   * using g_queue_push_tail_link(), so we should never have to manually adjust
+   * queue->tail. */
+  g_assert (queue->tail->next == NULL);
   
   queue->length++;
 }
@@ -1048,6 +1050,44 @@ g_queue_insert_before (GQueue   *queue,
 }
 
 /**
+ * g_queue_insert_before_link:
+ * @queue: a #GQueue
+ * @sibling: (nullable): a #GList link that must be part of @queue, or %NULL to
+ *   push at the tail of the queue.
+ * @link_: a #GList link to insert which must not be part of any other list.
+ *
+ * Inserts @link_ into @queue before @sibling.
+ *
+ * @sibling must be part of @queue.
+ *
+ * Since: 2.62
+ */
+void
+g_queue_insert_before_link (GQueue   *queue,
+                            GList    *sibling,
+                            GList    *link_)
+{
+  g_return_if_fail (queue != NULL);
+  g_return_if_fail (link_ != NULL);
+  g_return_if_fail (link_->prev == NULL);
+  g_return_if_fail (link_->next == NULL);
+
+  if G_UNLIKELY (sibling == NULL)
+    {
+      /* We don't use g_list_insert_before_link() with a NULL sibling because it
+       * would be a O(n) operation and we would need to update manually the tail
+       * pointer.
+       */
+      g_queue_push_tail_link (queue, link_);
+    }
+  else
+    {
+      queue->head = g_list_insert_before_link (queue->head, sibling, link_);
+      queue->length++;
+    }
+}
+
+/**
  * g_queue_insert_after:
  * @queue: a #GQueue
  * @sibling: (nullable): a #GList link that must be part of @queue, or %NULL to
@@ -1075,6 +1115,35 @@ g_queue_insert_after (GQueue   *queue,
 }
 
 /**
+ * g_queue_insert_after_link:
+ * @queue: a #GQueue
+ * @sibling: (nullable): a #GList link that must be part of @queue, or %NULL to
+ *   push at the head of the queue.
+ * @link_: a #GList link to insert which must not be part of any other list.
+ *
+ * Inserts @link_ into @queue after @sibling.
+ *
+ * @sibling must be part of @queue.
+ *
+ * Since: 2.62
+ */
+void
+g_queue_insert_after_link (GQueue   *queue,
+                           GList    *sibling,
+                           GList    *link_)
+{
+  g_return_if_fail (queue != NULL);
+  g_return_if_fail (link_ != NULL);
+  g_return_if_fail (link_->prev == NULL);
+  g_return_if_fail (link_->next == NULL);
+
+  if G_UNLIKELY (sibling == NULL)
+    g_queue_push_head_link (queue, link_);
+  else
+    g_queue_insert_before_link (queue, sibling->next, link_);
+}
+
+/**
  * g_queue_insert_sorted:
  * @queue: a #GQueue
  * @data: the data to insert
diff --git a/glib/gqueue.h b/glib/gqueue.h
index 2c836553b..65d609f1a 100644
--- a/glib/gqueue.h
+++ b/glib/gqueue.h
@@ -144,10 +144,20 @@ GLIB_AVAILABLE_IN_ALL
 void     g_queue_insert_before  (GQueue           *queue,
                                  GList            *sibling,
                                  gpointer          data);
+GLIB_AVAILABLE_IN_2_62
+void     g_queue_insert_before_link
+                                (GQueue           *queue,
+                                 GList            *sibling,
+                                 GList            *link_);
 GLIB_AVAILABLE_IN_ALL
 void     g_queue_insert_after   (GQueue           *queue,
                                  GList            *sibling,
                                  gpointer          data);
+GLIB_AVAILABLE_IN_2_62
+void     g_queue_insert_after_link
+                                (GQueue           *queue,
+                                 GList            *sibling,
+                                 GList            *link_);
 GLIB_AVAILABLE_IN_ALL
 void     g_queue_insert_sorted  (GQueue           *queue,
                                  gpointer          data,
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 50d464b64..e093bb8bf 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -1533,7 +1533,7 @@ g_scanner_unexp_token (GScanner		*scanner,
 		   "%s%s",
 		   need_valid ? "valid " : "",
 		   symbol_spec);
-      /* FIXME: should we attempt to lookup the symbol_name for symbol_2_token? */
+      /* FIXME: should we attempt to look up the symbol_name for symbol_2_token? */
       break;
     case G_TOKEN_CHAR:
       _g_snprintf (expected_string, expected_string_len, "%scharacter",
diff --git a/glib/gscripttable.h b/glib/gscripttable.h
index ed9542a85..55bc7f4e6 100644
--- a/glib/gscripttable.h
+++ b/glib/gscripttable.h
@@ -803,8 +803,8 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
   G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
   G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
-  G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_DEVANAGARI,
-  G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
+  G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_INHERITED,
+  G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
   G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
   G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
   G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI, G_UNICODE_SCRIPT_DEVANAGARI,
@@ -1071,7 +1071,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_TELUGU,
   G_UNICODE_SCRIPT_TELUGU, G_UNICODE_SCRIPT_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_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_KANNADA,
@@ -1247,24 +1247,24 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
-  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_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_UNKNOWN,
-  G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
-  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_UNKNOWN,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
+  G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LAO,
   G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO, G_UNICODE_SCRIPT_LAO,
@@ -2480,7 +2480,7 @@ static const guchar g_script_easy_table[8192] = {
   G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_COMMON,
   G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_INHERITED,
   G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_COMMON, G_UNICODE_SCRIPT_COMMON,
-  G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_UNKNOWN,
+  G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_INHERITED, G_UNICODE_SCRIPT_COMMON,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN,
   G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_UNKNOWN, G_UNICODE_SCRIPT_LATIN,
   G_UNICODE_SCRIPT_LATIN, G_UNICODE_SCRIPT_LATIN, G_UNICODE_SCRIPT_LATIN,
@@ -2774,8 +2774,7 @@ static const struct {
  { 0x2800,   256, G_UNICODE_SCRIPT_BRAILLE },
  { 0x2900,   628, G_UNICODE_SCRIPT_COMMON },
  { 0x2b76,    32, G_UNICODE_SCRIPT_COMMON },
- { 0x2b98,    49, G_UNICODE_SCRIPT_COMMON },
- { 0x2bca,    53, G_UNICODE_SCRIPT_COMMON },
+ { 0x2b98,   104, G_UNICODE_SCRIPT_COMMON },
  { 0x2c00,    47, G_UNICODE_SCRIPT_GLAGOLITIC },
  { 0x2c30,    47, G_UNICODE_SCRIPT_GLAGOLITIC },
  { 0x2c60,    32, G_UNICODE_SCRIPT_LATIN },
@@ -2797,7 +2796,7 @@ static const struct {
  { 0x2dd0,     7, G_UNICODE_SCRIPT_ETHIOPIC },
  { 0x2dd8,     7, G_UNICODE_SCRIPT_ETHIOPIC },
  { 0x2de0,    32, G_UNICODE_SCRIPT_CYRILLIC },
- { 0x2e00,    79, G_UNICODE_SCRIPT_COMMON },
+ { 0x2e00,    80, G_UNICODE_SCRIPT_COMMON },
  { 0x2e80,    26, G_UNICODE_SCRIPT_HAN },
  { 0x2e9b,    89, G_UNICODE_SCRIPT_HAN },
  { 0x2f00,   214, G_UNICODE_SCRIPT_HAN },
@@ -2832,6 +2831,7 @@ static const struct {
  { 0x3260,    31, G_UNICODE_SCRIPT_HANGUL },
  { 0x327f,    81, G_UNICODE_SCRIPT_COMMON },
  { 0x32d0,    47, G_UNICODE_SCRIPT_KATAKANA },
+ { 0x32ff,     1, G_UNICODE_SCRIPT_COMMON },
  { 0x3300,    88, G_UNICODE_SCRIPT_KATAKANA },
  { 0x3358,   168, G_UNICODE_SCRIPT_COMMON },
  { 0x3400,  6582, G_UNICODE_SCRIPT_HAN },
@@ -2846,7 +2846,8 @@ static const struct {
  { 0xa700,    34, G_UNICODE_SCRIPT_COMMON },
  { 0xa722,   102, G_UNICODE_SCRIPT_LATIN },
  { 0xa788,     3, G_UNICODE_SCRIPT_COMMON },
- { 0xa78b,    47, G_UNICODE_SCRIPT_LATIN },
+ { 0xa78b,    53, G_UNICODE_SCRIPT_LATIN },
+ { 0xa7c2,     5, G_UNICODE_SCRIPT_LATIN },
  { 0xa7f7,     9, G_UNICODE_SCRIPT_LATIN },
  { 0xa800,    44, G_UNICODE_SCRIPT_SYLOTI_NAGRI },
  { 0xa830,    10, G_UNICODE_SCRIPT_COMMON },
@@ -2882,6 +2883,7 @@ static const struct {
  { 0xab5b,     1, G_UNICODE_SCRIPT_COMMON },
  { 0xab5c,     9, G_UNICODE_SCRIPT_LATIN },
  { 0xab65,     1, G_UNICODE_SCRIPT_GREEK },
+ { 0xab66,     2, G_UNICODE_SCRIPT_LATIN },
  { 0xab70,    80, G_UNICODE_SCRIPT_CHEROKEE },
  { 0xabc0,    46, G_UNICODE_SCRIPT_MEETEI_MAYEK },
  { 0xabf0,    10, G_UNICODE_SCRIPT_MEETEI_MAYEK },
@@ -3022,6 +3024,7 @@ static const struct {
  { 0x10e60,    31, G_UNICODE_SCRIPT_ARABIC },
  { 0x10f00,    40, G_UNICODE_SCRIPT_OLD_SOGDIAN },
  { 0x10f30,    42, G_UNICODE_SCRIPT_SOGDIAN },
+ { 0x10fe0,    23, G_UNICODE_SCRIPT_ELYMAIC },
  { 0x11000,    78, G_UNICODE_SCRIPT_BRAHMI },
  { 0x11052,    30, G_UNICODE_SCRIPT_BRAHMI },
  { 0x1107f,     1, G_UNICODE_SCRIPT_BRAHMI },
@@ -3062,7 +3065,7 @@ static const struct {
  { 0x11370,     5, G_UNICODE_SCRIPT_GRANTHA },
  { 0x11400,    90, G_UNICODE_SCRIPT_NEWA },
  { 0x1145b,     1, G_UNICODE_SCRIPT_NEWA },
- { 0x1145d,     2, G_UNICODE_SCRIPT_NEWA },
+ { 0x1145d,     3, G_UNICODE_SCRIPT_NEWA },
  { 0x11480,    72, G_UNICODE_SCRIPT_TIRHUTA },
  { 0x114d0,    10, G_UNICODE_SCRIPT_TIRHUTA },
  { 0x11580,    54, G_UNICODE_SCRIPT_SIDDHAM },
@@ -3070,7 +3073,7 @@ static const struct {
  { 0x11600,    69, G_UNICODE_SCRIPT_MODI },
  { 0x11650,    10, G_UNICODE_SCRIPT_MODI },
  { 0x11660,    13, G_UNICODE_SCRIPT_MONGOLIAN },
- { 0x11680,    56, G_UNICODE_SCRIPT_TAKRI },
+ { 0x11680,    57, G_UNICODE_SCRIPT_TAKRI },
  { 0x116c0,    10, G_UNICODE_SCRIPT_TAKRI },
  { 0x11700,    27, G_UNICODE_SCRIPT_AHOM },
  { 0x1171d,    15, G_UNICODE_SCRIPT_AHOM },
@@ -3078,9 +3081,11 @@ static const struct {
  { 0x11800,    60, G_UNICODE_SCRIPT_DOGRA },
  { 0x118a0,    83, G_UNICODE_SCRIPT_WARANG_CITI },
  { 0x118ff,     1, G_UNICODE_SCRIPT_WARANG_CITI },
+ { 0x119a0,     8, G_UNICODE_SCRIPT_NANDINAGARI },
+ { 0x119aa,    46, G_UNICODE_SCRIPT_NANDINAGARI },
+ { 0x119da,    11, G_UNICODE_SCRIPT_NANDINAGARI },
  { 0x11a00,    72, G_UNICODE_SCRIPT_ZANABAZAR_SQUARE },
- { 0x11a50,    52, G_UNICODE_SCRIPT_SOYOMBO },
- { 0x11a86,    29, G_UNICODE_SCRIPT_SOYOMBO },
+ { 0x11a50,    83, G_UNICODE_SCRIPT_SOYOMBO },
  { 0x11ac0,    57, G_UNICODE_SCRIPT_PAU_CIN_HAU },
  { 0x11c00,     9, G_UNICODE_SCRIPT_BHAIKSUKI },
  { 0x11c0a,    45, G_UNICODE_SCRIPT_BHAIKSUKI },
@@ -3103,11 +3108,14 @@ static const struct {
  { 0x11d93,     6, G_UNICODE_SCRIPT_GUNJALA_GONDI },
  { 0x11da0,    10, G_UNICODE_SCRIPT_GUNJALA_GONDI },
  { 0x11ee0,    25, G_UNICODE_SCRIPT_MAKASAR },
+ { 0x11fc0,    50, G_UNICODE_SCRIPT_TAMIL },
+ { 0x11fff,     1, G_UNICODE_SCRIPT_TAMIL },
  { 0x12000,   922, G_UNICODE_SCRIPT_CUNEIFORM },
  { 0x12400,   111, G_UNICODE_SCRIPT_CUNEIFORM },
  { 0x12470,     5, G_UNICODE_SCRIPT_CUNEIFORM },
  { 0x12480,   196, G_UNICODE_SCRIPT_CUNEIFORM },
  { 0x13000,  1071, G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS },
+ { 0x13430,     9, G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS },
  { 0x14400,   583, G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS },
  { 0x16800,   569, G_UNICODE_SCRIPT_BAMUM },
  { 0x16a40,    31, G_UNICODE_SCRIPT_MRO },
@@ -3121,15 +3129,18 @@ static const struct {
  { 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 },
+ { 0x16f00,    75, G_UNICODE_SCRIPT_MIAO },
+ { 0x16f4f,    57, G_UNICODE_SCRIPT_MIAO },
  { 0x16f8f,    17, G_UNICODE_SCRIPT_MIAO },
  { 0x16fe0,     1, G_UNICODE_SCRIPT_TANGUT },
  { 0x16fe1,     1, G_UNICODE_SCRIPT_NUSHU },
- { 0x17000,  6130, G_UNICODE_SCRIPT_TANGUT },
+ { 0x16fe2,     2, G_UNICODE_SCRIPT_COMMON },
+ { 0x17000,  6136, G_UNICODE_SCRIPT_TANGUT },
  { 0x18800,   755, G_UNICODE_SCRIPT_TANGUT },
  { 0x1b000,     1, G_UNICODE_SCRIPT_KATAKANA },
  { 0x1b001,   286, G_UNICODE_SCRIPT_HIRAGANA },
+ { 0x1b150,     3, G_UNICODE_SCRIPT_HIRAGANA },
+ { 0x1b164,     4, G_UNICODE_SCRIPT_KATAKANA },
  { 0x1b170,   396, G_UNICODE_SCRIPT_NUSHU },
  { 0x1bc00,   107, G_UNICODE_SCRIPT_DUPLOYAN },
  { 0x1bc70,    13, G_UNICODE_SCRIPT_DUPLOYAN },
@@ -3181,12 +3192,19 @@ static const struct {
  { 0x1e01b,     7, G_UNICODE_SCRIPT_GLAGOLITIC },
  { 0x1e023,     2, G_UNICODE_SCRIPT_GLAGOLITIC },
  { 0x1e026,     5, G_UNICODE_SCRIPT_GLAGOLITIC },
+ { 0x1e100,    45, G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG },
+ { 0x1e130,    14, G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG },
+ { 0x1e140,    10, G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG },
+ { 0x1e14e,     2, G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG },
+ { 0x1e2c0,    58, G_UNICODE_SCRIPT_WANCHO },
+ { 0x1e2ff,     1, G_UNICODE_SCRIPT_WANCHO },
  { 0x1e800,   197, G_UNICODE_SCRIPT_MENDE_KIKAKUI },
  { 0x1e8c7,    16, G_UNICODE_SCRIPT_MENDE_KIKAKUI },
- { 0x1e900,    75, G_UNICODE_SCRIPT_ADLAM },
+ { 0x1e900,    76, G_UNICODE_SCRIPT_ADLAM },
  { 0x1e950,    10, G_UNICODE_SCRIPT_ADLAM },
  { 0x1e95e,     2, G_UNICODE_SCRIPT_ADLAM },
  { 0x1ec71,    68, G_UNICODE_SCRIPT_COMMON },
+ { 0x1ed01,    61, G_UNICODE_SCRIPT_COMMON },
  { 0x1ee00,     4, G_UNICODE_SCRIPT_ARABIC },
  { 0x1ee05,    27, G_UNICODE_SCRIPT_ARABIC },
  { 0x1ee21,     2, G_UNICODE_SCRIPT_ARABIC },
@@ -3228,7 +3246,7 @@ static const struct {
  { 0x1f0c1,    15, G_UNICODE_SCRIPT_COMMON },
  { 0x1f0d1,    37, G_UNICODE_SCRIPT_COMMON },
  { 0x1f100,    13, G_UNICODE_SCRIPT_COMMON },
- { 0x1f110,    92, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f110,    93, G_UNICODE_SCRIPT_COMMON },
  { 0x1f170,    61, G_UNICODE_SCRIPT_COMMON },
  { 0x1f1e6,    26, G_UNICODE_SCRIPT_COMMON },
  { 0x1f200,     1, G_UNICODE_SCRIPT_HIRAGANA },
@@ -3237,26 +3255,29 @@ static const struct {
  { 0x1f240,     9, G_UNICODE_SCRIPT_COMMON },
  { 0x1f250,     2, G_UNICODE_SCRIPT_COMMON },
  { 0x1f260,     6, G_UNICODE_SCRIPT_COMMON },
- { 0x1f300,   981, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f300,   982, G_UNICODE_SCRIPT_COMMON },
  { 0x1f6e0,    13, G_UNICODE_SCRIPT_COMMON },
- { 0x1f6f0,    10, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f6f0,    11, G_UNICODE_SCRIPT_COMMON },
  { 0x1f700,   116, G_UNICODE_SCRIPT_COMMON },
  { 0x1f780,    89, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f7e0,    12, G_UNICODE_SCRIPT_COMMON },
  { 0x1f800,    12, G_UNICODE_SCRIPT_COMMON },
  { 0x1f810,    56, G_UNICODE_SCRIPT_COMMON },
  { 0x1f850,    10, G_UNICODE_SCRIPT_COMMON },
  { 0x1f860,    40, G_UNICODE_SCRIPT_COMMON },
  { 0x1f890,    30, G_UNICODE_SCRIPT_COMMON },
  { 0x1f900,    12, G_UNICODE_SCRIPT_COMMON },
- { 0x1f910,    47, G_UNICODE_SCRIPT_COMMON },
- { 0x1f940,    49, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f90d,   101, 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 },
+ { 0x1f97a,    41, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f9a5,     6, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f9ae,    29, G_UNICODE_SCRIPT_COMMON },
+ { 0x1f9cd,   135, G_UNICODE_SCRIPT_COMMON },
  { 0x1fa60,    14, G_UNICODE_SCRIPT_COMMON },
+ { 0x1fa70,     4, G_UNICODE_SCRIPT_COMMON },
+ { 0x1fa78,     3, G_UNICODE_SCRIPT_COMMON },
+ { 0x1fa80,     3, G_UNICODE_SCRIPT_COMMON },
+ { 0x1fa90,     6, 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/gsequence.c b/glib/gsequence.c
index fd5464f06..c0fa9d6c9 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -827,7 +827,7 @@ g_sequence_search (GSequence        *seq,
 /**
  * g_sequence_lookup:
  * @seq: a #GSequence
- * @data: data to lookup
+ * @data: data to look up
  * @cmp_func: the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func
  *
@@ -1115,7 +1115,7 @@ g_sequence_search_iter (GSequence                *seq,
 /**
  * g_sequence_lookup_iter:
  * @seq: a #GSequence
- * @data: data to lookup
+ * @data: data to look up
  * @iter_cmp: the function used to compare iterators in the sequence
  * @cmp_data: user data passed to @iter_cmp
  *
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 78eb71d3e..99ceb15c7 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1988,10 +1988,17 @@ g_strncasecmp (const gchar *s1,
  * changed to the @new_delimiter character. Modifies @string in place,
  * and returns @string itself, not a copy. The return value is to
  * allow nesting such as
- * |[<!-- language="C" --> 
+ * |[<!-- language="C" -->
  *   g_ascii_strup (g_strdelimit (str, "abc", '?'))
  * ]|
  *
+ * In order to modify a copy, you may use `g_strdup()`:
+ * |[<!-- language="C" -->
+ *   reformatted = g_strdelimit (g_strdup (const_str), "abc", '?');
+ *   ...
+ *   g_free (reformatted);
+ * ]|
+ *
  * Returns: @string
  */
 gchar *
@@ -2025,10 +2032,17 @@ g_strdelimit (gchar       *string,
  * replaces the character with @substitutor. Modifies @string in place,
  * and return @string itself, not a copy. The return value is to allow
  * nesting such as
- * |[<!-- language="C" --> 
+ * |[<!-- language="C" -->
  *   g_ascii_strup (g_strcanon (str, "abc", '?'))
  * ]|
  *
+ * In order to modify a copy, you may use `g_strdup()`:
+ * |[<!-- language="C" -->
+ *   reformatted = g_strcanon (g_strdup (const_str), "abc", '?');
+ *   ...
+ *   g_free (reformatted);
+ * ]|
+ *
  * Returns: @string
  */
 gchar *
diff --git a/glib/gtester-report.in b/glib/gtester-report.in
index 01f6033f7..e5121f709 100644
--- a/glib/gtester-report.in
+++ b/glib/gtester-report.in
@@ -15,6 +15,10 @@
 #
 # 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/>.
+
+# Deprecated: Since GLib 2.62, gtester and gtester-report have been deprecated
+# in favour of TAP.
+
 import datetime
 import optparse
 import sys, re, xml.dom.minidom
@@ -343,6 +347,9 @@ class HTMLReportWriter(ReportWriter):
     self.oprint ('<body>\n')
     self.oprint ('<h2>GTester Unit Test Report</h2>\n')
     self.handle_info ()
+    self.oprint ('<p style="color:red;font-weight:bold"><blink>'
+                 'Deprecated: Since GLib 2.62, gtester and gtester-report are '
+                 'deprecated. Port to TAP.</blink></p>\n');
     self.oprint ('<table id="ResultTable" width="100%" border="1">\n<tr>\n')
     self.oprint ('<th>Program / Testcase </th>\n')
     self.oprint ('<th style="width:8em">Duration (sec)</th>\n')
@@ -474,6 +481,10 @@ def main():
   options, files = parse_opts()
   if options is None:
     return 0
+
+  print("Deprecated: Since GLib 2.62, gtester and gtester-report are "
+        "deprecated. Port to TAP.", file=sys.stderr)
+
   xd = xml.dom.minidom.parse (files[0])
   rr = ReportReader()
   rr.trampoline (xd)
diff --git a/glib/gtester.c b/glib/gtester.c
index 368fa8f3d..fdcdaca10 100644
--- a/glib/gtester.c
+++ b/glib/gtester.c
@@ -43,6 +43,7 @@ static gboolean     gtester_quiet = FALSE;
 static gboolean     gtester_verbose = FALSE;
 static gboolean     gtester_list_tests = FALSE;
 static gboolean     gtester_selftest = FALSE;
+static gboolean     gtester_ignore_deprecation = FALSE;
 static gboolean     subtest_running = FALSE;
 static gint         subtest_exitstatus = 0;
 static gboolean     subtest_io_pending = FALSE;
@@ -660,6 +661,11 @@ parse_args (gint    *argc_p,
             }
           argv[i] = NULL;
         }
+      else if (strcmp ("--i-know-this-is-deprecated", argv[i]) == 0)
+        {
+          gtester_ignore_deprecation = TRUE;
+          argv[i] = NULL;
+        }
     }
   /* collapse argv */
   e = 1;
@@ -690,6 +696,10 @@ main (int    argc,
       return 1;
     }
 
+  if (!gtester_ignore_deprecation)
+    g_warning ("Deprecated: Since GLib 2.62, gtester and gtester-report are "
+               "deprecated. Port to TAP.");
+
   if (output_filename)
     {
       int errsv;
@@ -700,6 +710,8 @@ main (int    argc,
     }
 
   test_log_printfe ("<?xml version=\"1.0\"?>\n");
+  test_log_printfe ("<!-- Deprecated: Since GLib 2.62, gtester and "
+                    "gtester-report are deprecated. Port to TAP. -->\n");
   test_log_printfe ("%s<gtester>\n", sindent (log_indent));
   log_indent += 2;
   for (ui = 1; ui < argc; ui++)
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index edf5ba1b5..abdaaa607 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -60,7 +60,6 @@
  * SECTION:testing
  * @title: Testing
  * @short_description: a test framework
- * @see_also: [gtester][gtester], [gtester-report][gtester-report]
  *
  * GLib provides a framework for writing and maintaining unit tests
  * in parallel to the code they are testing. The API is designed according
@@ -235,7 +234,10 @@
  * If you don't have access to the Autotools TAP harness, you can use the
  * [gtester][gtester] and [gtester-report][gtester-report] tools, and use
  * the [glib.mk](https://gitlab.gnome.org/GNOME/glib/blob/glib-2-58/glib.mk)
- * Automake template provided by GLib.
+ * Automake template provided by GLib. Note, however, that since GLib 2.62,
+ * [gtester][gtester] and [gtester-report][gtester-report] have been deprecated
+ * in favour of using TAP. The `--tap` argument to tests is enabled by default
+ * as of GLib 2.62.
  */
 
 /**
@@ -832,7 +834,7 @@ static char       *test_trap_last_stdout = NULL;
 static char       *test_trap_last_stderr = NULL;
 static char       *test_uri_base = NULL;
 static gboolean    test_debug_log = FALSE;
-static gboolean    test_tap_log = FALSE;
+static gboolean    test_tap_log = TRUE;  /* default to TAP as of GLib 2.62; see #1619; the non-TAP output mode is deprecated */
 static gboolean    test_nonfatal_assertions = FALSE;
 static DestroyEntry *test_destroy_queue = NULL;
 static char       *test_argv0 = NULL;
@@ -942,17 +944,24 @@ g_test_log (GTestLogType lbit,
     case G_TEST_LOG_START_SUITE:
       if (test_tap_log)
         {
+          /* We only print the TAP "plan" (1..n) ahead of time if we did
+           * not use the -p option to select specific tests to be run. */
           if (string1[0] != 0)
             g_print ("# Start of %s tests\n", string1);
-          else
+          else if (test_paths == NULL)
             g_print ("1..%d\n", test_count);
         }
       break;
     case G_TEST_LOG_STOP_SUITE:
       if (test_tap_log)
         {
+          /* If we didn't print the TAP "plan" at the beginning because
+           * we were using -p, we need to print how many tests we ran at
+           * the end instead. */
           if (string1[0] != 0)
             g_print ("# End of %s tests\n", string1);
+          else if (test_paths != NULL)
+            g_print ("1..%d\n", test_run_count);
         }
       break;
     case G_TEST_LOG_STOP_CASE:
@@ -994,6 +1003,10 @@ g_test_log (GTestLogType lbit,
       if (result == G_TEST_RUN_SKIPPED || result == G_TEST_RUN_INCOMPLETE)
         test_skipped_count++;
       break;
+    case G_TEST_LOG_SKIP_CASE:
+      if (test_tap_log)
+          g_print ("ok %d %s # SKIP\n", test_run_count, string1);
+      break;
     case G_TEST_LOG_MIN_RESULT:
       if (test_tap_log)
         g_print ("# min perf: %s\n", string1);
@@ -1097,6 +1110,9 @@ parse_args (gint    *argc_p,
               test_log_fd = g_ascii_strtoull (argv[i], NULL, 0);
             }
           argv[i] = NULL;
+
+          /* Force non-TAP output when using gtester */
+          test_tap_log = FALSE;
         }
       else if (strcmp ("--GTestSkipCount", argv[i]) == 0 || strncmp ("--GTestSkipCount=", argv[i], 17) == 0)
         {
@@ -1124,6 +1140,10 @@ parse_args (gint    *argc_p,
           }
 #endif
           argv[i] = NULL;
+
+          /* Force non-TAP output when spawning a subprocess, since people often
+           * test the stdout/stderr of the subprocess strictly */
+          test_tap_log = FALSE;
         }
       else if (strcmp ("-p", argv[i]) == 0 || strncmp ("-p=", argv[i], 3) == 0)
         {
@@ -1231,6 +1251,11 @@ parse_args (gint    *argc_p,
           exit (0);
         }
     }
+
+  /* We've been prepending to test_paths, but its order matters, so
+   * permute it */
+  test_paths = g_slist_reverse (test_paths);
+
   /* collapse argv */
   e = 1;
   for (i = 1; i < argc; i++)
@@ -1535,18 +1560,6 @@ void
       test_tmpdir = g_getenv ("G_TEST_TMPDIR");
     }
 
-  /* sanity check */
-  if (test_tap_log)
-    {
-      if (test_paths || test_startup_skip_count)
-        {
-          /* Not invoking every test (even if SKIPped) breaks the "1..XX" plan */
-          g_printerr ("%s: -p and --GTestSkipCount options are incompatible with --tap\n",
-                      (*argv)[0]);
-          exit (1);
-        }
-    }
-
   /* verify GRand reliability, needed for reliable seeds */
   if (1)
     {
@@ -1893,6 +1906,7 @@ g_test_bug_base (const char *uri_pattern)
  * and @bug_uri_snippet.
  *
  * Since: 2.16
+ * See also: g_test_summary()
  */
 void
 g_test_bug (const char *bug_uri_snippet)
@@ -1916,6 +1930,31 @@ g_test_bug (const char *bug_uri_snippet)
 }
 
 /**
+ * g_test_summary:
+ * @summary: One or two sentences summarising what the test checks, and how it
+ *    checks it.
+ *
+ * Set the summary for a test, which describes what the test checks, and how it
+ * goes about checking it. This may be included in test report output, and is
+ * useful documentation for anyone reading the source code or modifying a test
+ * in future. It must be a single line.
+ *
+ * This should be called at the top of a test function.
+ *
+ * Since: 2.62
+ * See also: g_test_bug()
+ */
+void
+g_test_summary (const char *summary)
+{
+  g_return_if_fail (summary != NULL);
+  g_return_if_fail (strchr (summary, '\n') == NULL);
+  g_return_if_fail (strchr (summary, '\r') == NULL);
+
+  g_test_message ("%s summary: %s", test_run_name, summary);
+}
+
+/**
  * g_test_get_root:
  *
  * Get the toplevel test suite for the test path API.
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 237b0dd10..7a0715c82 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -321,6 +321,8 @@ GLIB_AVAILABLE_IN_ALL
 void    g_test_bug_base                 (const char *uri_pattern);
 GLIB_AVAILABLE_IN_ALL
 void    g_test_bug                      (const char *bug_uri_snippet);
+GLIB_AVAILABLE_IN_2_62
+void    g_test_summary                  (const char *summary);
 /* measure test timings */
 GLIB_AVAILABLE_IN_ALL
 void    g_test_timer_start              (void);
diff --git a/glib/gthread.h b/glib/gthread.h
index 80b0ef99b..c8761c5e6 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -405,6 +405,152 @@ g_rec_mutex_locker_free (GRecMutexLocker *locker)
   g_rec_mutex_unlock ((GRecMutex *) locker);
 }
 
+/**
+ * GRWLockWriterLocker:
+ *
+ * Opaque type. See g_rw_lock_writer_locker_new() for details.
+ * Since: 2.62
+ */
+typedef void GRWLockWriterLocker;
+
+/**
+ * g_rw_lock_writer_locker_new:
+ * @rw_lock: a #GRWLock
+ *
+ * Obtain a write lock on @rw_lock and return a new #GRWLockWriterLocker.
+ * Unlock with g_rw_lock_writer_locker_free(). Using g_rw_lock_writer_unlock()
+ * on @rw_lock while a #GRWLockWriterLocker exists can lead to undefined
+ * behaviour.
+ *
+ * This is intended to be used with g_autoptr().  Note that g_autoptr()
+ * is only available when using GCC or clang, so the following example
+ * will only work with those compilers:
+ * |[
+ * typedef struct
+ * {
+ *   ...
+ *   GRWLock rw_lock;
+ *   GPtrArray *array;
+ *   ...
+ * } MyObject;
+ *
+ * static gchar *
+ * my_object_get_data (MyObject *self, guint index)
+ * {
+ *   g_autoptr(GRWLockReaderLocker) locker = g_rw_lock_reader_locker_new (&self->rw_lock);
+ *
+ *   // Code with a read lock obtained on rw_lock here
+ *
+ *   if (self->array == NULL)
+ *     // No need to unlock
+ *     return NULL;
+ *
+ *   if (index < self->array->len)
+ *     // No need to unlock
+ *     return g_ptr_array_index (self->array, index);
+ *
+ *   // Optionally early unlock
+ *   g_clear_pointer (&locker, g_rw_lock_reader_locker_free);
+ *
+ *   // Code with rw_lock unlocked here
+ *   return NULL;
+ * }
+ *
+ * static void
+ * my_object_set_data (MyObject *self, guint index, gpointer data)
+ * {
+ *   g_autoptr(GRWLockWriterLocker) locker = g_rw_lock_writer_locker_new (&self->rw_lock);
+ *
+ *   // Code with a write lock obtained on rw_lock here
+ *
+ *   if (self->array == NULL)
+ *     self->array = g_ptr_array_new ();
+ *
+ *   if (cond)
+ *     // No need to unlock
+ *     return;
+ *
+ *   if (index >= self->array->len)
+ *     g_ptr_array_set_size (self->array, index+1);
+ *   g_ptr_array_index (self->array, index) = data;
+ *
+ *   // Optionally early unlock
+ *   g_clear_pointer (&locker, g_rw_lock_writer_locker_free);
+ *
+ *   // Code with rw_lock unlocked here
+ * }
+ * ]|
+ *
+ * Returns: a #GRWLockWriterLocker
+ * Since: 2.62
+ */
+static inline GRWLockWriterLocker *
+g_rw_lock_writer_locker_new (GRWLock *rw_lock)
+{
+  g_rw_lock_writer_lock (rw_lock);
+  return (GRWLockWriterLocker *) rw_lock;
+}
+
+/**
+ * g_rw_lock_writer_locker_free:
+ * @locker: a GRWLockWriterLocker
+ *
+ * Release a write lock on @locker's read-write lock. See
+ * g_rw_lock_writer_locker_new() for details.
+ *
+ * Since: 2.62
+ */
+static inline void
+g_rw_lock_writer_locker_free (GRWLockWriterLocker *locker)
+{
+  g_rw_lock_writer_unlock ((GRWLock *) locker);
+}
+
+/**
+ * GRWLockReaderLocker:
+ *
+ * Opaque type. See g_rw_lock_reader_locker_new() for details.
+ * Since: 2.62
+ */
+typedef void GRWLockReaderLocker;
+
+/**
+ * g_rw_lock_reader_locker_new:
+ * @rw_lock: a #GRWLock
+ *
+ * Obtain a read lock on @rw_lock and return a new #GRWLockReaderLocker.
+ * Unlock with g_rw_lock_reader_locker_free(). Using g_rw_lock_reader_unlock()
+ * on @rw_lock while a #GRWLockReaderLocker exists can lead to undefined
+ * behaviour.
+ *
+ * This is intended to be used with g_autoptr(). For a code sample, see
+ * g_rw_lock_writer_locker_new().
+ *
+ * Returns: a #GRWLockReaderLocker
+ * Since: 2.62
+ */
+static inline GRWLockReaderLocker *
+g_rw_lock_reader_locker_new (GRWLock *rw_lock)
+{
+  g_rw_lock_reader_lock (rw_lock);
+  return (GRWLockReaderLocker *) rw_lock;
+}
+
+/**
+ * g_rw_lock_reader_locker_free:
+ * @locker: a GRWLockReaderLocker
+ *
+ * Release a read lock on @locker's read-write lock. See
+ * g_rw_lock_reader_locker_new() for details.
+ *
+ * Since: 2.62
+ */
+static inline void
+g_rw_lock_reader_locker_free (GRWLockReaderLocker *locker)
+{
+  g_rw_lock_reader_unlock ((GRWLock *) locker);
+}
+
 G_END_DECLS
 
 #endif /* __G_THREAD_H__ */
diff --git a/glib/gtree.c b/glib/gtree.c
index 324cdafa0..115f44659 100644
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -48,7 +48,7 @@
  *
  * To insert a key/value pair into a #GTree use g_tree_insert().
  *
- * To lookup the value corresponding to a given key, use
+ * To look up the value corresponding to a given key, use
  * g_tree_lookup() and g_tree_lookup_extended().
  *
  * To find out the number of nodes in a #GTree, use g_tree_nnodes(). To
diff --git a/glib/gunibreak.h b/glib/gunibreak.h
index 3b71b179d..5e0780673 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 "11.0.0"
+#define G_UNICODE_DATA_VERSION "12.1.0"
 
 #define G_UNICODE_LAST_CHAR 0x10FFFF
 
@@ -1507,7 +1507,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_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, 
@@ -1774,33 +1774,33 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, 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_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, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    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_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, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
-    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, 
+    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_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
     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_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, 
     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_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
-    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, 
+    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_COMPLEX_CONTEXT, 
@@ -3513,11 +3513,11 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, 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_COMBINING_MARK, 
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     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_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
@@ -5042,7 +5042,6 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_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, 
@@ -5069,7 +5068,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
   { /* page 44, index 39 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -5365,7 +5365,7 @@ static const gint8 break_property_data[][256] = {
     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_ALPHABETIC, 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, 
@@ -5390,7 +5390,6 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_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, 
@@ -5403,7 +5402,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5448,13 +5448,12 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
   { /* page 47, index 42 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -6003,7 +6002,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_UNKNOWN
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
   { /* page 77, index 46 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -6618,13 +6617,13 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_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_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, 
@@ -7094,7 +7093,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -15347,18 +15346,18 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_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, 
@@ -15927,7 +15926,7 @@ static const gint8 break_property_data[][256] = {
     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_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, 
@@ -16227,7 +16226,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN, 
+    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, 
@@ -16525,7 +16524,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 282, index 127 */
+  { /* page 281, index 127 */
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_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_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_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_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, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_BEFORE, 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, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    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 282, index 128 */
     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, 
@@ -16591,7 +16720,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -16653,7 +16782,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 284, index 128 */
+  { /* page 284, 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, 
@@ -16782,7 +16911,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 285, index 129 */
+  { /* page 285, index 130 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -16912,7 +17041,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 286, index 130 */
+  { /* page 286, index 131 */
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -17042,7 +17171,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 291, index 131 */
+  { /* page 287, index 132 */
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_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_POSTFIX, 
+    G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_POSTFIX, 
+    G_UNICODE_BREAK_POSTFIX, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_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_AFTER
+  },
+  { /* page 291, 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, 
@@ -17172,7 +17431,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 292, index 132 */
+  { /* page 292, 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, 
@@ -17301,7 +17560,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 293, index 133 */
+  { /* page 293, 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, 
@@ -17431,7 +17690,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 306, index 134 */
+  { /* page 306, 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, 
@@ -17561,7 +17820,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 307, index 135 */
+  { /* page 307, 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, 
@@ -17691,7 +17950,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 308, index 136 */
+  { /* page 308, 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, 
@@ -17716,11 +17975,11 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_NON_BREAKING_GLUE, 
+    G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_NON_BREAKING_GLUE, 
+    G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_NON_BREAKING_GLUE, 
+    G_UNICODE_BREAK_NON_BREAKING_GLUE, G_UNICODE_BREAK_OPEN_PUNCTUATION, 
+    G_UNICODE_BREAK_CLOSE_PUNCTUATION, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -17821,7 +18080,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 325, index 137 */
+  { /* page 325, 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, 
@@ -17951,7 +18210,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 326, index 138 */
+  { /* page 326, 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, 
@@ -18081,7 +18340,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 362, index 139 */
+  { /* page 362, index 141 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -18210,7 +18469,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 363, index 140 */
+  { /* page 363, 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, 
@@ -18340,7 +18599,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 366, index 141 */
+  { /* page 366, index 143 */
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -18470,7 +18729,10 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 367, index 142 */
+  { /* page 367, index 144 */
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -18507,10 +18769,7 @@ static const gint8 break_property_data[][256] = {
     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_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, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -18534,11 +18793,11 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_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_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, 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, 
@@ -18584,7 +18843,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_NON_STARTER, G_UNICODE_BREAK_NON_STARTER, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_NON_STARTER, G_UNICODE_BREAK_NON_STARTER, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -18600,7 +18859,10 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 391, index 143 */
+  { /* page 391, 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, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -18722,15 +18984,12 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     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 394, index 144 */
+  { /* page 394, 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, 
@@ -18860,7 +19119,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 433, index 145 */
+  { /* page 433, index 147 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -18901,6 +19160,9 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -18909,14 +19171,14 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, 
+    G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
-    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_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, 
@@ -18988,9 +19250,9 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
+    G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 434, index 146 */
+  { /* page 434, index 148 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -19120,7 +19382,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 444, index 147 */
+  { /* page 444, 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, 
@@ -19250,7 +19512,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 464, index 148 */
+  { /* page 464, 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, 
@@ -19380,7 +19642,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 465, index 149 */
+  { /* page 465, 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, 
@@ -19510,7 +19772,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 466, index 150 */
+  { /* page 466, 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, 
@@ -19640,7 +19902,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 467, index 151 */
+  { /* page 467, 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, 
@@ -19770,7 +20032,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 468, index 152 */
+  { /* page 468, 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, 
@@ -19900,7 +20162,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 469, index 153 */
+  { /* page 469, 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, 
@@ -20030,7 +20292,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 470, index 154 */
+  { /* page 470, index 156 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20160,7 +20422,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
   },
-  { /* page 471, index 155 */
+  { /* page 471, index 157 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20290,7 +20552,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
     G_UNICODE_BREAK_NUMERIC, G_UNICODE_BREAK_NUMERIC
   },
-  { /* page 474, index 156 */
+  { /* page 474, index 158 */
     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, 
@@ -20419,7 +20681,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 480, index 157 */
+  { /* page 480, index 159 */
     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, 
@@ -20549,7 +20811,267 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 488, index 158 */
+  { /* page 481, index 160 */
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_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_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_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_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, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    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 482, index 161 */
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_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_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
+    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_PREFIX
+  },
+  { /* page 488, index 162 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20679,7 +21201,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 489, index 159 */
+  { /* page 489, index 163 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -20717,7 +21239,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
     G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
-    G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN, 
+    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_NUMERIC, G_UNICODE_BREAK_NUMERIC, 
@@ -20809,7 +21331,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 492, index 160 */
+  { /* page 492, index 164 */
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -20939,7 +21461,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 494, index 161 */
+  { /* page 493, index 165 */
+    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_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
+    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 166 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21069,7 +21721,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 497, index 162 */
+  { /* page 497, index 167 */
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -21124,7 +21776,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
     G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -21199,7 +21851,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_REGIONAL_INDICATOR, G_UNICODE_BREAK_REGIONAL_INDICATOR, 
     G_UNICODE_BREAK_REGIONAL_INDICATOR, G_UNICODE_BREAK_REGIONAL_INDICATOR
   },
-  { /* page 499, index 163 */
+  { /* page 499, index 168 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21329,7 +21981,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_EMOJI_MODIFIER, G_UNICODE_BREAK_EMOJI_MODIFIER, 
     G_UNICODE_BREAK_EMOJI_MODIFIER, G_UNICODE_BREAK_EMOJI_MODIFIER
   },
-  { /* page 500, index 164 */
+  { /* page 500, index 169 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -21383,9 +22035,9 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     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_EMOJI_BASE, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
+    G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
+    G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
@@ -21401,8 +22053,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_EMOJI_BASE, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, 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 +22111,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 501, index 165 */
+  { /* page 501, index 170 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21589,7 +22241,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 502, index 166 */
+  { /* page 502, 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 +22371,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 503, index 167 */
+  { /* page 503, index 172 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21849,7 +22501,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 504, index 168 */
+  { /* page 504, index 173 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21979,7 +22631,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 505, index 169 */
+  { /* page 505, index 174 */
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -21987,14 +22639,14 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
     G_UNICODE_BREAK_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_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_EMOJI_BASE, 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_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -22010,7 +22662,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     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_EMOJI_BASE, 
+    G_UNICODE_BREAK_EMOJI_BASE, 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, 
@@ -22073,6 +22725,7 @@ static const gint8 break_property_data[][256] = {
     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_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, 
@@ -22081,9 +22734,8 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
-    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
+    G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_EMOJI_BASE, 
+    G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
     G_UNICODE_BREAK_EMOJI_BASE, G_UNICODE_BREAK_EMOJI_BASE, 
@@ -22109,7 +22761,137 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC
   },
-  { /* page 511, index 170 */
+  { /* page 506, index 175 */
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
+    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_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_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_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_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_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
+  },
+  { /* page 511, index 176 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -22239,7 +23021,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 767, index 171 */
+  { /* page 767, index 177 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -22369,7 +23151,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 1023, index 172 */
+  { /* page 1023, index 178 */
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -22499,7 +23281,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 3584, index 173 */
+  { /* page 3584, index 179 */
     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, 
@@ -22629,7 +23411,7 @@ static const gint8 break_property_data[][256] = {
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
     G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
   },
-  { /* page 3585, index 174 */
+  { /* page 3585, index 180 */
     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, 
@@ -23044,19 +23826,19 @@ static const gint16 break_property_table_part1[763] = {
   124 /* page 278 */,
   125 /* page 279 */,
   126 /* page 280 */,
+  127 /* page 281 */,
+  128 /* page 282 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  127 /* page 282 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  128 /* page 284 */,
-  129 /* page 285 */,
-  130 /* page 286 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  129 /* page 284 */,
+  130 /* page 285 */,
+  131 /* page 286 */,
+  132 /* page 287 */,
   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,
-  131 /* page 291 */,
-  132 /* page 292 */,
-  133 /* page 293 */,
+  133 /* page 291 */,
+  134 /* page 292 */,
+  135 /* 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,
@@ -23069,9 +23851,9 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  134 /* page 306 */,
-  135 /* page 307 */,
-  136 /* page 308 */,
+  136 /* page 306 */,
+  137 /* page 307 */,
+  138 /* 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,
@@ -23088,8 +23870,8 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  137 /* page 325 */,
-  138 /* page 326 */,
+  139 /* page 325 */,
+  140 /* 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,
@@ -23125,12 +23907,12 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  139 /* page 362 */,
-  140 /* page 363 */,
+  141 /* page 362 */,
+  142 /* page 363 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  141 /* page 366 */,
-  142 /* page 367 */,
+  143 /* page 366 */,
+  144 /* 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,
@@ -23154,10 +23936,10 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  143 /* page 391 */,
+  145 /* page 391 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  144 /* page 394 */,
+  146 /* 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,
@@ -23196,8 +23978,8 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  145 /* page 433 */,
-  146 /* page 434 */,
+  147 /* page 433 */,
+  148 /* 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,
@@ -23207,7 +23989,7 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  147 /* page 444 */,
+  149 /* 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,
@@ -23227,54 +24009,54 @@ static const gint16 break_property_table_part1[763] = {
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  148 /* page 464 */,
-  149 /* page 465 */,
-  150 /* page 466 */,
-  151 /* page 467 */,
-  152 /* page 468 */,
-  153 /* page 469 */,
-  154 /* page 470 */,
-  155 /* page 471 */,
+  150 /* page 464 */,
+  151 /* page 465 */,
+  152 /* page 466 */,
+  153 /* page 467 */,
+  154 /* page 468 */,
+  155 /* page 469 */,
+  156 /* page 470 */,
+  157 /* page 471 */,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_BREAK_ALPHABETIC + G_UNICODE_MAX_TABLE_INDEX,
-  156 /* page 474 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  158 /* 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,
-  157 /* page 480 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  159 /* page 480 */,
+  160 /* page 481 */,
+  161 /* page 482 */,
   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,
+  162 /* page 488 */,
+  163 /* page 489 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  158 /* page 488 */,
-  159 /* page 489 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
+  164 /* page 492 */,
+  165 /* page 493 */,
+  166 /* page 494 */,
   G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  160 /* page 492 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  161 /* page 494 */,
-  G_UNICODE_BREAK_UNKNOWN + G_UNICODE_MAX_TABLE_INDEX,
-  G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  162 /* page 497 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
-  163 /* page 499 */,
-  164 /* page 500 */,
-  165 /* page 501 */,
-  166 /* page 502 */,
-  167 /* page 503 */,
-  168 /* page 504 */,
-  169 /* page 505 */,
+  167 /* page 497 */,
   G_UNICODE_BREAK_IDEOGRAPHIC + G_UNICODE_MAX_TABLE_INDEX,
+  168 /* page 499 */,
+  169 /* page 500 */,
+  170 /* page 501 */,
+  171 /* page 502 */,
+  172 /* page 503 */,
+  173 /* page 504 */,
+  174 /* page 505 */,
+  175 /* page 506 */,
   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,
-  170 /* page 511 */,
+  176 /* 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,
@@ -23530,8 +24312,8 @@ static const gint16 break_property_table_part1[763] = {
 
 /* U+E0000 through U+10FFFF */
 static const gint16 break_property_table_part2[768] = {
-  173 /* page 3584 */,
-  174 /* page 3585 */,
+  179 /* page 3584 */,
+  180 /* 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 4bb6b5794..712daa665 100644
--- a/glib/gunichartables.h
+++ b/glib/gunichartables.h
@@ -4,7 +4,7 @@
 #ifndef CHARTABLES_H
 #define CHARTABLES_H
 
-#define G_UNICODE_DATA_VERSION "11.0.0"
+#define G_UNICODE_DATA_VERSION "12.1.0"
 
 #define G_UNICODE_LAST_CHAR 0x10ffff
 
@@ -1410,7 +1410,7 @@ static const char type_data[][256] = {
     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_OTHER_PUNCTUATION, 
     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_LETTER, 
@@ -1605,26 +1605,26 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, 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_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_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_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_UNASSIGNED, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 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_NON_SPACING_MARK, 
     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_UNASSIGNED, 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_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2192,7 +2192,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_SYMBOL, 
     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, 
@@ -2833,11 +2833,11 @@ static const char type_data[][256] = {
     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_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    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_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 29, index 27 */
@@ -4051,7 +4051,6 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -4069,7 +4068,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL
   },
   { /* page 44, index 39 */
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -4340,7 +4340,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_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_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -4356,7 +4357,6 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -4365,7 +4365,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 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, 
@@ -4395,11 +4395,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    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, 
@@ -4763,7 +4763,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED
+    G_UNICODE_OTHER_SYMBOL
   },
   { /* page 77, index 46 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -5321,6 +5321,12 @@ static const char type_data[][256] = {
     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_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_UPPERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
+    G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_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, 
@@ -5337,11 +5343,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_MODIFIER_LETTER, 
+    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
@@ -5515,35 +5517,36 @@ static const char type_data[][256] = {
     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_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
-    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     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_OTHER_PUNCTUATION, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_MODIFIER_LETTER, 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_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_OTHER_PUNCTUATION, 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_NON_SPACING_MARK, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION, 
+    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_NON_SPACING_MARK, 
+    G_UNICODE_MODIFIER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 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_DECIMAL_NUMBER, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_OTHER_LETTER, G_UNICODE_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
   },
   { /* page 170, index 54 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -5688,10 +5691,10 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
+    G_UNICODE_LOWERCASE_LETTER, G_UNICODE_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_LOWERCASE_LETTER, 
+    G_UNICODE_UNASSIGNED, 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, 
@@ -7698,15 +7701,15 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_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
@@ -8133,7 +8136,7 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    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, 
@@ -8357,7 +8360,7 @@ static const char type_data[][256] = {
     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_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -8578,7 +8581,97 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER
   },
-  { /* page 282, index 86 */
+  { /* page 281, index 86 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_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_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_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_UNASSIGNED, G_UNICODE_UNASSIGNED, 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_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_LETTER, 
+    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, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 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 282, index 87 */
     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, 
@@ -8630,7 +8723,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_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, 
@@ -8677,7 +8770,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 284, index 87 */
+  { /* page 284, 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_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -8776,7 +8869,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 285, index 88 */
+  { /* page 285, index 89 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_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, 
@@ -8869,7 +8962,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 286, index 89 */
+  { /* page 286, index 90 */
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -8958,7 +9051,96 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 291, index 90 */
+  { /* page 287, index 91 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_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_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_CURRENCY_SYMBOL, 
+    G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_CURRENCY_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_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_PUNCTUATION
+  },
+  { /* page 291, 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, 
@@ -9046,7 +9228,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 292, index 91 */
+  { /* page 292, index 93 */
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER, 
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER, 
     G_UNICODE_LETTER_NUMBER, G_UNICODE_LETTER_NUMBER, 
@@ -9153,7 +9335,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER
   },
-  { /* page 293, index 92 */
+  { /* page 293, 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, 
@@ -9241,7 +9423,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 308, index 93 */
+  { /* page 308, 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, 
@@ -9258,6 +9440,9 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, 
+    G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, 
+    G_UNICODE_FORMAT, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -9323,13 +9508,9 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, 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 326, index 94 */
+  { /* page 326, 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, 
@@ -9417,7 +9598,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 362, index 95 */
+  { /* page 362, index 97 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9507,7 +9688,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 363, index 96 */
+  { /* page 363, 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, 
@@ -9599,7 +9780,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 366, index 97 */
+  { /* page 366, index 99 */
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -9698,7 +9879,9 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 367, index 98 */
+  { /* page 367, 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, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9723,9 +9906,10 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_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_NON_SPACING_MARK, 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_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
@@ -9743,9 +9927,6 @@ static const char type_data[][256] = {
     G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 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, 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_MODIFIER_LETTER, 
@@ -9777,6 +9958,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_MODIFIER_LETTER, 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_UNASSIGNED, 
@@ -9786,10 +9968,11 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 391, index 99 */
+  { /* page 391, 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, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -9873,11 +10056,9 @@ static const char type_data[][256] = {
     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 100 */
+  { /* page 394, 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, 
@@ -9965,7 +10146,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 433, index 101 */
+  { /* page 433, 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, 
@@ -9992,15 +10173,15 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_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_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, 
@@ -10053,7 +10234,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 434, index 102 */
+  { /* page 434, index 104 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -10141,7 +10322,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 444, index 103 */
+  { /* page 444, index 105 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -10229,7 +10410,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 464, index 104 */
+  { /* page 464, 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, 
@@ -10317,7 +10498,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 465, index 105 */
+  { /* page 465, 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, 
@@ -10409,7 +10590,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 466, index 106 */
+  { /* page 466, index 108 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -10497,7 +10678,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 467, index 107 */
+  { /* page 467, index 109 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -10585,7 +10766,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 468, index 108 */
+  { /* page 468, index 110 */
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -10714,7 +10895,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER
   },
-  { /* page 469, index 109 */
+  { /* page 469, index 111 */
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -10843,7 +11024,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER
   },
-  { /* page 470, index 110 */
+  { /* page 470, index 112 */
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -10973,7 +11154,7 @@ static const char type_data[][256] = {
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER
   },
-  { /* page 471, index 111 */
+  { /* page 471, index 113 */
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
     G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -11103,7 +11284,7 @@ static const char type_data[][256] = {
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER
   },
-  { /* page 474, index 112 */
+  { /* page 474, index 114 */
     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, 
@@ -11214,7 +11395,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 480, index 113 */
+  { /* page 480, index 115 */
     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, 
@@ -11308,7 +11489,188 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 488, index 114 */
+  { /* page 481, index 116 */
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_MODIFIER_LETTER, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_MODIFIER_LETTER, G_UNICODE_MODIFIER_LETTER, 
+    G_UNICODE_MODIFIER_LETTER, G_UNICODE_MODIFIER_LETTER, 
+    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_OTHER_LETTER, 
+    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, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, 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 482, index 117 */
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_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_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_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_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_CURRENCY_SYMBOL
+  },
+  { /* page 488, index 118 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -11397,7 +11759,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 489, index 115 */
+  { /* page 489, index 119 */
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -11435,9 +11797,9 @@ static const char type_data[][256] = {
     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_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_MODIFIER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
+    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, 
@@ -11499,7 +11861,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 492, index 116 */
+  { /* page 492, index 120 */
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -11587,7 +11949,95 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 494, index 117 */
+  { /* page 493, index 121 */
+    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_SYMBOL, 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, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 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 122 */
     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, 
@@ -11675,7 +12125,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 496, index 118 */
+  { /* page 496, 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, 
@@ -11763,7 +12213,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 497, index 119 */
+  { /* page 497, index 124 */
     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, 
@@ -11800,7 +12250,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_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, 
@@ -11851,7 +12301,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL
   },
-  { /* page 498, index 120 */
+  { /* page 498, index 125 */
     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, 
@@ -11939,7 +12389,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 499, index 121 */
+  { /* page 499, index 126 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12028,7 +12478,7 @@ static const char type_data[][256] = {
     G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_MODIFIER_SYMBOL, 
     G_UNICODE_MODIFIER_SYMBOL
   },
-  { /* page 502, index 122 */
+  { /* page 502, index 127 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12100,7 +12550,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_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, 
@@ -12112,11 +12562,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 503, index 123 */
+  { /* page 503, index 128 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12191,11 +12641,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_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_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -12204,7 +12654,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 504, index 124 */
+  { /* page 504, index 129 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12292,12 +12742,11 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 505, index 125 */
+  { /* page 505, index 130 */
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_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_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12314,7 +12763,6 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12330,11 +12778,13 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_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, 
@@ -12348,20 +12798,19 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_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_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_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_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -12378,37 +12827,38 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL
   },
-  { /* 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, 
+  { /* page 506, index 131 */
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_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, 
@@ -12418,19 +12868,19 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_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_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
+    G_UNICODE_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_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, 
@@ -12468,7 +12918,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 678, index 127 */
+  { /* page 678, 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, 
@@ -12556,7 +13006,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 695, index 128 */
+  { /* page 695, index 133 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12644,7 +13094,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 696, index 129 */
+  { /* page 696, index 134 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12732,7 +13182,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 718, index 130 */
+  { /* page 718, index 135 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12820,7 +13270,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER
   },
-  { /* page 747, index 131 */
+  { /* page 747, index 136 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12908,7 +13358,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 762, index 132 */
+  { /* page 762, index 137 */
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -12996,7 +13446,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 3584, index 133 */
+  { /* page 3584, index 138 */
     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, 
@@ -13076,7 +13526,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
-  { /* page 3585, index 134 */
+  { /* page 3585, index 139 */
     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, 
@@ -13204,7 +13654,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 4095, index 135 */
+  { /* page 4095, index 140 */
     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, 
@@ -13292,7 +13742,7 @@ static const char type_data[][256] = {
     G_UNICODE_PRIVATE_USE, G_UNICODE_PRIVATE_USE, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED
   },
-  { /* page 4351, index 136 */
+  { /* page 4351, index 141 */
     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, 
@@ -13665,19 +14115,19 @@ static const gint16 type_table_part1[763] = {
   83 /* page 278 */,
   84 /* page 279 */,
   85 /* page 280 */,
+  86 /* page 281 */,
+  87 /* page 282 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  86 /* page 282 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  87 /* page 284 */,
-  88 /* page 285 */,
-  89 /* page 286 */,
-  G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  88 /* page 284 */,
+  89 /* page 285 */,
+  90 /* page 286 */,
+  91 /* page 287 */,
   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 291 */,
-  91 /* page 292 */,
-  92 /* page 293 */,
+  92 /* page 291 */,
+  93 /* page 292 */,
+  94 /* 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,
@@ -13692,7 +14142,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  93 /* page 308 */,
+  95 /* 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,
@@ -13710,7 +14160,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  94 /* page 326 */,
+  96 /* 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,
@@ -13746,12 +14196,12 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  95 /* page 362 */,
-  96 /* page 363 */,
+  97 /* page 362 */,
+  98 /* page 363 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  97 /* page 366 */,
-  98 /* page 367 */,
+  99 /* page 366 */,
+  100 /* 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,
@@ -13775,10 +14225,10 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  99 /* page 391 */,
+  101 /* page 391 */,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  100 /* page 394 */,
+  102 /* 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,
@@ -13817,8 +14267,8 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  101 /* page 433 */,
-  102 /* page 434 */,
+  103 /* page 433 */,
+  104 /* 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,
@@ -13828,7 +14278,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  103 /* page 444 */,
+  105 /* 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,
@@ -13848,49 +14298,49 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  104 /* page 464 */,
-  105 /* page 465 */,
-  106 /* page 466 */,
-  107 /* page 467 */,
-  108 /* page 468 */,
-  109 /* page 469 */,
-  110 /* page 470 */,
-  111 /* page 471 */,
+  106 /* page 464 */,
+  107 /* page 465 */,
+  108 /* page 466 */,
+  109 /* page 467 */,
+  110 /* page 468 */,
+  111 /* page 469 */,
+  112 /* page 470 */,
+  113 /* page 471 */,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
-  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,
+  114 /* page 474 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  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,
+  115 /* page 480 */,
+  116 /* page 481 */,
+  117 /* page 482 */,
   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,
-  114 /* page 488 */,
-  115 /* page 489 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
+  118 /* page 488 */,
+  119 /* page 489 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  116 /* page 492 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  117 /* page 494 */,
+  120 /* page 492 */,
+  121 /* page 493 */,
+  122 /* page 494 */,
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
-  118 /* page 496 */,
-  119 /* page 497 */,
-  120 /* page 498 */,
-  121 /* page 499 */,
+  123 /* page 496 */,
+  124 /* page 497 */,
+  125 /* page 498 */,
+  126 /* page 499 */,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_SYMBOL + G_UNICODE_MAX_TABLE_INDEX,
-  122 /* page 502 */,
-  123 /* page 503 */,
-  124 /* page 504 */,
-  125 /* page 505 */,
-  126 /* page 506 */,
+  127 /* page 502 */,
+  128 /* page 503 */,
+  129 /* page 504 */,
+  130 /* page 505 */,
+  131 /* 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,
@@ -14062,7 +14512,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  127 /* page 678 */,
+  132 /* 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,
@@ -14079,8 +14529,8 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  128 /* page 695 */,
-  129 /* page 696 */,
+  133 /* page 695 */,
+  134 /* 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,
@@ -14102,7 +14552,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  130 /* page 718 */,
+  135 /* 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,
@@ -14131,7 +14581,7 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  131 /* page 747 */,
+  136 /* 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,
@@ -14146,13 +14596,13 @@ static const gint16 type_table_part1[763] = {
   G_UNICODE_UNASSIGNED + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_OTHER_LETTER + G_UNICODE_MAX_TABLE_INDEX,
-  132 /* page 762 */
+  137 /* page 762 */
 };
 
 /* U+E0000 through U+10FFFF */
 static const gint16 type_table_part2[768] = {
-  133 /* page 3584 */,
-  134 /* page 3585 */,
+  138 /* page 3584 */,
+  139 /* 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,
@@ -14662,7 +15112,7 @@ static const gint16 type_table_part2[768] = {
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
-  135 /* page 4095 */,
+  140 /* 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,
@@ -14918,7 +15368,7 @@ static const gint16 type_table_part2[768] = {
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
   G_UNICODE_PRIVATE_USE + G_UNICODE_MAX_TABLE_INDEX,
-  136 /* page 4351 */
+  141 /* page 4351 */
 };
 
 static const gunichar attr_data[][256] = {
@@ -14999,7 +15449,7 @@ static const gunichar attr_data[][256] = {
     0x0194, 0x0000, 0xa78d, 0xa7aa, 0x0000, 0x0197, 0x0196, 0xa7ae, 0x2c62, 
     0xa7ad, 0x0000, 0x0000, 0x019c, 0x0000, 0x2c6e, 0x019d, 0x0000, 0x0000, 
     0x019f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2c64, 
-    0x0000, 0x0000, 0x01a6, 0x0000, 0x0000, 0x01a9, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x01a6, 0x0000, 0xa7c5, 0x01a9, 0x0000, 0x0000, 0x0000, 
     0xa7b1, 0x01ae, 0x0244, 0x01b1, 0x01b2, 0x0245, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x01b7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0xa7b2, 0xa7b0, 0x0000, 0x0000, 0x0000, 
@@ -15651,7 +16101,7 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0xa77d, 0x0000, 0x0000, 0x0000, 0x2c63, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa7c6, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -15873,13 +16323,13 @@ static const gunichar attr_data[][256] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0xa77a, 0xa779, 0xa77c, 0xa77b, 0x1d79, 
     0xa77f, 0xa77e, 0xa781, 0xa780, 0xa783, 0xa782, 0xa785, 0xa784, 0xa787, 
     0xa786, 0x0000, 0x0000, 0x0000, 0xa78c, 0xa78b, 0x0265, 0x0000, 0x0000, 
-    0xa791, 0xa790, 0xa793, 0xa792, 0x0000, 0x0000, 0xa797, 0xa796, 0xa799, 
+    0xa791, 0xa790, 0xa793, 0xa792, 0xa7c4, 0x0000, 0xa797, 0xa796, 0xa799, 
     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, 0xa7b9, 0xa7b8, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0xa7b5, 0xa7b4, 0xa7b7, 0xa7b6, 0xa7b9, 0xa7b8, 0xa7bb, 0xa7ba, 0xa7bd, 
+    0xa7bc, 0xa7bf, 0xa7be, 0x0000, 0x0000, 0xa7c3, 0xa7c2, 0xa794, 0x0282, 
+    0x1d8e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -16575,7 +17025,69 @@ static const gunichar attr_data[][256] = {
     0x0007, 0x0008, 0x0009, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 
     0x0006, 0x0007, 0x0008, 0x0009
   },
-  { /* page 489, index 53 */
+  { /* page 481, index 53 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 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
+  },
+  { /* page 482, index 54 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 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
+  },
+  { /* page 489, index 55 */
     0x1e922, 0x1e923, 0x1e924, 0x1e925, 0x1e926, 0x1e927, 0x1e928, 0x1e929, 
     0x1e92a, 0x1e92b, 0x1e92c, 0x1e92d, 0x1e92e, 0x1e92f, 0x1e930, 0x1e931, 
     0x1e932, 0x1e933, 0x1e934, 0x1e935, 0x1e936, 0x1e937, 0x1e938, 0x1e939, 
@@ -17092,15 +17604,15 @@ static const gint16 attr_table_part1[763] = {
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
+  53 /* page 481 */,
+  54 /* page 482 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  0x0000 + G_UNICODE_MAX_TABLE_INDEX,
-  53 /* page 489 */,
+  55 /* page 489 */,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
   0x0000 + G_UNICODE_MAX_TABLE_INDEX,
@@ -18613,8 +19125,7 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0x31C0, 0x31E3},
 {0x31F0, 0x321E},
 {0x3220, 0x3247},
-{0x3250, 0x32FE},
-{0x3300, 0x4DBF},
+{0x3250, 0x4DBF},
 {0x4E00, 0xA48C},
 {0xA490, 0xA4C6},
 {0xA960, 0xA97C},
@@ -18626,10 +19137,12 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0xFE68, 0xFE6B},
 {0xFF01, 0xFF60},
 {0xFFE0, 0xFFE6},
-{0x16FE0, 0x16FE1},
-{0x17000, 0x187F1},
+{0x16FE0, 0x16FE3},
+{0x17000, 0x187F7},
 {0x18800, 0x18AF2},
 {0x1B000, 0x1B11E},
+{0x1B150, 0x1B152},
+{0x1B164, 0x1B167},
 {0x1B170, 0x1B2FB},
 {0x1F004, 0x1F004},
 {0x1F0CF, 0x1F0CF},
@@ -18661,16 +19174,20 @@ static const struct Interval g_unicode_width_table_wide[] = {
 {0x1F680, 0x1F6C5},
 {0x1F6CC, 0x1F6CC},
 {0x1F6D0, 0x1F6D2},
+{0x1F6D5, 0x1F6D5},
 {0x1F6EB, 0x1F6EC},
-{0x1F6F4, 0x1F6F9},
-{0x1F910, 0x1F93E},
-{0x1F940, 0x1F970},
+{0x1F6F4, 0x1F6FA},
+{0x1F7E0, 0x1F7EB},
+{0x1F90D, 0x1F971},
 {0x1F973, 0x1F976},
-{0x1F97A, 0x1F97A},
-{0x1F97C, 0x1F9A2},
-{0x1F9B0, 0x1F9B9},
-{0x1F9C0, 0x1F9C2},
-{0x1F9D0, 0x1F9FF},
+{0x1F97A, 0x1F9A2},
+{0x1F9A5, 0x1F9AA},
+{0x1F9AE, 0x1F9CA},
+{0x1F9CD, 0x1F9FF},
+{0x1FA70, 0x1FA73},
+{0x1FA78, 0x1FA7A},
+{0x1FA80, 0x1FA82},
+{0x1FA90, 0x1FA95},
 {0x20000, 0x2FFFD},
 {0x30000, 0x3FFFD},
 };
diff --git a/glib/gunicode.h b/glib/gunicode.h
index 36f841b9d..700a3f2d9 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -607,7 +607,13 @@ typedef enum
   G_UNICODE_SCRIPT_MAKASAR,                /* Maka */
   G_UNICODE_SCRIPT_MEDEFAIDRIN,            /* Medf */
   G_UNICODE_SCRIPT_OLD_SOGDIAN,            /* Sogo */
-  G_UNICODE_SCRIPT_SOGDIAN                 /* Sogd */
+  G_UNICODE_SCRIPT_SOGDIAN,                /* Sogd */
+
+  /* Unicode 12.0 additions */
+  G_UNICODE_SCRIPT_ELYMAIC,                /* Elym */
+  G_UNICODE_SCRIPT_NANDINAGARI,            /* Nand */
+  G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG, /* Rohg */
+  G_UNICODE_SCRIPT_WANCHO                  /* Wcho */
 } GUnicodeScript;
 
 GLIB_AVAILABLE_IN_ALL
diff --git a/glib/gunidecomp.h b/glib/gunidecomp.h
index 02f2c9191..b28eeda61 100644
--- a/glib/gunidecomp.h
+++ b/glib/gunidecomp.h
@@ -173,7 +173,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 118, 118, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 118, 118, 9, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 122, 122, 122, 122, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -656,7 +656,20 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 282, index 48 */
+  { /* page 281, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 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
+  },
+  { /* page 282, 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, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 
@@ -669,7 +682,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 284, index 49 */
+  { /* page 284, 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, 9, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -682,7 +695,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 285, index 50 */
+  { /* page 285, 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, 7, 0, 9, 9, 0, 0, 
@@ -695,7 +708,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 362, index 51 */
+  { /* page 362, 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, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -708,7 +721,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 363, index 52 */
+  { /* page 363, 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, 
     230, 230, 230, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -721,7 +734,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 444, index 53 */
+  { /* page 444, 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, 
@@ -734,7 +747,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 465, index 54 */
+  { /* page 465, 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, 0, 0, 0, 0, 0, 0, 
@@ -748,7 +761,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 466, index 55 */
+  { /* page 466, index 56 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 
@@ -761,7 +774,7 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 480, index 56 */
+  { /* page 480, index 57 */
     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, 
@@ -775,7 +788,33 @@ static const guchar cclass_data[][256] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 488, index 57 */
+  { /* page 481, 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, 
+    230, 230, 230, 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
+  },
+  { /* page 482, index 59 */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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
+  },
+  { /* page 488, index 60 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -788,7 +827,7 @@ static const guchar cclass_data[][256] = {
     220, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   },
-  { /* page 489, index 58 */
+  { /* page 489, index 61 */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 
@@ -1085,13 +1124,11 @@ static const gint16 combining_class_table_part1[763] = {
   45 /* page 278 */,
   46 /* page 279 */,
   47 /* page 280 */,
+  48 /* page 281 */,
+  49 /* page 282 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  48 /* page 282 */,
-  0 + G_UNICODE_MAX_TABLE_INDEX,
-  49 /* page 284 */,
-  50 /* page 285 */,
-  0 + G_UNICODE_MAX_TABLE_INDEX,
-  0 + G_UNICODE_MAX_TABLE_INDEX,
+  50 /* page 284 */,
+  51 /* page 285 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1166,10 +1203,10 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  51 /* page 362 */,
-  52 /* page 363 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  52 /* page 362 */,
+  53 /* page 363 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1248,9 +1285,9 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  53 /* page 444 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  54 /* page 444 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1269,10 +1306,10 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  54 /* page 465 */,
-  55 /* page 466 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  55 /* page 465 */,
+  56 /* page 466 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -1284,16 +1321,18 @@ static const gint16 combining_class_table_part1[763] = {
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  56 /* page 480 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
+  57 /* page 480 */,
+  58 /* page 481 */,
+  59 /* page 482 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
-  57 /* page 488 */,
-  58 /* page 489 */,
+  60 /* page 488 */,
+  61 /* page 489 */,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
   0 + G_UNICODE_MAX_TABLE_INDEX,
@@ -4428,1461 +4467,1462 @@ static const decomposition decomp_table[] =
   { 0x32fc, G_UNICODE_NOT_PRESENT_OFFSET, 8984 },
   { 0x32fd, G_UNICODE_NOT_PRESENT_OFFSET, 8988 },
   { 0x32fe, G_UNICODE_NOT_PRESENT_OFFSET, 8992 },
-  { 0x3300, G_UNICODE_NOT_PRESENT_OFFSET, 8996 },
-  { 0x3301, G_UNICODE_NOT_PRESENT_OFFSET, 9012 },
-  { 0x3302, G_UNICODE_NOT_PRESENT_OFFSET, 9025 },
-  { 0x3303, G_UNICODE_NOT_PRESENT_OFFSET, 9041 },
-  { 0x3304, G_UNICODE_NOT_PRESENT_OFFSET, 9051 },
-  { 0x3305, G_UNICODE_NOT_PRESENT_OFFSET, 9067 },
-  { 0x3306, G_UNICODE_NOT_PRESENT_OFFSET, 9077 },
-  { 0x3307, G_UNICODE_NOT_PRESENT_OFFSET, 9087 },
-  { 0x3308, G_UNICODE_NOT_PRESENT_OFFSET, 9106 },
-  { 0x3309, G_UNICODE_NOT_PRESENT_OFFSET, 9119 },
-  { 0x330a, G_UNICODE_NOT_PRESENT_OFFSET, 9129 },
-  { 0x330b, G_UNICODE_NOT_PRESENT_OFFSET, 9139 },
-  { 0x330c, G_UNICODE_NOT_PRESENT_OFFSET, 9149 },
-  { 0x330d, G_UNICODE_NOT_PRESENT_OFFSET, 9162 },
-  { 0x330e, G_UNICODE_NOT_PRESENT_OFFSET, 9175 },
-  { 0x330f, G_UNICODE_NOT_PRESENT_OFFSET, 9188 },
-  { 0x3310, G_UNICODE_NOT_PRESENT_OFFSET, 9201 },
-  { 0x3311, G_UNICODE_NOT_PRESENT_OFFSET, 9214 },
-  { 0x3312, G_UNICODE_NOT_PRESENT_OFFSET, 9227 },
-  { 0x3313, G_UNICODE_NOT_PRESENT_OFFSET, 9240 },
-  { 0x3314, G_UNICODE_NOT_PRESENT_OFFSET, 9259 },
-  { 0x3315, G_UNICODE_NOT_PRESENT_OFFSET, 9266 },
-  { 0x3316, G_UNICODE_NOT_PRESENT_OFFSET, 9285 },
-  { 0x3317, G_UNICODE_NOT_PRESENT_OFFSET, 9304 },
-  { 0x3318, G_UNICODE_NOT_PRESENT_OFFSET, 9320 },
-  { 0x3319, G_UNICODE_NOT_PRESENT_OFFSET, 9333 },
-  { 0x331a, G_UNICODE_NOT_PRESENT_OFFSET, 9352 },
-  { 0x331b, G_UNICODE_NOT_PRESENT_OFFSET, 9371 },
-  { 0x331c, G_UNICODE_NOT_PRESENT_OFFSET, 9384 },
-  { 0x331d, G_UNICODE_NOT_PRESENT_OFFSET, 9394 },
-  { 0x331e, G_UNICODE_NOT_PRESENT_OFFSET, 9404 },
-  { 0x331f, G_UNICODE_NOT_PRESENT_OFFSET, 9417 },
-  { 0x3320, G_UNICODE_NOT_PRESENT_OFFSET, 9430 },
-  { 0x3321, G_UNICODE_NOT_PRESENT_OFFSET, 9446 },
-  { 0x3322, G_UNICODE_NOT_PRESENT_OFFSET, 9462 },
-  { 0x3323, G_UNICODE_NOT_PRESENT_OFFSET, 9472 },
-  { 0x3324, G_UNICODE_NOT_PRESENT_OFFSET, 9482 },
-  { 0x3325, G_UNICODE_NOT_PRESENT_OFFSET, 9495 },
-  { 0x3326, G_UNICODE_NOT_PRESENT_OFFSET, 9505 },
-  { 0x3327, G_UNICODE_NOT_PRESENT_OFFSET, 9515 },
-  { 0x3328, G_UNICODE_NOT_PRESENT_OFFSET, 9522 },
-  { 0x3329, G_UNICODE_NOT_PRESENT_OFFSET, 9529 },
-  { 0x332a, G_UNICODE_NOT_PRESENT_OFFSET, 9539 },
-  { 0x332b, G_UNICODE_NOT_PRESENT_OFFSET, 9549 },
-  { 0x332c, G_UNICODE_NOT_PRESENT_OFFSET, 9568 },
-  { 0x332d, G_UNICODE_NOT_PRESENT_OFFSET, 9581 },
-  { 0x332e, G_UNICODE_NOT_PRESENT_OFFSET, 9597 },
-  { 0x332f, G_UNICODE_NOT_PRESENT_OFFSET, 9616 },
-  { 0x3330, G_UNICODE_NOT_PRESENT_OFFSET, 9629 },
-  { 0x3331, G_UNICODE_NOT_PRESENT_OFFSET, 9639 },
-  { 0x3332, G_UNICODE_NOT_PRESENT_OFFSET, 9649 },
-  { 0x3333, G_UNICODE_NOT_PRESENT_OFFSET, 9668 },
-  { 0x3334, G_UNICODE_NOT_PRESENT_OFFSET, 9681 },
-  { 0x3335, G_UNICODE_NOT_PRESENT_OFFSET, 9700 },
-  { 0x3336, G_UNICODE_NOT_PRESENT_OFFSET, 9710 },
-  { 0x3337, G_UNICODE_NOT_PRESENT_OFFSET, 9726 },
-  { 0x3338, G_UNICODE_NOT_PRESENT_OFFSET, 9736 },
-  { 0x3339, G_UNICODE_NOT_PRESENT_OFFSET, 9749 },
-  { 0x333a, G_UNICODE_NOT_PRESENT_OFFSET, 9759 },
-  { 0x333b, G_UNICODE_NOT_PRESENT_OFFSET, 9772 },
-  { 0x333c, G_UNICODE_NOT_PRESENT_OFFSET, 9788 },
-  { 0x333d, G_UNICODE_NOT_PRESENT_OFFSET, 9801 },
-  { 0x333e, G_UNICODE_NOT_PRESENT_OFFSET, 9817 },
-  { 0x333f, G_UNICODE_NOT_PRESENT_OFFSET, 9830 },
-  { 0x3340, G_UNICODE_NOT_PRESENT_OFFSET, 9837 },
-  { 0x3341, G_UNICODE_NOT_PRESENT_OFFSET, 9853 },
-  { 0x3342, G_UNICODE_NOT_PRESENT_OFFSET, 9863 },
-  { 0x3343, G_UNICODE_NOT_PRESENT_OFFSET, 9873 },
-  { 0x3344, G_UNICODE_NOT_PRESENT_OFFSET, 9886 },
-  { 0x3345, G_UNICODE_NOT_PRESENT_OFFSET, 9896 },
-  { 0x3346, G_UNICODE_NOT_PRESENT_OFFSET, 9906 },
-  { 0x3347, G_UNICODE_NOT_PRESENT_OFFSET, 9916 },
-  { 0x3348, G_UNICODE_NOT_PRESENT_OFFSET, 9932 },
-  { 0x3349, G_UNICODE_NOT_PRESENT_OFFSET, 9945 },
-  { 0x334a, G_UNICODE_NOT_PRESENT_OFFSET, 9952 },
-  { 0x334b, G_UNICODE_NOT_PRESENT_OFFSET, 9971 },
-  { 0x334c, G_UNICODE_NOT_PRESENT_OFFSET, 9981 },
-  { 0x334d, G_UNICODE_NOT_PRESENT_OFFSET, 9997 },
-  { 0x334e, G_UNICODE_NOT_PRESENT_OFFSET, 10010 },
-  { 0x334f, G_UNICODE_NOT_PRESENT_OFFSET, 10023 },
-  { 0x3350, G_UNICODE_NOT_PRESENT_OFFSET, 10033 },
-  { 0x3351, G_UNICODE_NOT_PRESENT_OFFSET, 10043 },
-  { 0x3352, G_UNICODE_NOT_PRESENT_OFFSET, 10056 },
-  { 0x3353, G_UNICODE_NOT_PRESENT_OFFSET, 10063 },
-  { 0x3354, G_UNICODE_NOT_PRESENT_OFFSET, 10076 },
-  { 0x3355, G_UNICODE_NOT_PRESENT_OFFSET, 10092 },
-  { 0x3356, G_UNICODE_NOT_PRESENT_OFFSET, 10099 },
-  { 0x3357, G_UNICODE_NOT_PRESENT_OFFSET, 10118 },
-  { 0x3358, G_UNICODE_NOT_PRESENT_OFFSET, 10128 },
-  { 0x3359, G_UNICODE_NOT_PRESENT_OFFSET, 10133 },
-  { 0x335a, G_UNICODE_NOT_PRESENT_OFFSET, 10138 },
-  { 0x335b, G_UNICODE_NOT_PRESENT_OFFSET, 10143 },
-  { 0x335c, G_UNICODE_NOT_PRESENT_OFFSET, 10148 },
-  { 0x335d, G_UNICODE_NOT_PRESENT_OFFSET, 10153 },
-  { 0x335e, G_UNICODE_NOT_PRESENT_OFFSET, 10158 },
-  { 0x335f, G_UNICODE_NOT_PRESENT_OFFSET, 10163 },
-  { 0x3360, G_UNICODE_NOT_PRESENT_OFFSET, 10168 },
-  { 0x3361, G_UNICODE_NOT_PRESENT_OFFSET, 10173 },
-  { 0x3362, G_UNICODE_NOT_PRESENT_OFFSET, 10178 },
-  { 0x3363, G_UNICODE_NOT_PRESENT_OFFSET, 10184 },
-  { 0x3364, G_UNICODE_NOT_PRESENT_OFFSET, 10190 },
-  { 0x3365, G_UNICODE_NOT_PRESENT_OFFSET, 10196 },
-  { 0x3366, G_UNICODE_NOT_PRESENT_OFFSET, 10202 },
-  { 0x3367, G_UNICODE_NOT_PRESENT_OFFSET, 10208 },
-  { 0x3368, G_UNICODE_NOT_PRESENT_OFFSET, 10214 },
-  { 0x3369, G_UNICODE_NOT_PRESENT_OFFSET, 10220 },
-  { 0x336a, G_UNICODE_NOT_PRESENT_OFFSET, 10226 },
-  { 0x336b, G_UNICODE_NOT_PRESENT_OFFSET, 10232 },
-  { 0x336c, G_UNICODE_NOT_PRESENT_OFFSET, 10238 },
-  { 0x336d, G_UNICODE_NOT_PRESENT_OFFSET, 10244 },
-  { 0x336e, G_UNICODE_NOT_PRESENT_OFFSET, 10250 },
-  { 0x336f, G_UNICODE_NOT_PRESENT_OFFSET, 10256 },
-  { 0x3370, G_UNICODE_NOT_PRESENT_OFFSET, 10262 },
-  { 0x3371, G_UNICODE_NOT_PRESENT_OFFSET, 10268 },
-  { 0x3372, G_UNICODE_NOT_PRESENT_OFFSET, 10272 },
-  { 0x3373, G_UNICODE_NOT_PRESENT_OFFSET, 10275 },
-  { 0x3374, G_UNICODE_NOT_PRESENT_OFFSET, 10278 },
-  { 0x3375, G_UNICODE_NOT_PRESENT_OFFSET, 10282 },
-  { 0x3376, G_UNICODE_NOT_PRESENT_OFFSET, 10285 },
-  { 0x3377, G_UNICODE_NOT_PRESENT_OFFSET, 10288 },
-  { 0x3378, G_UNICODE_NOT_PRESENT_OFFSET, 10291 },
-  { 0x3379, G_UNICODE_NOT_PRESENT_OFFSET, 10295 },
-  { 0x337a, G_UNICODE_NOT_PRESENT_OFFSET, 10299 },
-  { 0x337b, G_UNICODE_NOT_PRESENT_OFFSET, 10302 },
-  { 0x337c, G_UNICODE_NOT_PRESENT_OFFSET, 10309 },
-  { 0x337d, G_UNICODE_NOT_PRESENT_OFFSET, 10316 },
-  { 0x337e, G_UNICODE_NOT_PRESENT_OFFSET, 10323 },
-  { 0x337f, G_UNICODE_NOT_PRESENT_OFFSET, 10330 },
-  { 0x3380, G_UNICODE_NOT_PRESENT_OFFSET, 10343 },
-  { 0x3381, G_UNICODE_NOT_PRESENT_OFFSET, 10346 },
-  { 0x3382, G_UNICODE_NOT_PRESENT_OFFSET, 10349 },
-  { 0x3383, G_UNICODE_NOT_PRESENT_OFFSET, 10353 },
-  { 0x3384, G_UNICODE_NOT_PRESENT_OFFSET, 10356 },
-  { 0x3385, G_UNICODE_NOT_PRESENT_OFFSET, 10359 },
-  { 0x3386, G_UNICODE_NOT_PRESENT_OFFSET, 10362 },
-  { 0x3387, G_UNICODE_NOT_PRESENT_OFFSET, 10365 },
-  { 0x3388, G_UNICODE_NOT_PRESENT_OFFSET, 10368 },
-  { 0x3389, G_UNICODE_NOT_PRESENT_OFFSET, 10372 },
-  { 0x338a, G_UNICODE_NOT_PRESENT_OFFSET, 10377 },
-  { 0x338b, G_UNICODE_NOT_PRESENT_OFFSET, 10380 },
-  { 0x338c, G_UNICODE_NOT_PRESENT_OFFSET, 10383 },
-  { 0x338d, G_UNICODE_NOT_PRESENT_OFFSET, 10387 },
-  { 0x338e, G_UNICODE_NOT_PRESENT_OFFSET, 10391 },
-  { 0x338f, G_UNICODE_NOT_PRESENT_OFFSET, 10394 },
-  { 0x3390, G_UNICODE_NOT_PRESENT_OFFSET, 10397 },
-  { 0x3391, G_UNICODE_NOT_PRESENT_OFFSET, 10400 },
-  { 0x3392, G_UNICODE_NOT_PRESENT_OFFSET, 10404 },
-  { 0x3393, G_UNICODE_NOT_PRESENT_OFFSET, 10408 },
-  { 0x3394, G_UNICODE_NOT_PRESENT_OFFSET, 10412 },
-  { 0x3395, G_UNICODE_NOT_PRESENT_OFFSET, 10416 },
-  { 0x3396, G_UNICODE_NOT_PRESENT_OFFSET, 10420 },
-  { 0x3397, G_UNICODE_NOT_PRESENT_OFFSET, 10423 },
-  { 0x3398, G_UNICODE_NOT_PRESENT_OFFSET, 10426 },
-  { 0x3399, G_UNICODE_NOT_PRESENT_OFFSET, 10429 },
-  { 0x339a, G_UNICODE_NOT_PRESENT_OFFSET, 10432 },
-  { 0x339b, G_UNICODE_NOT_PRESENT_OFFSET, 10435 },
-  { 0x339c, G_UNICODE_NOT_PRESENT_OFFSET, 10439 },
-  { 0x339d, G_UNICODE_NOT_PRESENT_OFFSET, 10442 },
-  { 0x339e, G_UNICODE_NOT_PRESENT_OFFSET, 10445 },
-  { 0x339f, G_UNICODE_NOT_PRESENT_OFFSET, 10448 },
-  { 0x33a0, G_UNICODE_NOT_PRESENT_OFFSET, 10452 },
-  { 0x33a1, G_UNICODE_NOT_PRESENT_OFFSET, 10456 },
-  { 0x33a2, G_UNICODE_NOT_PRESENT_OFFSET, 10459 },
-  { 0x33a3, G_UNICODE_NOT_PRESENT_OFFSET, 10463 },
-  { 0x33a4, G_UNICODE_NOT_PRESENT_OFFSET, 10467 },
-  { 0x33a5, G_UNICODE_NOT_PRESENT_OFFSET, 10471 },
-  { 0x33a6, G_UNICODE_NOT_PRESENT_OFFSET, 10474 },
-  { 0x33a7, G_UNICODE_NOT_PRESENT_OFFSET, 10478 },
-  { 0x33a8, G_UNICODE_NOT_PRESENT_OFFSET, 10484 },
-  { 0x33a9, G_UNICODE_NOT_PRESENT_OFFSET, 10491 },
-  { 0x33aa, G_UNICODE_NOT_PRESENT_OFFSET, 10494 },
-  { 0x33ab, G_UNICODE_NOT_PRESENT_OFFSET, 10498 },
-  { 0x33ac, G_UNICODE_NOT_PRESENT_OFFSET, 10502 },
-  { 0x33ad, G_UNICODE_NOT_PRESENT_OFFSET, 10506 },
-  { 0x33ae, G_UNICODE_NOT_PRESENT_OFFSET, 10510 },
-  { 0x33af, G_UNICODE_NOT_PRESENT_OFFSET, 10518 },
-  { 0x33b0, G_UNICODE_NOT_PRESENT_OFFSET, 10527 },
-  { 0x33b1, G_UNICODE_NOT_PRESENT_OFFSET, 10530 },
-  { 0x33b2, G_UNICODE_NOT_PRESENT_OFFSET, 10533 },
-  { 0x33b3, G_UNICODE_NOT_PRESENT_OFFSET, 10537 },
-  { 0x33b4, G_UNICODE_NOT_PRESENT_OFFSET, 10540 },
-  { 0x33b5, G_UNICODE_NOT_PRESENT_OFFSET, 10543 },
-  { 0x33b6, G_UNICODE_NOT_PRESENT_OFFSET, 10546 },
-  { 0x33b7, G_UNICODE_NOT_PRESENT_OFFSET, 10550 },
-  { 0x33b8, G_UNICODE_NOT_PRESENT_OFFSET, 10553 },
-  { 0x33b9, G_UNICODE_NOT_PRESENT_OFFSET, 10556 },
-  { 0x33ba, G_UNICODE_NOT_PRESENT_OFFSET, 10559 },
-  { 0x33bb, G_UNICODE_NOT_PRESENT_OFFSET, 10562 },
-  { 0x33bc, G_UNICODE_NOT_PRESENT_OFFSET, 10565 },
-  { 0x33bd, G_UNICODE_NOT_PRESENT_OFFSET, 10569 },
-  { 0x33be, G_UNICODE_NOT_PRESENT_OFFSET, 10572 },
-  { 0x33bf, G_UNICODE_NOT_PRESENT_OFFSET, 10575 },
-  { 0x33c0, G_UNICODE_NOT_PRESENT_OFFSET, 10578 },
-  { 0x33c1, G_UNICODE_NOT_PRESENT_OFFSET, 10582 },
-  { 0x33c2, G_UNICODE_NOT_PRESENT_OFFSET, 10586 },
-  { 0x33c3, G_UNICODE_NOT_PRESENT_OFFSET, 10591 },
-  { 0x33c4, G_UNICODE_NOT_PRESENT_OFFSET, 10594 },
-  { 0x33c5, G_UNICODE_NOT_PRESENT_OFFSET, 10597 },
-  { 0x33c6, G_UNICODE_NOT_PRESENT_OFFSET, 10600 },
-  { 0x33c7, G_UNICODE_NOT_PRESENT_OFFSET, 10607 },
-  { 0x33c8, G_UNICODE_NOT_PRESENT_OFFSET, 10611 },
-  { 0x33c9, G_UNICODE_NOT_PRESENT_OFFSET, 10614 },
-  { 0x33ca, G_UNICODE_NOT_PRESENT_OFFSET, 10617 },
-  { 0x33cb, G_UNICODE_NOT_PRESENT_OFFSET, 10620 },
-  { 0x33cc, G_UNICODE_NOT_PRESENT_OFFSET, 10623 },
-  { 0x33cd, G_UNICODE_NOT_PRESENT_OFFSET, 10626 },
-  { 0x33ce, G_UNICODE_NOT_PRESENT_OFFSET, 10629 },
-  { 0x33cf, G_UNICODE_NOT_PRESENT_OFFSET, 10632 },
-  { 0x33d0, G_UNICODE_NOT_PRESENT_OFFSET, 10635 },
-  { 0x33d1, G_UNICODE_NOT_PRESENT_OFFSET, 10638 },
-  { 0x33d2, G_UNICODE_NOT_PRESENT_OFFSET, 10641 },
-  { 0x33d3, G_UNICODE_NOT_PRESENT_OFFSET, 10645 },
-  { 0x33d4, G_UNICODE_NOT_PRESENT_OFFSET, 10648 },
-  { 0x33d5, G_UNICODE_NOT_PRESENT_OFFSET, 10651 },
-  { 0x33d6, G_UNICODE_NOT_PRESENT_OFFSET, 10655 },
-  { 0x33d7, G_UNICODE_NOT_PRESENT_OFFSET, 10659 },
-  { 0x33d8, G_UNICODE_NOT_PRESENT_OFFSET, 10662 },
-  { 0x33d9, G_UNICODE_NOT_PRESENT_OFFSET, 10667 },
-  { 0x33da, G_UNICODE_NOT_PRESENT_OFFSET, 10671 },
-  { 0x33db, G_UNICODE_NOT_PRESENT_OFFSET, 10674 },
-  { 0x33dc, G_UNICODE_NOT_PRESENT_OFFSET, 10677 },
-  { 0x33dd, G_UNICODE_NOT_PRESENT_OFFSET, 10680 },
-  { 0x33de, G_UNICODE_NOT_PRESENT_OFFSET, 10683 },
-  { 0x33df, G_UNICODE_NOT_PRESENT_OFFSET, 10689 },
-  { 0x33e0, G_UNICODE_NOT_PRESENT_OFFSET, 10695 },
-  { 0x33e1, G_UNICODE_NOT_PRESENT_OFFSET, 10700 },
-  { 0x33e2, G_UNICODE_NOT_PRESENT_OFFSET, 10705 },
-  { 0x33e3, G_UNICODE_NOT_PRESENT_OFFSET, 10710 },
-  { 0x33e4, G_UNICODE_NOT_PRESENT_OFFSET, 10715 },
-  { 0x33e5, G_UNICODE_NOT_PRESENT_OFFSET, 10720 },
-  { 0x33e6, G_UNICODE_NOT_PRESENT_OFFSET, 10725 },
-  { 0x33e7, G_UNICODE_NOT_PRESENT_OFFSET, 10730 },
-  { 0x33e8, G_UNICODE_NOT_PRESENT_OFFSET, 10735 },
-  { 0x33e9, G_UNICODE_NOT_PRESENT_OFFSET, 10740 },
-  { 0x33ea, G_UNICODE_NOT_PRESENT_OFFSET, 10746 },
-  { 0x33eb, G_UNICODE_NOT_PRESENT_OFFSET, 10752 },
-  { 0x33ec, G_UNICODE_NOT_PRESENT_OFFSET, 10758 },
-  { 0x33ed, G_UNICODE_NOT_PRESENT_OFFSET, 10764 },
-  { 0x33ee, G_UNICODE_NOT_PRESENT_OFFSET, 10770 },
-  { 0x33ef, G_UNICODE_NOT_PRESENT_OFFSET, 10776 },
-  { 0x33f0, G_UNICODE_NOT_PRESENT_OFFSET, 10782 },
-  { 0x33f1, G_UNICODE_NOT_PRESENT_OFFSET, 10788 },
-  { 0x33f2, G_UNICODE_NOT_PRESENT_OFFSET, 10794 },
-  { 0x33f3, G_UNICODE_NOT_PRESENT_OFFSET, 10800 },
-  { 0x33f4, G_UNICODE_NOT_PRESENT_OFFSET, 10806 },
-  { 0x33f5, G_UNICODE_NOT_PRESENT_OFFSET, 10812 },
-  { 0x33f6, G_UNICODE_NOT_PRESENT_OFFSET, 10818 },
-  { 0x33f7, G_UNICODE_NOT_PRESENT_OFFSET, 10824 },
-  { 0x33f8, G_UNICODE_NOT_PRESENT_OFFSET, 10830 },
-  { 0x33f9, G_UNICODE_NOT_PRESENT_OFFSET, 10836 },
-  { 0x33fa, G_UNICODE_NOT_PRESENT_OFFSET, 10842 },
-  { 0x33fb, G_UNICODE_NOT_PRESENT_OFFSET, 10848 },
-  { 0x33fc, G_UNICODE_NOT_PRESENT_OFFSET, 10854 },
-  { 0x33fd, G_UNICODE_NOT_PRESENT_OFFSET, 10860 },
-  { 0x33fe, G_UNICODE_NOT_PRESENT_OFFSET, 10866 },
-  { 0x33ff, G_UNICODE_NOT_PRESENT_OFFSET, 10872 },
-  { 0xa69c, G_UNICODE_NOT_PRESENT_OFFSET, 10876 },
-  { 0xa69d, G_UNICODE_NOT_PRESENT_OFFSET, 10879 },
-  { 0xa770, G_UNICODE_NOT_PRESENT_OFFSET, 10882 },
-  { 0xa7f8, G_UNICODE_NOT_PRESENT_OFFSET, 10886 },
-  { 0xa7f9, G_UNICODE_NOT_PRESENT_OFFSET, 10889 },
-  { 0xab5c, G_UNICODE_NOT_PRESENT_OFFSET, 10892 },
-  { 0xab5d, G_UNICODE_NOT_PRESENT_OFFSET, 10896 },
-  { 0xab5e, G_UNICODE_NOT_PRESENT_OFFSET, 10900 },
-  { 0xab5f, G_UNICODE_NOT_PRESENT_OFFSET, 10903 },
-  { 0xf900, 10907, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf901, 10911, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x32ff, G_UNICODE_NOT_PRESENT_OFFSET, 8996 },
+  { 0x3300, G_UNICODE_NOT_PRESENT_OFFSET, 9003 },
+  { 0x3301, G_UNICODE_NOT_PRESENT_OFFSET, 9019 },
+  { 0x3302, G_UNICODE_NOT_PRESENT_OFFSET, 9032 },
+  { 0x3303, G_UNICODE_NOT_PRESENT_OFFSET, 9048 },
+  { 0x3304, G_UNICODE_NOT_PRESENT_OFFSET, 9058 },
+  { 0x3305, G_UNICODE_NOT_PRESENT_OFFSET, 9074 },
+  { 0x3306, G_UNICODE_NOT_PRESENT_OFFSET, 9084 },
+  { 0x3307, G_UNICODE_NOT_PRESENT_OFFSET, 9094 },
+  { 0x3308, G_UNICODE_NOT_PRESENT_OFFSET, 9113 },
+  { 0x3309, G_UNICODE_NOT_PRESENT_OFFSET, 9126 },
+  { 0x330a, G_UNICODE_NOT_PRESENT_OFFSET, 9136 },
+  { 0x330b, G_UNICODE_NOT_PRESENT_OFFSET, 9146 },
+  { 0x330c, G_UNICODE_NOT_PRESENT_OFFSET, 9156 },
+  { 0x330d, G_UNICODE_NOT_PRESENT_OFFSET, 9169 },
+  { 0x330e, G_UNICODE_NOT_PRESENT_OFFSET, 9182 },
+  { 0x330f, G_UNICODE_NOT_PRESENT_OFFSET, 9195 },
+  { 0x3310, G_UNICODE_NOT_PRESENT_OFFSET, 9208 },
+  { 0x3311, G_UNICODE_NOT_PRESENT_OFFSET, 9221 },
+  { 0x3312, G_UNICODE_NOT_PRESENT_OFFSET, 9234 },
+  { 0x3313, G_UNICODE_NOT_PRESENT_OFFSET, 9247 },
+  { 0x3314, G_UNICODE_NOT_PRESENT_OFFSET, 9266 },
+  { 0x3315, G_UNICODE_NOT_PRESENT_OFFSET, 9273 },
+  { 0x3316, G_UNICODE_NOT_PRESENT_OFFSET, 9292 },
+  { 0x3317, G_UNICODE_NOT_PRESENT_OFFSET, 9311 },
+  { 0x3318, G_UNICODE_NOT_PRESENT_OFFSET, 9327 },
+  { 0x3319, G_UNICODE_NOT_PRESENT_OFFSET, 9340 },
+  { 0x331a, G_UNICODE_NOT_PRESENT_OFFSET, 9359 },
+  { 0x331b, G_UNICODE_NOT_PRESENT_OFFSET, 9378 },
+  { 0x331c, G_UNICODE_NOT_PRESENT_OFFSET, 9391 },
+  { 0x331d, G_UNICODE_NOT_PRESENT_OFFSET, 9401 },
+  { 0x331e, G_UNICODE_NOT_PRESENT_OFFSET, 9411 },
+  { 0x331f, G_UNICODE_NOT_PRESENT_OFFSET, 9424 },
+  { 0x3320, G_UNICODE_NOT_PRESENT_OFFSET, 9437 },
+  { 0x3321, G_UNICODE_NOT_PRESENT_OFFSET, 9453 },
+  { 0x3322, G_UNICODE_NOT_PRESENT_OFFSET, 9469 },
+  { 0x3323, G_UNICODE_NOT_PRESENT_OFFSET, 9479 },
+  { 0x3324, G_UNICODE_NOT_PRESENT_OFFSET, 9489 },
+  { 0x3325, G_UNICODE_NOT_PRESENT_OFFSET, 9502 },
+  { 0x3326, G_UNICODE_NOT_PRESENT_OFFSET, 9512 },
+  { 0x3327, G_UNICODE_NOT_PRESENT_OFFSET, 9522 },
+  { 0x3328, G_UNICODE_NOT_PRESENT_OFFSET, 9529 },
+  { 0x3329, G_UNICODE_NOT_PRESENT_OFFSET, 9536 },
+  { 0x332a, G_UNICODE_NOT_PRESENT_OFFSET, 9546 },
+  { 0x332b, G_UNICODE_NOT_PRESENT_OFFSET, 9556 },
+  { 0x332c, G_UNICODE_NOT_PRESENT_OFFSET, 9575 },
+  { 0x332d, G_UNICODE_NOT_PRESENT_OFFSET, 9588 },
+  { 0x332e, G_UNICODE_NOT_PRESENT_OFFSET, 9604 },
+  { 0x332f, G_UNICODE_NOT_PRESENT_OFFSET, 9623 },
+  { 0x3330, G_UNICODE_NOT_PRESENT_OFFSET, 9636 },
+  { 0x3331, G_UNICODE_NOT_PRESENT_OFFSET, 9646 },
+  { 0x3332, G_UNICODE_NOT_PRESENT_OFFSET, 9656 },
+  { 0x3333, G_UNICODE_NOT_PRESENT_OFFSET, 9675 },
+  { 0x3334, G_UNICODE_NOT_PRESENT_OFFSET, 9688 },
+  { 0x3335, G_UNICODE_NOT_PRESENT_OFFSET, 9707 },
+  { 0x3336, G_UNICODE_NOT_PRESENT_OFFSET, 9717 },
+  { 0x3337, G_UNICODE_NOT_PRESENT_OFFSET, 9733 },
+  { 0x3338, G_UNICODE_NOT_PRESENT_OFFSET, 9743 },
+  { 0x3339, G_UNICODE_NOT_PRESENT_OFFSET, 9756 },
+  { 0x333a, G_UNICODE_NOT_PRESENT_OFFSET, 9766 },
+  { 0x333b, G_UNICODE_NOT_PRESENT_OFFSET, 9779 },
+  { 0x333c, G_UNICODE_NOT_PRESENT_OFFSET, 9795 },
+  { 0x333d, G_UNICODE_NOT_PRESENT_OFFSET, 9808 },
+  { 0x333e, G_UNICODE_NOT_PRESENT_OFFSET, 9824 },
+  { 0x333f, G_UNICODE_NOT_PRESENT_OFFSET, 9837 },
+  { 0x3340, G_UNICODE_NOT_PRESENT_OFFSET, 9844 },
+  { 0x3341, G_UNICODE_NOT_PRESENT_OFFSET, 9860 },
+  { 0x3342, G_UNICODE_NOT_PRESENT_OFFSET, 9870 },
+  { 0x3343, G_UNICODE_NOT_PRESENT_OFFSET, 9880 },
+  { 0x3344, G_UNICODE_NOT_PRESENT_OFFSET, 9893 },
+  { 0x3345, G_UNICODE_NOT_PRESENT_OFFSET, 9903 },
+  { 0x3346, G_UNICODE_NOT_PRESENT_OFFSET, 9913 },
+  { 0x3347, G_UNICODE_NOT_PRESENT_OFFSET, 9923 },
+  { 0x3348, G_UNICODE_NOT_PRESENT_OFFSET, 9939 },
+  { 0x3349, G_UNICODE_NOT_PRESENT_OFFSET, 9952 },
+  { 0x334a, G_UNICODE_NOT_PRESENT_OFFSET, 9959 },
+  { 0x334b, G_UNICODE_NOT_PRESENT_OFFSET, 9978 },
+  { 0x334c, G_UNICODE_NOT_PRESENT_OFFSET, 9988 },
+  { 0x334d, G_UNICODE_NOT_PRESENT_OFFSET, 10004 },
+  { 0x334e, G_UNICODE_NOT_PRESENT_OFFSET, 10017 },
+  { 0x334f, G_UNICODE_NOT_PRESENT_OFFSET, 10030 },
+  { 0x3350, G_UNICODE_NOT_PRESENT_OFFSET, 10040 },
+  { 0x3351, G_UNICODE_NOT_PRESENT_OFFSET, 10050 },
+  { 0x3352, G_UNICODE_NOT_PRESENT_OFFSET, 10063 },
+  { 0x3353, G_UNICODE_NOT_PRESENT_OFFSET, 10070 },
+  { 0x3354, G_UNICODE_NOT_PRESENT_OFFSET, 10083 },
+  { 0x3355, G_UNICODE_NOT_PRESENT_OFFSET, 10099 },
+  { 0x3356, G_UNICODE_NOT_PRESENT_OFFSET, 10106 },
+  { 0x3357, G_UNICODE_NOT_PRESENT_OFFSET, 10125 },
+  { 0x3358, G_UNICODE_NOT_PRESENT_OFFSET, 10135 },
+  { 0x3359, G_UNICODE_NOT_PRESENT_OFFSET, 10140 },
+  { 0x335a, G_UNICODE_NOT_PRESENT_OFFSET, 10145 },
+  { 0x335b, G_UNICODE_NOT_PRESENT_OFFSET, 10150 },
+  { 0x335c, G_UNICODE_NOT_PRESENT_OFFSET, 10155 },
+  { 0x335d, G_UNICODE_NOT_PRESENT_OFFSET, 10160 },
+  { 0x335e, G_UNICODE_NOT_PRESENT_OFFSET, 10165 },
+  { 0x335f, G_UNICODE_NOT_PRESENT_OFFSET, 10170 },
+  { 0x3360, G_UNICODE_NOT_PRESENT_OFFSET, 10175 },
+  { 0x3361, G_UNICODE_NOT_PRESENT_OFFSET, 10180 },
+  { 0x3362, G_UNICODE_NOT_PRESENT_OFFSET, 10185 },
+  { 0x3363, G_UNICODE_NOT_PRESENT_OFFSET, 10191 },
+  { 0x3364, G_UNICODE_NOT_PRESENT_OFFSET, 10197 },
+  { 0x3365, G_UNICODE_NOT_PRESENT_OFFSET, 10203 },
+  { 0x3366, G_UNICODE_NOT_PRESENT_OFFSET, 10209 },
+  { 0x3367, G_UNICODE_NOT_PRESENT_OFFSET, 10215 },
+  { 0x3368, G_UNICODE_NOT_PRESENT_OFFSET, 10221 },
+  { 0x3369, G_UNICODE_NOT_PRESENT_OFFSET, 10227 },
+  { 0x336a, G_UNICODE_NOT_PRESENT_OFFSET, 10233 },
+  { 0x336b, G_UNICODE_NOT_PRESENT_OFFSET, 10239 },
+  { 0x336c, G_UNICODE_NOT_PRESENT_OFFSET, 10245 },
+  { 0x336d, G_UNICODE_NOT_PRESENT_OFFSET, 10251 },
+  { 0x336e, G_UNICODE_NOT_PRESENT_OFFSET, 10257 },
+  { 0x336f, G_UNICODE_NOT_PRESENT_OFFSET, 10263 },
+  { 0x3370, G_UNICODE_NOT_PRESENT_OFFSET, 10269 },
+  { 0x3371, G_UNICODE_NOT_PRESENT_OFFSET, 10275 },
+  { 0x3372, G_UNICODE_NOT_PRESENT_OFFSET, 10279 },
+  { 0x3373, G_UNICODE_NOT_PRESENT_OFFSET, 10282 },
+  { 0x3374, G_UNICODE_NOT_PRESENT_OFFSET, 10285 },
+  { 0x3375, G_UNICODE_NOT_PRESENT_OFFSET, 10289 },
+  { 0x3376, G_UNICODE_NOT_PRESENT_OFFSET, 10292 },
+  { 0x3377, G_UNICODE_NOT_PRESENT_OFFSET, 10295 },
+  { 0x3378, G_UNICODE_NOT_PRESENT_OFFSET, 10298 },
+  { 0x3379, G_UNICODE_NOT_PRESENT_OFFSET, 10302 },
+  { 0x337a, G_UNICODE_NOT_PRESENT_OFFSET, 10306 },
+  { 0x337b, G_UNICODE_NOT_PRESENT_OFFSET, 10309 },
+  { 0x337c, G_UNICODE_NOT_PRESENT_OFFSET, 10316 },
+  { 0x337d, G_UNICODE_NOT_PRESENT_OFFSET, 10323 },
+  { 0x337e, G_UNICODE_NOT_PRESENT_OFFSET, 10330 },
+  { 0x337f, G_UNICODE_NOT_PRESENT_OFFSET, 10337 },
+  { 0x3380, G_UNICODE_NOT_PRESENT_OFFSET, 10350 },
+  { 0x3381, G_UNICODE_NOT_PRESENT_OFFSET, 10353 },
+  { 0x3382, G_UNICODE_NOT_PRESENT_OFFSET, 10356 },
+  { 0x3383, G_UNICODE_NOT_PRESENT_OFFSET, 10360 },
+  { 0x3384, G_UNICODE_NOT_PRESENT_OFFSET, 10363 },
+  { 0x3385, G_UNICODE_NOT_PRESENT_OFFSET, 10366 },
+  { 0x3386, G_UNICODE_NOT_PRESENT_OFFSET, 10369 },
+  { 0x3387, G_UNICODE_NOT_PRESENT_OFFSET, 10372 },
+  { 0x3388, G_UNICODE_NOT_PRESENT_OFFSET, 10375 },
+  { 0x3389, G_UNICODE_NOT_PRESENT_OFFSET, 10379 },
+  { 0x338a, G_UNICODE_NOT_PRESENT_OFFSET, 10384 },
+  { 0x338b, G_UNICODE_NOT_PRESENT_OFFSET, 10387 },
+  { 0x338c, G_UNICODE_NOT_PRESENT_OFFSET, 10390 },
+  { 0x338d, G_UNICODE_NOT_PRESENT_OFFSET, 10394 },
+  { 0x338e, G_UNICODE_NOT_PRESENT_OFFSET, 10398 },
+  { 0x338f, G_UNICODE_NOT_PRESENT_OFFSET, 10401 },
+  { 0x3390, G_UNICODE_NOT_PRESENT_OFFSET, 10404 },
+  { 0x3391, G_UNICODE_NOT_PRESENT_OFFSET, 10407 },
+  { 0x3392, G_UNICODE_NOT_PRESENT_OFFSET, 10411 },
+  { 0x3393, G_UNICODE_NOT_PRESENT_OFFSET, 10415 },
+  { 0x3394, G_UNICODE_NOT_PRESENT_OFFSET, 10419 },
+  { 0x3395, G_UNICODE_NOT_PRESENT_OFFSET, 10423 },
+  { 0x3396, G_UNICODE_NOT_PRESENT_OFFSET, 10427 },
+  { 0x3397, G_UNICODE_NOT_PRESENT_OFFSET, 10430 },
+  { 0x3398, G_UNICODE_NOT_PRESENT_OFFSET, 10433 },
+  { 0x3399, G_UNICODE_NOT_PRESENT_OFFSET, 10436 },
+  { 0x339a, G_UNICODE_NOT_PRESENT_OFFSET, 10439 },
+  { 0x339b, G_UNICODE_NOT_PRESENT_OFFSET, 10442 },
+  { 0x339c, G_UNICODE_NOT_PRESENT_OFFSET, 10446 },
+  { 0x339d, G_UNICODE_NOT_PRESENT_OFFSET, 10449 },
+  { 0x339e, G_UNICODE_NOT_PRESENT_OFFSET, 10452 },
+  { 0x339f, G_UNICODE_NOT_PRESENT_OFFSET, 10455 },
+  { 0x33a0, G_UNICODE_NOT_PRESENT_OFFSET, 10459 },
+  { 0x33a1, G_UNICODE_NOT_PRESENT_OFFSET, 10463 },
+  { 0x33a2, G_UNICODE_NOT_PRESENT_OFFSET, 10466 },
+  { 0x33a3, G_UNICODE_NOT_PRESENT_OFFSET, 10470 },
+  { 0x33a4, G_UNICODE_NOT_PRESENT_OFFSET, 10474 },
+  { 0x33a5, G_UNICODE_NOT_PRESENT_OFFSET, 10478 },
+  { 0x33a6, G_UNICODE_NOT_PRESENT_OFFSET, 10481 },
+  { 0x33a7, G_UNICODE_NOT_PRESENT_OFFSET, 10485 },
+  { 0x33a8, G_UNICODE_NOT_PRESENT_OFFSET, 10491 },
+  { 0x33a9, G_UNICODE_NOT_PRESENT_OFFSET, 10498 },
+  { 0x33aa, G_UNICODE_NOT_PRESENT_OFFSET, 10501 },
+  { 0x33ab, G_UNICODE_NOT_PRESENT_OFFSET, 10505 },
+  { 0x33ac, G_UNICODE_NOT_PRESENT_OFFSET, 10509 },
+  { 0x33ad, G_UNICODE_NOT_PRESENT_OFFSET, 10513 },
+  { 0x33ae, G_UNICODE_NOT_PRESENT_OFFSET, 10517 },
+  { 0x33af, G_UNICODE_NOT_PRESENT_OFFSET, 10525 },
+  { 0x33b0, G_UNICODE_NOT_PRESENT_OFFSET, 10534 },
+  { 0x33b1, G_UNICODE_NOT_PRESENT_OFFSET, 10537 },
+  { 0x33b2, G_UNICODE_NOT_PRESENT_OFFSET, 10540 },
+  { 0x33b3, G_UNICODE_NOT_PRESENT_OFFSET, 10544 },
+  { 0x33b4, G_UNICODE_NOT_PRESENT_OFFSET, 10547 },
+  { 0x33b5, G_UNICODE_NOT_PRESENT_OFFSET, 10550 },
+  { 0x33b6, G_UNICODE_NOT_PRESENT_OFFSET, 10553 },
+  { 0x33b7, G_UNICODE_NOT_PRESENT_OFFSET, 10557 },
+  { 0x33b8, G_UNICODE_NOT_PRESENT_OFFSET, 10560 },
+  { 0x33b9, G_UNICODE_NOT_PRESENT_OFFSET, 10563 },
+  { 0x33ba, G_UNICODE_NOT_PRESENT_OFFSET, 10566 },
+  { 0x33bb, G_UNICODE_NOT_PRESENT_OFFSET, 10569 },
+  { 0x33bc, G_UNICODE_NOT_PRESENT_OFFSET, 10572 },
+  { 0x33bd, G_UNICODE_NOT_PRESENT_OFFSET, 10576 },
+  { 0x33be, G_UNICODE_NOT_PRESENT_OFFSET, 10579 },
+  { 0x33bf, G_UNICODE_NOT_PRESENT_OFFSET, 10582 },
+  { 0x33c0, G_UNICODE_NOT_PRESENT_OFFSET, 10585 },
+  { 0x33c1, G_UNICODE_NOT_PRESENT_OFFSET, 10589 },
+  { 0x33c2, G_UNICODE_NOT_PRESENT_OFFSET, 10593 },
+  { 0x33c3, G_UNICODE_NOT_PRESENT_OFFSET, 10598 },
+  { 0x33c4, G_UNICODE_NOT_PRESENT_OFFSET, 10601 },
+  { 0x33c5, G_UNICODE_NOT_PRESENT_OFFSET, 10604 },
+  { 0x33c6, G_UNICODE_NOT_PRESENT_OFFSET, 10607 },
+  { 0x33c7, G_UNICODE_NOT_PRESENT_OFFSET, 10614 },
+  { 0x33c8, G_UNICODE_NOT_PRESENT_OFFSET, 10618 },
+  { 0x33c9, G_UNICODE_NOT_PRESENT_OFFSET, 10621 },
+  { 0x33ca, G_UNICODE_NOT_PRESENT_OFFSET, 10624 },
+  { 0x33cb, G_UNICODE_NOT_PRESENT_OFFSET, 10627 },
+  { 0x33cc, G_UNICODE_NOT_PRESENT_OFFSET, 10630 },
+  { 0x33cd, G_UNICODE_NOT_PRESENT_OFFSET, 10633 },
+  { 0x33ce, G_UNICODE_NOT_PRESENT_OFFSET, 10636 },
+  { 0x33cf, G_UNICODE_NOT_PRESENT_OFFSET, 10639 },
+  { 0x33d0, G_UNICODE_NOT_PRESENT_OFFSET, 10642 },
+  { 0x33d1, G_UNICODE_NOT_PRESENT_OFFSET, 10645 },
+  { 0x33d2, G_UNICODE_NOT_PRESENT_OFFSET, 10648 },
+  { 0x33d3, G_UNICODE_NOT_PRESENT_OFFSET, 10652 },
+  { 0x33d4, G_UNICODE_NOT_PRESENT_OFFSET, 10655 },
+  { 0x33d5, G_UNICODE_NOT_PRESENT_OFFSET, 10658 },
+  { 0x33d6, G_UNICODE_NOT_PRESENT_OFFSET, 10662 },
+  { 0x33d7, G_UNICODE_NOT_PRESENT_OFFSET, 10666 },
+  { 0x33d8, G_UNICODE_NOT_PRESENT_OFFSET, 10669 },
+  { 0x33d9, G_UNICODE_NOT_PRESENT_OFFSET, 10674 },
+  { 0x33da, G_UNICODE_NOT_PRESENT_OFFSET, 10678 },
+  { 0x33db, G_UNICODE_NOT_PRESENT_OFFSET, 10681 },
+  { 0x33dc, G_UNICODE_NOT_PRESENT_OFFSET, 10684 },
+  { 0x33dd, G_UNICODE_NOT_PRESENT_OFFSET, 10687 },
+  { 0x33de, G_UNICODE_NOT_PRESENT_OFFSET, 10690 },
+  { 0x33df, G_UNICODE_NOT_PRESENT_OFFSET, 10696 },
+  { 0x33e0, G_UNICODE_NOT_PRESENT_OFFSET, 10702 },
+  { 0x33e1, G_UNICODE_NOT_PRESENT_OFFSET, 10707 },
+  { 0x33e2, G_UNICODE_NOT_PRESENT_OFFSET, 10712 },
+  { 0x33e3, G_UNICODE_NOT_PRESENT_OFFSET, 10717 },
+  { 0x33e4, G_UNICODE_NOT_PRESENT_OFFSET, 10722 },
+  { 0x33e5, G_UNICODE_NOT_PRESENT_OFFSET, 10727 },
+  { 0x33e6, G_UNICODE_NOT_PRESENT_OFFSET, 10732 },
+  { 0x33e7, G_UNICODE_NOT_PRESENT_OFFSET, 10737 },
+  { 0x33e8, G_UNICODE_NOT_PRESENT_OFFSET, 10742 },
+  { 0x33e9, G_UNICODE_NOT_PRESENT_OFFSET, 10747 },
+  { 0x33ea, G_UNICODE_NOT_PRESENT_OFFSET, 10753 },
+  { 0x33eb, G_UNICODE_NOT_PRESENT_OFFSET, 10759 },
+  { 0x33ec, G_UNICODE_NOT_PRESENT_OFFSET, 10765 },
+  { 0x33ed, G_UNICODE_NOT_PRESENT_OFFSET, 10771 },
+  { 0x33ee, G_UNICODE_NOT_PRESENT_OFFSET, 10777 },
+  { 0x33ef, G_UNICODE_NOT_PRESENT_OFFSET, 10783 },
+  { 0x33f0, G_UNICODE_NOT_PRESENT_OFFSET, 10789 },
+  { 0x33f1, G_UNICODE_NOT_PRESENT_OFFSET, 10795 },
+  { 0x33f2, G_UNICODE_NOT_PRESENT_OFFSET, 10801 },
+  { 0x33f3, G_UNICODE_NOT_PRESENT_OFFSET, 10807 },
+  { 0x33f4, G_UNICODE_NOT_PRESENT_OFFSET, 10813 },
+  { 0x33f5, G_UNICODE_NOT_PRESENT_OFFSET, 10819 },
+  { 0x33f6, G_UNICODE_NOT_PRESENT_OFFSET, 10825 },
+  { 0x33f7, G_UNICODE_NOT_PRESENT_OFFSET, 10831 },
+  { 0x33f8, G_UNICODE_NOT_PRESENT_OFFSET, 10837 },
+  { 0x33f9, G_UNICODE_NOT_PRESENT_OFFSET, 10843 },
+  { 0x33fa, G_UNICODE_NOT_PRESENT_OFFSET, 10849 },
+  { 0x33fb, G_UNICODE_NOT_PRESENT_OFFSET, 10855 },
+  { 0x33fc, G_UNICODE_NOT_PRESENT_OFFSET, 10861 },
+  { 0x33fd, G_UNICODE_NOT_PRESENT_OFFSET, 10867 },
+  { 0x33fe, G_UNICODE_NOT_PRESENT_OFFSET, 10873 },
+  { 0x33ff, G_UNICODE_NOT_PRESENT_OFFSET, 10879 },
+  { 0xa69c, G_UNICODE_NOT_PRESENT_OFFSET, 10883 },
+  { 0xa69d, G_UNICODE_NOT_PRESENT_OFFSET, 10886 },
+  { 0xa770, G_UNICODE_NOT_PRESENT_OFFSET, 10889 },
+  { 0xa7f8, G_UNICODE_NOT_PRESENT_OFFSET, 10893 },
+  { 0xa7f9, G_UNICODE_NOT_PRESENT_OFFSET, 10896 },
+  { 0xab5c, G_UNICODE_NOT_PRESENT_OFFSET, 10899 },
+  { 0xab5d, G_UNICODE_NOT_PRESENT_OFFSET, 10903 },
+  { 0xab5e, G_UNICODE_NOT_PRESENT_OFFSET, 10907 },
+  { 0xab5f, G_UNICODE_NOT_PRESENT_OFFSET, 10910 },
+  { 0xf900, 10914, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf901, 10918, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf902, 6813, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf903, 10915, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf904, 10919, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf905, 10923, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf906, 10927, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf903, 10922, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf904, 10926, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf905, 10930, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf906, 10934, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf907, 7029, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf908, 7029, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf909, 10931, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf909, 10938, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf90a, 6845, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf90b, 10935, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf90c, 10939, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf90d, 10943, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf90e, 10947, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf90f, 10951, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf910, 10955, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf911, 10959, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf912, 10963, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf913, 10967, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf914, 10971, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf915, 10975, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf916, 10979, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf917, 10983, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf918, 10987, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf919, 10991, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf91a, 10995, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf91b, 10999, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf91c, 11003, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf91d, 11007, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf91e, 11011, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf91f, 11015, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf920, 11019, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf921, 11023, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf922, 11027, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf923, 11031, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf924, 11035, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf925, 11039, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf926, 11043, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf927, 11047, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf928, 11051, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf929, 11055, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf92a, 11059, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf92b, 11063, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf92c, 11067, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf92d, 11071, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf92e, 11075, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf92f, 11079, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf930, 11083, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf931, 11087, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf932, 11091, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf933, 11095, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf90b, 10942, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf90c, 10946, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf90d, 10950, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf90e, 10954, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf90f, 10958, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf910, 10962, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf911, 10966, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf912, 10970, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf913, 10974, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf914, 10978, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf915, 10982, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf916, 10986, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf917, 10990, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf918, 10994, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf919, 10998, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf91a, 11002, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf91b, 11006, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf91c, 11010, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf91d, 11014, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf91e, 11018, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf91f, 11022, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf920, 11026, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf921, 11030, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf922, 11034, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf923, 11038, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf924, 11042, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf925, 11046, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf926, 11050, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf927, 11054, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf928, 11058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf929, 11062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf92a, 11066, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf92b, 11070, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf92c, 11074, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf92d, 11078, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf92e, 11082, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf92f, 11086, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf930, 11090, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf931, 11094, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf932, 11098, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf933, 11102, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf934, 6677, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf935, 11099, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf936, 11103, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf937, 11107, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf938, 11111, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf939, 11115, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf93a, 11119, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf93b, 11123, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf93c, 11127, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf93d, 11131, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf93e, 11135, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf93f, 11139, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf935, 11106, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf936, 11110, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf937, 11114, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf938, 11118, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf939, 11122, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf93a, 11126, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf93b, 11130, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf93c, 11134, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf93d, 11138, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf93e, 11142, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf93f, 11146, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf940, 6969, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf941, 11143, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf942, 11147, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf943, 11151, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf944, 11155, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf945, 11159, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf946, 11163, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf947, 11167, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf948, 11171, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf949, 11175, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf94a, 11179, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf94b, 11183, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf94c, 11187, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf94d, 11191, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf94e, 11195, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf94f, 11199, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf950, 11203, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf951, 11207, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf952, 11211, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf953, 11215, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf954, 11219, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf955, 11223, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf956, 11227, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf957, 11231, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf958, 11235, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf959, 11239, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf95a, 11243, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf95b, 11247, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf95c, 10971, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf95d, 11251, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf95e, 11255, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf95f, 11259, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf960, 11263, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf961, 11267, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf962, 11271, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf963, 11275, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf964, 11279, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf965, 11283, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf966, 11287, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf967, 11291, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf968, 11295, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf969, 11299, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf96a, 11303, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf96b, 11307, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf96c, 11311, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf96d, 11315, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf96e, 11319, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf96f, 11323, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf970, 11327, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf941, 11150, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf942, 11154, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf943, 11158, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf944, 11162, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf945, 11166, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf946, 11170, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf947, 11174, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf948, 11178, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf949, 11182, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf94a, 11186, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf94b, 11190, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf94c, 11194, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf94d, 11198, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf94e, 11202, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf94f, 11206, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf950, 11210, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf951, 11214, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf952, 11218, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf953, 11222, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf954, 11226, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf955, 11230, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf956, 11234, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf957, 11238, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf958, 11242, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf959, 11246, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf95a, 11250, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf95b, 11254, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf95c, 10978, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf95d, 11258, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf95e, 11262, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf95f, 11266, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf960, 11270, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf961, 11274, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf962, 11278, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf963, 11282, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf964, 11286, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf965, 11290, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf966, 11294, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf967, 11298, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf968, 11302, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf969, 11306, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf96a, 11310, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf96b, 11314, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf96c, 11318, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf96d, 11322, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf96e, 11326, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf96f, 11330, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf970, 11334, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf971, 6821, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf972, 11331, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf973, 11335, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf974, 11339, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf975, 11343, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf976, 11347, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf977, 11351, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf978, 11355, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf979, 11359, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf97a, 11363, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf97b, 11367, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf97c, 11371, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf97d, 11375, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf97e, 11379, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf97f, 11383, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf980, 11387, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf972, 11338, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf973, 11342, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf974, 11346, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf975, 11350, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf976, 11354, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf977, 11358, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf978, 11362, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf979, 11366, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf97a, 11370, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf97b, 11374, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf97c, 11378, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf97d, 11382, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf97e, 11386, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf97f, 11390, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf980, 11394, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf981, 6329, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf982, 11391, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf983, 11395, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf984, 11399, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf985, 11403, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf986, 11407, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf987, 11411, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf988, 11415, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf989, 11419, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf982, 11398, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf983, 11402, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf984, 11406, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf985, 11410, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf986, 11414, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf987, 11418, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf988, 11422, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf989, 11426, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf98a, 6253, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf98b, 11423, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf98c, 11427, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf98d, 11431, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf98e, 11435, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf98f, 11439, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf990, 11443, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf991, 11447, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf992, 11451, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf993, 11455, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf994, 11459, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf995, 11463, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf996, 11467, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf997, 11471, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf998, 11475, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf999, 11479, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf99a, 11483, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf99b, 11487, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf99c, 11491, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf99d, 11495, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf99e, 11499, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf99f, 11503, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a0, 11507, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a1, 11323, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a2, 11511, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a3, 11515, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a4, 11519, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a5, 11523, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a6, 11527, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a7, 11531, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a8, 11535, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9a9, 11539, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9aa, 11259, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ab, 11543, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ac, 11547, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ad, 11551, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ae, 11555, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9af, 11559, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b0, 11563, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b1, 11567, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b2, 11571, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b3, 11575, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b4, 11579, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b5, 11583, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b6, 11587, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b7, 11591, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b8, 11595, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9b9, 11599, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ba, 11603, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9bb, 11607, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9bc, 11611, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9bd, 11615, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9be, 11619, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9bf, 10971, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c0, 11623, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c1, 11627, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c2, 11631, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c3, 11635, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf98b, 11430, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf98c, 11434, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf98d, 11438, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf98e, 11442, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf98f, 11446, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf990, 11450, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf991, 11454, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf992, 11458, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf993, 11462, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf994, 11466, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf995, 11470, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf996, 11474, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf997, 11478, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf998, 11482, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf999, 11486, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf99a, 11490, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf99b, 11494, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf99c, 11498, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf99d, 11502, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf99e, 11506, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf99f, 11510, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a0, 11514, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a1, 11330, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a2, 11518, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a3, 11522, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a4, 11526, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a5, 11530, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a6, 11534, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a7, 11538, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a8, 11542, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9a9, 11546, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9aa, 11266, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ab, 11550, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ac, 11554, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ad, 11558, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ae, 11562, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9af, 11566, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b0, 11570, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b1, 11574, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b2, 11578, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b3, 11582, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b4, 11586, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b5, 11590, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b6, 11594, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b7, 11598, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b8, 11602, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9b9, 11606, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ba, 11610, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9bb, 11614, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9bc, 11618, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9bd, 11622, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9be, 11626, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9bf, 10978, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c0, 11630, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c1, 11634, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c2, 11638, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c3, 11642, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf9c4, 7025, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c5, 11639, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c6, 11643, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c7, 11647, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c8, 11651, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9c9, 11655, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ca, 11659, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9cb, 11663, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9cc, 11667, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9cd, 11671, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ce, 11675, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9cf, 11679, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d0, 11683, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c5, 11646, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c6, 11650, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c7, 11654, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c8, 11658, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9c9, 11662, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ca, 11666, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9cb, 11670, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9cc, 11674, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9cd, 11678, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ce, 11682, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9cf, 11686, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d0, 11690, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf9d1, 8562, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d2, 11687, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d3, 11691, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d4, 11695, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d5, 11699, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d6, 11703, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d7, 11707, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d8, 11711, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9d9, 11715, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9da, 11719, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9db, 11267, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9dc, 11723, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9dd, 11727, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9de, 11731, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9df, 11735, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e0, 11739, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e1, 11743, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e2, 11747, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e3, 11751, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e4, 11755, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e5, 11759, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e6, 11763, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e7, 11767, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9e8, 11771, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d2, 11694, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d3, 11698, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d4, 11702, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d5, 11706, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d6, 11710, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d7, 11714, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d8, 11718, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9d9, 11722, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9da, 11726, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9db, 11274, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9dc, 11730, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9dd, 11734, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9de, 11738, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9df, 11742, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e0, 11746, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e1, 11750, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e2, 11754, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e3, 11758, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e4, 11762, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e5, 11766, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e6, 11770, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e7, 11774, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9e8, 11778, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf9e9, 6841, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ea, 11775, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9eb, 11779, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ec, 11783, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ed, 11787, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ee, 11791, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ef, 11795, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f0, 11799, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f1, 11803, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f2, 11807, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f3, 11811, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f4, 11815, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f5, 11819, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f6, 11823, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ea, 11782, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9eb, 11786, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ec, 11790, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ed, 11794, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ee, 11798, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ef, 11802, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f0, 11806, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f1, 11810, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f2, 11814, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f3, 11818, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f4, 11822, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f5, 11826, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f6, 11830, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xf9f7, 6645, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f8, 11827, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9f9, 11831, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9fa, 11835, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9fb, 11839, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9fc, 11843, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9fd, 11847, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9fe, 11851, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xf9ff, 11855, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa00, 11859, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa01, 11863, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa02, 11867, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa03, 11871, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa04, 11875, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa05, 11879, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa06, 11883, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa07, 11887, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f8, 11834, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9f9, 11838, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9fa, 11842, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9fb, 11846, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9fc, 11850, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9fd, 11854, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9fe, 11858, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xf9ff, 11862, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa00, 11866, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa01, 11870, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa02, 11874, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa03, 11878, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa04, 11882, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa05, 11886, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa06, 11890, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa07, 11894, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa08, 6753, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa09, 11891, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa09, 11898, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa0a, 6765, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa0b, 11895, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa0c, 11899, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa0d, 11903, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa10, 11907, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa12, 11911, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa15, 11915, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa16, 11919, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa17, 11923, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa18, 11927, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa19, 11931, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa1a, 11935, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa1b, 11939, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa1c, 11943, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa1d, 11947, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa0b, 11902, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa0c, 11906, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa0d, 11910, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa10, 11914, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa12, 11918, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa15, 11922, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa16, 11926, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa17, 11930, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa18, 11934, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa19, 11938, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa1a, 11942, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa1b, 11946, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa1c, 11950, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa1d, 11954, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa1e, 6673, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa20, 11951, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa22, 11955, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa25, 11959, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa26, 11963, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa2a, 11967, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa2b, 11971, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa2c, 11975, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa2d, 11979, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa2e, 11983, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa2f, 11987, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa30, 11991, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa31, 11995, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa32, 11999, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa33, 12003, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa34, 12007, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa35, 12011, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa36, 12015, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa37, 12019, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa38, 12023, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa39, 12027, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa3a, 12031, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa3b, 12035, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa20, 11958, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa22, 11962, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa25, 11966, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa26, 11970, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa2a, 11974, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa2b, 11978, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa2c, 11982, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa2d, 11986, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa2e, 11990, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa2f, 11994, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa30, 11998, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa31, 12002, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa32, 12006, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa33, 12010, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa34, 12014, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa35, 12018, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa36, 12022, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa37, 12026, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa38, 12030, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa39, 12034, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa3a, 12038, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa3b, 12042, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa3c, 6357, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa3d, 12039, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa3e, 12043, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa3f, 12047, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa40, 12051, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa41, 12055, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa42, 12059, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa43, 12063, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa44, 12067, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa45, 12071, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa46, 12075, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa47, 12079, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa48, 12083, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa49, 12087, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa4a, 12091, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa4b, 12095, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa3d, 12046, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa3e, 12050, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa3f, 12054, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa40, 12058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa41, 12062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa42, 12066, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa43, 12070, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa44, 12074, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa45, 12078, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa46, 12082, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa47, 12086, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa48, 12090, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa49, 12094, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa4a, 12098, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa4b, 12102, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa4c, 8582, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa4d, 12099, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa4e, 12103, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa4f, 12107, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa50, 12111, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa4d, 12106, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa4e, 12110, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa4f, 12114, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa50, 12118, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa51, 8598, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa52, 12115, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa53, 12119, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa54, 12123, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa55, 12127, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa56, 12131, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa57, 11467, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa58, 12135, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa59, 12139, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa5a, 12143, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa5b, 12147, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa5c, 12151, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa5d, 12155, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa5e, 12155, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa5f, 12159, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa60, 12163, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa61, 12167, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa62, 12171, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa63, 12175, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa64, 12179, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa65, 12183, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa66, 12187, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa67, 11959, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa68, 12191, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa69, 12195, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa6a, 12199, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa6b, 12203, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa6c, 12207, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa6d, 12212, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa70, 12216, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa71, 12220, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa72, 12224, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa73, 12228, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa74, 12232, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa75, 12236, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa76, 12240, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa77, 12244, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa78, 12015, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa79, 12248, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa7a, 12252, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa7b, 12256, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa7c, 11907, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa7d, 12260, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa7e, 12264, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa7f, 12268, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa80, 12272, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa81, 12276, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa82, 12280, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa83, 12284, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa84, 12288, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa85, 12292, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa86, 12296, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa87, 12300, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa88, 12304, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa89, 12047, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa8a, 12308, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa8b, 12051, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa8c, 12312, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa8d, 12316, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa8e, 12320, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa8f, 12324, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa90, 12328, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa91, 11911, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa92, 11055, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa93, 12332, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa94, 12336, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa52, 12122, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa53, 12126, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa54, 12130, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa55, 12134, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa56, 12138, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa57, 11474, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa58, 12142, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa59, 12146, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa5a, 12150, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa5b, 12154, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa5c, 12158, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa5d, 12162, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa5e, 12162, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa5f, 12166, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa60, 12170, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa61, 12174, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa62, 12178, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa63, 12182, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa64, 12186, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa65, 12190, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa66, 12194, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa67, 11966, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa68, 12198, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa69, 12202, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa6a, 12206, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa6b, 12210, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa6c, 12214, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa6d, 12219, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa70, 12223, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa71, 12227, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa72, 12231, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa73, 12235, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa74, 12239, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa75, 12243, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa76, 12247, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa77, 12251, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa78, 12022, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa79, 12255, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa7a, 12259, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa7b, 12263, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa7c, 11914, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa7d, 12267, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa7e, 12271, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa7f, 12275, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa80, 12279, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa81, 12283, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa82, 12287, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa83, 12291, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa84, 12295, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa85, 12299, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa86, 12303, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa87, 12307, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa88, 12311, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa89, 12054, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa8a, 12315, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa8b, 12058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa8c, 12319, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa8d, 12323, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa8e, 12327, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa8f, 12331, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa90, 12335, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa91, 11918, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa92, 11062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa93, 12339, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa94, 12343, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xfa95, 6489, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa96, 11327, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa97, 11659, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa98, 12340, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa99, 12344, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa9a, 12079, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa9b, 12348, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa9c, 12083, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa9d, 12352, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa9e, 12356, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfa9f, 12360, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa0, 11919, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa1, 12364, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa2, 12368, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa3, 12372, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa4, 12376, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa5, 12380, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa6, 11923, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa7, 12384, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa8, 12388, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaa9, 12392, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaaa, 12396, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaab, 12400, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaac, 12404, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaad, 12131, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaae, 12408, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaaf, 12412, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab0, 11467, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab1, 12416, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab2, 12147, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab3, 12420, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab4, 12424, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab5, 12428, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab6, 12432, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab7, 12436, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab8, 12167, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfab9, 12440, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaba, 11955, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfabb, 12444, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfabc, 12171, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfabd, 11251, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfabe, 12448, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfabf, 12175, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac0, 12452, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac1, 12183, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac2, 12456, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac3, 12460, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac4, 12464, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac5, 12468, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac6, 12472, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac7, 12191, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac8, 11943, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfac9, 12476, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfaca, 12195, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfacb, 12480, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfacc, 12199, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfacd, 12484, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa96, 11334, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa97, 11666, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa98, 12347, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa99, 12351, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa9a, 12086, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa9b, 12355, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa9c, 12090, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa9d, 12359, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa9e, 12363, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfa9f, 12367, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa0, 11926, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa1, 12371, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa2, 12375, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa3, 12379, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa4, 12383, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa5, 12387, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa6, 11930, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa7, 12391, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa8, 12395, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaa9, 12399, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaaa, 12403, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaab, 12407, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaac, 12411, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaad, 12138, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaae, 12415, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaaf, 12419, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab0, 11474, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab1, 12423, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab2, 12154, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab3, 12427, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab4, 12431, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab5, 12435, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab6, 12439, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab7, 12443, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab8, 12174, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfab9, 12447, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaba, 11962, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfabb, 12451, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfabc, 12178, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfabd, 11258, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfabe, 12455, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfabf, 12182, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac0, 12459, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac1, 12190, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac2, 12463, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac3, 12467, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac4, 12471, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac5, 12475, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac6, 12479, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac7, 12198, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac8, 11950, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfac9, 12483, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfaca, 12202, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfacb, 12487, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfacc, 12206, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfacd, 12491, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0xface, 7029, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfacf, 12488, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad0, 12493, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad1, 12498, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad2, 12503, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad3, 12507, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad4, 12511, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad5, 12515, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad6, 12520, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad7, 12525, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad8, 12530, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfad9, 12534, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb00, G_UNICODE_NOT_PRESENT_OFFSET, 12538 },
-  { 0xfb01, G_UNICODE_NOT_PRESENT_OFFSET, 12541 },
-  { 0xfb02, G_UNICODE_NOT_PRESENT_OFFSET, 12544 },
-  { 0xfb03, G_UNICODE_NOT_PRESENT_OFFSET, 12547 },
-  { 0xfb04, G_UNICODE_NOT_PRESENT_OFFSET, 12551 },
-  { 0xfb05, G_UNICODE_NOT_PRESENT_OFFSET, 12555 },
-  { 0xfb06, G_UNICODE_NOT_PRESENT_OFFSET, 12555 },
-  { 0xfb13, G_UNICODE_NOT_PRESENT_OFFSET, 12558 },
-  { 0xfb14, G_UNICODE_NOT_PRESENT_OFFSET, 12563 },
-  { 0xfb15, G_UNICODE_NOT_PRESENT_OFFSET, 12568 },
-  { 0xfb16, G_UNICODE_NOT_PRESENT_OFFSET, 12573 },
-  { 0xfb17, G_UNICODE_NOT_PRESENT_OFFSET, 12578 },
-  { 0xfb1d, 12583, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb1f, 12588, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb20, G_UNICODE_NOT_PRESENT_OFFSET, 12593 },
+  { 0xfacf, 12495, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad0, 12500, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad1, 12505, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad2, 12510, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad3, 12514, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad4, 12518, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad5, 12522, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad6, 12527, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad7, 12532, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad8, 12537, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfad9, 12541, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb00, G_UNICODE_NOT_PRESENT_OFFSET, 12545 },
+  { 0xfb01, G_UNICODE_NOT_PRESENT_OFFSET, 12548 },
+  { 0xfb02, G_UNICODE_NOT_PRESENT_OFFSET, 12551 },
+  { 0xfb03, G_UNICODE_NOT_PRESENT_OFFSET, 12554 },
+  { 0xfb04, G_UNICODE_NOT_PRESENT_OFFSET, 12558 },
+  { 0xfb05, G_UNICODE_NOT_PRESENT_OFFSET, 12562 },
+  { 0xfb06, G_UNICODE_NOT_PRESENT_OFFSET, 12562 },
+  { 0xfb13, G_UNICODE_NOT_PRESENT_OFFSET, 12565 },
+  { 0xfb14, G_UNICODE_NOT_PRESENT_OFFSET, 12570 },
+  { 0xfb15, G_UNICODE_NOT_PRESENT_OFFSET, 12575 },
+  { 0xfb16, G_UNICODE_NOT_PRESENT_OFFSET, 12580 },
+  { 0xfb17, G_UNICODE_NOT_PRESENT_OFFSET, 12585 },
+  { 0xfb1d, 12590, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb1f, 12595, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb20, G_UNICODE_NOT_PRESENT_OFFSET, 12600 },
   { 0xfb21, G_UNICODE_NOT_PRESENT_OFFSET, 5338 },
   { 0xfb22, G_UNICODE_NOT_PRESENT_OFFSET, 5347 },
-  { 0xfb23, G_UNICODE_NOT_PRESENT_OFFSET, 12596 },
-  { 0xfb24, G_UNICODE_NOT_PRESENT_OFFSET, 12599 },
-  { 0xfb25, G_UNICODE_NOT_PRESENT_OFFSET, 12602 },
-  { 0xfb26, G_UNICODE_NOT_PRESENT_OFFSET, 12605 },
-  { 0xfb27, G_UNICODE_NOT_PRESENT_OFFSET, 12608 },
-  { 0xfb28, G_UNICODE_NOT_PRESENT_OFFSET, 12611 },
+  { 0xfb23, G_UNICODE_NOT_PRESENT_OFFSET, 12603 },
+  { 0xfb24, G_UNICODE_NOT_PRESENT_OFFSET, 12606 },
+  { 0xfb25, G_UNICODE_NOT_PRESENT_OFFSET, 12609 },
+  { 0xfb26, G_UNICODE_NOT_PRESENT_OFFSET, 12612 },
+  { 0xfb27, G_UNICODE_NOT_PRESENT_OFFSET, 12615 },
+  { 0xfb28, G_UNICODE_NOT_PRESENT_OFFSET, 12618 },
   { 0xfb29, G_UNICODE_NOT_PRESENT_OFFSET, 5267 },
-  { 0xfb2a, 12614, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb2b, 12619, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb2c, 12624, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb2d, 12631, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb2e, 12638, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb2f, 12643, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb30, 12648, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb31, 12653, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb32, 12658, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb33, 12663, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb34, 12668, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb35, 12673, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb36, 12678, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb38, 12683, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb39, 12688, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb3a, 12693, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb3b, 12698, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb3c, 12703, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb3e, 12708, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb40, 12713, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb41, 12718, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb43, 12723, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb44, 12728, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb46, 12733, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb47, 12738, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb48, 12743, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb49, 12748, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb4a, 12753, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb4b, 12758, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb4c, 12763, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb4d, 12768, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb4e, 12773, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0xfb4f, G_UNICODE_NOT_PRESENT_OFFSET, 12778 },
-  { 0xfb50, G_UNICODE_NOT_PRESENT_OFFSET, 12783 },
-  { 0xfb51, G_UNICODE_NOT_PRESENT_OFFSET, 12783 },
-  { 0xfb52, G_UNICODE_NOT_PRESENT_OFFSET, 12786 },
-  { 0xfb53, G_UNICODE_NOT_PRESENT_OFFSET, 12786 },
-  { 0xfb54, G_UNICODE_NOT_PRESENT_OFFSET, 12786 },
-  { 0xfb55, G_UNICODE_NOT_PRESENT_OFFSET, 12786 },
-  { 0xfb56, G_UNICODE_NOT_PRESENT_OFFSET, 12789 },
-  { 0xfb57, G_UNICODE_NOT_PRESENT_OFFSET, 12789 },
-  { 0xfb58, G_UNICODE_NOT_PRESENT_OFFSET, 12789 },
-  { 0xfb59, G_UNICODE_NOT_PRESENT_OFFSET, 12789 },
-  { 0xfb5a, G_UNICODE_NOT_PRESENT_OFFSET, 12792 },
-  { 0xfb5b, G_UNICODE_NOT_PRESENT_OFFSET, 12792 },
-  { 0xfb5c, G_UNICODE_NOT_PRESENT_OFFSET, 12792 },
-  { 0xfb5d, G_UNICODE_NOT_PRESENT_OFFSET, 12792 },
-  { 0xfb5e, G_UNICODE_NOT_PRESENT_OFFSET, 12795 },
-  { 0xfb5f, G_UNICODE_NOT_PRESENT_OFFSET, 12795 },
-  { 0xfb60, G_UNICODE_NOT_PRESENT_OFFSET, 12795 },
-  { 0xfb61, G_UNICODE_NOT_PRESENT_OFFSET, 12795 },
-  { 0xfb62, G_UNICODE_NOT_PRESENT_OFFSET, 12798 },
-  { 0xfb63, G_UNICODE_NOT_PRESENT_OFFSET, 12798 },
-  { 0xfb64, G_UNICODE_NOT_PRESENT_OFFSET, 12798 },
-  { 0xfb65, G_UNICODE_NOT_PRESENT_OFFSET, 12798 },
-  { 0xfb66, G_UNICODE_NOT_PRESENT_OFFSET, 12801 },
-  { 0xfb67, G_UNICODE_NOT_PRESENT_OFFSET, 12801 },
-  { 0xfb68, G_UNICODE_NOT_PRESENT_OFFSET, 12801 },
-  { 0xfb69, G_UNICODE_NOT_PRESENT_OFFSET, 12801 },
-  { 0xfb6a, G_UNICODE_NOT_PRESENT_OFFSET, 12804 },
-  { 0xfb6b, G_UNICODE_NOT_PRESENT_OFFSET, 12804 },
-  { 0xfb6c, G_UNICODE_NOT_PRESENT_OFFSET, 12804 },
-  { 0xfb6d, G_UNICODE_NOT_PRESENT_OFFSET, 12804 },
-  { 0xfb6e, G_UNICODE_NOT_PRESENT_OFFSET, 12807 },
-  { 0xfb6f, G_UNICODE_NOT_PRESENT_OFFSET, 12807 },
-  { 0xfb70, G_UNICODE_NOT_PRESENT_OFFSET, 12807 },
-  { 0xfb71, G_UNICODE_NOT_PRESENT_OFFSET, 12807 },
-  { 0xfb72, G_UNICODE_NOT_PRESENT_OFFSET, 12810 },
-  { 0xfb73, G_UNICODE_NOT_PRESENT_OFFSET, 12810 },
-  { 0xfb74, G_UNICODE_NOT_PRESENT_OFFSET, 12810 },
-  { 0xfb75, G_UNICODE_NOT_PRESENT_OFFSET, 12810 },
-  { 0xfb76, G_UNICODE_NOT_PRESENT_OFFSET, 12813 },
-  { 0xfb77, G_UNICODE_NOT_PRESENT_OFFSET, 12813 },
-  { 0xfb78, G_UNICODE_NOT_PRESENT_OFFSET, 12813 },
-  { 0xfb79, G_UNICODE_NOT_PRESENT_OFFSET, 12813 },
-  { 0xfb7a, G_UNICODE_NOT_PRESENT_OFFSET, 12816 },
-  { 0xfb7b, G_UNICODE_NOT_PRESENT_OFFSET, 12816 },
-  { 0xfb7c, G_UNICODE_NOT_PRESENT_OFFSET, 12816 },
-  { 0xfb7d, G_UNICODE_NOT_PRESENT_OFFSET, 12816 },
-  { 0xfb7e, G_UNICODE_NOT_PRESENT_OFFSET, 12819 },
-  { 0xfb7f, G_UNICODE_NOT_PRESENT_OFFSET, 12819 },
-  { 0xfb80, G_UNICODE_NOT_PRESENT_OFFSET, 12819 },
-  { 0xfb81, G_UNICODE_NOT_PRESENT_OFFSET, 12819 },
-  { 0xfb82, G_UNICODE_NOT_PRESENT_OFFSET, 12822 },
-  { 0xfb83, G_UNICODE_NOT_PRESENT_OFFSET, 12822 },
-  { 0xfb84, G_UNICODE_NOT_PRESENT_OFFSET, 12825 },
-  { 0xfb85, G_UNICODE_NOT_PRESENT_OFFSET, 12825 },
-  { 0xfb86, G_UNICODE_NOT_PRESENT_OFFSET, 12828 },
-  { 0xfb87, G_UNICODE_NOT_PRESENT_OFFSET, 12828 },
-  { 0xfb88, G_UNICODE_NOT_PRESENT_OFFSET, 12831 },
-  { 0xfb89, G_UNICODE_NOT_PRESENT_OFFSET, 12831 },
-  { 0xfb8a, G_UNICODE_NOT_PRESENT_OFFSET, 12834 },
-  { 0xfb8b, G_UNICODE_NOT_PRESENT_OFFSET, 12834 },
-  { 0xfb8c, G_UNICODE_NOT_PRESENT_OFFSET, 12837 },
-  { 0xfb8d, G_UNICODE_NOT_PRESENT_OFFSET, 12837 },
-  { 0xfb8e, G_UNICODE_NOT_PRESENT_OFFSET, 12840 },
-  { 0xfb8f, G_UNICODE_NOT_PRESENT_OFFSET, 12840 },
-  { 0xfb90, G_UNICODE_NOT_PRESENT_OFFSET, 12840 },
-  { 0xfb91, G_UNICODE_NOT_PRESENT_OFFSET, 12840 },
-  { 0xfb92, G_UNICODE_NOT_PRESENT_OFFSET, 12843 },
-  { 0xfb93, G_UNICODE_NOT_PRESENT_OFFSET, 12843 },
-  { 0xfb94, G_UNICODE_NOT_PRESENT_OFFSET, 12843 },
-  { 0xfb95, G_UNICODE_NOT_PRESENT_OFFSET, 12843 },
-  { 0xfb96, G_UNICODE_NOT_PRESENT_OFFSET, 12846 },
-  { 0xfb97, G_UNICODE_NOT_PRESENT_OFFSET, 12846 },
-  { 0xfb98, G_UNICODE_NOT_PRESENT_OFFSET, 12846 },
-  { 0xfb99, G_UNICODE_NOT_PRESENT_OFFSET, 12846 },
-  { 0xfb9a, G_UNICODE_NOT_PRESENT_OFFSET, 12849 },
-  { 0xfb9b, G_UNICODE_NOT_PRESENT_OFFSET, 12849 },
-  { 0xfb9c, G_UNICODE_NOT_PRESENT_OFFSET, 12849 },
-  { 0xfb9d, G_UNICODE_NOT_PRESENT_OFFSET, 12849 },
-  { 0xfb9e, G_UNICODE_NOT_PRESENT_OFFSET, 12852 },
-  { 0xfb9f, G_UNICODE_NOT_PRESENT_OFFSET, 12852 },
-  { 0xfba0, G_UNICODE_NOT_PRESENT_OFFSET, 12855 },
-  { 0xfba1, G_UNICODE_NOT_PRESENT_OFFSET, 12855 },
-  { 0xfba2, G_UNICODE_NOT_PRESENT_OFFSET, 12855 },
-  { 0xfba3, G_UNICODE_NOT_PRESENT_OFFSET, 12855 },
+  { 0xfb2a, 12621, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb2b, 12626, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb2c, 12631, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb2d, 12638, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb2e, 12645, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb2f, 12650, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb30, 12655, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb31, 12660, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb32, 12665, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb33, 12670, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb34, 12675, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb35, 12680, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb36, 12685, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb38, 12690, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb39, 12695, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb3a, 12700, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb3b, 12705, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb3c, 12710, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb3e, 12715, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb40, 12720, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb41, 12725, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb43, 12730, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb44, 12735, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb46, 12740, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb47, 12745, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb48, 12750, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb49, 12755, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb4a, 12760, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb4b, 12765, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb4c, 12770, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb4d, 12775, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb4e, 12780, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xfb4f, G_UNICODE_NOT_PRESENT_OFFSET, 12785 },
+  { 0xfb50, G_UNICODE_NOT_PRESENT_OFFSET, 12790 },
+  { 0xfb51, G_UNICODE_NOT_PRESENT_OFFSET, 12790 },
+  { 0xfb52, G_UNICODE_NOT_PRESENT_OFFSET, 12793 },
+  { 0xfb53, G_UNICODE_NOT_PRESENT_OFFSET, 12793 },
+  { 0xfb54, G_UNICODE_NOT_PRESENT_OFFSET, 12793 },
+  { 0xfb55, G_UNICODE_NOT_PRESENT_OFFSET, 12793 },
+  { 0xfb56, G_UNICODE_NOT_PRESENT_OFFSET, 12796 },
+  { 0xfb57, G_UNICODE_NOT_PRESENT_OFFSET, 12796 },
+  { 0xfb58, G_UNICODE_NOT_PRESENT_OFFSET, 12796 },
+  { 0xfb59, G_UNICODE_NOT_PRESENT_OFFSET, 12796 },
+  { 0xfb5a, G_UNICODE_NOT_PRESENT_OFFSET, 12799 },
+  { 0xfb5b, G_UNICODE_NOT_PRESENT_OFFSET, 12799 },
+  { 0xfb5c, G_UNICODE_NOT_PRESENT_OFFSET, 12799 },
+  { 0xfb5d, G_UNICODE_NOT_PRESENT_OFFSET, 12799 },
+  { 0xfb5e, G_UNICODE_NOT_PRESENT_OFFSET, 12802 },
+  { 0xfb5f, G_UNICODE_NOT_PRESENT_OFFSET, 12802 },
+  { 0xfb60, G_UNICODE_NOT_PRESENT_OFFSET, 12802 },
+  { 0xfb61, G_UNICODE_NOT_PRESENT_OFFSET, 12802 },
+  { 0xfb62, G_UNICODE_NOT_PRESENT_OFFSET, 12805 },
+  { 0xfb63, G_UNICODE_NOT_PRESENT_OFFSET, 12805 },
+  { 0xfb64, G_UNICODE_NOT_PRESENT_OFFSET, 12805 },
+  { 0xfb65, G_UNICODE_NOT_PRESENT_OFFSET, 12805 },
+  { 0xfb66, G_UNICODE_NOT_PRESENT_OFFSET, 12808 },
+  { 0xfb67, G_UNICODE_NOT_PRESENT_OFFSET, 12808 },
+  { 0xfb68, G_UNICODE_NOT_PRESENT_OFFSET, 12808 },
+  { 0xfb69, G_UNICODE_NOT_PRESENT_OFFSET, 12808 },
+  { 0xfb6a, G_UNICODE_NOT_PRESENT_OFFSET, 12811 },
+  { 0xfb6b, G_UNICODE_NOT_PRESENT_OFFSET, 12811 },
+  { 0xfb6c, G_UNICODE_NOT_PRESENT_OFFSET, 12811 },
+  { 0xfb6d, G_UNICODE_NOT_PRESENT_OFFSET, 12811 },
+  { 0xfb6e, G_UNICODE_NOT_PRESENT_OFFSET, 12814 },
+  { 0xfb6f, G_UNICODE_NOT_PRESENT_OFFSET, 12814 },
+  { 0xfb70, G_UNICODE_NOT_PRESENT_OFFSET, 12814 },
+  { 0xfb71, G_UNICODE_NOT_PRESENT_OFFSET, 12814 },
+  { 0xfb72, G_UNICODE_NOT_PRESENT_OFFSET, 12817 },
+  { 0xfb73, G_UNICODE_NOT_PRESENT_OFFSET, 12817 },
+  { 0xfb74, G_UNICODE_NOT_PRESENT_OFFSET, 12817 },
+  { 0xfb75, G_UNICODE_NOT_PRESENT_OFFSET, 12817 },
+  { 0xfb76, G_UNICODE_NOT_PRESENT_OFFSET, 12820 },
+  { 0xfb77, G_UNICODE_NOT_PRESENT_OFFSET, 12820 },
+  { 0xfb78, G_UNICODE_NOT_PRESENT_OFFSET, 12820 },
+  { 0xfb79, G_UNICODE_NOT_PRESENT_OFFSET, 12820 },
+  { 0xfb7a, G_UNICODE_NOT_PRESENT_OFFSET, 12823 },
+  { 0xfb7b, G_UNICODE_NOT_PRESENT_OFFSET, 12823 },
+  { 0xfb7c, G_UNICODE_NOT_PRESENT_OFFSET, 12823 },
+  { 0xfb7d, G_UNICODE_NOT_PRESENT_OFFSET, 12823 },
+  { 0xfb7e, G_UNICODE_NOT_PRESENT_OFFSET, 12826 },
+  { 0xfb7f, G_UNICODE_NOT_PRESENT_OFFSET, 12826 },
+  { 0xfb80, G_UNICODE_NOT_PRESENT_OFFSET, 12826 },
+  { 0xfb81, G_UNICODE_NOT_PRESENT_OFFSET, 12826 },
+  { 0xfb82, G_UNICODE_NOT_PRESENT_OFFSET, 12829 },
+  { 0xfb83, G_UNICODE_NOT_PRESENT_OFFSET, 12829 },
+  { 0xfb84, G_UNICODE_NOT_PRESENT_OFFSET, 12832 },
+  { 0xfb85, G_UNICODE_NOT_PRESENT_OFFSET, 12832 },
+  { 0xfb86, G_UNICODE_NOT_PRESENT_OFFSET, 12835 },
+  { 0xfb87, G_UNICODE_NOT_PRESENT_OFFSET, 12835 },
+  { 0xfb88, G_UNICODE_NOT_PRESENT_OFFSET, 12838 },
+  { 0xfb89, G_UNICODE_NOT_PRESENT_OFFSET, 12838 },
+  { 0xfb8a, G_UNICODE_NOT_PRESENT_OFFSET, 12841 },
+  { 0xfb8b, G_UNICODE_NOT_PRESENT_OFFSET, 12841 },
+  { 0xfb8c, G_UNICODE_NOT_PRESENT_OFFSET, 12844 },
+  { 0xfb8d, G_UNICODE_NOT_PRESENT_OFFSET, 12844 },
+  { 0xfb8e, G_UNICODE_NOT_PRESENT_OFFSET, 12847 },
+  { 0xfb8f, G_UNICODE_NOT_PRESENT_OFFSET, 12847 },
+  { 0xfb90, G_UNICODE_NOT_PRESENT_OFFSET, 12847 },
+  { 0xfb91, G_UNICODE_NOT_PRESENT_OFFSET, 12847 },
+  { 0xfb92, G_UNICODE_NOT_PRESENT_OFFSET, 12850 },
+  { 0xfb93, G_UNICODE_NOT_PRESENT_OFFSET, 12850 },
+  { 0xfb94, G_UNICODE_NOT_PRESENT_OFFSET, 12850 },
+  { 0xfb95, G_UNICODE_NOT_PRESENT_OFFSET, 12850 },
+  { 0xfb96, G_UNICODE_NOT_PRESENT_OFFSET, 12853 },
+  { 0xfb97, G_UNICODE_NOT_PRESENT_OFFSET, 12853 },
+  { 0xfb98, G_UNICODE_NOT_PRESENT_OFFSET, 12853 },
+  { 0xfb99, G_UNICODE_NOT_PRESENT_OFFSET, 12853 },
+  { 0xfb9a, G_UNICODE_NOT_PRESENT_OFFSET, 12856 },
+  { 0xfb9b, G_UNICODE_NOT_PRESENT_OFFSET, 12856 },
+  { 0xfb9c, G_UNICODE_NOT_PRESENT_OFFSET, 12856 },
+  { 0xfb9d, G_UNICODE_NOT_PRESENT_OFFSET, 12856 },
+  { 0xfb9e, G_UNICODE_NOT_PRESENT_OFFSET, 12859 },
+  { 0xfb9f, G_UNICODE_NOT_PRESENT_OFFSET, 12859 },
+  { 0xfba0, G_UNICODE_NOT_PRESENT_OFFSET, 12862 },
+  { 0xfba1, G_UNICODE_NOT_PRESENT_OFFSET, 12862 },
+  { 0xfba2, G_UNICODE_NOT_PRESENT_OFFSET, 12862 },
+  { 0xfba3, G_UNICODE_NOT_PRESENT_OFFSET, 12862 },
   { 0xfba4, G_UNICODE_NOT_PRESENT_OFFSET, 1721 },
   { 0xfba5, G_UNICODE_NOT_PRESENT_OFFSET, 1721 },
-  { 0xfba6, G_UNICODE_NOT_PRESENT_OFFSET, 12858 },
-  { 0xfba7, G_UNICODE_NOT_PRESENT_OFFSET, 12858 },
-  { 0xfba8, G_UNICODE_NOT_PRESENT_OFFSET, 12858 },
-  { 0xfba9, G_UNICODE_NOT_PRESENT_OFFSET, 12858 },
-  { 0xfbaa, G_UNICODE_NOT_PRESENT_OFFSET, 12861 },
-  { 0xfbab, G_UNICODE_NOT_PRESENT_OFFSET, 12861 },
-  { 0xfbac, G_UNICODE_NOT_PRESENT_OFFSET, 12861 },
-  { 0xfbad, G_UNICODE_NOT_PRESENT_OFFSET, 12861 },
-  { 0xfbae, G_UNICODE_NOT_PRESENT_OFFSET, 12864 },
-  { 0xfbaf, G_UNICODE_NOT_PRESENT_OFFSET, 12864 },
+  { 0xfba6, G_UNICODE_NOT_PRESENT_OFFSET, 12865 },
+  { 0xfba7, G_UNICODE_NOT_PRESENT_OFFSET, 12865 },
+  { 0xfba8, G_UNICODE_NOT_PRESENT_OFFSET, 12865 },
+  { 0xfba9, G_UNICODE_NOT_PRESENT_OFFSET, 12865 },
+  { 0xfbaa, G_UNICODE_NOT_PRESENT_OFFSET, 12868 },
+  { 0xfbab, G_UNICODE_NOT_PRESENT_OFFSET, 12868 },
+  { 0xfbac, G_UNICODE_NOT_PRESENT_OFFSET, 12868 },
+  { 0xfbad, G_UNICODE_NOT_PRESENT_OFFSET, 12868 },
+  { 0xfbae, G_UNICODE_NOT_PRESENT_OFFSET, 12871 },
+  { 0xfbaf, G_UNICODE_NOT_PRESENT_OFFSET, 12871 },
   { 0xfbb0, G_UNICODE_NOT_PRESENT_OFFSET, 1731 },
   { 0xfbb1, G_UNICODE_NOT_PRESENT_OFFSET, 1731 },
-  { 0xfbd3, G_UNICODE_NOT_PRESENT_OFFSET, 12867 },
-  { 0xfbd4, G_UNICODE_NOT_PRESENT_OFFSET, 12867 },
-  { 0xfbd5, G_UNICODE_NOT_PRESENT_OFFSET, 12867 },
-  { 0xfbd6, G_UNICODE_NOT_PRESENT_OFFSET, 12867 },
-  { 0xfbd7, G_UNICODE_NOT_PRESENT_OFFSET, 12870 },
-  { 0xfbd8, G_UNICODE_NOT_PRESENT_OFFSET, 12870 },
-  { 0xfbd9, G_UNICODE_NOT_PRESENT_OFFSET, 12873 },
-  { 0xfbda, G_UNICODE_NOT_PRESENT_OFFSET, 12873 },
-  { 0xfbdb, G_UNICODE_NOT_PRESENT_OFFSET, 12876 },
-  { 0xfbdc, G_UNICODE_NOT_PRESENT_OFFSET, 12876 },
+  { 0xfbd3, G_UNICODE_NOT_PRESENT_OFFSET, 12874 },
+  { 0xfbd4, G_UNICODE_NOT_PRESENT_OFFSET, 12874 },
+  { 0xfbd5, G_UNICODE_NOT_PRESENT_OFFSET, 12874 },
+  { 0xfbd6, G_UNICODE_NOT_PRESENT_OFFSET, 12874 },
+  { 0xfbd7, G_UNICODE_NOT_PRESENT_OFFSET, 12877 },
+  { 0xfbd8, G_UNICODE_NOT_PRESENT_OFFSET, 12877 },
+  { 0xfbd9, G_UNICODE_NOT_PRESENT_OFFSET, 12880 },
+  { 0xfbda, G_UNICODE_NOT_PRESENT_OFFSET, 12880 },
+  { 0xfbdb, G_UNICODE_NOT_PRESENT_OFFSET, 12883 },
+  { 0xfbdc, G_UNICODE_NOT_PRESENT_OFFSET, 12883 },
   { 0xfbdd, G_UNICODE_NOT_PRESENT_OFFSET, 1711 },
-  { 0xfbde, G_UNICODE_NOT_PRESENT_OFFSET, 12879 },
-  { 0xfbdf, G_UNICODE_NOT_PRESENT_OFFSET, 12879 },
-  { 0xfbe0, G_UNICODE_NOT_PRESENT_OFFSET, 12882 },
-  { 0xfbe1, G_UNICODE_NOT_PRESENT_OFFSET, 12882 },
-  { 0xfbe2, G_UNICODE_NOT_PRESENT_OFFSET, 12885 },
-  { 0xfbe3, G_UNICODE_NOT_PRESENT_OFFSET, 12885 },
-  { 0xfbe4, G_UNICODE_NOT_PRESENT_OFFSET, 12888 },
-  { 0xfbe5, G_UNICODE_NOT_PRESENT_OFFSET, 12888 },
-  { 0xfbe6, G_UNICODE_NOT_PRESENT_OFFSET, 12888 },
-  { 0xfbe7, G_UNICODE_NOT_PRESENT_OFFSET, 12888 },
-  { 0xfbe8, G_UNICODE_NOT_PRESENT_OFFSET, 12891 },
-  { 0xfbe9, G_UNICODE_NOT_PRESENT_OFFSET, 12891 },
-  { 0xfbea, G_UNICODE_NOT_PRESENT_OFFSET, 12894 },
-  { 0xfbeb, G_UNICODE_NOT_PRESENT_OFFSET, 12894 },
-  { 0xfbec, G_UNICODE_NOT_PRESENT_OFFSET, 12901 },
-  { 0xfbed, G_UNICODE_NOT_PRESENT_OFFSET, 12901 },
-  { 0xfbee, G_UNICODE_NOT_PRESENT_OFFSET, 12908 },
-  { 0xfbef, G_UNICODE_NOT_PRESENT_OFFSET, 12908 },
-  { 0xfbf0, G_UNICODE_NOT_PRESENT_OFFSET, 12915 },
-  { 0xfbf1, G_UNICODE_NOT_PRESENT_OFFSET, 12915 },
-  { 0xfbf2, G_UNICODE_NOT_PRESENT_OFFSET, 12922 },
-  { 0xfbf3, G_UNICODE_NOT_PRESENT_OFFSET, 12922 },
-  { 0xfbf4, G_UNICODE_NOT_PRESENT_OFFSET, 12929 },
-  { 0xfbf5, G_UNICODE_NOT_PRESENT_OFFSET, 12929 },
-  { 0xfbf6, G_UNICODE_NOT_PRESENT_OFFSET, 12936 },
-  { 0xfbf7, G_UNICODE_NOT_PRESENT_OFFSET, 12936 },
-  { 0xfbf8, G_UNICODE_NOT_PRESENT_OFFSET, 12936 },
-  { 0xfbf9, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
-  { 0xfbfa, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
-  { 0xfbfb, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
-  { 0xfbfc, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
-  { 0xfbfd, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
-  { 0xfbfe, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
-  { 0xfbff, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
-  { 0xfc00, G_UNICODE_NOT_PRESENT_OFFSET, 12953 },
-  { 0xfc01, G_UNICODE_NOT_PRESENT_OFFSET, 12960 },
-  { 0xfc02, G_UNICODE_NOT_PRESENT_OFFSET, 12967 },
-  { 0xfc03, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
-  { 0xfc04, G_UNICODE_NOT_PRESENT_OFFSET, 12974 },
-  { 0xfc05, G_UNICODE_NOT_PRESENT_OFFSET, 12981 },
-  { 0xfc06, G_UNICODE_NOT_PRESENT_OFFSET, 12986 },
-  { 0xfc07, G_UNICODE_NOT_PRESENT_OFFSET, 12991 },
-  { 0xfc08, G_UNICODE_NOT_PRESENT_OFFSET, 12996 },
-  { 0xfc09, G_UNICODE_NOT_PRESENT_OFFSET, 13001 },
-  { 0xfc0a, G_UNICODE_NOT_PRESENT_OFFSET, 13006 },
-  { 0xfc0b, G_UNICODE_NOT_PRESENT_OFFSET, 13011 },
-  { 0xfc0c, G_UNICODE_NOT_PRESENT_OFFSET, 13016 },
-  { 0xfc0d, G_UNICODE_NOT_PRESENT_OFFSET, 13021 },
-  { 0xfc0e, G_UNICODE_NOT_PRESENT_OFFSET, 13026 },
-  { 0xfc0f, G_UNICODE_NOT_PRESENT_OFFSET, 13031 },
-  { 0xfc10, G_UNICODE_NOT_PRESENT_OFFSET, 13036 },
-  { 0xfc11, G_UNICODE_NOT_PRESENT_OFFSET, 13041 },
-  { 0xfc12, G_UNICODE_NOT_PRESENT_OFFSET, 13046 },
-  { 0xfc13, G_UNICODE_NOT_PRESENT_OFFSET, 13051 },
-  { 0xfc14, G_UNICODE_NOT_PRESENT_OFFSET, 13056 },
-  { 0xfc15, G_UNICODE_NOT_PRESENT_OFFSET, 13061 },
-  { 0xfc16, G_UNICODE_NOT_PRESENT_OFFSET, 13066 },
-  { 0xfc17, G_UNICODE_NOT_PRESENT_OFFSET, 13071 },
-  { 0xfc18, G_UNICODE_NOT_PRESENT_OFFSET, 13076 },
-  { 0xfc19, G_UNICODE_NOT_PRESENT_OFFSET, 13081 },
-  { 0xfc1a, G_UNICODE_NOT_PRESENT_OFFSET, 13086 },
-  { 0xfc1b, G_UNICODE_NOT_PRESENT_OFFSET, 13091 },
-  { 0xfc1c, G_UNICODE_NOT_PRESENT_OFFSET, 13096 },
-  { 0xfc1d, G_UNICODE_NOT_PRESENT_OFFSET, 13101 },
-  { 0xfc1e, G_UNICODE_NOT_PRESENT_OFFSET, 13106 },
-  { 0xfc1f, G_UNICODE_NOT_PRESENT_OFFSET, 13111 },
-  { 0xfc20, G_UNICODE_NOT_PRESENT_OFFSET, 13116 },
-  { 0xfc21, G_UNICODE_NOT_PRESENT_OFFSET, 13121 },
-  { 0xfc22, G_UNICODE_NOT_PRESENT_OFFSET, 13126 },
-  { 0xfc23, G_UNICODE_NOT_PRESENT_OFFSET, 13131 },
-  { 0xfc24, G_UNICODE_NOT_PRESENT_OFFSET, 13136 },
-  { 0xfc25, G_UNICODE_NOT_PRESENT_OFFSET, 13141 },
-  { 0xfc26, G_UNICODE_NOT_PRESENT_OFFSET, 13146 },
-  { 0xfc27, G_UNICODE_NOT_PRESENT_OFFSET, 13151 },
-  { 0xfc28, G_UNICODE_NOT_PRESENT_OFFSET, 13156 },
-  { 0xfc29, G_UNICODE_NOT_PRESENT_OFFSET, 13161 },
-  { 0xfc2a, G_UNICODE_NOT_PRESENT_OFFSET, 13166 },
-  { 0xfc2b, G_UNICODE_NOT_PRESENT_OFFSET, 13171 },
-  { 0xfc2c, G_UNICODE_NOT_PRESENT_OFFSET, 13176 },
-  { 0xfc2d, G_UNICODE_NOT_PRESENT_OFFSET, 13181 },
-  { 0xfc2e, G_UNICODE_NOT_PRESENT_OFFSET, 13186 },
-  { 0xfc2f, G_UNICODE_NOT_PRESENT_OFFSET, 13191 },
-  { 0xfc30, G_UNICODE_NOT_PRESENT_OFFSET, 13196 },
-  { 0xfc31, G_UNICODE_NOT_PRESENT_OFFSET, 13201 },
-  { 0xfc32, G_UNICODE_NOT_PRESENT_OFFSET, 13206 },
-  { 0xfc33, G_UNICODE_NOT_PRESENT_OFFSET, 13211 },
-  { 0xfc34, G_UNICODE_NOT_PRESENT_OFFSET, 13216 },
-  { 0xfc35, G_UNICODE_NOT_PRESENT_OFFSET, 13221 },
-  { 0xfc36, G_UNICODE_NOT_PRESENT_OFFSET, 13226 },
-  { 0xfc37, G_UNICODE_NOT_PRESENT_OFFSET, 13231 },
-  { 0xfc38, G_UNICODE_NOT_PRESENT_OFFSET, 13236 },
-  { 0xfc39, G_UNICODE_NOT_PRESENT_OFFSET, 13241 },
-  { 0xfc3a, G_UNICODE_NOT_PRESENT_OFFSET, 13246 },
-  { 0xfc3b, G_UNICODE_NOT_PRESENT_OFFSET, 13251 },
-  { 0xfc3c, G_UNICODE_NOT_PRESENT_OFFSET, 13256 },
-  { 0xfc3d, G_UNICODE_NOT_PRESENT_OFFSET, 13261 },
-  { 0xfc3e, G_UNICODE_NOT_PRESENT_OFFSET, 13266 },
-  { 0xfc3f, G_UNICODE_NOT_PRESENT_OFFSET, 13271 },
-  { 0xfc40, G_UNICODE_NOT_PRESENT_OFFSET, 13276 },
-  { 0xfc41, G_UNICODE_NOT_PRESENT_OFFSET, 13281 },
-  { 0xfc42, G_UNICODE_NOT_PRESENT_OFFSET, 13286 },
-  { 0xfc43, G_UNICODE_NOT_PRESENT_OFFSET, 13291 },
-  { 0xfc44, G_UNICODE_NOT_PRESENT_OFFSET, 13296 },
-  { 0xfc45, G_UNICODE_NOT_PRESENT_OFFSET, 13301 },
-  { 0xfc46, G_UNICODE_NOT_PRESENT_OFFSET, 13306 },
-  { 0xfc47, G_UNICODE_NOT_PRESENT_OFFSET, 13311 },
-  { 0xfc48, G_UNICODE_NOT_PRESENT_OFFSET, 13316 },
-  { 0xfc49, G_UNICODE_NOT_PRESENT_OFFSET, 13321 },
-  { 0xfc4a, G_UNICODE_NOT_PRESENT_OFFSET, 13326 },
-  { 0xfc4b, G_UNICODE_NOT_PRESENT_OFFSET, 13331 },
-  { 0xfc4c, G_UNICODE_NOT_PRESENT_OFFSET, 13336 },
-  { 0xfc4d, G_UNICODE_NOT_PRESENT_OFFSET, 13341 },
-  { 0xfc4e, G_UNICODE_NOT_PRESENT_OFFSET, 13346 },
-  { 0xfc4f, G_UNICODE_NOT_PRESENT_OFFSET, 13351 },
-  { 0xfc50, G_UNICODE_NOT_PRESENT_OFFSET, 13356 },
-  { 0xfc51, G_UNICODE_NOT_PRESENT_OFFSET, 13361 },
-  { 0xfc52, G_UNICODE_NOT_PRESENT_OFFSET, 13366 },
-  { 0xfc53, G_UNICODE_NOT_PRESENT_OFFSET, 13371 },
-  { 0xfc54, G_UNICODE_NOT_PRESENT_OFFSET, 13376 },
-  { 0xfc55, G_UNICODE_NOT_PRESENT_OFFSET, 13381 },
-  { 0xfc56, G_UNICODE_NOT_PRESENT_OFFSET, 13386 },
-  { 0xfc57, G_UNICODE_NOT_PRESENT_OFFSET, 13391 },
-  { 0xfc58, G_UNICODE_NOT_PRESENT_OFFSET, 13396 },
-  { 0xfc59, G_UNICODE_NOT_PRESENT_OFFSET, 13401 },
-  { 0xfc5a, G_UNICODE_NOT_PRESENT_OFFSET, 13406 },
-  { 0xfc5b, G_UNICODE_NOT_PRESENT_OFFSET, 13411 },
-  { 0xfc5c, G_UNICODE_NOT_PRESENT_OFFSET, 13416 },
-  { 0xfc5d, G_UNICODE_NOT_PRESENT_OFFSET, 13421 },
-  { 0xfc5e, G_UNICODE_NOT_PRESENT_OFFSET, 13426 },
-  { 0xfc5f, G_UNICODE_NOT_PRESENT_OFFSET, 13432 },
-  { 0xfc60, G_UNICODE_NOT_PRESENT_OFFSET, 13438 },
-  { 0xfc61, G_UNICODE_NOT_PRESENT_OFFSET, 13444 },
-  { 0xfc62, G_UNICODE_NOT_PRESENT_OFFSET, 13450 },
-  { 0xfc63, G_UNICODE_NOT_PRESENT_OFFSET, 13456 },
-  { 0xfc64, G_UNICODE_NOT_PRESENT_OFFSET, 13462 },
-  { 0xfc65, G_UNICODE_NOT_PRESENT_OFFSET, 13469 },
-  { 0xfc66, G_UNICODE_NOT_PRESENT_OFFSET, 12967 },
-  { 0xfc67, G_UNICODE_NOT_PRESENT_OFFSET, 13476 },
-  { 0xfc68, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
-  { 0xfc69, G_UNICODE_NOT_PRESENT_OFFSET, 12974 },
-  { 0xfc6a, G_UNICODE_NOT_PRESENT_OFFSET, 13483 },
-  { 0xfc6b, G_UNICODE_NOT_PRESENT_OFFSET, 13488 },
-  { 0xfc6c, G_UNICODE_NOT_PRESENT_OFFSET, 12996 },
-  { 0xfc6d, G_UNICODE_NOT_PRESENT_OFFSET, 13493 },
-  { 0xfc6e, G_UNICODE_NOT_PRESENT_OFFSET, 13001 },
-  { 0xfc6f, G_UNICODE_NOT_PRESENT_OFFSET, 13006 },
-  { 0xfc70, G_UNICODE_NOT_PRESENT_OFFSET, 13498 },
-  { 0xfc71, G_UNICODE_NOT_PRESENT_OFFSET, 13503 },
-  { 0xfc72, G_UNICODE_NOT_PRESENT_OFFSET, 13026 },
-  { 0xfc73, G_UNICODE_NOT_PRESENT_OFFSET, 13508 },
-  { 0xfc74, G_UNICODE_NOT_PRESENT_OFFSET, 13031 },
-  { 0xfc75, G_UNICODE_NOT_PRESENT_OFFSET, 13036 },
-  { 0xfc76, G_UNICODE_NOT_PRESENT_OFFSET, 13513 },
-  { 0xfc77, G_UNICODE_NOT_PRESENT_OFFSET, 13518 },
-  { 0xfc78, G_UNICODE_NOT_PRESENT_OFFSET, 13046 },
-  { 0xfc79, G_UNICODE_NOT_PRESENT_OFFSET, 13523 },
-  { 0xfc7a, G_UNICODE_NOT_PRESENT_OFFSET, 13051 },
-  { 0xfc7b, G_UNICODE_NOT_PRESENT_OFFSET, 13056 },
-  { 0xfc7c, G_UNICODE_NOT_PRESENT_OFFSET, 13201 },
-  { 0xfc7d, G_UNICODE_NOT_PRESENT_OFFSET, 13206 },
-  { 0xfc7e, G_UNICODE_NOT_PRESENT_OFFSET, 13221 },
-  { 0xfc7f, G_UNICODE_NOT_PRESENT_OFFSET, 13226 },
-  { 0xfc80, G_UNICODE_NOT_PRESENT_OFFSET, 13231 },
-  { 0xfc81, G_UNICODE_NOT_PRESENT_OFFSET, 13251 },
-  { 0xfc82, G_UNICODE_NOT_PRESENT_OFFSET, 13256 },
-  { 0xfc83, G_UNICODE_NOT_PRESENT_OFFSET, 13261 },
-  { 0xfc84, G_UNICODE_NOT_PRESENT_OFFSET, 13266 },
-  { 0xfc85, G_UNICODE_NOT_PRESENT_OFFSET, 13286 },
-  { 0xfc86, G_UNICODE_NOT_PRESENT_OFFSET, 13291 },
-  { 0xfc87, G_UNICODE_NOT_PRESENT_OFFSET, 13296 },
-  { 0xfc88, G_UNICODE_NOT_PRESENT_OFFSET, 13528 },
-  { 0xfc89, G_UNICODE_NOT_PRESENT_OFFSET, 13316 },
-  { 0xfc8a, G_UNICODE_NOT_PRESENT_OFFSET, 13533 },
-  { 0xfc8b, G_UNICODE_NOT_PRESENT_OFFSET, 13538 },
-  { 0xfc8c, G_UNICODE_NOT_PRESENT_OFFSET, 13346 },
-  { 0xfc8d, G_UNICODE_NOT_PRESENT_OFFSET, 13543 },
-  { 0xfc8e, G_UNICODE_NOT_PRESENT_OFFSET, 13351 },
-  { 0xfc8f, G_UNICODE_NOT_PRESENT_OFFSET, 13356 },
-  { 0xfc90, G_UNICODE_NOT_PRESENT_OFFSET, 13421 },
-  { 0xfc91, G_UNICODE_NOT_PRESENT_OFFSET, 13548 },
-  { 0xfc92, G_UNICODE_NOT_PRESENT_OFFSET, 13553 },
-  { 0xfc93, G_UNICODE_NOT_PRESENT_OFFSET, 13396 },
-  { 0xfc94, G_UNICODE_NOT_PRESENT_OFFSET, 13558 },
-  { 0xfc95, G_UNICODE_NOT_PRESENT_OFFSET, 13401 },
-  { 0xfc96, G_UNICODE_NOT_PRESENT_OFFSET, 13406 },
-  { 0xfc97, G_UNICODE_NOT_PRESENT_OFFSET, 12953 },
-  { 0xfc98, G_UNICODE_NOT_PRESENT_OFFSET, 12960 },
-  { 0xfc99, G_UNICODE_NOT_PRESENT_OFFSET, 13563 },
-  { 0xfc9a, G_UNICODE_NOT_PRESENT_OFFSET, 12967 },
-  { 0xfc9b, G_UNICODE_NOT_PRESENT_OFFSET, 13570 },
-  { 0xfc9c, G_UNICODE_NOT_PRESENT_OFFSET, 12981 },
-  { 0xfc9d, G_UNICODE_NOT_PRESENT_OFFSET, 12986 },
-  { 0xfc9e, G_UNICODE_NOT_PRESENT_OFFSET, 12991 },
-  { 0xfc9f, G_UNICODE_NOT_PRESENT_OFFSET, 12996 },
-  { 0xfca0, G_UNICODE_NOT_PRESENT_OFFSET, 13577 },
-  { 0xfca1, G_UNICODE_NOT_PRESENT_OFFSET, 13011 },
-  { 0xfca2, G_UNICODE_NOT_PRESENT_OFFSET, 13016 },
-  { 0xfca3, G_UNICODE_NOT_PRESENT_OFFSET, 13021 },
-  { 0xfca4, G_UNICODE_NOT_PRESENT_OFFSET, 13026 },
-  { 0xfca5, G_UNICODE_NOT_PRESENT_OFFSET, 13582 },
-  { 0xfca6, G_UNICODE_NOT_PRESENT_OFFSET, 13046 },
-  { 0xfca7, G_UNICODE_NOT_PRESENT_OFFSET, 13061 },
-  { 0xfca8, G_UNICODE_NOT_PRESENT_OFFSET, 13066 },
-  { 0xfca9, G_UNICODE_NOT_PRESENT_OFFSET, 13071 },
-  { 0xfcaa, G_UNICODE_NOT_PRESENT_OFFSET, 13076 },
-  { 0xfcab, G_UNICODE_NOT_PRESENT_OFFSET, 13081 },
-  { 0xfcac, G_UNICODE_NOT_PRESENT_OFFSET, 13091 },
-  { 0xfcad, G_UNICODE_NOT_PRESENT_OFFSET, 13096 },
-  { 0xfcae, G_UNICODE_NOT_PRESENT_OFFSET, 13101 },
-  { 0xfcaf, G_UNICODE_NOT_PRESENT_OFFSET, 13106 },
-  { 0xfcb0, G_UNICODE_NOT_PRESENT_OFFSET, 13111 },
-  { 0xfcb1, G_UNICODE_NOT_PRESENT_OFFSET, 13116 },
-  { 0xfcb2, G_UNICODE_NOT_PRESENT_OFFSET, 13587 },
-  { 0xfcb3, G_UNICODE_NOT_PRESENT_OFFSET, 13121 },
-  { 0xfcb4, G_UNICODE_NOT_PRESENT_OFFSET, 13126 },
-  { 0xfcb5, G_UNICODE_NOT_PRESENT_OFFSET, 13131 },
-  { 0xfcb6, G_UNICODE_NOT_PRESENT_OFFSET, 13136 },
-  { 0xfcb7, G_UNICODE_NOT_PRESENT_OFFSET, 13141 },
-  { 0xfcb8, G_UNICODE_NOT_PRESENT_OFFSET, 13146 },
-  { 0xfcb9, G_UNICODE_NOT_PRESENT_OFFSET, 13156 },
-  { 0xfcba, G_UNICODE_NOT_PRESENT_OFFSET, 13161 },
-  { 0xfcbb, G_UNICODE_NOT_PRESENT_OFFSET, 13166 },
-  { 0xfcbc, G_UNICODE_NOT_PRESENT_OFFSET, 13171 },
-  { 0xfcbd, G_UNICODE_NOT_PRESENT_OFFSET, 13176 },
-  { 0xfcbe, G_UNICODE_NOT_PRESENT_OFFSET, 13181 },
-  { 0xfcbf, G_UNICODE_NOT_PRESENT_OFFSET, 13186 },
-  { 0xfcc0, G_UNICODE_NOT_PRESENT_OFFSET, 13191 },
-  { 0xfcc1, G_UNICODE_NOT_PRESENT_OFFSET, 13196 },
-  { 0xfcc2, G_UNICODE_NOT_PRESENT_OFFSET, 13211 },
-  { 0xfcc3, G_UNICODE_NOT_PRESENT_OFFSET, 13216 },
-  { 0xfcc4, G_UNICODE_NOT_PRESENT_OFFSET, 13236 },
-  { 0xfcc5, G_UNICODE_NOT_PRESENT_OFFSET, 13241 },
-  { 0xfcc6, G_UNICODE_NOT_PRESENT_OFFSET, 13246 },
-  { 0xfcc7, G_UNICODE_NOT_PRESENT_OFFSET, 13251 },
-  { 0xfcc8, G_UNICODE_NOT_PRESENT_OFFSET, 13256 },
-  { 0xfcc9, G_UNICODE_NOT_PRESENT_OFFSET, 13271 },
-  { 0xfcca, G_UNICODE_NOT_PRESENT_OFFSET, 13276 },
-  { 0xfccb, G_UNICODE_NOT_PRESENT_OFFSET, 13281 },
-  { 0xfccc, G_UNICODE_NOT_PRESENT_OFFSET, 13286 },
-  { 0xfccd, G_UNICODE_NOT_PRESENT_OFFSET, 13592 },
-  { 0xfcce, G_UNICODE_NOT_PRESENT_OFFSET, 13301 },
-  { 0xfccf, G_UNICODE_NOT_PRESENT_OFFSET, 13306 },
-  { 0xfcd0, G_UNICODE_NOT_PRESENT_OFFSET, 13311 },
-  { 0xfcd1, G_UNICODE_NOT_PRESENT_OFFSET, 13316 },
-  { 0xfcd2, G_UNICODE_NOT_PRESENT_OFFSET, 13331 },
-  { 0xfcd3, G_UNICODE_NOT_PRESENT_OFFSET, 13336 },
-  { 0xfcd4, G_UNICODE_NOT_PRESENT_OFFSET, 13341 },
-  { 0xfcd5, G_UNICODE_NOT_PRESENT_OFFSET, 13346 },
-  { 0xfcd6, G_UNICODE_NOT_PRESENT_OFFSET, 13597 },
-  { 0xfcd7, G_UNICODE_NOT_PRESENT_OFFSET, 13361 },
-  { 0xfcd8, G_UNICODE_NOT_PRESENT_OFFSET, 13366 },
-  { 0xfcd9, G_UNICODE_NOT_PRESENT_OFFSET, 13602 },
-  { 0xfcda, G_UNICODE_NOT_PRESENT_OFFSET, 13381 },
-  { 0xfcdb, G_UNICODE_NOT_PRESENT_OFFSET, 13386 },
-  { 0xfcdc, G_UNICODE_NOT_PRESENT_OFFSET, 13391 },
-  { 0xfcdd, G_UNICODE_NOT_PRESENT_OFFSET, 13396 },
-  { 0xfcde, G_UNICODE_NOT_PRESENT_OFFSET, 13607 },
-  { 0xfcdf, G_UNICODE_NOT_PRESENT_OFFSET, 12967 },
-  { 0xfce0, G_UNICODE_NOT_PRESENT_OFFSET, 13570 },
-  { 0xfce1, G_UNICODE_NOT_PRESENT_OFFSET, 12996 },
-  { 0xfce2, G_UNICODE_NOT_PRESENT_OFFSET, 13577 },
-  { 0xfce3, G_UNICODE_NOT_PRESENT_OFFSET, 13026 },
-  { 0xfce4, G_UNICODE_NOT_PRESENT_OFFSET, 13582 },
-  { 0xfce5, G_UNICODE_NOT_PRESENT_OFFSET, 13046 },
-  { 0xfce6, G_UNICODE_NOT_PRESENT_OFFSET, 13612 },
-  { 0xfce7, G_UNICODE_NOT_PRESENT_OFFSET, 13111 },
-  { 0xfce8, G_UNICODE_NOT_PRESENT_OFFSET, 13617 },
-  { 0xfce9, G_UNICODE_NOT_PRESENT_OFFSET, 13622 },
-  { 0xfcea, G_UNICODE_NOT_PRESENT_OFFSET, 13627 },
-  { 0xfceb, G_UNICODE_NOT_PRESENT_OFFSET, 13251 },
-  { 0xfcec, G_UNICODE_NOT_PRESENT_OFFSET, 13256 },
-  { 0xfced, G_UNICODE_NOT_PRESENT_OFFSET, 13286 },
-  { 0xfcee, G_UNICODE_NOT_PRESENT_OFFSET, 13346 },
-  { 0xfcef, G_UNICODE_NOT_PRESENT_OFFSET, 13597 },
-  { 0xfcf0, G_UNICODE_NOT_PRESENT_OFFSET, 13396 },
-  { 0xfcf1, G_UNICODE_NOT_PRESENT_OFFSET, 13607 },
-  { 0xfcf2, G_UNICODE_NOT_PRESENT_OFFSET, 13632 },
-  { 0xfcf3, G_UNICODE_NOT_PRESENT_OFFSET, 13639 },
-  { 0xfcf4, G_UNICODE_NOT_PRESENT_OFFSET, 13646 },
-  { 0xfcf5, G_UNICODE_NOT_PRESENT_OFFSET, 13653 },
-  { 0xfcf6, G_UNICODE_NOT_PRESENT_OFFSET, 13658 },
-  { 0xfcf7, G_UNICODE_NOT_PRESENT_OFFSET, 13663 },
-  { 0xfcf8, G_UNICODE_NOT_PRESENT_OFFSET, 13668 },
-  { 0xfcf9, G_UNICODE_NOT_PRESENT_OFFSET, 13673 },
-  { 0xfcfa, G_UNICODE_NOT_PRESENT_OFFSET, 13678 },
-  { 0xfcfb, G_UNICODE_NOT_PRESENT_OFFSET, 13683 },
-  { 0xfcfc, G_UNICODE_NOT_PRESENT_OFFSET, 13688 },
-  { 0xfcfd, G_UNICODE_NOT_PRESENT_OFFSET, 13693 },
-  { 0xfcfe, G_UNICODE_NOT_PRESENT_OFFSET, 13698 },
-  { 0xfcff, G_UNICODE_NOT_PRESENT_OFFSET, 13703 },
-  { 0xfd00, G_UNICODE_NOT_PRESENT_OFFSET, 13708 },
-  { 0xfd01, G_UNICODE_NOT_PRESENT_OFFSET, 13713 },
-  { 0xfd02, G_UNICODE_NOT_PRESENT_OFFSET, 13718 },
-  { 0xfd03, G_UNICODE_NOT_PRESENT_OFFSET, 13723 },
-  { 0xfd04, G_UNICODE_NOT_PRESENT_OFFSET, 13728 },
-  { 0xfd05, G_UNICODE_NOT_PRESENT_OFFSET, 13733 },
-  { 0xfd06, G_UNICODE_NOT_PRESENT_OFFSET, 13738 },
-  { 0xfd07, G_UNICODE_NOT_PRESENT_OFFSET, 13743 },
-  { 0xfd08, G_UNICODE_NOT_PRESENT_OFFSET, 13748 },
-  { 0xfd09, G_UNICODE_NOT_PRESENT_OFFSET, 13753 },
-  { 0xfd0a, G_UNICODE_NOT_PRESENT_OFFSET, 13758 },
-  { 0xfd0b, G_UNICODE_NOT_PRESENT_OFFSET, 13763 },
-  { 0xfd0c, G_UNICODE_NOT_PRESENT_OFFSET, 13622 },
-  { 0xfd0d, G_UNICODE_NOT_PRESENT_OFFSET, 13768 },
-  { 0xfd0e, G_UNICODE_NOT_PRESENT_OFFSET, 13773 },
-  { 0xfd0f, G_UNICODE_NOT_PRESENT_OFFSET, 13778 },
-  { 0xfd10, G_UNICODE_NOT_PRESENT_OFFSET, 13783 },
-  { 0xfd11, G_UNICODE_NOT_PRESENT_OFFSET, 13653 },
-  { 0xfd12, G_UNICODE_NOT_PRESENT_OFFSET, 13658 },
-  { 0xfd13, G_UNICODE_NOT_PRESENT_OFFSET, 13663 },
-  { 0xfd14, G_UNICODE_NOT_PRESENT_OFFSET, 13668 },
-  { 0xfd15, G_UNICODE_NOT_PRESENT_OFFSET, 13673 },
-  { 0xfd16, G_UNICODE_NOT_PRESENT_OFFSET, 13678 },
-  { 0xfd17, G_UNICODE_NOT_PRESENT_OFFSET, 13683 },
-  { 0xfd18, G_UNICODE_NOT_PRESENT_OFFSET, 13688 },
-  { 0xfd19, G_UNICODE_NOT_PRESENT_OFFSET, 13693 },
-  { 0xfd1a, G_UNICODE_NOT_PRESENT_OFFSET, 13698 },
-  { 0xfd1b, G_UNICODE_NOT_PRESENT_OFFSET, 13703 },
-  { 0xfd1c, G_UNICODE_NOT_PRESENT_OFFSET, 13708 },
-  { 0xfd1d, G_UNICODE_NOT_PRESENT_OFFSET, 13713 },
-  { 0xfd1e, G_UNICODE_NOT_PRESENT_OFFSET, 13718 },
-  { 0xfd1f, G_UNICODE_NOT_PRESENT_OFFSET, 13723 },
-  { 0xfd20, G_UNICODE_NOT_PRESENT_OFFSET, 13728 },
-  { 0xfd21, G_UNICODE_NOT_PRESENT_OFFSET, 13733 },
-  { 0xfd22, G_UNICODE_NOT_PRESENT_OFFSET, 13738 },
-  { 0xfd23, G_UNICODE_NOT_PRESENT_OFFSET, 13743 },
-  { 0xfd24, G_UNICODE_NOT_PRESENT_OFFSET, 13748 },
-  { 0xfd25, G_UNICODE_NOT_PRESENT_OFFSET, 13753 },
-  { 0xfd26, G_UNICODE_NOT_PRESENT_OFFSET, 13758 },
-  { 0xfd27, G_UNICODE_NOT_PRESENT_OFFSET, 13763 },
-  { 0xfd28, G_UNICODE_NOT_PRESENT_OFFSET, 13622 },
-  { 0xfd29, G_UNICODE_NOT_PRESENT_OFFSET, 13768 },
-  { 0xfd2a, G_UNICODE_NOT_PRESENT_OFFSET, 13773 },
-  { 0xfd2b, G_UNICODE_NOT_PRESENT_OFFSET, 13778 },
-  { 0xfd2c, G_UNICODE_NOT_PRESENT_OFFSET, 13783 },
-  { 0xfd2d, G_UNICODE_NOT_PRESENT_OFFSET, 13753 },
-  { 0xfd2e, G_UNICODE_NOT_PRESENT_OFFSET, 13758 },
-  { 0xfd2f, G_UNICODE_NOT_PRESENT_OFFSET, 13763 },
-  { 0xfd30, G_UNICODE_NOT_PRESENT_OFFSET, 13622 },
-  { 0xfd31, G_UNICODE_NOT_PRESENT_OFFSET, 13617 },
-  { 0xfd32, G_UNICODE_NOT_PRESENT_OFFSET, 13627 },
-  { 0xfd33, G_UNICODE_NOT_PRESENT_OFFSET, 13151 },
-  { 0xfd34, G_UNICODE_NOT_PRESENT_OFFSET, 13096 },
-  { 0xfd35, G_UNICODE_NOT_PRESENT_OFFSET, 13101 },
-  { 0xfd36, G_UNICODE_NOT_PRESENT_OFFSET, 13106 },
-  { 0xfd37, G_UNICODE_NOT_PRESENT_OFFSET, 13753 },
-  { 0xfd38, G_UNICODE_NOT_PRESENT_OFFSET, 13758 },
-  { 0xfd39, G_UNICODE_NOT_PRESENT_OFFSET, 13763 },
-  { 0xfd3a, G_UNICODE_NOT_PRESENT_OFFSET, 13151 },
-  { 0xfd3b, G_UNICODE_NOT_PRESENT_OFFSET, 13156 },
-  { 0xfd3c, G_UNICODE_NOT_PRESENT_OFFSET, 13788 },
-  { 0xfd3d, G_UNICODE_NOT_PRESENT_OFFSET, 13788 },
-  { 0xfd50, G_UNICODE_NOT_PRESENT_OFFSET, 13793 },
-  { 0xfd51, G_UNICODE_NOT_PRESENT_OFFSET, 13800 },
-  { 0xfd52, G_UNICODE_NOT_PRESENT_OFFSET, 13800 },
-  { 0xfd53, G_UNICODE_NOT_PRESENT_OFFSET, 13807 },
-  { 0xfd54, G_UNICODE_NOT_PRESENT_OFFSET, 13814 },
-  { 0xfd55, G_UNICODE_NOT_PRESENT_OFFSET, 13821 },
-  { 0xfd56, G_UNICODE_NOT_PRESENT_OFFSET, 13828 },
-  { 0xfd57, G_UNICODE_NOT_PRESENT_OFFSET, 13835 },
-  { 0xfd58, G_UNICODE_NOT_PRESENT_OFFSET, 13842 },
-  { 0xfd59, G_UNICODE_NOT_PRESENT_OFFSET, 13842 },
-  { 0xfd5a, G_UNICODE_NOT_PRESENT_OFFSET, 13849 },
-  { 0xfd5b, G_UNICODE_NOT_PRESENT_OFFSET, 13856 },
-  { 0xfd5c, G_UNICODE_NOT_PRESENT_OFFSET, 13863 },
-  { 0xfd5d, G_UNICODE_NOT_PRESENT_OFFSET, 13870 },
-  { 0xfd5e, G_UNICODE_NOT_PRESENT_OFFSET, 13877 },
-  { 0xfd5f, G_UNICODE_NOT_PRESENT_OFFSET, 13884 },
-  { 0xfd60, G_UNICODE_NOT_PRESENT_OFFSET, 13884 },
-  { 0xfd61, G_UNICODE_NOT_PRESENT_OFFSET, 13891 },
-  { 0xfd62, G_UNICODE_NOT_PRESENT_OFFSET, 13898 },
-  { 0xfd63, G_UNICODE_NOT_PRESENT_OFFSET, 13898 },
-  { 0xfd64, G_UNICODE_NOT_PRESENT_OFFSET, 13905 },
-  { 0xfd65, G_UNICODE_NOT_PRESENT_OFFSET, 13905 },
-  { 0xfd66, G_UNICODE_NOT_PRESENT_OFFSET, 13912 },
-  { 0xfd67, G_UNICODE_NOT_PRESENT_OFFSET, 13919 },
-  { 0xfd68, G_UNICODE_NOT_PRESENT_OFFSET, 13919 },
-  { 0xfd69, G_UNICODE_NOT_PRESENT_OFFSET, 13926 },
-  { 0xfd6a, G_UNICODE_NOT_PRESENT_OFFSET, 13933 },
-  { 0xfd6b, G_UNICODE_NOT_PRESENT_OFFSET, 13933 },
-  { 0xfd6c, G_UNICODE_NOT_PRESENT_OFFSET, 13940 },
-  { 0xfd6d, G_UNICODE_NOT_PRESENT_OFFSET, 13940 },
-  { 0xfd6e, G_UNICODE_NOT_PRESENT_OFFSET, 13947 },
-  { 0xfd6f, G_UNICODE_NOT_PRESENT_OFFSET, 13954 },
-  { 0xfd70, G_UNICODE_NOT_PRESENT_OFFSET, 13954 },
-  { 0xfd71, G_UNICODE_NOT_PRESENT_OFFSET, 13961 },
-  { 0xfd72, G_UNICODE_NOT_PRESENT_OFFSET, 13961 },
-  { 0xfd73, G_UNICODE_NOT_PRESENT_OFFSET, 13968 },
-  { 0xfd74, G_UNICODE_NOT_PRESENT_OFFSET, 13975 },
-  { 0xfd75, G_UNICODE_NOT_PRESENT_OFFSET, 13982 },
-  { 0xfd76, G_UNICODE_NOT_PRESENT_OFFSET, 13989 },
-  { 0xfd77, G_UNICODE_NOT_PRESENT_OFFSET, 13989 },
-  { 0xfd78, G_UNICODE_NOT_PRESENT_OFFSET, 13996 },
-  { 0xfd79, G_UNICODE_NOT_PRESENT_OFFSET, 14003 },
-  { 0xfd7a, G_UNICODE_NOT_PRESENT_OFFSET, 14010 },
-  { 0xfd7b, G_UNICODE_NOT_PRESENT_OFFSET, 14017 },
-  { 0xfd7c, G_UNICODE_NOT_PRESENT_OFFSET, 14024 },
-  { 0xfd7d, G_UNICODE_NOT_PRESENT_OFFSET, 14024 },
-  { 0xfd7e, G_UNICODE_NOT_PRESENT_OFFSET, 14031 },
-  { 0xfd7f, G_UNICODE_NOT_PRESENT_OFFSET, 14038 },
-  { 0xfd80, G_UNICODE_NOT_PRESENT_OFFSET, 14045 },
-  { 0xfd81, G_UNICODE_NOT_PRESENT_OFFSET, 14052 },
-  { 0xfd82, G_UNICODE_NOT_PRESENT_OFFSET, 14059 },
-  { 0xfd83, G_UNICODE_NOT_PRESENT_OFFSET, 14066 },
-  { 0xfd84, G_UNICODE_NOT_PRESENT_OFFSET, 14066 },
-  { 0xfd85, G_UNICODE_NOT_PRESENT_OFFSET, 14073 },
-  { 0xfd86, G_UNICODE_NOT_PRESENT_OFFSET, 14073 },
-  { 0xfd87, G_UNICODE_NOT_PRESENT_OFFSET, 14080 },
-  { 0xfd88, G_UNICODE_NOT_PRESENT_OFFSET, 14080 },
-  { 0xfd89, G_UNICODE_NOT_PRESENT_OFFSET, 14087 },
-  { 0xfd8a, G_UNICODE_NOT_PRESENT_OFFSET, 14094 },
-  { 0xfd8b, G_UNICODE_NOT_PRESENT_OFFSET, 14101 },
-  { 0xfd8c, G_UNICODE_NOT_PRESENT_OFFSET, 14108 },
-  { 0xfd8d, G_UNICODE_NOT_PRESENT_OFFSET, 14115 },
-  { 0xfd8e, G_UNICODE_NOT_PRESENT_OFFSET, 14122 },
-  { 0xfd8f, G_UNICODE_NOT_PRESENT_OFFSET, 14129 },
-  { 0xfd92, G_UNICODE_NOT_PRESENT_OFFSET, 14136 },
-  { 0xfd93, G_UNICODE_NOT_PRESENT_OFFSET, 14143 },
-  { 0xfd94, G_UNICODE_NOT_PRESENT_OFFSET, 14150 },
-  { 0xfd95, G_UNICODE_NOT_PRESENT_OFFSET, 14157 },
-  { 0xfd96, G_UNICODE_NOT_PRESENT_OFFSET, 14164 },
-  { 0xfd97, G_UNICODE_NOT_PRESENT_OFFSET, 14171 },
-  { 0xfd98, G_UNICODE_NOT_PRESENT_OFFSET, 14171 },
-  { 0xfd99, G_UNICODE_NOT_PRESENT_OFFSET, 14178 },
-  { 0xfd9a, G_UNICODE_NOT_PRESENT_OFFSET, 14185 },
-  { 0xfd9b, G_UNICODE_NOT_PRESENT_OFFSET, 14192 },
-  { 0xfd9c, G_UNICODE_NOT_PRESENT_OFFSET, 14199 },
-  { 0xfd9d, G_UNICODE_NOT_PRESENT_OFFSET, 14199 },
-  { 0xfd9e, G_UNICODE_NOT_PRESENT_OFFSET, 14206 },
-  { 0xfd9f, G_UNICODE_NOT_PRESENT_OFFSET, 14213 },
-  { 0xfda0, G_UNICODE_NOT_PRESENT_OFFSET, 14220 },
-  { 0xfda1, G_UNICODE_NOT_PRESENT_OFFSET, 14227 },
-  { 0xfda2, G_UNICODE_NOT_PRESENT_OFFSET, 14234 },
-  { 0xfda3, G_UNICODE_NOT_PRESENT_OFFSET, 14241 },
-  { 0xfda4, G_UNICODE_NOT_PRESENT_OFFSET, 14248 },
-  { 0xfda5, G_UNICODE_NOT_PRESENT_OFFSET, 14255 },
-  { 0xfda6, G_UNICODE_NOT_PRESENT_OFFSET, 14262 },
-  { 0xfda7, G_UNICODE_NOT_PRESENT_OFFSET, 14269 },
-  { 0xfda8, G_UNICODE_NOT_PRESENT_OFFSET, 14276 },
-  { 0xfda9, G_UNICODE_NOT_PRESENT_OFFSET, 14283 },
-  { 0xfdaa, G_UNICODE_NOT_PRESENT_OFFSET, 14290 },
-  { 0xfdab, G_UNICODE_NOT_PRESENT_OFFSET, 14297 },
-  { 0xfdac, G_UNICODE_NOT_PRESENT_OFFSET, 14304 },
-  { 0xfdad, G_UNICODE_NOT_PRESENT_OFFSET, 14311 },
-  { 0xfdae, G_UNICODE_NOT_PRESENT_OFFSET, 14318 },
-  { 0xfdaf, G_UNICODE_NOT_PRESENT_OFFSET, 14325 },
-  { 0xfdb0, G_UNICODE_NOT_PRESENT_OFFSET, 14332 },
-  { 0xfdb1, G_UNICODE_NOT_PRESENT_OFFSET, 14339 },
-  { 0xfdb2, G_UNICODE_NOT_PRESENT_OFFSET, 14346 },
-  { 0xfdb3, G_UNICODE_NOT_PRESENT_OFFSET, 14353 },
-  { 0xfdb4, G_UNICODE_NOT_PRESENT_OFFSET, 14031 },
-  { 0xfdb5, G_UNICODE_NOT_PRESENT_OFFSET, 14045 },
-  { 0xfdb6, G_UNICODE_NOT_PRESENT_OFFSET, 14360 },
-  { 0xfdb7, G_UNICODE_NOT_PRESENT_OFFSET, 14367 },
-  { 0xfdb8, G_UNICODE_NOT_PRESENT_OFFSET, 14374 },
-  { 0xfdb9, G_UNICODE_NOT_PRESENT_OFFSET, 14381 },
-  { 0xfdba, G_UNICODE_NOT_PRESENT_OFFSET, 14388 },
-  { 0xfdbb, G_UNICODE_NOT_PRESENT_OFFSET, 14395 },
-  { 0xfdbc, G_UNICODE_NOT_PRESENT_OFFSET, 14388 },
-  { 0xfdbd, G_UNICODE_NOT_PRESENT_OFFSET, 14374 },
-  { 0xfdbe, G_UNICODE_NOT_PRESENT_OFFSET, 14402 },
-  { 0xfdbf, G_UNICODE_NOT_PRESENT_OFFSET, 14409 },
-  { 0xfdc0, G_UNICODE_NOT_PRESENT_OFFSET, 14416 },
-  { 0xfdc1, G_UNICODE_NOT_PRESENT_OFFSET, 14423 },
-  { 0xfdc2, G_UNICODE_NOT_PRESENT_OFFSET, 14430 },
-  { 0xfdc3, G_UNICODE_NOT_PRESENT_OFFSET, 14395 },
-  { 0xfdc4, G_UNICODE_NOT_PRESENT_OFFSET, 13982 },
-  { 0xfdc5, G_UNICODE_NOT_PRESENT_OFFSET, 13912 },
-  { 0xfdc6, G_UNICODE_NOT_PRESENT_OFFSET, 14437 },
-  { 0xfdc7, G_UNICODE_NOT_PRESENT_OFFSET, 14444 },
-  { 0xfdf0, G_UNICODE_NOT_PRESENT_OFFSET, 14451 },
-  { 0xfdf1, G_UNICODE_NOT_PRESENT_OFFSET, 14458 },
-  { 0xfdf2, G_UNICODE_NOT_PRESENT_OFFSET, 14465 },
-  { 0xfdf3, G_UNICODE_NOT_PRESENT_OFFSET, 14474 },
-  { 0xfdf4, G_UNICODE_NOT_PRESENT_OFFSET, 14483 },
-  { 0xfdf5, G_UNICODE_NOT_PRESENT_OFFSET, 14492 },
-  { 0xfdf6, G_UNICODE_NOT_PRESENT_OFFSET, 14501 },
-  { 0xfdf7, G_UNICODE_NOT_PRESENT_OFFSET, 14510 },
-  { 0xfdf8, G_UNICODE_NOT_PRESENT_OFFSET, 14519 },
-  { 0xfdf9, G_UNICODE_NOT_PRESENT_OFFSET, 14528 },
-  { 0xfdfa, G_UNICODE_NOT_PRESENT_OFFSET, 14535 },
-  { 0xfdfb, G_UNICODE_NOT_PRESENT_OFFSET, 14569 },
-  { 0xfdfc, G_UNICODE_NOT_PRESENT_OFFSET, 14585 },
-  { 0xfe10, G_UNICODE_NOT_PRESENT_OFFSET, 14594 },
-  { 0xfe11, G_UNICODE_NOT_PRESENT_OFFSET, 14596 },
-  { 0xfe12, G_UNICODE_NOT_PRESENT_OFFSET, 14600 },
-  { 0xfe13, G_UNICODE_NOT_PRESENT_OFFSET, 14604 },
+  { 0xfbde, G_UNICODE_NOT_PRESENT_OFFSET, 12886 },
+  { 0xfbdf, G_UNICODE_NOT_PRESENT_OFFSET, 12886 },
+  { 0xfbe0, G_UNICODE_NOT_PRESENT_OFFSET, 12889 },
+  { 0xfbe1, G_UNICODE_NOT_PRESENT_OFFSET, 12889 },
+  { 0xfbe2, G_UNICODE_NOT_PRESENT_OFFSET, 12892 },
+  { 0xfbe3, G_UNICODE_NOT_PRESENT_OFFSET, 12892 },
+  { 0xfbe4, G_UNICODE_NOT_PRESENT_OFFSET, 12895 },
+  { 0xfbe5, G_UNICODE_NOT_PRESENT_OFFSET, 12895 },
+  { 0xfbe6, G_UNICODE_NOT_PRESENT_OFFSET, 12895 },
+  { 0xfbe7, G_UNICODE_NOT_PRESENT_OFFSET, 12895 },
+  { 0xfbe8, G_UNICODE_NOT_PRESENT_OFFSET, 12898 },
+  { 0xfbe9, G_UNICODE_NOT_PRESENT_OFFSET, 12898 },
+  { 0xfbea, G_UNICODE_NOT_PRESENT_OFFSET, 12901 },
+  { 0xfbeb, G_UNICODE_NOT_PRESENT_OFFSET, 12901 },
+  { 0xfbec, G_UNICODE_NOT_PRESENT_OFFSET, 12908 },
+  { 0xfbed, G_UNICODE_NOT_PRESENT_OFFSET, 12908 },
+  { 0xfbee, G_UNICODE_NOT_PRESENT_OFFSET, 12915 },
+  { 0xfbef, G_UNICODE_NOT_PRESENT_OFFSET, 12915 },
+  { 0xfbf0, G_UNICODE_NOT_PRESENT_OFFSET, 12922 },
+  { 0xfbf1, G_UNICODE_NOT_PRESENT_OFFSET, 12922 },
+  { 0xfbf2, G_UNICODE_NOT_PRESENT_OFFSET, 12929 },
+  { 0xfbf3, G_UNICODE_NOT_PRESENT_OFFSET, 12929 },
+  { 0xfbf4, G_UNICODE_NOT_PRESENT_OFFSET, 12936 },
+  { 0xfbf5, G_UNICODE_NOT_PRESENT_OFFSET, 12936 },
+  { 0xfbf6, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
+  { 0xfbf7, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
+  { 0xfbf8, G_UNICODE_NOT_PRESENT_OFFSET, 12943 },
+  { 0xfbf9, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
+  { 0xfbfa, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
+  { 0xfbfb, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
+  { 0xfbfc, G_UNICODE_NOT_PRESENT_OFFSET, 12957 },
+  { 0xfbfd, G_UNICODE_NOT_PRESENT_OFFSET, 12957 },
+  { 0xfbfe, G_UNICODE_NOT_PRESENT_OFFSET, 12957 },
+  { 0xfbff, G_UNICODE_NOT_PRESENT_OFFSET, 12957 },
+  { 0xfc00, G_UNICODE_NOT_PRESENT_OFFSET, 12960 },
+  { 0xfc01, G_UNICODE_NOT_PRESENT_OFFSET, 12967 },
+  { 0xfc02, G_UNICODE_NOT_PRESENT_OFFSET, 12974 },
+  { 0xfc03, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
+  { 0xfc04, G_UNICODE_NOT_PRESENT_OFFSET, 12981 },
+  { 0xfc05, G_UNICODE_NOT_PRESENT_OFFSET, 12988 },
+  { 0xfc06, G_UNICODE_NOT_PRESENT_OFFSET, 12993 },
+  { 0xfc07, G_UNICODE_NOT_PRESENT_OFFSET, 12998 },
+  { 0xfc08, G_UNICODE_NOT_PRESENT_OFFSET, 13003 },
+  { 0xfc09, G_UNICODE_NOT_PRESENT_OFFSET, 13008 },
+  { 0xfc0a, G_UNICODE_NOT_PRESENT_OFFSET, 13013 },
+  { 0xfc0b, G_UNICODE_NOT_PRESENT_OFFSET, 13018 },
+  { 0xfc0c, G_UNICODE_NOT_PRESENT_OFFSET, 13023 },
+  { 0xfc0d, G_UNICODE_NOT_PRESENT_OFFSET, 13028 },
+  { 0xfc0e, G_UNICODE_NOT_PRESENT_OFFSET, 13033 },
+  { 0xfc0f, G_UNICODE_NOT_PRESENT_OFFSET, 13038 },
+  { 0xfc10, G_UNICODE_NOT_PRESENT_OFFSET, 13043 },
+  { 0xfc11, G_UNICODE_NOT_PRESENT_OFFSET, 13048 },
+  { 0xfc12, G_UNICODE_NOT_PRESENT_OFFSET, 13053 },
+  { 0xfc13, G_UNICODE_NOT_PRESENT_OFFSET, 13058 },
+  { 0xfc14, G_UNICODE_NOT_PRESENT_OFFSET, 13063 },
+  { 0xfc15, G_UNICODE_NOT_PRESENT_OFFSET, 13068 },
+  { 0xfc16, G_UNICODE_NOT_PRESENT_OFFSET, 13073 },
+  { 0xfc17, G_UNICODE_NOT_PRESENT_OFFSET, 13078 },
+  { 0xfc18, G_UNICODE_NOT_PRESENT_OFFSET, 13083 },
+  { 0xfc19, G_UNICODE_NOT_PRESENT_OFFSET, 13088 },
+  { 0xfc1a, G_UNICODE_NOT_PRESENT_OFFSET, 13093 },
+  { 0xfc1b, G_UNICODE_NOT_PRESENT_OFFSET, 13098 },
+  { 0xfc1c, G_UNICODE_NOT_PRESENT_OFFSET, 13103 },
+  { 0xfc1d, G_UNICODE_NOT_PRESENT_OFFSET, 13108 },
+  { 0xfc1e, G_UNICODE_NOT_PRESENT_OFFSET, 13113 },
+  { 0xfc1f, G_UNICODE_NOT_PRESENT_OFFSET, 13118 },
+  { 0xfc20, G_UNICODE_NOT_PRESENT_OFFSET, 13123 },
+  { 0xfc21, G_UNICODE_NOT_PRESENT_OFFSET, 13128 },
+  { 0xfc22, G_UNICODE_NOT_PRESENT_OFFSET, 13133 },
+  { 0xfc23, G_UNICODE_NOT_PRESENT_OFFSET, 13138 },
+  { 0xfc24, G_UNICODE_NOT_PRESENT_OFFSET, 13143 },
+  { 0xfc25, G_UNICODE_NOT_PRESENT_OFFSET, 13148 },
+  { 0xfc26, G_UNICODE_NOT_PRESENT_OFFSET, 13153 },
+  { 0xfc27, G_UNICODE_NOT_PRESENT_OFFSET, 13158 },
+  { 0xfc28, G_UNICODE_NOT_PRESENT_OFFSET, 13163 },
+  { 0xfc29, G_UNICODE_NOT_PRESENT_OFFSET, 13168 },
+  { 0xfc2a, G_UNICODE_NOT_PRESENT_OFFSET, 13173 },
+  { 0xfc2b, G_UNICODE_NOT_PRESENT_OFFSET, 13178 },
+  { 0xfc2c, G_UNICODE_NOT_PRESENT_OFFSET, 13183 },
+  { 0xfc2d, G_UNICODE_NOT_PRESENT_OFFSET, 13188 },
+  { 0xfc2e, G_UNICODE_NOT_PRESENT_OFFSET, 13193 },
+  { 0xfc2f, G_UNICODE_NOT_PRESENT_OFFSET, 13198 },
+  { 0xfc30, G_UNICODE_NOT_PRESENT_OFFSET, 13203 },
+  { 0xfc31, G_UNICODE_NOT_PRESENT_OFFSET, 13208 },
+  { 0xfc32, G_UNICODE_NOT_PRESENT_OFFSET, 13213 },
+  { 0xfc33, G_UNICODE_NOT_PRESENT_OFFSET, 13218 },
+  { 0xfc34, G_UNICODE_NOT_PRESENT_OFFSET, 13223 },
+  { 0xfc35, G_UNICODE_NOT_PRESENT_OFFSET, 13228 },
+  { 0xfc36, G_UNICODE_NOT_PRESENT_OFFSET, 13233 },
+  { 0xfc37, G_UNICODE_NOT_PRESENT_OFFSET, 13238 },
+  { 0xfc38, G_UNICODE_NOT_PRESENT_OFFSET, 13243 },
+  { 0xfc39, G_UNICODE_NOT_PRESENT_OFFSET, 13248 },
+  { 0xfc3a, G_UNICODE_NOT_PRESENT_OFFSET, 13253 },
+  { 0xfc3b, G_UNICODE_NOT_PRESENT_OFFSET, 13258 },
+  { 0xfc3c, G_UNICODE_NOT_PRESENT_OFFSET, 13263 },
+  { 0xfc3d, G_UNICODE_NOT_PRESENT_OFFSET, 13268 },
+  { 0xfc3e, G_UNICODE_NOT_PRESENT_OFFSET, 13273 },
+  { 0xfc3f, G_UNICODE_NOT_PRESENT_OFFSET, 13278 },
+  { 0xfc40, G_UNICODE_NOT_PRESENT_OFFSET, 13283 },
+  { 0xfc41, G_UNICODE_NOT_PRESENT_OFFSET, 13288 },
+  { 0xfc42, G_UNICODE_NOT_PRESENT_OFFSET, 13293 },
+  { 0xfc43, G_UNICODE_NOT_PRESENT_OFFSET, 13298 },
+  { 0xfc44, G_UNICODE_NOT_PRESENT_OFFSET, 13303 },
+  { 0xfc45, G_UNICODE_NOT_PRESENT_OFFSET, 13308 },
+  { 0xfc46, G_UNICODE_NOT_PRESENT_OFFSET, 13313 },
+  { 0xfc47, G_UNICODE_NOT_PRESENT_OFFSET, 13318 },
+  { 0xfc48, G_UNICODE_NOT_PRESENT_OFFSET, 13323 },
+  { 0xfc49, G_UNICODE_NOT_PRESENT_OFFSET, 13328 },
+  { 0xfc4a, G_UNICODE_NOT_PRESENT_OFFSET, 13333 },
+  { 0xfc4b, G_UNICODE_NOT_PRESENT_OFFSET, 13338 },
+  { 0xfc4c, G_UNICODE_NOT_PRESENT_OFFSET, 13343 },
+  { 0xfc4d, G_UNICODE_NOT_PRESENT_OFFSET, 13348 },
+  { 0xfc4e, G_UNICODE_NOT_PRESENT_OFFSET, 13353 },
+  { 0xfc4f, G_UNICODE_NOT_PRESENT_OFFSET, 13358 },
+  { 0xfc50, G_UNICODE_NOT_PRESENT_OFFSET, 13363 },
+  { 0xfc51, G_UNICODE_NOT_PRESENT_OFFSET, 13368 },
+  { 0xfc52, G_UNICODE_NOT_PRESENT_OFFSET, 13373 },
+  { 0xfc53, G_UNICODE_NOT_PRESENT_OFFSET, 13378 },
+  { 0xfc54, G_UNICODE_NOT_PRESENT_OFFSET, 13383 },
+  { 0xfc55, G_UNICODE_NOT_PRESENT_OFFSET, 13388 },
+  { 0xfc56, G_UNICODE_NOT_PRESENT_OFFSET, 13393 },
+  { 0xfc57, G_UNICODE_NOT_PRESENT_OFFSET, 13398 },
+  { 0xfc58, G_UNICODE_NOT_PRESENT_OFFSET, 13403 },
+  { 0xfc59, G_UNICODE_NOT_PRESENT_OFFSET, 13408 },
+  { 0xfc5a, G_UNICODE_NOT_PRESENT_OFFSET, 13413 },
+  { 0xfc5b, G_UNICODE_NOT_PRESENT_OFFSET, 13418 },
+  { 0xfc5c, G_UNICODE_NOT_PRESENT_OFFSET, 13423 },
+  { 0xfc5d, G_UNICODE_NOT_PRESENT_OFFSET, 13428 },
+  { 0xfc5e, G_UNICODE_NOT_PRESENT_OFFSET, 13433 },
+  { 0xfc5f, G_UNICODE_NOT_PRESENT_OFFSET, 13439 },
+  { 0xfc60, G_UNICODE_NOT_PRESENT_OFFSET, 13445 },
+  { 0xfc61, G_UNICODE_NOT_PRESENT_OFFSET, 13451 },
+  { 0xfc62, G_UNICODE_NOT_PRESENT_OFFSET, 13457 },
+  { 0xfc63, G_UNICODE_NOT_PRESENT_OFFSET, 13463 },
+  { 0xfc64, G_UNICODE_NOT_PRESENT_OFFSET, 13469 },
+  { 0xfc65, G_UNICODE_NOT_PRESENT_OFFSET, 13476 },
+  { 0xfc66, G_UNICODE_NOT_PRESENT_OFFSET, 12974 },
+  { 0xfc67, G_UNICODE_NOT_PRESENT_OFFSET, 13483 },
+  { 0xfc68, G_UNICODE_NOT_PRESENT_OFFSET, 12950 },
+  { 0xfc69, G_UNICODE_NOT_PRESENT_OFFSET, 12981 },
+  { 0xfc6a, G_UNICODE_NOT_PRESENT_OFFSET, 13490 },
+  { 0xfc6b, G_UNICODE_NOT_PRESENT_OFFSET, 13495 },
+  { 0xfc6c, G_UNICODE_NOT_PRESENT_OFFSET, 13003 },
+  { 0xfc6d, G_UNICODE_NOT_PRESENT_OFFSET, 13500 },
+  { 0xfc6e, G_UNICODE_NOT_PRESENT_OFFSET, 13008 },
+  { 0xfc6f, G_UNICODE_NOT_PRESENT_OFFSET, 13013 },
+  { 0xfc70, G_UNICODE_NOT_PRESENT_OFFSET, 13505 },
+  { 0xfc71, G_UNICODE_NOT_PRESENT_OFFSET, 13510 },
+  { 0xfc72, G_UNICODE_NOT_PRESENT_OFFSET, 13033 },
+  { 0xfc73, G_UNICODE_NOT_PRESENT_OFFSET, 13515 },
+  { 0xfc74, G_UNICODE_NOT_PRESENT_OFFSET, 13038 },
+  { 0xfc75, G_UNICODE_NOT_PRESENT_OFFSET, 13043 },
+  { 0xfc76, G_UNICODE_NOT_PRESENT_OFFSET, 13520 },
+  { 0xfc77, G_UNICODE_NOT_PRESENT_OFFSET, 13525 },
+  { 0xfc78, G_UNICODE_NOT_PRESENT_OFFSET, 13053 },
+  { 0xfc79, G_UNICODE_NOT_PRESENT_OFFSET, 13530 },
+  { 0xfc7a, G_UNICODE_NOT_PRESENT_OFFSET, 13058 },
+  { 0xfc7b, G_UNICODE_NOT_PRESENT_OFFSET, 13063 },
+  { 0xfc7c, G_UNICODE_NOT_PRESENT_OFFSET, 13208 },
+  { 0xfc7d, G_UNICODE_NOT_PRESENT_OFFSET, 13213 },
+  { 0xfc7e, G_UNICODE_NOT_PRESENT_OFFSET, 13228 },
+  { 0xfc7f, G_UNICODE_NOT_PRESENT_OFFSET, 13233 },
+  { 0xfc80, G_UNICODE_NOT_PRESENT_OFFSET, 13238 },
+  { 0xfc81, G_UNICODE_NOT_PRESENT_OFFSET, 13258 },
+  { 0xfc82, G_UNICODE_NOT_PRESENT_OFFSET, 13263 },
+  { 0xfc83, G_UNICODE_NOT_PRESENT_OFFSET, 13268 },
+  { 0xfc84, G_UNICODE_NOT_PRESENT_OFFSET, 13273 },
+  { 0xfc85, G_UNICODE_NOT_PRESENT_OFFSET, 13293 },
+  { 0xfc86, G_UNICODE_NOT_PRESENT_OFFSET, 13298 },
+  { 0xfc87, G_UNICODE_NOT_PRESENT_OFFSET, 13303 },
+  { 0xfc88, G_UNICODE_NOT_PRESENT_OFFSET, 13535 },
+  { 0xfc89, G_UNICODE_NOT_PRESENT_OFFSET, 13323 },
+  { 0xfc8a, G_UNICODE_NOT_PRESENT_OFFSET, 13540 },
+  { 0xfc8b, G_UNICODE_NOT_PRESENT_OFFSET, 13545 },
+  { 0xfc8c, G_UNICODE_NOT_PRESENT_OFFSET, 13353 },
+  { 0xfc8d, G_UNICODE_NOT_PRESENT_OFFSET, 13550 },
+  { 0xfc8e, G_UNICODE_NOT_PRESENT_OFFSET, 13358 },
+  { 0xfc8f, G_UNICODE_NOT_PRESENT_OFFSET, 13363 },
+  { 0xfc90, G_UNICODE_NOT_PRESENT_OFFSET, 13428 },
+  { 0xfc91, G_UNICODE_NOT_PRESENT_OFFSET, 13555 },
+  { 0xfc92, G_UNICODE_NOT_PRESENT_OFFSET, 13560 },
+  { 0xfc93, G_UNICODE_NOT_PRESENT_OFFSET, 13403 },
+  { 0xfc94, G_UNICODE_NOT_PRESENT_OFFSET, 13565 },
+  { 0xfc95, G_UNICODE_NOT_PRESENT_OFFSET, 13408 },
+  { 0xfc96, G_UNICODE_NOT_PRESENT_OFFSET, 13413 },
+  { 0xfc97, G_UNICODE_NOT_PRESENT_OFFSET, 12960 },
+  { 0xfc98, G_UNICODE_NOT_PRESENT_OFFSET, 12967 },
+  { 0xfc99, G_UNICODE_NOT_PRESENT_OFFSET, 13570 },
+  { 0xfc9a, G_UNICODE_NOT_PRESENT_OFFSET, 12974 },
+  { 0xfc9b, G_UNICODE_NOT_PRESENT_OFFSET, 13577 },
+  { 0xfc9c, G_UNICODE_NOT_PRESENT_OFFSET, 12988 },
+  { 0xfc9d, G_UNICODE_NOT_PRESENT_OFFSET, 12993 },
+  { 0xfc9e, G_UNICODE_NOT_PRESENT_OFFSET, 12998 },
+  { 0xfc9f, G_UNICODE_NOT_PRESENT_OFFSET, 13003 },
+  { 0xfca0, G_UNICODE_NOT_PRESENT_OFFSET, 13584 },
+  { 0xfca1, G_UNICODE_NOT_PRESENT_OFFSET, 13018 },
+  { 0xfca2, G_UNICODE_NOT_PRESENT_OFFSET, 13023 },
+  { 0xfca3, G_UNICODE_NOT_PRESENT_OFFSET, 13028 },
+  { 0xfca4, G_UNICODE_NOT_PRESENT_OFFSET, 13033 },
+  { 0xfca5, G_UNICODE_NOT_PRESENT_OFFSET, 13589 },
+  { 0xfca6, G_UNICODE_NOT_PRESENT_OFFSET, 13053 },
+  { 0xfca7, G_UNICODE_NOT_PRESENT_OFFSET, 13068 },
+  { 0xfca8, G_UNICODE_NOT_PRESENT_OFFSET, 13073 },
+  { 0xfca9, G_UNICODE_NOT_PRESENT_OFFSET, 13078 },
+  { 0xfcaa, G_UNICODE_NOT_PRESENT_OFFSET, 13083 },
+  { 0xfcab, G_UNICODE_NOT_PRESENT_OFFSET, 13088 },
+  { 0xfcac, G_UNICODE_NOT_PRESENT_OFFSET, 13098 },
+  { 0xfcad, G_UNICODE_NOT_PRESENT_OFFSET, 13103 },
+  { 0xfcae, G_UNICODE_NOT_PRESENT_OFFSET, 13108 },
+  { 0xfcaf, G_UNICODE_NOT_PRESENT_OFFSET, 13113 },
+  { 0xfcb0, G_UNICODE_NOT_PRESENT_OFFSET, 13118 },
+  { 0xfcb1, G_UNICODE_NOT_PRESENT_OFFSET, 13123 },
+  { 0xfcb2, G_UNICODE_NOT_PRESENT_OFFSET, 13594 },
+  { 0xfcb3, G_UNICODE_NOT_PRESENT_OFFSET, 13128 },
+  { 0xfcb4, G_UNICODE_NOT_PRESENT_OFFSET, 13133 },
+  { 0xfcb5, G_UNICODE_NOT_PRESENT_OFFSET, 13138 },
+  { 0xfcb6, G_UNICODE_NOT_PRESENT_OFFSET, 13143 },
+  { 0xfcb7, G_UNICODE_NOT_PRESENT_OFFSET, 13148 },
+  { 0xfcb8, G_UNICODE_NOT_PRESENT_OFFSET, 13153 },
+  { 0xfcb9, G_UNICODE_NOT_PRESENT_OFFSET, 13163 },
+  { 0xfcba, G_UNICODE_NOT_PRESENT_OFFSET, 13168 },
+  { 0xfcbb, G_UNICODE_NOT_PRESENT_OFFSET, 13173 },
+  { 0xfcbc, G_UNICODE_NOT_PRESENT_OFFSET, 13178 },
+  { 0xfcbd, G_UNICODE_NOT_PRESENT_OFFSET, 13183 },
+  { 0xfcbe, G_UNICODE_NOT_PRESENT_OFFSET, 13188 },
+  { 0xfcbf, G_UNICODE_NOT_PRESENT_OFFSET, 13193 },
+  { 0xfcc0, G_UNICODE_NOT_PRESENT_OFFSET, 13198 },
+  { 0xfcc1, G_UNICODE_NOT_PRESENT_OFFSET, 13203 },
+  { 0xfcc2, G_UNICODE_NOT_PRESENT_OFFSET, 13218 },
+  { 0xfcc3, G_UNICODE_NOT_PRESENT_OFFSET, 13223 },
+  { 0xfcc4, G_UNICODE_NOT_PRESENT_OFFSET, 13243 },
+  { 0xfcc5, G_UNICODE_NOT_PRESENT_OFFSET, 13248 },
+  { 0xfcc6, G_UNICODE_NOT_PRESENT_OFFSET, 13253 },
+  { 0xfcc7, G_UNICODE_NOT_PRESENT_OFFSET, 13258 },
+  { 0xfcc8, G_UNICODE_NOT_PRESENT_OFFSET, 13263 },
+  { 0xfcc9, G_UNICODE_NOT_PRESENT_OFFSET, 13278 },
+  { 0xfcca, G_UNICODE_NOT_PRESENT_OFFSET, 13283 },
+  { 0xfccb, G_UNICODE_NOT_PRESENT_OFFSET, 13288 },
+  { 0xfccc, G_UNICODE_NOT_PRESENT_OFFSET, 13293 },
+  { 0xfccd, G_UNICODE_NOT_PRESENT_OFFSET, 13599 },
+  { 0xfcce, G_UNICODE_NOT_PRESENT_OFFSET, 13308 },
+  { 0xfccf, G_UNICODE_NOT_PRESENT_OFFSET, 13313 },
+  { 0xfcd0, G_UNICODE_NOT_PRESENT_OFFSET, 13318 },
+  { 0xfcd1, G_UNICODE_NOT_PRESENT_OFFSET, 13323 },
+  { 0xfcd2, G_UNICODE_NOT_PRESENT_OFFSET, 13338 },
+  { 0xfcd3, G_UNICODE_NOT_PRESENT_OFFSET, 13343 },
+  { 0xfcd4, G_UNICODE_NOT_PRESENT_OFFSET, 13348 },
+  { 0xfcd5, G_UNICODE_NOT_PRESENT_OFFSET, 13353 },
+  { 0xfcd6, G_UNICODE_NOT_PRESENT_OFFSET, 13604 },
+  { 0xfcd7, G_UNICODE_NOT_PRESENT_OFFSET, 13368 },
+  { 0xfcd8, G_UNICODE_NOT_PRESENT_OFFSET, 13373 },
+  { 0xfcd9, G_UNICODE_NOT_PRESENT_OFFSET, 13609 },
+  { 0xfcda, G_UNICODE_NOT_PRESENT_OFFSET, 13388 },
+  { 0xfcdb, G_UNICODE_NOT_PRESENT_OFFSET, 13393 },
+  { 0xfcdc, G_UNICODE_NOT_PRESENT_OFFSET, 13398 },
+  { 0xfcdd, G_UNICODE_NOT_PRESENT_OFFSET, 13403 },
+  { 0xfcde, G_UNICODE_NOT_PRESENT_OFFSET, 13614 },
+  { 0xfcdf, G_UNICODE_NOT_PRESENT_OFFSET, 12974 },
+  { 0xfce0, G_UNICODE_NOT_PRESENT_OFFSET, 13577 },
+  { 0xfce1, G_UNICODE_NOT_PRESENT_OFFSET, 13003 },
+  { 0xfce2, G_UNICODE_NOT_PRESENT_OFFSET, 13584 },
+  { 0xfce3, G_UNICODE_NOT_PRESENT_OFFSET, 13033 },
+  { 0xfce4, G_UNICODE_NOT_PRESENT_OFFSET, 13589 },
+  { 0xfce5, G_UNICODE_NOT_PRESENT_OFFSET, 13053 },
+  { 0xfce6, G_UNICODE_NOT_PRESENT_OFFSET, 13619 },
+  { 0xfce7, G_UNICODE_NOT_PRESENT_OFFSET, 13118 },
+  { 0xfce8, G_UNICODE_NOT_PRESENT_OFFSET, 13624 },
+  { 0xfce9, G_UNICODE_NOT_PRESENT_OFFSET, 13629 },
+  { 0xfcea, G_UNICODE_NOT_PRESENT_OFFSET, 13634 },
+  { 0xfceb, G_UNICODE_NOT_PRESENT_OFFSET, 13258 },
+  { 0xfcec, G_UNICODE_NOT_PRESENT_OFFSET, 13263 },
+  { 0xfced, G_UNICODE_NOT_PRESENT_OFFSET, 13293 },
+  { 0xfcee, G_UNICODE_NOT_PRESENT_OFFSET, 13353 },
+  { 0xfcef, G_UNICODE_NOT_PRESENT_OFFSET, 13604 },
+  { 0xfcf0, G_UNICODE_NOT_PRESENT_OFFSET, 13403 },
+  { 0xfcf1, G_UNICODE_NOT_PRESENT_OFFSET, 13614 },
+  { 0xfcf2, G_UNICODE_NOT_PRESENT_OFFSET, 13639 },
+  { 0xfcf3, G_UNICODE_NOT_PRESENT_OFFSET, 13646 },
+  { 0xfcf4, G_UNICODE_NOT_PRESENT_OFFSET, 13653 },
+  { 0xfcf5, G_UNICODE_NOT_PRESENT_OFFSET, 13660 },
+  { 0xfcf6, G_UNICODE_NOT_PRESENT_OFFSET, 13665 },
+  { 0xfcf7, G_UNICODE_NOT_PRESENT_OFFSET, 13670 },
+  { 0xfcf8, G_UNICODE_NOT_PRESENT_OFFSET, 13675 },
+  { 0xfcf9, G_UNICODE_NOT_PRESENT_OFFSET, 13680 },
+  { 0xfcfa, G_UNICODE_NOT_PRESENT_OFFSET, 13685 },
+  { 0xfcfb, G_UNICODE_NOT_PRESENT_OFFSET, 13690 },
+  { 0xfcfc, G_UNICODE_NOT_PRESENT_OFFSET, 13695 },
+  { 0xfcfd, G_UNICODE_NOT_PRESENT_OFFSET, 13700 },
+  { 0xfcfe, G_UNICODE_NOT_PRESENT_OFFSET, 13705 },
+  { 0xfcff, G_UNICODE_NOT_PRESENT_OFFSET, 13710 },
+  { 0xfd00, G_UNICODE_NOT_PRESENT_OFFSET, 13715 },
+  { 0xfd01, G_UNICODE_NOT_PRESENT_OFFSET, 13720 },
+  { 0xfd02, G_UNICODE_NOT_PRESENT_OFFSET, 13725 },
+  { 0xfd03, G_UNICODE_NOT_PRESENT_OFFSET, 13730 },
+  { 0xfd04, G_UNICODE_NOT_PRESENT_OFFSET, 13735 },
+  { 0xfd05, G_UNICODE_NOT_PRESENT_OFFSET, 13740 },
+  { 0xfd06, G_UNICODE_NOT_PRESENT_OFFSET, 13745 },
+  { 0xfd07, G_UNICODE_NOT_PRESENT_OFFSET, 13750 },
+  { 0xfd08, G_UNICODE_NOT_PRESENT_OFFSET, 13755 },
+  { 0xfd09, G_UNICODE_NOT_PRESENT_OFFSET, 13760 },
+  { 0xfd0a, G_UNICODE_NOT_PRESENT_OFFSET, 13765 },
+  { 0xfd0b, G_UNICODE_NOT_PRESENT_OFFSET, 13770 },
+  { 0xfd0c, G_UNICODE_NOT_PRESENT_OFFSET, 13629 },
+  { 0xfd0d, G_UNICODE_NOT_PRESENT_OFFSET, 13775 },
+  { 0xfd0e, G_UNICODE_NOT_PRESENT_OFFSET, 13780 },
+  { 0xfd0f, G_UNICODE_NOT_PRESENT_OFFSET, 13785 },
+  { 0xfd10, G_UNICODE_NOT_PRESENT_OFFSET, 13790 },
+  { 0xfd11, G_UNICODE_NOT_PRESENT_OFFSET, 13660 },
+  { 0xfd12, G_UNICODE_NOT_PRESENT_OFFSET, 13665 },
+  { 0xfd13, G_UNICODE_NOT_PRESENT_OFFSET, 13670 },
+  { 0xfd14, G_UNICODE_NOT_PRESENT_OFFSET, 13675 },
+  { 0xfd15, G_UNICODE_NOT_PRESENT_OFFSET, 13680 },
+  { 0xfd16, G_UNICODE_NOT_PRESENT_OFFSET, 13685 },
+  { 0xfd17, G_UNICODE_NOT_PRESENT_OFFSET, 13690 },
+  { 0xfd18, G_UNICODE_NOT_PRESENT_OFFSET, 13695 },
+  { 0xfd19, G_UNICODE_NOT_PRESENT_OFFSET, 13700 },
+  { 0xfd1a, G_UNICODE_NOT_PRESENT_OFFSET, 13705 },
+  { 0xfd1b, G_UNICODE_NOT_PRESENT_OFFSET, 13710 },
+  { 0xfd1c, G_UNICODE_NOT_PRESENT_OFFSET, 13715 },
+  { 0xfd1d, G_UNICODE_NOT_PRESENT_OFFSET, 13720 },
+  { 0xfd1e, G_UNICODE_NOT_PRESENT_OFFSET, 13725 },
+  { 0xfd1f, G_UNICODE_NOT_PRESENT_OFFSET, 13730 },
+  { 0xfd20, G_UNICODE_NOT_PRESENT_OFFSET, 13735 },
+  { 0xfd21, G_UNICODE_NOT_PRESENT_OFFSET, 13740 },
+  { 0xfd22, G_UNICODE_NOT_PRESENT_OFFSET, 13745 },
+  { 0xfd23, G_UNICODE_NOT_PRESENT_OFFSET, 13750 },
+  { 0xfd24, G_UNICODE_NOT_PRESENT_OFFSET, 13755 },
+  { 0xfd25, G_UNICODE_NOT_PRESENT_OFFSET, 13760 },
+  { 0xfd26, G_UNICODE_NOT_PRESENT_OFFSET, 13765 },
+  { 0xfd27, G_UNICODE_NOT_PRESENT_OFFSET, 13770 },
+  { 0xfd28, G_UNICODE_NOT_PRESENT_OFFSET, 13629 },
+  { 0xfd29, G_UNICODE_NOT_PRESENT_OFFSET, 13775 },
+  { 0xfd2a, G_UNICODE_NOT_PRESENT_OFFSET, 13780 },
+  { 0xfd2b, G_UNICODE_NOT_PRESENT_OFFSET, 13785 },
+  { 0xfd2c, G_UNICODE_NOT_PRESENT_OFFSET, 13790 },
+  { 0xfd2d, G_UNICODE_NOT_PRESENT_OFFSET, 13760 },
+  { 0xfd2e, G_UNICODE_NOT_PRESENT_OFFSET, 13765 },
+  { 0xfd2f, G_UNICODE_NOT_PRESENT_OFFSET, 13770 },
+  { 0xfd30, G_UNICODE_NOT_PRESENT_OFFSET, 13629 },
+  { 0xfd31, G_UNICODE_NOT_PRESENT_OFFSET, 13624 },
+  { 0xfd32, G_UNICODE_NOT_PRESENT_OFFSET, 13634 },
+  { 0xfd33, G_UNICODE_NOT_PRESENT_OFFSET, 13158 },
+  { 0xfd34, G_UNICODE_NOT_PRESENT_OFFSET, 13103 },
+  { 0xfd35, G_UNICODE_NOT_PRESENT_OFFSET, 13108 },
+  { 0xfd36, G_UNICODE_NOT_PRESENT_OFFSET, 13113 },
+  { 0xfd37, G_UNICODE_NOT_PRESENT_OFFSET, 13760 },
+  { 0xfd38, G_UNICODE_NOT_PRESENT_OFFSET, 13765 },
+  { 0xfd39, G_UNICODE_NOT_PRESENT_OFFSET, 13770 },
+  { 0xfd3a, G_UNICODE_NOT_PRESENT_OFFSET, 13158 },
+  { 0xfd3b, G_UNICODE_NOT_PRESENT_OFFSET, 13163 },
+  { 0xfd3c, G_UNICODE_NOT_PRESENT_OFFSET, 13795 },
+  { 0xfd3d, G_UNICODE_NOT_PRESENT_OFFSET, 13795 },
+  { 0xfd50, G_UNICODE_NOT_PRESENT_OFFSET, 13800 },
+  { 0xfd51, G_UNICODE_NOT_PRESENT_OFFSET, 13807 },
+  { 0xfd52, G_UNICODE_NOT_PRESENT_OFFSET, 13807 },
+  { 0xfd53, G_UNICODE_NOT_PRESENT_OFFSET, 13814 },
+  { 0xfd54, G_UNICODE_NOT_PRESENT_OFFSET, 13821 },
+  { 0xfd55, G_UNICODE_NOT_PRESENT_OFFSET, 13828 },
+  { 0xfd56, G_UNICODE_NOT_PRESENT_OFFSET, 13835 },
+  { 0xfd57, G_UNICODE_NOT_PRESENT_OFFSET, 13842 },
+  { 0xfd58, G_UNICODE_NOT_PRESENT_OFFSET, 13849 },
+  { 0xfd59, G_UNICODE_NOT_PRESENT_OFFSET, 13849 },
+  { 0xfd5a, G_UNICODE_NOT_PRESENT_OFFSET, 13856 },
+  { 0xfd5b, G_UNICODE_NOT_PRESENT_OFFSET, 13863 },
+  { 0xfd5c, G_UNICODE_NOT_PRESENT_OFFSET, 13870 },
+  { 0xfd5d, G_UNICODE_NOT_PRESENT_OFFSET, 13877 },
+  { 0xfd5e, G_UNICODE_NOT_PRESENT_OFFSET, 13884 },
+  { 0xfd5f, G_UNICODE_NOT_PRESENT_OFFSET, 13891 },
+  { 0xfd60, G_UNICODE_NOT_PRESENT_OFFSET, 13891 },
+  { 0xfd61, G_UNICODE_NOT_PRESENT_OFFSET, 13898 },
+  { 0xfd62, G_UNICODE_NOT_PRESENT_OFFSET, 13905 },
+  { 0xfd63, G_UNICODE_NOT_PRESENT_OFFSET, 13905 },
+  { 0xfd64, G_UNICODE_NOT_PRESENT_OFFSET, 13912 },
+  { 0xfd65, G_UNICODE_NOT_PRESENT_OFFSET, 13912 },
+  { 0xfd66, G_UNICODE_NOT_PRESENT_OFFSET, 13919 },
+  { 0xfd67, G_UNICODE_NOT_PRESENT_OFFSET, 13926 },
+  { 0xfd68, G_UNICODE_NOT_PRESENT_OFFSET, 13926 },
+  { 0xfd69, G_UNICODE_NOT_PRESENT_OFFSET, 13933 },
+  { 0xfd6a, G_UNICODE_NOT_PRESENT_OFFSET, 13940 },
+  { 0xfd6b, G_UNICODE_NOT_PRESENT_OFFSET, 13940 },
+  { 0xfd6c, G_UNICODE_NOT_PRESENT_OFFSET, 13947 },
+  { 0xfd6d, G_UNICODE_NOT_PRESENT_OFFSET, 13947 },
+  { 0xfd6e, G_UNICODE_NOT_PRESENT_OFFSET, 13954 },
+  { 0xfd6f, G_UNICODE_NOT_PRESENT_OFFSET, 13961 },
+  { 0xfd70, G_UNICODE_NOT_PRESENT_OFFSET, 13961 },
+  { 0xfd71, G_UNICODE_NOT_PRESENT_OFFSET, 13968 },
+  { 0xfd72, G_UNICODE_NOT_PRESENT_OFFSET, 13968 },
+  { 0xfd73, G_UNICODE_NOT_PRESENT_OFFSET, 13975 },
+  { 0xfd74, G_UNICODE_NOT_PRESENT_OFFSET, 13982 },
+  { 0xfd75, G_UNICODE_NOT_PRESENT_OFFSET, 13989 },
+  { 0xfd76, G_UNICODE_NOT_PRESENT_OFFSET, 13996 },
+  { 0xfd77, G_UNICODE_NOT_PRESENT_OFFSET, 13996 },
+  { 0xfd78, G_UNICODE_NOT_PRESENT_OFFSET, 14003 },
+  { 0xfd79, G_UNICODE_NOT_PRESENT_OFFSET, 14010 },
+  { 0xfd7a, G_UNICODE_NOT_PRESENT_OFFSET, 14017 },
+  { 0xfd7b, G_UNICODE_NOT_PRESENT_OFFSET, 14024 },
+  { 0xfd7c, G_UNICODE_NOT_PRESENT_OFFSET, 14031 },
+  { 0xfd7d, G_UNICODE_NOT_PRESENT_OFFSET, 14031 },
+  { 0xfd7e, G_UNICODE_NOT_PRESENT_OFFSET, 14038 },
+  { 0xfd7f, G_UNICODE_NOT_PRESENT_OFFSET, 14045 },
+  { 0xfd80, G_UNICODE_NOT_PRESENT_OFFSET, 14052 },
+  { 0xfd81, G_UNICODE_NOT_PRESENT_OFFSET, 14059 },
+  { 0xfd82, G_UNICODE_NOT_PRESENT_OFFSET, 14066 },
+  { 0xfd83, G_UNICODE_NOT_PRESENT_OFFSET, 14073 },
+  { 0xfd84, G_UNICODE_NOT_PRESENT_OFFSET, 14073 },
+  { 0xfd85, G_UNICODE_NOT_PRESENT_OFFSET, 14080 },
+  { 0xfd86, G_UNICODE_NOT_PRESENT_OFFSET, 14080 },
+  { 0xfd87, G_UNICODE_NOT_PRESENT_OFFSET, 14087 },
+  { 0xfd88, G_UNICODE_NOT_PRESENT_OFFSET, 14087 },
+  { 0xfd89, G_UNICODE_NOT_PRESENT_OFFSET, 14094 },
+  { 0xfd8a, G_UNICODE_NOT_PRESENT_OFFSET, 14101 },
+  { 0xfd8b, G_UNICODE_NOT_PRESENT_OFFSET, 14108 },
+  { 0xfd8c, G_UNICODE_NOT_PRESENT_OFFSET, 14115 },
+  { 0xfd8d, G_UNICODE_NOT_PRESENT_OFFSET, 14122 },
+  { 0xfd8e, G_UNICODE_NOT_PRESENT_OFFSET, 14129 },
+  { 0xfd8f, G_UNICODE_NOT_PRESENT_OFFSET, 14136 },
+  { 0xfd92, G_UNICODE_NOT_PRESENT_OFFSET, 14143 },
+  { 0xfd93, G_UNICODE_NOT_PRESENT_OFFSET, 14150 },
+  { 0xfd94, G_UNICODE_NOT_PRESENT_OFFSET, 14157 },
+  { 0xfd95, G_UNICODE_NOT_PRESENT_OFFSET, 14164 },
+  { 0xfd96, G_UNICODE_NOT_PRESENT_OFFSET, 14171 },
+  { 0xfd97, G_UNICODE_NOT_PRESENT_OFFSET, 14178 },
+  { 0xfd98, G_UNICODE_NOT_PRESENT_OFFSET, 14178 },
+  { 0xfd99, G_UNICODE_NOT_PRESENT_OFFSET, 14185 },
+  { 0xfd9a, G_UNICODE_NOT_PRESENT_OFFSET, 14192 },
+  { 0xfd9b, G_UNICODE_NOT_PRESENT_OFFSET, 14199 },
+  { 0xfd9c, G_UNICODE_NOT_PRESENT_OFFSET, 14206 },
+  { 0xfd9d, G_UNICODE_NOT_PRESENT_OFFSET, 14206 },
+  { 0xfd9e, G_UNICODE_NOT_PRESENT_OFFSET, 14213 },
+  { 0xfd9f, G_UNICODE_NOT_PRESENT_OFFSET, 14220 },
+  { 0xfda0, G_UNICODE_NOT_PRESENT_OFFSET, 14227 },
+  { 0xfda1, G_UNICODE_NOT_PRESENT_OFFSET, 14234 },
+  { 0xfda2, G_UNICODE_NOT_PRESENT_OFFSET, 14241 },
+  { 0xfda3, G_UNICODE_NOT_PRESENT_OFFSET, 14248 },
+  { 0xfda4, G_UNICODE_NOT_PRESENT_OFFSET, 14255 },
+  { 0xfda5, G_UNICODE_NOT_PRESENT_OFFSET, 14262 },
+  { 0xfda6, G_UNICODE_NOT_PRESENT_OFFSET, 14269 },
+  { 0xfda7, G_UNICODE_NOT_PRESENT_OFFSET, 14276 },
+  { 0xfda8, G_UNICODE_NOT_PRESENT_OFFSET, 14283 },
+  { 0xfda9, G_UNICODE_NOT_PRESENT_OFFSET, 14290 },
+  { 0xfdaa, G_UNICODE_NOT_PRESENT_OFFSET, 14297 },
+  { 0xfdab, G_UNICODE_NOT_PRESENT_OFFSET, 14304 },
+  { 0xfdac, G_UNICODE_NOT_PRESENT_OFFSET, 14311 },
+  { 0xfdad, G_UNICODE_NOT_PRESENT_OFFSET, 14318 },
+  { 0xfdae, G_UNICODE_NOT_PRESENT_OFFSET, 14325 },
+  { 0xfdaf, G_UNICODE_NOT_PRESENT_OFFSET, 14332 },
+  { 0xfdb0, G_UNICODE_NOT_PRESENT_OFFSET, 14339 },
+  { 0xfdb1, G_UNICODE_NOT_PRESENT_OFFSET, 14346 },
+  { 0xfdb2, G_UNICODE_NOT_PRESENT_OFFSET, 14353 },
+  { 0xfdb3, G_UNICODE_NOT_PRESENT_OFFSET, 14360 },
+  { 0xfdb4, G_UNICODE_NOT_PRESENT_OFFSET, 14038 },
+  { 0xfdb5, G_UNICODE_NOT_PRESENT_OFFSET, 14052 },
+  { 0xfdb6, G_UNICODE_NOT_PRESENT_OFFSET, 14367 },
+  { 0xfdb7, G_UNICODE_NOT_PRESENT_OFFSET, 14374 },
+  { 0xfdb8, G_UNICODE_NOT_PRESENT_OFFSET, 14381 },
+  { 0xfdb9, G_UNICODE_NOT_PRESENT_OFFSET, 14388 },
+  { 0xfdba, G_UNICODE_NOT_PRESENT_OFFSET, 14395 },
+  { 0xfdbb, G_UNICODE_NOT_PRESENT_OFFSET, 14402 },
+  { 0xfdbc, G_UNICODE_NOT_PRESENT_OFFSET, 14395 },
+  { 0xfdbd, G_UNICODE_NOT_PRESENT_OFFSET, 14381 },
+  { 0xfdbe, G_UNICODE_NOT_PRESENT_OFFSET, 14409 },
+  { 0xfdbf, G_UNICODE_NOT_PRESENT_OFFSET, 14416 },
+  { 0xfdc0, G_UNICODE_NOT_PRESENT_OFFSET, 14423 },
+  { 0xfdc1, G_UNICODE_NOT_PRESENT_OFFSET, 14430 },
+  { 0xfdc2, G_UNICODE_NOT_PRESENT_OFFSET, 14437 },
+  { 0xfdc3, G_UNICODE_NOT_PRESENT_OFFSET, 14402 },
+  { 0xfdc4, G_UNICODE_NOT_PRESENT_OFFSET, 13989 },
+  { 0xfdc5, G_UNICODE_NOT_PRESENT_OFFSET, 13919 },
+  { 0xfdc6, G_UNICODE_NOT_PRESENT_OFFSET, 14444 },
+  { 0xfdc7, G_UNICODE_NOT_PRESENT_OFFSET, 14451 },
+  { 0xfdf0, G_UNICODE_NOT_PRESENT_OFFSET, 14458 },
+  { 0xfdf1, G_UNICODE_NOT_PRESENT_OFFSET, 14465 },
+  { 0xfdf2, G_UNICODE_NOT_PRESENT_OFFSET, 14472 },
+  { 0xfdf3, G_UNICODE_NOT_PRESENT_OFFSET, 14481 },
+  { 0xfdf4, G_UNICODE_NOT_PRESENT_OFFSET, 14490 },
+  { 0xfdf5, G_UNICODE_NOT_PRESENT_OFFSET, 14499 },
+  { 0xfdf6, G_UNICODE_NOT_PRESENT_OFFSET, 14508 },
+  { 0xfdf7, G_UNICODE_NOT_PRESENT_OFFSET, 14517 },
+  { 0xfdf8, G_UNICODE_NOT_PRESENT_OFFSET, 14526 },
+  { 0xfdf9, G_UNICODE_NOT_PRESENT_OFFSET, 14535 },
+  { 0xfdfa, G_UNICODE_NOT_PRESENT_OFFSET, 14542 },
+  { 0xfdfb, G_UNICODE_NOT_PRESENT_OFFSET, 14576 },
+  { 0xfdfc, G_UNICODE_NOT_PRESENT_OFFSET, 14592 },
+  { 0xfe10, G_UNICODE_NOT_PRESENT_OFFSET, 14601 },
+  { 0xfe11, G_UNICODE_NOT_PRESENT_OFFSET, 14603 },
+  { 0xfe12, G_UNICODE_NOT_PRESENT_OFFSET, 14607 },
+  { 0xfe13, G_UNICODE_NOT_PRESENT_OFFSET, 14611 },
   { 0xfe14, G_UNICODE_NOT_PRESENT_OFFSET, 1248 },
-  { 0xfe15, G_UNICODE_NOT_PRESENT_OFFSET, 14606 },
-  { 0xfe16, G_UNICODE_NOT_PRESENT_OFFSET, 14608 },
-  { 0xfe17, G_UNICODE_NOT_PRESENT_OFFSET, 14610 },
-  { 0xfe18, G_UNICODE_NOT_PRESENT_OFFSET, 14614 },
+  { 0xfe15, G_UNICODE_NOT_PRESENT_OFFSET, 14613 },
+  { 0xfe16, G_UNICODE_NOT_PRESENT_OFFSET, 14615 },
+  { 0xfe17, G_UNICODE_NOT_PRESENT_OFFSET, 14617 },
+  { 0xfe18, G_UNICODE_NOT_PRESENT_OFFSET, 14621 },
   { 0xfe19, G_UNICODE_NOT_PRESENT_OFFSET, 5186 },
   { 0xfe30, G_UNICODE_NOT_PRESENT_OFFSET, 5183 },
-  { 0xfe31, G_UNICODE_NOT_PRESENT_OFFSET, 14618 },
-  { 0xfe32, G_UNICODE_NOT_PRESENT_OFFSET, 14622 },
-  { 0xfe33, G_UNICODE_NOT_PRESENT_OFFSET, 14626 },
-  { 0xfe34, G_UNICODE_NOT_PRESENT_OFFSET, 14626 },
+  { 0xfe31, G_UNICODE_NOT_PRESENT_OFFSET, 14625 },
+  { 0xfe32, G_UNICODE_NOT_PRESENT_OFFSET, 14629 },
+  { 0xfe33, G_UNICODE_NOT_PRESENT_OFFSET, 14633 },
+  { 0xfe34, G_UNICODE_NOT_PRESENT_OFFSET, 14633 },
   { 0xfe35, G_UNICODE_NOT_PRESENT_OFFSET, 5275 },
   { 0xfe36, G_UNICODE_NOT_PRESENT_OFFSET, 5277 },
-  { 0xfe37, G_UNICODE_NOT_PRESENT_OFFSET, 14628 },
-  { 0xfe38, G_UNICODE_NOT_PRESENT_OFFSET, 14630 },
-  { 0xfe39, G_UNICODE_NOT_PRESENT_OFFSET, 14632 },
-  { 0xfe3a, G_UNICODE_NOT_PRESENT_OFFSET, 14636 },
-  { 0xfe3b, G_UNICODE_NOT_PRESENT_OFFSET, 14640 },
-  { 0xfe3c, G_UNICODE_NOT_PRESENT_OFFSET, 14644 },
-  { 0xfe3d, G_UNICODE_NOT_PRESENT_OFFSET, 14648 },
-  { 0xfe3e, G_UNICODE_NOT_PRESENT_OFFSET, 14652 },
+  { 0xfe37, G_UNICODE_NOT_PRESENT_OFFSET, 14635 },
+  { 0xfe38, G_UNICODE_NOT_PRESENT_OFFSET, 14637 },
+  { 0xfe39, G_UNICODE_NOT_PRESENT_OFFSET, 14639 },
+  { 0xfe3a, G_UNICODE_NOT_PRESENT_OFFSET, 14643 },
+  { 0xfe3b, G_UNICODE_NOT_PRESENT_OFFSET, 14647 },
+  { 0xfe3c, G_UNICODE_NOT_PRESENT_OFFSET, 14651 },
+  { 0xfe3d, G_UNICODE_NOT_PRESENT_OFFSET, 14655 },
+  { 0xfe3e, G_UNICODE_NOT_PRESENT_OFFSET, 14659 },
   { 0xfe3f, G_UNICODE_NOT_PRESENT_OFFSET, 5826 },
   { 0xfe40, G_UNICODE_NOT_PRESENT_OFFSET, 5830 },
-  { 0xfe41, G_UNICODE_NOT_PRESENT_OFFSET, 14656 },
-  { 0xfe42, G_UNICODE_NOT_PRESENT_OFFSET, 14660 },
-  { 0xfe43, G_UNICODE_NOT_PRESENT_OFFSET, 14664 },
-  { 0xfe44, G_UNICODE_NOT_PRESENT_OFFSET, 14668 },
-  { 0xfe47, G_UNICODE_NOT_PRESENT_OFFSET, 14672 },
-  { 0xfe48, G_UNICODE_NOT_PRESENT_OFFSET, 14674 },
+  { 0xfe41, G_UNICODE_NOT_PRESENT_OFFSET, 14663 },
+  { 0xfe42, G_UNICODE_NOT_PRESENT_OFFSET, 14667 },
+  { 0xfe43, G_UNICODE_NOT_PRESENT_OFFSET, 14671 },
+  { 0xfe44, G_UNICODE_NOT_PRESENT_OFFSET, 14675 },
+  { 0xfe47, G_UNICODE_NOT_PRESENT_OFFSET, 14679 },
+  { 0xfe48, G_UNICODE_NOT_PRESENT_OFFSET, 14681 },
   { 0xfe49, G_UNICODE_NOT_PRESENT_OFFSET, 5227 },
   { 0xfe4a, G_UNICODE_NOT_PRESENT_OFFSET, 5227 },
   { 0xfe4b, G_UNICODE_NOT_PRESENT_OFFSET, 5227 },
   { 0xfe4c, G_UNICODE_NOT_PRESENT_OFFSET, 5227 },
-  { 0xfe4d, G_UNICODE_NOT_PRESENT_OFFSET, 14626 },
-  { 0xfe4e, G_UNICODE_NOT_PRESENT_OFFSET, 14626 },
-  { 0xfe4f, G_UNICODE_NOT_PRESENT_OFFSET, 14626 },
-  { 0xfe50, G_UNICODE_NOT_PRESENT_OFFSET, 14594 },
-  { 0xfe51, G_UNICODE_NOT_PRESENT_OFFSET, 14596 },
+  { 0xfe4d, G_UNICODE_NOT_PRESENT_OFFSET, 14633 },
+  { 0xfe4e, G_UNICODE_NOT_PRESENT_OFFSET, 14633 },
+  { 0xfe4f, G_UNICODE_NOT_PRESENT_OFFSET, 14633 },
+  { 0xfe50, G_UNICODE_NOT_PRESENT_OFFSET, 14601 },
+  { 0xfe51, G_UNICODE_NOT_PRESENT_OFFSET, 14603 },
   { 0xfe52, G_UNICODE_NOT_PRESENT_OFFSET, 5181 },
   { 0xfe54, G_UNICODE_NOT_PRESENT_OFFSET, 1248 },
-  { 0xfe55, G_UNICODE_NOT_PRESENT_OFFSET, 14604 },
-  { 0xfe56, G_UNICODE_NOT_PRESENT_OFFSET, 14608 },
-  { 0xfe57, G_UNICODE_NOT_PRESENT_OFFSET, 14606 },
-  { 0xfe58, G_UNICODE_NOT_PRESENT_OFFSET, 14618 },
+  { 0xfe55, G_UNICODE_NOT_PRESENT_OFFSET, 14611 },
+  { 0xfe56, G_UNICODE_NOT_PRESENT_OFFSET, 14615 },
+  { 0xfe57, G_UNICODE_NOT_PRESENT_OFFSET, 14613 },
+  { 0xfe58, G_UNICODE_NOT_PRESENT_OFFSET, 14625 },
   { 0xfe59, G_UNICODE_NOT_PRESENT_OFFSET, 5275 },
   { 0xfe5a, G_UNICODE_NOT_PRESENT_OFFSET, 5277 },
-  { 0xfe5b, G_UNICODE_NOT_PRESENT_OFFSET, 14628 },
-  { 0xfe5c, G_UNICODE_NOT_PRESENT_OFFSET, 14630 },
-  { 0xfe5d, G_UNICODE_NOT_PRESENT_OFFSET, 14632 },
-  { 0xfe5e, G_UNICODE_NOT_PRESENT_OFFSET, 14636 },
-  { 0xfe5f, G_UNICODE_NOT_PRESENT_OFFSET, 14676 },
-  { 0xfe60, G_UNICODE_NOT_PRESENT_OFFSET, 14678 },
-  { 0xfe61, G_UNICODE_NOT_PRESENT_OFFSET, 14680 },
+  { 0xfe5b, G_UNICODE_NOT_PRESENT_OFFSET, 14635 },
+  { 0xfe5c, G_UNICODE_NOT_PRESENT_OFFSET, 14637 },
+  { 0xfe5d, G_UNICODE_NOT_PRESENT_OFFSET, 14639 },
+  { 0xfe5e, G_UNICODE_NOT_PRESENT_OFFSET, 14643 },
+  { 0xfe5f, G_UNICODE_NOT_PRESENT_OFFSET, 14683 },
+  { 0xfe60, G_UNICODE_NOT_PRESENT_OFFSET, 14685 },
+  { 0xfe61, G_UNICODE_NOT_PRESENT_OFFSET, 14687 },
   { 0xfe62, G_UNICODE_NOT_PRESENT_OFFSET, 5267 },
-  { 0xfe63, G_UNICODE_NOT_PRESENT_OFFSET, 14682 },
-  { 0xfe64, G_UNICODE_NOT_PRESENT_OFFSET, 14684 },
-  { 0xfe65, G_UNICODE_NOT_PRESENT_OFFSET, 14686 },
+  { 0xfe63, G_UNICODE_NOT_PRESENT_OFFSET, 14689 },
+  { 0xfe64, G_UNICODE_NOT_PRESENT_OFFSET, 14691 },
+  { 0xfe65, G_UNICODE_NOT_PRESENT_OFFSET, 14693 },
   { 0xfe66, G_UNICODE_NOT_PRESENT_OFFSET, 5273 },
-  { 0xfe68, G_UNICODE_NOT_PRESENT_OFFSET, 14688 },
-  { 0xfe69, G_UNICODE_NOT_PRESENT_OFFSET, 14690 },
-  { 0xfe6a, G_UNICODE_NOT_PRESENT_OFFSET, 14692 },
-  { 0xfe6b, G_UNICODE_NOT_PRESENT_OFFSET, 14694 },
-  { 0xfe70, G_UNICODE_NOT_PRESENT_OFFSET, 14696 },
-  { 0xfe71, G_UNICODE_NOT_PRESENT_OFFSET, 14700 },
-  { 0xfe72, G_UNICODE_NOT_PRESENT_OFFSET, 14705 },
-  { 0xfe74, G_UNICODE_NOT_PRESENT_OFFSET, 14709 },
-  { 0xfe76, G_UNICODE_NOT_PRESENT_OFFSET, 14713 },
-  { 0xfe77, G_UNICODE_NOT_PRESENT_OFFSET, 14717 },
-  { 0xfe78, G_UNICODE_NOT_PRESENT_OFFSET, 14722 },
-  { 0xfe79, G_UNICODE_NOT_PRESENT_OFFSET, 14726 },
-  { 0xfe7a, G_UNICODE_NOT_PRESENT_OFFSET, 14731 },
-  { 0xfe7b, G_UNICODE_NOT_PRESENT_OFFSET, 14735 },
-  { 0xfe7c, G_UNICODE_NOT_PRESENT_OFFSET, 14740 },
-  { 0xfe7d, G_UNICODE_NOT_PRESENT_OFFSET, 14744 },
-  { 0xfe7e, G_UNICODE_NOT_PRESENT_OFFSET, 14749 },
-  { 0xfe7f, G_UNICODE_NOT_PRESENT_OFFSET, 14753 },
-  { 0xfe80, G_UNICODE_NOT_PRESENT_OFFSET, 14758 },
+  { 0xfe68, G_UNICODE_NOT_PRESENT_OFFSET, 14695 },
+  { 0xfe69, G_UNICODE_NOT_PRESENT_OFFSET, 14697 },
+  { 0xfe6a, G_UNICODE_NOT_PRESENT_OFFSET, 14699 },
+  { 0xfe6b, G_UNICODE_NOT_PRESENT_OFFSET, 14701 },
+  { 0xfe70, G_UNICODE_NOT_PRESENT_OFFSET, 14703 },
+  { 0xfe71, G_UNICODE_NOT_PRESENT_OFFSET, 14707 },
+  { 0xfe72, G_UNICODE_NOT_PRESENT_OFFSET, 14712 },
+  { 0xfe74, G_UNICODE_NOT_PRESENT_OFFSET, 14716 },
+  { 0xfe76, G_UNICODE_NOT_PRESENT_OFFSET, 14720 },
+  { 0xfe77, G_UNICODE_NOT_PRESENT_OFFSET, 14724 },
+  { 0xfe78, G_UNICODE_NOT_PRESENT_OFFSET, 14729 },
+  { 0xfe79, G_UNICODE_NOT_PRESENT_OFFSET, 14733 },
+  { 0xfe7a, G_UNICODE_NOT_PRESENT_OFFSET, 14738 },
+  { 0xfe7b, G_UNICODE_NOT_PRESENT_OFFSET, 14742 },
+  { 0xfe7c, G_UNICODE_NOT_PRESENT_OFFSET, 14747 },
+  { 0xfe7d, G_UNICODE_NOT_PRESENT_OFFSET, 14751 },
+  { 0xfe7e, G_UNICODE_NOT_PRESENT_OFFSET, 14756 },
+  { 0xfe7f, G_UNICODE_NOT_PRESENT_OFFSET, 14760 },
+  { 0xfe80, G_UNICODE_NOT_PRESENT_OFFSET, 14765 },
   { 0xfe81, G_UNICODE_NOT_PRESENT_OFFSET, 1676 },
   { 0xfe82, G_UNICODE_NOT_PRESENT_OFFSET, 1676 },
   { 0xfe83, G_UNICODE_NOT_PRESENT_OFFSET, 1681 },
@@ -5895,133 +5935,133 @@ static const decomposition decomp_table[] =
   { 0xfe8a, G_UNICODE_NOT_PRESENT_OFFSET, 1696 },
   { 0xfe8b, G_UNICODE_NOT_PRESENT_OFFSET, 1696 },
   { 0xfe8c, G_UNICODE_NOT_PRESENT_OFFSET, 1696 },
-  { 0xfe8d, G_UNICODE_NOT_PRESENT_OFFSET, 14761 },
-  { 0xfe8e, G_UNICODE_NOT_PRESENT_OFFSET, 14761 },
-  { 0xfe8f, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0xfe90, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0xfe91, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0xfe92, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0xfe93, G_UNICODE_NOT_PRESENT_OFFSET, 14767 },
-  { 0xfe94, G_UNICODE_NOT_PRESENT_OFFSET, 14767 },
-  { 0xfe95, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0xfe96, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0xfe97, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0xfe98, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0xfe99, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0xfe9a, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0xfe9b, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0xfe9c, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0xfe9d, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0xfe9e, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0xfe9f, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0xfea0, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0xfea1, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0xfea2, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0xfea3, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0xfea4, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0xfea5, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0xfea6, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0xfea7, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0xfea8, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0xfea9, G_UNICODE_NOT_PRESENT_OFFSET, 14785 },
-  { 0xfeaa, G_UNICODE_NOT_PRESENT_OFFSET, 14785 },
-  { 0xfeab, G_UNICODE_NOT_PRESENT_OFFSET, 14788 },
-  { 0xfeac, G_UNICODE_NOT_PRESENT_OFFSET, 14788 },
-  { 0xfead, G_UNICODE_NOT_PRESENT_OFFSET, 14791 },
-  { 0xfeae, G_UNICODE_NOT_PRESENT_OFFSET, 14791 },
-  { 0xfeaf, G_UNICODE_NOT_PRESENT_OFFSET, 14794 },
-  { 0xfeb0, G_UNICODE_NOT_PRESENT_OFFSET, 14794 },
-  { 0xfeb1, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0xfeb2, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0xfeb3, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0xfeb4, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0xfeb5, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0xfeb6, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0xfeb7, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0xfeb8, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0xfeb9, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0xfeba, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0xfebb, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0xfebc, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0xfebd, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0xfebe, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0xfebf, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0xfec0, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0xfec1, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0xfec2, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0xfec3, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0xfec4, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0xfec5, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0xfec6, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0xfec7, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0xfec8, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0xfec9, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0xfeca, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0xfecb, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0xfecc, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0xfecd, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0xfece, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0xfecf, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0xfed0, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0xfed1, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0xfed2, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0xfed3, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0xfed4, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0xfed5, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0xfed6, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0xfed7, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0xfed8, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0xfed9, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0xfeda, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0xfedb, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0xfedc, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0xfedd, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0xfede, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0xfedf, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0xfee0, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0xfee1, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0xfee2, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0xfee3, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0xfee4, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0xfee5, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0xfee6, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0xfee7, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0xfee8, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0xfee9, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0xfeea, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0xfeeb, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0xfeec, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0xfeed, G_UNICODE_NOT_PRESENT_OFFSET, 14842 },
-  { 0xfeee, G_UNICODE_NOT_PRESENT_OFFSET, 14842 },
-  { 0xfeef, G_UNICODE_NOT_PRESENT_OFFSET, 12891 },
-  { 0xfef0, G_UNICODE_NOT_PRESENT_OFFSET, 12891 },
-  { 0xfef1, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0xfef2, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0xfef3, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0xfef4, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0xfef5, G_UNICODE_NOT_PRESENT_OFFSET, 14848 },
-  { 0xfef6, G_UNICODE_NOT_PRESENT_OFFSET, 14848 },
-  { 0xfef7, G_UNICODE_NOT_PRESENT_OFFSET, 14855 },
-  { 0xfef8, G_UNICODE_NOT_PRESENT_OFFSET, 14855 },
-  { 0xfef9, G_UNICODE_NOT_PRESENT_OFFSET, 14862 },
-  { 0xfefa, G_UNICODE_NOT_PRESENT_OFFSET, 14862 },
-  { 0xfefb, G_UNICODE_NOT_PRESENT_OFFSET, 14869 },
-  { 0xfefc, G_UNICODE_NOT_PRESENT_OFFSET, 14869 },
-  { 0xff01, G_UNICODE_NOT_PRESENT_OFFSET, 14606 },
-  { 0xff02, G_UNICODE_NOT_PRESENT_OFFSET, 14874 },
-  { 0xff03, G_UNICODE_NOT_PRESENT_OFFSET, 14676 },
-  { 0xff04, G_UNICODE_NOT_PRESENT_OFFSET, 14690 },
-  { 0xff05, G_UNICODE_NOT_PRESENT_OFFSET, 14692 },
-  { 0xff06, G_UNICODE_NOT_PRESENT_OFFSET, 14678 },
-  { 0xff07, G_UNICODE_NOT_PRESENT_OFFSET, 14876 },
+  { 0xfe8d, G_UNICODE_NOT_PRESENT_OFFSET, 14768 },
+  { 0xfe8e, G_UNICODE_NOT_PRESENT_OFFSET, 14768 },
+  { 0xfe8f, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0xfe90, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0xfe91, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0xfe92, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0xfe93, G_UNICODE_NOT_PRESENT_OFFSET, 14774 },
+  { 0xfe94, G_UNICODE_NOT_PRESENT_OFFSET, 14774 },
+  { 0xfe95, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0xfe96, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0xfe97, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0xfe98, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0xfe99, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0xfe9a, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0xfe9b, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0xfe9c, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0xfe9d, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0xfe9e, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0xfe9f, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0xfea0, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0xfea1, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0xfea2, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0xfea3, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0xfea4, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0xfea5, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0xfea6, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0xfea7, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0xfea8, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0xfea9, G_UNICODE_NOT_PRESENT_OFFSET, 14792 },
+  { 0xfeaa, G_UNICODE_NOT_PRESENT_OFFSET, 14792 },
+  { 0xfeab, G_UNICODE_NOT_PRESENT_OFFSET, 14795 },
+  { 0xfeac, G_UNICODE_NOT_PRESENT_OFFSET, 14795 },
+  { 0xfead, G_UNICODE_NOT_PRESENT_OFFSET, 14798 },
+  { 0xfeae, G_UNICODE_NOT_PRESENT_OFFSET, 14798 },
+  { 0xfeaf, G_UNICODE_NOT_PRESENT_OFFSET, 14801 },
+  { 0xfeb0, G_UNICODE_NOT_PRESENT_OFFSET, 14801 },
+  { 0xfeb1, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0xfeb2, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0xfeb3, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0xfeb4, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0xfeb5, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0xfeb6, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0xfeb7, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0xfeb8, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0xfeb9, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0xfeba, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0xfebb, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0xfebc, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0xfebd, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0xfebe, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0xfebf, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0xfec0, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0xfec1, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0xfec2, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0xfec3, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0xfec4, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0xfec5, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0xfec6, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0xfec7, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0xfec8, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0xfec9, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0xfeca, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0xfecb, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0xfecc, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0xfecd, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0xfece, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0xfecf, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0xfed0, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0xfed1, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0xfed2, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0xfed3, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0xfed4, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0xfed5, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0xfed6, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0xfed7, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0xfed8, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0xfed9, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0xfeda, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0xfedb, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0xfedc, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0xfedd, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0xfede, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0xfedf, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0xfee0, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0xfee1, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0xfee2, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0xfee3, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0xfee4, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0xfee5, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0xfee6, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0xfee7, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0xfee8, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0xfee9, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0xfeea, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0xfeeb, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0xfeec, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0xfeed, G_UNICODE_NOT_PRESENT_OFFSET, 14849 },
+  { 0xfeee, G_UNICODE_NOT_PRESENT_OFFSET, 14849 },
+  { 0xfeef, G_UNICODE_NOT_PRESENT_OFFSET, 12898 },
+  { 0xfef0, G_UNICODE_NOT_PRESENT_OFFSET, 12898 },
+  { 0xfef1, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0xfef2, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0xfef3, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0xfef4, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0xfef5, G_UNICODE_NOT_PRESENT_OFFSET, 14855 },
+  { 0xfef6, G_UNICODE_NOT_PRESENT_OFFSET, 14855 },
+  { 0xfef7, G_UNICODE_NOT_PRESENT_OFFSET, 14862 },
+  { 0xfef8, G_UNICODE_NOT_PRESENT_OFFSET, 14862 },
+  { 0xfef9, G_UNICODE_NOT_PRESENT_OFFSET, 14869 },
+  { 0xfefa, G_UNICODE_NOT_PRESENT_OFFSET, 14869 },
+  { 0xfefb, G_UNICODE_NOT_PRESENT_OFFSET, 14876 },
+  { 0xfefc, G_UNICODE_NOT_PRESENT_OFFSET, 14876 },
+  { 0xff01, G_UNICODE_NOT_PRESENT_OFFSET, 14613 },
+  { 0xff02, G_UNICODE_NOT_PRESENT_OFFSET, 14881 },
+  { 0xff03, G_UNICODE_NOT_PRESENT_OFFSET, 14683 },
+  { 0xff04, G_UNICODE_NOT_PRESENT_OFFSET, 14697 },
+  { 0xff05, G_UNICODE_NOT_PRESENT_OFFSET, 14699 },
+  { 0xff06, G_UNICODE_NOT_PRESENT_OFFSET, 14685 },
+  { 0xff07, G_UNICODE_NOT_PRESENT_OFFSET, 14883 },
   { 0xff08, G_UNICODE_NOT_PRESENT_OFFSET, 5275 },
   { 0xff09, G_UNICODE_NOT_PRESENT_OFFSET, 5277 },
-  { 0xff0a, G_UNICODE_NOT_PRESENT_OFFSET, 14680 },
+  { 0xff0a, G_UNICODE_NOT_PRESENT_OFFSET, 14687 },
   { 0xff0b, G_UNICODE_NOT_PRESENT_OFFSET, 5267 },
-  { 0xff0c, G_UNICODE_NOT_PRESENT_OFFSET, 14594 },
-  { 0xff0d, G_UNICODE_NOT_PRESENT_OFFSET, 14682 },
+  { 0xff0c, G_UNICODE_NOT_PRESENT_OFFSET, 14601 },
+  { 0xff0d, G_UNICODE_NOT_PRESENT_OFFSET, 14689 },
   { 0xff0e, G_UNICODE_NOT_PRESENT_OFFSET, 5181 },
-  { 0xff0f, G_UNICODE_NOT_PRESENT_OFFSET, 14878 },
+  { 0xff0f, G_UNICODE_NOT_PRESENT_OFFSET, 14885 },
   { 0xff10, G_UNICODE_NOT_PRESENT_OFFSET, 5253 },
   { 0xff11, G_UNICODE_NOT_PRESENT_OFFSET, 27 },
   { 0xff12, G_UNICODE_NOT_PRESENT_OFFSET, 12 },
@@ -6032,13 +6072,13 @@ static const decomposition decomp_table[] =
   { 0xff17, G_UNICODE_NOT_PRESENT_OFFSET, 5261 },
   { 0xff18, G_UNICODE_NOT_PRESENT_OFFSET, 5263 },
   { 0xff19, G_UNICODE_NOT_PRESENT_OFFSET, 5265 },
-  { 0xff1a, G_UNICODE_NOT_PRESENT_OFFSET, 14604 },
+  { 0xff1a, G_UNICODE_NOT_PRESENT_OFFSET, 14611 },
   { 0xff1b, G_UNICODE_NOT_PRESENT_OFFSET, 1248 },
-  { 0xff1c, G_UNICODE_NOT_PRESENT_OFFSET, 14684 },
+  { 0xff1c, G_UNICODE_NOT_PRESENT_OFFSET, 14691 },
   { 0xff1d, G_UNICODE_NOT_PRESENT_OFFSET, 5273 },
-  { 0xff1e, G_UNICODE_NOT_PRESENT_OFFSET, 14686 },
-  { 0xff1f, G_UNICODE_NOT_PRESENT_OFFSET, 14608 },
-  { 0xff20, G_UNICODE_NOT_PRESENT_OFFSET, 14694 },
+  { 0xff1e, G_UNICODE_NOT_PRESENT_OFFSET, 14693 },
+  { 0xff1f, G_UNICODE_NOT_PRESENT_OFFSET, 14615 },
+  { 0xff20, G_UNICODE_NOT_PRESENT_OFFSET, 14701 },
   { 0xff21, G_UNICODE_NOT_PRESENT_OFFSET, 2309 },
   { 0xff22, G_UNICODE_NOT_PRESENT_OFFSET, 2314 },
   { 0xff23, G_UNICODE_NOT_PRESENT_OFFSET, 5292 },
@@ -6065,11 +6105,11 @@ static const decomposition decomp_table[] =
   { 0xff38, G_UNICODE_NOT_PRESENT_OFFSET, 5487 },
   { 0xff39, G_UNICODE_NOT_PRESENT_OFFSET, 6135 },
   { 0xff3a, G_UNICODE_NOT_PRESENT_OFFSET, 5331 },
-  { 0xff3b, G_UNICODE_NOT_PRESENT_OFFSET, 14672 },
-  { 0xff3c, G_UNICODE_NOT_PRESENT_OFFSET, 14688 },
-  { 0xff3d, G_UNICODE_NOT_PRESENT_OFFSET, 14674 },
-  { 0xff3e, G_UNICODE_NOT_PRESENT_OFFSET, 14880 },
-  { 0xff3f, G_UNICODE_NOT_PRESENT_OFFSET, 14626 },
+  { 0xff3b, G_UNICODE_NOT_PRESENT_OFFSET, 14679 },
+  { 0xff3c, G_UNICODE_NOT_PRESENT_OFFSET, 14695 },
+  { 0xff3d, G_UNICODE_NOT_PRESENT_OFFSET, 14681 },
+  { 0xff3e, G_UNICODE_NOT_PRESENT_OFFSET, 14887 },
+  { 0xff3f, G_UNICODE_NOT_PRESENT_OFFSET, 14633 },
   { 0xff40, G_UNICODE_NOT_PRESENT_OFFSET, 5110 },
   { 0xff41, G_UNICODE_NOT_PRESENT_OFFSET, 6 },
   { 0xff42, G_UNICODE_NOT_PRESENT_OFFSET, 2364 },
@@ -6097,28 +6137,28 @@ static const decomposition decomp_table[] =
   { 0xff58, G_UNICODE_NOT_PRESENT_OFFSET, 1222 },
   { 0xff59, G_UNICODE_NOT_PRESENT_OFFSET, 1191 },
   { 0xff5a, G_UNICODE_NOT_PRESENT_OFFSET, 2526 },
-  { 0xff5b, G_UNICODE_NOT_PRESENT_OFFSET, 14628 },
-  { 0xff5c, G_UNICODE_NOT_PRESENT_OFFSET, 14882 },
-  { 0xff5d, G_UNICODE_NOT_PRESENT_OFFSET, 14630 },
-  { 0xff5e, G_UNICODE_NOT_PRESENT_OFFSET, 14884 },
-  { 0xff5f, G_UNICODE_NOT_PRESENT_OFFSET, 14886 },
-  { 0xff60, G_UNICODE_NOT_PRESENT_OFFSET, 14890 },
-  { 0xff61, G_UNICODE_NOT_PRESENT_OFFSET, 14600 },
-  { 0xff62, G_UNICODE_NOT_PRESENT_OFFSET, 14656 },
-  { 0xff63, G_UNICODE_NOT_PRESENT_OFFSET, 14660 },
-  { 0xff64, G_UNICODE_NOT_PRESENT_OFFSET, 14596 },
-  { 0xff65, G_UNICODE_NOT_PRESENT_OFFSET, 14894 },
+  { 0xff5b, G_UNICODE_NOT_PRESENT_OFFSET, 14635 },
+  { 0xff5c, G_UNICODE_NOT_PRESENT_OFFSET, 14889 },
+  { 0xff5d, G_UNICODE_NOT_PRESENT_OFFSET, 14637 },
+  { 0xff5e, G_UNICODE_NOT_PRESENT_OFFSET, 14891 },
+  { 0xff5f, G_UNICODE_NOT_PRESENT_OFFSET, 14893 },
+  { 0xff60, G_UNICODE_NOT_PRESENT_OFFSET, 14897 },
+  { 0xff61, G_UNICODE_NOT_PRESENT_OFFSET, 14607 },
+  { 0xff62, G_UNICODE_NOT_PRESENT_OFFSET, 14663 },
+  { 0xff63, G_UNICODE_NOT_PRESENT_OFFSET, 14667 },
+  { 0xff64, G_UNICODE_NOT_PRESENT_OFFSET, 14603 },
+  { 0xff65, G_UNICODE_NOT_PRESENT_OFFSET, 14901 },
   { 0xff66, G_UNICODE_NOT_PRESENT_OFFSET, 8992 },
-  { 0xff67, G_UNICODE_NOT_PRESENT_OFFSET, 14898 },
-  { 0xff68, G_UNICODE_NOT_PRESENT_OFFSET, 14902 },
-  { 0xff69, G_UNICODE_NOT_PRESENT_OFFSET, 14906 },
-  { 0xff6a, G_UNICODE_NOT_PRESENT_OFFSET, 14910 },
-  { 0xff6b, G_UNICODE_NOT_PRESENT_OFFSET, 14914 },
-  { 0xff6c, G_UNICODE_NOT_PRESENT_OFFSET, 14918 },
-  { 0xff6d, G_UNICODE_NOT_PRESENT_OFFSET, 14922 },
-  { 0xff6e, G_UNICODE_NOT_PRESENT_OFFSET, 14926 },
-  { 0xff6f, G_UNICODE_NOT_PRESENT_OFFSET, 14930 },
-  { 0xff70, G_UNICODE_NOT_PRESENT_OFFSET, 14934 },
+  { 0xff67, G_UNICODE_NOT_PRESENT_OFFSET, 14905 },
+  { 0xff68, G_UNICODE_NOT_PRESENT_OFFSET, 14909 },
+  { 0xff69, G_UNICODE_NOT_PRESENT_OFFSET, 14913 },
+  { 0xff6a, G_UNICODE_NOT_PRESENT_OFFSET, 14917 },
+  { 0xff6b, G_UNICODE_NOT_PRESENT_OFFSET, 14921 },
+  { 0xff6c, G_UNICODE_NOT_PRESENT_OFFSET, 14925 },
+  { 0xff6d, G_UNICODE_NOT_PRESENT_OFFSET, 14929 },
+  { 0xff6e, G_UNICODE_NOT_PRESENT_OFFSET, 14933 },
+  { 0xff6f, G_UNICODE_NOT_PRESENT_OFFSET, 14937 },
+  { 0xff70, G_UNICODE_NOT_PRESENT_OFFSET, 14941 },
   { 0xff71, G_UNICODE_NOT_PRESENT_OFFSET, 8808 },
   { 0xff72, G_UNICODE_NOT_PRESENT_OFFSET, 8812 },
   { 0xff73, G_UNICODE_NOT_PRESENT_OFFSET, 8816 },
@@ -6163,9 +6203,9 @@ static const decomposition decomp_table[] =
   { 0xff9a, G_UNICODE_NOT_PRESENT_OFFSET, 8972 },
   { 0xff9b, G_UNICODE_NOT_PRESENT_OFFSET, 8976 },
   { 0xff9c, G_UNICODE_NOT_PRESENT_OFFSET, 8980 },
-  { 0xff9d, G_UNICODE_NOT_PRESENT_OFFSET, 14938 },
-  { 0xff9e, G_UNICODE_NOT_PRESENT_OFFSET, 14942 },
-  { 0xff9f, G_UNICODE_NOT_PRESENT_OFFSET, 14946 },
+  { 0xff9d, G_UNICODE_NOT_PRESENT_OFFSET, 14945 },
+  { 0xff9e, G_UNICODE_NOT_PRESENT_OFFSET, 14949 },
+  { 0xff9f, G_UNICODE_NOT_PRESENT_OFFSET, 14953 },
   { 0xffa0, G_UNICODE_NOT_PRESENT_OFFSET, 7683 },
   { 0xffa1, G_UNICODE_NOT_PRESENT_OFFSET, 7479 },
   { 0xffa2, G_UNICODE_NOT_PRESENT_OFFSET, 7483 },
@@ -6218,45 +6258,45 @@ static const decomposition decomp_table[] =
   { 0xffda, G_UNICODE_NOT_PRESENT_OFFSET, 7671 },
   { 0xffdb, G_UNICODE_NOT_PRESENT_OFFSET, 7675 },
   { 0xffdc, G_UNICODE_NOT_PRESENT_OFFSET, 7679 },
-  { 0xffe0, G_UNICODE_NOT_PRESENT_OFFSET, 14950 },
-  { 0xffe1, G_UNICODE_NOT_PRESENT_OFFSET, 14953 },
-  { 0xffe2, G_UNICODE_NOT_PRESENT_OFFSET, 14956 },
+  { 0xffe0, G_UNICODE_NOT_PRESENT_OFFSET, 14957 },
+  { 0xffe1, G_UNICODE_NOT_PRESENT_OFFSET, 14960 },
+  { 0xffe2, G_UNICODE_NOT_PRESENT_OFFSET, 14963 },
   { 0xffe3, G_UNICODE_NOT_PRESENT_OFFSET, 8 },
-  { 0xffe4, G_UNICODE_NOT_PRESENT_OFFSET, 14959 },
-  { 0xffe5, G_UNICODE_NOT_PRESENT_OFFSET, 14962 },
-  { 0xffe6, G_UNICODE_NOT_PRESENT_OFFSET, 14965 },
-  { 0xffe8, G_UNICODE_NOT_PRESENT_OFFSET, 14969 },
-  { 0xffe9, G_UNICODE_NOT_PRESENT_OFFSET, 14973 },
-  { 0xffea, G_UNICODE_NOT_PRESENT_OFFSET, 14977 },
-  { 0xffeb, G_UNICODE_NOT_PRESENT_OFFSET, 14981 },
-  { 0xffec, G_UNICODE_NOT_PRESENT_OFFSET, 14985 },
-  { 0xffed, G_UNICODE_NOT_PRESENT_OFFSET, 14989 },
-  { 0xffee, G_UNICODE_NOT_PRESENT_OFFSET, 14993 },
-  { 0x1109a, 14997, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1109c, 15006, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x110ab, 15015, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1112e, 15024, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1112f, 15033, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1134b, 15042, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1134c, 15051, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x114bb, 15060, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x114bc, 15069, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x114be, 15078, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x115ba, 15087, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x115bb, 15096, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d15e, 15105, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d15f, 15114, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d160, 15123, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d161, 15136, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d162, 15149, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d163, 15162, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d164, 15175, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d1bb, 15188, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d1bc, 15197, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d1bd, 15206, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d1be, 15219, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d1bf, 15232, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x1d1c0, 15245, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0xffe4, G_UNICODE_NOT_PRESENT_OFFSET, 14966 },
+  { 0xffe5, G_UNICODE_NOT_PRESENT_OFFSET, 14969 },
+  { 0xffe6, G_UNICODE_NOT_PRESENT_OFFSET, 14972 },
+  { 0xffe8, G_UNICODE_NOT_PRESENT_OFFSET, 14976 },
+  { 0xffe9, G_UNICODE_NOT_PRESENT_OFFSET, 14980 },
+  { 0xffea, G_UNICODE_NOT_PRESENT_OFFSET, 14984 },
+  { 0xffeb, G_UNICODE_NOT_PRESENT_OFFSET, 14988 },
+  { 0xffec, G_UNICODE_NOT_PRESENT_OFFSET, 14992 },
+  { 0xffed, G_UNICODE_NOT_PRESENT_OFFSET, 14996 },
+  { 0xffee, G_UNICODE_NOT_PRESENT_OFFSET, 15000 },
+  { 0x1109a, 15004, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1109c, 15013, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x110ab, 15022, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1112e, 15031, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1112f, 15040, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1134b, 15049, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1134c, 15058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x114bb, 15067, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x114bc, 15076, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x114be, 15085, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x115ba, 15094, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x115bb, 15103, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d15e, 15112, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d15f, 15121, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d160, 15130, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d161, 15143, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d162, 15156, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d163, 15169, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d164, 15182, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d1bb, 15195, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d1bc, 15204, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d1bd, 15213, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d1be, 15226, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d1bf, 15239, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1d1c0, 15252, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x1d400, G_UNICODE_NOT_PRESENT_OFFSET, 2309 },
   { 0x1d401, G_UNICODE_NOT_PRESENT_OFFSET, 2314 },
   { 0x1d402, G_UNICODE_NOT_PRESENT_OFFSET, 5292 },
@@ -6909,300 +6949,300 @@ static const decomposition decomp_table[] =
   { 0x1d6a1, G_UNICODE_NOT_PRESENT_OFFSET, 1222 },
   { 0x1d6a2, G_UNICODE_NOT_PRESENT_OFFSET, 1191 },
   { 0x1d6a3, G_UNICODE_NOT_PRESENT_OFFSET, 2526 },
-  { 0x1d6a4, G_UNICODE_NOT_PRESENT_OFFSET, 15258 },
-  { 0x1d6a5, G_UNICODE_NOT_PRESENT_OFFSET, 15261 },
-  { 0x1d6a8, G_UNICODE_NOT_PRESENT_OFFSET, 15264 },
-  { 0x1d6a9, G_UNICODE_NOT_PRESENT_OFFSET, 15267 },
+  { 0x1d6a4, G_UNICODE_NOT_PRESENT_OFFSET, 15265 },
+  { 0x1d6a5, G_UNICODE_NOT_PRESENT_OFFSET, 15268 },
+  { 0x1d6a8, G_UNICODE_NOT_PRESENT_OFFSET, 15271 },
+  { 0x1d6a9, G_UNICODE_NOT_PRESENT_OFFSET, 15274 },
   { 0x1d6aa, G_UNICODE_NOT_PRESENT_OFFSET, 5354 },
-  { 0x1d6ab, G_UNICODE_NOT_PRESENT_OFFSET, 15270 },
-  { 0x1d6ac, G_UNICODE_NOT_PRESENT_OFFSET, 15273 },
-  { 0x1d6ad, G_UNICODE_NOT_PRESENT_OFFSET, 15276 },
-  { 0x1d6ae, G_UNICODE_NOT_PRESENT_OFFSET, 15279 },
+  { 0x1d6ab, G_UNICODE_NOT_PRESENT_OFFSET, 15277 },
+  { 0x1d6ac, G_UNICODE_NOT_PRESENT_OFFSET, 15280 },
+  { 0x1d6ad, G_UNICODE_NOT_PRESENT_OFFSET, 15283 },
+  { 0x1d6ae, G_UNICODE_NOT_PRESENT_OFFSET, 15286 },
   { 0x1d6af, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
-  { 0x1d6b0, G_UNICODE_NOT_PRESENT_OFFSET, 15282 },
-  { 0x1d6b1, G_UNICODE_NOT_PRESENT_OFFSET, 15285 },
-  { 0x1d6b2, G_UNICODE_NOT_PRESENT_OFFSET, 15288 },
-  { 0x1d6b3, G_UNICODE_NOT_PRESENT_OFFSET, 15291 },
-  { 0x1d6b4, G_UNICODE_NOT_PRESENT_OFFSET, 15294 },
-  { 0x1d6b5, G_UNICODE_NOT_PRESENT_OFFSET, 15297 },
-  { 0x1d6b6, G_UNICODE_NOT_PRESENT_OFFSET, 15300 },
+  { 0x1d6b0, G_UNICODE_NOT_PRESENT_OFFSET, 15289 },
+  { 0x1d6b1, G_UNICODE_NOT_PRESENT_OFFSET, 15292 },
+  { 0x1d6b2, G_UNICODE_NOT_PRESENT_OFFSET, 15295 },
+  { 0x1d6b3, G_UNICODE_NOT_PRESENT_OFFSET, 15298 },
+  { 0x1d6b4, G_UNICODE_NOT_PRESENT_OFFSET, 15301 },
+  { 0x1d6b5, G_UNICODE_NOT_PRESENT_OFFSET, 15304 },
+  { 0x1d6b6, G_UNICODE_NOT_PRESENT_OFFSET, 15307 },
   { 0x1d6b7, G_UNICODE_NOT_PRESENT_OFFSET, 5357 },
-  { 0x1d6b8, G_UNICODE_NOT_PRESENT_OFFSET, 15303 },
+  { 0x1d6b8, G_UNICODE_NOT_PRESENT_OFFSET, 15310 },
   { 0x1d6b9, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
   { 0x1d6ba, G_UNICODE_NOT_PRESENT_OFFSET, 1408 },
-  { 0x1d6bb, G_UNICODE_NOT_PRESENT_OFFSET, 15306 },
+  { 0x1d6bb, G_UNICODE_NOT_PRESENT_OFFSET, 15313 },
   { 0x1d6bc, G_UNICODE_NOT_PRESENT_OFFSET, 1374 },
-  { 0x1d6bd, G_UNICODE_NOT_PRESENT_OFFSET, 15309 },
-  { 0x1d6be, G_UNICODE_NOT_PRESENT_OFFSET, 15312 },
-  { 0x1d6bf, G_UNICODE_NOT_PRESENT_OFFSET, 15315 },
+  { 0x1d6bd, G_UNICODE_NOT_PRESENT_OFFSET, 15316 },
+  { 0x1d6be, G_UNICODE_NOT_PRESENT_OFFSET, 15319 },
+  { 0x1d6bf, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
   { 0x1d6c0, G_UNICODE_NOT_PRESENT_OFFSET, 5333 },
-  { 0x1d6c1, G_UNICODE_NOT_PRESENT_OFFSET, 15318 },
-  { 0x1d6c2, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
+  { 0x1d6c1, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
+  { 0x1d6c2, G_UNICODE_NOT_PRESENT_OFFSET, 15329 },
   { 0x1d6c3, G_UNICODE_NOT_PRESENT_OFFSET, 1368 },
   { 0x1d6c4, G_UNICODE_NOT_PRESENT_OFFSET, 2418 },
   { 0x1d6c5, G_UNICODE_NOT_PRESENT_OFFSET, 2421 },
   { 0x1d6c6, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
-  { 0x1d6c7, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
-  { 0x1d6c8, G_UNICODE_NOT_PRESENT_OFFSET, 15328 },
+  { 0x1d6c7, G_UNICODE_NOT_PRESENT_OFFSET, 15332 },
+  { 0x1d6c8, G_UNICODE_NOT_PRESENT_OFFSET, 15335 },
   { 0x1d6c9, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d6ca, G_UNICODE_NOT_PRESENT_OFFSET, 4860 },
   { 0x1d6cb, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
-  { 0x1d6cc, G_UNICODE_NOT_PRESENT_OFFSET, 15331 },
+  { 0x1d6cc, G_UNICODE_NOT_PRESENT_OFFSET, 15338 },
   { 0x1d6cd, G_UNICODE_NOT_PRESENT_OFFSET, 20 },
-  { 0x1d6ce, G_UNICODE_NOT_PRESENT_OFFSET, 15334 },
-  { 0x1d6cf, G_UNICODE_NOT_PRESENT_OFFSET, 15337 },
-  { 0x1d6d0, G_UNICODE_NOT_PRESENT_OFFSET, 15340 },
+  { 0x1d6ce, G_UNICODE_NOT_PRESENT_OFFSET, 15341 },
+  { 0x1d6cf, G_UNICODE_NOT_PRESENT_OFFSET, 15344 },
+  { 0x1d6d0, G_UNICODE_NOT_PRESENT_OFFSET, 15347 },
   { 0x1d6d1, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
   { 0x1d6d2, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d6d3, G_UNICODE_NOT_PRESENT_OFFSET, 1399 },
-  { 0x1d6d4, G_UNICODE_NOT_PRESENT_OFFSET, 15343 },
-  { 0x1d6d5, G_UNICODE_NOT_PRESENT_OFFSET, 15346 },
-  { 0x1d6d6, G_UNICODE_NOT_PRESENT_OFFSET, 15349 },
+  { 0x1d6d4, G_UNICODE_NOT_PRESENT_OFFSET, 15350 },
+  { 0x1d6d5, G_UNICODE_NOT_PRESENT_OFFSET, 15353 },
+  { 0x1d6d6, G_UNICODE_NOT_PRESENT_OFFSET, 15356 },
   { 0x1d6d7, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d6d8, G_UNICODE_NOT_PRESENT_OFFSET, 2424 },
-  { 0x1d6d9, G_UNICODE_NOT_PRESENT_OFFSET, 15352 },
-  { 0x1d6da, G_UNICODE_NOT_PRESENT_OFFSET, 15355 },
-  { 0x1d6db, G_UNICODE_NOT_PRESENT_OFFSET, 15358 },
+  { 0x1d6d9, G_UNICODE_NOT_PRESENT_OFFSET, 15359 },
+  { 0x1d6da, G_UNICODE_NOT_PRESENT_OFFSET, 15362 },
+  { 0x1d6db, G_UNICODE_NOT_PRESENT_OFFSET, 15365 },
   { 0x1d6dc, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
   { 0x1d6dd, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d6de, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
   { 0x1d6df, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d6e0, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d6e1, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
-  { 0x1d6e2, G_UNICODE_NOT_PRESENT_OFFSET, 15264 },
-  { 0x1d6e3, G_UNICODE_NOT_PRESENT_OFFSET, 15267 },
+  { 0x1d6e2, G_UNICODE_NOT_PRESENT_OFFSET, 15271 },
+  { 0x1d6e3, G_UNICODE_NOT_PRESENT_OFFSET, 15274 },
   { 0x1d6e4, G_UNICODE_NOT_PRESENT_OFFSET, 5354 },
-  { 0x1d6e5, G_UNICODE_NOT_PRESENT_OFFSET, 15270 },
-  { 0x1d6e6, G_UNICODE_NOT_PRESENT_OFFSET, 15273 },
-  { 0x1d6e7, G_UNICODE_NOT_PRESENT_OFFSET, 15276 },
-  { 0x1d6e8, G_UNICODE_NOT_PRESENT_OFFSET, 15279 },
+  { 0x1d6e5, G_UNICODE_NOT_PRESENT_OFFSET, 15277 },
+  { 0x1d6e6, G_UNICODE_NOT_PRESENT_OFFSET, 15280 },
+  { 0x1d6e7, G_UNICODE_NOT_PRESENT_OFFSET, 15283 },
+  { 0x1d6e8, G_UNICODE_NOT_PRESENT_OFFSET, 15286 },
   { 0x1d6e9, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
-  { 0x1d6ea, G_UNICODE_NOT_PRESENT_OFFSET, 15282 },
-  { 0x1d6eb, G_UNICODE_NOT_PRESENT_OFFSET, 15285 },
-  { 0x1d6ec, G_UNICODE_NOT_PRESENT_OFFSET, 15288 },
-  { 0x1d6ed, G_UNICODE_NOT_PRESENT_OFFSET, 15291 },
-  { 0x1d6ee, G_UNICODE_NOT_PRESENT_OFFSET, 15294 },
-  { 0x1d6ef, G_UNICODE_NOT_PRESENT_OFFSET, 15297 },
-  { 0x1d6f0, G_UNICODE_NOT_PRESENT_OFFSET, 15300 },
+  { 0x1d6ea, G_UNICODE_NOT_PRESENT_OFFSET, 15289 },
+  { 0x1d6eb, G_UNICODE_NOT_PRESENT_OFFSET, 15292 },
+  { 0x1d6ec, G_UNICODE_NOT_PRESENT_OFFSET, 15295 },
+  { 0x1d6ed, G_UNICODE_NOT_PRESENT_OFFSET, 15298 },
+  { 0x1d6ee, G_UNICODE_NOT_PRESENT_OFFSET, 15301 },
+  { 0x1d6ef, G_UNICODE_NOT_PRESENT_OFFSET, 15304 },
+  { 0x1d6f0, G_UNICODE_NOT_PRESENT_OFFSET, 15307 },
   { 0x1d6f1, G_UNICODE_NOT_PRESENT_OFFSET, 5357 },
-  { 0x1d6f2, G_UNICODE_NOT_PRESENT_OFFSET, 15303 },
+  { 0x1d6f2, G_UNICODE_NOT_PRESENT_OFFSET, 15310 },
   { 0x1d6f3, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
   { 0x1d6f4, G_UNICODE_NOT_PRESENT_OFFSET, 1408 },
-  { 0x1d6f5, G_UNICODE_NOT_PRESENT_OFFSET, 15306 },
+  { 0x1d6f5, G_UNICODE_NOT_PRESENT_OFFSET, 15313 },
   { 0x1d6f6, G_UNICODE_NOT_PRESENT_OFFSET, 1374 },
-  { 0x1d6f7, G_UNICODE_NOT_PRESENT_OFFSET, 15309 },
-  { 0x1d6f8, G_UNICODE_NOT_PRESENT_OFFSET, 15312 },
-  { 0x1d6f9, G_UNICODE_NOT_PRESENT_OFFSET, 15315 },
+  { 0x1d6f7, G_UNICODE_NOT_PRESENT_OFFSET, 15316 },
+  { 0x1d6f8, G_UNICODE_NOT_PRESENT_OFFSET, 15319 },
+  { 0x1d6f9, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
   { 0x1d6fa, G_UNICODE_NOT_PRESENT_OFFSET, 5333 },
-  { 0x1d6fb, G_UNICODE_NOT_PRESENT_OFFSET, 15318 },
-  { 0x1d6fc, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
+  { 0x1d6fb, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
+  { 0x1d6fc, G_UNICODE_NOT_PRESENT_OFFSET, 15329 },
   { 0x1d6fd, G_UNICODE_NOT_PRESENT_OFFSET, 1368 },
   { 0x1d6fe, G_UNICODE_NOT_PRESENT_OFFSET, 2418 },
   { 0x1d6ff, G_UNICODE_NOT_PRESENT_OFFSET, 2421 },
   { 0x1d700, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
-  { 0x1d701, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
-  { 0x1d702, G_UNICODE_NOT_PRESENT_OFFSET, 15328 },
+  { 0x1d701, G_UNICODE_NOT_PRESENT_OFFSET, 15332 },
+  { 0x1d702, G_UNICODE_NOT_PRESENT_OFFSET, 15335 },
   { 0x1d703, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d704, G_UNICODE_NOT_PRESENT_OFFSET, 4860 },
   { 0x1d705, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
-  { 0x1d706, G_UNICODE_NOT_PRESENT_OFFSET, 15331 },
+  { 0x1d706, G_UNICODE_NOT_PRESENT_OFFSET, 15338 },
   { 0x1d707, G_UNICODE_NOT_PRESENT_OFFSET, 20 },
-  { 0x1d708, G_UNICODE_NOT_PRESENT_OFFSET, 15334 },
-  { 0x1d709, G_UNICODE_NOT_PRESENT_OFFSET, 15337 },
-  { 0x1d70a, G_UNICODE_NOT_PRESENT_OFFSET, 15340 },
+  { 0x1d708, G_UNICODE_NOT_PRESENT_OFFSET, 15341 },
+  { 0x1d709, G_UNICODE_NOT_PRESENT_OFFSET, 15344 },
+  { 0x1d70a, G_UNICODE_NOT_PRESENT_OFFSET, 15347 },
   { 0x1d70b, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
   { 0x1d70c, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d70d, G_UNICODE_NOT_PRESENT_OFFSET, 1399 },
-  { 0x1d70e, G_UNICODE_NOT_PRESENT_OFFSET, 15343 },
-  { 0x1d70f, G_UNICODE_NOT_PRESENT_OFFSET, 15346 },
-  { 0x1d710, G_UNICODE_NOT_PRESENT_OFFSET, 15349 },
+  { 0x1d70e, G_UNICODE_NOT_PRESENT_OFFSET, 15350 },
+  { 0x1d70f, G_UNICODE_NOT_PRESENT_OFFSET, 15353 },
+  { 0x1d710, G_UNICODE_NOT_PRESENT_OFFSET, 15356 },
   { 0x1d711, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d712, G_UNICODE_NOT_PRESENT_OFFSET, 2424 },
-  { 0x1d713, G_UNICODE_NOT_PRESENT_OFFSET, 15352 },
-  { 0x1d714, G_UNICODE_NOT_PRESENT_OFFSET, 15355 },
-  { 0x1d715, G_UNICODE_NOT_PRESENT_OFFSET, 15358 },
+  { 0x1d713, G_UNICODE_NOT_PRESENT_OFFSET, 15359 },
+  { 0x1d714, G_UNICODE_NOT_PRESENT_OFFSET, 15362 },
+  { 0x1d715, G_UNICODE_NOT_PRESENT_OFFSET, 15365 },
   { 0x1d716, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
   { 0x1d717, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d718, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
   { 0x1d719, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d71a, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d71b, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
-  { 0x1d71c, G_UNICODE_NOT_PRESENT_OFFSET, 15264 },
-  { 0x1d71d, G_UNICODE_NOT_PRESENT_OFFSET, 15267 },
+  { 0x1d71c, G_UNICODE_NOT_PRESENT_OFFSET, 15271 },
+  { 0x1d71d, G_UNICODE_NOT_PRESENT_OFFSET, 15274 },
   { 0x1d71e, G_UNICODE_NOT_PRESENT_OFFSET, 5354 },
-  { 0x1d71f, G_UNICODE_NOT_PRESENT_OFFSET, 15270 },
-  { 0x1d720, G_UNICODE_NOT_PRESENT_OFFSET, 15273 },
-  { 0x1d721, G_UNICODE_NOT_PRESENT_OFFSET, 15276 },
-  { 0x1d722, G_UNICODE_NOT_PRESENT_OFFSET, 15279 },
+  { 0x1d71f, G_UNICODE_NOT_PRESENT_OFFSET, 15277 },
+  { 0x1d720, G_UNICODE_NOT_PRESENT_OFFSET, 15280 },
+  { 0x1d721, G_UNICODE_NOT_PRESENT_OFFSET, 15283 },
+  { 0x1d722, G_UNICODE_NOT_PRESENT_OFFSET, 15286 },
   { 0x1d723, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
-  { 0x1d724, G_UNICODE_NOT_PRESENT_OFFSET, 15282 },
-  { 0x1d725, G_UNICODE_NOT_PRESENT_OFFSET, 15285 },
-  { 0x1d726, G_UNICODE_NOT_PRESENT_OFFSET, 15288 },
-  { 0x1d727, G_UNICODE_NOT_PRESENT_OFFSET, 15291 },
-  { 0x1d728, G_UNICODE_NOT_PRESENT_OFFSET, 15294 },
-  { 0x1d729, G_UNICODE_NOT_PRESENT_OFFSET, 15297 },
-  { 0x1d72a, G_UNICODE_NOT_PRESENT_OFFSET, 15300 },
+  { 0x1d724, G_UNICODE_NOT_PRESENT_OFFSET, 15289 },
+  { 0x1d725, G_UNICODE_NOT_PRESENT_OFFSET, 15292 },
+  { 0x1d726, G_UNICODE_NOT_PRESENT_OFFSET, 15295 },
+  { 0x1d727, G_UNICODE_NOT_PRESENT_OFFSET, 15298 },
+  { 0x1d728, G_UNICODE_NOT_PRESENT_OFFSET, 15301 },
+  { 0x1d729, G_UNICODE_NOT_PRESENT_OFFSET, 15304 },
+  { 0x1d72a, G_UNICODE_NOT_PRESENT_OFFSET, 15307 },
   { 0x1d72b, G_UNICODE_NOT_PRESENT_OFFSET, 5357 },
-  { 0x1d72c, G_UNICODE_NOT_PRESENT_OFFSET, 15303 },
+  { 0x1d72c, G_UNICODE_NOT_PRESENT_OFFSET, 15310 },
   { 0x1d72d, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
   { 0x1d72e, G_UNICODE_NOT_PRESENT_OFFSET, 1408 },
-  { 0x1d72f, G_UNICODE_NOT_PRESENT_OFFSET, 15306 },
+  { 0x1d72f, G_UNICODE_NOT_PRESENT_OFFSET, 15313 },
   { 0x1d730, G_UNICODE_NOT_PRESENT_OFFSET, 1374 },
-  { 0x1d731, G_UNICODE_NOT_PRESENT_OFFSET, 15309 },
-  { 0x1d732, G_UNICODE_NOT_PRESENT_OFFSET, 15312 },
-  { 0x1d733, G_UNICODE_NOT_PRESENT_OFFSET, 15315 },
+  { 0x1d731, G_UNICODE_NOT_PRESENT_OFFSET, 15316 },
+  { 0x1d732, G_UNICODE_NOT_PRESENT_OFFSET, 15319 },
+  { 0x1d733, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
   { 0x1d734, G_UNICODE_NOT_PRESENT_OFFSET, 5333 },
-  { 0x1d735, G_UNICODE_NOT_PRESENT_OFFSET, 15318 },
-  { 0x1d736, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
+  { 0x1d735, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
+  { 0x1d736, G_UNICODE_NOT_PRESENT_OFFSET, 15329 },
   { 0x1d737, G_UNICODE_NOT_PRESENT_OFFSET, 1368 },
   { 0x1d738, G_UNICODE_NOT_PRESENT_OFFSET, 2418 },
   { 0x1d739, G_UNICODE_NOT_PRESENT_OFFSET, 2421 },
   { 0x1d73a, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
-  { 0x1d73b, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
-  { 0x1d73c, G_UNICODE_NOT_PRESENT_OFFSET, 15328 },
+  { 0x1d73b, G_UNICODE_NOT_PRESENT_OFFSET, 15332 },
+  { 0x1d73c, G_UNICODE_NOT_PRESENT_OFFSET, 15335 },
   { 0x1d73d, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d73e, G_UNICODE_NOT_PRESENT_OFFSET, 4860 },
   { 0x1d73f, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
-  { 0x1d740, G_UNICODE_NOT_PRESENT_OFFSET, 15331 },
+  { 0x1d740, G_UNICODE_NOT_PRESENT_OFFSET, 15338 },
   { 0x1d741, G_UNICODE_NOT_PRESENT_OFFSET, 20 },
-  { 0x1d742, G_UNICODE_NOT_PRESENT_OFFSET, 15334 },
-  { 0x1d743, G_UNICODE_NOT_PRESENT_OFFSET, 15337 },
-  { 0x1d744, G_UNICODE_NOT_PRESENT_OFFSET, 15340 },
+  { 0x1d742, G_UNICODE_NOT_PRESENT_OFFSET, 15341 },
+  { 0x1d743, G_UNICODE_NOT_PRESENT_OFFSET, 15344 },
+  { 0x1d744, G_UNICODE_NOT_PRESENT_OFFSET, 15347 },
   { 0x1d745, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
   { 0x1d746, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d747, G_UNICODE_NOT_PRESENT_OFFSET, 1399 },
-  { 0x1d748, G_UNICODE_NOT_PRESENT_OFFSET, 15343 },
-  { 0x1d749, G_UNICODE_NOT_PRESENT_OFFSET, 15346 },
-  { 0x1d74a, G_UNICODE_NOT_PRESENT_OFFSET, 15349 },
+  { 0x1d748, G_UNICODE_NOT_PRESENT_OFFSET, 15350 },
+  { 0x1d749, G_UNICODE_NOT_PRESENT_OFFSET, 15353 },
+  { 0x1d74a, G_UNICODE_NOT_PRESENT_OFFSET, 15356 },
   { 0x1d74b, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d74c, G_UNICODE_NOT_PRESENT_OFFSET, 2424 },
-  { 0x1d74d, G_UNICODE_NOT_PRESENT_OFFSET, 15352 },
-  { 0x1d74e, G_UNICODE_NOT_PRESENT_OFFSET, 15355 },
-  { 0x1d74f, G_UNICODE_NOT_PRESENT_OFFSET, 15358 },
+  { 0x1d74d, G_UNICODE_NOT_PRESENT_OFFSET, 15359 },
+  { 0x1d74e, G_UNICODE_NOT_PRESENT_OFFSET, 15362 },
+  { 0x1d74f, G_UNICODE_NOT_PRESENT_OFFSET, 15365 },
   { 0x1d750, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
   { 0x1d751, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d752, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
   { 0x1d753, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d754, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d755, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
-  { 0x1d756, G_UNICODE_NOT_PRESENT_OFFSET, 15264 },
-  { 0x1d757, G_UNICODE_NOT_PRESENT_OFFSET, 15267 },
+  { 0x1d756, G_UNICODE_NOT_PRESENT_OFFSET, 15271 },
+  { 0x1d757, G_UNICODE_NOT_PRESENT_OFFSET, 15274 },
   { 0x1d758, G_UNICODE_NOT_PRESENT_OFFSET, 5354 },
-  { 0x1d759, G_UNICODE_NOT_PRESENT_OFFSET, 15270 },
-  { 0x1d75a, G_UNICODE_NOT_PRESENT_OFFSET, 15273 },
-  { 0x1d75b, G_UNICODE_NOT_PRESENT_OFFSET, 15276 },
-  { 0x1d75c, G_UNICODE_NOT_PRESENT_OFFSET, 15279 },
+  { 0x1d759, G_UNICODE_NOT_PRESENT_OFFSET, 15277 },
+  { 0x1d75a, G_UNICODE_NOT_PRESENT_OFFSET, 15280 },
+  { 0x1d75b, G_UNICODE_NOT_PRESENT_OFFSET, 15283 },
+  { 0x1d75c, G_UNICODE_NOT_PRESENT_OFFSET, 15286 },
   { 0x1d75d, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
-  { 0x1d75e, G_UNICODE_NOT_PRESENT_OFFSET, 15282 },
-  { 0x1d75f, G_UNICODE_NOT_PRESENT_OFFSET, 15285 },
-  { 0x1d760, G_UNICODE_NOT_PRESENT_OFFSET, 15288 },
-  { 0x1d761, G_UNICODE_NOT_PRESENT_OFFSET, 15291 },
-  { 0x1d762, G_UNICODE_NOT_PRESENT_OFFSET, 15294 },
-  { 0x1d763, G_UNICODE_NOT_PRESENT_OFFSET, 15297 },
-  { 0x1d764, G_UNICODE_NOT_PRESENT_OFFSET, 15300 },
+  { 0x1d75e, G_UNICODE_NOT_PRESENT_OFFSET, 15289 },
+  { 0x1d75f, G_UNICODE_NOT_PRESENT_OFFSET, 15292 },
+  { 0x1d760, G_UNICODE_NOT_PRESENT_OFFSET, 15295 },
+  { 0x1d761, G_UNICODE_NOT_PRESENT_OFFSET, 15298 },
+  { 0x1d762, G_UNICODE_NOT_PRESENT_OFFSET, 15301 },
+  { 0x1d763, G_UNICODE_NOT_PRESENT_OFFSET, 15304 },
+  { 0x1d764, G_UNICODE_NOT_PRESENT_OFFSET, 15307 },
   { 0x1d765, G_UNICODE_NOT_PRESENT_OFFSET, 5357 },
-  { 0x1d766, G_UNICODE_NOT_PRESENT_OFFSET, 15303 },
+  { 0x1d766, G_UNICODE_NOT_PRESENT_OFFSET, 15310 },
   { 0x1d767, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
   { 0x1d768, G_UNICODE_NOT_PRESENT_OFFSET, 1408 },
-  { 0x1d769, G_UNICODE_NOT_PRESENT_OFFSET, 15306 },
+  { 0x1d769, G_UNICODE_NOT_PRESENT_OFFSET, 15313 },
   { 0x1d76a, G_UNICODE_NOT_PRESENT_OFFSET, 1374 },
-  { 0x1d76b, G_UNICODE_NOT_PRESENT_OFFSET, 15309 },
-  { 0x1d76c, G_UNICODE_NOT_PRESENT_OFFSET, 15312 },
-  { 0x1d76d, G_UNICODE_NOT_PRESENT_OFFSET, 15315 },
+  { 0x1d76b, G_UNICODE_NOT_PRESENT_OFFSET, 15316 },
+  { 0x1d76c, G_UNICODE_NOT_PRESENT_OFFSET, 15319 },
+  { 0x1d76d, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
   { 0x1d76e, G_UNICODE_NOT_PRESENT_OFFSET, 5333 },
-  { 0x1d76f, G_UNICODE_NOT_PRESENT_OFFSET, 15318 },
-  { 0x1d770, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
+  { 0x1d76f, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
+  { 0x1d770, G_UNICODE_NOT_PRESENT_OFFSET, 15329 },
   { 0x1d771, G_UNICODE_NOT_PRESENT_OFFSET, 1368 },
   { 0x1d772, G_UNICODE_NOT_PRESENT_OFFSET, 2418 },
   { 0x1d773, G_UNICODE_NOT_PRESENT_OFFSET, 2421 },
   { 0x1d774, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
-  { 0x1d775, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
-  { 0x1d776, G_UNICODE_NOT_PRESENT_OFFSET, 15328 },
+  { 0x1d775, G_UNICODE_NOT_PRESENT_OFFSET, 15332 },
+  { 0x1d776, G_UNICODE_NOT_PRESENT_OFFSET, 15335 },
   { 0x1d777, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d778, G_UNICODE_NOT_PRESENT_OFFSET, 4860 },
   { 0x1d779, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
-  { 0x1d77a, G_UNICODE_NOT_PRESENT_OFFSET, 15331 },
+  { 0x1d77a, G_UNICODE_NOT_PRESENT_OFFSET, 15338 },
   { 0x1d77b, G_UNICODE_NOT_PRESENT_OFFSET, 20 },
-  { 0x1d77c, G_UNICODE_NOT_PRESENT_OFFSET, 15334 },
-  { 0x1d77d, G_UNICODE_NOT_PRESENT_OFFSET, 15337 },
-  { 0x1d77e, G_UNICODE_NOT_PRESENT_OFFSET, 15340 },
+  { 0x1d77c, G_UNICODE_NOT_PRESENT_OFFSET, 15341 },
+  { 0x1d77d, G_UNICODE_NOT_PRESENT_OFFSET, 15344 },
+  { 0x1d77e, G_UNICODE_NOT_PRESENT_OFFSET, 15347 },
   { 0x1d77f, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
   { 0x1d780, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d781, G_UNICODE_NOT_PRESENT_OFFSET, 1399 },
-  { 0x1d782, G_UNICODE_NOT_PRESENT_OFFSET, 15343 },
-  { 0x1d783, G_UNICODE_NOT_PRESENT_OFFSET, 15346 },
-  { 0x1d784, G_UNICODE_NOT_PRESENT_OFFSET, 15349 },
+  { 0x1d782, G_UNICODE_NOT_PRESENT_OFFSET, 15350 },
+  { 0x1d783, G_UNICODE_NOT_PRESENT_OFFSET, 15353 },
+  { 0x1d784, G_UNICODE_NOT_PRESENT_OFFSET, 15356 },
   { 0x1d785, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d786, G_UNICODE_NOT_PRESENT_OFFSET, 2424 },
-  { 0x1d787, G_UNICODE_NOT_PRESENT_OFFSET, 15352 },
-  { 0x1d788, G_UNICODE_NOT_PRESENT_OFFSET, 15355 },
-  { 0x1d789, G_UNICODE_NOT_PRESENT_OFFSET, 15358 },
+  { 0x1d787, G_UNICODE_NOT_PRESENT_OFFSET, 15359 },
+  { 0x1d788, G_UNICODE_NOT_PRESENT_OFFSET, 15362 },
+  { 0x1d789, G_UNICODE_NOT_PRESENT_OFFSET, 15365 },
   { 0x1d78a, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
   { 0x1d78b, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d78c, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
   { 0x1d78d, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d78e, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d78f, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
-  { 0x1d790, G_UNICODE_NOT_PRESENT_OFFSET, 15264 },
-  { 0x1d791, G_UNICODE_NOT_PRESENT_OFFSET, 15267 },
+  { 0x1d790, G_UNICODE_NOT_PRESENT_OFFSET, 15271 },
+  { 0x1d791, G_UNICODE_NOT_PRESENT_OFFSET, 15274 },
   { 0x1d792, G_UNICODE_NOT_PRESENT_OFFSET, 5354 },
-  { 0x1d793, G_UNICODE_NOT_PRESENT_OFFSET, 15270 },
-  { 0x1d794, G_UNICODE_NOT_PRESENT_OFFSET, 15273 },
-  { 0x1d795, G_UNICODE_NOT_PRESENT_OFFSET, 15276 },
-  { 0x1d796, G_UNICODE_NOT_PRESENT_OFFSET, 15279 },
+  { 0x1d793, G_UNICODE_NOT_PRESENT_OFFSET, 15277 },
+  { 0x1d794, G_UNICODE_NOT_PRESENT_OFFSET, 15280 },
+  { 0x1d795, G_UNICODE_NOT_PRESENT_OFFSET, 15283 },
+  { 0x1d796, G_UNICODE_NOT_PRESENT_OFFSET, 15286 },
   { 0x1d797, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
-  { 0x1d798, G_UNICODE_NOT_PRESENT_OFFSET, 15282 },
-  { 0x1d799, G_UNICODE_NOT_PRESENT_OFFSET, 15285 },
-  { 0x1d79a, G_UNICODE_NOT_PRESENT_OFFSET, 15288 },
-  { 0x1d79b, G_UNICODE_NOT_PRESENT_OFFSET, 15291 },
-  { 0x1d79c, G_UNICODE_NOT_PRESENT_OFFSET, 15294 },
-  { 0x1d79d, G_UNICODE_NOT_PRESENT_OFFSET, 15297 },
-  { 0x1d79e, G_UNICODE_NOT_PRESENT_OFFSET, 15300 },
+  { 0x1d798, G_UNICODE_NOT_PRESENT_OFFSET, 15289 },
+  { 0x1d799, G_UNICODE_NOT_PRESENT_OFFSET, 15292 },
+  { 0x1d79a, G_UNICODE_NOT_PRESENT_OFFSET, 15295 },
+  { 0x1d79b, G_UNICODE_NOT_PRESENT_OFFSET, 15298 },
+  { 0x1d79c, G_UNICODE_NOT_PRESENT_OFFSET, 15301 },
+  { 0x1d79d, G_UNICODE_NOT_PRESENT_OFFSET, 15304 },
+  { 0x1d79e, G_UNICODE_NOT_PRESENT_OFFSET, 15307 },
   { 0x1d79f, G_UNICODE_NOT_PRESENT_OFFSET, 5357 },
-  { 0x1d7a0, G_UNICODE_NOT_PRESENT_OFFSET, 15303 },
+  { 0x1d7a0, G_UNICODE_NOT_PRESENT_OFFSET, 15310 },
   { 0x1d7a1, G_UNICODE_NOT_PRESENT_OFFSET, 1402 },
   { 0x1d7a2, G_UNICODE_NOT_PRESENT_OFFSET, 1408 },
-  { 0x1d7a3, G_UNICODE_NOT_PRESENT_OFFSET, 15306 },
+  { 0x1d7a3, G_UNICODE_NOT_PRESENT_OFFSET, 15313 },
   { 0x1d7a4, G_UNICODE_NOT_PRESENT_OFFSET, 1374 },
-  { 0x1d7a5, G_UNICODE_NOT_PRESENT_OFFSET, 15309 },
-  { 0x1d7a6, G_UNICODE_NOT_PRESENT_OFFSET, 15312 },
-  { 0x1d7a7, G_UNICODE_NOT_PRESENT_OFFSET, 15315 },
+  { 0x1d7a5, G_UNICODE_NOT_PRESENT_OFFSET, 15316 },
+  { 0x1d7a6, G_UNICODE_NOT_PRESENT_OFFSET, 15319 },
+  { 0x1d7a7, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
   { 0x1d7a8, G_UNICODE_NOT_PRESENT_OFFSET, 5333 },
-  { 0x1d7a9, G_UNICODE_NOT_PRESENT_OFFSET, 15318 },
-  { 0x1d7aa, G_UNICODE_NOT_PRESENT_OFFSET, 15322 },
+  { 0x1d7a9, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
+  { 0x1d7aa, G_UNICODE_NOT_PRESENT_OFFSET, 15329 },
   { 0x1d7ab, G_UNICODE_NOT_PRESENT_OFFSET, 1368 },
   { 0x1d7ac, G_UNICODE_NOT_PRESENT_OFFSET, 2418 },
   { 0x1d7ad, G_UNICODE_NOT_PRESENT_OFFSET, 2421 },
   { 0x1d7ae, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
-  { 0x1d7af, G_UNICODE_NOT_PRESENT_OFFSET, 15325 },
-  { 0x1d7b0, G_UNICODE_NOT_PRESENT_OFFSET, 15328 },
+  { 0x1d7af, G_UNICODE_NOT_PRESENT_OFFSET, 15332 },
+  { 0x1d7b0, G_UNICODE_NOT_PRESENT_OFFSET, 15335 },
   { 0x1d7b1, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d7b2, G_UNICODE_NOT_PRESENT_OFFSET, 4860 },
   { 0x1d7b3, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
-  { 0x1d7b4, G_UNICODE_NOT_PRESENT_OFFSET, 15331 },
+  { 0x1d7b4, G_UNICODE_NOT_PRESENT_OFFSET, 15338 },
   { 0x1d7b5, G_UNICODE_NOT_PRESENT_OFFSET, 20 },
-  { 0x1d7b6, G_UNICODE_NOT_PRESENT_OFFSET, 15334 },
-  { 0x1d7b7, G_UNICODE_NOT_PRESENT_OFFSET, 15337 },
-  { 0x1d7b8, G_UNICODE_NOT_PRESENT_OFFSET, 15340 },
+  { 0x1d7b6, G_UNICODE_NOT_PRESENT_OFFSET, 15341 },
+  { 0x1d7b7, G_UNICODE_NOT_PRESENT_OFFSET, 15344 },
+  { 0x1d7b8, G_UNICODE_NOT_PRESENT_OFFSET, 15347 },
   { 0x1d7b9, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
   { 0x1d7ba, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d7bb, G_UNICODE_NOT_PRESENT_OFFSET, 1399 },
-  { 0x1d7bc, G_UNICODE_NOT_PRESENT_OFFSET, 15343 },
-  { 0x1d7bd, G_UNICODE_NOT_PRESENT_OFFSET, 15346 },
-  { 0x1d7be, G_UNICODE_NOT_PRESENT_OFFSET, 15349 },
+  { 0x1d7bc, G_UNICODE_NOT_PRESENT_OFFSET, 15350 },
+  { 0x1d7bd, G_UNICODE_NOT_PRESENT_OFFSET, 15353 },
+  { 0x1d7be, G_UNICODE_NOT_PRESENT_OFFSET, 15356 },
   { 0x1d7bf, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d7c0, G_UNICODE_NOT_PRESENT_OFFSET, 2424 },
-  { 0x1d7c1, G_UNICODE_NOT_PRESENT_OFFSET, 15352 },
-  { 0x1d7c2, G_UNICODE_NOT_PRESENT_OFFSET, 15355 },
-  { 0x1d7c3, G_UNICODE_NOT_PRESENT_OFFSET, 15358 },
+  { 0x1d7c1, G_UNICODE_NOT_PRESENT_OFFSET, 15359 },
+  { 0x1d7c2, G_UNICODE_NOT_PRESENT_OFFSET, 15362 },
+  { 0x1d7c3, G_UNICODE_NOT_PRESENT_OFFSET, 15365 },
   { 0x1d7c4, G_UNICODE_NOT_PRESENT_OFFSET, 1405 },
   { 0x1d7c5, G_UNICODE_NOT_PRESENT_OFFSET, 1371 },
   { 0x1d7c6, G_UNICODE_NOT_PRESENT_OFFSET, 1393 },
   { 0x1d7c7, G_UNICODE_NOT_PRESENT_OFFSET, 1387 },
   { 0x1d7c8, G_UNICODE_NOT_PRESENT_OFFSET, 1396 },
   { 0x1d7c9, G_UNICODE_NOT_PRESENT_OFFSET, 1390 },
-  { 0x1d7ca, G_UNICODE_NOT_PRESENT_OFFSET, 15362 },
-  { 0x1d7cb, G_UNICODE_NOT_PRESENT_OFFSET, 15365 },
+  { 0x1d7ca, G_UNICODE_NOT_PRESENT_OFFSET, 15369 },
+  { 0x1d7cb, G_UNICODE_NOT_PRESENT_OFFSET, 15372 },
   { 0x1d7ce, G_UNICODE_NOT_PRESENT_OFFSET, 5253 },
   { 0x1d7cf, G_UNICODE_NOT_PRESENT_OFFSET, 27 },
   { 0x1d7d0, G_UNICODE_NOT_PRESENT_OFFSET, 12 },
@@ -7253,189 +7293,189 @@ static const decomposition decomp_table[] =
   { 0x1d7fd, G_UNICODE_NOT_PRESENT_OFFSET, 5261 },
   { 0x1d7fe, G_UNICODE_NOT_PRESENT_OFFSET, 5263 },
   { 0x1d7ff, G_UNICODE_NOT_PRESENT_OFFSET, 5265 },
-  { 0x1ee00, G_UNICODE_NOT_PRESENT_OFFSET, 14761 },
-  { 0x1ee01, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0x1ee02, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0x1ee03, G_UNICODE_NOT_PRESENT_OFFSET, 14785 },
-  { 0x1ee05, G_UNICODE_NOT_PRESENT_OFFSET, 14842 },
-  { 0x1ee06, G_UNICODE_NOT_PRESENT_OFFSET, 14794 },
-  { 0x1ee07, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0x1ee08, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0x1ee09, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0x1ee0a, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0x1ee0b, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0x1ee0c, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0x1ee0d, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0x1ee0e, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0x1ee0f, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0x1ee10, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0x1ee11, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0x1ee12, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0x1ee13, G_UNICODE_NOT_PRESENT_OFFSET, 14791 },
-  { 0x1ee14, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0x1ee15, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0x1ee16, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0x1ee17, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0x1ee18, G_UNICODE_NOT_PRESENT_OFFSET, 14788 },
-  { 0x1ee19, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0x1ee1a, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0x1ee1b, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0x1ee1c, G_UNICODE_NOT_PRESENT_OFFSET, 15368 },
-  { 0x1ee1d, G_UNICODE_NOT_PRESENT_OFFSET, 12852 },
-  { 0x1ee1e, G_UNICODE_NOT_PRESENT_OFFSET, 15371 },
-  { 0x1ee1f, G_UNICODE_NOT_PRESENT_OFFSET, 15374 },
-  { 0x1ee21, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0x1ee22, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0x1ee24, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0x1ee27, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0x1ee29, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0x1ee2a, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0x1ee2b, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0x1ee2c, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0x1ee2d, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0x1ee2e, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0x1ee2f, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0x1ee30, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0x1ee31, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0x1ee32, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0x1ee34, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0x1ee35, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0x1ee36, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0x1ee37, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0x1ee39, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0x1ee3b, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0x1ee42, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0x1ee47, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0x1ee49, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0x1ee4b, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0x1ee4d, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0x1ee4e, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0x1ee4f, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0x1ee51, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0x1ee52, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0x1ee54, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0x1ee57, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0x1ee59, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0x1ee5b, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0x1ee5d, G_UNICODE_NOT_PRESENT_OFFSET, 12852 },
-  { 0x1ee5f, G_UNICODE_NOT_PRESENT_OFFSET, 15374 },
-  { 0x1ee61, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0x1ee62, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0x1ee64, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0x1ee67, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0x1ee68, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0x1ee69, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0x1ee6a, G_UNICODE_NOT_PRESENT_OFFSET, 14827 },
-  { 0x1ee6c, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0x1ee6d, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0x1ee6e, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0x1ee6f, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0x1ee70, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0x1ee71, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0x1ee72, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0x1ee74, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0x1ee75, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0x1ee76, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0x1ee77, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0x1ee79, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0x1ee7a, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0x1ee7b, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0x1ee7c, G_UNICODE_NOT_PRESENT_OFFSET, 15368 },
-  { 0x1ee7e, G_UNICODE_NOT_PRESENT_OFFSET, 15371 },
-  { 0x1ee80, G_UNICODE_NOT_PRESENT_OFFSET, 14761 },
-  { 0x1ee81, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0x1ee82, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0x1ee83, G_UNICODE_NOT_PRESENT_OFFSET, 14785 },
-  { 0x1ee84, G_UNICODE_NOT_PRESENT_OFFSET, 14839 },
-  { 0x1ee85, G_UNICODE_NOT_PRESENT_OFFSET, 14842 },
-  { 0x1ee86, G_UNICODE_NOT_PRESENT_OFFSET, 14794 },
-  { 0x1ee87, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0x1ee88, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0x1ee89, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0x1ee8b, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0x1ee8c, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0x1ee8d, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0x1ee8e, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0x1ee8f, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0x1ee90, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0x1ee91, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0x1ee92, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0x1ee93, G_UNICODE_NOT_PRESENT_OFFSET, 14791 },
-  { 0x1ee94, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0x1ee95, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0x1ee96, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0x1ee97, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0x1ee98, G_UNICODE_NOT_PRESENT_OFFSET, 14788 },
-  { 0x1ee99, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0x1ee9a, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0x1ee9b, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0x1eea1, G_UNICODE_NOT_PRESENT_OFFSET, 14764 },
-  { 0x1eea2, G_UNICODE_NOT_PRESENT_OFFSET, 14776 },
-  { 0x1eea3, G_UNICODE_NOT_PRESENT_OFFSET, 14785 },
-  { 0x1eea5, G_UNICODE_NOT_PRESENT_OFFSET, 14842 },
-  { 0x1eea6, G_UNICODE_NOT_PRESENT_OFFSET, 14794 },
-  { 0x1eea7, G_UNICODE_NOT_PRESENT_OFFSET, 14779 },
-  { 0x1eea8, G_UNICODE_NOT_PRESENT_OFFSET, 14809 },
-  { 0x1eea9, G_UNICODE_NOT_PRESENT_OFFSET, 14845 },
-  { 0x1eeab, G_UNICODE_NOT_PRESENT_OFFSET, 14830 },
-  { 0x1eeac, G_UNICODE_NOT_PRESENT_OFFSET, 14833 },
-  { 0x1eead, G_UNICODE_NOT_PRESENT_OFFSET, 14836 },
-  { 0x1eeae, G_UNICODE_NOT_PRESENT_OFFSET, 14797 },
-  { 0x1eeaf, G_UNICODE_NOT_PRESENT_OFFSET, 14815 },
-  { 0x1eeb0, G_UNICODE_NOT_PRESENT_OFFSET, 14821 },
-  { 0x1eeb1, G_UNICODE_NOT_PRESENT_OFFSET, 14803 },
-  { 0x1eeb2, G_UNICODE_NOT_PRESENT_OFFSET, 14824 },
-  { 0x1eeb3, G_UNICODE_NOT_PRESENT_OFFSET, 14791 },
-  { 0x1eeb4, G_UNICODE_NOT_PRESENT_OFFSET, 14800 },
-  { 0x1eeb5, G_UNICODE_NOT_PRESENT_OFFSET, 14770 },
-  { 0x1eeb6, G_UNICODE_NOT_PRESENT_OFFSET, 14773 },
-  { 0x1eeb7, G_UNICODE_NOT_PRESENT_OFFSET, 14782 },
-  { 0x1eeb8, G_UNICODE_NOT_PRESENT_OFFSET, 14788 },
-  { 0x1eeb9, G_UNICODE_NOT_PRESENT_OFFSET, 14806 },
-  { 0x1eeba, G_UNICODE_NOT_PRESENT_OFFSET, 14812 },
-  { 0x1eebb, G_UNICODE_NOT_PRESENT_OFFSET, 14818 },
-  { 0x1f100, G_UNICODE_NOT_PRESENT_OFFSET, 15377 },
-  { 0x1f101, G_UNICODE_NOT_PRESENT_OFFSET, 15380 },
-  { 0x1f102, G_UNICODE_NOT_PRESENT_OFFSET, 15383 },
-  { 0x1f103, G_UNICODE_NOT_PRESENT_OFFSET, 15386 },
-  { 0x1f104, G_UNICODE_NOT_PRESENT_OFFSET, 15389 },
-  { 0x1f105, G_UNICODE_NOT_PRESENT_OFFSET, 15392 },
-  { 0x1f106, G_UNICODE_NOT_PRESENT_OFFSET, 15395 },
-  { 0x1f107, G_UNICODE_NOT_PRESENT_OFFSET, 15398 },
-  { 0x1f108, G_UNICODE_NOT_PRESENT_OFFSET, 15401 },
-  { 0x1f109, G_UNICODE_NOT_PRESENT_OFFSET, 15404 },
-  { 0x1f10a, G_UNICODE_NOT_PRESENT_OFFSET, 15407 },
-  { 0x1f110, G_UNICODE_NOT_PRESENT_OFFSET, 15410 },
-  { 0x1f111, G_UNICODE_NOT_PRESENT_OFFSET, 15414 },
-  { 0x1f112, G_UNICODE_NOT_PRESENT_OFFSET, 15418 },
-  { 0x1f113, G_UNICODE_NOT_PRESENT_OFFSET, 15422 },
-  { 0x1f114, G_UNICODE_NOT_PRESENT_OFFSET, 15426 },
-  { 0x1f115, G_UNICODE_NOT_PRESENT_OFFSET, 15430 },
-  { 0x1f116, G_UNICODE_NOT_PRESENT_OFFSET, 15434 },
-  { 0x1f117, G_UNICODE_NOT_PRESENT_OFFSET, 15438 },
-  { 0x1f118, G_UNICODE_NOT_PRESENT_OFFSET, 15442 },
-  { 0x1f119, G_UNICODE_NOT_PRESENT_OFFSET, 15446 },
-  { 0x1f11a, G_UNICODE_NOT_PRESENT_OFFSET, 15450 },
-  { 0x1f11b, G_UNICODE_NOT_PRESENT_OFFSET, 15454 },
-  { 0x1f11c, G_UNICODE_NOT_PRESENT_OFFSET, 15458 },
-  { 0x1f11d, G_UNICODE_NOT_PRESENT_OFFSET, 15462 },
-  { 0x1f11e, G_UNICODE_NOT_PRESENT_OFFSET, 15466 },
-  { 0x1f11f, G_UNICODE_NOT_PRESENT_OFFSET, 15470 },
-  { 0x1f120, G_UNICODE_NOT_PRESENT_OFFSET, 15474 },
-  { 0x1f121, G_UNICODE_NOT_PRESENT_OFFSET, 15478 },
-  { 0x1f122, G_UNICODE_NOT_PRESENT_OFFSET, 15482 },
-  { 0x1f123, G_UNICODE_NOT_PRESENT_OFFSET, 15486 },
-  { 0x1f124, G_UNICODE_NOT_PRESENT_OFFSET, 15490 },
-  { 0x1f125, G_UNICODE_NOT_PRESENT_OFFSET, 15494 },
-  { 0x1f126, G_UNICODE_NOT_PRESENT_OFFSET, 15498 },
-  { 0x1f127, G_UNICODE_NOT_PRESENT_OFFSET, 15502 },
-  { 0x1f128, G_UNICODE_NOT_PRESENT_OFFSET, 15506 },
-  { 0x1f129, G_UNICODE_NOT_PRESENT_OFFSET, 15510 },
-  { 0x1f12a, G_UNICODE_NOT_PRESENT_OFFSET, 15514 },
+  { 0x1ee00, G_UNICODE_NOT_PRESENT_OFFSET, 14768 },
+  { 0x1ee01, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0x1ee02, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0x1ee03, G_UNICODE_NOT_PRESENT_OFFSET, 14792 },
+  { 0x1ee05, G_UNICODE_NOT_PRESENT_OFFSET, 14849 },
+  { 0x1ee06, G_UNICODE_NOT_PRESENT_OFFSET, 14801 },
+  { 0x1ee07, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0x1ee08, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0x1ee09, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0x1ee0a, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0x1ee0b, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0x1ee0c, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0x1ee0d, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0x1ee0e, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0x1ee0f, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0x1ee10, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0x1ee11, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0x1ee12, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0x1ee13, G_UNICODE_NOT_PRESENT_OFFSET, 14798 },
+  { 0x1ee14, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0x1ee15, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0x1ee16, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0x1ee17, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0x1ee18, G_UNICODE_NOT_PRESENT_OFFSET, 14795 },
+  { 0x1ee19, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0x1ee1a, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0x1ee1b, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0x1ee1c, G_UNICODE_NOT_PRESENT_OFFSET, 15375 },
+  { 0x1ee1d, G_UNICODE_NOT_PRESENT_OFFSET, 12859 },
+  { 0x1ee1e, G_UNICODE_NOT_PRESENT_OFFSET, 15378 },
+  { 0x1ee1f, G_UNICODE_NOT_PRESENT_OFFSET, 15381 },
+  { 0x1ee21, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0x1ee22, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0x1ee24, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0x1ee27, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0x1ee29, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0x1ee2a, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0x1ee2b, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0x1ee2c, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0x1ee2d, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0x1ee2e, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0x1ee2f, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0x1ee30, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0x1ee31, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0x1ee32, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0x1ee34, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0x1ee35, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0x1ee36, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0x1ee37, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0x1ee39, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0x1ee3b, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0x1ee42, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0x1ee47, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0x1ee49, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0x1ee4b, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0x1ee4d, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0x1ee4e, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0x1ee4f, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0x1ee51, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0x1ee52, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0x1ee54, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0x1ee57, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0x1ee59, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0x1ee5b, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0x1ee5d, G_UNICODE_NOT_PRESENT_OFFSET, 12859 },
+  { 0x1ee5f, G_UNICODE_NOT_PRESENT_OFFSET, 15381 },
+  { 0x1ee61, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0x1ee62, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0x1ee64, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0x1ee67, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0x1ee68, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0x1ee69, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0x1ee6a, G_UNICODE_NOT_PRESENT_OFFSET, 14834 },
+  { 0x1ee6c, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0x1ee6d, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0x1ee6e, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0x1ee6f, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0x1ee70, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0x1ee71, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0x1ee72, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0x1ee74, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0x1ee75, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0x1ee76, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0x1ee77, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0x1ee79, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0x1ee7a, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0x1ee7b, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0x1ee7c, G_UNICODE_NOT_PRESENT_OFFSET, 15375 },
+  { 0x1ee7e, G_UNICODE_NOT_PRESENT_OFFSET, 15378 },
+  { 0x1ee80, G_UNICODE_NOT_PRESENT_OFFSET, 14768 },
+  { 0x1ee81, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0x1ee82, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0x1ee83, G_UNICODE_NOT_PRESENT_OFFSET, 14792 },
+  { 0x1ee84, G_UNICODE_NOT_PRESENT_OFFSET, 14846 },
+  { 0x1ee85, G_UNICODE_NOT_PRESENT_OFFSET, 14849 },
+  { 0x1ee86, G_UNICODE_NOT_PRESENT_OFFSET, 14801 },
+  { 0x1ee87, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0x1ee88, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0x1ee89, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0x1ee8b, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0x1ee8c, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0x1ee8d, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0x1ee8e, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0x1ee8f, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0x1ee90, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0x1ee91, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0x1ee92, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0x1ee93, G_UNICODE_NOT_PRESENT_OFFSET, 14798 },
+  { 0x1ee94, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0x1ee95, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0x1ee96, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0x1ee97, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0x1ee98, G_UNICODE_NOT_PRESENT_OFFSET, 14795 },
+  { 0x1ee99, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0x1ee9a, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0x1ee9b, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0x1eea1, G_UNICODE_NOT_PRESENT_OFFSET, 14771 },
+  { 0x1eea2, G_UNICODE_NOT_PRESENT_OFFSET, 14783 },
+  { 0x1eea3, G_UNICODE_NOT_PRESENT_OFFSET, 14792 },
+  { 0x1eea5, G_UNICODE_NOT_PRESENT_OFFSET, 14849 },
+  { 0x1eea6, G_UNICODE_NOT_PRESENT_OFFSET, 14801 },
+  { 0x1eea7, G_UNICODE_NOT_PRESENT_OFFSET, 14786 },
+  { 0x1eea8, G_UNICODE_NOT_PRESENT_OFFSET, 14816 },
+  { 0x1eea9, G_UNICODE_NOT_PRESENT_OFFSET, 14852 },
+  { 0x1eeab, G_UNICODE_NOT_PRESENT_OFFSET, 14837 },
+  { 0x1eeac, G_UNICODE_NOT_PRESENT_OFFSET, 14840 },
+  { 0x1eead, G_UNICODE_NOT_PRESENT_OFFSET, 14843 },
+  { 0x1eeae, G_UNICODE_NOT_PRESENT_OFFSET, 14804 },
+  { 0x1eeaf, G_UNICODE_NOT_PRESENT_OFFSET, 14822 },
+  { 0x1eeb0, G_UNICODE_NOT_PRESENT_OFFSET, 14828 },
+  { 0x1eeb1, G_UNICODE_NOT_PRESENT_OFFSET, 14810 },
+  { 0x1eeb2, G_UNICODE_NOT_PRESENT_OFFSET, 14831 },
+  { 0x1eeb3, G_UNICODE_NOT_PRESENT_OFFSET, 14798 },
+  { 0x1eeb4, G_UNICODE_NOT_PRESENT_OFFSET, 14807 },
+  { 0x1eeb5, G_UNICODE_NOT_PRESENT_OFFSET, 14777 },
+  { 0x1eeb6, G_UNICODE_NOT_PRESENT_OFFSET, 14780 },
+  { 0x1eeb7, G_UNICODE_NOT_PRESENT_OFFSET, 14789 },
+  { 0x1eeb8, G_UNICODE_NOT_PRESENT_OFFSET, 14795 },
+  { 0x1eeb9, G_UNICODE_NOT_PRESENT_OFFSET, 14813 },
+  { 0x1eeba, G_UNICODE_NOT_PRESENT_OFFSET, 14819 },
+  { 0x1eebb, G_UNICODE_NOT_PRESENT_OFFSET, 14825 },
+  { 0x1f100, G_UNICODE_NOT_PRESENT_OFFSET, 15384 },
+  { 0x1f101, G_UNICODE_NOT_PRESENT_OFFSET, 15387 },
+  { 0x1f102, G_UNICODE_NOT_PRESENT_OFFSET, 15390 },
+  { 0x1f103, G_UNICODE_NOT_PRESENT_OFFSET, 15393 },
+  { 0x1f104, G_UNICODE_NOT_PRESENT_OFFSET, 15396 },
+  { 0x1f105, G_UNICODE_NOT_PRESENT_OFFSET, 15399 },
+  { 0x1f106, G_UNICODE_NOT_PRESENT_OFFSET, 15402 },
+  { 0x1f107, G_UNICODE_NOT_PRESENT_OFFSET, 15405 },
+  { 0x1f108, G_UNICODE_NOT_PRESENT_OFFSET, 15408 },
+  { 0x1f109, G_UNICODE_NOT_PRESENT_OFFSET, 15411 },
+  { 0x1f10a, G_UNICODE_NOT_PRESENT_OFFSET, 15414 },
+  { 0x1f110, G_UNICODE_NOT_PRESENT_OFFSET, 15417 },
+  { 0x1f111, G_UNICODE_NOT_PRESENT_OFFSET, 15421 },
+  { 0x1f112, G_UNICODE_NOT_PRESENT_OFFSET, 15425 },
+  { 0x1f113, G_UNICODE_NOT_PRESENT_OFFSET, 15429 },
+  { 0x1f114, G_UNICODE_NOT_PRESENT_OFFSET, 15433 },
+  { 0x1f115, G_UNICODE_NOT_PRESENT_OFFSET, 15437 },
+  { 0x1f116, G_UNICODE_NOT_PRESENT_OFFSET, 15441 },
+  { 0x1f117, G_UNICODE_NOT_PRESENT_OFFSET, 15445 },
+  { 0x1f118, G_UNICODE_NOT_PRESENT_OFFSET, 15449 },
+  { 0x1f119, G_UNICODE_NOT_PRESENT_OFFSET, 15453 },
+  { 0x1f11a, G_UNICODE_NOT_PRESENT_OFFSET, 15457 },
+  { 0x1f11b, G_UNICODE_NOT_PRESENT_OFFSET, 15461 },
+  { 0x1f11c, G_UNICODE_NOT_PRESENT_OFFSET, 15465 },
+  { 0x1f11d, G_UNICODE_NOT_PRESENT_OFFSET, 15469 },
+  { 0x1f11e, G_UNICODE_NOT_PRESENT_OFFSET, 15473 },
+  { 0x1f11f, G_UNICODE_NOT_PRESENT_OFFSET, 15477 },
+  { 0x1f120, G_UNICODE_NOT_PRESENT_OFFSET, 15481 },
+  { 0x1f121, G_UNICODE_NOT_PRESENT_OFFSET, 15485 },
+  { 0x1f122, G_UNICODE_NOT_PRESENT_OFFSET, 15489 },
+  { 0x1f123, G_UNICODE_NOT_PRESENT_OFFSET, 15493 },
+  { 0x1f124, G_UNICODE_NOT_PRESENT_OFFSET, 15497 },
+  { 0x1f125, G_UNICODE_NOT_PRESENT_OFFSET, 15501 },
+  { 0x1f126, G_UNICODE_NOT_PRESENT_OFFSET, 15505 },
+  { 0x1f127, G_UNICODE_NOT_PRESENT_OFFSET, 15509 },
+  { 0x1f128, G_UNICODE_NOT_PRESENT_OFFSET, 15513 },
+  { 0x1f129, G_UNICODE_NOT_PRESENT_OFFSET, 15517 },
+  { 0x1f12a, G_UNICODE_NOT_PRESENT_OFFSET, 15521 },
   { 0x1f12b, G_UNICODE_NOT_PRESENT_OFFSET, 5292 },
   { 0x1f12c, G_UNICODE_NOT_PRESENT_OFFSET, 2346 },
-  { 0x1f12d, G_UNICODE_NOT_PRESENT_OFFSET, 15522 },
-  { 0x1f12e, G_UNICODE_NOT_PRESENT_OFFSET, 15525 },
+  { 0x1f12d, G_UNICODE_NOT_PRESENT_OFFSET, 15529 },
+  { 0x1f12e, G_UNICODE_NOT_PRESENT_OFFSET, 15532 },
   { 0x1f130, G_UNICODE_NOT_PRESENT_OFFSET, 2309 },
   { 0x1f131, G_UNICODE_NOT_PRESENT_OFFSET, 2314 },
   { 0x1f132, G_UNICODE_NOT_PRESENT_OFFSET, 5292 },
@@ -7462,615 +7502,616 @@ static const decomposition decomp_table[] =
   { 0x1f147, G_UNICODE_NOT_PRESENT_OFFSET, 5487 },
   { 0x1f148, G_UNICODE_NOT_PRESENT_OFFSET, 6135 },
   { 0x1f149, G_UNICODE_NOT_PRESENT_OFFSET, 5331 },
-  { 0x1f14a, G_UNICODE_NOT_PRESENT_OFFSET, 15528 },
-  { 0x1f14b, G_UNICODE_NOT_PRESENT_OFFSET, 10556 },
-  { 0x1f14c, G_UNICODE_NOT_PRESENT_OFFSET, 15531 },
-  { 0x1f14d, G_UNICODE_NOT_PRESENT_OFFSET, 15534 },
-  { 0x1f14e, G_UNICODE_NOT_PRESENT_OFFSET, 15537 },
-  { 0x1f14f, G_UNICODE_NOT_PRESENT_OFFSET, 15541 },
-  { 0x1f16a, G_UNICODE_NOT_PRESENT_OFFSET, 15544 },
-  { 0x1f16b, G_UNICODE_NOT_PRESENT_OFFSET, 15547 },
-  { 0x1f190, G_UNICODE_NOT_PRESENT_OFFSET, 15550 },
-  { 0x1f200, G_UNICODE_NOT_PRESENT_OFFSET, 15553 },
-  { 0x1f201, G_UNICODE_NOT_PRESENT_OFFSET, 15560 },
+  { 0x1f14a, G_UNICODE_NOT_PRESENT_OFFSET, 15535 },
+  { 0x1f14b, G_UNICODE_NOT_PRESENT_OFFSET, 10563 },
+  { 0x1f14c, G_UNICODE_NOT_PRESENT_OFFSET, 15538 },
+  { 0x1f14d, G_UNICODE_NOT_PRESENT_OFFSET, 15541 },
+  { 0x1f14e, G_UNICODE_NOT_PRESENT_OFFSET, 15544 },
+  { 0x1f14f, G_UNICODE_NOT_PRESENT_OFFSET, 15548 },
+  { 0x1f16a, G_UNICODE_NOT_PRESENT_OFFSET, 15551 },
+  { 0x1f16b, G_UNICODE_NOT_PRESENT_OFFSET, 15554 },
+  { 0x1f16c, G_UNICODE_NOT_PRESENT_OFFSET, 15557 },
+  { 0x1f190, G_UNICODE_NOT_PRESENT_OFFSET, 15560 },
+  { 0x1f200, G_UNICODE_NOT_PRESENT_OFFSET, 15563 },
+  { 0x1f201, G_UNICODE_NOT_PRESENT_OFFSET, 15570 },
   { 0x1f202, G_UNICODE_NOT_PRESENT_OFFSET, 8848 },
   { 0x1f210, G_UNICODE_NOT_PRESENT_OFFSET, 6433 },
-  { 0x1f211, G_UNICODE_NOT_PRESENT_OFFSET, 15567 },
-  { 0x1f212, G_UNICODE_NOT_PRESENT_OFFSET, 15571 },
+  { 0x1f211, G_UNICODE_NOT_PRESENT_OFFSET, 15577 },
+  { 0x1f212, G_UNICODE_NOT_PRESENT_OFFSET, 15581 },
   { 0x1f213, G_UNICODE_NOT_PRESENT_OFFSET, 7346 },
   { 0x1f214, G_UNICODE_NOT_PRESENT_OFFSET, 6205 },
-  { 0x1f215, G_UNICODE_NOT_PRESENT_OFFSET, 15575 },
-  { 0x1f216, G_UNICODE_NOT_PRESENT_OFFSET, 15579 },
+  { 0x1f215, G_UNICODE_NOT_PRESENT_OFFSET, 15585 },
+  { 0x1f216, G_UNICODE_NOT_PRESENT_OFFSET, 15589 },
   { 0x1f217, G_UNICODE_NOT_PRESENT_OFFSET, 7887 },
-  { 0x1f218, G_UNICODE_NOT_PRESENT_OFFSET, 15583 },
-  { 0x1f219, G_UNICODE_NOT_PRESENT_OFFSET, 15587 },
-  { 0x1f21a, G_UNICODE_NOT_PRESENT_OFFSET, 15591 },
-  { 0x1f21b, G_UNICODE_NOT_PRESENT_OFFSET, 11619 },
-  { 0x1f21c, G_UNICODE_NOT_PRESENT_OFFSET, 15595 },
-  { 0x1f21d, G_UNICODE_NOT_PRESENT_OFFSET, 15599 },
-  { 0x1f21e, G_UNICODE_NOT_PRESENT_OFFSET, 15603 },
-  { 0x1f21f, G_UNICODE_NOT_PRESENT_OFFSET, 15607 },
-  { 0x1f220, G_UNICODE_NOT_PRESENT_OFFSET, 15611 },
-  { 0x1f221, G_UNICODE_NOT_PRESENT_OFFSET, 15615 },
+  { 0x1f218, G_UNICODE_NOT_PRESENT_OFFSET, 15593 },
+  { 0x1f219, G_UNICODE_NOT_PRESENT_OFFSET, 15597 },
+  { 0x1f21a, G_UNICODE_NOT_PRESENT_OFFSET, 15601 },
+  { 0x1f21b, G_UNICODE_NOT_PRESENT_OFFSET, 11626 },
+  { 0x1f21c, G_UNICODE_NOT_PRESENT_OFFSET, 15605 },
+  { 0x1f21d, G_UNICODE_NOT_PRESENT_OFFSET, 15609 },
+  { 0x1f21e, G_UNICODE_NOT_PRESENT_OFFSET, 15613 },
+  { 0x1f21f, G_UNICODE_NOT_PRESENT_OFFSET, 15617 },
+  { 0x1f220, G_UNICODE_NOT_PRESENT_OFFSET, 15621 },
+  { 0x1f221, G_UNICODE_NOT_PRESENT_OFFSET, 15625 },
   { 0x1f222, G_UNICODE_NOT_PRESENT_OFFSET, 6577 },
-  { 0x1f223, G_UNICODE_NOT_PRESENT_OFFSET, 15619 },
-  { 0x1f224, G_UNICODE_NOT_PRESENT_OFFSET, 15623 },
-  { 0x1f225, G_UNICODE_NOT_PRESENT_OFFSET, 15627 },
-  { 0x1f226, G_UNICODE_NOT_PRESENT_OFFSET, 15631 },
-  { 0x1f227, G_UNICODE_NOT_PRESENT_OFFSET, 15635 },
-  { 0x1f228, G_UNICODE_NOT_PRESENT_OFFSET, 15639 },
+  { 0x1f223, G_UNICODE_NOT_PRESENT_OFFSET, 15629 },
+  { 0x1f224, G_UNICODE_NOT_PRESENT_OFFSET, 15633 },
+  { 0x1f225, G_UNICODE_NOT_PRESENT_OFFSET, 15637 },
+  { 0x1f226, G_UNICODE_NOT_PRESENT_OFFSET, 15641 },
+  { 0x1f227, G_UNICODE_NOT_PRESENT_OFFSET, 15645 },
+  { 0x1f228, G_UNICODE_NOT_PRESENT_OFFSET, 15649 },
   { 0x1f229, G_UNICODE_NOT_PRESENT_OFFSET, 6181 },
   { 0x1f22a, G_UNICODE_NOT_PRESENT_OFFSET, 7855 },
-  { 0x1f22b, G_UNICODE_NOT_PRESENT_OFFSET, 15643 },
+  { 0x1f22b, G_UNICODE_NOT_PRESENT_OFFSET, 15653 },
   { 0x1f22c, G_UNICODE_NOT_PRESENT_OFFSET, 8646 },
   { 0x1f22d, G_UNICODE_NOT_PRESENT_OFFSET, 7867 },
   { 0x1f22e, G_UNICODE_NOT_PRESENT_OFFSET, 8650 },
-  { 0x1f22f, G_UNICODE_NOT_PRESENT_OFFSET, 15647 },
+  { 0x1f22f, G_UNICODE_NOT_PRESENT_OFFSET, 15657 },
   { 0x1f230, G_UNICODE_NOT_PRESENT_OFFSET, 6801 },
-  { 0x1f231, G_UNICODE_NOT_PRESENT_OFFSET, 15651 },
-  { 0x1f232, G_UNICODE_NOT_PRESENT_OFFSET, 15655 },
-  { 0x1f233, G_UNICODE_NOT_PRESENT_OFFSET, 15659 },
-  { 0x1f234, G_UNICODE_NOT_PRESENT_OFFSET, 15663 },
-  { 0x1f235, G_UNICODE_NOT_PRESENT_OFFSET, 15667 },
+  { 0x1f231, G_UNICODE_NOT_PRESENT_OFFSET, 15661 },
+  { 0x1f232, G_UNICODE_NOT_PRESENT_OFFSET, 15665 },
+  { 0x1f233, G_UNICODE_NOT_PRESENT_OFFSET, 15669 },
+  { 0x1f234, G_UNICODE_NOT_PRESENT_OFFSET, 15673 },
+  { 0x1f235, G_UNICODE_NOT_PRESENT_OFFSET, 15677 },
   { 0x1f236, G_UNICODE_NOT_PRESENT_OFFSET, 8578 },
   { 0x1f237, G_UNICODE_NOT_PRESENT_OFFSET, 6473 },
-  { 0x1f238, G_UNICODE_NOT_PRESENT_OFFSET, 15671 },
-  { 0x1f239, G_UNICODE_NOT_PRESENT_OFFSET, 15675 },
-  { 0x1f23a, G_UNICODE_NOT_PRESENT_OFFSET, 15679 },
-  { 0x1f23b, G_UNICODE_NOT_PRESENT_OFFSET, 15683 },
-  { 0x1f240, G_UNICODE_NOT_PRESENT_OFFSET, 15687 },
-  { 0x1f241, G_UNICODE_NOT_PRESENT_OFFSET, 15697 },
-  { 0x1f242, G_UNICODE_NOT_PRESENT_OFFSET, 15707 },
-  { 0x1f243, G_UNICODE_NOT_PRESENT_OFFSET, 15717 },
-  { 0x1f244, G_UNICODE_NOT_PRESENT_OFFSET, 15727 },
-  { 0x1f245, G_UNICODE_NOT_PRESENT_OFFSET, 15737 },
-  { 0x1f246, G_UNICODE_NOT_PRESENT_OFFSET, 15747 },
-  { 0x1f247, G_UNICODE_NOT_PRESENT_OFFSET, 15757 },
-  { 0x1f248, G_UNICODE_NOT_PRESENT_OFFSET, 15767 },
-  { 0x1f250, G_UNICODE_NOT_PRESENT_OFFSET, 15777 },
-  { 0x1f251, G_UNICODE_NOT_PRESENT_OFFSET, 15781 },
-  { 0x2f800, 15785, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f801, 15789, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f802, 15793, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f803, 15797, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f804, 15802, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f805, 11991, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f806, 15806, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f807, 15810, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f808, 15814, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f809, 15818, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f80a, 11995, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f80b, 15822, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f80c, 15826, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f80d, 15830, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f80e, 11999, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f80f, 15835, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f810, 15839, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f811, 15843, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f812, 15847, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f813, 15852, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f814, 15856, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f815, 15603, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f816, 15860, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f817, 15865, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f818, 15869, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f819, 15873, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f81a, 15877, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f81b, 12220, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f81c, 15881, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x1f238, G_UNICODE_NOT_PRESENT_OFFSET, 15681 },
+  { 0x1f239, G_UNICODE_NOT_PRESENT_OFFSET, 15685 },
+  { 0x1f23a, G_UNICODE_NOT_PRESENT_OFFSET, 15689 },
+  { 0x1f23b, G_UNICODE_NOT_PRESENT_OFFSET, 15693 },
+  { 0x1f240, G_UNICODE_NOT_PRESENT_OFFSET, 15697 },
+  { 0x1f241, G_UNICODE_NOT_PRESENT_OFFSET, 15707 },
+  { 0x1f242, G_UNICODE_NOT_PRESENT_OFFSET, 15717 },
+  { 0x1f243, G_UNICODE_NOT_PRESENT_OFFSET, 15727 },
+  { 0x1f244, G_UNICODE_NOT_PRESENT_OFFSET, 15737 },
+  { 0x1f245, G_UNICODE_NOT_PRESENT_OFFSET, 15747 },
+  { 0x1f246, G_UNICODE_NOT_PRESENT_OFFSET, 15757 },
+  { 0x1f247, G_UNICODE_NOT_PRESENT_OFFSET, 15767 },
+  { 0x1f248, G_UNICODE_NOT_PRESENT_OFFSET, 15777 },
+  { 0x1f250, G_UNICODE_NOT_PRESENT_OFFSET, 15787 },
+  { 0x1f251, G_UNICODE_NOT_PRESENT_OFFSET, 15791 },
+  { 0x2f800, 15795, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f801, 15799, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f802, 15803, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f803, 15807, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f804, 15812, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f805, 11998, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f806, 15816, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f807, 15820, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f808, 15824, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f809, 15828, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f80a, 12002, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f80b, 15832, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f80c, 15836, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f80d, 15840, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f80e, 12006, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f80f, 15845, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f810, 15849, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f811, 15853, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f812, 15857, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f813, 15862, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f814, 15866, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f815, 15613, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f816, 15870, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f817, 15875, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f818, 15879, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f819, 15883, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f81a, 15887, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f81b, 12227, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f81c, 15891, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2f81d, 6245, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f81e, 15886, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f81f, 15890, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f820, 15894, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f821, 15898, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f822, 15675, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f823, 15902, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f824, 15906, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f825, 12240, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f826, 12003, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f827, 12007, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f828, 12244, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f829, 15910, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f82a, 15914, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f82b, 11275, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f82c, 15918, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f82d, 12011, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f82e, 15922, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f82f, 15926, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f830, 15930, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f831, 15934, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f832, 15934, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f833, 15934, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f834, 15938, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f835, 15943, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f836, 15947, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f837, 15951, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f838, 15955, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f839, 15960, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f83a, 15964, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f83b, 15968, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f83c, 15972, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f83d, 15976, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f83e, 15980, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f83f, 15984, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f840, 15988, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f841, 15992, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f842, 15996, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f843, 16000, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f844, 16004, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f845, 16008, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f846, 16008, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f847, 12252, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f848, 16012, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f849, 16016, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f84a, 16020, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f84b, 16024, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f84c, 12019, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f84d, 16028, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f84e, 16032, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f84f, 16036, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f850, 11859, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f851, 16040, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f852, 16044, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f853, 16048, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f854, 16052, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f855, 16056, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f856, 16060, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f857, 16064, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f858, 16068, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f859, 16072, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f85a, 16077, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f85b, 16081, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f85c, 16085, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f85d, 15575, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f85e, 16089, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f85f, 16093, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f860, 16097, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f861, 16102, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f862, 16107, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f863, 16111, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f864, 16115, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f865, 16119, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f866, 16123, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f867, 16127, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f868, 16131, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f869, 16135, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f86a, 16139, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f86b, 16139, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f86c, 16143, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f86d, 16148, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f86e, 16152, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f86f, 11259, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f870, 16156, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f871, 16160, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f872, 16165, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f873, 16169, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f874, 16173, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f81e, 15896, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f81f, 15900, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f820, 15904, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f821, 15908, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f822, 15685, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f823, 15912, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f824, 15916, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f825, 12247, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f826, 12010, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f827, 12014, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f828, 12251, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f829, 15920, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f82a, 15924, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f82b, 11282, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f82c, 15928, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f82d, 12018, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f82e, 15932, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f82f, 15936, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f830, 15940, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f831, 15944, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f832, 15944, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f833, 15944, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f834, 15948, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f835, 15953, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f836, 15957, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f837, 15961, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f838, 15965, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f839, 15970, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f83a, 15974, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f83b, 15978, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f83c, 15982, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f83d, 15986, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f83e, 15990, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f83f, 15994, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f840, 15998, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f841, 16002, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f842, 16006, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f843, 16010, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f844, 16014, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f845, 16018, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f846, 16018, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f847, 12259, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f848, 16022, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f849, 16026, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f84a, 16030, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f84b, 16034, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f84c, 12026, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f84d, 16038, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f84e, 16042, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f84f, 16046, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f850, 11866, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f851, 16050, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f852, 16054, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f853, 16058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f854, 16062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f855, 16066, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f856, 16070, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f857, 16074, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f858, 16078, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f859, 16082, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f85a, 16087, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f85b, 16091, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f85c, 16095, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f85d, 15585, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f85e, 16099, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f85f, 16103, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f860, 16107, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f861, 16112, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f862, 16117, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f863, 16121, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f864, 16125, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f865, 16129, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f866, 16133, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f867, 16137, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f868, 16141, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f869, 16145, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f86a, 16149, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f86b, 16149, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f86c, 16153, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f86d, 16158, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f86e, 16162, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f86f, 11266, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f870, 16166, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f871, 16170, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f872, 16175, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f873, 16179, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f874, 16183, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2f875, 6349, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f876, 16177, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f877, 16181, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f876, 16187, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f877, 16191, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2f878, 6357, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f879, 16185, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f87a, 16189, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f87b, 16193, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f87c, 16198, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f87d, 16202, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f87e, 16207, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f87f, 16211, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f880, 16215, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f881, 16219, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f882, 16223, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f883, 16227, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f884, 16231, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f885, 16235, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f886, 16239, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f887, 16243, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f888, 16247, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f889, 16251, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f88a, 16256, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f88b, 16260, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f88c, 16264, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f88d, 16268, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f88e, 11051, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f88f, 16272, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f879, 16195, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f87a, 16199, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f87b, 16203, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f87c, 16208, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f87d, 16212, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f87e, 16217, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f87f, 16221, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f880, 16225, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f881, 16229, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f882, 16233, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f883, 16237, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f884, 16241, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f885, 16245, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f886, 16249, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f887, 16253, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f888, 16257, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f889, 16261, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f88a, 16266, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f88b, 16270, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f88c, 16274, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f88d, 16278, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f88e, 11058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f88f, 16282, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2f890, 6397, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f891, 16277, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f892, 16277, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f893, 16282, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f894, 16286, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f895, 16286, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f896, 16290, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f897, 16294, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f898, 16299, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f899, 16304, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f89a, 16308, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f89b, 16312, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f89c, 16316, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f89d, 16320, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f89e, 16324, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f89f, 16328, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a0, 16332, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a1, 16336, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a2, 16340, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a3, 12039, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a4, 16344, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a5, 16349, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a6, 16353, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a7, 16357, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a8, 12300, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8a9, 16357, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8aa, 16361, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ab, 12047, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ac, 16365, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ad, 16369, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ae, 16373, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8af, 16377, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b0, 12051, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b1, 10943, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b2, 16381, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b3, 16385, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b4, 16389, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b5, 16393, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b6, 16397, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b7, 16401, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b8, 16405, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8b9, 16410, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ba, 16414, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8bb, 16418, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8bc, 16422, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8bd, 16426, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8be, 16430, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8bf, 16435, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c0, 16439, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c1, 16443, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c2, 16447, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c3, 16451, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c4, 16455, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c5, 16459, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c6, 16463, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c7, 16467, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c8, 12055, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8c9, 16471, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ca, 16475, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8cb, 16480, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8cc, 16484, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8cd, 16488, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ce, 16492, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8cf, 12063, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d0, 16496, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d1, 16500, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d2, 16504, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d3, 16508, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d4, 16512, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d5, 16516, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d6, 16520, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d7, 16524, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d8, 11055, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8d9, 12332, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8da, 16528, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8db, 16532, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8dc, 16536, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8dd, 16540, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8de, 16545, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8df, 16549, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e0, 16553, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e1, 16557, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e2, 12067, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e3, 16561, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e4, 16566, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e5, 16570, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e6, 16574, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e7, 12503, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e8, 16578, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8e9, 16582, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ea, 16586, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8eb, 16590, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ec, 16594, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ed, 16599, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ee, 16603, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ef, 16607, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f0, 16611, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f1, 16616, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f2, 16620, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f3, 16624, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f4, 16628, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f5, 11327, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f6, 16632, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f7, 16636, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f8, 16641, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8f9, 16646, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8fa, 16651, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8fb, 16655, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8fc, 16660, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8fd, 16664, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8fe, 16668, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f8ff, 16672, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f900, 16676, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f901, 12071, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f902, 11659, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f903, 16680, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f904, 16684, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f905, 16688, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f906, 16692, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f907, 16697, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f908, 16701, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f909, 16705, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f90a, 16709, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f90b, 12344, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f90c, 16713, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f90d, 16717, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f90e, 16722, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f90f, 16726, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f910, 16730, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f911, 16735, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f912, 16740, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f913, 16744, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f914, 12348, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f915, 16748, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f916, 16752, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f917, 16756, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f918, 16760, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f919, 16764, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f91a, 16768, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f91b, 16772, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f91c, 16777, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f91d, 16781, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f91e, 16786, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f91f, 16790, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f920, 16795, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f921, 12356, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f922, 16799, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f923, 16803, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f924, 16808, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f925, 16812, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f926, 16816, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f927, 16821, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f928, 16826, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f929, 16830, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f92a, 16834, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f92b, 16838, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f92c, 16842, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f92d, 16842, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f92e, 16846, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f92f, 16850, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f930, 12364, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f931, 16854, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f932, 16858, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f933, 16862, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f934, 16866, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f935, 16870, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f936, 16875, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f937, 16879, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f938, 11271, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f939, 16884, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f93a, 16889, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f93b, 16893, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f93c, 16898, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f93d, 16903, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f93e, 16908, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f93f, 16912, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f940, 12388, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f941, 16916, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f942, 16921, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f943, 16926, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f944, 16931, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f945, 16936, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f946, 16940, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f947, 16940, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f948, 12392, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f949, 12511, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f94a, 16944, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f94b, 16948, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f94c, 16952, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f94d, 16956, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f94e, 16961, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f94f, 11123, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f950, 12400, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f951, 16965, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f952, 16969, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f953, 12111, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f954, 16974, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f955, 16979, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f956, 11939, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f957, 16984, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f958, 16988, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f959, 12123, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f95a, 16992, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f95b, 16996, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f95c, 17000, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f95d, 17005, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f95e, 17005, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f95f, 17010, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f960, 17014, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f961, 17018, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f962, 17023, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f963, 17027, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f964, 17031, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f965, 17035, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f966, 17040, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f967, 17044, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f968, 17048, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f969, 17052, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f96a, 17056, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f96b, 17060, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f96c, 17065, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f96d, 17069, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f96e, 17073, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f96f, 17077, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f970, 17081, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f971, 17085, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f972, 17089, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f973, 17094, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f974, 17099, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f975, 17103, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f976, 17108, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f977, 17112, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f978, 17117, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f979, 17121, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f97a, 12147, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f97b, 17125, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f97c, 17130, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f97d, 17135, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f97e, 17139, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f97f, 17144, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f980, 17148, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f981, 17153, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f982, 17157, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f983, 17161, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f984, 17165, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f985, 17169, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f986, 17173, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f987, 17177, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f988, 17182, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f989, 17187, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f98a, 17192, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f98b, 16282, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f98c, 17197, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f98d, 17201, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f98e, 17205, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f98f, 17209, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f990, 17213, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f991, 17217, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f992, 17221, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f993, 17225, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f994, 17229, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f995, 17233, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f996, 17237, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f997, 17241, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f998, 11339, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f999, 17246, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f99a, 17250, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f99b, 17254, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f99c, 17258, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f99d, 17262, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f99e, 17266, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f99f, 12159, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a0, 17270, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a1, 17274, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a2, 17278, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a3, 17282, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a4, 17286, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a5, 17291, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a6, 17296, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a7, 17301, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a8, 17305, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9a9, 17309, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9aa, 17313, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ab, 17317, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ac, 17322, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ad, 17326, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ae, 17331, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9af, 17335, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b0, 17339, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b1, 17344, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b2, 17349, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b3, 17353, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b4, 11103, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b5, 17357, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b6, 17361, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b7, 17365, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b8, 17369, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9b9, 17373, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ba, 17377, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9bb, 12428, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9bc, 17381, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9bd, 17385, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9be, 17389, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9bf, 17393, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c0, 17397, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c1, 17401, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c2, 17405, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c3, 17409, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f891, 16287, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f892, 16287, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f893, 16292, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f894, 16296, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f895, 16296, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f896, 16300, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f897, 16304, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f898, 16309, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f899, 16314, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f89a, 16318, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f89b, 16322, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f89c, 16326, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f89d, 16330, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f89e, 16334, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f89f, 16338, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a0, 16342, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a1, 16346, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a2, 16350, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a3, 12046, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a4, 16354, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a5, 16359, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a6, 16363, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a7, 16367, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a8, 12307, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8a9, 16367, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8aa, 16371, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ab, 12054, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ac, 16375, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ad, 16379, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ae, 16383, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8af, 16387, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b0, 12058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b1, 10950, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b2, 16391, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b3, 16395, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b4, 16399, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b5, 16403, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b6, 16407, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b7, 16411, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b8, 16415, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8b9, 16420, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ba, 16424, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8bb, 16428, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8bc, 16432, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8bd, 16436, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8be, 16440, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8bf, 16445, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c0, 16449, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c1, 16453, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c2, 16457, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c3, 16461, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c4, 16465, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c5, 16469, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c6, 16473, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c7, 16477, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c8, 12062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8c9, 16481, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ca, 16485, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8cb, 16490, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8cc, 16494, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8cd, 16498, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ce, 16502, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8cf, 12070, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d0, 16506, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d1, 16510, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d2, 16514, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d3, 16518, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d4, 16522, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d5, 16526, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d6, 16530, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d7, 16534, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d8, 11062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8d9, 12339, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8da, 16538, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8db, 16542, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8dc, 16546, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8dd, 16550, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8de, 16555, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8df, 16559, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e0, 16563, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e1, 16567, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e2, 12074, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e3, 16571, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e4, 16576, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e5, 16580, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e6, 16584, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e7, 12510, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e8, 16588, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8e9, 16592, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ea, 16596, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8eb, 16600, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ec, 16604, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ed, 16609, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ee, 16613, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ef, 16617, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f0, 16621, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f1, 16626, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f2, 16630, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f3, 16634, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f4, 16638, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f5, 11334, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f6, 16642, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f7, 16646, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f8, 16651, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8f9, 16656, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8fa, 16661, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8fb, 16665, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8fc, 16670, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8fd, 16674, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8fe, 16678, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f8ff, 16682, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f900, 16686, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f901, 12078, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f902, 11666, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f903, 16690, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f904, 16694, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f905, 16698, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f906, 16702, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f907, 16707, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f908, 16711, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f909, 16715, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f90a, 16719, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f90b, 12351, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f90c, 16723, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f90d, 16727, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f90e, 16732, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f90f, 16736, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f910, 16740, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f911, 16745, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f912, 16750, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f913, 16754, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f914, 12355, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f915, 16758, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f916, 16762, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f917, 16766, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f918, 16770, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f919, 16774, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f91a, 16778, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f91b, 16782, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f91c, 16787, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f91d, 16791, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f91e, 16796, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f91f, 16800, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f920, 16805, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f921, 12363, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f922, 16809, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f923, 16813, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f924, 16818, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f925, 16822, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f926, 16826, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f927, 16831, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f928, 16836, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f929, 16840, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f92a, 16844, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f92b, 16848, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f92c, 16852, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f92d, 16852, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f92e, 16856, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f92f, 16860, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f930, 12371, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f931, 16864, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f932, 16868, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f933, 16872, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f934, 16876, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f935, 16880, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f936, 16885, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f937, 16889, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f938, 11278, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f939, 16894, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f93a, 16899, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f93b, 16903, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f93c, 16908, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f93d, 16913, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f93e, 16918, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f93f, 16922, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f940, 12395, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f941, 16926, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f942, 16931, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f943, 16936, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f944, 16941, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f945, 16946, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f946, 16950, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f947, 16950, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f948, 12399, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f949, 12518, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f94a, 16954, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f94b, 16958, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f94c, 16962, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f94d, 16966, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f94e, 16971, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f94f, 11130, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f950, 12407, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f951, 16975, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f952, 16979, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f953, 12118, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f954, 16984, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f955, 16989, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f956, 11946, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f957, 16994, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f958, 16998, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f959, 12130, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f95a, 17002, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f95b, 17006, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f95c, 17010, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f95d, 17015, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f95e, 17015, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f95f, 17020, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f960, 17024, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f961, 17028, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f962, 17033, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f963, 17037, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f964, 17041, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f965, 17045, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f966, 17050, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f967, 17054, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f968, 17058, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f969, 17062, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f96a, 17066, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f96b, 17070, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f96c, 17075, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f96d, 17079, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f96e, 17083, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f96f, 17087, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f970, 17091, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f971, 17095, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f972, 17099, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f973, 17104, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f974, 17109, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f975, 17113, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f976, 17118, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f977, 17122, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f978, 17127, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f979, 17131, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f97a, 12154, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f97b, 17135, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f97c, 17140, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f97d, 17145, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f97e, 17149, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f97f, 17154, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f980, 17158, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f981, 17163, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f982, 17167, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f983, 17171, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f984, 17175, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f985, 17179, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f986, 17183, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f987, 17187, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f988, 17192, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f989, 17197, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f98a, 17202, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f98b, 16292, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f98c, 17207, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f98d, 17211, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f98e, 17215, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f98f, 17219, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f990, 17223, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f991, 17227, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f992, 17231, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f993, 17235, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f994, 17239, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f995, 17243, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f996, 17247, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f997, 17251, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f998, 11346, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f999, 17256, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f99a, 17260, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f99b, 17264, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f99c, 17268, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f99d, 17272, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f99e, 17276, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f99f, 12166, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a0, 17280, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a1, 17284, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a2, 17288, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a3, 17292, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a4, 17296, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a5, 17301, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a6, 17306, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a7, 17311, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a8, 17315, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9a9, 17319, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9aa, 17323, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ab, 17327, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ac, 17332, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ad, 17336, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ae, 17341, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9af, 17345, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b0, 17349, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b1, 17354, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b2, 17359, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b3, 17363, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b4, 11110, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b5, 17367, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b6, 17371, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b7, 17375, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b8, 17379, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9b9, 17383, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ba, 17387, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9bb, 12435, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9bc, 17391, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9bd, 17395, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9be, 17399, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9bf, 17403, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c0, 17407, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c1, 17411, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c2, 17415, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c3, 17419, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2f9c4, 6757, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c5, 17413, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c6, 17418, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c7, 17422, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c8, 17426, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9c9, 17430, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ca, 17434, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9cb, 17438, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9cc, 17443, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9cd, 17448, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ce, 17452, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9cf, 17456, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d0, 12448, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d1, 12452, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c5, 17423, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c6, 17428, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c7, 17432, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c8, 17436, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9c9, 17440, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ca, 17444, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9cb, 17448, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9cc, 17453, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9cd, 17458, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ce, 17462, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9cf, 17466, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d0, 12455, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d1, 12459, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2f9d2, 6785, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d3, 17460, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d4, 17465, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d5, 17469, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d6, 17473, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d7, 17477, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d8, 17481, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9d9, 17486, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9da, 17491, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9db, 17495, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9dc, 17499, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9dd, 17503, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9de, 17508, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9df, 12456, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e0, 17512, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e1, 17517, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e2, 17522, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e3, 17526, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e4, 17530, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e5, 17534, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e6, 17539, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e7, 17543, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e8, 17547, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9e9, 17551, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ea, 17555, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9eb, 17559, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ec, 17563, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ed, 17567, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ee, 17572, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ef, 17576, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f0, 17580, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f1, 17584, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f2, 17589, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f3, 17593, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f4, 17597, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f5, 17601, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f6, 17605, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f7, 17610, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f8, 17615, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9f9, 17619, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9fa, 17623, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9fb, 17627, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9fc, 17632, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9fd, 17636, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9fe, 12480, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2f9ff, 12480, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa00, 17641, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa01, 17645, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa02, 17650, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa03, 17654, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa04, 17658, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa05, 17662, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa06, 17666, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa07, 17670, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa08, 17674, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa09, 17678, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa0a, 12484, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa0b, 17683, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa0c, 17687, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa0d, 17691, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa0e, 17695, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa0f, 17699, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa10, 17703, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa11, 17708, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa12, 17712, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa13, 17717, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa14, 17722, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d3, 17470, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d4, 17475, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d5, 17479, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d6, 17483, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d7, 17487, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d8, 17491, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9d9, 17496, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9da, 17501, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9db, 17505, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9dc, 17509, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9dd, 17513, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9de, 17518, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9df, 12463, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e0, 17522, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e1, 17527, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e2, 17532, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e3, 17536, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e4, 17540, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e5, 17544, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e6, 17549, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e7, 17553, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e8, 17557, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9e9, 17561, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ea, 17565, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9eb, 17569, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ec, 17573, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ed, 17577, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ee, 17582, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ef, 17586, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f0, 17590, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f1, 17594, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f2, 17599, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f3, 17603, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f4, 17607, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f5, 17611, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f6, 17615, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f7, 17620, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f8, 17625, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9f9, 17629, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9fa, 17633, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9fb, 17637, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9fc, 17642, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9fd, 17646, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9fe, 12487, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2f9ff, 12487, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa00, 17651, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa01, 17655, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa02, 17660, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa03, 17664, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa04, 17668, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa05, 17672, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa06, 17676, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa07, 17680, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa08, 17684, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa09, 17688, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa0a, 12491, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa0b, 17693, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa0c, 17697, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa0d, 17701, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa0e, 17705, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa0f, 17709, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa10, 17713, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa11, 17718, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa12, 17722, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa13, 17727, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa14, 17732, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2fa15, 6977, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa16, 17727, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa16, 17737, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2fa17, 6993, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa18, 17731, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa19, 17735, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa1a, 17739, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa1b, 17743, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa18, 17741, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa19, 17745, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa1a, 17749, G_UNICODE_NOT_PRESENT_OFFSET },
+  { 0x2fa1b, 17753, G_UNICODE_NOT_PRESENT_OFFSET },
   { 0x2fa1c, 7013, G_UNICODE_NOT_PRESENT_OFFSET },
-  { 0x2fa1d, 17747, G_UNICODE_NOT_PRESENT_OFFSET }
+  { 0x2fa1d, 17757, G_UNICODE_NOT_PRESENT_OFFSET }
 };
 
 static const gchar decomp_expansion_string[] = 
@@ -9946,1784 +9987,1786 @@ static const gchar decomp_expansion_string[] =
   "\xe3\x83\xb0\0" /* offset 8984 */
   "\xe3\x83\xb1\0" /* offset 8988 */
   "\xe3\x83\xb2\0" /* offset 8992 */
-  "\xe3\x82\xa2\xe3\x83\x8f\xe3\x82\x9a\xe3\x83\xbc\xe3\x83\x88\0" /* offset 8996 */
-  "\xe3\x82\xa2\xe3\x83\xab\xe3\x83\x95\xe3\x82\xa1\0" /* offset 9012 */
-  "\xe3\x82\xa2\xe3\x83\xb3\xe3\x83\x98\xe3\x82\x9a\xe3\x82\xa2\0" /* offset 9025 */
-  "\xe3\x82\xa2\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9041 */
-  "\xe3\x82\xa4\xe3\x83\x8b\xe3\x83\xb3\xe3\x82\xaf\xe3\x82\x99\0" /* offset 9051 */
-  "\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x81\0" /* offset 9067 */
-  "\xe3\x82\xa6\xe3\x82\xa9\xe3\x83\xb3\0" /* offset 9077 */
-  "\xe3\x82\xa8\xe3\x82\xb9\xe3\x82\xaf\xe3\x83\xbc\xe3\x83\x88\xe3\x82\x99\0" /* offset 9087 */
-  "\xe3\x82\xa8\xe3\x83\xbc\xe3\x82\xab\xe3\x83\xbc\0" /* offset 9106 */
-  "\xe3\x82\xaa\xe3\x83\xb3\xe3\x82\xb9\0" /* offset 9119 */
-  "\xe3\x82\xaa\xe3\x83\xbc\xe3\x83\xa0\0" /* offset 9129 */
-  "\xe3\x82\xab\xe3\x82\xa4\xe3\x83\xaa\0" /* offset 9139 */
-  "\xe3\x82\xab\xe3\x83\xa9\xe3\x83\x83\xe3\x83\x88\0" /* offset 9149 */
-  "\xe3\x82\xab\xe3\x83\xad\xe3\x83\xaa\xe3\x83\xbc\0" /* offset 9162 */
-  "\xe3\x82\xab\xe3\x82\x99\xe3\x83\xad\xe3\x83\xb3\0" /* offset 9175 */
-  "\xe3\x82\xab\xe3\x82\x99\xe3\x83\xb3\xe3\x83\x9e\0" /* offset 9188 */
-  "\xe3\x82\xad\xe3\x82\x99\xe3\x82\xab\xe3\x82\x99\0" /* offset 9201 */
-  "\xe3\x82\xad\xe3\x82\x99\xe3\x83\x8b\xe3\x83\xbc\0" /* offset 9214 */
-  "\xe3\x82\xad\xe3\x83\xa5\xe3\x83\xaa\xe3\x83\xbc\0" /* offset 9227 */
-  "\xe3\x82\xad\xe3\x82\x99\xe3\x83\xab\xe3\x82\xbf\xe3\x82\x99\xe3\x83\xbc\0" /* offset 9240 */
-  "\xe3\x82\xad\xe3\x83\xad\0" /* offset 9259 */
-  "\xe3\x82\xad\xe3\x83\xad\xe3\x82\xaf\xe3\x82\x99\xe3\x83\xa9\xe3\x83\xa0\0" /* offset 9266 */
-  "\xe3\x82\xad\xe3\x83\xad\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\x88\xe3\x83\xab\0" /* offset 9285 */
-  "\xe3\x82\xad\xe3\x83\xad\xe3\x83\xaf\xe3\x83\x83\xe3\x83\x88\0" /* offset 9304 */
-  "\xe3\x82\xaf\xe3\x82\x99\xe3\x83\xa9\xe3\x83\xa0\0" /* offset 9320 */
-  "\xe3\x82\xaf\xe3\x82\x99\xe3\x83\xa9\xe3\x83\xa0\xe3\x83\x88\xe3\x83\xb3\0" /* offset 9333 */
-  "\xe3\x82\xaf\xe3\x83\xab\xe3\x82\xbb\xe3\x82\x99\xe3\x82\xa4\xe3\x83\xad\0" /* offset 9352 */
-  "\xe3\x82\xaf\xe3\x83\xad\xe3\x83\xbc\xe3\x83\x8d\0" /* offset 9371 */
-  "\xe3\x82\xb1\xe3\x83\xbc\xe3\x82\xb9\0" /* offset 9384 */
-  "\xe3\x82\xb3\xe3\x83\xab\xe3\x83\x8a\0" /* offset 9394 */
-  "\xe3\x82\xb3\xe3\x83\xbc\xe3\x83\x9b\xe3\x82\x9a\0" /* offset 9404 */
-  "\xe3\x82\xb5\xe3\x82\xa4\xe3\x82\xaf\xe3\x83\xab\0" /* offset 9417 */
-  "\xe3\x82\xb5\xe3\x83\xb3\xe3\x83\x81\xe3\x83\xbc\xe3\x83\xa0\0" /* offset 9430 */
-  "\xe3\x82\xb7\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf\xe3\x82\x99\0" /* offset 9446 */
-  "\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x81\0" /* offset 9462 */
-  "\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x88\0" /* offset 9472 */
-  "\xe3\x82\xbf\xe3\x82\x99\xe3\x83\xbc\xe3\x82\xb9\0" /* offset 9482 */
-  "\xe3\x83\x86\xe3\x82\x99\xe3\x82\xb7\0" /* offset 9495 */
-  "\xe3\x83\x88\xe3\x82\x99\xe3\x83\xab\0" /* offset 9505 */
-  "\xe3\x83\x88\xe3\x83\xb3\0" /* offset 9515 */
-  "\xe3\x83\x8a\xe3\x83\x8e\0" /* offset 9522 */
-  "\xe3\x83\x8e\xe3\x83\x83\xe3\x83\x88\0" /* offset 9529 */
-  "\xe3\x83\x8f\xe3\x82\xa4\xe3\x83\x84\0" /* offset 9539 */
-  "\xe3\x83\x8f\xe3\x82\x9a\xe3\x83\xbc\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x88\0" /* offset 9549 */
-  "\xe3\x83\x8f\xe3\x82\x9a\xe3\x83\xbc\xe3\x83\x84\0" /* offset 9568 */
-  "\xe3\x83\x8f\xe3\x82\x99\xe3\x83\xbc\xe3\x83\xac\xe3\x83\xab\0" /* offset 9581 */
-  "\xe3\x83\x92\xe3\x82\x9a\xe3\x82\xa2\xe3\x82\xb9\xe3\x83\x88\xe3\x83\xab\0" /* offset 9597 */
-  "\xe3\x83\x92\xe3\x82\x9a\xe3\x82\xaf\xe3\x83\xab\0" /* offset 9616 */
-  "\xe3\x83\x92\xe3\x82\x9a\xe3\x82\xb3\0" /* offset 9629 */
-  "\xe3\x83\x92\xe3\x82\x99\xe3\x83\xab\0" /* offset 9639 */
-  "\xe3\x83\x95\xe3\x82\xa1\xe3\x83\xa9\xe3\x83\x83\xe3\x83\x88\xe3\x82\x99\0" /* offset 9649 */
-  "\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xbc\xe3\x83\x88\0" /* offset 9668 */
-  "\xe3\x83\x95\xe3\x82\x99\xe3\x83\x83\xe3\x82\xb7\xe3\x82\xa7\xe3\x83\xab\0" /* offset 9681 */
-  "\xe3\x83\x95\xe3\x83\xa9\xe3\x83\xb3\0" /* offset 9700 */
-  "\xe3\x83\x98\xe3\x82\xaf\xe3\x82\xbf\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9710 */
-  "\xe3\x83\x98\xe3\x82\x9a\xe3\x82\xbd\0" /* offset 9726 */
-  "\xe3\x83\x98\xe3\x82\x9a\xe3\x83\x8b\xe3\x83\x92\0" /* offset 9736 */
-  "\xe3\x83\x98\xe3\x83\xab\xe3\x83\x84\0" /* offset 9749 */
-  "\xe3\x83\x98\xe3\x82\x9a\xe3\x83\xb3\xe3\x82\xb9\0" /* offset 9759 */
-  "\xe3\x83\x98\xe3\x82\x9a\xe3\x83\xbc\xe3\x82\xb7\xe3\x82\x99\0" /* offset 9772 */
-  "\xe3\x83\x98\xe3\x82\x99\xe3\x83\xbc\xe3\x82\xbf\0" /* offset 9788 */
-  "\xe3\x83\x9b\xe3\x82\x9a\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x88\0" /* offset 9801 */
-  "\xe3\x83\x9b\xe3\x82\x99\xe3\x83\xab\xe3\x83\x88\0" /* offset 9817 */
-  "\xe3\x83\x9b\xe3\x83\xb3\0" /* offset 9830 */
-  "\xe3\x83\x9b\xe3\x82\x9a\xe3\x83\xb3\xe3\x83\x88\xe3\x82\x99\0" /* offset 9837 */
-  "\xe3\x83\x9b\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9853 */
-  "\xe3\x83\x9b\xe3\x83\xbc\xe3\x83\xb3\0" /* offset 9863 */
-  "\xe3\x83\x9e\xe3\x82\xa4\xe3\x82\xaf\xe3\x83\xad\0" /* offset 9873 */
-  "\xe3\x83\x9e\xe3\x82\xa4\xe3\x83\xab\0" /* offset 9886 */
-  "\xe3\x83\x9e\xe3\x83\x83\xe3\x83\x8f\0" /* offset 9896 */
-  "\xe3\x83\x9e\xe3\x83\xab\xe3\x82\xaf\0" /* offset 9906 */
-  "\xe3\x83\x9e\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\0" /* offset 9916 */
-  "\xe3\x83\x9f\xe3\x82\xaf\xe3\x83\xad\xe3\x83\xb3\0" /* offset 9932 */
-  "\xe3\x83\x9f\xe3\x83\xaa\0" /* offset 9945 */
-  "\xe3\x83\x9f\xe3\x83\xaa\xe3\x83\x8f\xe3\x82\x99\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9952 */
-  "\xe3\x83\xa1\xe3\x82\xab\xe3\x82\x99\0" /* offset 9971 */
-  "\xe3\x83\xa1\xe3\x82\xab\xe3\x82\x99\xe3\x83\x88\xe3\x83\xb3\0" /* offset 9981 */
-  "\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\x88\xe3\x83\xab\0" /* offset 9997 */
-  "\xe3\x83\xa4\xe3\x83\xbc\xe3\x83\x88\xe3\x82\x99\0" /* offset 10010 */
-  "\xe3\x83\xa4\xe3\x83\xbc\xe3\x83\xab\0" /* offset 10023 */
-  "\xe3\x83\xa6\xe3\x82\xa2\xe3\x83\xb3\0" /* offset 10033 */
-  "\xe3\x83\xaa\xe3\x83\x83\xe3\x83\x88\xe3\x83\xab\0" /* offset 10043 */
-  "\xe3\x83\xaa\xe3\x83\xa9\0" /* offset 10056 */
-  "\xe3\x83\xab\xe3\x83\x92\xe3\x82\x9a\xe3\x83\xbc\0" /* offset 10063 */
-  "\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x95\xe3\x82\x99\xe3\x83\xab\0" /* offset 10076 */
-  "\xe3\x83\xac\xe3\x83\xa0\0" /* offset 10092 */
-  "\xe3\x83\xac\xe3\x83\xb3\xe3\x83\x88\xe3\x82\xb1\xe3\x82\x99\xe3\x83\xb3\0" /* offset 10099 */
-  "\xe3\x83\xaf\xe3\x83\x83\xe3\x83\x88\0" /* offset 10118 */
-  "\x30\xe7\x82\xb9\0" /* offset 10128 */
-  "\x31\xe7\x82\xb9\0" /* offset 10133 */
-  "\x32\xe7\x82\xb9\0" /* offset 10138 */
-  "\x33\xe7\x82\xb9\0" /* offset 10143 */
-  "\x34\xe7\x82\xb9\0" /* offset 10148 */
-  "\x35\xe7\x82\xb9\0" /* offset 10153 */
-  "\x36\xe7\x82\xb9\0" /* offset 10158 */
-  "\x37\xe7\x82\xb9\0" /* offset 10163 */
-  "\x38\xe7\x82\xb9\0" /* offset 10168 */
-  "\x39\xe7\x82\xb9\0" /* offset 10173 */
-  "\x31\x30\xe7\x82\xb9\0" /* offset 10178 */
-  "\x31\x31\xe7\x82\xb9\0" /* offset 10184 */
-  "\x31\x32\xe7\x82\xb9\0" /* offset 10190 */
-  "\x31\x33\xe7\x82\xb9\0" /* offset 10196 */
-  "\x31\x34\xe7\x82\xb9\0" /* offset 10202 */
-  "\x31\x35\xe7\x82\xb9\0" /* offset 10208 */
-  "\x31\x36\xe7\x82\xb9\0" /* offset 10214 */
-  "\x31\x37\xe7\x82\xb9\0" /* offset 10220 */
-  "\x31\x38\xe7\x82\xb9\0" /* offset 10226 */
-  "\x31\x39\xe7\x82\xb9\0" /* offset 10232 */
-  "\x32\x30\xe7\x82\xb9\0" /* offset 10238 */
-  "\x32\x31\xe7\x82\xb9\0" /* offset 10244 */
-  "\x32\x32\xe7\x82\xb9\0" /* offset 10250 */
-  "\x32\x33\xe7\x82\xb9\0" /* offset 10256 */
-  "\x32\x34\xe7\x82\xb9\0" /* offset 10262 */
-  "\x68\x50\x61\0" /* offset 10268 */
-  "\x64\x61\0" /* offset 10272 */
-  "\x41\x55\0" /* offset 10275 */
-  "\x62\x61\x72\0" /* offset 10278 */
-  "\x6f\x56\0" /* offset 10282 */
-  "\x70\x63\0" /* offset 10285 */
-  "\x64\x6d\0" /* offset 10288 */
-  "\x64\x6d\x32\0" /* offset 10291 */
-  "\x64\x6d\x33\0" /* offset 10295 */
-  "\x49\x55\0" /* offset 10299 */
-  "\xe5\xb9\xb3\xe6\x88\x90\0" /* offset 10302 */
-  "\xe6\x98\xad\xe5\x92\x8c\0" /* offset 10309 */
-  "\xe5\xa4\xa7\xe6\xad\xa3\0" /* offset 10316 */
-  "\xe6\x98\x8e\xe6\xb2\xbb\0" /* offset 10323 */
-  "\xe6\xa0\xaa\xe5\xbc\x8f\xe4\xbc\x9a\xe7\xa4\xbe\0" /* offset 10330 */
-  "\x70\x41\0" /* offset 10343 */
-  "\x6e\x41\0" /* offset 10346 */
-  "\xce\xbc\x41\0" /* offset 10349 */
-  "\x6d\x41\0" /* offset 10353 */
-  "\x6b\x41\0" /* offset 10356 */
-  "\x4b\x42\0" /* offset 10359 */
-  "\x4d\x42\0" /* offset 10362 */
-  "\x47\x42\0" /* offset 10365 */
-  "\x63\x61\x6c\0" /* offset 10368 */
-  "\x6b\x63\x61\x6c\0" /* offset 10372 */
-  "\x70\x46\0" /* offset 10377 */
-  "\x6e\x46\0" /* offset 10380 */
-  "\xce\xbc\x46\0" /* offset 10383 */
-  "\xce\xbc\x67\0" /* offset 10387 */
-  "\x6d\x67\0" /* offset 10391 */
-  "\x6b\x67\0" /* offset 10394 */
-  "\x48\x7a\0" /* offset 10397 */
-  "\x6b\x48\x7a\0" /* offset 10400 */
-  "\x4d\x48\x7a\0" /* offset 10404 */
-  "\x47\x48\x7a\0" /* offset 10408 */
-  "\x54\x48\x7a\0" /* offset 10412 */
-  "\xce\xbc\x6c\0" /* offset 10416 */
-  "\x6d\x6c\0" /* offset 10420 */
-  "\x64\x6c\0" /* offset 10423 */
-  "\x6b\x6c\0" /* offset 10426 */
-  "\x66\x6d\0" /* offset 10429 */
-  "\x6e\x6d\0" /* offset 10432 */
-  "\xce\xbc\x6d\0" /* offset 10435 */
-  "\x6d\x6d\0" /* offset 10439 */
-  "\x63\x6d\0" /* offset 10442 */
-  "\x6b\x6d\0" /* offset 10445 */
-  "\x6d\x6d\x32\0" /* offset 10448 */
-  "\x63\x6d\x32\0" /* offset 10452 */
-  "\x6d\x32\0" /* offset 10456 */
-  "\x6b\x6d\x32\0" /* offset 10459 */
-  "\x6d\x6d\x33\0" /* offset 10463 */
-  "\x63\x6d\x33\0" /* offset 10467 */
-  "\x6d\x33\0" /* offset 10471 */
-  "\x6b\x6d\x33\0" /* offset 10474 */
-  "\x6d\xe2\x88\x95\x73\0" /* offset 10478 */
-  "\x6d\xe2\x88\x95\x73\x32\0" /* offset 10484 */
-  "\x50\x61\0" /* offset 10491 */
-  "\x6b\x50\x61\0" /* offset 10494 */
-  "\x4d\x50\x61\0" /* offset 10498 */
-  "\x47\x50\x61\0" /* offset 10502 */
-  "\x72\x61\x64\0" /* offset 10506 */
-  "\x72\x61\x64\xe2\x88\x95\x73\0" /* offset 10510 */
-  "\x72\x61\x64\xe2\x88\x95\x73\x32\0" /* offset 10518 */
-  "\x70\x73\0" /* offset 10527 */
-  "\x6e\x73\0" /* offset 10530 */
-  "\xce\xbc\x73\0" /* offset 10533 */
-  "\x6d\x73\0" /* offset 10537 */
-  "\x70\x56\0" /* offset 10540 */
-  "\x6e\x56\0" /* offset 10543 */
-  "\xce\xbc\x56\0" /* offset 10546 */
-  "\x6d\x56\0" /* offset 10550 */
-  "\x6b\x56\0" /* offset 10553 */
-  "\x4d\x56\0" /* offset 10556 */
-  "\x70\x57\0" /* offset 10559 */
-  "\x6e\x57\0" /* offset 10562 */
-  "\xce\xbc\x57\0" /* offset 10565 */
-  "\x6d\x57\0" /* offset 10569 */
-  "\x6b\x57\0" /* offset 10572 */
-  "\x4d\x57\0" /* offset 10575 */
-  "\x6b\xce\xa9\0" /* offset 10578 */
-  "\x4d\xce\xa9\0" /* offset 10582 */
-  "\x61\x2e\x6d\x2e\0" /* offset 10586 */
-  "\x42\x71\0" /* offset 10591 */
-  "\x63\x63\0" /* offset 10594 */
-  "\x63\x64\0" /* offset 10597 */
-  "\x43\xe2\x88\x95\x6b\x67\0" /* offset 10600 */
-  "\x43\x6f\x2e\0" /* offset 10607 */
-  "\x64\x42\0" /* offset 10611 */
-  "\x47\x79\0" /* offset 10614 */
-  "\x68\x61\0" /* offset 10617 */
-  "\x48\x50\0" /* offset 10620 */
-  "\x69\x6e\0" /* offset 10623 */
-  "\x4b\x4b\0" /* offset 10626 */
-  "\x4b\x4d\0" /* offset 10629 */
-  "\x6b\x74\0" /* offset 10632 */
-  "\x6c\x6d\0" /* offset 10635 */
-  "\x6c\x6e\0" /* offset 10638 */
-  "\x6c\x6f\x67\0" /* offset 10641 */
-  "\x6c\x78\0" /* offset 10645 */
-  "\x6d\x62\0" /* offset 10648 */
-  "\x6d\x69\x6c\0" /* offset 10651 */
-  "\x6d\x6f\x6c\0" /* offset 10655 */
-  "\x50\x48\0" /* offset 10659 */
-  "\x70\x2e\x6d\x2e\0" /* offset 10662 */
-  "\x50\x50\x4d\0" /* offset 10667 */
-  "\x50\x52\0" /* offset 10671 */
-  "\x73\x72\0" /* offset 10674 */
-  "\x53\x76\0" /* offset 10677 */
-  "\x57\x62\0" /* offset 10680 */
-  "\x56\xe2\x88\x95\x6d\0" /* offset 10683 */
-  "\x41\xe2\x88\x95\x6d\0" /* offset 10689 */
-  "\x31\xe6\x97\xa5\0" /* offset 10695 */
-  "\x32\xe6\x97\xa5\0" /* offset 10700 */
-  "\x33\xe6\x97\xa5\0" /* offset 10705 */
-  "\x34\xe6\x97\xa5\0" /* offset 10710 */
-  "\x35\xe6\x97\xa5\0" /* offset 10715 */
-  "\x36\xe6\x97\xa5\0" /* offset 10720 */
-  "\x37\xe6\x97\xa5\0" /* offset 10725 */
-  "\x38\xe6\x97\xa5\0" /* offset 10730 */
-  "\x39\xe6\x97\xa5\0" /* offset 10735 */
-  "\x31\x30\xe6\x97\xa5\0" /* offset 10740 */
-  "\x31\x31\xe6\x97\xa5\0" /* offset 10746 */
-  "\x31\x32\xe6\x97\xa5\0" /* offset 10752 */
-  "\x31\x33\xe6\x97\xa5\0" /* offset 10758 */
-  "\x31\x34\xe6\x97\xa5\0" /* offset 10764 */
-  "\x31\x35\xe6\x97\xa5\0" /* offset 10770 */
-  "\x31\x36\xe6\x97\xa5\0" /* offset 10776 */
-  "\x31\x37\xe6\x97\xa5\0" /* offset 10782 */
-  "\x31\x38\xe6\x97\xa5\0" /* offset 10788 */
-  "\x31\x39\xe6\x97\xa5\0" /* offset 10794 */
-  "\x32\x30\xe6\x97\xa5\0" /* offset 10800 */
-  "\x32\x31\xe6\x97\xa5\0" /* offset 10806 */
-  "\x32\x32\xe6\x97\xa5\0" /* offset 10812 */
-  "\x32\x33\xe6\x97\xa5\0" /* offset 10818 */
-  "\x32\x34\xe6\x97\xa5\0" /* offset 10824 */
-  "\x32\x35\xe6\x97\xa5\0" /* offset 10830 */
-  "\x32\x36\xe6\x97\xa5\0" /* offset 10836 */
-  "\x32\x37\xe6\x97\xa5\0" /* offset 10842 */
-  "\x32\x38\xe6\x97\xa5\0" /* offset 10848 */
-  "\x32\x39\xe6\x97\xa5\0" /* offset 10854 */
-  "\x33\x30\xe6\x97\xa5\0" /* offset 10860 */
-  "\x33\x31\xe6\x97\xa5\0" /* offset 10866 */
-  "\x67\x61\x6c\0" /* offset 10872 */
-  "\xd1\x8a\0" /* offset 10876 */
-  "\xd1\x8c\0" /* offset 10879 */
-  "\xea\x9d\xaf\0" /* offset 10882 */
-  "\xc4\xa6\0" /* offset 10886 */
-  "\xc5\x93\0" /* offset 10889 */
-  "\xea\x9c\xa7\0" /* offset 10892 */
-  "\xea\xac\xb7\0" /* offset 10896 */
-  "\xc9\xab\0" /* offset 10900 */
-  "\xea\xad\x92\0" /* offset 10903 */
-  "\xe8\xb1\x88\0" /* offset 10907 */
-  "\xe6\x9b\xb4\0" /* offset 10911 */
-  "\xe8\xb3\x88\0" /* offset 10915 */
-  "\xe6\xbb\x91\0" /* offset 10919 */
-  "\xe4\xb8\xb2\0" /* offset 10923 */
-  "\xe5\x8f\xa5\0" /* offset 10927 */
-  "\xe5\xa5\x91\0" /* offset 10931 */
-  "\xe5\x96\x87\0" /* offset 10935 */
-  "\xe5\xa5\x88\0" /* offset 10939 */
-  "\xe6\x87\xb6\0" /* offset 10943 */
-  "\xe7\x99\xa9\0" /* offset 10947 */
-  "\xe7\xbe\x85\0" /* offset 10951 */
-  "\xe8\x98\xbf\0" /* offset 10955 */
-  "\xe8\x9e\xba\0" /* offset 10959 */
-  "\xe8\xa3\xb8\0" /* offset 10963 */
-  "\xe9\x82\x8f\0" /* offset 10967 */
-  "\xe6\xa8\x82\0" /* offset 10971 */
-  "\xe6\xb4\x9b\0" /* offset 10975 */
-  "\xe7\x83\x99\0" /* offset 10979 */
-  "\xe7\x8f\x9e\0" /* offset 10983 */
-  "\xe8\x90\xbd\0" /* offset 10987 */
-  "\xe9\x85\xaa\0" /* offset 10991 */
-  "\xe9\xa7\xb1\0" /* offset 10995 */
-  "\xe4\xba\x82\0" /* offset 10999 */
-  "\xe5\x8d\xb5\0" /* offset 11003 */
-  "\xe6\xac\x84\0" /* offset 11007 */
-  "\xe7\x88\x9b\0" /* offset 11011 */
-  "\xe8\x98\xad\0" /* offset 11015 */
-  "\xe9\xb8\x9e\0" /* offset 11019 */
-  "\xe5\xb5\x90\0" /* offset 11023 */
-  "\xe6\xbf\xab\0" /* offset 11027 */
-  "\xe8\x97\x8d\0" /* offset 11031 */
-  "\xe8\xa5\xa4\0" /* offset 11035 */
-  "\xe6\x8b\x89\0" /* offset 11039 */
-  "\xe8\x87\x98\0" /* offset 11043 */
-  "\xe8\xa0\x9f\0" /* offset 11047 */
-  "\xe5\xbb\x8a\0" /* offset 11051 */
-  "\xe6\x9c\x97\0" /* offset 11055 */
-  "\xe6\xb5\xaa\0" /* offset 11059 */
-  "\xe7\x8b\xbc\0" /* offset 11063 */
-  "\xe9\x83\x8e\0" /* offset 11067 */
-  "\xe4\xbe\x86\0" /* offset 11071 */
-  "\xe5\x86\xb7\0" /* offset 11075 */
-  "\xe5\x8b\x9e\0" /* offset 11079 */
-  "\xe6\x93\x84\0" /* offset 11083 */
-  "\xe6\xab\x93\0" /* offset 11087 */
-  "\xe7\x88\x90\0" /* offset 11091 */
-  "\xe7\x9b\xa7\0" /* offset 11095 */
-  "\xe8\x98\x86\0" /* offset 11099 */
-  "\xe8\x99\x9c\0" /* offset 11103 */
-  "\xe8\xb7\xaf\0" /* offset 11107 */
-  "\xe9\x9c\xb2\0" /* offset 11111 */
-  "\xe9\xad\xaf\0" /* offset 11115 */
-  "\xe9\xb7\xba\0" /* offset 11119 */
-  "\xe7\xa2\x8c\0" /* offset 11123 */
-  "\xe7\xa5\xbf\0" /* offset 11127 */
-  "\xe7\xb6\xa0\0" /* offset 11131 */
-  "\xe8\x8f\x89\0" /* offset 11135 */
-  "\xe9\x8c\x84\0" /* offset 11139 */
-  "\xe8\xab\x96\0" /* offset 11143 */
-  "\xe5\xa3\x9f\0" /* offset 11147 */
-  "\xe5\xbc\x84\0" /* offset 11151 */
-  "\xe7\xb1\xa0\0" /* offset 11155 */
-  "\xe8\x81\xbe\0" /* offset 11159 */
-  "\xe7\x89\xa2\0" /* offset 11163 */
-  "\xe7\xa3\x8a\0" /* offset 11167 */
-  "\xe8\xb3\x82\0" /* offset 11171 */
-  "\xe9\x9b\xb7\0" /* offset 11175 */
-  "\xe5\xa3\x98\0" /* offset 11179 */
-  "\xe5\xb1\xa2\0" /* offset 11183 */
-  "\xe6\xa8\x93\0" /* offset 11187 */
-  "\xe6\xb7\x9a\0" /* offset 11191 */
-  "\xe6\xbc\x8f\0" /* offset 11195 */
-  "\xe7\xb4\xaf\0" /* offset 11199 */
-  "\xe7\xb8\xb7\0" /* offset 11203 */
-  "\xe9\x99\x8b\0" /* offset 11207 */
-  "\xe5\x8b\x92\0" /* offset 11211 */
-  "\xe8\x82\x8b\0" /* offset 11215 */
-  "\xe5\x87\x9c\0" /* offset 11219 */
-  "\xe5\x87\x8c\0" /* offset 11223 */
-  "\xe7\xa8\x9c\0" /* offset 11227 */
-  "\xe7\xb6\xbe\0" /* offset 11231 */
-  "\xe8\x8f\xb1\0" /* offset 11235 */
-  "\xe9\x99\xb5\0" /* offset 11239 */
-  "\xe8\xae\x80\0" /* offset 11243 */
-  "\xe6\x8b\x8f\0" /* offset 11247 */
-  "\xe8\xab\xbe\0" /* offset 11251 */
-  "\xe4\xb8\xb9\0" /* offset 11255 */
-  "\xe5\xaf\xa7\0" /* offset 11259 */
-  "\xe6\x80\x92\0" /* offset 11263 */
-  "\xe7\x8e\x87\0" /* offset 11267 */
-  "\xe7\x95\xb0\0" /* offset 11271 */
-  "\xe5\x8c\x97\0" /* offset 11275 */
-  "\xe7\xa3\xbb\0" /* offset 11279 */
-  "\xe4\xbe\xbf\0" /* offset 11283 */
-  "\xe5\xbe\xa9\0" /* offset 11287 */
-  "\xe4\xb8\x8d\0" /* offset 11291 */
-  "\xe6\xb3\x8c\0" /* offset 11295 */
-  "\xe6\x95\xb8\0" /* offset 11299 */
-  "\xe7\xb4\xa2\0" /* offset 11303 */
-  "\xe5\x8f\x83\0" /* offset 11307 */
-  "\xe5\xa1\x9e\0" /* offset 11311 */
-  "\xe7\x9c\x81\0" /* offset 11315 */
-  "\xe8\x91\x89\0" /* offset 11319 */
-  "\xe8\xaa\xaa\0" /* offset 11323 */
-  "\xe6\xae\xba\0" /* offset 11327 */
-  "\xe6\xb2\x88\0" /* offset 11331 */
-  "\xe6\x8b\xbe\0" /* offset 11335 */
-  "\xe8\x8b\xa5\0" /* offset 11339 */
-  "\xe6\x8e\xa0\0" /* offset 11343 */
-  "\xe7\x95\xa5\0" /* offset 11347 */
-  "\xe4\xba\xae\0" /* offset 11351 */
-  "\xe5\x85\xa9\0" /* offset 11355 */
-  "\xe5\x87\x89\0" /* offset 11359 */
-  "\xe6\xa2\x81\0" /* offset 11363 */
-  "\xe7\xb3\xa7\0" /* offset 11367 */
-  "\xe8\x89\xaf\0" /* offset 11371 */
-  "\xe8\xab\x92\0" /* offset 11375 */
-  "\xe9\x87\x8f\0" /* offset 11379 */
-  "\xe5\x8b\xb5\0" /* offset 11383 */
-  "\xe5\x91\x82\0" /* offset 11387 */
-  "\xe5\xbb\xac\0" /* offset 11391 */
-  "\xe6\x97\x85\0" /* offset 11395 */
-  "\xe6\xbf\xbe\0" /* offset 11399 */
-  "\xe7\xa4\xaa\0" /* offset 11403 */
-  "\xe9\x96\xad\0" /* offset 11407 */
-  "\xe9\xa9\xaa\0" /* offset 11411 */
-  "\xe9\xba\x97\0" /* offset 11415 */
-  "\xe9\xbb\x8e\0" /* offset 11419 */
-  "\xe6\x9b\x86\0" /* offset 11423 */
-  "\xe6\xad\xb7\0" /* offset 11427 */
-  "\xe8\xbd\xa2\0" /* offset 11431 */
-  "\xe5\xb9\xb4\0" /* offset 11435 */
-  "\xe6\x86\x90\0" /* offset 11439 */
-  "\xe6\x88\x80\0" /* offset 11443 */
-  "\xe6\x92\x9a\0" /* offset 11447 */
-  "\xe6\xbc\xa3\0" /* offset 11451 */
-  "\xe7\x85\x89\0" /* offset 11455 */
-  "\xe7\x92\x89\0" /* offset 11459 */
-  "\xe7\xa7\x8a\0" /* offset 11463 */
-  "\xe7\xb7\xb4\0" /* offset 11467 */
-  "\xe8\x81\xaf\0" /* offset 11471 */
-  "\xe8\xbc\xa6\0" /* offset 11475 */
-  "\xe8\x93\xae\0" /* offset 11479 */
-  "\xe9\x80\xa3\0" /* offset 11483 */
-  "\xe9\x8d\x8a\0" /* offset 11487 */
-  "\xe5\x88\x97\0" /* offset 11491 */
-  "\xe5\x8a\xa3\0" /* offset 11495 */
-  "\xe5\x92\xbd\0" /* offset 11499 */
-  "\xe7\x83\x88\0" /* offset 11503 */
-  "\xe8\xa3\x82\0" /* offset 11507 */
-  "\xe5\xbb\x89\0" /* offset 11511 */
-  "\xe5\xbf\xb5\0" /* offset 11515 */
-  "\xe6\x8d\xbb\0" /* offset 11519 */
-  "\xe6\xae\xae\0" /* offset 11523 */
-  "\xe7\xb0\xbe\0" /* offset 11527 */
-  "\xe7\x8d\xb5\0" /* offset 11531 */
-  "\xe4\xbb\xa4\0" /* offset 11535 */
-  "\xe5\x9b\xb9\0" /* offset 11539 */
-  "\xe5\xb6\xba\0" /* offset 11543 */
-  "\xe6\x80\x9c\0" /* offset 11547 */
-  "\xe7\x8e\xb2\0" /* offset 11551 */
-  "\xe7\x91\xa9\0" /* offset 11555 */
-  "\xe7\xbe\x9a\0" /* offset 11559 */
-  "\xe8\x81\x86\0" /* offset 11563 */
-  "\xe9\x88\xb4\0" /* offset 11567 */
-  "\xe9\x9b\xb6\0" /* offset 11571 */
-  "\xe9\x9d\x88\0" /* offset 11575 */
-  "\xe9\xa0\x98\0" /* offset 11579 */
-  "\xe4\xbe\x8b\0" /* offset 11583 */
-  "\xe7\xa6\xae\0" /* offset 11587 */
-  "\xe9\x86\xb4\0" /* offset 11591 */
-  "\xe9\x9a\xb8\0" /* offset 11595 */
-  "\xe6\x83\xa1\0" /* offset 11599 */
-  "\xe4\xba\x86\0" /* offset 11603 */
-  "\xe5\x83\x9a\0" /* offset 11607 */
-  "\xe5\xaf\xae\0" /* offset 11611 */
-  "\xe5\xb0\xbf\0" /* offset 11615 */
-  "\xe6\x96\x99\0" /* offset 11619 */
-  "\xe7\x87\x8e\0" /* offset 11623 */
-  "\xe7\x99\x82\0" /* offset 11627 */
-  "\xe8\x93\xbc\0" /* offset 11631 */
-  "\xe9\x81\xbc\0" /* offset 11635 */
-  "\xe6\x9a\x88\0" /* offset 11639 */
-  "\xe9\x98\xae\0" /* offset 11643 */
-  "\xe5\x8a\x89\0" /* offset 11647 */
-  "\xe6\x9d\xbb\0" /* offset 11651 */
-  "\xe6\x9f\xb3\0" /* offset 11655 */
-  "\xe6\xb5\x81\0" /* offset 11659 */
-  "\xe6\xba\x9c\0" /* offset 11663 */
-  "\xe7\x90\x89\0" /* offset 11667 */
-  "\xe7\x95\x99\0" /* offset 11671 */
-  "\xe7\xa1\xab\0" /* offset 11675 */
-  "\xe7\xb4\x90\0" /* offset 11679 */
-  "\xe9\xa1\x9e\0" /* offset 11683 */
-  "\xe6\x88\xae\0" /* offset 11687 */
-  "\xe9\x99\xb8\0" /* offset 11691 */
-  "\xe5\x80\xab\0" /* offset 11695 */
-  "\xe5\xb4\x99\0" /* offset 11699 */
-  "\xe6\xb7\xaa\0" /* offset 11703 */
-  "\xe8\xbc\xaa\0" /* offset 11707 */
-  "\xe5\xbe\x8b\0" /* offset 11711 */
-  "\xe6\x85\x84\0" /* offset 11715 */
-  "\xe6\xa0\x97\0" /* offset 11719 */
-  "\xe9\x9a\x86\0" /* offset 11723 */
-  "\xe5\x88\xa9\0" /* offset 11727 */
-  "\xe5\x90\x8f\0" /* offset 11731 */
-  "\xe5\xb1\xa5\0" /* offset 11735 */
-  "\xe6\x98\x93\0" /* offset 11739 */
-  "\xe6\x9d\x8e\0" /* offset 11743 */
-  "\xe6\xa2\xa8\0" /* offset 11747 */
-  "\xe6\xb3\xa5\0" /* offset 11751 */
-  "\xe7\x90\x86\0" /* offset 11755 */
-  "\xe7\x97\xa2\0" /* offset 11759 */
-  "\xe7\xbd\xb9\0" /* offset 11763 */
-  "\xe8\xa3\x8f\0" /* offset 11767 */
-  "\xe8\xa3\xa1\0" /* offset 11771 */
-  "\xe9\x9b\xa2\0" /* offset 11775 */
-  "\xe5\x8c\xbf\0" /* offset 11779 */
-  "\xe6\xba\xba\0" /* offset 11783 */
-  "\xe5\x90\x9d\0" /* offset 11787 */
-  "\xe7\x87\x90\0" /* offset 11791 */
-  "\xe7\x92\x98\0" /* offset 11795 */
-  "\xe8\x97\xba\0" /* offset 11799 */
-  "\xe9\x9a\xa3\0" /* offset 11803 */
-  "\xe9\xb1\x97\0" /* offset 11807 */
-  "\xe9\xba\x9f\0" /* offset 11811 */
-  "\xe6\x9e\x97\0" /* offset 11815 */
-  "\xe6\xb7\x8b\0" /* offset 11819 */
-  "\xe8\x87\xa8\0" /* offset 11823 */
-  "\xe7\xac\xa0\0" /* offset 11827 */
-  "\xe7\xb2\x92\0" /* offset 11831 */
-  "\xe7\x8b\x80\0" /* offset 11835 */
-  "\xe7\x82\x99\0" /* offset 11839 */
-  "\xe8\xad\x98\0" /* offset 11843 */
-  "\xe4\xbb\x80\0" /* offset 11847 */
-  "\xe8\x8c\xb6\0" /* offset 11851 */
-  "\xe5\x88\xba\0" /* offset 11855 */
-  "\xe5\x88\x87\0" /* offset 11859 */
-  "\xe5\xba\xa6\0" /* offset 11863 */
-  "\xe6\x8b\x93\0" /* offset 11867 */
-  "\xe7\xb3\x96\0" /* offset 11871 */
-  "\xe5\xae\x85\0" /* offset 11875 */
-  "\xe6\xb4\x9e\0" /* offset 11879 */
-  "\xe6\x9a\xb4\0" /* offset 11883 */
-  "\xe8\xbc\xbb\0" /* offset 11887 */
-  "\xe9\x99\x8d\0" /* offset 11891 */
-  "\xe5\xbb\x93\0" /* offset 11895 */
-  "\xe5\x85\x80\0" /* offset 11899 */
-  "\xe5\x97\x80\0" /* offset 11903 */
-  "\xe5\xa1\x9a\0" /* offset 11907 */
-  "\xe6\x99\xb4\0" /* offset 11911 */
-  "\xe5\x87\x9e\0" /* offset 11915 */
-  "\xe7\x8c\xaa\0" /* offset 11919 */
-  "\xe7\x9b\x8a\0" /* offset 11923 */
-  "\xe7\xa4\xbc\0" /* offset 11927 */
-  "\xe7\xa5\x9e\0" /* offset 11931 */
-  "\xe7\xa5\xa5\0" /* offset 11935 */
-  "\xe7\xa6\x8f\0" /* offset 11939 */
-  "\xe9\x9d\x96\0" /* offset 11943 */
-  "\xe7\xb2\xbe\0" /* offset 11947 */
-  "\xe8\x98\x92\0" /* offset 11951 */
-  "\xe8\xab\xb8\0" /* offset 11955 */
-  "\xe9\x80\xb8\0" /* offset 11959 */
-  "\xe9\x83\xbd\0" /* offset 11963 */
-  "\xe9\xa3\xaf\0" /* offset 11967 */
-  "\xe9\xa3\xbc\0" /* offset 11971 */
-  "\xe9\xa4\xa8\0" /* offset 11975 */
-  "\xe9\xb6\xb4\0" /* offset 11979 */
-  "\xe9\x83\x9e\0" /* offset 11983 */
-  "\xe9\x9a\xb7\0" /* offset 11987 */
-  "\xe4\xbe\xae\0" /* offset 11991 */
-  "\xe5\x83\xa7\0" /* offset 11995 */
-  "\xe5\x85\x8d\0" /* offset 11999 */
-  "\xe5\x8b\x89\0" /* offset 12003 */
-  "\xe5\x8b\xa4\0" /* offset 12007 */
-  "\xe5\x8d\x91\0" /* offset 12011 */
-  "\xe5\x96\x9d\0" /* offset 12015 */
-  "\xe5\x98\x86\0" /* offset 12019 */
-  "\xe5\x99\xa8\0" /* offset 12023 */
-  "\xe5\xa1\x80\0" /* offset 12027 */
-  "\xe5\xa2\xa8\0" /* offset 12031 */
-  "\xe5\xb1\xa4\0" /* offset 12035 */
-  "\xe6\x82\x94\0" /* offset 12039 */
-  "\xe6\x85\xa8\0" /* offset 12043 */
-  "\xe6\x86\x8e\0" /* offset 12047 */
-  "\xe6\x87\xb2\0" /* offset 12051 */
-  "\xe6\x95\x8f\0" /* offset 12055 */
-  "\xe6\x97\xa2\0" /* offset 12059 */
-  "\xe6\x9a\x91\0" /* offset 12063 */
-  "\xe6\xa2\x85\0" /* offset 12067 */
-  "\xe6\xb5\xb7\0" /* offset 12071 */
-  "\xe6\xb8\x9a\0" /* offset 12075 */
-  "\xe6\xbc\xa2\0" /* offset 12079 */
-  "\xe7\x85\xae\0" /* offset 12083 */
-  "\xe7\x88\xab\0" /* offset 12087 */
-  "\xe7\x90\xa2\0" /* offset 12091 */
-  "\xe7\xa2\x91\0" /* offset 12095 */
-  "\xe7\xa5\x89\0" /* offset 12099 */
-  "\xe7\xa5\x88\0" /* offset 12103 */
-  "\xe7\xa5\x90\0" /* offset 12107 */
-  "\xe7\xa5\x96\0" /* offset 12111 */
-  "\xe7\xa6\x8d\0" /* offset 12115 */
-  "\xe7\xa6\x8e\0" /* offset 12119 */
-  "\xe7\xa9\x80\0" /* offset 12123 */
-  "\xe7\xaa\x81\0" /* offset 12127 */
-  "\xe7\xaf\x80\0" /* offset 12131 */
-  "\xe7\xb8\x89\0" /* offset 12135 */
-  "\xe7\xb9\x81\0" /* offset 12139 */
-  "\xe7\xbd\xb2\0" /* offset 12143 */
-  "\xe8\x80\x85\0" /* offset 12147 */
-  "\xe8\x87\xad\0" /* offset 12151 */
-  "\xe8\x89\xb9\0" /* offset 12155 */
-  "\xe8\x91\x97\0" /* offset 12159 */
-  "\xe8\xa4\x90\0" /* offset 12163 */
-  "\xe8\xa6\x96\0" /* offset 12167 */
-  "\xe8\xac\x81\0" /* offset 12171 */
-  "\xe8\xac\xb9\0" /* offset 12175 */
-  "\xe8\xb3\x93\0" /* offset 12179 */
-  "\xe8\xb4\x88\0" /* offset 12183 */
-  "\xe8\xbe\xb6\0" /* offset 12187 */
-  "\xe9\x9b\xa3\0" /* offset 12191 */
-  "\xe9\x9f\xbf\0" /* offset 12195 */
-  "\xe9\xa0\xbb\0" /* offset 12199 */
-  "\xe6\x81\xb5\0" /* offset 12203 */
-  "\xf0\xa4\x8b\xae\0" /* offset 12207 */
-  "\xe8\x88\x98\0" /* offset 12212 */
-  "\xe4\xb8\xa6\0" /* offset 12216 */
-  "\xe5\x86\xb5\0" /* offset 12220 */
-  "\xe5\x85\xa8\0" /* offset 12224 */
-  "\xe4\xbe\x80\0" /* offset 12228 */
-  "\xe5\x85\x85\0" /* offset 12232 */
-  "\xe5\x86\x80\0" /* offset 12236 */
-  "\xe5\x8b\x87\0" /* offset 12240 */
-  "\xe5\x8b\xba\0" /* offset 12244 */
-  "\xe5\x95\x95\0" /* offset 12248 */
-  "\xe5\x96\x99\0" /* offset 12252 */
-  "\xe5\x97\xa2\0" /* offset 12256 */
-  "\xe5\xa2\xb3\0" /* offset 12260 */
-  "\xe5\xa5\x84\0" /* offset 12264 */
-  "\xe5\xa5\x94\0" /* offset 12268 */
-  "\xe5\xa9\xa2\0" /* offset 12272 */
-  "\xe5\xac\xa8\0" /* offset 12276 */
-  "\xe5\xbb\x92\0" /* offset 12280 */
-  "\xe5\xbb\x99\0" /* offset 12284 */
-  "\xe5\xbd\xa9\0" /* offset 12288 */
-  "\xe5\xbe\xad\0" /* offset 12292 */
-  "\xe6\x83\x98\0" /* offset 12296 */
-  "\xe6\x85\x8e\0" /* offset 12300 */
-  "\xe6\x84\x88\0" /* offset 12304 */
-  "\xe6\x85\xa0\0" /* offset 12308 */
-  "\xe6\x88\xb4\0" /* offset 12312 */
-  "\xe6\x8f\x84\0" /* offset 12316 */
-  "\xe6\x90\x9c\0" /* offset 12320 */
-  "\xe6\x91\x92\0" /* offset 12324 */
-  "\xe6\x95\x96\0" /* offset 12328 */
-  "\xe6\x9c\x9b\0" /* offset 12332 */
-  "\xe6\x9d\x96\0" /* offset 12336 */
-  "\xe6\xbb\x9b\0" /* offset 12340 */
-  "\xe6\xbb\x8b\0" /* offset 12344 */
-  "\xe7\x80\x9e\0" /* offset 12348 */
-  "\xe7\x9e\xa7\0" /* offset 12352 */
-  "\xe7\x88\xb5\0" /* offset 12356 */
-  "\xe7\x8a\xaf\0" /* offset 12360 */
-  "\xe7\x91\xb1\0" /* offset 12364 */
-  "\xe7\x94\x86\0" /* offset 12368 */
-  "\xe7\x94\xbb\0" /* offset 12372 */
-  "\xe7\x98\x9d\0" /* offset 12376 */
-  "\xe7\x98\x9f\0" /* offset 12380 */
-  "\xe7\x9b\x9b\0" /* offset 12384 */
-  "\xe7\x9b\xb4\0" /* offset 12388 */
-  "\xe7\x9d\x8a\0" /* offset 12392 */
-  "\xe7\x9d\x80\0" /* offset 12396 */
-  "\xe7\xa3\x8c\0" /* offset 12400 */
-  "\xe7\xaa\xb1\0" /* offset 12404 */
-  "\xe7\xb1\xbb\0" /* offset 12408 */
-  "\xe7\xb5\x9b\0" /* offset 12412 */
-  "\xe7\xbc\xbe\0" /* offset 12416 */
-  "\xe8\x8d\x92\0" /* offset 12420 */
-  "\xe8\x8f\xaf\0" /* offset 12424 */
-  "\xe8\x9d\xb9\0" /* offset 12428 */
-  "\xe8\xa5\x81\0" /* offset 12432 */
-  "\xe8\xa6\x86\0" /* offset 12436 */
-  "\xe8\xaa\xbf\0" /* offset 12440 */
-  "\xe8\xab\x8b\0" /* offset 12444 */
-  "\xe8\xab\xad\0" /* offset 12448 */
-  "\xe8\xae\x8a\0" /* offset 12452 */
-  "\xe8\xbc\xb8\0" /* offset 12456 */
-  "\xe9\x81\xb2\0" /* offset 12460 */
-  "\xe9\x86\x99\0" /* offset 12464 */
-  "\xe9\x89\xb6\0" /* offset 12468 */
-  "\xe9\x99\xbc\0" /* offset 12472 */
-  "\xe9\x9f\x9b\0" /* offset 12476 */
-  "\xe9\xa0\x8b\0" /* offset 12480 */
-  "\xe9\xac\x92\0" /* offset 12484 */
-  "\xf0\xa2\xa1\x8a\0" /* offset 12488 */
-  "\xf0\xa2\xa1\x84\0" /* offset 12493 */
-  "\xf0\xa3\x8f\x95\0" /* offset 12498 */
-  "\xe3\xae\x9d\0" /* offset 12503 */
-  "\xe4\x80\x98\0" /* offset 12507 */
-  "\xe4\x80\xb9\0" /* offset 12511 */
-  "\xf0\xa5\x89\x89\0" /* offset 12515 */
-  "\xf0\xa5\xb3\x90\0" /* offset 12520 */
-  "\xf0\xa7\xbb\x93\0" /* offset 12525 */
-  "\xe9\xbd\x83\0" /* offset 12530 */
-  "\xe9\xbe\x8e\0" /* offset 12534 */
-  "\x66\x66\0" /* offset 12538 */
-  "\x66\x69\0" /* offset 12541 */
-  "\x66\x6c\0" /* offset 12544 */
-  "\x66\x66\x69\0" /* offset 12547 */
-  "\x66\x66\x6c\0" /* offset 12551 */
-  "\x73\x74\0" /* offset 12555 */
-  "\xd5\xb4\xd5\xb6\0" /* offset 12558 */
-  "\xd5\xb4\xd5\xa5\0" /* offset 12563 */
-  "\xd5\xb4\xd5\xab\0" /* offset 12568 */
-  "\xd5\xbe\xd5\xb6\0" /* offset 12573 */
-  "\xd5\xb4\xd5\xad\0" /* offset 12578 */
-  "\xd7\x99\xd6\xb4\0" /* offset 12583 */
-  "\xd7\xb2\xd6\xb7\0" /* offset 12588 */
-  "\xd7\xa2\0" /* offset 12593 */
-  "\xd7\x94\0" /* offset 12596 */
-  "\xd7\x9b\0" /* offset 12599 */
-  "\xd7\x9c\0" /* offset 12602 */
-  "\xd7\x9d\0" /* offset 12605 */
-  "\xd7\xa8\0" /* offset 12608 */
-  "\xd7\xaa\0" /* offset 12611 */
-  "\xd7\xa9\xd7\x81\0" /* offset 12614 */
-  "\xd7\xa9\xd7\x82\0" /* offset 12619 */
-  "\xd7\xa9\xd6\xbc\xd7\x81\0" /* offset 12624 */
-  "\xd7\xa9\xd6\xbc\xd7\x82\0" /* offset 12631 */
-  "\xd7\x90\xd6\xb7\0" /* offset 12638 */
-  "\xd7\x90\xd6\xb8\0" /* offset 12643 */
-  "\xd7\x90\xd6\xbc\0" /* offset 12648 */
-  "\xd7\x91\xd6\xbc\0" /* offset 12653 */
-  "\xd7\x92\xd6\xbc\0" /* offset 12658 */
-  "\xd7\x93\xd6\xbc\0" /* offset 12663 */
-  "\xd7\x94\xd6\xbc\0" /* offset 12668 */
-  "\xd7\x95\xd6\xbc\0" /* offset 12673 */
-  "\xd7\x96\xd6\xbc\0" /* offset 12678 */
-  "\xd7\x98\xd6\xbc\0" /* offset 12683 */
-  "\xd7\x99\xd6\xbc\0" /* offset 12688 */
-  "\xd7\x9a\xd6\xbc\0" /* offset 12693 */
-  "\xd7\x9b\xd6\xbc\0" /* offset 12698 */
-  "\xd7\x9c\xd6\xbc\0" /* offset 12703 */
-  "\xd7\x9e\xd6\xbc\0" /* offset 12708 */
-  "\xd7\xa0\xd6\xbc\0" /* offset 12713 */
-  "\xd7\xa1\xd6\xbc\0" /* offset 12718 */
-  "\xd7\xa3\xd6\xbc\0" /* offset 12723 */
-  "\xd7\xa4\xd6\xbc\0" /* offset 12728 */
-  "\xd7\xa6\xd6\xbc\0" /* offset 12733 */
-  "\xd7\xa7\xd6\xbc\0" /* offset 12738 */
-  "\xd7\xa8\xd6\xbc\0" /* offset 12743 */
-  "\xd7\xa9\xd6\xbc\0" /* offset 12748 */
-  "\xd7\xaa\xd6\xbc\0" /* offset 12753 */
-  "\xd7\x95\xd6\xb9\0" /* offset 12758 */
-  "\xd7\x91\xd6\xbf\0" /* offset 12763 */
-  "\xd7\x9b\xd6\xbf\0" /* offset 12768 */
-  "\xd7\xa4\xd6\xbf\0" /* offset 12773 */
-  "\xd7\x90\xd7\x9c\0" /* offset 12778 */
-  "\xd9\xb1\0" /* offset 12783 */
-  "\xd9\xbb\0" /* offset 12786 */
-  "\xd9\xbe\0" /* offset 12789 */
-  "\xda\x80\0" /* offset 12792 */
-  "\xd9\xba\0" /* offset 12795 */
-  "\xd9\xbf\0" /* offset 12798 */
-  "\xd9\xb9\0" /* offset 12801 */
-  "\xda\xa4\0" /* offset 12804 */
-  "\xda\xa6\0" /* offset 12807 */
-  "\xda\x84\0" /* offset 12810 */
-  "\xda\x83\0" /* offset 12813 */
-  "\xda\x86\0" /* offset 12816 */
-  "\xda\x87\0" /* offset 12819 */
-  "\xda\x8d\0" /* offset 12822 */
-  "\xda\x8c\0" /* offset 12825 */
-  "\xda\x8e\0" /* offset 12828 */
-  "\xda\x88\0" /* offset 12831 */
-  "\xda\x98\0" /* offset 12834 */
-  "\xda\x91\0" /* offset 12837 */
-  "\xda\xa9\0" /* offset 12840 */
-  "\xda\xaf\0" /* offset 12843 */
-  "\xda\xb3\0" /* offset 12846 */
-  "\xda\xb1\0" /* offset 12849 */
-  "\xda\xba\0" /* offset 12852 */
-  "\xda\xbb\0" /* offset 12855 */
-  "\xdb\x81\0" /* offset 12858 */
-  "\xda\xbe\0" /* offset 12861 */
-  "\xdb\x92\0" /* offset 12864 */
-  "\xda\xad\0" /* offset 12867 */
-  "\xdb\x87\0" /* offset 12870 */
-  "\xdb\x86\0" /* offset 12873 */
-  "\xdb\x88\0" /* offset 12876 */
-  "\xdb\x8b\0" /* offset 12879 */
-  "\xdb\x85\0" /* offset 12882 */
-  "\xdb\x89\0" /* offset 12885 */
-  "\xdb\x90\0" /* offset 12888 */
-  "\xd9\x89\0" /* offset 12891 */
-  "\xd9\x8a\xd9\x94\xd8\xa7\0" /* offset 12894 */
-  "\xd9\x8a\xd9\x94\xdb\x95\0" /* offset 12901 */
-  "\xd9\x8a\xd9\x94\xd9\x88\0" /* offset 12908 */
-  "\xd9\x8a\xd9\x94\xdb\x87\0" /* offset 12915 */
-  "\xd9\x8a\xd9\x94\xdb\x86\0" /* offset 12922 */
-  "\xd9\x8a\xd9\x94\xdb\x88\0" /* offset 12929 */
-  "\xd9\x8a\xd9\x94\xdb\x90\0" /* offset 12936 */
-  "\xd9\x8a\xd9\x94\xd9\x89\0" /* offset 12943 */
-  "\xdb\x8c\0" /* offset 12950 */
-  "\xd9\x8a\xd9\x94\xd8\xac\0" /* offset 12953 */
-  "\xd9\x8a\xd9\x94\xd8\xad\0" /* offset 12960 */
-  "\xd9\x8a\xd9\x94\xd9\x85\0" /* offset 12967 */
-  "\xd9\x8a\xd9\x94\xd9\x8a\0" /* offset 12974 */
-  "\xd8\xa8\xd8\xac\0" /* offset 12981 */
-  "\xd8\xa8\xd8\xad\0" /* offset 12986 */
-  "\xd8\xa8\xd8\xae\0" /* offset 12991 */
-  "\xd8\xa8\xd9\x85\0" /* offset 12996 */
-  "\xd8\xa8\xd9\x89\0" /* offset 13001 */
-  "\xd8\xa8\xd9\x8a\0" /* offset 13006 */
-  "\xd8\xaa\xd8\xac\0" /* offset 13011 */
-  "\xd8\xaa\xd8\xad\0" /* offset 13016 */
-  "\xd8\xaa\xd8\xae\0" /* offset 13021 */
-  "\xd8\xaa\xd9\x85\0" /* offset 13026 */
-  "\xd8\xaa\xd9\x89\0" /* offset 13031 */
-  "\xd8\xaa\xd9\x8a\0" /* offset 13036 */
-  "\xd8\xab\xd8\xac\0" /* offset 13041 */
-  "\xd8\xab\xd9\x85\0" /* offset 13046 */
-  "\xd8\xab\xd9\x89\0" /* offset 13051 */
-  "\xd8\xab\xd9\x8a\0" /* offset 13056 */
-  "\xd8\xac\xd8\xad\0" /* offset 13061 */
-  "\xd8\xac\xd9\x85\0" /* offset 13066 */
-  "\xd8\xad\xd8\xac\0" /* offset 13071 */
-  "\xd8\xad\xd9\x85\0" /* offset 13076 */
-  "\xd8\xae\xd8\xac\0" /* offset 13081 */
-  "\xd8\xae\xd8\xad\0" /* offset 13086 */
-  "\xd8\xae\xd9\x85\0" /* offset 13091 */
-  "\xd8\xb3\xd8\xac\0" /* offset 13096 */
-  "\xd8\xb3\xd8\xad\0" /* offset 13101 */
-  "\xd8\xb3\xd8\xae\0" /* offset 13106 */
-  "\xd8\xb3\xd9\x85\0" /* offset 13111 */
-  "\xd8\xb5\xd8\xad\0" /* offset 13116 */
-  "\xd8\xb5\xd9\x85\0" /* offset 13121 */
-  "\xd8\xb6\xd8\xac\0" /* offset 13126 */
-  "\xd8\xb6\xd8\xad\0" /* offset 13131 */
-  "\xd8\xb6\xd8\xae\0" /* offset 13136 */
-  "\xd8\xb6\xd9\x85\0" /* offset 13141 */
-  "\xd8\xb7\xd8\xad\0" /* offset 13146 */
-  "\xd8\xb7\xd9\x85\0" /* offset 13151 */
-  "\xd8\xb8\xd9\x85\0" /* offset 13156 */
-  "\xd8\xb9\xd8\xac\0" /* offset 13161 */
-  "\xd8\xb9\xd9\x85\0" /* offset 13166 */
-  "\xd8\xba\xd8\xac\0" /* offset 13171 */
-  "\xd8\xba\xd9\x85\0" /* offset 13176 */
-  "\xd9\x81\xd8\xac\0" /* offset 13181 */
-  "\xd9\x81\xd8\xad\0" /* offset 13186 */
-  "\xd9\x81\xd8\xae\0" /* offset 13191 */
-  "\xd9\x81\xd9\x85\0" /* offset 13196 */
-  "\xd9\x81\xd9\x89\0" /* offset 13201 */
-  "\xd9\x81\xd9\x8a\0" /* offset 13206 */
-  "\xd9\x82\xd8\xad\0" /* offset 13211 */
-  "\xd9\x82\xd9\x85\0" /* offset 13216 */
-  "\xd9\x82\xd9\x89\0" /* offset 13221 */
-  "\xd9\x82\xd9\x8a\0" /* offset 13226 */
-  "\xd9\x83\xd8\xa7\0" /* offset 13231 */
-  "\xd9\x83\xd8\xac\0" /* offset 13236 */
-  "\xd9\x83\xd8\xad\0" /* offset 13241 */
-  "\xd9\x83\xd8\xae\0" /* offset 13246 */
-  "\xd9\x83\xd9\x84\0" /* offset 13251 */
-  "\xd9\x83\xd9\x85\0" /* offset 13256 */
-  "\xd9\x83\xd9\x89\0" /* offset 13261 */
-  "\xd9\x83\xd9\x8a\0" /* offset 13266 */
-  "\xd9\x84\xd8\xac\0" /* offset 13271 */
-  "\xd9\x84\xd8\xad\0" /* offset 13276 */
-  "\xd9\x84\xd8\xae\0" /* offset 13281 */
-  "\xd9\x84\xd9\x85\0" /* offset 13286 */
-  "\xd9\x84\xd9\x89\0" /* offset 13291 */
-  "\xd9\x84\xd9\x8a\0" /* offset 13296 */
-  "\xd9\x85\xd8\xac\0" /* offset 13301 */
-  "\xd9\x85\xd8\xad\0" /* offset 13306 */
-  "\xd9\x85\xd8\xae\0" /* offset 13311 */
-  "\xd9\x85\xd9\x85\0" /* offset 13316 */
-  "\xd9\x85\xd9\x89\0" /* offset 13321 */
-  "\xd9\x85\xd9\x8a\0" /* offset 13326 */
-  "\xd9\x86\xd8\xac\0" /* offset 13331 */
-  "\xd9\x86\xd8\xad\0" /* offset 13336 */
-  "\xd9\x86\xd8\xae\0" /* offset 13341 */
-  "\xd9\x86\xd9\x85\0" /* offset 13346 */
-  "\xd9\x86\xd9\x89\0" /* offset 13351 */
-  "\xd9\x86\xd9\x8a\0" /* offset 13356 */
-  "\xd9\x87\xd8\xac\0" /* offset 13361 */
-  "\xd9\x87\xd9\x85\0" /* offset 13366 */
-  "\xd9\x87\xd9\x89\0" /* offset 13371 */
-  "\xd9\x87\xd9\x8a\0" /* offset 13376 */
-  "\xd9\x8a\xd8\xac\0" /* offset 13381 */
-  "\xd9\x8a\xd8\xad\0" /* offset 13386 */
-  "\xd9\x8a\xd8\xae\0" /* offset 13391 */
-  "\xd9\x8a\xd9\x85\0" /* offset 13396 */
-  "\xd9\x8a\xd9\x89\0" /* offset 13401 */
-  "\xd9\x8a\xd9\x8a\0" /* offset 13406 */
-  "\xd8\xb0\xd9\xb0\0" /* offset 13411 */
-  "\xd8\xb1\xd9\xb0\0" /* offset 13416 */
-  "\xd9\x89\xd9\xb0\0" /* offset 13421 */
-  "\x20\xd9\x8c\xd9\x91\0" /* offset 13426 */
-  "\x20\xd9\x8d\xd9\x91\0" /* offset 13432 */
-  "\x20\xd9\x8e\xd9\x91\0" /* offset 13438 */
-  "\x20\xd9\x8f\xd9\x91\0" /* offset 13444 */
-  "\x20\xd9\x90\xd9\x91\0" /* offset 13450 */
-  "\x20\xd9\x91\xd9\xb0\0" /* offset 13456 */
-  "\xd9\x8a\xd9\x94\xd8\xb1\0" /* offset 13462 */
-  "\xd9\x8a\xd9\x94\xd8\xb2\0" /* offset 13469 */
-  "\xd9\x8a\xd9\x94\xd9\x86\0" /* offset 13476 */
-  "\xd8\xa8\xd8\xb1\0" /* offset 13483 */
-  "\xd8\xa8\xd8\xb2\0" /* offset 13488 */
-  "\xd8\xa8\xd9\x86\0" /* offset 13493 */
-  "\xd8\xaa\xd8\xb1\0" /* offset 13498 */
-  "\xd8\xaa\xd8\xb2\0" /* offset 13503 */
-  "\xd8\xaa\xd9\x86\0" /* offset 13508 */
-  "\xd8\xab\xd8\xb1\0" /* offset 13513 */
-  "\xd8\xab\xd8\xb2\0" /* offset 13518 */
-  "\xd8\xab\xd9\x86\0" /* offset 13523 */
-  "\xd9\x85\xd8\xa7\0" /* offset 13528 */
-  "\xd9\x86\xd8\xb1\0" /* offset 13533 */
-  "\xd9\x86\xd8\xb2\0" /* offset 13538 */
-  "\xd9\x86\xd9\x86\0" /* offset 13543 */
-  "\xd9\x8a\xd8\xb1\0" /* offset 13548 */
-  "\xd9\x8a\xd8\xb2\0" /* offset 13553 */
-  "\xd9\x8a\xd9\x86\0" /* offset 13558 */
-  "\xd9\x8a\xd9\x94\xd8\xae\0" /* offset 13563 */
-  "\xd9\x8a\xd9\x94\xd9\x87\0" /* offset 13570 */
-  "\xd8\xa8\xd9\x87\0" /* offset 13577 */
-  "\xd8\xaa\xd9\x87\0" /* offset 13582 */
-  "\xd8\xb5\xd8\xae\0" /* offset 13587 */
-  "\xd9\x84\xd9\x87\0" /* offset 13592 */
-  "\xd9\x86\xd9\x87\0" /* offset 13597 */
-  "\xd9\x87\xd9\xb0\0" /* offset 13602 */
-  "\xd9\x8a\xd9\x87\0" /* offset 13607 */
-  "\xd8\xab\xd9\x87\0" /* offset 13612 */
-  "\xd8\xb3\xd9\x87\0" /* offset 13617 */
-  "\xd8\xb4\xd9\x85\0" /* offset 13622 */
-  "\xd8\xb4\xd9\x87\0" /* offset 13627 */
-  "\xd9\x80\xd9\x8e\xd9\x91\0" /* offset 13632 */
-  "\xd9\x80\xd9\x8f\xd9\x91\0" /* offset 13639 */
-  "\xd9\x80\xd9\x90\xd9\x91\0" /* offset 13646 */
-  "\xd8\xb7\xd9\x89\0" /* offset 13653 */
-  "\xd8\xb7\xd9\x8a\0" /* offset 13658 */
-  "\xd8\xb9\xd9\x89\0" /* offset 13663 */
-  "\xd8\xb9\xd9\x8a\0" /* offset 13668 */
-  "\xd8\xba\xd9\x89\0" /* offset 13673 */
-  "\xd8\xba\xd9\x8a\0" /* offset 13678 */
-  "\xd8\xb3\xd9\x89\0" /* offset 13683 */
-  "\xd8\xb3\xd9\x8a\0" /* offset 13688 */
-  "\xd8\xb4\xd9\x89\0" /* offset 13693 */
-  "\xd8\xb4\xd9\x8a\0" /* offset 13698 */
-  "\xd8\xad\xd9\x89\0" /* offset 13703 */
-  "\xd8\xad\xd9\x8a\0" /* offset 13708 */
-  "\xd8\xac\xd9\x89\0" /* offset 13713 */
-  "\xd8\xac\xd9\x8a\0" /* offset 13718 */
-  "\xd8\xae\xd9\x89\0" /* offset 13723 */
-  "\xd8\xae\xd9\x8a\0" /* offset 13728 */
-  "\xd8\xb5\xd9\x89\0" /* offset 13733 */
-  "\xd8\xb5\xd9\x8a\0" /* offset 13738 */
-  "\xd8\xb6\xd9\x89\0" /* offset 13743 */
-  "\xd8\xb6\xd9\x8a\0" /* offset 13748 */
-  "\xd8\xb4\xd8\xac\0" /* offset 13753 */
-  "\xd8\xb4\xd8\xad\0" /* offset 13758 */
-  "\xd8\xb4\xd8\xae\0" /* offset 13763 */
-  "\xd8\xb4\xd8\xb1\0" /* offset 13768 */
-  "\xd8\xb3\xd8\xb1\0" /* offset 13773 */
-  "\xd8\xb5\xd8\xb1\0" /* offset 13778 */
-  "\xd8\xb6\xd8\xb1\0" /* offset 13783 */
-  "\xd8\xa7\xd9\x8b\0" /* offset 13788 */
-  "\xd8\xaa\xd8\xac\xd9\x85\0" /* offset 13793 */
-  "\xd8\xaa\xd8\xad\xd8\xac\0" /* offset 13800 */
-  "\xd8\xaa\xd8\xad\xd9\x85\0" /* offset 13807 */
-  "\xd8\xaa\xd8\xae\xd9\x85\0" /* offset 13814 */
-  "\xd8\xaa\xd9\x85\xd8\xac\0" /* offset 13821 */
-  "\xd8\xaa\xd9\x85\xd8\xad\0" /* offset 13828 */
-  "\xd8\xaa\xd9\x85\xd8\xae\0" /* offset 13835 */
-  "\xd8\xac\xd9\x85\xd8\xad\0" /* offset 13842 */
-  "\xd8\xad\xd9\x85\xd9\x8a\0" /* offset 13849 */
-  "\xd8\xad\xd9\x85\xd9\x89\0" /* offset 13856 */
-  "\xd8\xb3\xd8\xad\xd8\xac\0" /* offset 13863 */
-  "\xd8\xb3\xd8\xac\xd8\xad\0" /* offset 13870 */
-  "\xd8\xb3\xd8\xac\xd9\x89\0" /* offset 13877 */
-  "\xd8\xb3\xd9\x85\xd8\xad\0" /* offset 13884 */
-  "\xd8\xb3\xd9\x85\xd8\xac\0" /* offset 13891 */
-  "\xd8\xb3\xd9\x85\xd9\x85\0" /* offset 13898 */
-  "\xd8\xb5\xd8\xad\xd8\xad\0" /* offset 13905 */
-  "\xd8\xb5\xd9\x85\xd9\x85\0" /* offset 13912 */
-  "\xd8\xb4\xd8\xad\xd9\x85\0" /* offset 13919 */
-  "\xd8\xb4\xd8\xac\xd9\x8a\0" /* offset 13926 */
-  "\xd8\xb4\xd9\x85\xd8\xae\0" /* offset 13933 */
-  "\xd8\xb4\xd9\x85\xd9\x85\0" /* offset 13940 */
-  "\xd8\xb6\xd8\xad\xd9\x89\0" /* offset 13947 */
-  "\xd8\xb6\xd8\xae\xd9\x85\0" /* offset 13954 */
-  "\xd8\xb7\xd9\x85\xd8\xad\0" /* offset 13961 */
-  "\xd8\xb7\xd9\x85\xd9\x85\0" /* offset 13968 */
-  "\xd8\xb7\xd9\x85\xd9\x8a\0" /* offset 13975 */
-  "\xd8\xb9\xd8\xac\xd9\x85\0" /* offset 13982 */
-  "\xd8\xb9\xd9\x85\xd9\x85\0" /* offset 13989 */
-  "\xd8\xb9\xd9\x85\xd9\x89\0" /* offset 13996 */
-  "\xd8\xba\xd9\x85\xd9\x85\0" /* offset 14003 */
-  "\xd8\xba\xd9\x85\xd9\x8a\0" /* offset 14010 */
-  "\xd8\xba\xd9\x85\xd9\x89\0" /* offset 14017 */
-  "\xd9\x81\xd8\xae\xd9\x85\0" /* offset 14024 */
-  "\xd9\x82\xd9\x85\xd8\xad\0" /* offset 14031 */
-  "\xd9\x82\xd9\x85\xd9\x85\0" /* offset 14038 */
-  "\xd9\x84\xd8\xad\xd9\x85\0" /* offset 14045 */
-  "\xd9\x84\xd8\xad\xd9\x8a\0" /* offset 14052 */
-  "\xd9\x84\xd8\xad\xd9\x89\0" /* offset 14059 */
-  "\xd9\x84\xd8\xac\xd8\xac\0" /* offset 14066 */
-  "\xd9\x84\xd8\xae\xd9\x85\0" /* offset 14073 */
-  "\xd9\x84\xd9\x85\xd8\xad\0" /* offset 14080 */
-  "\xd9\x85\xd8\xad\xd8\xac\0" /* offset 14087 */
-  "\xd9\x85\xd8\xad\xd9\x85\0" /* offset 14094 */
-  "\xd9\x85\xd8\xad\xd9\x8a\0" /* offset 14101 */
-  "\xd9\x85\xd8\xac\xd8\xad\0" /* offset 14108 */
-  "\xd9\x85\xd8\xac\xd9\x85\0" /* offset 14115 */
-  "\xd9\x85\xd8\xae\xd8\xac\0" /* offset 14122 */
-  "\xd9\x85\xd8\xae\xd9\x85\0" /* offset 14129 */
-  "\xd9\x85\xd8\xac\xd8\xae\0" /* offset 14136 */
-  "\xd9\x87\xd9\x85\xd8\xac\0" /* offset 14143 */
-  "\xd9\x87\xd9\x85\xd9\x85\0" /* offset 14150 */
-  "\xd9\x86\xd8\xad\xd9\x85\0" /* offset 14157 */
-  "\xd9\x86\xd8\xad\xd9\x89\0" /* offset 14164 */
-  "\xd9\x86\xd8\xac\xd9\x85\0" /* offset 14171 */
-  "\xd9\x86\xd8\xac\xd9\x89\0" /* offset 14178 */
-  "\xd9\x86\xd9\x85\xd9\x8a\0" /* offset 14185 */
-  "\xd9\x86\xd9\x85\xd9\x89\0" /* offset 14192 */
-  "\xd9\x8a\xd9\x85\xd9\x85\0" /* offset 14199 */
-  "\xd8\xa8\xd8\xae\xd9\x8a\0" /* offset 14206 */
-  "\xd8\xaa\xd8\xac\xd9\x8a\0" /* offset 14213 */
-  "\xd8\xaa\xd8\xac\xd9\x89\0" /* offset 14220 */
-  "\xd8\xaa\xd8\xae\xd9\x8a\0" /* offset 14227 */
-  "\xd8\xaa\xd8\xae\xd9\x89\0" /* offset 14234 */
-  "\xd8\xaa\xd9\x85\xd9\x8a\0" /* offset 14241 */
-  "\xd8\xaa\xd9\x85\xd9\x89\0" /* offset 14248 */
-  "\xd8\xac\xd9\x85\xd9\x8a\0" /* offset 14255 */
-  "\xd8\xac\xd8\xad\xd9\x89\0" /* offset 14262 */
-  "\xd8\xac\xd9\x85\xd9\x89\0" /* offset 14269 */
-  "\xd8\xb3\xd8\xae\xd9\x89\0" /* offset 14276 */
-  "\xd8\xb5\xd8\xad\xd9\x8a\0" /* offset 14283 */
-  "\xd8\xb4\xd8\xad\xd9\x8a\0" /* offset 14290 */
-  "\xd8\xb6\xd8\xad\xd9\x8a\0" /* offset 14297 */
-  "\xd9\x84\xd8\xac\xd9\x8a\0" /* offset 14304 */
-  "\xd9\x84\xd9\x85\xd9\x8a\0" /* offset 14311 */
-  "\xd9\x8a\xd8\xad\xd9\x8a\0" /* offset 14318 */
-  "\xd9\x8a\xd8\xac\xd9\x8a\0" /* offset 14325 */
-  "\xd9\x8a\xd9\x85\xd9\x8a\0" /* offset 14332 */
-  "\xd9\x85\xd9\x85\xd9\x8a\0" /* offset 14339 */
-  "\xd9\x82\xd9\x85\xd9\x8a\0" /* offset 14346 */
-  "\xd9\x86\xd8\xad\xd9\x8a\0" /* offset 14353 */
-  "\xd8\xb9\xd9\x85\xd9\x8a\0" /* offset 14360 */
-  "\xd9\x83\xd9\x85\xd9\x8a\0" /* offset 14367 */
-  "\xd9\x86\xd8\xac\xd8\xad\0" /* offset 14374 */
-  "\xd9\x85\xd8\xae\xd9\x8a\0" /* offset 14381 */
-  "\xd9\x84\xd8\xac\xd9\x85\0" /* offset 14388 */
-  "\xd9\x83\xd9\x85\xd9\x85\0" /* offset 14395 */
-  "\xd8\xac\xd8\xad\xd9\x8a\0" /* offset 14402 */
-  "\xd8\xad\xd8\xac\xd9\x8a\0" /* offset 14409 */
-  "\xd9\x85\xd8\xac\xd9\x8a\0" /* offset 14416 */
-  "\xd9\x81\xd9\x85\xd9\x8a\0" /* offset 14423 */
-  "\xd8\xa8\xd8\xad\xd9\x8a\0" /* offset 14430 */
-  "\xd8\xb3\xd8\xae\xd9\x8a\0" /* offset 14437 */
-  "\xd9\x86\xd8\xac\xd9\x8a\0" /* offset 14444 */
-  "\xd8\xb5\xd9\x84\xdb\x92\0" /* offset 14451 */
-  "\xd9\x82\xd9\x84\xdb\x92\0" /* offset 14458 */
-  "\xd8\xa7\xd9\x84\xd9\x84\xd9\x87\0" /* offset 14465 */
-  "\xd8\xa7\xd9\x83\xd8\xa8\xd8\xb1\0" /* offset 14474 */
-  "\xd9\x85\xd8\xad\xd9\x85\xd8\xaf\0" /* offset 14483 */
-  "\xd8\xb5\xd9\x84\xd8\xb9\xd9\x85\0" /* offset 14492 */
-  "\xd8\xb1\xd8\xb3\xd9\x88\xd9\x84\0" /* offset 14501 */
-  "\xd8\xb9\xd9\x84\xd9\x8a\xd9\x87\0" /* offset 14510 */
-  "\xd9\x88\xd8\xb3\xd9\x84\xd9\x85\0" /* offset 14519 */
-  "\xd8\xb5\xd9\x84\xd9\x89\0" /* offset 14528 */
-  "\xd8\xb5\xd9\x84\xd9\x89\x20\xd8\xa7\xd9\x84\xd9\x84\xd9\x87\x20\xd8\xb9\xd9\x84\xd9\x8a\xd9\x87\x20\xd9\x88\xd8\xb3\xd9\x84\xd9\x85\0" /* offset 14535 */
-  "\xd8\xac\xd9\x84\x20\xd8\xac\xd9\x84\xd8\xa7\xd9\x84\xd9\x87\0" /* offset 14569 */
-  "\xd8\xb1\xdb\x8c\xd8\xa7\xd9\x84\0" /* offset 14585 */
-  "\x2c\0" /* offset 14594 */
-  "\xe3\x80\x81\0" /* offset 14596 */
-  "\xe3\x80\x82\0" /* offset 14600 */
-  "\x3a\0" /* offset 14604 */
-  "\x21\0" /* offset 14606 */
-  "\x3f\0" /* offset 14608 */
-  "\xe3\x80\x96\0" /* offset 14610 */
-  "\xe3\x80\x97\0" /* offset 14614 */
-  "\xe2\x80\x94\0" /* offset 14618 */
-  "\xe2\x80\x93\0" /* offset 14622 */
-  "\x5f\0" /* offset 14626 */
-  "\x7b\0" /* offset 14628 */
-  "\x7d\0" /* offset 14630 */
-  "\xe3\x80\x94\0" /* offset 14632 */
-  "\xe3\x80\x95\0" /* offset 14636 */
-  "\xe3\x80\x90\0" /* offset 14640 */
-  "\xe3\x80\x91\0" /* offset 14644 */
-  "\xe3\x80\x8a\0" /* offset 14648 */
-  "\xe3\x80\x8b\0" /* offset 14652 */
-  "\xe3\x80\x8c\0" /* offset 14656 */
-  "\xe3\x80\x8d\0" /* offset 14660 */
-  "\xe3\x80\x8e\0" /* offset 14664 */
-  "\xe3\x80\x8f\0" /* offset 14668 */
-  "\x5b\0" /* offset 14672 */
-  "\x5d\0" /* offset 14674 */
-  "\x23\0" /* offset 14676 */
-  "\x26\0" /* offset 14678 */
-  "\x2a\0" /* offset 14680 */
-  "\x2d\0" /* offset 14682 */
-  "\x3c\0" /* offset 14684 */
-  "\x3e\0" /* offset 14686 */
-  "\x5c\0" /* offset 14688 */
-  "\x24\0" /* offset 14690 */
-  "\x25\0" /* offset 14692 */
-  "\x40\0" /* offset 14694 */
-  "\x20\xd9\x8b\0" /* offset 14696 */
-  "\xd9\x80\xd9\x8b\0" /* offset 14700 */
-  "\x20\xd9\x8c\0" /* offset 14705 */
-  "\x20\xd9\x8d\0" /* offset 14709 */
-  "\x20\xd9\x8e\0" /* offset 14713 */
-  "\xd9\x80\xd9\x8e\0" /* offset 14717 */
-  "\x20\xd9\x8f\0" /* offset 14722 */
-  "\xd9\x80\xd9\x8f\0" /* offset 14726 */
-  "\x20\xd9\x90\0" /* offset 14731 */
-  "\xd9\x80\xd9\x90\0" /* offset 14735 */
-  "\x20\xd9\x91\0" /* offset 14740 */
-  "\xd9\x80\xd9\x91\0" /* offset 14744 */
-  "\x20\xd9\x92\0" /* offset 14749 */
-  "\xd9\x80\xd9\x92\0" /* offset 14753 */
-  "\xd8\xa1\0" /* offset 14758 */
-  "\xd8\xa7\0" /* offset 14761 */
-  "\xd8\xa8\0" /* offset 14764 */
-  "\xd8\xa9\0" /* offset 14767 */
-  "\xd8\xaa\0" /* offset 14770 */
-  "\xd8\xab\0" /* offset 14773 */
-  "\xd8\xac\0" /* offset 14776 */
-  "\xd8\xad\0" /* offset 14779 */
-  "\xd8\xae\0" /* offset 14782 */
-  "\xd8\xaf\0" /* offset 14785 */
-  "\xd8\xb0\0" /* offset 14788 */
-  "\xd8\xb1\0" /* offset 14791 */
-  "\xd8\xb2\0" /* offset 14794 */
-  "\xd8\xb3\0" /* offset 14797 */
-  "\xd8\xb4\0" /* offset 14800 */
-  "\xd8\xb5\0" /* offset 14803 */
-  "\xd8\xb6\0" /* offset 14806 */
-  "\xd8\xb7\0" /* offset 14809 */
-  "\xd8\xb8\0" /* offset 14812 */
-  "\xd8\xb9\0" /* offset 14815 */
-  "\xd8\xba\0" /* offset 14818 */
-  "\xd9\x81\0" /* offset 14821 */
-  "\xd9\x82\0" /* offset 14824 */
-  "\xd9\x83\0" /* offset 14827 */
-  "\xd9\x84\0" /* offset 14830 */
-  "\xd9\x85\0" /* offset 14833 */
-  "\xd9\x86\0" /* offset 14836 */
-  "\xd9\x87\0" /* offset 14839 */
-  "\xd9\x88\0" /* offset 14842 */
-  "\xd9\x8a\0" /* offset 14845 */
-  "\xd9\x84\xd8\xa7\xd9\x93\0" /* offset 14848 */
-  "\xd9\x84\xd8\xa7\xd9\x94\0" /* offset 14855 */
-  "\xd9\x84\xd8\xa7\xd9\x95\0" /* offset 14862 */
-  "\xd9\x84\xd8\xa7\0" /* offset 14869 */
-  "\x22\0" /* offset 14874 */
-  "\x27\0" /* offset 14876 */
-  "\x2f\0" /* offset 14878 */
-  "\x5e\0" /* offset 14880 */
-  "\x7c\0" /* offset 14882 */
-  "\x7e\0" /* offset 14884 */
-  "\xe2\xa6\x85\0" /* offset 14886 */
-  "\xe2\xa6\x86\0" /* offset 14890 */
-  "\xe3\x83\xbb\0" /* offset 14894 */
-  "\xe3\x82\xa1\0" /* offset 14898 */
-  "\xe3\x82\xa3\0" /* offset 14902 */
-  "\xe3\x82\xa5\0" /* offset 14906 */
-  "\xe3\x82\xa7\0" /* offset 14910 */
-  "\xe3\x82\xa9\0" /* offset 14914 */
-  "\xe3\x83\xa3\0" /* offset 14918 */
-  "\xe3\x83\xa5\0" /* offset 14922 */
-  "\xe3\x83\xa7\0" /* offset 14926 */
-  "\xe3\x83\x83\0" /* offset 14930 */
-  "\xe3\x83\xbc\0" /* offset 14934 */
-  "\xe3\x83\xb3\0" /* offset 14938 */
-  "\xe3\x82\x99\0" /* offset 14942 */
-  "\xe3\x82\x9a\0" /* offset 14946 */
-  "\xc2\xa2\0" /* offset 14950 */
-  "\xc2\xa3\0" /* offset 14953 */
-  "\xc2\xac\0" /* offset 14956 */
-  "\xc2\xa6\0" /* offset 14959 */
-  "\xc2\xa5\0" /* offset 14962 */
-  "\xe2\x82\xa9\0" /* offset 14965 */
-  "\xe2\x94\x82\0" /* offset 14969 */
-  "\xe2\x86\x90\0" /* offset 14973 */
-  "\xe2\x86\x91\0" /* offset 14977 */
-  "\xe2\x86\x92\0" /* offset 14981 */
-  "\xe2\x86\x93\0" /* offset 14985 */
-  "\xe2\x96\xa0\0" /* offset 14989 */
-  "\xe2\x97\x8b\0" /* offset 14993 */
-  "\xf0\x91\x82\x99\xf0\x91\x82\xba\0" /* offset 14997 */
-  "\xf0\x91\x82\x9b\xf0\x91\x82\xba\0" /* offset 15006 */
-  "\xf0\x91\x82\xa5\xf0\x91\x82\xba\0" /* offset 15015 */
-  "\xf0\x91\x84\xb1\xf0\x91\x84\xa7\0" /* offset 15024 */
-  "\xf0\x91\x84\xb2\xf0\x91\x84\xa7\0" /* offset 15033 */
-  "\xf0\x91\x8d\x87\xf0\x91\x8c\xbe\0" /* offset 15042 */
-  "\xf0\x91\x8d\x87\xf0\x91\x8d\x97\0" /* offset 15051 */
-  "\xf0\x91\x92\xb9\xf0\x91\x92\xba\0" /* offset 15060 */
-  "\xf0\x91\x92\xb9\xf0\x91\x92\xb0\0" /* offset 15069 */
-  "\xf0\x91\x92\xb9\xf0\x91\x92\xbd\0" /* offset 15078 */
-  "\xf0\x91\x96\xb8\xf0\x91\x96\xaf\0" /* offset 15087 */
-  "\xf0\x91\x96\xb9\xf0\x91\x96\xaf\0" /* offset 15096 */
-  "\xf0\x9d\x85\x97\xf0\x9d\x85\xa5\0" /* offset 15105 */
-  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\0" /* offset 15114 */
-  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xae\0" /* offset 15123 */
-  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xaf\0" /* offset 15136 */
-  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xb0\0" /* offset 15149 */
-  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xb1\0" /* offset 15162 */
-  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xb2\0" /* offset 15175 */
-  "\xf0\x9d\x86\xb9\xf0\x9d\x85\xa5\0" /* offset 15188 */
-  "\xf0\x9d\x86\xba\xf0\x9d\x85\xa5\0" /* offset 15197 */
-  "\xf0\x9d\x86\xb9\xf0\x9d\x85\xa5\xf0\x9d\x85\xae\0" /* offset 15206 */
-  "\xf0\x9d\x86\xba\xf0\x9d\x85\xa5\xf0\x9d\x85\xae\0" /* offset 15219 */
-  "\xf0\x9d\x86\xb9\xf0\x9d\x85\xa5\xf0\x9d\x85\xaf\0" /* offset 15232 */
-  "\xf0\x9d\x86\xba\xf0\x9d\x85\xa5\xf0\x9d\x85\xaf\0" /* offset 15245 */
-  "\xc4\xb1\0" /* offset 15258 */
-  "\xc8\xb7\0" /* offset 15261 */
-  "\xce\x91\0" /* offset 15264 */
-  "\xce\x92\0" /* offset 15267 */
-  "\xce\x94\0" /* offset 15270 */
-  "\xce\x95\0" /* offset 15273 */
-  "\xce\x96\0" /* offset 15276 */
-  "\xce\x97\0" /* offset 15279 */
-  "\xce\x99\0" /* offset 15282 */
-  "\xce\x9a\0" /* offset 15285 */
-  "\xce\x9b\0" /* offset 15288 */
-  "\xce\x9c\0" /* offset 15291 */
-  "\xce\x9d\0" /* offset 15294 */
-  "\xce\x9e\0" /* offset 15297 */
-  "\xce\x9f\0" /* offset 15300 */
-  "\xce\xa1\0" /* offset 15303 */
-  "\xce\xa4\0" /* offset 15306 */
-  "\xce\xa6\0" /* offset 15309 */
-  "\xce\xa7\0" /* offset 15312 */
-  "\xce\xa8\0" /* offset 15315 */
-  "\xe2\x88\x87\0" /* offset 15318 */
-  "\xce\xb1\0" /* offset 15322 */
-  "\xce\xb6\0" /* offset 15325 */
-  "\xce\xb7\0" /* offset 15328 */
-  "\xce\xbb\0" /* offset 15331 */
-  "\xce\xbd\0" /* offset 15334 */
-  "\xce\xbe\0" /* offset 15337 */
-  "\xce\xbf\0" /* offset 15340 */
-  "\xcf\x83\0" /* offset 15343 */
-  "\xcf\x84\0" /* offset 15346 */
-  "\xcf\x85\0" /* offset 15349 */
-  "\xcf\x88\0" /* offset 15352 */
-  "\xcf\x89\0" /* offset 15355 */
-  "\xe2\x88\x82\0" /* offset 15358 */
-  "\xcf\x9c\0" /* offset 15362 */
-  "\xcf\x9d\0" /* offset 15365 */
-  "\xd9\xae\0" /* offset 15368 */
-  "\xda\xa1\0" /* offset 15371 */
-  "\xd9\xaf\0" /* offset 15374 */
-  "\x30\x2e\0" /* offset 15377 */
-  "\x30\x2c\0" /* offset 15380 */
-  "\x31\x2c\0" /* offset 15383 */
-  "\x32\x2c\0" /* offset 15386 */
-  "\x33\x2c\0" /* offset 15389 */
-  "\x34\x2c\0" /* offset 15392 */
-  "\x35\x2c\0" /* offset 15395 */
-  "\x36\x2c\0" /* offset 15398 */
-  "\x37\x2c\0" /* offset 15401 */
-  "\x38\x2c\0" /* offset 15404 */
-  "\x39\x2c\0" /* offset 15407 */
-  "\x28\x41\x29\0" /* offset 15410 */
-  "\x28\x42\x29\0" /* offset 15414 */
-  "\x28\x43\x29\0" /* offset 15418 */
-  "\x28\x44\x29\0" /* offset 15422 */
-  "\x28\x45\x29\0" /* offset 15426 */
-  "\x28\x46\x29\0" /* offset 15430 */
-  "\x28\x47\x29\0" /* offset 15434 */
-  "\x28\x48\x29\0" /* offset 15438 */
-  "\x28\x49\x29\0" /* offset 15442 */
-  "\x28\x4a\x29\0" /* offset 15446 */
-  "\x28\x4b\x29\0" /* offset 15450 */
-  "\x28\x4c\x29\0" /* offset 15454 */
-  "\x28\x4d\x29\0" /* offset 15458 */
-  "\x28\x4e\x29\0" /* offset 15462 */
-  "\x28\x4f\x29\0" /* offset 15466 */
-  "\x28\x50\x29\0" /* offset 15470 */
-  "\x28\x51\x29\0" /* offset 15474 */
-  "\x28\x52\x29\0" /* offset 15478 */
-  "\x28\x53\x29\0" /* offset 15482 */
-  "\x28\x54\x29\0" /* offset 15486 */
-  "\x28\x55\x29\0" /* offset 15490 */
-  "\x28\x56\x29\0" /* offset 15494 */
-  "\x28\x57\x29\0" /* offset 15498 */
-  "\x28\x58\x29\0" /* offset 15502 */
-  "\x28\x59\x29\0" /* offset 15506 */
-  "\x28\x5a\x29\0" /* offset 15510 */
-  "\xe3\x80\x94\x53\xe3\x80\x95\0" /* offset 15514 */
-  "\x43\x44\0" /* offset 15522 */
-  "\x57\x5a\0" /* offset 15525 */
-  "\x48\x56\0" /* offset 15528 */
-  "\x53\x44\0" /* offset 15531 */
-  "\x53\x53\0" /* offset 15534 */
-  "\x50\x50\x56\0" /* offset 15537 */
-  "\x57\x43\0" /* offset 15541 */
-  "\x4d\x43\0" /* offset 15544 */
-  "\x4d\x44\0" /* offset 15547 */
-  "\x44\x4a\0" /* offset 15550 */
-  "\xe3\x81\xbb\xe3\x81\x8b\0" /* offset 15553 */
-  "\xe3\x82\xb3\xe3\x82\xb3\0" /* offset 15560 */
-  "\xe5\xad\x97\0" /* offset 15567 */
-  "\xe5\x8f\x8c\0" /* offset 15571 */
-  "\xe5\xa4\x9a\0" /* offset 15575 */
-  "\xe8\xa7\xa3\0" /* offset 15579 */
-  "\xe4\xba\xa4\0" /* offset 15583 */
-  "\xe6\x98\xa0\0" /* offset 15587 */
-  "\xe7\x84\xa1\0" /* offset 15591 */
-  "\xe5\x89\x8d\0" /* offset 15595 */
-  "\xe5\xbe\x8c\0" /* offset 15599 */
-  "\xe5\x86\x8d\0" /* offset 15603 */
-  "\xe6\x96\xb0\0" /* offset 15607 */
-  "\xe5\x88\x9d\0" /* offset 15611 */
-  "\xe7\xb5\x82\0" /* offset 15615 */
-  "\xe8\xb2\xa9\0" /* offset 15619 */
-  "\xe5\xa3\xb0\0" /* offset 15623 */
-  "\xe5\x90\xb9\0" /* offset 15627 */
-  "\xe6\xbc\x94\0" /* offset 15631 */
-  "\xe6\x8a\x95\0" /* offset 15635 */
-  "\xe6\x8d\x95\0" /* offset 15639 */
-  "\xe9\x81\x8a\0" /* offset 15643 */
-  "\xe6\x8c\x87\0" /* offset 15647 */
-  "\xe6\x89\x93\0" /* offset 15651 */
-  "\xe7\xa6\x81\0" /* offset 15655 */
-  "\xe7\xa9\xba\0" /* offset 15659 */
-  "\xe5\x90\x88\0" /* offset 15663 */
-  "\xe6\xba\x80\0" /* offset 15667 */
-  "\xe7\x94\xb3\0" /* offset 15671 */
-  "\xe5\x89\xb2\0" /* offset 15675 */
-  "\xe5\x96\xb6\0" /* offset 15679 */
-  "\xe9\x85\x8d\0" /* offset 15683 */
-  "\xe3\x80\x94\xe6\x9c\xac\xe3\x80\x95\0" /* offset 15687 */
-  "\xe3\x80\x94\xe4\xb8\x89\xe3\x80\x95\0" /* offset 15697 */
-  "\xe3\x80\x94\xe4\xba\x8c\xe3\x80\x95\0" /* offset 15707 */
-  "\xe3\x80\x94\xe5\xae\x89\xe3\x80\x95\0" /* offset 15717 */
-  "\xe3\x80\x94\xe7\x82\xb9\xe3\x80\x95\0" /* offset 15727 */
-  "\xe3\x80\x94\xe6\x89\x93\xe3\x80\x95\0" /* offset 15737 */
-  "\xe3\x80\x94\xe7\x9b\x97\xe3\x80\x95\0" /* offset 15747 */
-  "\xe3\x80\x94\xe5\x8b\x9d\xe3\x80\x95\0" /* offset 15757 */
-  "\xe3\x80\x94\xe6\x95\x97\xe3\x80\x95\0" /* offset 15767 */
-  "\xe5\xbe\x97\0" /* offset 15777 */
-  "\xe5\x8f\xaf\0" /* offset 15781 */
-  "\xe4\xb8\xbd\0" /* offset 15785 */
-  "\xe4\xb8\xb8\0" /* offset 15789 */
-  "\xe4\xb9\x81\0" /* offset 15793 */
-  "\xf0\xa0\x84\xa2\0" /* offset 15797 */
-  "\xe4\xbd\xa0\0" /* offset 15802 */
-  "\xe4\xbe\xbb\0" /* offset 15806 */
-  "\xe5\x80\x82\0" /* offset 15810 */
-  "\xe5\x81\xba\0" /* offset 15814 */
-  "\xe5\x82\x99\0" /* offset 15818 */
-  "\xe5\x83\x8f\0" /* offset 15822 */
-  "\xe3\x92\x9e\0" /* offset 15826 */
-  "\xf0\xa0\x98\xba\0" /* offset 15830 */
-  "\xe5\x85\x94\0" /* offset 15835 */
-  "\xe5\x85\xa4\0" /* offset 15839 */
-  "\xe5\x85\xb7\0" /* offset 15843 */
-  "\xf0\xa0\x94\x9c\0" /* offset 15847 */
-  "\xe3\x92\xb9\0" /* offset 15852 */
-  "\xe5\x85\xa7\0" /* offset 15856 */
-  "\xf0\xa0\x95\x8b\0" /* offset 15860 */
-  "\xe5\x86\x97\0" /* offset 15865 */
-  "\xe5\x86\xa4\0" /* offset 15869 */
-  "\xe4\xbb\x8c\0" /* offset 15873 */
-  "\xe5\x86\xac\0" /* offset 15877 */
-  "\xf0\xa9\x87\x9f\0" /* offset 15881 */
-  "\xe5\x88\x83\0" /* offset 15886 */
-  "\xe3\x93\x9f\0" /* offset 15890 */
-  "\xe5\x88\xbb\0" /* offset 15894 */
-  "\xe5\x89\x86\0" /* offset 15898 */
-  "\xe5\x89\xb7\0" /* offset 15902 */
-  "\xe3\x94\x95\0" /* offset 15906 */
-  "\xe5\x8c\x85\0" /* offset 15910 */
-  "\xe5\x8c\x86\0" /* offset 15914 */
-  "\xe5\x8d\x89\0" /* offset 15918 */
-  "\xe5\x8d\x9a\0" /* offset 15922 */
-  "\xe5\x8d\xb3\0" /* offset 15926 */
-  "\xe5\x8d\xbd\0" /* offset 15930 */
-  "\xe5\x8d\xbf\0" /* offset 15934 */
-  "\xf0\xa0\xa8\xac\0" /* offset 15938 */
-  "\xe7\x81\xb0\0" /* offset 15943 */
-  "\xe5\x8f\x8a\0" /* offset 15947 */
-  "\xe5\x8f\x9f\0" /* offset 15951 */
-  "\xf0\xa0\xad\xa3\0" /* offset 15955 */
-  "\xe5\x8f\xab\0" /* offset 15960 */
-  "\xe5\x8f\xb1\0" /* offset 15964 */
-  "\xe5\x90\x86\0" /* offset 15968 */
-  "\xe5\x92\x9e\0" /* offset 15972 */
-  "\xe5\x90\xb8\0" /* offset 15976 */
-  "\xe5\x91\x88\0" /* offset 15980 */
-  "\xe5\x91\xa8\0" /* offset 15984 */
-  "\xe5\x92\xa2\0" /* offset 15988 */
-  "\xe5\x93\xb6\0" /* offset 15992 */
-  "\xe5\x94\x90\0" /* offset 15996 */
-  "\xe5\x95\x93\0" /* offset 16000 */
-  "\xe5\x95\xa3\0" /* offset 16004 */
-  "\xe5\x96\x84\0" /* offset 16008 */
-  "\xe5\x96\xab\0" /* offset 16012 */
-  "\xe5\x96\xb3\0" /* offset 16016 */
-  "\xe5\x97\x82\0" /* offset 16020 */
-  "\xe5\x9c\x96\0" /* offset 16024 */
-  "\xe5\x9c\x97\0" /* offset 16028 */
-  "\xe5\x99\x91\0" /* offset 16032 */
-  "\xe5\x99\xb4\0" /* offset 16036 */
-  "\xe5\xa3\xae\0" /* offset 16040 */
-  "\xe5\x9f\x8e\0" /* offset 16044 */
-  "\xe5\x9f\xb4\0" /* offset 16048 */
-  "\xe5\xa0\x8d\0" /* offset 16052 */
-  "\xe5\x9e\x8b\0" /* offset 16056 */
-  "\xe5\xa0\xb2\0" /* offset 16060 */
-  "\xe5\xa0\xb1\0" /* offset 16064 */
-  "\xe5\xa2\xac\0" /* offset 16068 */
-  "\xf0\xa1\x93\xa4\0" /* offset 16072 */
-  "\xe5\xa3\xb2\0" /* offset 16077 */
-  "\xe5\xa3\xb7\0" /* offset 16081 */
-  "\xe5\xa4\x86\0" /* offset 16085 */
-  "\xe5\xa4\xa2\0" /* offset 16089 */
-  "\xe5\xa5\xa2\0" /* offset 16093 */
-  "\xf0\xa1\x9a\xa8\0" /* offset 16097 */
-  "\xf0\xa1\x9b\xaa\0" /* offset 16102 */
-  "\xe5\xa7\xac\0" /* offset 16107 */
-  "\xe5\xa8\x9b\0" /* offset 16111 */
-  "\xe5\xa8\xa7\0" /* offset 16115 */
-  "\xe5\xa7\x98\0" /* offset 16119 */
-  "\xe5\xa9\xa6\0" /* offset 16123 */
-  "\xe3\x9b\xae\0" /* offset 16127 */
-  "\xe3\x9b\xbc\0" /* offset 16131 */
-  "\xe5\xac\x88\0" /* offset 16135 */
-  "\xe5\xac\xbe\0" /* offset 16139 */
-  "\xf0\xa1\xa7\x88\0" /* offset 16143 */
-  "\xe5\xaf\x83\0" /* offset 16148 */
-  "\xe5\xaf\x98\0" /* offset 16152 */
-  "\xe5\xaf\xb3\0" /* offset 16156 */
-  "\xf0\xa1\xac\x98\0" /* offset 16160 */
-  "\xe5\xaf\xbf\0" /* offset 16165 */
-  "\xe5\xb0\x86\0" /* offset 16169 */
-  "\xe5\xbd\x93\0" /* offset 16173 */
-  "\xe3\x9e\x81\0" /* offset 16177 */
-  "\xe5\xb1\xa0\0" /* offset 16181 */
-  "\xe5\xb3\x80\0" /* offset 16185 */
-  "\xe5\xb2\x8d\0" /* offset 16189 */
-  "\xf0\xa1\xb7\xa4\0" /* offset 16193 */
-  "\xe5\xb5\x83\0" /* offset 16198 */
-  "\xf0\xa1\xb7\xa6\0" /* offset 16202 */
-  "\xe5\xb5\xae\0" /* offset 16207 */
-  "\xe5\xb5\xab\0" /* offset 16211 */
-  "\xe5\xb5\xbc\0" /* offset 16215 */
-  "\xe5\xb7\xa1\0" /* offset 16219 */
-  "\xe5\xb7\xa2\0" /* offset 16223 */
-  "\xe3\xa0\xaf\0" /* offset 16227 */
-  "\xe5\xb7\xbd\0" /* offset 16231 */
-  "\xe5\xb8\xa8\0" /* offset 16235 */
-  "\xe5\xb8\xbd\0" /* offset 16239 */
-  "\xe5\xb9\xa9\0" /* offset 16243 */
-  "\xe3\xa1\xa2\0" /* offset 16247 */
-  "\xf0\xa2\x86\x83\0" /* offset 16251 */
-  "\xe3\xa1\xbc\0" /* offset 16256 */
-  "\xe5\xba\xb0\0" /* offset 16260 */
-  "\xe5\xba\xb3\0" /* offset 16264 */
-  "\xe5\xba\xb6\0" /* offset 16268 */
-  "\xf0\xaa\x8e\x92\0" /* offset 16272 */
-  "\xf0\xa2\x8c\xb1\0" /* offset 16277 */
-  "\xe8\x88\x81\0" /* offset 16282 */
-  "\xe5\xbc\xa2\0" /* offset 16286 */
-  "\xe3\xa3\x87\0" /* offset 16290 */
-  "\xf0\xa3\x8a\xb8\0" /* offset 16294 */
-  "\xf0\xa6\x87\x9a\0" /* offset 16299 */
-  "\xe5\xbd\xa2\0" /* offset 16304 */
-  "\xe5\xbd\xab\0" /* offset 16308 */
-  "\xe3\xa3\xa3\0" /* offset 16312 */
-  "\xe5\xbe\x9a\0" /* offset 16316 */
-  "\xe5\xbf\x8d\0" /* offset 16320 */
-  "\xe5\xbf\x97\0" /* offset 16324 */
-  "\xe5\xbf\xb9\0" /* offset 16328 */
-  "\xe6\x82\x81\0" /* offset 16332 */
-  "\xe3\xa4\xba\0" /* offset 16336 */
-  "\xe3\xa4\x9c\0" /* offset 16340 */
-  "\xf0\xa2\x9b\x94\0" /* offset 16344 */
-  "\xe6\x83\x87\0" /* offset 16349 */
-  "\xe6\x85\x88\0" /* offset 16353 */
-  "\xe6\x85\x8c\0" /* offset 16357 */
-  "\xe6\x85\xba\0" /* offset 16361 */
-  "\xe6\x86\xb2\0" /* offset 16365 */
-  "\xe6\x86\xa4\0" /* offset 16369 */
-  "\xe6\x86\xaf\0" /* offset 16373 */
-  "\xe6\x87\x9e\0" /* offset 16377 */
-  "\xe6\x88\x90\0" /* offset 16381 */
-  "\xe6\x88\x9b\0" /* offset 16385 */
-  "\xe6\x89\x9d\0" /* offset 16389 */
-  "\xe6\x8a\xb1\0" /* offset 16393 */
-  "\xe6\x8b\x94\0" /* offset 16397 */
-  "\xe6\x8d\x90\0" /* offset 16401 */
-  "\xf0\xa2\xac\x8c\0" /* offset 16405 */
-  "\xe6\x8c\xbd\0" /* offset 16410 */
-  "\xe6\x8b\xbc\0" /* offset 16414 */
-  "\xe6\x8d\xa8\0" /* offset 16418 */
-  "\xe6\x8e\x83\0" /* offset 16422 */
-  "\xe6\x8f\xa4\0" /* offset 16426 */
-  "\xf0\xa2\xaf\xb1\0" /* offset 16430 */
-  "\xe6\x90\xa2\0" /* offset 16435 */
-  "\xe6\x8f\x85\0" /* offset 16439 */
-  "\xe6\x8e\xa9\0" /* offset 16443 */
-  "\xe3\xa8\xae\0" /* offset 16447 */
-  "\xe6\x91\xa9\0" /* offset 16451 */
-  "\xe6\x91\xbe\0" /* offset 16455 */
-  "\xe6\x92\x9d\0" /* offset 16459 */
-  "\xe6\x91\xb7\0" /* offset 16463 */
-  "\xe3\xa9\xac\0" /* offset 16467 */
-  "\xe6\x95\xac\0" /* offset 16471 */
-  "\xf0\xa3\x80\x8a\0" /* offset 16475 */
-  "\xe6\x97\xa3\0" /* offset 16480 */
-  "\xe6\x9b\xb8\0" /* offset 16484 */
-  "\xe6\x99\x89\0" /* offset 16488 */
-  "\xe3\xac\x99\0" /* offset 16492 */
-  "\xe3\xac\x88\0" /* offset 16496 */
-  "\xe3\xab\xa4\0" /* offset 16500 */
-  "\xe5\x86\x92\0" /* offset 16504 */
-  "\xe5\x86\x95\0" /* offset 16508 */
-  "\xe6\x9c\x80\0" /* offset 16512 */
-  "\xe6\x9a\x9c\0" /* offset 16516 */
-  "\xe8\x82\xad\0" /* offset 16520 */
-  "\xe4\x8f\x99\0" /* offset 16524 */
-  "\xe6\x9c\xa1\0" /* offset 16528 */
-  "\xe6\x9d\x9e\0" /* offset 16532 */
-  "\xe6\x9d\x93\0" /* offset 16536 */
-  "\xf0\xa3\x8f\x83\0" /* offset 16540 */
-  "\xe3\xad\x89\0" /* offset 16545 */
-  "\xe6\x9f\xba\0" /* offset 16549 */
-  "\xe6\x9e\x85\0" /* offset 16553 */
-  "\xe6\xa1\x92\0" /* offset 16557 */
-  "\xf0\xa3\x91\xad\0" /* offset 16561 */
-  "\xe6\xa2\x8e\0" /* offset 16566 */
-  "\xe6\xa0\x9f\0" /* offset 16570 */
-  "\xe6\xa4\x94\0" /* offset 16574 */
-  "\xe6\xa5\x82\0" /* offset 16578 */
-  "\xe6\xa6\xa3\0" /* offset 16582 */
-  "\xe6\xa7\xaa\0" /* offset 16586 */
-  "\xe6\xaa\xa8\0" /* offset 16590 */
-  "\xf0\xa3\x9a\xa3\0" /* offset 16594 */
-  "\xe6\xab\x9b\0" /* offset 16599 */
-  "\xe3\xb0\x98\0" /* offset 16603 */
-  "\xe6\xac\xa1\0" /* offset 16607 */
-  "\xf0\xa3\xa2\xa7\0" /* offset 16611 */
-  "\xe6\xad\x94\0" /* offset 16616 */
-  "\xe3\xb1\x8e\0" /* offset 16620 */
-  "\xe6\xad\xb2\0" /* offset 16624 */
-  "\xe6\xae\x9f\0" /* offset 16628 */
-  "\xe6\xae\xbb\0" /* offset 16632 */
-  "\xf0\xa3\xaa\x8d\0" /* offset 16636 */
-  "\xf0\xa1\xb4\x8b\0" /* offset 16641 */
-  "\xf0\xa3\xab\xba\0" /* offset 16646 */
-  "\xe6\xb1\x8e\0" /* offset 16651 */
-  "\xf0\xa3\xb2\xbc\0" /* offset 16655 */
-  "\xe6\xb2\xbf\0" /* offset 16660 */
-  "\xe6\xb3\x8d\0" /* offset 16664 */
-  "\xe6\xb1\xa7\0" /* offset 16668 */
-  "\xe6\xb4\x96\0" /* offset 16672 */
-  "\xe6\xb4\xbe\0" /* offset 16676 */
-  "\xe6\xb5\xa9\0" /* offset 16680 */
-  "\xe6\xb5\xb8\0" /* offset 16684 */
-  "\xe6\xb6\x85\0" /* offset 16688 */
-  "\xf0\xa3\xb4\x9e\0" /* offset 16692 */
-  "\xe6\xb4\xb4\0" /* offset 16697 */
-  "\xe6\xb8\xaf\0" /* offset 16701 */
-  "\xe6\xb9\xae\0" /* offset 16705 */
-  "\xe3\xb4\xb3\0" /* offset 16709 */
-  "\xe6\xbb\x87\0" /* offset 16713 */
-  "\xf0\xa3\xbb\x91\0" /* offset 16717 */
-  "\xe6\xb7\xb9\0" /* offset 16722 */
-  "\xe6\xbd\xae\0" /* offset 16726 */
-  "\xf0\xa3\xbd\x9e\0" /* offset 16730 */
-  "\xf0\xa3\xbe\x8e\0" /* offset 16735 */
-  "\xe6\xbf\x86\0" /* offset 16740 */
-  "\xe7\x80\xb9\0" /* offset 16744 */
-  "\xe7\x80\x9b\0" /* offset 16748 */
-  "\xe3\xb6\x96\0" /* offset 16752 */
-  "\xe7\x81\x8a\0" /* offset 16756 */
-  "\xe7\x81\xbd\0" /* offset 16760 */
-  "\xe7\x81\xb7\0" /* offset 16764 */
-  "\xe7\x82\xad\0" /* offset 16768 */
-  "\xf0\xa0\x94\xa5\0" /* offset 16772 */
-  "\xe7\x85\x85\0" /* offset 16777 */
-  "\xf0\xa4\x89\xa3\0" /* offset 16781 */
-  "\xe7\x86\x9c\0" /* offset 16786 */
-  "\xf0\xa4\x8e\xab\0" /* offset 16790 */
-  "\xe7\x88\xa8\0" /* offset 16795 */
-  "\xe7\x89\x90\0" /* offset 16799 */
-  "\xf0\xa4\x98\x88\0" /* offset 16803 */
-  "\xe7\x8a\x80\0" /* offset 16808 */
-  "\xe7\x8a\x95\0" /* offset 16812 */
-  "\xf0\xa4\x9c\xb5\0" /* offset 16816 */
-  "\xf0\xa4\xa0\x94\0" /* offset 16821 */
-  "\xe7\x8d\xba\0" /* offset 16826 */
-  "\xe7\x8e\x8b\0" /* offset 16830 */
-  "\xe3\xba\xac\0" /* offset 16834 */
-  "\xe7\x8e\xa5\0" /* offset 16838 */
-  "\xe3\xba\xb8\0" /* offset 16842 */
-  "\xe7\x91\x87\0" /* offset 16846 */
-  "\xe7\x91\x9c\0" /* offset 16850 */
-  "\xe7\x92\x85\0" /* offset 16854 */
-  "\xe7\x93\x8a\0" /* offset 16858 */
-  "\xe3\xbc\x9b\0" /* offset 16862 */
-  "\xe7\x94\xa4\0" /* offset 16866 */
-  "\xf0\xa4\xb0\xb6\0" /* offset 16870 */
-  "\xe7\x94\xbe\0" /* offset 16875 */
-  "\xf0\xa4\xb2\x92\0" /* offset 16879 */
-  "\xf0\xa2\x86\x9f\0" /* offset 16884 */
-  "\xe7\x98\x90\0" /* offset 16889 */
-  "\xf0\xa4\xbe\xa1\0" /* offset 16893 */
-  "\xf0\xa4\xbe\xb8\0" /* offset 16898 */
-  "\xf0\xa5\x81\x84\0" /* offset 16903 */
-  "\xe3\xbf\xbc\0" /* offset 16908 */
-  "\xe4\x80\x88\0" /* offset 16912 */
-  "\xf0\xa5\x83\xb3\0" /* offset 16916 */
-  "\xf0\xa5\x83\xb2\0" /* offset 16921 */
-  "\xf0\xa5\x84\x99\0" /* offset 16926 */
-  "\xf0\xa5\x84\xb3\0" /* offset 16931 */
-  "\xe7\x9c\x9e\0" /* offset 16936 */
-  "\xe7\x9c\x9f\0" /* offset 16940 */
-  "\xe7\x9e\x8b\0" /* offset 16944 */
-  "\xe4\x81\x86\0" /* offset 16948 */
-  "\xe4\x82\x96\0" /* offset 16952 */
-  "\xf0\xa5\x90\x9d\0" /* offset 16956 */
-  "\xe7\xa1\x8e\0" /* offset 16961 */
-  "\xe4\x83\xa3\0" /* offset 16965 */
-  "\xf0\xa5\x98\xa6\0" /* offset 16969 */
-  "\xf0\xa5\x9a\x9a\0" /* offset 16974 */
-  "\xf0\xa5\x9b\x85\0" /* offset 16979 */
-  "\xe7\xa7\xab\0" /* offset 16984 */
-  "\xe4\x84\xaf\0" /* offset 16988 */
-  "\xe7\xa9\x8a\0" /* offset 16992 */
-  "\xe7\xa9\x8f\0" /* offset 16996 */
-  "\xf0\xa5\xa5\xbc\0" /* offset 17000 */
-  "\xf0\xa5\xaa\xa7\0" /* offset 17005 */
-  "\xe7\xab\xae\0" /* offset 17010 */
-  "\xe4\x88\x82\0" /* offset 17014 */
-  "\xf0\xa5\xae\xab\0" /* offset 17018 */
-  "\xe7\xaf\x86\0" /* offset 17023 */
-  "\xe7\xaf\x89\0" /* offset 17027 */
-  "\xe4\x88\xa7\0" /* offset 17031 */
-  "\xf0\xa5\xb2\x80\0" /* offset 17035 */
-  "\xe7\xb3\x92\0" /* offset 17040 */
-  "\xe4\x8a\xa0\0" /* offset 17044 */
-  "\xe7\xb3\xa8\0" /* offset 17048 */
-  "\xe7\xb3\xa3\0" /* offset 17052 */
-  "\xe7\xb4\x80\0" /* offset 17056 */
-  "\xf0\xa5\xbe\x86\0" /* offset 17060 */
-  "\xe7\xb5\xa3\0" /* offset 17065 */
-  "\xe4\x8c\x81\0" /* offset 17069 */
-  "\xe7\xb7\x87\0" /* offset 17073 */
-  "\xe7\xb8\x82\0" /* offset 17077 */
-  "\xe7\xb9\x85\0" /* offset 17081 */
-  "\xe4\x8c\xb4\0" /* offset 17085 */
-  "\xf0\xa6\x88\xa8\0" /* offset 17089 */
-  "\xf0\xa6\x89\x87\0" /* offset 17094 */
-  "\xe4\x8d\x99\0" /* offset 17099 */
-  "\xf0\xa6\x8b\x99\0" /* offset 17103 */
-  "\xe7\xbd\xba\0" /* offset 17108 */
-  "\xf0\xa6\x8c\xbe\0" /* offset 17112 */
-  "\xe7\xbe\x95\0" /* offset 17117 */
-  "\xe7\xbf\xba\0" /* offset 17121 */
-  "\xf0\xa6\x93\x9a\0" /* offset 17125 */
-  "\xf0\xa6\x94\xa3\0" /* offset 17130 */
-  "\xe8\x81\xa0\0" /* offset 17135 */
-  "\xf0\xa6\x96\xa8\0" /* offset 17139 */
-  "\xe8\x81\xb0\0" /* offset 17144 */
-  "\xf0\xa3\x8d\x9f\0" /* offset 17148 */
-  "\xe4\x8f\x95\0" /* offset 17153 */
-  "\xe8\x82\xb2\0" /* offset 17157 */
-  "\xe8\x84\x83\0" /* offset 17161 */
-  "\xe4\x90\x8b\0" /* offset 17165 */
-  "\xe8\x84\xbe\0" /* offset 17169 */
-  "\xe5\xaa\xb5\0" /* offset 17173 */
-  "\xf0\xa6\x9e\xa7\0" /* offset 17177 */
-  "\xf0\xa6\x9e\xb5\0" /* offset 17182 */
-  "\xf0\xa3\x8e\x93\0" /* offset 17187 */
-  "\xf0\xa3\x8e\x9c\0" /* offset 17192 */
-  "\xe8\x88\x84\0" /* offset 17197 */
-  "\xe8\xbe\x9e\0" /* offset 17201 */
-  "\xe4\x91\xab\0" /* offset 17205 */
-  "\xe8\x8a\x91\0" /* offset 17209 */
-  "\xe8\x8a\x8b\0" /* offset 17213 */
-  "\xe8\x8a\x9d\0" /* offset 17217 */
-  "\xe5\x8a\xb3\0" /* offset 17221 */
-  "\xe8\x8a\xb1\0" /* offset 17225 */
-  "\xe8\x8a\xb3\0" /* offset 17229 */
-  "\xe8\x8a\xbd\0" /* offset 17233 */
-  "\xe8\x8b\xa6\0" /* offset 17237 */
-  "\xf0\xa6\xac\xbc\0" /* offset 17241 */
-  "\xe8\x8c\x9d\0" /* offset 17246 */
-  "\xe8\x8d\xa3\0" /* offset 17250 */
-  "\xe8\x8e\xad\0" /* offset 17254 */
-  "\xe8\x8c\xa3\0" /* offset 17258 */
-  "\xe8\x8e\xbd\0" /* offset 17262 */
-  "\xe8\x8f\xa7\0" /* offset 17266 */
-  "\xe8\x8d\x93\0" /* offset 17270 */
-  "\xe8\x8f\x8a\0" /* offset 17274 */
-  "\xe8\x8f\x8c\0" /* offset 17278 */
-  "\xe8\x8f\x9c\0" /* offset 17282 */
-  "\xf0\xa6\xb0\xb6\0" /* offset 17286 */
-  "\xf0\xa6\xb5\xab\0" /* offset 17291 */
-  "\xf0\xa6\xb3\x95\0" /* offset 17296 */
-  "\xe4\x94\xab\0" /* offset 17301 */
-  "\xe8\x93\xb1\0" /* offset 17305 */
-  "\xe8\x93\xb3\0" /* offset 17309 */
-  "\xe8\x94\x96\0" /* offset 17313 */
-  "\xf0\xa7\x8f\x8a\0" /* offset 17317 */
-  "\xe8\x95\xa4\0" /* offset 17322 */
-  "\xf0\xa6\xbc\xac\0" /* offset 17326 */
-  "\xe4\x95\x9d\0" /* offset 17331 */
-  "\xe4\x95\xa1\0" /* offset 17335 */
-  "\xf0\xa6\xbe\xb1\0" /* offset 17339 */
-  "\xf0\xa7\x83\x92\0" /* offset 17344 */
-  "\xe4\x95\xab\0" /* offset 17349 */
-  "\xe8\x99\x90\0" /* offset 17353 */
-  "\xe8\x99\xa7\0" /* offset 17357 */
-  "\xe8\x99\xa9\0" /* offset 17361 */
-  "\xe8\x9a\xa9\0" /* offset 17365 */
-  "\xe8\x9a\x88\0" /* offset 17369 */
-  "\xe8\x9c\x8e\0" /* offset 17373 */
-  "\xe8\x9b\xa2\0" /* offset 17377 */
-  "\xe8\x9c\xa8\0" /* offset 17381 */
-  "\xe8\x9d\xab\0" /* offset 17385 */
-  "\xe8\x9e\x86\0" /* offset 17389 */
-  "\xe4\x97\x97\0" /* offset 17393 */
-  "\xe8\x9f\xa1\0" /* offset 17397 */
-  "\xe8\xa0\x81\0" /* offset 17401 */
-  "\xe4\x97\xb9\0" /* offset 17405 */
-  "\xe8\xa1\xa0\0" /* offset 17409 */
-  "\xf0\xa7\x99\xa7\0" /* offset 17413 */
-  "\xe8\xa3\x97\0" /* offset 17418 */
-  "\xe8\xa3\x9e\0" /* offset 17422 */
-  "\xe4\x98\xb5\0" /* offset 17426 */
-  "\xe8\xa3\xba\0" /* offset 17430 */
-  "\xe3\x92\xbb\0" /* offset 17434 */
-  "\xf0\xa7\xa2\xae\0" /* offset 17438 */
-  "\xf0\xa7\xa5\xa6\0" /* offset 17443 */
-  "\xe4\x9a\xbe\0" /* offset 17448 */
-  "\xe4\x9b\x87\0" /* offset 17452 */
-  "\xe8\xaa\xa0\0" /* offset 17456 */
-  "\xf0\xa7\xb2\xa8\0" /* offset 17460 */
-  "\xe8\xb2\xab\0" /* offset 17465 */
-  "\xe8\xb3\x81\0" /* offset 17469 */
-  "\xe8\xb4\x9b\0" /* offset 17473 */
-  "\xe8\xb5\xb7\0" /* offset 17477 */
-  "\xf0\xa7\xbc\xaf\0" /* offset 17481 */
-  "\xf0\xa0\xa0\x84\0" /* offset 17486 */
-  "\xe8\xb7\x8b\0" /* offset 17491 */
-  "\xe8\xb6\xbc\0" /* offset 17495 */
-  "\xe8\xb7\xb0\0" /* offset 17499 */
-  "\xf0\xa0\xa3\x9e\0" /* offset 17503 */
-  "\xe8\xbb\x94\0" /* offset 17508 */
-  "\xf0\xa8\x97\x92\0" /* offset 17512 */
-  "\xf0\xa8\x97\xad\0" /* offset 17517 */
-  "\xe9\x82\x94\0" /* offset 17522 */
-  "\xe9\x83\xb1\0" /* offset 17526 */
-  "\xe9\x84\x91\0" /* offset 17530 */
-  "\xf0\xa8\x9c\xae\0" /* offset 17534 */
-  "\xe9\x84\x9b\0" /* offset 17539 */
-  "\xe9\x88\xb8\0" /* offset 17543 */
-  "\xe9\x8b\x97\0" /* offset 17547 */
-  "\xe9\x8b\x98\0" /* offset 17551 */
-  "\xe9\x89\xbc\0" /* offset 17555 */
-  "\xe9\x8f\xb9\0" /* offset 17559 */
-  "\xe9\x90\x95\0" /* offset 17563 */
-  "\xf0\xa8\xaf\xba\0" /* offset 17567 */
-  "\xe9\x96\x8b\0" /* offset 17572 */
-  "\xe4\xa6\x95\0" /* offset 17576 */
-  "\xe9\x96\xb7\0" /* offset 17580 */
-  "\xf0\xa8\xb5\xb7\0" /* offset 17584 */
-  "\xe4\xa7\xa6\0" /* offset 17589 */
-  "\xe9\x9b\x83\0" /* offset 17593 */
-  "\xe5\xb6\xb2\0" /* offset 17597 */
-  "\xe9\x9c\xa3\0" /* offset 17601 */
-  "\xf0\xa9\x85\x85\0" /* offset 17605 */
-  "\xf0\xa9\x88\x9a\0" /* offset 17610 */
-  "\xe4\xa9\xae\0" /* offset 17615 */
-  "\xe4\xa9\xb6\0" /* offset 17619 */
-  "\xe9\x9f\xa0\0" /* offset 17623 */
-  "\xf0\xa9\x90\x8a\0" /* offset 17627 */
-  "\xe4\xaa\xb2\0" /* offset 17632 */
-  "\xf0\xa9\x92\x96\0" /* offset 17636 */
-  "\xe9\xa0\xa9\0" /* offset 17641 */
-  "\xf0\xa9\x96\xb6\0" /* offset 17645 */
-  "\xe9\xa3\xa2\0" /* offset 17650 */
-  "\xe4\xac\xb3\0" /* offset 17654 */
-  "\xe9\xa4\xa9\0" /* offset 17658 */
-  "\xe9\xa6\xa7\0" /* offset 17662 */
-  "\xe9\xa7\x82\0" /* offset 17666 */
-  "\xe9\xa7\xbe\0" /* offset 17670 */
-  "\xe4\xaf\x8e\0" /* offset 17674 */
-  "\xf0\xa9\xac\xb0\0" /* offset 17678 */
-  "\xe9\xb1\x80\0" /* offset 17683 */
-  "\xe9\xb3\xbd\0" /* offset 17687 */
-  "\xe4\xb3\x8e\0" /* offset 17691 */
-  "\xe4\xb3\xad\0" /* offset 17695 */
-  "\xe9\xb5\xa7\0" /* offset 17699 */
-  "\xf0\xaa\x83\x8e\0" /* offset 17703 */
-  "\xe4\xb3\xb8\0" /* offset 17708 */
-  "\xf0\xaa\x84\x85\0" /* offset 17712 */
-  "\xf0\xaa\x88\x8e\0" /* offset 17717 */
-  "\xf0\xaa\x8a\x91\0" /* offset 17722 */
-  "\xe4\xb5\x96\0" /* offset 17727 */
-  "\xe9\xbb\xbe\0" /* offset 17731 */
-  "\xe9\xbc\x85\0" /* offset 17735 */
-  "\xe9\xbc\x8f\0" /* offset 17739 */
-  "\xe9\xbc\x96\0" /* offset 17743 */
-  "\xf0\xaa\x98\x80\0" /* offset 17747 */;
+  "\xe4\xbb\xa4\xe5\x92\x8c\0" /* offset 8996 */
+  "\xe3\x82\xa2\xe3\x83\x8f\xe3\x82\x9a\xe3\x83\xbc\xe3\x83\x88\0" /* offset 9003 */
+  "\xe3\x82\xa2\xe3\x83\xab\xe3\x83\x95\xe3\x82\xa1\0" /* offset 9019 */
+  "\xe3\x82\xa2\xe3\x83\xb3\xe3\x83\x98\xe3\x82\x9a\xe3\x82\xa2\0" /* offset 9032 */
+  "\xe3\x82\xa2\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9048 */
+  "\xe3\x82\xa4\xe3\x83\x8b\xe3\x83\xb3\xe3\x82\xaf\xe3\x82\x99\0" /* offset 9058 */
+  "\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x81\0" /* offset 9074 */
+  "\xe3\x82\xa6\xe3\x82\xa9\xe3\x83\xb3\0" /* offset 9084 */
+  "\xe3\x82\xa8\xe3\x82\xb9\xe3\x82\xaf\xe3\x83\xbc\xe3\x83\x88\xe3\x82\x99\0" /* offset 9094 */
+  "\xe3\x82\xa8\xe3\x83\xbc\xe3\x82\xab\xe3\x83\xbc\0" /* offset 9113 */
+  "\xe3\x82\xaa\xe3\x83\xb3\xe3\x82\xb9\0" /* offset 9126 */
+  "\xe3\x82\xaa\xe3\x83\xbc\xe3\x83\xa0\0" /* offset 9136 */
+  "\xe3\x82\xab\xe3\x82\xa4\xe3\x83\xaa\0" /* offset 9146 */
+  "\xe3\x82\xab\xe3\x83\xa9\xe3\x83\x83\xe3\x83\x88\0" /* offset 9156 */
+  "\xe3\x82\xab\xe3\x83\xad\xe3\x83\xaa\xe3\x83\xbc\0" /* offset 9169 */
+  "\xe3\x82\xab\xe3\x82\x99\xe3\x83\xad\xe3\x83\xb3\0" /* offset 9182 */
+  "\xe3\x82\xab\xe3\x82\x99\xe3\x83\xb3\xe3\x83\x9e\0" /* offset 9195 */
+  "\xe3\x82\xad\xe3\x82\x99\xe3\x82\xab\xe3\x82\x99\0" /* offset 9208 */
+  "\xe3\x82\xad\xe3\x82\x99\xe3\x83\x8b\xe3\x83\xbc\0" /* offset 9221 */
+  "\xe3\x82\xad\xe3\x83\xa5\xe3\x83\xaa\xe3\x83\xbc\0" /* offset 9234 */
+  "\xe3\x82\xad\xe3\x82\x99\xe3\x83\xab\xe3\x82\xbf\xe3\x82\x99\xe3\x83\xbc\0" /* offset 9247 */
+  "\xe3\x82\xad\xe3\x83\xad\0" /* offset 9266 */
+  "\xe3\x82\xad\xe3\x83\xad\xe3\x82\xaf\xe3\x82\x99\xe3\x83\xa9\xe3\x83\xa0\0" /* offset 9273 */
+  "\xe3\x82\xad\xe3\x83\xad\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\x88\xe3\x83\xab\0" /* offset 9292 */
+  "\xe3\x82\xad\xe3\x83\xad\xe3\x83\xaf\xe3\x83\x83\xe3\x83\x88\0" /* offset 9311 */
+  "\xe3\x82\xaf\xe3\x82\x99\xe3\x83\xa9\xe3\x83\xa0\0" /* offset 9327 */
+  "\xe3\x82\xaf\xe3\x82\x99\xe3\x83\xa9\xe3\x83\xa0\xe3\x83\x88\xe3\x83\xb3\0" /* offset 9340 */
+  "\xe3\x82\xaf\xe3\x83\xab\xe3\x82\xbb\xe3\x82\x99\xe3\x82\xa4\xe3\x83\xad\0" /* offset 9359 */
+  "\xe3\x82\xaf\xe3\x83\xad\xe3\x83\xbc\xe3\x83\x8d\0" /* offset 9378 */
+  "\xe3\x82\xb1\xe3\x83\xbc\xe3\x82\xb9\0" /* offset 9391 */
+  "\xe3\x82\xb3\xe3\x83\xab\xe3\x83\x8a\0" /* offset 9401 */
+  "\xe3\x82\xb3\xe3\x83\xbc\xe3\x83\x9b\xe3\x82\x9a\0" /* offset 9411 */
+  "\xe3\x82\xb5\xe3\x82\xa4\xe3\x82\xaf\xe3\x83\xab\0" /* offset 9424 */
+  "\xe3\x82\xb5\xe3\x83\xb3\xe3\x83\x81\xe3\x83\xbc\xe3\x83\xa0\0" /* offset 9437 */
+  "\xe3\x82\xb7\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf\xe3\x82\x99\0" /* offset 9453 */
+  "\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x81\0" /* offset 9469 */
+  "\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x88\0" /* offset 9479 */
+  "\xe3\x82\xbf\xe3\x82\x99\xe3\x83\xbc\xe3\x82\xb9\0" /* offset 9489 */
+  "\xe3\x83\x86\xe3\x82\x99\xe3\x82\xb7\0" /* offset 9502 */
+  "\xe3\x83\x88\xe3\x82\x99\xe3\x83\xab\0" /* offset 9512 */
+  "\xe3\x83\x88\xe3\x83\xb3\0" /* offset 9522 */
+  "\xe3\x83\x8a\xe3\x83\x8e\0" /* offset 9529 */
+  "\xe3\x83\x8e\xe3\x83\x83\xe3\x83\x88\0" /* offset 9536 */
+  "\xe3\x83\x8f\xe3\x82\xa4\xe3\x83\x84\0" /* offset 9546 */
+  "\xe3\x83\x8f\xe3\x82\x9a\xe3\x83\xbc\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x88\0" /* offset 9556 */
+  "\xe3\x83\x8f\xe3\x82\x9a\xe3\x83\xbc\xe3\x83\x84\0" /* offset 9575 */
+  "\xe3\x83\x8f\xe3\x82\x99\xe3\x83\xbc\xe3\x83\xac\xe3\x83\xab\0" /* offset 9588 */
+  "\xe3\x83\x92\xe3\x82\x9a\xe3\x82\xa2\xe3\x82\xb9\xe3\x83\x88\xe3\x83\xab\0" /* offset 9604 */
+  "\xe3\x83\x92\xe3\x82\x9a\xe3\x82\xaf\xe3\x83\xab\0" /* offset 9623 */
+  "\xe3\x83\x92\xe3\x82\x9a\xe3\x82\xb3\0" /* offset 9636 */
+  "\xe3\x83\x92\xe3\x82\x99\xe3\x83\xab\0" /* offset 9646 */
+  "\xe3\x83\x95\xe3\x82\xa1\xe3\x83\xa9\xe3\x83\x83\xe3\x83\x88\xe3\x82\x99\0" /* offset 9656 */
+  "\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xbc\xe3\x83\x88\0" /* offset 9675 */
+  "\xe3\x83\x95\xe3\x82\x99\xe3\x83\x83\xe3\x82\xb7\xe3\x82\xa7\xe3\x83\xab\0" /* offset 9688 */
+  "\xe3\x83\x95\xe3\x83\xa9\xe3\x83\xb3\0" /* offset 9707 */
+  "\xe3\x83\x98\xe3\x82\xaf\xe3\x82\xbf\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9717 */
+  "\xe3\x83\x98\xe3\x82\x9a\xe3\x82\xbd\0" /* offset 9733 */
+  "\xe3\x83\x98\xe3\x82\x9a\xe3\x83\x8b\xe3\x83\x92\0" /* offset 9743 */
+  "\xe3\x83\x98\xe3\x83\xab\xe3\x83\x84\0" /* offset 9756 */
+  "\xe3\x83\x98\xe3\x82\x9a\xe3\x83\xb3\xe3\x82\xb9\0" /* offset 9766 */
+  "\xe3\x83\x98\xe3\x82\x9a\xe3\x83\xbc\xe3\x82\xb7\xe3\x82\x99\0" /* offset 9779 */
+  "\xe3\x83\x98\xe3\x82\x99\xe3\x83\xbc\xe3\x82\xbf\0" /* offset 9795 */
+  "\xe3\x83\x9b\xe3\x82\x9a\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x88\0" /* offset 9808 */
+  "\xe3\x83\x9b\xe3\x82\x99\xe3\x83\xab\xe3\x83\x88\0" /* offset 9824 */
+  "\xe3\x83\x9b\xe3\x83\xb3\0" /* offset 9837 */
+  "\xe3\x83\x9b\xe3\x82\x9a\xe3\x83\xb3\xe3\x83\x88\xe3\x82\x99\0" /* offset 9844 */
+  "\xe3\x83\x9b\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9860 */
+  "\xe3\x83\x9b\xe3\x83\xbc\xe3\x83\xb3\0" /* offset 9870 */
+  "\xe3\x83\x9e\xe3\x82\xa4\xe3\x82\xaf\xe3\x83\xad\0" /* offset 9880 */
+  "\xe3\x83\x9e\xe3\x82\xa4\xe3\x83\xab\0" /* offset 9893 */
+  "\xe3\x83\x9e\xe3\x83\x83\xe3\x83\x8f\0" /* offset 9903 */
+  "\xe3\x83\x9e\xe3\x83\xab\xe3\x82\xaf\0" /* offset 9913 */
+  "\xe3\x83\x9e\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\0" /* offset 9923 */
+  "\xe3\x83\x9f\xe3\x82\xaf\xe3\x83\xad\xe3\x83\xb3\0" /* offset 9939 */
+  "\xe3\x83\x9f\xe3\x83\xaa\0" /* offset 9952 */
+  "\xe3\x83\x9f\xe3\x83\xaa\xe3\x83\x8f\xe3\x82\x99\xe3\x83\xbc\xe3\x83\xab\0" /* offset 9959 */
+  "\xe3\x83\xa1\xe3\x82\xab\xe3\x82\x99\0" /* offset 9978 */
+  "\xe3\x83\xa1\xe3\x82\xab\xe3\x82\x99\xe3\x83\x88\xe3\x83\xb3\0" /* offset 9988 */
+  "\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\x88\xe3\x83\xab\0" /* offset 10004 */
+  "\xe3\x83\xa4\xe3\x83\xbc\xe3\x83\x88\xe3\x82\x99\0" /* offset 10017 */
+  "\xe3\x83\xa4\xe3\x83\xbc\xe3\x83\xab\0" /* offset 10030 */
+  "\xe3\x83\xa6\xe3\x82\xa2\xe3\x83\xb3\0" /* offset 10040 */
+  "\xe3\x83\xaa\xe3\x83\x83\xe3\x83\x88\xe3\x83\xab\0" /* offset 10050 */
+  "\xe3\x83\xaa\xe3\x83\xa9\0" /* offset 10063 */
+  "\xe3\x83\xab\xe3\x83\x92\xe3\x82\x9a\xe3\x83\xbc\0" /* offset 10070 */
+  "\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x95\xe3\x82\x99\xe3\x83\xab\0" /* offset 10083 */
+  "\xe3\x83\xac\xe3\x83\xa0\0" /* offset 10099 */
+  "\xe3\x83\xac\xe3\x83\xb3\xe3\x83\x88\xe3\x82\xb1\xe3\x82\x99\xe3\x83\xb3\0" /* offset 10106 */
+  "\xe3\x83\xaf\xe3\x83\x83\xe3\x83\x88\0" /* offset 10125 */
+  "\x30\xe7\x82\xb9\0" /* offset 10135 */
+  "\x31\xe7\x82\xb9\0" /* offset 10140 */
+  "\x32\xe7\x82\xb9\0" /* offset 10145 */
+  "\x33\xe7\x82\xb9\0" /* offset 10150 */
+  "\x34\xe7\x82\xb9\0" /* offset 10155 */
+  "\x35\xe7\x82\xb9\0" /* offset 10160 */
+  "\x36\xe7\x82\xb9\0" /* offset 10165 */
+  "\x37\xe7\x82\xb9\0" /* offset 10170 */
+  "\x38\xe7\x82\xb9\0" /* offset 10175 */
+  "\x39\xe7\x82\xb9\0" /* offset 10180 */
+  "\x31\x30\xe7\x82\xb9\0" /* offset 10185 */
+  "\x31\x31\xe7\x82\xb9\0" /* offset 10191 */
+  "\x31\x32\xe7\x82\xb9\0" /* offset 10197 */
+  "\x31\x33\xe7\x82\xb9\0" /* offset 10203 */
+  "\x31\x34\xe7\x82\xb9\0" /* offset 10209 */
+  "\x31\x35\xe7\x82\xb9\0" /* offset 10215 */
+  "\x31\x36\xe7\x82\xb9\0" /* offset 10221 */
+  "\x31\x37\xe7\x82\xb9\0" /* offset 10227 */
+  "\x31\x38\xe7\x82\xb9\0" /* offset 10233 */
+  "\x31\x39\xe7\x82\xb9\0" /* offset 10239 */
+  "\x32\x30\xe7\x82\xb9\0" /* offset 10245 */
+  "\x32\x31\xe7\x82\xb9\0" /* offset 10251 */
+  "\x32\x32\xe7\x82\xb9\0" /* offset 10257 */
+  "\x32\x33\xe7\x82\xb9\0" /* offset 10263 */
+  "\x32\x34\xe7\x82\xb9\0" /* offset 10269 */
+  "\x68\x50\x61\0" /* offset 10275 */
+  "\x64\x61\0" /* offset 10279 */
+  "\x41\x55\0" /* offset 10282 */
+  "\x62\x61\x72\0" /* offset 10285 */
+  "\x6f\x56\0" /* offset 10289 */
+  "\x70\x63\0" /* offset 10292 */
+  "\x64\x6d\0" /* offset 10295 */
+  "\x64\x6d\x32\0" /* offset 10298 */
+  "\x64\x6d\x33\0" /* offset 10302 */
+  "\x49\x55\0" /* offset 10306 */
+  "\xe5\xb9\xb3\xe6\x88\x90\0" /* offset 10309 */
+  "\xe6\x98\xad\xe5\x92\x8c\0" /* offset 10316 */
+  "\xe5\xa4\xa7\xe6\xad\xa3\0" /* offset 10323 */
+  "\xe6\x98\x8e\xe6\xb2\xbb\0" /* offset 10330 */
+  "\xe6\xa0\xaa\xe5\xbc\x8f\xe4\xbc\x9a\xe7\xa4\xbe\0" /* offset 10337 */
+  "\x70\x41\0" /* offset 10350 */
+  "\x6e\x41\0" /* offset 10353 */
+  "\xce\xbc\x41\0" /* offset 10356 */
+  "\x6d\x41\0" /* offset 10360 */
+  "\x6b\x41\0" /* offset 10363 */
+  "\x4b\x42\0" /* offset 10366 */
+  "\x4d\x42\0" /* offset 10369 */
+  "\x47\x42\0" /* offset 10372 */
+  "\x63\x61\x6c\0" /* offset 10375 */
+  "\x6b\x63\x61\x6c\0" /* offset 10379 */
+  "\x70\x46\0" /* offset 10384 */
+  "\x6e\x46\0" /* offset 10387 */
+  "\xce\xbc\x46\0" /* offset 10390 */
+  "\xce\xbc\x67\0" /* offset 10394 */
+  "\x6d\x67\0" /* offset 10398 */
+  "\x6b\x67\0" /* offset 10401 */
+  "\x48\x7a\0" /* offset 10404 */
+  "\x6b\x48\x7a\0" /* offset 10407 */
+  "\x4d\x48\x7a\0" /* offset 10411 */
+  "\x47\x48\x7a\0" /* offset 10415 */
+  "\x54\x48\x7a\0" /* offset 10419 */
+  "\xce\xbc\x6c\0" /* offset 10423 */
+  "\x6d\x6c\0" /* offset 10427 */
+  "\x64\x6c\0" /* offset 10430 */
+  "\x6b\x6c\0" /* offset 10433 */
+  "\x66\x6d\0" /* offset 10436 */
+  "\x6e\x6d\0" /* offset 10439 */
+  "\xce\xbc\x6d\0" /* offset 10442 */
+  "\x6d\x6d\0" /* offset 10446 */
+  "\x63\x6d\0" /* offset 10449 */
+  "\x6b\x6d\0" /* offset 10452 */
+  "\x6d\x6d\x32\0" /* offset 10455 */
+  "\x63\x6d\x32\0" /* offset 10459 */
+  "\x6d\x32\0" /* offset 10463 */
+  "\x6b\x6d\x32\0" /* offset 10466 */
+  "\x6d\x6d\x33\0" /* offset 10470 */
+  "\x63\x6d\x33\0" /* offset 10474 */
+  "\x6d\x33\0" /* offset 10478 */
+  "\x6b\x6d\x33\0" /* offset 10481 */
+  "\x6d\xe2\x88\x95\x73\0" /* offset 10485 */
+  "\x6d\xe2\x88\x95\x73\x32\0" /* offset 10491 */
+  "\x50\x61\0" /* offset 10498 */
+  "\x6b\x50\x61\0" /* offset 10501 */
+  "\x4d\x50\x61\0" /* offset 10505 */
+  "\x47\x50\x61\0" /* offset 10509 */
+  "\x72\x61\x64\0" /* offset 10513 */
+  "\x72\x61\x64\xe2\x88\x95\x73\0" /* offset 10517 */
+  "\x72\x61\x64\xe2\x88\x95\x73\x32\0" /* offset 10525 */
+  "\x70\x73\0" /* offset 10534 */
+  "\x6e\x73\0" /* offset 10537 */
+  "\xce\xbc\x73\0" /* offset 10540 */
+  "\x6d\x73\0" /* offset 10544 */
+  "\x70\x56\0" /* offset 10547 */
+  "\x6e\x56\0" /* offset 10550 */
+  "\xce\xbc\x56\0" /* offset 10553 */
+  "\x6d\x56\0" /* offset 10557 */
+  "\x6b\x56\0" /* offset 10560 */
+  "\x4d\x56\0" /* offset 10563 */
+  "\x70\x57\0" /* offset 10566 */
+  "\x6e\x57\0" /* offset 10569 */
+  "\xce\xbc\x57\0" /* offset 10572 */
+  "\x6d\x57\0" /* offset 10576 */
+  "\x6b\x57\0" /* offset 10579 */
+  "\x4d\x57\0" /* offset 10582 */
+  "\x6b\xce\xa9\0" /* offset 10585 */
+  "\x4d\xce\xa9\0" /* offset 10589 */
+  "\x61\x2e\x6d\x2e\0" /* offset 10593 */
+  "\x42\x71\0" /* offset 10598 */
+  "\x63\x63\0" /* offset 10601 */
+  "\x63\x64\0" /* offset 10604 */
+  "\x43\xe2\x88\x95\x6b\x67\0" /* offset 10607 */
+  "\x43\x6f\x2e\0" /* offset 10614 */
+  "\x64\x42\0" /* offset 10618 */
+  "\x47\x79\0" /* offset 10621 */
+  "\x68\x61\0" /* offset 10624 */
+  "\x48\x50\0" /* offset 10627 */
+  "\x69\x6e\0" /* offset 10630 */
+  "\x4b\x4b\0" /* offset 10633 */
+  "\x4b\x4d\0" /* offset 10636 */
+  "\x6b\x74\0" /* offset 10639 */
+  "\x6c\x6d\0" /* offset 10642 */
+  "\x6c\x6e\0" /* offset 10645 */
+  "\x6c\x6f\x67\0" /* offset 10648 */
+  "\x6c\x78\0" /* offset 10652 */
+  "\x6d\x62\0" /* offset 10655 */
+  "\x6d\x69\x6c\0" /* offset 10658 */
+  "\x6d\x6f\x6c\0" /* offset 10662 */
+  "\x50\x48\0" /* offset 10666 */
+  "\x70\x2e\x6d\x2e\0" /* offset 10669 */
+  "\x50\x50\x4d\0" /* offset 10674 */
+  "\x50\x52\0" /* offset 10678 */
+  "\x73\x72\0" /* offset 10681 */
+  "\x53\x76\0" /* offset 10684 */
+  "\x57\x62\0" /* offset 10687 */
+  "\x56\xe2\x88\x95\x6d\0" /* offset 10690 */
+  "\x41\xe2\x88\x95\x6d\0" /* offset 10696 */
+  "\x31\xe6\x97\xa5\0" /* offset 10702 */
+  "\x32\xe6\x97\xa5\0" /* offset 10707 */
+  "\x33\xe6\x97\xa5\0" /* offset 10712 */
+  "\x34\xe6\x97\xa5\0" /* offset 10717 */
+  "\x35\xe6\x97\xa5\0" /* offset 10722 */
+  "\x36\xe6\x97\xa5\0" /* offset 10727 */
+  "\x37\xe6\x97\xa5\0" /* offset 10732 */
+  "\x38\xe6\x97\xa5\0" /* offset 10737 */
+  "\x39\xe6\x97\xa5\0" /* offset 10742 */
+  "\x31\x30\xe6\x97\xa5\0" /* offset 10747 */
+  "\x31\x31\xe6\x97\xa5\0" /* offset 10753 */
+  "\x31\x32\xe6\x97\xa5\0" /* offset 10759 */
+  "\x31\x33\xe6\x97\xa5\0" /* offset 10765 */
+  "\x31\x34\xe6\x97\xa5\0" /* offset 10771 */
+  "\x31\x35\xe6\x97\xa5\0" /* offset 10777 */
+  "\x31\x36\xe6\x97\xa5\0" /* offset 10783 */
+  "\x31\x37\xe6\x97\xa5\0" /* offset 10789 */
+  "\x31\x38\xe6\x97\xa5\0" /* offset 10795 */
+  "\x31\x39\xe6\x97\xa5\0" /* offset 10801 */
+  "\x32\x30\xe6\x97\xa5\0" /* offset 10807 */
+  "\x32\x31\xe6\x97\xa5\0" /* offset 10813 */
+  "\x32\x32\xe6\x97\xa5\0" /* offset 10819 */
+  "\x32\x33\xe6\x97\xa5\0" /* offset 10825 */
+  "\x32\x34\xe6\x97\xa5\0" /* offset 10831 */
+  "\x32\x35\xe6\x97\xa5\0" /* offset 10837 */
+  "\x32\x36\xe6\x97\xa5\0" /* offset 10843 */
+  "\x32\x37\xe6\x97\xa5\0" /* offset 10849 */
+  "\x32\x38\xe6\x97\xa5\0" /* offset 10855 */
+  "\x32\x39\xe6\x97\xa5\0" /* offset 10861 */
+  "\x33\x30\xe6\x97\xa5\0" /* offset 10867 */
+  "\x33\x31\xe6\x97\xa5\0" /* offset 10873 */
+  "\x67\x61\x6c\0" /* offset 10879 */
+  "\xd1\x8a\0" /* offset 10883 */
+  "\xd1\x8c\0" /* offset 10886 */
+  "\xea\x9d\xaf\0" /* offset 10889 */
+  "\xc4\xa6\0" /* offset 10893 */
+  "\xc5\x93\0" /* offset 10896 */
+  "\xea\x9c\xa7\0" /* offset 10899 */
+  "\xea\xac\xb7\0" /* offset 10903 */
+  "\xc9\xab\0" /* offset 10907 */
+  "\xea\xad\x92\0" /* offset 10910 */
+  "\xe8\xb1\x88\0" /* offset 10914 */
+  "\xe6\x9b\xb4\0" /* offset 10918 */
+  "\xe8\xb3\x88\0" /* offset 10922 */
+  "\xe6\xbb\x91\0" /* offset 10926 */
+  "\xe4\xb8\xb2\0" /* offset 10930 */
+  "\xe5\x8f\xa5\0" /* offset 10934 */
+  "\xe5\xa5\x91\0" /* offset 10938 */
+  "\xe5\x96\x87\0" /* offset 10942 */
+  "\xe5\xa5\x88\0" /* offset 10946 */
+  "\xe6\x87\xb6\0" /* offset 10950 */
+  "\xe7\x99\xa9\0" /* offset 10954 */
+  "\xe7\xbe\x85\0" /* offset 10958 */
+  "\xe8\x98\xbf\0" /* offset 10962 */
+  "\xe8\x9e\xba\0" /* offset 10966 */
+  "\xe8\xa3\xb8\0" /* offset 10970 */
+  "\xe9\x82\x8f\0" /* offset 10974 */
+  "\xe6\xa8\x82\0" /* offset 10978 */
+  "\xe6\xb4\x9b\0" /* offset 10982 */
+  "\xe7\x83\x99\0" /* offset 10986 */
+  "\xe7\x8f\x9e\0" /* offset 10990 */
+  "\xe8\x90\xbd\0" /* offset 10994 */
+  "\xe9\x85\xaa\0" /* offset 10998 */
+  "\xe9\xa7\xb1\0" /* offset 11002 */
+  "\xe4\xba\x82\0" /* offset 11006 */
+  "\xe5\x8d\xb5\0" /* offset 11010 */
+  "\xe6\xac\x84\0" /* offset 11014 */
+  "\xe7\x88\x9b\0" /* offset 11018 */
+  "\xe8\x98\xad\0" /* offset 11022 */
+  "\xe9\xb8\x9e\0" /* offset 11026 */
+  "\xe5\xb5\x90\0" /* offset 11030 */
+  "\xe6\xbf\xab\0" /* offset 11034 */
+  "\xe8\x97\x8d\0" /* offset 11038 */
+  "\xe8\xa5\xa4\0" /* offset 11042 */
+  "\xe6\x8b\x89\0" /* offset 11046 */
+  "\xe8\x87\x98\0" /* offset 11050 */
+  "\xe8\xa0\x9f\0" /* offset 11054 */
+  "\xe5\xbb\x8a\0" /* offset 11058 */
+  "\xe6\x9c\x97\0" /* offset 11062 */
+  "\xe6\xb5\xaa\0" /* offset 11066 */
+  "\xe7\x8b\xbc\0" /* offset 11070 */
+  "\xe9\x83\x8e\0" /* offset 11074 */
+  "\xe4\xbe\x86\0" /* offset 11078 */
+  "\xe5\x86\xb7\0" /* offset 11082 */
+  "\xe5\x8b\x9e\0" /* offset 11086 */
+  "\xe6\x93\x84\0" /* offset 11090 */
+  "\xe6\xab\x93\0" /* offset 11094 */
+  "\xe7\x88\x90\0" /* offset 11098 */
+  "\xe7\x9b\xa7\0" /* offset 11102 */
+  "\xe8\x98\x86\0" /* offset 11106 */
+  "\xe8\x99\x9c\0" /* offset 11110 */
+  "\xe8\xb7\xaf\0" /* offset 11114 */
+  "\xe9\x9c\xb2\0" /* offset 11118 */
+  "\xe9\xad\xaf\0" /* offset 11122 */
+  "\xe9\xb7\xba\0" /* offset 11126 */
+  "\xe7\xa2\x8c\0" /* offset 11130 */
+  "\xe7\xa5\xbf\0" /* offset 11134 */
+  "\xe7\xb6\xa0\0" /* offset 11138 */
+  "\xe8\x8f\x89\0" /* offset 11142 */
+  "\xe9\x8c\x84\0" /* offset 11146 */
+  "\xe8\xab\x96\0" /* offset 11150 */
+  "\xe5\xa3\x9f\0" /* offset 11154 */
+  "\xe5\xbc\x84\0" /* offset 11158 */
+  "\xe7\xb1\xa0\0" /* offset 11162 */
+  "\xe8\x81\xbe\0" /* offset 11166 */
+  "\xe7\x89\xa2\0" /* offset 11170 */
+  "\xe7\xa3\x8a\0" /* offset 11174 */
+  "\xe8\xb3\x82\0" /* offset 11178 */
+  "\xe9\x9b\xb7\0" /* offset 11182 */
+  "\xe5\xa3\x98\0" /* offset 11186 */
+  "\xe5\xb1\xa2\0" /* offset 11190 */
+  "\xe6\xa8\x93\0" /* offset 11194 */
+  "\xe6\xb7\x9a\0" /* offset 11198 */
+  "\xe6\xbc\x8f\0" /* offset 11202 */
+  "\xe7\xb4\xaf\0" /* offset 11206 */
+  "\xe7\xb8\xb7\0" /* offset 11210 */
+  "\xe9\x99\x8b\0" /* offset 11214 */
+  "\xe5\x8b\x92\0" /* offset 11218 */
+  "\xe8\x82\x8b\0" /* offset 11222 */
+  "\xe5\x87\x9c\0" /* offset 11226 */
+  "\xe5\x87\x8c\0" /* offset 11230 */
+  "\xe7\xa8\x9c\0" /* offset 11234 */
+  "\xe7\xb6\xbe\0" /* offset 11238 */
+  "\xe8\x8f\xb1\0" /* offset 11242 */
+  "\xe9\x99\xb5\0" /* offset 11246 */
+  "\xe8\xae\x80\0" /* offset 11250 */
+  "\xe6\x8b\x8f\0" /* offset 11254 */
+  "\xe8\xab\xbe\0" /* offset 11258 */
+  "\xe4\xb8\xb9\0" /* offset 11262 */
+  "\xe5\xaf\xa7\0" /* offset 11266 */
+  "\xe6\x80\x92\0" /* offset 11270 */
+  "\xe7\x8e\x87\0" /* offset 11274 */
+  "\xe7\x95\xb0\0" /* offset 11278 */
+  "\xe5\x8c\x97\0" /* offset 11282 */
+  "\xe7\xa3\xbb\0" /* offset 11286 */
+  "\xe4\xbe\xbf\0" /* offset 11290 */
+  "\xe5\xbe\xa9\0" /* offset 11294 */
+  "\xe4\xb8\x8d\0" /* offset 11298 */
+  "\xe6\xb3\x8c\0" /* offset 11302 */
+  "\xe6\x95\xb8\0" /* offset 11306 */
+  "\xe7\xb4\xa2\0" /* offset 11310 */
+  "\xe5\x8f\x83\0" /* offset 11314 */
+  "\xe5\xa1\x9e\0" /* offset 11318 */
+  "\xe7\x9c\x81\0" /* offset 11322 */
+  "\xe8\x91\x89\0" /* offset 11326 */
+  "\xe8\xaa\xaa\0" /* offset 11330 */
+  "\xe6\xae\xba\0" /* offset 11334 */
+  "\xe6\xb2\x88\0" /* offset 11338 */
+  "\xe6\x8b\xbe\0" /* offset 11342 */
+  "\xe8\x8b\xa5\0" /* offset 11346 */
+  "\xe6\x8e\xa0\0" /* offset 11350 */
+  "\xe7\x95\xa5\0" /* offset 11354 */
+  "\xe4\xba\xae\0" /* offset 11358 */
+  "\xe5\x85\xa9\0" /* offset 11362 */
+  "\xe5\x87\x89\0" /* offset 11366 */
+  "\xe6\xa2\x81\0" /* offset 11370 */
+  "\xe7\xb3\xa7\0" /* offset 11374 */
+  "\xe8\x89\xaf\0" /* offset 11378 */
+  "\xe8\xab\x92\0" /* offset 11382 */
+  "\xe9\x87\x8f\0" /* offset 11386 */
+  "\xe5\x8b\xb5\0" /* offset 11390 */
+  "\xe5\x91\x82\0" /* offset 11394 */
+  "\xe5\xbb\xac\0" /* offset 11398 */
+  "\xe6\x97\x85\0" /* offset 11402 */
+  "\xe6\xbf\xbe\0" /* offset 11406 */
+  "\xe7\xa4\xaa\0" /* offset 11410 */
+  "\xe9\x96\xad\0" /* offset 11414 */
+  "\xe9\xa9\xaa\0" /* offset 11418 */
+  "\xe9\xba\x97\0" /* offset 11422 */
+  "\xe9\xbb\x8e\0" /* offset 11426 */
+  "\xe6\x9b\x86\0" /* offset 11430 */
+  "\xe6\xad\xb7\0" /* offset 11434 */
+  "\xe8\xbd\xa2\0" /* offset 11438 */
+  "\xe5\xb9\xb4\0" /* offset 11442 */
+  "\xe6\x86\x90\0" /* offset 11446 */
+  "\xe6\x88\x80\0" /* offset 11450 */
+  "\xe6\x92\x9a\0" /* offset 11454 */
+  "\xe6\xbc\xa3\0" /* offset 11458 */
+  "\xe7\x85\x89\0" /* offset 11462 */
+  "\xe7\x92\x89\0" /* offset 11466 */
+  "\xe7\xa7\x8a\0" /* offset 11470 */
+  "\xe7\xb7\xb4\0" /* offset 11474 */
+  "\xe8\x81\xaf\0" /* offset 11478 */
+  "\xe8\xbc\xa6\0" /* offset 11482 */
+  "\xe8\x93\xae\0" /* offset 11486 */
+  "\xe9\x80\xa3\0" /* offset 11490 */
+  "\xe9\x8d\x8a\0" /* offset 11494 */
+  "\xe5\x88\x97\0" /* offset 11498 */
+  "\xe5\x8a\xa3\0" /* offset 11502 */
+  "\xe5\x92\xbd\0" /* offset 11506 */
+  "\xe7\x83\x88\0" /* offset 11510 */
+  "\xe8\xa3\x82\0" /* offset 11514 */
+  "\xe5\xbb\x89\0" /* offset 11518 */
+  "\xe5\xbf\xb5\0" /* offset 11522 */
+  "\xe6\x8d\xbb\0" /* offset 11526 */
+  "\xe6\xae\xae\0" /* offset 11530 */
+  "\xe7\xb0\xbe\0" /* offset 11534 */
+  "\xe7\x8d\xb5\0" /* offset 11538 */
+  "\xe4\xbb\xa4\0" /* offset 11542 */
+  "\xe5\x9b\xb9\0" /* offset 11546 */
+  "\xe5\xb6\xba\0" /* offset 11550 */
+  "\xe6\x80\x9c\0" /* offset 11554 */
+  "\xe7\x8e\xb2\0" /* offset 11558 */
+  "\xe7\x91\xa9\0" /* offset 11562 */
+  "\xe7\xbe\x9a\0" /* offset 11566 */
+  "\xe8\x81\x86\0" /* offset 11570 */
+  "\xe9\x88\xb4\0" /* offset 11574 */
+  "\xe9\x9b\xb6\0" /* offset 11578 */
+  "\xe9\x9d\x88\0" /* offset 11582 */
+  "\xe9\xa0\x98\0" /* offset 11586 */
+  "\xe4\xbe\x8b\0" /* offset 11590 */
+  "\xe7\xa6\xae\0" /* offset 11594 */
+  "\xe9\x86\xb4\0" /* offset 11598 */
+  "\xe9\x9a\xb8\0" /* offset 11602 */
+  "\xe6\x83\xa1\0" /* offset 11606 */
+  "\xe4\xba\x86\0" /* offset 11610 */
+  "\xe5\x83\x9a\0" /* offset 11614 */
+  "\xe5\xaf\xae\0" /* offset 11618 */
+  "\xe5\xb0\xbf\0" /* offset 11622 */
+  "\xe6\x96\x99\0" /* offset 11626 */
+  "\xe7\x87\x8e\0" /* offset 11630 */
+  "\xe7\x99\x82\0" /* offset 11634 */
+  "\xe8\x93\xbc\0" /* offset 11638 */
+  "\xe9\x81\xbc\0" /* offset 11642 */
+  "\xe6\x9a\x88\0" /* offset 11646 */
+  "\xe9\x98\xae\0" /* offset 11650 */
+  "\xe5\x8a\x89\0" /* offset 11654 */
+  "\xe6\x9d\xbb\0" /* offset 11658 */
+  "\xe6\x9f\xb3\0" /* offset 11662 */
+  "\xe6\xb5\x81\0" /* offset 11666 */
+  "\xe6\xba\x9c\0" /* offset 11670 */
+  "\xe7\x90\x89\0" /* offset 11674 */
+  "\xe7\x95\x99\0" /* offset 11678 */
+  "\xe7\xa1\xab\0" /* offset 11682 */
+  "\xe7\xb4\x90\0" /* offset 11686 */
+  "\xe9\xa1\x9e\0" /* offset 11690 */
+  "\xe6\x88\xae\0" /* offset 11694 */
+  "\xe9\x99\xb8\0" /* offset 11698 */
+  "\xe5\x80\xab\0" /* offset 11702 */
+  "\xe5\xb4\x99\0" /* offset 11706 */
+  "\xe6\xb7\xaa\0" /* offset 11710 */
+  "\xe8\xbc\xaa\0" /* offset 11714 */
+  "\xe5\xbe\x8b\0" /* offset 11718 */
+  "\xe6\x85\x84\0" /* offset 11722 */
+  "\xe6\xa0\x97\0" /* offset 11726 */
+  "\xe9\x9a\x86\0" /* offset 11730 */
+  "\xe5\x88\xa9\0" /* offset 11734 */
+  "\xe5\x90\x8f\0" /* offset 11738 */
+  "\xe5\xb1\xa5\0" /* offset 11742 */
+  "\xe6\x98\x93\0" /* offset 11746 */
+  "\xe6\x9d\x8e\0" /* offset 11750 */
+  "\xe6\xa2\xa8\0" /* offset 11754 */
+  "\xe6\xb3\xa5\0" /* offset 11758 */
+  "\xe7\x90\x86\0" /* offset 11762 */
+  "\xe7\x97\xa2\0" /* offset 11766 */
+  "\xe7\xbd\xb9\0" /* offset 11770 */
+  "\xe8\xa3\x8f\0" /* offset 11774 */
+  "\xe8\xa3\xa1\0" /* offset 11778 */
+  "\xe9\x9b\xa2\0" /* offset 11782 */
+  "\xe5\x8c\xbf\0" /* offset 11786 */
+  "\xe6\xba\xba\0" /* offset 11790 */
+  "\xe5\x90\x9d\0" /* offset 11794 */
+  "\xe7\x87\x90\0" /* offset 11798 */
+  "\xe7\x92\x98\0" /* offset 11802 */
+  "\xe8\x97\xba\0" /* offset 11806 */
+  "\xe9\x9a\xa3\0" /* offset 11810 */
+  "\xe9\xb1\x97\0" /* offset 11814 */
+  "\xe9\xba\x9f\0" /* offset 11818 */
+  "\xe6\x9e\x97\0" /* offset 11822 */
+  "\xe6\xb7\x8b\0" /* offset 11826 */
+  "\xe8\x87\xa8\0" /* offset 11830 */
+  "\xe7\xac\xa0\0" /* offset 11834 */
+  "\xe7\xb2\x92\0" /* offset 11838 */
+  "\xe7\x8b\x80\0" /* offset 11842 */
+  "\xe7\x82\x99\0" /* offset 11846 */
+  "\xe8\xad\x98\0" /* offset 11850 */
+  "\xe4\xbb\x80\0" /* offset 11854 */
+  "\xe8\x8c\xb6\0" /* offset 11858 */
+  "\xe5\x88\xba\0" /* offset 11862 */
+  "\xe5\x88\x87\0" /* offset 11866 */
+  "\xe5\xba\xa6\0" /* offset 11870 */
+  "\xe6\x8b\x93\0" /* offset 11874 */
+  "\xe7\xb3\x96\0" /* offset 11878 */
+  "\xe5\xae\x85\0" /* offset 11882 */
+  "\xe6\xb4\x9e\0" /* offset 11886 */
+  "\xe6\x9a\xb4\0" /* offset 11890 */
+  "\xe8\xbc\xbb\0" /* offset 11894 */
+  "\xe9\x99\x8d\0" /* offset 11898 */
+  "\xe5\xbb\x93\0" /* offset 11902 */
+  "\xe5\x85\x80\0" /* offset 11906 */
+  "\xe5\x97\x80\0" /* offset 11910 */
+  "\xe5\xa1\x9a\0" /* offset 11914 */
+  "\xe6\x99\xb4\0" /* offset 11918 */
+  "\xe5\x87\x9e\0" /* offset 11922 */
+  "\xe7\x8c\xaa\0" /* offset 11926 */
+  "\xe7\x9b\x8a\0" /* offset 11930 */
+  "\xe7\xa4\xbc\0" /* offset 11934 */
+  "\xe7\xa5\x9e\0" /* offset 11938 */
+  "\xe7\xa5\xa5\0" /* offset 11942 */
+  "\xe7\xa6\x8f\0" /* offset 11946 */
+  "\xe9\x9d\x96\0" /* offset 11950 */
+  "\xe7\xb2\xbe\0" /* offset 11954 */
+  "\xe8\x98\x92\0" /* offset 11958 */
+  "\xe8\xab\xb8\0" /* offset 11962 */
+  "\xe9\x80\xb8\0" /* offset 11966 */
+  "\xe9\x83\xbd\0" /* offset 11970 */
+  "\xe9\xa3\xaf\0" /* offset 11974 */
+  "\xe9\xa3\xbc\0" /* offset 11978 */
+  "\xe9\xa4\xa8\0" /* offset 11982 */
+  "\xe9\xb6\xb4\0" /* offset 11986 */
+  "\xe9\x83\x9e\0" /* offset 11990 */
+  "\xe9\x9a\xb7\0" /* offset 11994 */
+  "\xe4\xbe\xae\0" /* offset 11998 */
+  "\xe5\x83\xa7\0" /* offset 12002 */
+  "\xe5\x85\x8d\0" /* offset 12006 */
+  "\xe5\x8b\x89\0" /* offset 12010 */
+  "\xe5\x8b\xa4\0" /* offset 12014 */
+  "\xe5\x8d\x91\0" /* offset 12018 */
+  "\xe5\x96\x9d\0" /* offset 12022 */
+  "\xe5\x98\x86\0" /* offset 12026 */
+  "\xe5\x99\xa8\0" /* offset 12030 */
+  "\xe5\xa1\x80\0" /* offset 12034 */
+  "\xe5\xa2\xa8\0" /* offset 12038 */
+  "\xe5\xb1\xa4\0" /* offset 12042 */
+  "\xe6\x82\x94\0" /* offset 12046 */
+  "\xe6\x85\xa8\0" /* offset 12050 */
+  "\xe6\x86\x8e\0" /* offset 12054 */
+  "\xe6\x87\xb2\0" /* offset 12058 */
+  "\xe6\x95\x8f\0" /* offset 12062 */
+  "\xe6\x97\xa2\0" /* offset 12066 */
+  "\xe6\x9a\x91\0" /* offset 12070 */
+  "\xe6\xa2\x85\0" /* offset 12074 */
+  "\xe6\xb5\xb7\0" /* offset 12078 */
+  "\xe6\xb8\x9a\0" /* offset 12082 */
+  "\xe6\xbc\xa2\0" /* offset 12086 */
+  "\xe7\x85\xae\0" /* offset 12090 */
+  "\xe7\x88\xab\0" /* offset 12094 */
+  "\xe7\x90\xa2\0" /* offset 12098 */
+  "\xe7\xa2\x91\0" /* offset 12102 */
+  "\xe7\xa5\x89\0" /* offset 12106 */
+  "\xe7\xa5\x88\0" /* offset 12110 */
+  "\xe7\xa5\x90\0" /* offset 12114 */
+  "\xe7\xa5\x96\0" /* offset 12118 */
+  "\xe7\xa6\x8d\0" /* offset 12122 */
+  "\xe7\xa6\x8e\0" /* offset 12126 */
+  "\xe7\xa9\x80\0" /* offset 12130 */
+  "\xe7\xaa\x81\0" /* offset 12134 */
+  "\xe7\xaf\x80\0" /* offset 12138 */
+  "\xe7\xb8\x89\0" /* offset 12142 */
+  "\xe7\xb9\x81\0" /* offset 12146 */
+  "\xe7\xbd\xb2\0" /* offset 12150 */
+  "\xe8\x80\x85\0" /* offset 12154 */
+  "\xe8\x87\xad\0" /* offset 12158 */
+  "\xe8\x89\xb9\0" /* offset 12162 */
+  "\xe8\x91\x97\0" /* offset 12166 */
+  "\xe8\xa4\x90\0" /* offset 12170 */
+  "\xe8\xa6\x96\0" /* offset 12174 */
+  "\xe8\xac\x81\0" /* offset 12178 */
+  "\xe8\xac\xb9\0" /* offset 12182 */
+  "\xe8\xb3\x93\0" /* offset 12186 */
+  "\xe8\xb4\x88\0" /* offset 12190 */
+  "\xe8\xbe\xb6\0" /* offset 12194 */
+  "\xe9\x9b\xa3\0" /* offset 12198 */
+  "\xe9\x9f\xbf\0" /* offset 12202 */
+  "\xe9\xa0\xbb\0" /* offset 12206 */
+  "\xe6\x81\xb5\0" /* offset 12210 */
+  "\xf0\xa4\x8b\xae\0" /* offset 12214 */
+  "\xe8\x88\x98\0" /* offset 12219 */
+  "\xe4\xb8\xa6\0" /* offset 12223 */
+  "\xe5\x86\xb5\0" /* offset 12227 */
+  "\xe5\x85\xa8\0" /* offset 12231 */
+  "\xe4\xbe\x80\0" /* offset 12235 */
+  "\xe5\x85\x85\0" /* offset 12239 */
+  "\xe5\x86\x80\0" /* offset 12243 */
+  "\xe5\x8b\x87\0" /* offset 12247 */
+  "\xe5\x8b\xba\0" /* offset 12251 */
+  "\xe5\x95\x95\0" /* offset 12255 */
+  "\xe5\x96\x99\0" /* offset 12259 */
+  "\xe5\x97\xa2\0" /* offset 12263 */
+  "\xe5\xa2\xb3\0" /* offset 12267 */
+  "\xe5\xa5\x84\0" /* offset 12271 */
+  "\xe5\xa5\x94\0" /* offset 12275 */
+  "\xe5\xa9\xa2\0" /* offset 12279 */
+  "\xe5\xac\xa8\0" /* offset 12283 */
+  "\xe5\xbb\x92\0" /* offset 12287 */
+  "\xe5\xbb\x99\0" /* offset 12291 */
+  "\xe5\xbd\xa9\0" /* offset 12295 */
+  "\xe5\xbe\xad\0" /* offset 12299 */
+  "\xe6\x83\x98\0" /* offset 12303 */
+  "\xe6\x85\x8e\0" /* offset 12307 */
+  "\xe6\x84\x88\0" /* offset 12311 */
+  "\xe6\x85\xa0\0" /* offset 12315 */
+  "\xe6\x88\xb4\0" /* offset 12319 */
+  "\xe6\x8f\x84\0" /* offset 12323 */
+  "\xe6\x90\x9c\0" /* offset 12327 */
+  "\xe6\x91\x92\0" /* offset 12331 */
+  "\xe6\x95\x96\0" /* offset 12335 */
+  "\xe6\x9c\x9b\0" /* offset 12339 */
+  "\xe6\x9d\x96\0" /* offset 12343 */
+  "\xe6\xbb\x9b\0" /* offset 12347 */
+  "\xe6\xbb\x8b\0" /* offset 12351 */
+  "\xe7\x80\x9e\0" /* offset 12355 */
+  "\xe7\x9e\xa7\0" /* offset 12359 */
+  "\xe7\x88\xb5\0" /* offset 12363 */
+  "\xe7\x8a\xaf\0" /* offset 12367 */
+  "\xe7\x91\xb1\0" /* offset 12371 */
+  "\xe7\x94\x86\0" /* offset 12375 */
+  "\xe7\x94\xbb\0" /* offset 12379 */
+  "\xe7\x98\x9d\0" /* offset 12383 */
+  "\xe7\x98\x9f\0" /* offset 12387 */
+  "\xe7\x9b\x9b\0" /* offset 12391 */
+  "\xe7\x9b\xb4\0" /* offset 12395 */
+  "\xe7\x9d\x8a\0" /* offset 12399 */
+  "\xe7\x9d\x80\0" /* offset 12403 */
+  "\xe7\xa3\x8c\0" /* offset 12407 */
+  "\xe7\xaa\xb1\0" /* offset 12411 */
+  "\xe7\xb1\xbb\0" /* offset 12415 */
+  "\xe7\xb5\x9b\0" /* offset 12419 */
+  "\xe7\xbc\xbe\0" /* offset 12423 */
+  "\xe8\x8d\x92\0" /* offset 12427 */
+  "\xe8\x8f\xaf\0" /* offset 12431 */
+  "\xe8\x9d\xb9\0" /* offset 12435 */
+  "\xe8\xa5\x81\0" /* offset 12439 */
+  "\xe8\xa6\x86\0" /* offset 12443 */
+  "\xe8\xaa\xbf\0" /* offset 12447 */
+  "\xe8\xab\x8b\0" /* offset 12451 */
+  "\xe8\xab\xad\0" /* offset 12455 */
+  "\xe8\xae\x8a\0" /* offset 12459 */
+  "\xe8\xbc\xb8\0" /* offset 12463 */
+  "\xe9\x81\xb2\0" /* offset 12467 */
+  "\xe9\x86\x99\0" /* offset 12471 */
+  "\xe9\x89\xb6\0" /* offset 12475 */
+  "\xe9\x99\xbc\0" /* offset 12479 */
+  "\xe9\x9f\x9b\0" /* offset 12483 */
+  "\xe9\xa0\x8b\0" /* offset 12487 */
+  "\xe9\xac\x92\0" /* offset 12491 */
+  "\xf0\xa2\xa1\x8a\0" /* offset 12495 */
+  "\xf0\xa2\xa1\x84\0" /* offset 12500 */
+  "\xf0\xa3\x8f\x95\0" /* offset 12505 */
+  "\xe3\xae\x9d\0" /* offset 12510 */
+  "\xe4\x80\x98\0" /* offset 12514 */
+  "\xe4\x80\xb9\0" /* offset 12518 */
+  "\xf0\xa5\x89\x89\0" /* offset 12522 */
+  "\xf0\xa5\xb3\x90\0" /* offset 12527 */
+  "\xf0\xa7\xbb\x93\0" /* offset 12532 */
+  "\xe9\xbd\x83\0" /* offset 12537 */
+  "\xe9\xbe\x8e\0" /* offset 12541 */
+  "\x66\x66\0" /* offset 12545 */
+  "\x66\x69\0" /* offset 12548 */
+  "\x66\x6c\0" /* offset 12551 */
+  "\x66\x66\x69\0" /* offset 12554 */
+  "\x66\x66\x6c\0" /* offset 12558 */
+  "\x73\x74\0" /* offset 12562 */
+  "\xd5\xb4\xd5\xb6\0" /* offset 12565 */
+  "\xd5\xb4\xd5\xa5\0" /* offset 12570 */
+  "\xd5\xb4\xd5\xab\0" /* offset 12575 */
+  "\xd5\xbe\xd5\xb6\0" /* offset 12580 */
+  "\xd5\xb4\xd5\xad\0" /* offset 12585 */
+  "\xd7\x99\xd6\xb4\0" /* offset 12590 */
+  "\xd7\xb2\xd6\xb7\0" /* offset 12595 */
+  "\xd7\xa2\0" /* offset 12600 */
+  "\xd7\x94\0" /* offset 12603 */
+  "\xd7\x9b\0" /* offset 12606 */
+  "\xd7\x9c\0" /* offset 12609 */
+  "\xd7\x9d\0" /* offset 12612 */
+  "\xd7\xa8\0" /* offset 12615 */
+  "\xd7\xaa\0" /* offset 12618 */
+  "\xd7\xa9\xd7\x81\0" /* offset 12621 */
+  "\xd7\xa9\xd7\x82\0" /* offset 12626 */
+  "\xd7\xa9\xd6\xbc\xd7\x81\0" /* offset 12631 */
+  "\xd7\xa9\xd6\xbc\xd7\x82\0" /* offset 12638 */
+  "\xd7\x90\xd6\xb7\0" /* offset 12645 */
+  "\xd7\x90\xd6\xb8\0" /* offset 12650 */
+  "\xd7\x90\xd6\xbc\0" /* offset 12655 */
+  "\xd7\x91\xd6\xbc\0" /* offset 12660 */
+  "\xd7\x92\xd6\xbc\0" /* offset 12665 */
+  "\xd7\x93\xd6\xbc\0" /* offset 12670 */
+  "\xd7\x94\xd6\xbc\0" /* offset 12675 */
+  "\xd7\x95\xd6\xbc\0" /* offset 12680 */
+  "\xd7\x96\xd6\xbc\0" /* offset 12685 */
+  "\xd7\x98\xd6\xbc\0" /* offset 12690 */
+  "\xd7\x99\xd6\xbc\0" /* offset 12695 */
+  "\xd7\x9a\xd6\xbc\0" /* offset 12700 */
+  "\xd7\x9b\xd6\xbc\0" /* offset 12705 */
+  "\xd7\x9c\xd6\xbc\0" /* offset 12710 */
+  "\xd7\x9e\xd6\xbc\0" /* offset 12715 */
+  "\xd7\xa0\xd6\xbc\0" /* offset 12720 */
+  "\xd7\xa1\xd6\xbc\0" /* offset 12725 */
+  "\xd7\xa3\xd6\xbc\0" /* offset 12730 */
+  "\xd7\xa4\xd6\xbc\0" /* offset 12735 */
+  "\xd7\xa6\xd6\xbc\0" /* offset 12740 */
+  "\xd7\xa7\xd6\xbc\0" /* offset 12745 */
+  "\xd7\xa8\xd6\xbc\0" /* offset 12750 */
+  "\xd7\xa9\xd6\xbc\0" /* offset 12755 */
+  "\xd7\xaa\xd6\xbc\0" /* offset 12760 */
+  "\xd7\x95\xd6\xb9\0" /* offset 12765 */
+  "\xd7\x91\xd6\xbf\0" /* offset 12770 */
+  "\xd7\x9b\xd6\xbf\0" /* offset 12775 */
+  "\xd7\xa4\xd6\xbf\0" /* offset 12780 */
+  "\xd7\x90\xd7\x9c\0" /* offset 12785 */
+  "\xd9\xb1\0" /* offset 12790 */
+  "\xd9\xbb\0" /* offset 12793 */
+  "\xd9\xbe\0" /* offset 12796 */
+  "\xda\x80\0" /* offset 12799 */
+  "\xd9\xba\0" /* offset 12802 */
+  "\xd9\xbf\0" /* offset 12805 */
+  "\xd9\xb9\0" /* offset 12808 */
+  "\xda\xa4\0" /* offset 12811 */
+  "\xda\xa6\0" /* offset 12814 */
+  "\xda\x84\0" /* offset 12817 */
+  "\xda\x83\0" /* offset 12820 */
+  "\xda\x86\0" /* offset 12823 */
+  "\xda\x87\0" /* offset 12826 */
+  "\xda\x8d\0" /* offset 12829 */
+  "\xda\x8c\0" /* offset 12832 */
+  "\xda\x8e\0" /* offset 12835 */
+  "\xda\x88\0" /* offset 12838 */
+  "\xda\x98\0" /* offset 12841 */
+  "\xda\x91\0" /* offset 12844 */
+  "\xda\xa9\0" /* offset 12847 */
+  "\xda\xaf\0" /* offset 12850 */
+  "\xda\xb3\0" /* offset 12853 */
+  "\xda\xb1\0" /* offset 12856 */
+  "\xda\xba\0" /* offset 12859 */
+  "\xda\xbb\0" /* offset 12862 */
+  "\xdb\x81\0" /* offset 12865 */
+  "\xda\xbe\0" /* offset 12868 */
+  "\xdb\x92\0" /* offset 12871 */
+  "\xda\xad\0" /* offset 12874 */
+  "\xdb\x87\0" /* offset 12877 */
+  "\xdb\x86\0" /* offset 12880 */
+  "\xdb\x88\0" /* offset 12883 */
+  "\xdb\x8b\0" /* offset 12886 */
+  "\xdb\x85\0" /* offset 12889 */
+  "\xdb\x89\0" /* offset 12892 */
+  "\xdb\x90\0" /* offset 12895 */
+  "\xd9\x89\0" /* offset 12898 */
+  "\xd9\x8a\xd9\x94\xd8\xa7\0" /* offset 12901 */
+  "\xd9\x8a\xd9\x94\xdb\x95\0" /* offset 12908 */
+  "\xd9\x8a\xd9\x94\xd9\x88\0" /* offset 12915 */
+  "\xd9\x8a\xd9\x94\xdb\x87\0" /* offset 12922 */
+  "\xd9\x8a\xd9\x94\xdb\x86\0" /* offset 12929 */
+  "\xd9\x8a\xd9\x94\xdb\x88\0" /* offset 12936 */
+  "\xd9\x8a\xd9\x94\xdb\x90\0" /* offset 12943 */
+  "\xd9\x8a\xd9\x94\xd9\x89\0" /* offset 12950 */
+  "\xdb\x8c\0" /* offset 12957 */
+  "\xd9\x8a\xd9\x94\xd8\xac\0" /* offset 12960 */
+  "\xd9\x8a\xd9\x94\xd8\xad\0" /* offset 12967 */
+  "\xd9\x8a\xd9\x94\xd9\x85\0" /* offset 12974 */
+  "\xd9\x8a\xd9\x94\xd9\x8a\0" /* offset 12981 */
+  "\xd8\xa8\xd8\xac\0" /* offset 12988 */
+  "\xd8\xa8\xd8\xad\0" /* offset 12993 */
+  "\xd8\xa8\xd8\xae\0" /* offset 12998 */
+  "\xd8\xa8\xd9\x85\0" /* offset 13003 */
+  "\xd8\xa8\xd9\x89\0" /* offset 13008 */
+  "\xd8\xa8\xd9\x8a\0" /* offset 13013 */
+  "\xd8\xaa\xd8\xac\0" /* offset 13018 */
+  "\xd8\xaa\xd8\xad\0" /* offset 13023 */
+  "\xd8\xaa\xd8\xae\0" /* offset 13028 */
+  "\xd8\xaa\xd9\x85\0" /* offset 13033 */
+  "\xd8\xaa\xd9\x89\0" /* offset 13038 */
+  "\xd8\xaa\xd9\x8a\0" /* offset 13043 */
+  "\xd8\xab\xd8\xac\0" /* offset 13048 */
+  "\xd8\xab\xd9\x85\0" /* offset 13053 */
+  "\xd8\xab\xd9\x89\0" /* offset 13058 */
+  "\xd8\xab\xd9\x8a\0" /* offset 13063 */
+  "\xd8\xac\xd8\xad\0" /* offset 13068 */
+  "\xd8\xac\xd9\x85\0" /* offset 13073 */
+  "\xd8\xad\xd8\xac\0" /* offset 13078 */
+  "\xd8\xad\xd9\x85\0" /* offset 13083 */
+  "\xd8\xae\xd8\xac\0" /* offset 13088 */
+  "\xd8\xae\xd8\xad\0" /* offset 13093 */
+  "\xd8\xae\xd9\x85\0" /* offset 13098 */
+  "\xd8\xb3\xd8\xac\0" /* offset 13103 */
+  "\xd8\xb3\xd8\xad\0" /* offset 13108 */
+  "\xd8\xb3\xd8\xae\0" /* offset 13113 */
+  "\xd8\xb3\xd9\x85\0" /* offset 13118 */
+  "\xd8\xb5\xd8\xad\0" /* offset 13123 */
+  "\xd8\xb5\xd9\x85\0" /* offset 13128 */
+  "\xd8\xb6\xd8\xac\0" /* offset 13133 */
+  "\xd8\xb6\xd8\xad\0" /* offset 13138 */
+  "\xd8\xb6\xd8\xae\0" /* offset 13143 */
+  "\xd8\xb6\xd9\x85\0" /* offset 13148 */
+  "\xd8\xb7\xd8\xad\0" /* offset 13153 */
+  "\xd8\xb7\xd9\x85\0" /* offset 13158 */
+  "\xd8\xb8\xd9\x85\0" /* offset 13163 */
+  "\xd8\xb9\xd8\xac\0" /* offset 13168 */
+  "\xd8\xb9\xd9\x85\0" /* offset 13173 */
+  "\xd8\xba\xd8\xac\0" /* offset 13178 */
+  "\xd8\xba\xd9\x85\0" /* offset 13183 */
+  "\xd9\x81\xd8\xac\0" /* offset 13188 */
+  "\xd9\x81\xd8\xad\0" /* offset 13193 */
+  "\xd9\x81\xd8\xae\0" /* offset 13198 */
+  "\xd9\x81\xd9\x85\0" /* offset 13203 */
+  "\xd9\x81\xd9\x89\0" /* offset 13208 */
+  "\xd9\x81\xd9\x8a\0" /* offset 13213 */
+  "\xd9\x82\xd8\xad\0" /* offset 13218 */
+  "\xd9\x82\xd9\x85\0" /* offset 13223 */
+  "\xd9\x82\xd9\x89\0" /* offset 13228 */
+  "\xd9\x82\xd9\x8a\0" /* offset 13233 */
+  "\xd9\x83\xd8\xa7\0" /* offset 13238 */
+  "\xd9\x83\xd8\xac\0" /* offset 13243 */
+  "\xd9\x83\xd8\xad\0" /* offset 13248 */
+  "\xd9\x83\xd8\xae\0" /* offset 13253 */
+  "\xd9\x83\xd9\x84\0" /* offset 13258 */
+  "\xd9\x83\xd9\x85\0" /* offset 13263 */
+  "\xd9\x83\xd9\x89\0" /* offset 13268 */
+  "\xd9\x83\xd9\x8a\0" /* offset 13273 */
+  "\xd9\x84\xd8\xac\0" /* offset 13278 */
+  "\xd9\x84\xd8\xad\0" /* offset 13283 */
+  "\xd9\x84\xd8\xae\0" /* offset 13288 */
+  "\xd9\x84\xd9\x85\0" /* offset 13293 */
+  "\xd9\x84\xd9\x89\0" /* offset 13298 */
+  "\xd9\x84\xd9\x8a\0" /* offset 13303 */
+  "\xd9\x85\xd8\xac\0" /* offset 13308 */
+  "\xd9\x85\xd8\xad\0" /* offset 13313 */
+  "\xd9\x85\xd8\xae\0" /* offset 13318 */
+  "\xd9\x85\xd9\x85\0" /* offset 13323 */
+  "\xd9\x85\xd9\x89\0" /* offset 13328 */
+  "\xd9\x85\xd9\x8a\0" /* offset 13333 */
+  "\xd9\x86\xd8\xac\0" /* offset 13338 */
+  "\xd9\x86\xd8\xad\0" /* offset 13343 */
+  "\xd9\x86\xd8\xae\0" /* offset 13348 */
+  "\xd9\x86\xd9\x85\0" /* offset 13353 */
+  "\xd9\x86\xd9\x89\0" /* offset 13358 */
+  "\xd9\x86\xd9\x8a\0" /* offset 13363 */
+  "\xd9\x87\xd8\xac\0" /* offset 13368 */
+  "\xd9\x87\xd9\x85\0" /* offset 13373 */
+  "\xd9\x87\xd9\x89\0" /* offset 13378 */
+  "\xd9\x87\xd9\x8a\0" /* offset 13383 */
+  "\xd9\x8a\xd8\xac\0" /* offset 13388 */
+  "\xd9\x8a\xd8\xad\0" /* offset 13393 */
+  "\xd9\x8a\xd8\xae\0" /* offset 13398 */
+  "\xd9\x8a\xd9\x85\0" /* offset 13403 */
+  "\xd9\x8a\xd9\x89\0" /* offset 13408 */
+  "\xd9\x8a\xd9\x8a\0" /* offset 13413 */
+  "\xd8\xb0\xd9\xb0\0" /* offset 13418 */
+  "\xd8\xb1\xd9\xb0\0" /* offset 13423 */
+  "\xd9\x89\xd9\xb0\0" /* offset 13428 */
+  "\x20\xd9\x8c\xd9\x91\0" /* offset 13433 */
+  "\x20\xd9\x8d\xd9\x91\0" /* offset 13439 */
+  "\x20\xd9\x8e\xd9\x91\0" /* offset 13445 */
+  "\x20\xd9\x8f\xd9\x91\0" /* offset 13451 */
+  "\x20\xd9\x90\xd9\x91\0" /* offset 13457 */
+  "\x20\xd9\x91\xd9\xb0\0" /* offset 13463 */
+  "\xd9\x8a\xd9\x94\xd8\xb1\0" /* offset 13469 */
+  "\xd9\x8a\xd9\x94\xd8\xb2\0" /* offset 13476 */
+  "\xd9\x8a\xd9\x94\xd9\x86\0" /* offset 13483 */
+  "\xd8\xa8\xd8\xb1\0" /* offset 13490 */
+  "\xd8\xa8\xd8\xb2\0" /* offset 13495 */
+  "\xd8\xa8\xd9\x86\0" /* offset 13500 */
+  "\xd8\xaa\xd8\xb1\0" /* offset 13505 */
+  "\xd8\xaa\xd8\xb2\0" /* offset 13510 */
+  "\xd8\xaa\xd9\x86\0" /* offset 13515 */
+  "\xd8\xab\xd8\xb1\0" /* offset 13520 */
+  "\xd8\xab\xd8\xb2\0" /* offset 13525 */
+  "\xd8\xab\xd9\x86\0" /* offset 13530 */
+  "\xd9\x85\xd8\xa7\0" /* offset 13535 */
+  "\xd9\x86\xd8\xb1\0" /* offset 13540 */
+  "\xd9\x86\xd8\xb2\0" /* offset 13545 */
+  "\xd9\x86\xd9\x86\0" /* offset 13550 */
+  "\xd9\x8a\xd8\xb1\0" /* offset 13555 */
+  "\xd9\x8a\xd8\xb2\0" /* offset 13560 */
+  "\xd9\x8a\xd9\x86\0" /* offset 13565 */
+  "\xd9\x8a\xd9\x94\xd8\xae\0" /* offset 13570 */
+  "\xd9\x8a\xd9\x94\xd9\x87\0" /* offset 13577 */
+  "\xd8\xa8\xd9\x87\0" /* offset 13584 */
+  "\xd8\xaa\xd9\x87\0" /* offset 13589 */
+  "\xd8\xb5\xd8\xae\0" /* offset 13594 */
+  "\xd9\x84\xd9\x87\0" /* offset 13599 */
+  "\xd9\x86\xd9\x87\0" /* offset 13604 */
+  "\xd9\x87\xd9\xb0\0" /* offset 13609 */
+  "\xd9\x8a\xd9\x87\0" /* offset 13614 */
+  "\xd8\xab\xd9\x87\0" /* offset 13619 */
+  "\xd8\xb3\xd9\x87\0" /* offset 13624 */
+  "\xd8\xb4\xd9\x85\0" /* offset 13629 */
+  "\xd8\xb4\xd9\x87\0" /* offset 13634 */
+  "\xd9\x80\xd9\x8e\xd9\x91\0" /* offset 13639 */
+  "\xd9\x80\xd9\x8f\xd9\x91\0" /* offset 13646 */
+  "\xd9\x80\xd9\x90\xd9\x91\0" /* offset 13653 */
+  "\xd8\xb7\xd9\x89\0" /* offset 13660 */
+  "\xd8\xb7\xd9\x8a\0" /* offset 13665 */
+  "\xd8\xb9\xd9\x89\0" /* offset 13670 */
+  "\xd8\xb9\xd9\x8a\0" /* offset 13675 */
+  "\xd8\xba\xd9\x89\0" /* offset 13680 */
+  "\xd8\xba\xd9\x8a\0" /* offset 13685 */
+  "\xd8\xb3\xd9\x89\0" /* offset 13690 */
+  "\xd8\xb3\xd9\x8a\0" /* offset 13695 */
+  "\xd8\xb4\xd9\x89\0" /* offset 13700 */
+  "\xd8\xb4\xd9\x8a\0" /* offset 13705 */
+  "\xd8\xad\xd9\x89\0" /* offset 13710 */
+  "\xd8\xad\xd9\x8a\0" /* offset 13715 */
+  "\xd8\xac\xd9\x89\0" /* offset 13720 */
+  "\xd8\xac\xd9\x8a\0" /* offset 13725 */
+  "\xd8\xae\xd9\x89\0" /* offset 13730 */
+  "\xd8\xae\xd9\x8a\0" /* offset 13735 */
+  "\xd8\xb5\xd9\x89\0" /* offset 13740 */
+  "\xd8\xb5\xd9\x8a\0" /* offset 13745 */
+  "\xd8\xb6\xd9\x89\0" /* offset 13750 */
+  "\xd8\xb6\xd9\x8a\0" /* offset 13755 */
+  "\xd8\xb4\xd8\xac\0" /* offset 13760 */
+  "\xd8\xb4\xd8\xad\0" /* offset 13765 */
+  "\xd8\xb4\xd8\xae\0" /* offset 13770 */
+  "\xd8\xb4\xd8\xb1\0" /* offset 13775 */
+  "\xd8\xb3\xd8\xb1\0" /* offset 13780 */
+  "\xd8\xb5\xd8\xb1\0" /* offset 13785 */
+  "\xd8\xb6\xd8\xb1\0" /* offset 13790 */
+  "\xd8\xa7\xd9\x8b\0" /* offset 13795 */
+  "\xd8\xaa\xd8\xac\xd9\x85\0" /* offset 13800 */
+  "\xd8\xaa\xd8\xad\xd8\xac\0" /* offset 13807 */
+  "\xd8\xaa\xd8\xad\xd9\x85\0" /* offset 13814 */
+  "\xd8\xaa\xd8\xae\xd9\x85\0" /* offset 13821 */
+  "\xd8\xaa\xd9\x85\xd8\xac\0" /* offset 13828 */
+  "\xd8\xaa\xd9\x85\xd8\xad\0" /* offset 13835 */
+  "\xd8\xaa\xd9\x85\xd8\xae\0" /* offset 13842 */
+  "\xd8\xac\xd9\x85\xd8\xad\0" /* offset 13849 */
+  "\xd8\xad\xd9\x85\xd9\x8a\0" /* offset 13856 */
+  "\xd8\xad\xd9\x85\xd9\x89\0" /* offset 13863 */
+  "\xd8\xb3\xd8\xad\xd8\xac\0" /* offset 13870 */
+  "\xd8\xb3\xd8\xac\xd8\xad\0" /* offset 13877 */
+  "\xd8\xb3\xd8\xac\xd9\x89\0" /* offset 13884 */
+  "\xd8\xb3\xd9\x85\xd8\xad\0" /* offset 13891 */
+  "\xd8\xb3\xd9\x85\xd8\xac\0" /* offset 13898 */
+  "\xd8\xb3\xd9\x85\xd9\x85\0" /* offset 13905 */
+  "\xd8\xb5\xd8\xad\xd8\xad\0" /* offset 13912 */
+  "\xd8\xb5\xd9\x85\xd9\x85\0" /* offset 13919 */
+  "\xd8\xb4\xd8\xad\xd9\x85\0" /* offset 13926 */
+  "\xd8\xb4\xd8\xac\xd9\x8a\0" /* offset 13933 */
+  "\xd8\xb4\xd9\x85\xd8\xae\0" /* offset 13940 */
+  "\xd8\xb4\xd9\x85\xd9\x85\0" /* offset 13947 */
+  "\xd8\xb6\xd8\xad\xd9\x89\0" /* offset 13954 */
+  "\xd8\xb6\xd8\xae\xd9\x85\0" /* offset 13961 */
+  "\xd8\xb7\xd9\x85\xd8\xad\0" /* offset 13968 */
+  "\xd8\xb7\xd9\x85\xd9\x85\0" /* offset 13975 */
+  "\xd8\xb7\xd9\x85\xd9\x8a\0" /* offset 13982 */
+  "\xd8\xb9\xd8\xac\xd9\x85\0" /* offset 13989 */
+  "\xd8\xb9\xd9\x85\xd9\x85\0" /* offset 13996 */
+  "\xd8\xb9\xd9\x85\xd9\x89\0" /* offset 14003 */
+  "\xd8\xba\xd9\x85\xd9\x85\0" /* offset 14010 */
+  "\xd8\xba\xd9\x85\xd9\x8a\0" /* offset 14017 */
+  "\xd8\xba\xd9\x85\xd9\x89\0" /* offset 14024 */
+  "\xd9\x81\xd8\xae\xd9\x85\0" /* offset 14031 */
+  "\xd9\x82\xd9\x85\xd8\xad\0" /* offset 14038 */
+  "\xd9\x82\xd9\x85\xd9\x85\0" /* offset 14045 */
+  "\xd9\x84\xd8\xad\xd9\x85\0" /* offset 14052 */
+  "\xd9\x84\xd8\xad\xd9\x8a\0" /* offset 14059 */
+  "\xd9\x84\xd8\xad\xd9\x89\0" /* offset 14066 */
+  "\xd9\x84\xd8\xac\xd8\xac\0" /* offset 14073 */
+  "\xd9\x84\xd8\xae\xd9\x85\0" /* offset 14080 */
+  "\xd9\x84\xd9\x85\xd8\xad\0" /* offset 14087 */
+  "\xd9\x85\xd8\xad\xd8\xac\0" /* offset 14094 */
+  "\xd9\x85\xd8\xad\xd9\x85\0" /* offset 14101 */
+  "\xd9\x85\xd8\xad\xd9\x8a\0" /* offset 14108 */
+  "\xd9\x85\xd8\xac\xd8\xad\0" /* offset 14115 */
+  "\xd9\x85\xd8\xac\xd9\x85\0" /* offset 14122 */
+  "\xd9\x85\xd8\xae\xd8\xac\0" /* offset 14129 */
+  "\xd9\x85\xd8\xae\xd9\x85\0" /* offset 14136 */
+  "\xd9\x85\xd8\xac\xd8\xae\0" /* offset 14143 */
+  "\xd9\x87\xd9\x85\xd8\xac\0" /* offset 14150 */
+  "\xd9\x87\xd9\x85\xd9\x85\0" /* offset 14157 */
+  "\xd9\x86\xd8\xad\xd9\x85\0" /* offset 14164 */
+  "\xd9\x86\xd8\xad\xd9\x89\0" /* offset 14171 */
+  "\xd9\x86\xd8\xac\xd9\x85\0" /* offset 14178 */
+  "\xd9\x86\xd8\xac\xd9\x89\0" /* offset 14185 */
+  "\xd9\x86\xd9\x85\xd9\x8a\0" /* offset 14192 */
+  "\xd9\x86\xd9\x85\xd9\x89\0" /* offset 14199 */
+  "\xd9\x8a\xd9\x85\xd9\x85\0" /* offset 14206 */
+  "\xd8\xa8\xd8\xae\xd9\x8a\0" /* offset 14213 */
+  "\xd8\xaa\xd8\xac\xd9\x8a\0" /* offset 14220 */
+  "\xd8\xaa\xd8\xac\xd9\x89\0" /* offset 14227 */
+  "\xd8\xaa\xd8\xae\xd9\x8a\0" /* offset 14234 */
+  "\xd8\xaa\xd8\xae\xd9\x89\0" /* offset 14241 */
+  "\xd8\xaa\xd9\x85\xd9\x8a\0" /* offset 14248 */
+  "\xd8\xaa\xd9\x85\xd9\x89\0" /* offset 14255 */
+  "\xd8\xac\xd9\x85\xd9\x8a\0" /* offset 14262 */
+  "\xd8\xac\xd8\xad\xd9\x89\0" /* offset 14269 */
+  "\xd8\xac\xd9\x85\xd9\x89\0" /* offset 14276 */
+  "\xd8\xb3\xd8\xae\xd9\x89\0" /* offset 14283 */
+  "\xd8\xb5\xd8\xad\xd9\x8a\0" /* offset 14290 */
+  "\xd8\xb4\xd8\xad\xd9\x8a\0" /* offset 14297 */
+  "\xd8\xb6\xd8\xad\xd9\x8a\0" /* offset 14304 */
+  "\xd9\x84\xd8\xac\xd9\x8a\0" /* offset 14311 */
+  "\xd9\x84\xd9\x85\xd9\x8a\0" /* offset 14318 */
+  "\xd9\x8a\xd8\xad\xd9\x8a\0" /* offset 14325 */
+  "\xd9\x8a\xd8\xac\xd9\x8a\0" /* offset 14332 */
+  "\xd9\x8a\xd9\x85\xd9\x8a\0" /* offset 14339 */
+  "\xd9\x85\xd9\x85\xd9\x8a\0" /* offset 14346 */
+  "\xd9\x82\xd9\x85\xd9\x8a\0" /* offset 14353 */
+  "\xd9\x86\xd8\xad\xd9\x8a\0" /* offset 14360 */
+  "\xd8\xb9\xd9\x85\xd9\x8a\0" /* offset 14367 */
+  "\xd9\x83\xd9\x85\xd9\x8a\0" /* offset 14374 */
+  "\xd9\x86\xd8\xac\xd8\xad\0" /* offset 14381 */
+  "\xd9\x85\xd8\xae\xd9\x8a\0" /* offset 14388 */
+  "\xd9\x84\xd8\xac\xd9\x85\0" /* offset 14395 */
+  "\xd9\x83\xd9\x85\xd9\x85\0" /* offset 14402 */
+  "\xd8\xac\xd8\xad\xd9\x8a\0" /* offset 14409 */
+  "\xd8\xad\xd8\xac\xd9\x8a\0" /* offset 14416 */
+  "\xd9\x85\xd8\xac\xd9\x8a\0" /* offset 14423 */
+  "\xd9\x81\xd9\x85\xd9\x8a\0" /* offset 14430 */
+  "\xd8\xa8\xd8\xad\xd9\x8a\0" /* offset 14437 */
+  "\xd8\xb3\xd8\xae\xd9\x8a\0" /* offset 14444 */
+  "\xd9\x86\xd8\xac\xd9\x8a\0" /* offset 14451 */
+  "\xd8\xb5\xd9\x84\xdb\x92\0" /* offset 14458 */
+  "\xd9\x82\xd9\x84\xdb\x92\0" /* offset 14465 */
+  "\xd8\xa7\xd9\x84\xd9\x84\xd9\x87\0" /* offset 14472 */
+  "\xd8\xa7\xd9\x83\xd8\xa8\xd8\xb1\0" /* offset 14481 */
+  "\xd9\x85\xd8\xad\xd9\x85\xd8\xaf\0" /* offset 14490 */
+  "\xd8\xb5\xd9\x84\xd8\xb9\xd9\x85\0" /* offset 14499 */
+  "\xd8\xb1\xd8\xb3\xd9\x88\xd9\x84\0" /* offset 14508 */
+  "\xd8\xb9\xd9\x84\xd9\x8a\xd9\x87\0" /* offset 14517 */
+  "\xd9\x88\xd8\xb3\xd9\x84\xd9\x85\0" /* offset 14526 */
+  "\xd8\xb5\xd9\x84\xd9\x89\0" /* offset 14535 */
+  "\xd8\xb5\xd9\x84\xd9\x89\x20\xd8\xa7\xd9\x84\xd9\x84\xd9\x87\x20\xd8\xb9\xd9\x84\xd9\x8a\xd9\x87\x20\xd9\x88\xd8\xb3\xd9\x84\xd9\x85\0" /* offset 14542 */
+  "\xd8\xac\xd9\x84\x20\xd8\xac\xd9\x84\xd8\xa7\xd9\x84\xd9\x87\0" /* offset 14576 */
+  "\xd8\xb1\xdb\x8c\xd8\xa7\xd9\x84\0" /* offset 14592 */
+  "\x2c\0" /* offset 14601 */
+  "\xe3\x80\x81\0" /* offset 14603 */
+  "\xe3\x80\x82\0" /* offset 14607 */
+  "\x3a\0" /* offset 14611 */
+  "\x21\0" /* offset 14613 */
+  "\x3f\0" /* offset 14615 */
+  "\xe3\x80\x96\0" /* offset 14617 */
+  "\xe3\x80\x97\0" /* offset 14621 */
+  "\xe2\x80\x94\0" /* offset 14625 */
+  "\xe2\x80\x93\0" /* offset 14629 */
+  "\x5f\0" /* offset 14633 */
+  "\x7b\0" /* offset 14635 */
+  "\x7d\0" /* offset 14637 */
+  "\xe3\x80\x94\0" /* offset 14639 */
+  "\xe3\x80\x95\0" /* offset 14643 */
+  "\xe3\x80\x90\0" /* offset 14647 */
+  "\xe3\x80\x91\0" /* offset 14651 */
+  "\xe3\x80\x8a\0" /* offset 14655 */
+  "\xe3\x80\x8b\0" /* offset 14659 */
+  "\xe3\x80\x8c\0" /* offset 14663 */
+  "\xe3\x80\x8d\0" /* offset 14667 */
+  "\xe3\x80\x8e\0" /* offset 14671 */
+  "\xe3\x80\x8f\0" /* offset 14675 */
+  "\x5b\0" /* offset 14679 */
+  "\x5d\0" /* offset 14681 */
+  "\x23\0" /* offset 14683 */
+  "\x26\0" /* offset 14685 */
+  "\x2a\0" /* offset 14687 */
+  "\x2d\0" /* offset 14689 */
+  "\x3c\0" /* offset 14691 */
+  "\x3e\0" /* offset 14693 */
+  "\x5c\0" /* offset 14695 */
+  "\x24\0" /* offset 14697 */
+  "\x25\0" /* offset 14699 */
+  "\x40\0" /* offset 14701 */
+  "\x20\xd9\x8b\0" /* offset 14703 */
+  "\xd9\x80\xd9\x8b\0" /* offset 14707 */
+  "\x20\xd9\x8c\0" /* offset 14712 */
+  "\x20\xd9\x8d\0" /* offset 14716 */
+  "\x20\xd9\x8e\0" /* offset 14720 */
+  "\xd9\x80\xd9\x8e\0" /* offset 14724 */
+  "\x20\xd9\x8f\0" /* offset 14729 */
+  "\xd9\x80\xd9\x8f\0" /* offset 14733 */
+  "\x20\xd9\x90\0" /* offset 14738 */
+  "\xd9\x80\xd9\x90\0" /* offset 14742 */
+  "\x20\xd9\x91\0" /* offset 14747 */
+  "\xd9\x80\xd9\x91\0" /* offset 14751 */
+  "\x20\xd9\x92\0" /* offset 14756 */
+  "\xd9\x80\xd9\x92\0" /* offset 14760 */
+  "\xd8\xa1\0" /* offset 14765 */
+  "\xd8\xa7\0" /* offset 14768 */
+  "\xd8\xa8\0" /* offset 14771 */
+  "\xd8\xa9\0" /* offset 14774 */
+  "\xd8\xaa\0" /* offset 14777 */
+  "\xd8\xab\0" /* offset 14780 */
+  "\xd8\xac\0" /* offset 14783 */
+  "\xd8\xad\0" /* offset 14786 */
+  "\xd8\xae\0" /* offset 14789 */
+  "\xd8\xaf\0" /* offset 14792 */
+  "\xd8\xb0\0" /* offset 14795 */
+  "\xd8\xb1\0" /* offset 14798 */
+  "\xd8\xb2\0" /* offset 14801 */
+  "\xd8\xb3\0" /* offset 14804 */
+  "\xd8\xb4\0" /* offset 14807 */
+  "\xd8\xb5\0" /* offset 14810 */
+  "\xd8\xb6\0" /* offset 14813 */
+  "\xd8\xb7\0" /* offset 14816 */
+  "\xd8\xb8\0" /* offset 14819 */
+  "\xd8\xb9\0" /* offset 14822 */
+  "\xd8\xba\0" /* offset 14825 */
+  "\xd9\x81\0" /* offset 14828 */
+  "\xd9\x82\0" /* offset 14831 */
+  "\xd9\x83\0" /* offset 14834 */
+  "\xd9\x84\0" /* offset 14837 */
+  "\xd9\x85\0" /* offset 14840 */
+  "\xd9\x86\0" /* offset 14843 */
+  "\xd9\x87\0" /* offset 14846 */
+  "\xd9\x88\0" /* offset 14849 */
+  "\xd9\x8a\0" /* offset 14852 */
+  "\xd9\x84\xd8\xa7\xd9\x93\0" /* offset 14855 */
+  "\xd9\x84\xd8\xa7\xd9\x94\0" /* offset 14862 */
+  "\xd9\x84\xd8\xa7\xd9\x95\0" /* offset 14869 */
+  "\xd9\x84\xd8\xa7\0" /* offset 14876 */
+  "\x22\0" /* offset 14881 */
+  "\x27\0" /* offset 14883 */
+  "\x2f\0" /* offset 14885 */
+  "\x5e\0" /* offset 14887 */
+  "\x7c\0" /* offset 14889 */
+  "\x7e\0" /* offset 14891 */
+  "\xe2\xa6\x85\0" /* offset 14893 */
+  "\xe2\xa6\x86\0" /* offset 14897 */
+  "\xe3\x83\xbb\0" /* offset 14901 */
+  "\xe3\x82\xa1\0" /* offset 14905 */
+  "\xe3\x82\xa3\0" /* offset 14909 */
+  "\xe3\x82\xa5\0" /* offset 14913 */
+  "\xe3\x82\xa7\0" /* offset 14917 */
+  "\xe3\x82\xa9\0" /* offset 14921 */
+  "\xe3\x83\xa3\0" /* offset 14925 */
+  "\xe3\x83\xa5\0" /* offset 14929 */
+  "\xe3\x83\xa7\0" /* offset 14933 */
+  "\xe3\x83\x83\0" /* offset 14937 */
+  "\xe3\x83\xbc\0" /* offset 14941 */
+  "\xe3\x83\xb3\0" /* offset 14945 */
+  "\xe3\x82\x99\0" /* offset 14949 */
+  "\xe3\x82\x9a\0" /* offset 14953 */
+  "\xc2\xa2\0" /* offset 14957 */
+  "\xc2\xa3\0" /* offset 14960 */
+  "\xc2\xac\0" /* offset 14963 */
+  "\xc2\xa6\0" /* offset 14966 */
+  "\xc2\xa5\0" /* offset 14969 */
+  "\xe2\x82\xa9\0" /* offset 14972 */
+  "\xe2\x94\x82\0" /* offset 14976 */
+  "\xe2\x86\x90\0" /* offset 14980 */
+  "\xe2\x86\x91\0" /* offset 14984 */
+  "\xe2\x86\x92\0" /* offset 14988 */
+  "\xe2\x86\x93\0" /* offset 14992 */
+  "\xe2\x96\xa0\0" /* offset 14996 */
+  "\xe2\x97\x8b\0" /* offset 15000 */
+  "\xf0\x91\x82\x99\xf0\x91\x82\xba\0" /* offset 15004 */
+  "\xf0\x91\x82\x9b\xf0\x91\x82\xba\0" /* offset 15013 */
+  "\xf0\x91\x82\xa5\xf0\x91\x82\xba\0" /* offset 15022 */
+  "\xf0\x91\x84\xb1\xf0\x91\x84\xa7\0" /* offset 15031 */
+  "\xf0\x91\x84\xb2\xf0\x91\x84\xa7\0" /* offset 15040 */
+  "\xf0\x91\x8d\x87\xf0\x91\x8c\xbe\0" /* offset 15049 */
+  "\xf0\x91\x8d\x87\xf0\x91\x8d\x97\0" /* offset 15058 */
+  "\xf0\x91\x92\xb9\xf0\x91\x92\xba\0" /* offset 15067 */
+  "\xf0\x91\x92\xb9\xf0\x91\x92\xb0\0" /* offset 15076 */
+  "\xf0\x91\x92\xb9\xf0\x91\x92\xbd\0" /* offset 15085 */
+  "\xf0\x91\x96\xb8\xf0\x91\x96\xaf\0" /* offset 15094 */
+  "\xf0\x91\x96\xb9\xf0\x91\x96\xaf\0" /* offset 15103 */
+  "\xf0\x9d\x85\x97\xf0\x9d\x85\xa5\0" /* offset 15112 */
+  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\0" /* offset 15121 */
+  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xae\0" /* offset 15130 */
+  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xaf\0" /* offset 15143 */
+  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xb0\0" /* offset 15156 */
+  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xb1\0" /* offset 15169 */
+  "\xf0\x9d\x85\x98\xf0\x9d\x85\xa5\xf0\x9d\x85\xb2\0" /* offset 15182 */
+  "\xf0\x9d\x86\xb9\xf0\x9d\x85\xa5\0" /* offset 15195 */
+  "\xf0\x9d\x86\xba\xf0\x9d\x85\xa5\0" /* offset 15204 */
+  "\xf0\x9d\x86\xb9\xf0\x9d\x85\xa5\xf0\x9d\x85\xae\0" /* offset 15213 */
+  "\xf0\x9d\x86\xba\xf0\x9d\x85\xa5\xf0\x9d\x85\xae\0" /* offset 15226 */
+  "\xf0\x9d\x86\xb9\xf0\x9d\x85\xa5\xf0\x9d\x85\xaf\0" /* offset 15239 */
+  "\xf0\x9d\x86\xba\xf0\x9d\x85\xa5\xf0\x9d\x85\xaf\0" /* offset 15252 */
+  "\xc4\xb1\0" /* offset 15265 */
+  "\xc8\xb7\0" /* offset 15268 */
+  "\xce\x91\0" /* offset 15271 */
+  "\xce\x92\0" /* offset 15274 */
+  "\xce\x94\0" /* offset 15277 */
+  "\xce\x95\0" /* offset 15280 */
+  "\xce\x96\0" /* offset 15283 */
+  "\xce\x97\0" /* offset 15286 */
+  "\xce\x99\0" /* offset 15289 */
+  "\xce\x9a\0" /* offset 15292 */
+  "\xce\x9b\0" /* offset 15295 */
+  "\xce\x9c\0" /* offset 15298 */
+  "\xce\x9d\0" /* offset 15301 */
+  "\xce\x9e\0" /* offset 15304 */
+  "\xce\x9f\0" /* offset 15307 */
+  "\xce\xa1\0" /* offset 15310 */
+  "\xce\xa4\0" /* offset 15313 */
+  "\xce\xa6\0" /* offset 15316 */
+  "\xce\xa7\0" /* offset 15319 */
+  "\xce\xa8\0" /* offset 15322 */
+  "\xe2\x88\x87\0" /* offset 15325 */
+  "\xce\xb1\0" /* offset 15329 */
+  "\xce\xb6\0" /* offset 15332 */
+  "\xce\xb7\0" /* offset 15335 */
+  "\xce\xbb\0" /* offset 15338 */
+  "\xce\xbd\0" /* offset 15341 */
+  "\xce\xbe\0" /* offset 15344 */
+  "\xce\xbf\0" /* offset 15347 */
+  "\xcf\x83\0" /* offset 15350 */
+  "\xcf\x84\0" /* offset 15353 */
+  "\xcf\x85\0" /* offset 15356 */
+  "\xcf\x88\0" /* offset 15359 */
+  "\xcf\x89\0" /* offset 15362 */
+  "\xe2\x88\x82\0" /* offset 15365 */
+  "\xcf\x9c\0" /* offset 15369 */
+  "\xcf\x9d\0" /* offset 15372 */
+  "\xd9\xae\0" /* offset 15375 */
+  "\xda\xa1\0" /* offset 15378 */
+  "\xd9\xaf\0" /* offset 15381 */
+  "\x30\x2e\0" /* offset 15384 */
+  "\x30\x2c\0" /* offset 15387 */
+  "\x31\x2c\0" /* offset 15390 */
+  "\x32\x2c\0" /* offset 15393 */
+  "\x33\x2c\0" /* offset 15396 */
+  "\x34\x2c\0" /* offset 15399 */
+  "\x35\x2c\0" /* offset 15402 */
+  "\x36\x2c\0" /* offset 15405 */
+  "\x37\x2c\0" /* offset 15408 */
+  "\x38\x2c\0" /* offset 15411 */
+  "\x39\x2c\0" /* offset 15414 */
+  "\x28\x41\x29\0" /* offset 15417 */
+  "\x28\x42\x29\0" /* offset 15421 */
+  "\x28\x43\x29\0" /* offset 15425 */
+  "\x28\x44\x29\0" /* offset 15429 */
+  "\x28\x45\x29\0" /* offset 15433 */
+  "\x28\x46\x29\0" /* offset 15437 */
+  "\x28\x47\x29\0" /* offset 15441 */
+  "\x28\x48\x29\0" /* offset 15445 */
+  "\x28\x49\x29\0" /* offset 15449 */
+  "\x28\x4a\x29\0" /* offset 15453 */
+  "\x28\x4b\x29\0" /* offset 15457 */
+  "\x28\x4c\x29\0" /* offset 15461 */
+  "\x28\x4d\x29\0" /* offset 15465 */
+  "\x28\x4e\x29\0" /* offset 15469 */
+  "\x28\x4f\x29\0" /* offset 15473 */
+  "\x28\x50\x29\0" /* offset 15477 */
+  "\x28\x51\x29\0" /* offset 15481 */
+  "\x28\x52\x29\0" /* offset 15485 */
+  "\x28\x53\x29\0" /* offset 15489 */
+  "\x28\x54\x29\0" /* offset 15493 */
+  "\x28\x55\x29\0" /* offset 15497 */
+  "\x28\x56\x29\0" /* offset 15501 */
+  "\x28\x57\x29\0" /* offset 15505 */
+  "\x28\x58\x29\0" /* offset 15509 */
+  "\x28\x59\x29\0" /* offset 15513 */
+  "\x28\x5a\x29\0" /* offset 15517 */
+  "\xe3\x80\x94\x53\xe3\x80\x95\0" /* offset 15521 */
+  "\x43\x44\0" /* offset 15529 */
+  "\x57\x5a\0" /* offset 15532 */
+  "\x48\x56\0" /* offset 15535 */
+  "\x53\x44\0" /* offset 15538 */
+  "\x53\x53\0" /* offset 15541 */
+  "\x50\x50\x56\0" /* offset 15544 */
+  "\x57\x43\0" /* offset 15548 */
+  "\x4d\x43\0" /* offset 15551 */
+  "\x4d\x44\0" /* offset 15554 */
+  "\x4d\x52\0" /* offset 15557 */
+  "\x44\x4a\0" /* offset 15560 */
+  "\xe3\x81\xbb\xe3\x81\x8b\0" /* offset 15563 */
+  "\xe3\x82\xb3\xe3\x82\xb3\0" /* offset 15570 */
+  "\xe5\xad\x97\0" /* offset 15577 */
+  "\xe5\x8f\x8c\0" /* offset 15581 */
+  "\xe5\xa4\x9a\0" /* offset 15585 */
+  "\xe8\xa7\xa3\0" /* offset 15589 */
+  "\xe4\xba\xa4\0" /* offset 15593 */
+  "\xe6\x98\xa0\0" /* offset 15597 */
+  "\xe7\x84\xa1\0" /* offset 15601 */
+  "\xe5\x89\x8d\0" /* offset 15605 */
+  "\xe5\xbe\x8c\0" /* offset 15609 */
+  "\xe5\x86\x8d\0" /* offset 15613 */
+  "\xe6\x96\xb0\0" /* offset 15617 */
+  "\xe5\x88\x9d\0" /* offset 15621 */
+  "\xe7\xb5\x82\0" /* offset 15625 */
+  "\xe8\xb2\xa9\0" /* offset 15629 */
+  "\xe5\xa3\xb0\0" /* offset 15633 */
+  "\xe5\x90\xb9\0" /* offset 15637 */
+  "\xe6\xbc\x94\0" /* offset 15641 */
+  "\xe6\x8a\x95\0" /* offset 15645 */
+  "\xe6\x8d\x95\0" /* offset 15649 */
+  "\xe9\x81\x8a\0" /* offset 15653 */
+  "\xe6\x8c\x87\0" /* offset 15657 */
+  "\xe6\x89\x93\0" /* offset 15661 */
+  "\xe7\xa6\x81\0" /* offset 15665 */
+  "\xe7\xa9\xba\0" /* offset 15669 */
+  "\xe5\x90\x88\0" /* offset 15673 */
+  "\xe6\xba\x80\0" /* offset 15677 */
+  "\xe7\x94\xb3\0" /* offset 15681 */
+  "\xe5\x89\xb2\0" /* offset 15685 */
+  "\xe5\x96\xb6\0" /* offset 15689 */
+  "\xe9\x85\x8d\0" /* offset 15693 */
+  "\xe3\x80\x94\xe6\x9c\xac\xe3\x80\x95\0" /* offset 15697 */
+  "\xe3\x80\x94\xe4\xb8\x89\xe3\x80\x95\0" /* offset 15707 */
+  "\xe3\x80\x94\xe4\xba\x8c\xe3\x80\x95\0" /* offset 15717 */
+  "\xe3\x80\x94\xe5\xae\x89\xe3\x80\x95\0" /* offset 15727 */
+  "\xe3\x80\x94\xe7\x82\xb9\xe3\x80\x95\0" /* offset 15737 */
+  "\xe3\x80\x94\xe6\x89\x93\xe3\x80\x95\0" /* offset 15747 */
+  "\xe3\x80\x94\xe7\x9b\x97\xe3\x80\x95\0" /* offset 15757 */
+  "\xe3\x80\x94\xe5\x8b\x9d\xe3\x80\x95\0" /* offset 15767 */
+  "\xe3\x80\x94\xe6\x95\x97\xe3\x80\x95\0" /* offset 15777 */
+  "\xe5\xbe\x97\0" /* offset 15787 */
+  "\xe5\x8f\xaf\0" /* offset 15791 */
+  "\xe4\xb8\xbd\0" /* offset 15795 */
+  "\xe4\xb8\xb8\0" /* offset 15799 */
+  "\xe4\xb9\x81\0" /* offset 15803 */
+  "\xf0\xa0\x84\xa2\0" /* offset 15807 */
+  "\xe4\xbd\xa0\0" /* offset 15812 */
+  "\xe4\xbe\xbb\0" /* offset 15816 */
+  "\xe5\x80\x82\0" /* offset 15820 */
+  "\xe5\x81\xba\0" /* offset 15824 */
+  "\xe5\x82\x99\0" /* offset 15828 */
+  "\xe5\x83\x8f\0" /* offset 15832 */
+  "\xe3\x92\x9e\0" /* offset 15836 */
+  "\xf0\xa0\x98\xba\0" /* offset 15840 */
+  "\xe5\x85\x94\0" /* offset 15845 */
+  "\xe5\x85\xa4\0" /* offset 15849 */
+  "\xe5\x85\xb7\0" /* offset 15853 */
+  "\xf0\xa0\x94\x9c\0" /* offset 15857 */
+  "\xe3\x92\xb9\0" /* offset 15862 */
+  "\xe5\x85\xa7\0" /* offset 15866 */
+  "\xf0\xa0\x95\x8b\0" /* offset 15870 */
+  "\xe5\x86\x97\0" /* offset 15875 */
+  "\xe5\x86\xa4\0" /* offset 15879 */
+  "\xe4\xbb\x8c\0" /* offset 15883 */
+  "\xe5\x86\xac\0" /* offset 15887 */
+  "\xf0\xa9\x87\x9f\0" /* offset 15891 */
+  "\xe5\x88\x83\0" /* offset 15896 */
+  "\xe3\x93\x9f\0" /* offset 15900 */
+  "\xe5\x88\xbb\0" /* offset 15904 */
+  "\xe5\x89\x86\0" /* offset 15908 */
+  "\xe5\x89\xb7\0" /* offset 15912 */
+  "\xe3\x94\x95\0" /* offset 15916 */
+  "\xe5\x8c\x85\0" /* offset 15920 */
+  "\xe5\x8c\x86\0" /* offset 15924 */
+  "\xe5\x8d\x89\0" /* offset 15928 */
+  "\xe5\x8d\x9a\0" /* offset 15932 */
+  "\xe5\x8d\xb3\0" /* offset 15936 */
+  "\xe5\x8d\xbd\0" /* offset 15940 */
+  "\xe5\x8d\xbf\0" /* offset 15944 */
+  "\xf0\xa0\xa8\xac\0" /* offset 15948 */
+  "\xe7\x81\xb0\0" /* offset 15953 */
+  "\xe5\x8f\x8a\0" /* offset 15957 */
+  "\xe5\x8f\x9f\0" /* offset 15961 */
+  "\xf0\xa0\xad\xa3\0" /* offset 15965 */
+  "\xe5\x8f\xab\0" /* offset 15970 */
+  "\xe5\x8f\xb1\0" /* offset 15974 */
+  "\xe5\x90\x86\0" /* offset 15978 */
+  "\xe5\x92\x9e\0" /* offset 15982 */
+  "\xe5\x90\xb8\0" /* offset 15986 */
+  "\xe5\x91\x88\0" /* offset 15990 */
+  "\xe5\x91\xa8\0" /* offset 15994 */
+  "\xe5\x92\xa2\0" /* offset 15998 */
+  "\xe5\x93\xb6\0" /* offset 16002 */
+  "\xe5\x94\x90\0" /* offset 16006 */
+  "\xe5\x95\x93\0" /* offset 16010 */
+  "\xe5\x95\xa3\0" /* offset 16014 */
+  "\xe5\x96\x84\0" /* offset 16018 */
+  "\xe5\x96\xab\0" /* offset 16022 */
+  "\xe5\x96\xb3\0" /* offset 16026 */
+  "\xe5\x97\x82\0" /* offset 16030 */
+  "\xe5\x9c\x96\0" /* offset 16034 */
+  "\xe5\x9c\x97\0" /* offset 16038 */
+  "\xe5\x99\x91\0" /* offset 16042 */
+  "\xe5\x99\xb4\0" /* offset 16046 */
+  "\xe5\xa3\xae\0" /* offset 16050 */
+  "\xe5\x9f\x8e\0" /* offset 16054 */
+  "\xe5\x9f\xb4\0" /* offset 16058 */
+  "\xe5\xa0\x8d\0" /* offset 16062 */
+  "\xe5\x9e\x8b\0" /* offset 16066 */
+  "\xe5\xa0\xb2\0" /* offset 16070 */
+  "\xe5\xa0\xb1\0" /* offset 16074 */
+  "\xe5\xa2\xac\0" /* offset 16078 */
+  "\xf0\xa1\x93\xa4\0" /* offset 16082 */
+  "\xe5\xa3\xb2\0" /* offset 16087 */
+  "\xe5\xa3\xb7\0" /* offset 16091 */
+  "\xe5\xa4\x86\0" /* offset 16095 */
+  "\xe5\xa4\xa2\0" /* offset 16099 */
+  "\xe5\xa5\xa2\0" /* offset 16103 */
+  "\xf0\xa1\x9a\xa8\0" /* offset 16107 */
+  "\xf0\xa1\x9b\xaa\0" /* offset 16112 */
+  "\xe5\xa7\xac\0" /* offset 16117 */
+  "\xe5\xa8\x9b\0" /* offset 16121 */
+  "\xe5\xa8\xa7\0" /* offset 16125 */
+  "\xe5\xa7\x98\0" /* offset 16129 */
+  "\xe5\xa9\xa6\0" /* offset 16133 */
+  "\xe3\x9b\xae\0" /* offset 16137 */
+  "\xe3\x9b\xbc\0" /* offset 16141 */
+  "\xe5\xac\x88\0" /* offset 16145 */
+  "\xe5\xac\xbe\0" /* offset 16149 */
+  "\xf0\xa1\xa7\x88\0" /* offset 16153 */
+  "\xe5\xaf\x83\0" /* offset 16158 */
+  "\xe5\xaf\x98\0" /* offset 16162 */
+  "\xe5\xaf\xb3\0" /* offset 16166 */
+  "\xf0\xa1\xac\x98\0" /* offset 16170 */
+  "\xe5\xaf\xbf\0" /* offset 16175 */
+  "\xe5\xb0\x86\0" /* offset 16179 */
+  "\xe5\xbd\x93\0" /* offset 16183 */
+  "\xe3\x9e\x81\0" /* offset 16187 */
+  "\xe5\xb1\xa0\0" /* offset 16191 */
+  "\xe5\xb3\x80\0" /* offset 16195 */
+  "\xe5\xb2\x8d\0" /* offset 16199 */
+  "\xf0\xa1\xb7\xa4\0" /* offset 16203 */
+  "\xe5\xb5\x83\0" /* offset 16208 */
+  "\xf0\xa1\xb7\xa6\0" /* offset 16212 */
+  "\xe5\xb5\xae\0" /* offset 16217 */
+  "\xe5\xb5\xab\0" /* offset 16221 */
+  "\xe5\xb5\xbc\0" /* offset 16225 */
+  "\xe5\xb7\xa1\0" /* offset 16229 */
+  "\xe5\xb7\xa2\0" /* offset 16233 */
+  "\xe3\xa0\xaf\0" /* offset 16237 */
+  "\xe5\xb7\xbd\0" /* offset 16241 */
+  "\xe5\xb8\xa8\0" /* offset 16245 */
+  "\xe5\xb8\xbd\0" /* offset 16249 */
+  "\xe5\xb9\xa9\0" /* offset 16253 */
+  "\xe3\xa1\xa2\0" /* offset 16257 */
+  "\xf0\xa2\x86\x83\0" /* offset 16261 */
+  "\xe3\xa1\xbc\0" /* offset 16266 */
+  "\xe5\xba\xb0\0" /* offset 16270 */
+  "\xe5\xba\xb3\0" /* offset 16274 */
+  "\xe5\xba\xb6\0" /* offset 16278 */
+  "\xf0\xaa\x8e\x92\0" /* offset 16282 */
+  "\xf0\xa2\x8c\xb1\0" /* offset 16287 */
+  "\xe8\x88\x81\0" /* offset 16292 */
+  "\xe5\xbc\xa2\0" /* offset 16296 */
+  "\xe3\xa3\x87\0" /* offset 16300 */
+  "\xf0\xa3\x8a\xb8\0" /* offset 16304 */
+  "\xf0\xa6\x87\x9a\0" /* offset 16309 */
+  "\xe5\xbd\xa2\0" /* offset 16314 */
+  "\xe5\xbd\xab\0" /* offset 16318 */
+  "\xe3\xa3\xa3\0" /* offset 16322 */
+  "\xe5\xbe\x9a\0" /* offset 16326 */
+  "\xe5\xbf\x8d\0" /* offset 16330 */
+  "\xe5\xbf\x97\0" /* offset 16334 */
+  "\xe5\xbf\xb9\0" /* offset 16338 */
+  "\xe6\x82\x81\0" /* offset 16342 */
+  "\xe3\xa4\xba\0" /* offset 16346 */
+  "\xe3\xa4\x9c\0" /* offset 16350 */
+  "\xf0\xa2\x9b\x94\0" /* offset 16354 */
+  "\xe6\x83\x87\0" /* offset 16359 */
+  "\xe6\x85\x88\0" /* offset 16363 */
+  "\xe6\x85\x8c\0" /* offset 16367 */
+  "\xe6\x85\xba\0" /* offset 16371 */
+  "\xe6\x86\xb2\0" /* offset 16375 */
+  "\xe6\x86\xa4\0" /* offset 16379 */
+  "\xe6\x86\xaf\0" /* offset 16383 */
+  "\xe6\x87\x9e\0" /* offset 16387 */
+  "\xe6\x88\x90\0" /* offset 16391 */
+  "\xe6\x88\x9b\0" /* offset 16395 */
+  "\xe6\x89\x9d\0" /* offset 16399 */
+  "\xe6\x8a\xb1\0" /* offset 16403 */
+  "\xe6\x8b\x94\0" /* offset 16407 */
+  "\xe6\x8d\x90\0" /* offset 16411 */
+  "\xf0\xa2\xac\x8c\0" /* offset 16415 */
+  "\xe6\x8c\xbd\0" /* offset 16420 */
+  "\xe6\x8b\xbc\0" /* offset 16424 */
+  "\xe6\x8d\xa8\0" /* offset 16428 */
+  "\xe6\x8e\x83\0" /* offset 16432 */
+  "\xe6\x8f\xa4\0" /* offset 16436 */
+  "\xf0\xa2\xaf\xb1\0" /* offset 16440 */
+  "\xe6\x90\xa2\0" /* offset 16445 */
+  "\xe6\x8f\x85\0" /* offset 16449 */
+  "\xe6\x8e\xa9\0" /* offset 16453 */
+  "\xe3\xa8\xae\0" /* offset 16457 */
+  "\xe6\x91\xa9\0" /* offset 16461 */
+  "\xe6\x91\xbe\0" /* offset 16465 */
+  "\xe6\x92\x9d\0" /* offset 16469 */
+  "\xe6\x91\xb7\0" /* offset 16473 */
+  "\xe3\xa9\xac\0" /* offset 16477 */
+  "\xe6\x95\xac\0" /* offset 16481 */
+  "\xf0\xa3\x80\x8a\0" /* offset 16485 */
+  "\xe6\x97\xa3\0" /* offset 16490 */
+  "\xe6\x9b\xb8\0" /* offset 16494 */
+  "\xe6\x99\x89\0" /* offset 16498 */
+  "\xe3\xac\x99\0" /* offset 16502 */
+  "\xe3\xac\x88\0" /* offset 16506 */
+  "\xe3\xab\xa4\0" /* offset 16510 */
+  "\xe5\x86\x92\0" /* offset 16514 */
+  "\xe5\x86\x95\0" /* offset 16518 */
+  "\xe6\x9c\x80\0" /* offset 16522 */
+  "\xe6\x9a\x9c\0" /* offset 16526 */
+  "\xe8\x82\xad\0" /* offset 16530 */
+  "\xe4\x8f\x99\0" /* offset 16534 */
+  "\xe6\x9c\xa1\0" /* offset 16538 */
+  "\xe6\x9d\x9e\0" /* offset 16542 */
+  "\xe6\x9d\x93\0" /* offset 16546 */
+  "\xf0\xa3\x8f\x83\0" /* offset 16550 */
+  "\xe3\xad\x89\0" /* offset 16555 */
+  "\xe6\x9f\xba\0" /* offset 16559 */
+  "\xe6\x9e\x85\0" /* offset 16563 */
+  "\xe6\xa1\x92\0" /* offset 16567 */
+  "\xf0\xa3\x91\xad\0" /* offset 16571 */
+  "\xe6\xa2\x8e\0" /* offset 16576 */
+  "\xe6\xa0\x9f\0" /* offset 16580 */
+  "\xe6\xa4\x94\0" /* offset 16584 */
+  "\xe6\xa5\x82\0" /* offset 16588 */
+  "\xe6\xa6\xa3\0" /* offset 16592 */
+  "\xe6\xa7\xaa\0" /* offset 16596 */
+  "\xe6\xaa\xa8\0" /* offset 16600 */
+  "\xf0\xa3\x9a\xa3\0" /* offset 16604 */
+  "\xe6\xab\x9b\0" /* offset 16609 */
+  "\xe3\xb0\x98\0" /* offset 16613 */
+  "\xe6\xac\xa1\0" /* offset 16617 */
+  "\xf0\xa3\xa2\xa7\0" /* offset 16621 */
+  "\xe6\xad\x94\0" /* offset 16626 */
+  "\xe3\xb1\x8e\0" /* offset 16630 */
+  "\xe6\xad\xb2\0" /* offset 16634 */
+  "\xe6\xae\x9f\0" /* offset 16638 */
+  "\xe6\xae\xbb\0" /* offset 16642 */
+  "\xf0\xa3\xaa\x8d\0" /* offset 16646 */
+  "\xf0\xa1\xb4\x8b\0" /* offset 16651 */
+  "\xf0\xa3\xab\xba\0" /* offset 16656 */
+  "\xe6\xb1\x8e\0" /* offset 16661 */
+  "\xf0\xa3\xb2\xbc\0" /* offset 16665 */
+  "\xe6\xb2\xbf\0" /* offset 16670 */
+  "\xe6\xb3\x8d\0" /* offset 16674 */
+  "\xe6\xb1\xa7\0" /* offset 16678 */
+  "\xe6\xb4\x96\0" /* offset 16682 */
+  "\xe6\xb4\xbe\0" /* offset 16686 */
+  "\xe6\xb5\xa9\0" /* offset 16690 */
+  "\xe6\xb5\xb8\0" /* offset 16694 */
+  "\xe6\xb6\x85\0" /* offset 16698 */
+  "\xf0\xa3\xb4\x9e\0" /* offset 16702 */
+  "\xe6\xb4\xb4\0" /* offset 16707 */
+  "\xe6\xb8\xaf\0" /* offset 16711 */
+  "\xe6\xb9\xae\0" /* offset 16715 */
+  "\xe3\xb4\xb3\0" /* offset 16719 */
+  "\xe6\xbb\x87\0" /* offset 16723 */
+  "\xf0\xa3\xbb\x91\0" /* offset 16727 */
+  "\xe6\xb7\xb9\0" /* offset 16732 */
+  "\xe6\xbd\xae\0" /* offset 16736 */
+  "\xf0\xa3\xbd\x9e\0" /* offset 16740 */
+  "\xf0\xa3\xbe\x8e\0" /* offset 16745 */
+  "\xe6\xbf\x86\0" /* offset 16750 */
+  "\xe7\x80\xb9\0" /* offset 16754 */
+  "\xe7\x80\x9b\0" /* offset 16758 */
+  "\xe3\xb6\x96\0" /* offset 16762 */
+  "\xe7\x81\x8a\0" /* offset 16766 */
+  "\xe7\x81\xbd\0" /* offset 16770 */
+  "\xe7\x81\xb7\0" /* offset 16774 */
+  "\xe7\x82\xad\0" /* offset 16778 */
+  "\xf0\xa0\x94\xa5\0" /* offset 16782 */
+  "\xe7\x85\x85\0" /* offset 16787 */
+  "\xf0\xa4\x89\xa3\0" /* offset 16791 */
+  "\xe7\x86\x9c\0" /* offset 16796 */
+  "\xf0\xa4\x8e\xab\0" /* offset 16800 */
+  "\xe7\x88\xa8\0" /* offset 16805 */
+  "\xe7\x89\x90\0" /* offset 16809 */
+  "\xf0\xa4\x98\x88\0" /* offset 16813 */
+  "\xe7\x8a\x80\0" /* offset 16818 */
+  "\xe7\x8a\x95\0" /* offset 16822 */
+  "\xf0\xa4\x9c\xb5\0" /* offset 16826 */
+  "\xf0\xa4\xa0\x94\0" /* offset 16831 */
+  "\xe7\x8d\xba\0" /* offset 16836 */
+  "\xe7\x8e\x8b\0" /* offset 16840 */
+  "\xe3\xba\xac\0" /* offset 16844 */
+  "\xe7\x8e\xa5\0" /* offset 16848 */
+  "\xe3\xba\xb8\0" /* offset 16852 */
+  "\xe7\x91\x87\0" /* offset 16856 */
+  "\xe7\x91\x9c\0" /* offset 16860 */
+  "\xe7\x92\x85\0" /* offset 16864 */
+  "\xe7\x93\x8a\0" /* offset 16868 */
+  "\xe3\xbc\x9b\0" /* offset 16872 */
+  "\xe7\x94\xa4\0" /* offset 16876 */
+  "\xf0\xa4\xb0\xb6\0" /* offset 16880 */
+  "\xe7\x94\xbe\0" /* offset 16885 */
+  "\xf0\xa4\xb2\x92\0" /* offset 16889 */
+  "\xf0\xa2\x86\x9f\0" /* offset 16894 */
+  "\xe7\x98\x90\0" /* offset 16899 */
+  "\xf0\xa4\xbe\xa1\0" /* offset 16903 */
+  "\xf0\xa4\xbe\xb8\0" /* offset 16908 */
+  "\xf0\xa5\x81\x84\0" /* offset 16913 */
+  "\xe3\xbf\xbc\0" /* offset 16918 */
+  "\xe4\x80\x88\0" /* offset 16922 */
+  "\xf0\xa5\x83\xb3\0" /* offset 16926 */
+  "\xf0\xa5\x83\xb2\0" /* offset 16931 */
+  "\xf0\xa5\x84\x99\0" /* offset 16936 */
+  "\xf0\xa5\x84\xb3\0" /* offset 16941 */
+  "\xe7\x9c\x9e\0" /* offset 16946 */
+  "\xe7\x9c\x9f\0" /* offset 16950 */
+  "\xe7\x9e\x8b\0" /* offset 16954 */
+  "\xe4\x81\x86\0" /* offset 16958 */
+  "\xe4\x82\x96\0" /* offset 16962 */
+  "\xf0\xa5\x90\x9d\0" /* offset 16966 */
+  "\xe7\xa1\x8e\0" /* offset 16971 */
+  "\xe4\x83\xa3\0" /* offset 16975 */
+  "\xf0\xa5\x98\xa6\0" /* offset 16979 */
+  "\xf0\xa5\x9a\x9a\0" /* offset 16984 */
+  "\xf0\xa5\x9b\x85\0" /* offset 16989 */
+  "\xe7\xa7\xab\0" /* offset 16994 */
+  "\xe4\x84\xaf\0" /* offset 16998 */
+  "\xe7\xa9\x8a\0" /* offset 17002 */
+  "\xe7\xa9\x8f\0" /* offset 17006 */
+  "\xf0\xa5\xa5\xbc\0" /* offset 17010 */
+  "\xf0\xa5\xaa\xa7\0" /* offset 17015 */
+  "\xe7\xab\xae\0" /* offset 17020 */
+  "\xe4\x88\x82\0" /* offset 17024 */
+  "\xf0\xa5\xae\xab\0" /* offset 17028 */
+  "\xe7\xaf\x86\0" /* offset 17033 */
+  "\xe7\xaf\x89\0" /* offset 17037 */
+  "\xe4\x88\xa7\0" /* offset 17041 */
+  "\xf0\xa5\xb2\x80\0" /* offset 17045 */
+  "\xe7\xb3\x92\0" /* offset 17050 */
+  "\xe4\x8a\xa0\0" /* offset 17054 */
+  "\xe7\xb3\xa8\0" /* offset 17058 */
+  "\xe7\xb3\xa3\0" /* offset 17062 */
+  "\xe7\xb4\x80\0" /* offset 17066 */
+  "\xf0\xa5\xbe\x86\0" /* offset 17070 */
+  "\xe7\xb5\xa3\0" /* offset 17075 */
+  "\xe4\x8c\x81\0" /* offset 17079 */
+  "\xe7\xb7\x87\0" /* offset 17083 */
+  "\xe7\xb8\x82\0" /* offset 17087 */
+  "\xe7\xb9\x85\0" /* offset 17091 */
+  "\xe4\x8c\xb4\0" /* offset 17095 */
+  "\xf0\xa6\x88\xa8\0" /* offset 17099 */
+  "\xf0\xa6\x89\x87\0" /* offset 17104 */
+  "\xe4\x8d\x99\0" /* offset 17109 */
+  "\xf0\xa6\x8b\x99\0" /* offset 17113 */
+  "\xe7\xbd\xba\0" /* offset 17118 */
+  "\xf0\xa6\x8c\xbe\0" /* offset 17122 */
+  "\xe7\xbe\x95\0" /* offset 17127 */
+  "\xe7\xbf\xba\0" /* offset 17131 */
+  "\xf0\xa6\x93\x9a\0" /* offset 17135 */
+  "\xf0\xa6\x94\xa3\0" /* offset 17140 */
+  "\xe8\x81\xa0\0" /* offset 17145 */
+  "\xf0\xa6\x96\xa8\0" /* offset 17149 */
+  "\xe8\x81\xb0\0" /* offset 17154 */
+  "\xf0\xa3\x8d\x9f\0" /* offset 17158 */
+  "\xe4\x8f\x95\0" /* offset 17163 */
+  "\xe8\x82\xb2\0" /* offset 17167 */
+  "\xe8\x84\x83\0" /* offset 17171 */
+  "\xe4\x90\x8b\0" /* offset 17175 */
+  "\xe8\x84\xbe\0" /* offset 17179 */
+  "\xe5\xaa\xb5\0" /* offset 17183 */
+  "\xf0\xa6\x9e\xa7\0" /* offset 17187 */
+  "\xf0\xa6\x9e\xb5\0" /* offset 17192 */
+  "\xf0\xa3\x8e\x93\0" /* offset 17197 */
+  "\xf0\xa3\x8e\x9c\0" /* offset 17202 */
+  "\xe8\x88\x84\0" /* offset 17207 */
+  "\xe8\xbe\x9e\0" /* offset 17211 */
+  "\xe4\x91\xab\0" /* offset 17215 */
+  "\xe8\x8a\x91\0" /* offset 17219 */
+  "\xe8\x8a\x8b\0" /* offset 17223 */
+  "\xe8\x8a\x9d\0" /* offset 17227 */
+  "\xe5\x8a\xb3\0" /* offset 17231 */
+  "\xe8\x8a\xb1\0" /* offset 17235 */
+  "\xe8\x8a\xb3\0" /* offset 17239 */
+  "\xe8\x8a\xbd\0" /* offset 17243 */
+  "\xe8\x8b\xa6\0" /* offset 17247 */
+  "\xf0\xa6\xac\xbc\0" /* offset 17251 */
+  "\xe8\x8c\x9d\0" /* offset 17256 */
+  "\xe8\x8d\xa3\0" /* offset 17260 */
+  "\xe8\x8e\xad\0" /* offset 17264 */
+  "\xe8\x8c\xa3\0" /* offset 17268 */
+  "\xe8\x8e\xbd\0" /* offset 17272 */
+  "\xe8\x8f\xa7\0" /* offset 17276 */
+  "\xe8\x8d\x93\0" /* offset 17280 */
+  "\xe8\x8f\x8a\0" /* offset 17284 */
+  "\xe8\x8f\x8c\0" /* offset 17288 */
+  "\xe8\x8f\x9c\0" /* offset 17292 */
+  "\xf0\xa6\xb0\xb6\0" /* offset 17296 */
+  "\xf0\xa6\xb5\xab\0" /* offset 17301 */
+  "\xf0\xa6\xb3\x95\0" /* offset 17306 */
+  "\xe4\x94\xab\0" /* offset 17311 */
+  "\xe8\x93\xb1\0" /* offset 17315 */
+  "\xe8\x93\xb3\0" /* offset 17319 */
+  "\xe8\x94\x96\0" /* offset 17323 */
+  "\xf0\xa7\x8f\x8a\0" /* offset 17327 */
+  "\xe8\x95\xa4\0" /* offset 17332 */
+  "\xf0\xa6\xbc\xac\0" /* offset 17336 */
+  "\xe4\x95\x9d\0" /* offset 17341 */
+  "\xe4\x95\xa1\0" /* offset 17345 */
+  "\xf0\xa6\xbe\xb1\0" /* offset 17349 */
+  "\xf0\xa7\x83\x92\0" /* offset 17354 */
+  "\xe4\x95\xab\0" /* offset 17359 */
+  "\xe8\x99\x90\0" /* offset 17363 */
+  "\xe8\x99\xa7\0" /* offset 17367 */
+  "\xe8\x99\xa9\0" /* offset 17371 */
+  "\xe8\x9a\xa9\0" /* offset 17375 */
+  "\xe8\x9a\x88\0" /* offset 17379 */
+  "\xe8\x9c\x8e\0" /* offset 17383 */
+  "\xe8\x9b\xa2\0" /* offset 17387 */
+  "\xe8\x9c\xa8\0" /* offset 17391 */
+  "\xe8\x9d\xab\0" /* offset 17395 */
+  "\xe8\x9e\x86\0" /* offset 17399 */
+  "\xe4\x97\x97\0" /* offset 17403 */
+  "\xe8\x9f\xa1\0" /* offset 17407 */
+  "\xe8\xa0\x81\0" /* offset 17411 */
+  "\xe4\x97\xb9\0" /* offset 17415 */
+  "\xe8\xa1\xa0\0" /* offset 17419 */
+  "\xf0\xa7\x99\xa7\0" /* offset 17423 */
+  "\xe8\xa3\x97\0" /* offset 17428 */
+  "\xe8\xa3\x9e\0" /* offset 17432 */
+  "\xe4\x98\xb5\0" /* offset 17436 */
+  "\xe8\xa3\xba\0" /* offset 17440 */
+  "\xe3\x92\xbb\0" /* offset 17444 */
+  "\xf0\xa7\xa2\xae\0" /* offset 17448 */
+  "\xf0\xa7\xa5\xa6\0" /* offset 17453 */
+  "\xe4\x9a\xbe\0" /* offset 17458 */
+  "\xe4\x9b\x87\0" /* offset 17462 */
+  "\xe8\xaa\xa0\0" /* offset 17466 */
+  "\xf0\xa7\xb2\xa8\0" /* offset 17470 */
+  "\xe8\xb2\xab\0" /* offset 17475 */
+  "\xe8\xb3\x81\0" /* offset 17479 */
+  "\xe8\xb4\x9b\0" /* offset 17483 */
+  "\xe8\xb5\xb7\0" /* offset 17487 */
+  "\xf0\xa7\xbc\xaf\0" /* offset 17491 */
+  "\xf0\xa0\xa0\x84\0" /* offset 17496 */
+  "\xe8\xb7\x8b\0" /* offset 17501 */
+  "\xe8\xb6\xbc\0" /* offset 17505 */
+  "\xe8\xb7\xb0\0" /* offset 17509 */
+  "\xf0\xa0\xa3\x9e\0" /* offset 17513 */
+  "\xe8\xbb\x94\0" /* offset 17518 */
+  "\xf0\xa8\x97\x92\0" /* offset 17522 */
+  "\xf0\xa8\x97\xad\0" /* offset 17527 */
+  "\xe9\x82\x94\0" /* offset 17532 */
+  "\xe9\x83\xb1\0" /* offset 17536 */
+  "\xe9\x84\x91\0" /* offset 17540 */
+  "\xf0\xa8\x9c\xae\0" /* offset 17544 */
+  "\xe9\x84\x9b\0" /* offset 17549 */
+  "\xe9\x88\xb8\0" /* offset 17553 */
+  "\xe9\x8b\x97\0" /* offset 17557 */
+  "\xe9\x8b\x98\0" /* offset 17561 */
+  "\xe9\x89\xbc\0" /* offset 17565 */
+  "\xe9\x8f\xb9\0" /* offset 17569 */
+  "\xe9\x90\x95\0" /* offset 17573 */
+  "\xf0\xa8\xaf\xba\0" /* offset 17577 */
+  "\xe9\x96\x8b\0" /* offset 17582 */
+  "\xe4\xa6\x95\0" /* offset 17586 */
+  "\xe9\x96\xb7\0" /* offset 17590 */
+  "\xf0\xa8\xb5\xb7\0" /* offset 17594 */
+  "\xe4\xa7\xa6\0" /* offset 17599 */
+  "\xe9\x9b\x83\0" /* offset 17603 */
+  "\xe5\xb6\xb2\0" /* offset 17607 */
+  "\xe9\x9c\xa3\0" /* offset 17611 */
+  "\xf0\xa9\x85\x85\0" /* offset 17615 */
+  "\xf0\xa9\x88\x9a\0" /* offset 17620 */
+  "\xe4\xa9\xae\0" /* offset 17625 */
+  "\xe4\xa9\xb6\0" /* offset 17629 */
+  "\xe9\x9f\xa0\0" /* offset 17633 */
+  "\xf0\xa9\x90\x8a\0" /* offset 17637 */
+  "\xe4\xaa\xb2\0" /* offset 17642 */
+  "\xf0\xa9\x92\x96\0" /* offset 17646 */
+  "\xe9\xa0\xa9\0" /* offset 17651 */
+  "\xf0\xa9\x96\xb6\0" /* offset 17655 */
+  "\xe9\xa3\xa2\0" /* offset 17660 */
+  "\xe4\xac\xb3\0" /* offset 17664 */
+  "\xe9\xa4\xa9\0" /* offset 17668 */
+  "\xe9\xa6\xa7\0" /* offset 17672 */
+  "\xe9\xa7\x82\0" /* offset 17676 */
+  "\xe9\xa7\xbe\0" /* offset 17680 */
+  "\xe4\xaf\x8e\0" /* offset 17684 */
+  "\xf0\xa9\xac\xb0\0" /* offset 17688 */
+  "\xe9\xb1\x80\0" /* offset 17693 */
+  "\xe9\xb3\xbd\0" /* offset 17697 */
+  "\xe4\xb3\x8e\0" /* offset 17701 */
+  "\xe4\xb3\xad\0" /* offset 17705 */
+  "\xe9\xb5\xa7\0" /* offset 17709 */
+  "\xf0\xaa\x83\x8e\0" /* offset 17713 */
+  "\xe4\xb3\xb8\0" /* offset 17718 */
+  "\xf0\xaa\x84\x85\0" /* offset 17722 */
+  "\xf0\xaa\x88\x8e\0" /* offset 17727 */
+  "\xf0\xaa\x8a\x91\0" /* offset 17732 */
+  "\xe4\xb5\x96\0" /* offset 17737 */
+  "\xe9\xbb\xbe\0" /* offset 17741 */
+  "\xe9\xbc\x85\0" /* offset 17745 */
+  "\xe9\xbc\x8f\0" /* offset 17749 */
+  "\xe9\xbc\x96\0" /* offset 17753 */
+  "\xf0\xaa\x98\x80\0" /* offset 17757 */;
 
 typedef struct
 {
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 793103182..9a79e4316 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -37,6 +37,13 @@
 #include "gwin32.h"
 #endif
 
+#define G_UNICHAR_FULLWIDTH_A 0xff21
+#define G_UNICHAR_FULLWIDTH_I 0xff29
+#define G_UNICHAR_FULLWIDTH_J 0xff2a
+#define G_UNICHAR_FULLWIDTH_F 0xff26
+#define G_UNICHAR_FULLWIDTH_a 0xff41
+#define G_UNICHAR_FULLWIDTH_f 0xff46
+
 #define ATTR_TABLE(Page) (((Page) <= G_UNICODE_LAST_PAGE_PART1) \
                           ? attr_table_part1[Page] \
                           : attr_table_part2[(Page) - 0xe00])
@@ -362,9 +369,11 @@ g_unichar_istitle (gunichar c)
 gboolean
 g_unichar_isxdigit (gunichar c)
 {
-  return ((c >= 'a' && c <= 'f')
-	  || (c >= 'A' && c <= 'F')
-	  || (TYPE (c) == G_UNICODE_DECIMAL_NUMBER));
+  return ((c >= 'a' && c <= 'f') ||
+          (c >= 'A' && c <= 'F') ||
+          (c >= G_UNICHAR_FULLWIDTH_a && c <= G_UNICHAR_FULLWIDTH_f) ||
+          (c >= G_UNICHAR_FULLWIDTH_A && c <= G_UNICHAR_FULLWIDTH_F) ||
+          (TYPE (c) == G_UNICODE_DECIMAL_NUMBER));
 }
 
 /**
@@ -614,13 +623,19 @@ gunichar
 g_unichar_totitle (gunichar c)
 {
   unsigned int i;
+
+  /* We handle U+0000 explicitely because some elements in
+   * title_table[i][1] may be null. */
+  if (c == 0)
+    return c;
+
   for (i = 0; i < G_N_ELEMENTS (title_table); ++i)
     {
       if (title_table[i][0] == c || title_table[i][1] == c
 	  || title_table[i][2] == c)
 	return title_table[i][0];
     }
-    
+
   if (TYPE (c) == G_UNICODE_LOWERCASE_LETTER)
     return g_unichar_toupper (c);
 
@@ -662,6 +677,10 @@ g_unichar_xdigit_value (gunichar c)
     return c - 'A' + 10;
   if (c >= 'a' && c <= 'f')
     return c - 'a' + 10;
+  if (c >= G_UNICHAR_FULLWIDTH_A && c <= G_UNICHAR_FULLWIDTH_F)
+    return c - G_UNICHAR_FULLWIDTH_A + 10;
+  if (c >= G_UNICHAR_FULLWIDTH_a && c <= G_UNICHAR_FULLWIDTH_f)
+    return c - G_UNICHAR_FULLWIDTH_a + 10;
   if (TYPE (c) == G_UNICODE_DECIMAL_NUMBER)
     return ATTTABLE (c >> 8, c & 0xff);
   return -1;
@@ -968,7 +987,8 @@ real_tolower (const gchar *str,
       last = p;
       p = g_utf8_next_char (p);
 
-      if (locale_type == LOCALE_TURKIC && c == 'I')
+      if (locale_type == LOCALE_TURKIC && (c == 'I' ||
+                                           c == G_UNICHAR_FULLWIDTH_I))
 	{
           if (g_utf8_get_char (p) == 0x0307)
             {
@@ -1004,7 +1024,8 @@ real_tolower (const gchar *str,
             }
         }
       else if (locale_type == LOCALE_LITHUANIAN && 
-               (c == 'I' || c == 'J' || c == 0x012e) && 
+               (c == 'I' || c == G_UNICHAR_FULLWIDTH_I ||
+                c == 'J' || c == G_UNICHAR_FULLWIDTH_J || c == 0x012e) &&
                has_more_above (p))
         {
           len += g_unichar_to_utf8 (g_unichar_tolower (c), out_buffer ? out_buffer + len : NULL); 
@@ -1449,6 +1470,12 @@ static const guint32 iso15924_tags[] =
     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 */
+
+  /* Unicode 12.0 additions */
+    PACK ('E','l','y','m'), /* G_UNICODE_SCRIPT_ELYMAIC */
+    PACK ('N','a','n','d'), /* G_UNICODE_SCRIPT_NANDINAGARI */
+    PACK ('H','m','n','p'), /* G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG */
+    PACK ('W','c','h','o'), /* G_UNICODE_SCRIPT_WANCHO */
 #undef PACK
 };
 
diff --git a/glib/gutils.c b/glib/gutils.c
index b4ca1cc3f..9e2f0b0b7 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -1047,29 +1047,6 @@ g_get_prgname (void)
   gchar* retval;
 
   G_LOCK (g_prgname);
-#ifdef G_OS_WIN32
-  if (g_prgname == NULL)
-    {
-      static gboolean beenhere = FALSE;
-
-      if (!beenhere)
-	{
-	  gchar *utf8_buf = NULL;
-	  wchar_t buf[MAX_PATH+1];
-
-	  beenhere = TRUE;
-	  if (GetModuleFileNameW (GetModuleHandle (NULL),
-				  buf, G_N_ELEMENTS (buf)) > 0)
-	    utf8_buf = g_utf16_to_utf8 (buf, -1, NULL, NULL, NULL);
-
-	  if (utf8_buf)
-	    {
-	      g_prgname = g_path_get_basename (utf8_buf);
-	      g_free (utf8_buf);
-	    }
-	}
-    }
-#endif
   retval = g_prgname;
   G_UNLOCK (g_prgname);
 
@@ -2323,7 +2300,7 @@ g_format_size_full (guint64          size,
   struct Format
   {
     guint64 factor;
-    char string[9];
+    char string[10];
   };
 
   typedef enum
@@ -2501,16 +2478,7 @@ g_format_size_full (guint64          size,
           /* Translators: the %s in "%s bits" will always be replaced by a number. */
           translated_format = g_dngettext (GETTEXT_PACKAGE, "%s bit", "%s bits", plural_form);
         }
-      /* XXX: Windows doesn't support the "'" format modifier, so we
-       * must not use it there.  Instead, just display the number
-       * without separation.  Bug #655336 is open until a solution is
-       * found.
-       */
-#ifndef G_OS_WIN32
       formatted_number = g_strdup_printf ("%'"G_GUINT64_FORMAT, size);
-#else
-      formatted_number = g_strdup_printf ("%"G_GUINT64_FORMAT, size);
-#endif
 
       g_string_append (string, " (");
       g_string_append_printf (string, translated_format, formatted_number);
diff --git a/glib/gvariant.c b/glib/gvariant.c
index db56560a6..dd0e0470d 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -226,7 +226,7 @@
  * type information would be allocated.
  * 
  * The type information cache, additionally, uses a #GHashTable to
- * store and lookup the cached items and stores a pointer to this
+ * store and look up the cached items and stores a pointer to this
  * hash table in static storage.  The hash table is freed when there
  * are zero items in the type cache.
  *
@@ -942,7 +942,7 @@ g_variant_new_dict_entry (GVariant *key,
 /**
  * g_variant_lookup: (skip)
  * @dictionary: a dictionary #GVariant
- * @key: the key to lookup in the dictionary
+ * @key: the key to look up in the dictionary
  * @format_string: a GVariant format string
  * @...: the arguments to unpack the value into
  *
@@ -1000,7 +1000,7 @@ g_variant_lookup (GVariant    *dictionary,
 /**
  * g_variant_lookup_value:
  * @dictionary: a dictionary #GVariant
- * @key: the key to lookup in the dictionary
+ * @key: the key to look up in the dictionary
  * @expected_type: (nullable): a #GVariantType, or %NULL
  *
  * Looks up a value in a dictionary #GVariant.
@@ -3947,7 +3947,7 @@ g_variant_dict_init (GVariantDict *dict,
 /**
  * g_variant_dict_lookup:
  * @dict: a #GVariantDict
- * @key: the key to lookup in the dictionary
+ * @key: the key to look up in the dictionary
  * @format_string: a GVariant format string
  * @...: the arguments to unpack the value into
  *
@@ -3994,7 +3994,7 @@ g_variant_dict_lookup (GVariantDict *dict,
 /**
  * g_variant_dict_lookup_value:
  * @dict: a #GVariantDict
- * @key: the key to lookup in the dictionary
+ * @key: the key to look up in the dictionary
  * @expected_type: (nullable): a #GVariantType, or %NULL
  *
  * Looks up a value in a #GVariantDict.
@@ -4034,7 +4034,7 @@ g_variant_dict_lookup_value (GVariantDict       *dict,
 /**
  * g_variant_dict_contains:
  * @dict: a #GVariantDict
- * @key: the key to lookup in the dictionary
+ * @key: the key to look up in the dictionary
  *
  * Checks if @key exists in @dict.
  *
diff --git a/glib/meson.build b/glib/meson.build
index df8be8e6d..40b58047d 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -459,4 +459,8 @@ if enable_systemtap
     install : true)
 endif
 
-subdir('tests')
+# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
+build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
+if build_tests
+  subdir('tests')
+endif
\ No newline at end of file
diff --git a/glib/tests/autoptr.c b/glib/tests/autoptr.c
index 92d4bbaca..d24ad1ed8 100644
--- a/glib/tests/autoptr.c
+++ b/glib/tests/autoptr.c
@@ -41,63 +41,63 @@ static void
 test_g_async_queue (void)
 {
   g_autoptr(GAsyncQueue) val = g_async_queue_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_bookmark_file (void)
 {
   g_autoptr(GBookmarkFile) val = g_bookmark_file_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_bytes (void)
 {
   g_autoptr(GBytes) val = g_bytes_new ("foo", 3);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_checksum (void)
 {
   g_autoptr(GChecksum) val = g_checksum_new (G_CHECKSUM_SHA256);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_date_time (void)
 {
   g_autoptr(GDateTime) val = g_date_time_new_now_utc ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_dir (void)
 {
   g_autoptr(GDir) val = g_dir_open (".", 0, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_error (void)
 {
   g_autoptr(GError) val = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, "oops");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_hash_table (void)
 {
   g_autoptr(GHashTable) val = g_hash_table_new (NULL, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_hmac (void)
 {
   g_autoptr(GHmac) val = g_hmac_new (G_CHECKSUM_SHA256, (guint8*)"hello", 5);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -110,14 +110,14 @@ test_g_io_channel (void)
 #endif
 
   g_autoptr(GIOChannel) val = g_io_channel_new_file (devnull, "r", NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_key_file (void)
 {
   g_autoptr(GKeyFile) val = g_key_file_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -125,57 +125,57 @@ test_g_list (void)
 {
   g_autoptr(GList) val = NULL;
   g_autoptr(GList) val2 = g_list_prepend (NULL, "foo");
-  g_assert (val == NULL);
-  g_assert (val2 != NULL);
+  g_assert_null (val);
+  g_assert_nonnull (val2);
 }
 
 static void
 test_g_array (void)
 {
   g_autoptr(GArray) val = g_array_new (0, 0, sizeof (gpointer));
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_ptr_array (void)
 {
   g_autoptr(GPtrArray) val = g_ptr_array_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_byte_array (void)
 {
   g_autoptr(GByteArray) val = g_byte_array_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_main_context (void)
 {
   g_autoptr(GMainContext) val = g_main_context_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_main_loop (void)
 {
   g_autoptr(GMainLoop) val = g_main_loop_new (NULL, TRUE);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_source (void)
 {
   g_autoptr(GSource) val = g_timeout_source_new_seconds (2);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_mapped_file (void)
 {
   g_autoptr(GMappedFile) val = g_mapped_file_new (g_test_get_filename (G_TEST_DIST, "keyfiletest.ini", NULL), FALSE, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -205,35 +205,35 @@ static void
 test_g_markup_parse_context (void)
 {
   g_autoptr(GMarkupParseContext) val = g_markup_parse_context_new (&parser,  0, NULL, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_node (void)
 {
   g_autoptr(GNode) val = g_node_new ("hello");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_option_context (void)
 {
   g_autoptr(GOptionContext) val = g_option_context_new ("hello");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_option_group (void)
 {
   g_autoptr(GOptionGroup) val = g_option_group_new ("hello", "world", "helpme", NULL, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_pattern_spec (void)
 {
   g_autoptr(GPatternSpec) val = g_pattern_spec_new ("plaid");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -241,7 +241,7 @@ test_g_queue (void)
 {
   g_autoptr(GQueue) val = g_queue_new ();
   g_auto(GQueue) stackval = G_QUEUE_INIT;
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
   g_assert_null (stackval.head);
 }
 
@@ -249,14 +249,14 @@ static void
 test_g_rand (void)
 {
   g_autoptr(GRand) val = g_rand_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_regex (void)
 {
   g_autoptr(GRegex) val = g_regex_new (".*", 0, 0, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -274,14 +274,14 @@ test_g_scanner (void)
 {
   GScannerConfig config = { 0, };
   g_autoptr(GScanner) val = g_scanner_new (&config);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_sequence (void)
 {
   g_autoptr(GSequence) val = g_sequence_new (NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -289,22 +289,22 @@ test_g_slist (void)
 {
   g_autoptr(GSList) val = NULL;
   g_autoptr(GSList) nonempty_val = g_slist_prepend (NULL, "hello");
-  g_assert (val == NULL);
-  g_assert (nonempty_val != NULL);
+  g_assert_null (val);
+  g_assert_nonnull (nonempty_val);
 }
 
 static void
 test_g_string (void)
 {
   g_autoptr(GString) val = g_string_new ("");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_string_chunk (void)
 {
   g_autoptr(GStringChunk) val = g_string_chunk_new (42);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static gpointer
@@ -318,7 +318,7 @@ static void
 test_g_thread (void)
 {
   g_autoptr(GThread) val = g_thread_new ("bob", mythread, NULL);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -414,6 +414,72 @@ test_g_rec_mutex_locker (void)
     g_thread_join (thread);
 }
 
+/* Thread function to check that an rw lock given in @data cannot be writer locked */
+static gpointer
+rw_lock_cannot_take_writer_lock_thread (gpointer data)
+{
+  GRWLock *lock = (GRWLock *) data;
+  g_assert_false (g_rw_lock_writer_trylock (lock));
+  return NULL;
+}
+
+/* Thread function to check that an rw lock given in @data can be reader locked */
+static gpointer
+rw_lock_can_take_reader_lock_thread (gpointer data)
+{
+  GRWLock *lock = (GRWLock *) data;
+  g_assert_true (g_rw_lock_reader_trylock (lock));
+  g_rw_lock_reader_unlock (lock);
+  return NULL;
+}
+
+static void
+test_g_rw_lock_lockers (void)
+{
+  GRWLock lock;
+  GThread *thread;
+
+  g_rw_lock_init (&lock);
+
+  if (TRUE)
+    {
+      g_autoptr(GRWLockWriterLocker) val = g_rw_lock_writer_locker_new (&lock);
+
+      g_assert_nonnull (val);
+
+      /* Verify that we cannot take another writer lock as a writer lock is currently held */
+      thread = g_thread_new ("rw lock cannot take writer lock", rw_lock_cannot_take_writer_lock_thread, &lock);
+      g_thread_join (thread);
+
+      /* Verify that we cannot take a reader lock as a writer lock is currently held */
+      g_assert_false (g_rw_lock_reader_trylock (&lock));
+    }
+
+  if (TRUE)
+    {
+      g_autoptr(GRWLockReaderLocker) val = g_rw_lock_reader_locker_new (&lock);
+
+      g_assert_nonnull (val);
+
+      /* Verify that we can take another reader lock from another thread */
+      thread = g_thread_new ("rw lock can take reader lock", rw_lock_can_take_reader_lock_thread, &lock);
+      g_thread_join (thread);
+
+      /* ... and also that recursive reader locking from the same thread works */
+      g_assert_true (g_rw_lock_reader_trylock (&lock));
+      g_rw_lock_reader_unlock (&lock);
+
+      /* Verify that we cannot take a writer lock as a reader lock is currently held */
+      thread = g_thread_new ("rw lock cannot take writer lock", rw_lock_cannot_take_writer_lock_thread, &lock);
+      g_thread_join (thread);
+    }
+
+  /* Verify that we can take a writer lock again: this can only work if all of
+   * the locks taken above have been correctly released. */
+  g_assert_true (g_rw_lock_writer_trylock (&lock));
+  g_rw_lock_writer_unlock (&lock);
+}
+
 static void
 test_g_cond (void)
 {
@@ -425,28 +491,28 @@ static void
 test_g_timer (void)
 {
   g_autoptr(GTimer) val = g_timer_new ();
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_time_zone (void)
 {
   g_autoptr(GTimeZone) val = g_time_zone_new ("UTC");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_tree (void)
 {
   g_autoptr(GTree) val = g_tree_new ((GCompareFunc)strcmp);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_variant (void)
 {
   g_autoptr(GVariant) val = g_variant_new_string ("hello");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -455,7 +521,7 @@ test_g_variant_builder (void)
   g_autoptr(GVariantBuilder) val = g_variant_builder_new (G_VARIANT_TYPE ("as"));
   g_auto(GVariantBuilder) stackval;
 
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
   g_variant_builder_init (&stackval, G_VARIANT_TYPE ("as"));
 }
 
@@ -464,7 +530,7 @@ test_g_variant_iter (void)
 {
   g_autoptr(GVariant) var = g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32, "", 0, sizeof(guint32));
   g_autoptr(GVariantIter) val = g_variant_iter_new (var);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -475,21 +541,21 @@ test_g_variant_dict (void)
   g_autoptr(GVariantDict) val = g_variant_dict_new (data);
 
   g_variant_dict_init (&stackval, data);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_g_variant_type (void)
 {
   g_autoptr(GVariantType) val = g_variant_type_new ("s");
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
 test_strv (void)
 {
   g_auto(GStrv) val = g_strsplit("a:b:c", ":", -1);
-  g_assert (val != NULL);
+  g_assert_nonnull (val);
 }
 
 static void
@@ -526,13 +592,13 @@ test_autolist (void)
 
   /* Only assert if autoptr works */
 #ifdef __GNUC__
-  g_assert (freed1);
-  g_assert (freed3);
+  g_assert_true (freed1);
+  g_assert_true (freed3);
 #endif
-  g_assert (!freed2);
+  g_assert_false (freed2);
 
   g_bytes_unref (b2);
-  g_assert (freed2);
+  g_assert_true (freed2);
 }
 
 static void
@@ -555,13 +621,42 @@ test_autoslist (void)
 
   /* Only assert if autoptr works */
 #ifdef __GNUC__
-  g_assert (freed1);
-  g_assert (freed3);
+  g_assert_true (freed1);
+  g_assert_true (freed3);
+#endif
+  g_assert_false (freed2);
+
+  g_bytes_unref (b2);
+  g_assert_true (freed2);
+}
+
+static void
+test_autoqueue (void)
+{
+  char data[1] = {0};
+  gboolean freed1 = FALSE;
+  gboolean freed2 = FALSE;
+  gboolean freed3 = FALSE;
+  GBytes *b1 = g_bytes_new_with_free_func (data, sizeof(data), mark_freed, &freed1);
+  GBytes *b2 = g_bytes_new_with_free_func (data, sizeof(data), mark_freed, &freed2);
+  GBytes *b3 = g_bytes_new_with_free_func (data, sizeof(data), mark_freed, &freed3);
+
+  {
+    g_autoqueue(GBytes) q = g_queue_new ();
+
+    g_queue_push_head (q, b1);
+    g_queue_push_tail (q, b3);
+  }
+
+  /* Only assert if autoptr works */
+#ifdef __GNUC__
+  g_assert_true (freed1);
+  g_assert_true (freed3);
 #endif
-  g_assert (!freed2);
+  g_assert_false (freed2);
 
   g_bytes_unref (b2);
-  g_assert (freed2);
+  g_assert_true (freed2);
 }
 
 int
@@ -607,6 +702,7 @@ main (int argc, gchar *argv[])
   g_test_add_func ("/autoptr/g_mutex", test_g_mutex);
   g_test_add_func ("/autoptr/g_mutex_locker", test_g_mutex_locker);
   g_test_add_func ("/autoptr/g_rec_mutex_locker", test_g_rec_mutex_locker);
+  g_test_add_func ("/autoptr/g_rw_lock_lockers", test_g_rw_lock_lockers);
   g_test_add_func ("/autoptr/g_cond", test_g_cond);
   g_test_add_func ("/autoptr/g_timer", test_g_timer);
   g_test_add_func ("/autoptr/g_time_zone", test_g_time_zone);
@@ -620,6 +716,7 @@ main (int argc, gchar *argv[])
   g_test_add_func ("/autoptr/refstring", test_refstring);
   g_test_add_func ("/autoptr/autolist", test_autolist);
   g_test_add_func ("/autoptr/autoslist", test_autoslist);
+  g_test_add_func ("/autoptr/autoqueue", test_autoqueue);
 
   return g_test_run ();
 }
diff --git a/glib/tests/date.c b/glib/tests/date.c
index 8eb28712b..ff13ad101 100644
--- a/glib/tests/date.c
+++ b/glib/tests/date.c
@@ -388,7 +388,7 @@ test_month_names (void)
       TEST_DATE ( 1,  4, 2018,   "%OB %Y",       "Απρίλιος 2018");
       TEST_DATE ( 1,  5, 2018,   "%OB %Y",          "Μάιος 2018");
       TEST_DATE ( 1,  6, 2018,   "%OB %Y",        "Ιούνιος 2018");
-      TEST_DATE (16,  7, 2018, "%e %b %Y",        "16 Ιούλ 2018");
+      TEST_DATE (16,  7, 2018, "%e %b %Y",        "16 Ιουλ 2018");
       TEST_DATE ( 1,  8, 2018,   "%Ob %Y",            "Αύγ 2018");
     }
   else
diff --git a/glib/tests/list.c b/glib/tests/list.c
index 1b5d6cadf..0adb1bbb1 100644
--- a/glib/tests/list.c
+++ b/glib/tests/list.c
@@ -548,6 +548,72 @@ test_double_free (void)
   g_test_trap_assert_stderr ("*corrupted double-linked list detected*");
 }
 
+static void
+test_list_insert_before_link (void)
+{
+  GList a = {0};
+  GList b = {0};
+  GList c = {0};
+  GList d = {0};
+  GList e = {0};
+  GList *list;
+
+  list = g_list_insert_before_link (NULL, NULL, &a);
+  g_assert_nonnull (list);
+  g_assert_true (list == &a);
+  g_assert_null (a.prev);
+  g_assert_null (a.next);
+  g_assert_cmpint (g_list_length (list), ==, 1);
+
+  list = g_list_insert_before_link (list, &a, &b);
+  g_assert_nonnull (list);
+  g_assert_true (list == &b);
+  g_assert_null (b.prev);
+  g_assert_true (b.next == &a);
+  g_assert_true (a.prev == &b);
+  g_assert_null (a.next);
+  g_assert_cmpint (g_list_length (list), ==, 2);
+
+  list = g_list_insert_before_link (list, &a, &c);
+  g_assert_nonnull (list);
+  g_assert_true (list == &b);
+  g_assert_null (b.prev);
+  g_assert_true (b.next == &c);
+  g_assert_true (c.next == &a);
+  g_assert_true (c.prev == &b);
+  g_assert_true (a.prev == &c);
+  g_assert_null (a.next);
+  g_assert_cmpint (g_list_length (list), ==, 3);
+
+  list = g_list_insert_before_link (list, &b, &d);
+  g_assert_nonnull (list);
+  g_assert_true (list == &d);
+  g_assert_null (d.prev);
+  g_assert_true (b.prev == &d);
+  g_assert_true (c.prev == &b);
+  g_assert_true (a.prev == &c);
+  g_assert_true (d.next == &b);
+  g_assert_true (b.next == &c);
+  g_assert_true (c.next == &a);
+  g_assert_null (a.next);
+  g_assert_cmpint (g_list_length (list), ==, 4);
+
+  list = g_list_insert_before_link (list, NULL, &e);
+  g_assert_nonnull (list);
+  g_assert_true (list == &d);
+  g_assert_null (d.prev);
+  g_assert_true (b.prev == &d);
+  g_assert_true (c.prev == &b);
+  g_assert_true (a.prev == &c);
+  g_assert_true (d.next == &b);
+  g_assert_true (b.next == &c);
+  g_assert_true (c.next == &a);
+  g_assert_true (a.next == &e);
+  g_assert_true (e.prev == &a);
+  g_assert_null (e.next);
+  g_assert_cmpint (g_list_length (list), ==, 5);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -562,6 +628,7 @@ main (int argc, char *argv[])
   g_test_add_func ("/list/sort", test_list_sort);
   g_test_add_func ("/list/sort-with-data", test_list_sort_with_data);
   g_test_add_func ("/list/sort/stable", test_list_sort_stable);
+  g_test_add_func ("/list/insert-before-link", test_list_insert_before_link);
   g_test_add_func ("/list/insert-sorted", test_list_insert_sorted);
   g_test_add_func ("/list/insert-sorted-with-data", test_list_insert_sorted_with_data);
   g_test_add_func ("/list/reverse", test_list_reverse);
diff --git a/glib/tests/mem-overflow.c b/glib/tests/mem-overflow.c
index 5e5dd68c0..64ec0b0cd 100644
--- a/glib/tests/mem-overflow.c
+++ b/glib/tests/mem-overflow.c
@@ -21,7 +21,7 @@
 
 /* We test for errors in optimize-only definitions in gmem.h */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ > 6
 #pragma GCC optimize (1)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Walloc-size-larger-than="
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index e6c5cbd22..c47133f24 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -204,8 +204,7 @@ foreach test_name, extra_args : glib_tests
 
   suite = ['glib'] + extra_args.get('suite', [])
   timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
-  test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
-    args : ['--tap'])
+  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
 endforeach
 
 # test-spawn-echo helper binary required by the spawn tests above
@@ -229,7 +228,7 @@ if not meson.is_cross_build() and host_system != 'windows'
   if xmllint.found()
     tmpsample_xml = custom_target('tmpsample.xml',
       output : 'tmpsample.xml',
-      command : [ gtester, '-k', '--quiet', '-o', '@OUTPUT@',
+      command : [ gtester, '-k', '--quiet', '--i-know-this-is-deprecated', '-o', '@OUTPUT@',
                   '--test-arg=--gtester-selftest', gtester])
 
     test('gtester-xmllint-check', xmllint,
diff --git a/glib/tests/option-argv0.c b/glib/tests/option-argv0.c
index f977625b5..5b626df70 100644
--- a/glib/tests/option-argv0.c
+++ b/glib/tests/option-argv0.c
@@ -51,7 +51,8 @@ test_platform_argv0 (void)
   /* This test must pass on platforms where platform_get_argv0()
    * is implemented. At the moment that means Linux/Cygwin,
    * (which uses /proc/self/cmdline) or OpenBSD (which uses
-   * sysctl and KERN_PROC_ARGS). On other platforms the test
+   * sysctl and KERN_PROC_ARGS) or Windows (which uses
+   * GetCommandlineW ()). On other platforms the test
    * is not expected to pass, but we'd still want to know
    * how it does (the test code itself doesn't use any platform-specific
    * functionality, the difference is internal to glib, so it's quite
@@ -60,7 +61,10 @@ test_platform_argv0 (void)
    * to prevent them from crashing hard on failed assertions,
    * and make them call g_test_skip() instead.
    */
-#if !defined HAVE_PROC_SELF_CMDLINE && !defined __OpenBSD__ && !defined __linux
+#if !defined HAVE_PROC_SELF_CMDLINE && \
+    !defined __OpenBSD__ && \
+    !defined __linux && \
+    !defined G_OS_WIN32
   fatal_errors = FALSE;
 #endif
 
diff --git a/glib/tests/protocol.c b/glib/tests/protocol.c
index 4713f3d0b..f1e969af3 100644
--- a/glib/tests/protocol.c
+++ b/glib/tests/protocol.c
@@ -122,9 +122,9 @@ test_message (void)
           (gchar*)argv0,
           NULL,
           "--GTestSubprocess",
-          "-p", "/glib/testing/protocol/debug",
-          "-p", "/glib/testing/protocol/message",
           "-p", "/glib/testing/protocol/gtest-message",
+          "-p", "/glib/testing/protocol/message",
+          "-p", "/glib/testing/protocol/debug",
           NULL
   };
   GTestLogBuffer* tlb;
diff --git a/glib/tests/queue.c b/glib/tests/queue.c
index 46839790f..dd9dd2127 100644
--- a/glib/tests/queue.c
+++ b/glib/tests/queue.c
@@ -1083,18 +1083,136 @@ test_clear_full (void)
   g_assert_true (three->freed);
   g_assert_true (four->freed);
 
+  g_assert_true (g_queue_is_empty (queue));
   check_integrity (queue);
 
   g_slice_free (QueueItem, one);
   g_slice_free (QueueItem, two);
   g_slice_free (QueueItem, three);
   g_slice_free (QueueItem, four);
+  g_queue_free (queue);
+}
+
+/* Check that g_queue_clear_full() called with a NULL free_func is equivalent
+ * to g_queue_clear(). */
+static void
+test_clear_full_noop (void)
+{
+  QueueItem *one, *two, *three, *four;
+  GQueue *queue;
+
+  queue = g_queue_new ();
+  g_queue_push_tail (queue, one = new_item (1));
+  g_queue_push_tail (queue, two = new_item (2));
+  g_queue_push_tail (queue, three = new_item (3));
+  g_queue_push_tail (queue, four = new_item (4));
+
+  g_assert_cmpint (g_queue_get_length (queue), ==, 4);
+  g_assert_false (one->freed);
+  g_assert_false (two->freed);
+  g_assert_false (three->freed);
+  g_assert_false (four->freed);
+
+  g_queue_clear_full (queue, NULL);
 
   g_assert_true (g_queue_is_empty (queue));
+  check_integrity (queue);
 
+  g_slice_free (QueueItem, one);
+  g_slice_free (QueueItem, two);
+  g_slice_free (QueueItem, three);
+  g_slice_free (QueueItem, four);
   g_queue_free (queue);
 }
 
+/* Test g_queue_push_nth_link() with various combinations of position (before,
+ * in the middle of, or at the end of the queue) and various existing queues
+ * (empty, single element, multiple elements). */
+static void
+test_push_nth_link (void)
+{
+  GQueue *q;
+  q = g_queue_new ();
+
+  /* Push onto before the front of an empty queue (which results in it being
+   * added to the end of the queue). */
+  g_queue_push_nth_link (q, -1, g_list_prepend (NULL, GINT_TO_POINTER (1)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 1);
+
+  g_queue_clear (q);
+
+  /* Push onto after the rear of an empty queue. */
+  g_queue_push_nth_link (q, 100, g_list_prepend (NULL, GINT_TO_POINTER (2)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 2);
+
+  g_queue_clear (q);
+
+  /* Push onto the front of an empty queue. */
+  g_queue_push_nth_link (q, 0, g_list_prepend (NULL, GINT_TO_POINTER (3)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 3);
+
+  g_queue_clear (q);
+
+  /* Push onto before the front of a non-empty queue (which results in it being
+   * added to the end of the queue). */
+  g_queue_push_head (q, GINT_TO_POINTER (4));
+  g_queue_push_nth_link (q, -1, g_list_prepend (NULL, GINT_TO_POINTER (5)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 2);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 4);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 1)), ==, 5);
+
+  g_queue_clear (q);
+
+  /* Push onto after the rear of a non-empty queue. */
+  g_queue_push_head (q, GINT_TO_POINTER (6));
+  g_queue_push_nth_link (q, 100, g_list_prepend (NULL, GINT_TO_POINTER (7)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 2);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 6);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 1)), ==, 7);
+
+  g_queue_clear (q);
+
+  /* Push onto the rear of a non-empty queue. */
+  g_queue_push_head (q, GINT_TO_POINTER (8));
+  g_queue_push_nth_link (q, 1, g_list_prepend (NULL, GINT_TO_POINTER (9)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 2);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 8);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 1)), ==, 9);
+
+  g_queue_clear (q);
+
+  /* Push onto the front of a non-empty queue. */
+  g_queue_push_head (q, GINT_TO_POINTER (10));
+  g_queue_push_nth_link (q, 0, g_list_prepend (NULL, GINT_TO_POINTER (11)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 2);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 11);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 1)), ==, 10);
+
+  g_queue_clear (q);
+
+  /* Push into the middle of a non-empty queue. */
+  g_queue_push_head (q, GINT_TO_POINTER (12));
+  g_queue_push_head (q, GINT_TO_POINTER (13));
+  g_queue_push_nth_link (q, 1, g_list_prepend (NULL, GINT_TO_POINTER (14)));
+  check_integrity (q);
+  g_assert_cmpint (g_queue_get_length (q), ==, 3);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 0)), ==, 13);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 1)), ==, 14);
+  g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_nth (q, 2)), ==, 12);
+
+  g_queue_free (q);
+}
+
 static void
 test_free_full (void)
 {
@@ -1117,6 +1235,40 @@ test_free_full (void)
   g_slice_free (QueueItem, three);
 }
 
+static void
+test_insert_sibling_link (void)
+{
+  GQueue q = G_QUEUE_INIT;
+  GList a = {0};
+  GList b = {0};
+  GList c = {0};
+  GList d = {0};
+  GList e = {0};
+
+  g_queue_push_head_link (&q, &a);
+  g_queue_insert_after_link (&q, &a, &d);
+  g_queue_insert_before_link (&q, &d, &b);
+  g_queue_insert_after_link (&q, &b, &c);
+  g_queue_insert_after_link (&q, NULL, &e);
+
+  g_assert_true (q.head == &e);
+  g_assert_true (q.tail == &d);
+
+  g_assert_null (e.prev);
+  g_assert_true (e.next == &a);
+
+  g_assert_true (a.prev == &e);
+  g_assert_true (a.next == &b);
+
+  g_assert_true (b.prev == &a);
+  g_assert_true (b.next == &c);
+
+  g_assert_true (c.prev == &b);
+  g_assert_true (c.next == &d);
+
+  g_assert_true (d.prev == &c);
+  g_assert_null (d.next);
+}
 
 int main (int argc, char *argv[])
 {
@@ -1133,6 +1285,9 @@ int main (int argc, char *argv[])
   g_test_add_func ("/queue/clear", test_clear);
   g_test_add_func ("/queue/free-full", test_free_full);
   g_test_add_func ("/queue/clear-full", test_clear_full);
+  g_test_add_func ("/queue/clear-full/noop", test_clear_full_noop);
+  g_test_add_func ("/queue/insert-sibling-link", test_insert_sibling_link);
+  g_test_add_func ("/queue/push-nth-link", test_push_nth_link);
 
   seed = g_test_rand_int_range (0, G_MAXINT);
   path = g_strdup_printf ("/queue/random/seed:%u", seed);
diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c
index 71d4315c8..e1f9619c7 100644
--- a/glib/tests/strfuncs.c
+++ b/glib/tests/strfuncs.c
@@ -199,50 +199,319 @@ test_is_to_digit (void)
   #undef TEST_DIGIT
 }
 
+/* Testing g_memdup() function with various positive and negative cases */
+static void
+test_memdup (void)
+{
+  gchar *str_dup = NULL;
+  const gchar *str = "The quick brown fox jumps over the lazy dog";
+
+  /* Testing negative cases */
+  g_assert_null (g_memdup (NULL, 1024));
+  g_assert_null (g_memdup (str, 0));
+  g_assert_null (g_memdup (NULL, 0));
+
+  /* Testing normal usage cases */
+  str_dup = g_memdup (str, strlen (str) + 1);
+  g_assert_nonnull (str_dup);
+  g_assert_cmpstr (str, ==, str_dup);
+
+  g_free (str_dup);
+}
+
+/* Testing g_strpcpy() function with various positive and negative cases */
+static void
+test_stpcpy (void)
+{
+  gchar *str = "The quick brown fox jumps over the lazy dog";
+  gchar str_cpy[45], *str_cpy_end = NULL;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_cpy_end = g_stpcpy (str_cpy, NULL);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_cpy_end = g_stpcpy (NULL, str);
+      g_test_assert_expected_messages ();
+    }
+
+  /* Testing normal usage cases */
+  str_cpy_end = g_stpcpy (str_cpy, str);
+  g_assert_nonnull (str_cpy);
+  g_assert_true (str_cpy + strlen (str) == str_cpy_end);
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpstr (str, ==, str_cpy_end - strlen (str));
+}
+
+/* Testing g_strlcpy() function with various positive and negative cases */
+static void
+test_strlcpy (void)
+{
+  gchar *str = "The quick brown fox jumps over the lazy dog";
+  gchar str_cpy[45];
+  gsize str_cpy_size = 0;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_cpy_size = g_strlcpy (str_cpy, NULL, 0);
+      g_test_assert_expected_messages ();
+      /* Returned 0 because g_strlcpy() failed */
+      g_assert_cmpint (str_cpy_size, ==, 0);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_cpy_size = g_strlcpy (NULL, str, 0);
+      g_test_assert_expected_messages ();
+      /* Returned 0 because g_strlcpy() failed */
+      g_assert_cmpint (str_cpy_size, ==, 0);
+    }
+
+  str_cpy_size = g_strlcpy (str_cpy, "", 0);
+  g_assert_cmpint (str_cpy_size, ==, strlen (""));
+
+  /* Testing normal usage cases.
+   * Note that the @dest_size argument to g_strlcpy() is normally meant to be
+   * set to `sizeof (dest)`. We set it to various values `≤ sizeof (str_cpy)`
+   * for testing purposes.  */
+  str_cpy_size = g_strlcpy (str_cpy, str, strlen (str) + 1);
+  g_assert_nonnull (str_cpy);
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+
+  str_cpy_size = g_strlcpy (str_cpy, str, strlen (str));
+  g_assert_nonnull (str_cpy);
+  g_assert_cmpstr ("The quick brown fox jumps over the lazy do", ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+
+  str_cpy_size = g_strlcpy (str_cpy, str, strlen (str) - 15);
+  g_assert_nonnull (str_cpy);
+  g_assert_cmpstr ("The quick brown fox jumps o", ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+
+  str_cpy_size = g_strlcpy (str_cpy, str, 0);
+  g_assert_nonnull (str_cpy);
+  g_assert_cmpstr ("The quick brown fox jumps o", ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+
+  str_cpy_size = g_strlcpy (str_cpy, str, strlen (str) + 15);
+  g_assert_nonnull (str_cpy);
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+}
+
+/* Testing g_strlcat() function with various positive and negative cases */
+static void
+test_strlcat (void)
+{
+  gchar *str = "The quick brown fox jumps over the lazy dog";
+  gchar str_cpy[60] = { 0 };
+  gsize str_cpy_size = 0;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_cpy_size = g_strlcat (str_cpy, NULL, 0);
+      g_test_assert_expected_messages ();
+      /* Returned 0 because g_strlcpy() failed */
+      g_assert_cmpint (str_cpy_size, ==, 0);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_cpy_size = g_strlcat (NULL, str, 0);
+      g_test_assert_expected_messages ();
+      /* Returned 0 because g_strlcpy() failed */
+      g_assert_cmpint (str_cpy_size, ==, 0);
+    }
+
+  str_cpy_size = g_strlcat (str_cpy, "", 0);
+  g_assert_cmpint (str_cpy_size, ==, strlen (""));
+
+  /* Testing normal usage cases.
+   * Note that the @dest_size argument to g_strlcat() is normally meant to be
+   * set to `sizeof (dest)`. We set it to various values `≤ sizeof (str_cpy)`
+   * for testing purposes. */
+  g_assert_cmpuint (strlen (str) + 1, <=, sizeof (str_cpy));
+  str_cpy_size = g_strlcat (str_cpy, str, strlen (str) + 1);
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+
+  g_assert_cmpuint (strlen (str), <=, sizeof (str_cpy));
+  str_cpy_size = g_strlcat (str_cpy, str, strlen (str));
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, 2 * strlen (str));
+
+  g_assert_cmpuint (strlen (str) - 15, <=, sizeof (str_cpy));
+  str_cpy_size = g_strlcat (str_cpy, str, strlen (str) - 15);
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, 2 * strlen (str) - 15);
+
+  g_assert_cmpuint (0, <=, sizeof (str_cpy));
+  str_cpy_size = g_strlcat (str_cpy, str, 0);
+  g_assert_cmpstr (str, ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, strlen (str));
+
+  g_assert_cmpuint (strlen (str) + 15, <=, sizeof (str_cpy));
+  str_cpy_size = g_strlcat (str_cpy, str, strlen (str) + 15);
+  g_assert_cmpstr ("The quick brown fox jumps over the lazy dogThe quick brow",
+                   ==, str_cpy);
+  g_assert_cmpint (str_cpy_size, ==, 2 * strlen (str));
+}
+
+/* Testing g_ascii_strdown() function with various positive and negative cases */
+static void
+test_ascii_strdown (void)
+{
+  const gchar *str_down = "the quick brown fox jumps over the lazy dog.";
+  const gchar *str_up = "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.";
+  gchar* str;
+
+  if (g_test_undefined ())
+    {
+  /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str = g_ascii_strdown (NULL, 0);
+      g_test_assert_expected_messages ();
+    }
+
+  str = g_ascii_strdown ("", 0);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+
+  str = g_ascii_strdown ("", -1);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+
+  /* Testing normal usage cases */
+  str = g_ascii_strdown (str_down, strlen (str_down));
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, str_down);
+  g_free (str);
+
+  str = g_ascii_strdown (str_up, strlen (str_up));
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, str_down);
+  g_free (str);
+
+  str = g_ascii_strdown (str_up, -1);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, str_down);
+  g_free (str);
+
+  str = g_ascii_strdown (str_up, 0);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+}
+
+/* Testing g_ascii_strup() function with various positive and negative cases */
+static void
+test_ascii_strup (void)
+{
+  const gchar *str_down = "the quick brown fox jumps over the lazy dog.";
+  const gchar *str_up = "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.";
+  gchar* str;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str = g_ascii_strup (NULL, 0);
+      g_test_assert_expected_messages ();
+    }
+
+  str = g_ascii_strup ("", 0);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+
+  str = g_ascii_strup ("", -1);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+
+  /* Testing normal usage cases */
+  str = g_ascii_strup (str_up, strlen (str_up));
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, str_up);
+  g_free (str);
+
+  str = g_ascii_strup (str_down, strlen (str_down));
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, str_up);
+  g_free (str);
+
+  str = g_ascii_strup (str_down, -1);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, str_up);
+  g_free (str);
+
+  str = g_ascii_strup (str_down, 0);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+}
+
+/* Testing g_strdup() function with various positive and negative cases */
 static void
 test_strdup (void)
 {
   gchar *str;
 
-  str = g_strdup (NULL);
-  g_assert (str == NULL);
+  g_assert_null (g_strdup (NULL));
 
   str = g_strdup (GLIB_TEST_STRING);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, GLIB_TEST_STRING);
   g_free (str);
 }
 
+/* Testing g_strndup() function with various positive and negative cases */
 static void
 test_strndup (void)
 {
   gchar *str;
 
   str = g_strndup (NULL, 3);
-  g_assert (str == NULL);
+  g_assert_null (str);
 
   str = g_strndup ("aaaa", 5);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "aaaa");
   g_free (str);
 
   str = g_strndup ("aaaa", 2);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "aa");
   g_free (str);
 }
 
+/* Testing g_strdup_printf() function with various positive and negative cases */
 static void
 test_strdup_printf (void)
 {
   gchar *str;
 
   str = g_strdup_printf ("%05d %-5s", 21, "test");
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "00021 test ");
   g_free (str);
 }
 
+/* Testing g_strdupv() function with various positive and negative cases */
 static void
 test_strdupv (void)
 {
@@ -250,92 +519,129 @@ test_strdupv (void)
   gchar **copy;
 
   copy = g_strdupv (NULL);
-  g_assert (copy == NULL);  
+  g_assert_null (copy);
 
   copy = g_strdupv (vec);
-  g_assert (copy != NULL);
+  g_assert_nonnull (copy);
   g_assert_cmpstr (copy[0], ==, "Foo");
   g_assert_cmpstr (copy[1], ==, "Bar");
-  g_assert (copy[2] == NULL);
+  g_assert_null (copy[2]);
   g_strfreev (copy);
 }
 
+/* Testing g_strfill() function with various positive and negative cases */
 static void
 test_strnfill (void)
 {
   gchar *str;
 
   str = g_strnfill (0, 'a');
-  g_assert (str != NULL);
-  g_assert (*str == '\0');
+  g_assert_nonnull (str);
+  g_assert_true (*str == '\0');
   g_free (str);
 
   str = g_strnfill (5, 'a');
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "aaaaa");
   g_free (str);
 }
 
+/* Testing g_strconcat() function with various positive and negative cases */
 static void
 test_strconcat (void)
 {
   gchar *str;
 
   str = g_strconcat (GLIB_TEST_STRING, NULL);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, GLIB_TEST_STRING);
   g_free (str);
 
   str = g_strconcat (GLIB_TEST_STRING,
-		     GLIB_TEST_STRING, 
+		     GLIB_TEST_STRING,
 		     GLIB_TEST_STRING,
 		     NULL);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, GLIB_TEST_STRING GLIB_TEST_STRING GLIB_TEST_STRING);
   g_free (str);
 
-  g_assert (g_strconcat (NULL, "bla", NULL) == NULL);
+  g_assert_null (g_strconcat (NULL, "bla", NULL));
 }
 
+/* Testing g_strjoinv() function with various positive and negative cases */
+static void
+test_strjoinv (void)
+{
+  gchar *strings[] = { "string1", "string2", NULL };
+  gchar *empty_strings[] = { NULL };
+  gchar *str;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str = g_strjoinv (NULL, NULL);
+      g_test_assert_expected_messages ();
+    }
+
+  str = g_strjoinv (":", strings);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "string1:string2");
+  g_free (str);
+
+  str = g_strjoinv (NULL, strings);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "string1string2");
+  g_free (str);
+
+  str = g_strjoinv (NULL, empty_strings);
+  g_assert_nonnull (str);
+  g_assert_cmpstr (str, ==, "");
+  g_free (str);
+}
+
+/* Testing g_strjoin() function with various positive and negative cases */
 static void
 test_strjoin (void)
 {
   gchar *str;
 
   str = g_strjoin (NULL, NULL);
-  g_assert (str != NULL);
-  g_assert (*str == '\0');
+  g_assert_nonnull (str);
+  g_assert_true (*str == '\0');
   g_free (str);
 
   str = g_strjoin (":", NULL);
-  g_assert (str != NULL);
-  g_assert (*str == '\0');
+  g_assert_nonnull (str);
+  g_assert_true (*str == '\0');
   g_free (str);
 
   str = g_strjoin (NULL, GLIB_TEST_STRING, NULL);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, GLIB_TEST_STRING);
   g_free (str);
 
   str = g_strjoin (NULL,
 		   GLIB_TEST_STRING,
-		   GLIB_TEST_STRING, 
+		   GLIB_TEST_STRING,
 		   GLIB_TEST_STRING,
 		   NULL);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, GLIB_TEST_STRING GLIB_TEST_STRING GLIB_TEST_STRING);
   g_free (str);
 
   str = g_strjoin (":",
 		   GLIB_TEST_STRING,
-		   GLIB_TEST_STRING, 
+		   GLIB_TEST_STRING,
 		   GLIB_TEST_STRING,
 		   NULL);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, GLIB_TEST_STRING ":" GLIB_TEST_STRING ":" GLIB_TEST_STRING);
   g_free (str);
 }
 
+/* Testing g_strcanon() function with various positive and negative cases */
 static void
 test_strcanon (void)
 {
@@ -349,24 +655,25 @@ test_strcanon (void)
                              "*assertion*!= NULL*");
       str = g_strcanon (NULL, "ab", 'y');
       g_test_assert_expected_messages ();
-      g_assert (str == NULL);
+      g_assert_null (str);
 
       str = g_strdup ("abxabxab");
       g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                              "*assertion*!= NULL*");
       ret = g_strcanon (str, NULL, 'y');
       g_test_assert_expected_messages ();
-      g_assert (ret == NULL);
+      g_assert_null (ret);
       g_free (str);
     }
 
   str = g_strdup ("abxabxab");
   str = g_strcanon (str, "ab", 'y');
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "abyabyab");
   g_free (str);
 }
 
+/* Testing g_strcompress() and g_strescape() functions with various cases */
 static void
 test_strcompress_strescape (void)
 {
@@ -380,7 +687,7 @@ test_strcompress_strescape (void)
                              "*assertion*!= NULL*");
       str = g_strcompress (NULL);
       g_test_assert_expected_messages ();
-      g_assert (str == NULL);
+      g_assert_null (str);
 
       /* trailing slashes are not allowed */
       g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
@@ -392,7 +699,7 @@ test_strcompress_strescape (void)
     }
 
   str = g_strcompress ("abc\\\\\\\"\\b\\f\\n\\r\\t\\v\\003\\177\\234\\313\\12345z");
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "abc\\\"\b\f\n\r\t\v\003\177\234\313\12345z");
   g_free (str);
 
@@ -403,29 +710,30 @@ test_strcompress_strescape (void)
                              "*assertion*!= NULL*");
       str = g_strescape (NULL, NULL);
       g_test_assert_expected_messages ();
-      g_assert (str == NULL);
+      g_assert_null (str);
     }
 
   str = g_strescape ("abc\\\"\b\f\n\r\t\v\003\177\234\313", NULL);
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "abc\\\\\\\"\\b\\f\\n\\r\\t\\v\\003\\177\\234\\313");
   g_free (str);
 
   str = g_strescape ("abc\\\"\b\f\n\r\t\v\003\177\234\313",
 		     "\b\f\001\002\003\004");
-  g_assert (str != NULL);
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "abc\\\\\\\"\b\f\\n\\r\\t\\v\003\\177\\234\\313");
   g_free (str);
 
   /* round trip */
   tmp = g_strescape ("abc\\\"\b\f\n\r\t\v\003\177\234\313", NULL);
   str = g_strcompress (tmp);
-  g_assert (str != NULL); 
+  g_assert_nonnull (str);
   g_assert_cmpstr (str, ==, "abc\\\"\b\f\n\r\t\v\003\177\234\313");
   g_free (str);
   g_free (tmp);
 }
 
+/* Testing g_ascii_strcasecmp() and g_ascii_strncasecmp() */
 static void
 test_ascii_strcasecmp (void)
 {
@@ -437,13 +745,25 @@ test_ascii_strcasecmp (void)
                              "*assertion*!= NULL*");
       res = g_ascii_strcasecmp ("foo", NULL);
       g_test_assert_expected_messages ();
-      g_assert (res == FALSE);
+      g_assert_false (res);
 
       g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                              "*assertion*!= NULL*");
       res = g_ascii_strcasecmp (NULL, "foo");
       g_test_assert_expected_messages ();
-      g_assert (res == FALSE);
+      g_assert_false (res);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_ascii_strncasecmp ("foo", NULL, 0);
+      g_test_assert_expected_messages ();
+      g_assert_false (res);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_ascii_strncasecmp (NULL, "foo", 0);
+      g_test_assert_expected_messages ();
+      g_assert_false (res);
     }
 
   res = g_ascii_strcasecmp ("FroboZZ", "frobozz");
@@ -487,6 +807,25 @@ test_ascii_strcasecmp (void)
 
   res = g_ascii_strcasecmp ("B", "A");
   g_assert_cmpint (res, >, 0);
+
+  /* g_ascii_strncasecmp() */
+  res = g_ascii_strncasecmp ("", "", 10);
+  g_assert_cmpint (res, ==, 0);
+
+  res = g_ascii_strncasecmp ("Frob0ZZ", "frob0zz", strlen ("frobozz"));
+  g_assert_cmpint (res, ==, 0);
+
+  res = g_ascii_strncasecmp ("Frob0ZZ", "frobozz", strlen ("frobozz"));
+  g_assert_cmpint (res, !=, 0);
+
+  res = g_ascii_strncasecmp ("frob0ZZ", "FroB0zz", strlen ("frobozz"));
+  g_assert_cmpint (res, ==, 0);
+
+  res = g_ascii_strncasecmp ("Frob0ZZ", "froB0zz", strlen ("frobozz") - 5);
+  g_assert_cmpint (res, ==, 0);
+
+  res = g_ascii_strncasecmp ("Frob0ZZ", "froB0zz", strlen ("frobozz") + 5);
+  g_assert_cmpint (res, ==, 0);
 }
 
 static void
@@ -504,6 +843,7 @@ do_test_strchug (const gchar *str, const gchar *expected)
   g_assert_cmpint (res, ==, TRUE);
 }
 
+/* Testing g_strchug() function with various positive and negative cases */
 static void
 test_strchug (void)
 {
@@ -539,6 +879,7 @@ do_test_strchomp (const gchar *str, const gchar *expected)
   g_assert_cmpint (res, ==, TRUE);
 }
 
+/* Testing g_strchomp() function with various positive and negative cases */
 static void
 test_strchomp (void)
 {
@@ -559,6 +900,59 @@ test_strchomp (void)
   do_test_strchomp ("a a ", "a a");
 }
 
+/* Testing g_str_tokenize_and_fold() functions */
+static void
+test_str_tokenize_and_fold (void)
+{
+  const gchar *local_str = "en_GB";
+  const gchar *sample  = "The quick brown fox¸ jumps over the lazy dog.";
+  const gchar *special_cases = "quıck QUİCK QUİı QUıİ İıck ıİCK àìøş";
+  gchar **tokens, **alternates;
+  gchar
+    *expected_tokens[] =     \
+    {"the", "quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog", NULL},
+    *expected_tokens_alt[] = \
+    { "quick", "quick", "quii", "quii", "iick", "iick", "àìøş", NULL};
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      tokens = g_str_tokenize_and_fold (NULL, local_str, NULL);
+      g_test_assert_expected_messages ();
+    }
+
+  tokens = g_str_tokenize_and_fold (special_cases, local_str, &alternates);
+  g_assert_cmpint (g_strv_length (tokens), ==,
+                   g_strv_length (expected_tokens_alt));
+  g_assert_true (g_strv_equal ((const gchar * const *) tokens,
+                               (const gchar * const *) expected_tokens_alt));
+  g_strfreev (tokens);
+  g_strfreev (alternates);
+
+  tokens = g_str_tokenize_and_fold (sample, local_str, &alternates);
+  g_assert_cmpint (g_strv_length (tokens), ==, g_strv_length (expected_tokens));
+  g_assert_true (g_strv_equal ((const gchar * const *) tokens,
+                               (const gchar * const *) expected_tokens));
+  g_strfreev (tokens);
+  g_strfreev (alternates);
+
+  tokens = g_str_tokenize_and_fold (sample, local_str, NULL);
+  g_assert_cmpint (g_strv_length (tokens), ==, g_strv_length (expected_tokens));
+  g_assert_true (g_strv_equal ((const gchar * const *) tokens,
+                               (const gchar * const *) expected_tokens));
+  g_strfreev (tokens);
+
+  tokens = g_str_tokenize_and_fold (sample, NULL, &alternates);
+  g_assert_cmpint (g_strv_length (tokens), ==, g_strv_length (expected_tokens));
+  g_assert_true (g_strv_equal ((const gchar * const *) tokens,
+                               (const gchar * const *) expected_tokens));
+  g_strfreev (tokens);
+  g_strfreev (alternates);
+}
+
+/* Testing g_strreverse() function with various positive and negative cases */
 static void
 test_strreverse (void)
 {
@@ -571,22 +965,23 @@ test_strreverse (void)
                              "*assertion*!= NULL*");
       str = g_strreverse (NULL);
       g_test_assert_expected_messages ();
-      g_assert (str == NULL);
+      g_assert_null (str);
     }
 
   str = p = g_strdup ("abcde");
   str = g_strreverse (str);
-  g_assert (str != NULL);
-  g_assert (p == str);
+  g_assert_nonnull (str);
+  g_assert_true (p == str);
   g_assert_cmpstr (str, ==, "edcba");
   g_free (str);
 }
 
+/* Testing g_strncasecmp() functions */
 static void
 test_strncasecmp (void)
 {
-  g_assert (g_strncasecmp ("abc1", "ABC2", 3) == 0);
-  g_assert (g_strncasecmp ("abc1", "ABC2", 4) != 0);
+  g_assert_cmpint (g_strncasecmp ("abc1", "ABC2", 3), ==, 0);
+  g_assert_cmpint (g_strncasecmp ("abc1", "ABC2", 4), !=, 0);
 }
 
 static void
@@ -597,73 +992,175 @@ test_strstr (void)
 
   haystack = g_strdup ("FooBarFooBarFoo");
 
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_strstr_len (NULL, 0, "xxx");
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_strstr_len ("xxx", 0, NULL);
+      g_test_assert_expected_messages ();
+    }
+
   /* strstr_len */
   res = g_strstr_len (haystack, 6, "xxx");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strstr_len (haystack, 6, "FooBarFooBarFooBar");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strstr_len (haystack, 3, "Bar");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strstr_len (haystack, 6, "");
-  g_assert (res == haystack);
+  g_assert_true (res == haystack);
   g_assert_cmpstr (res, ==, "FooBarFooBarFoo");
 
   res = g_strstr_len (haystack, 6, "Bar");
-  g_assert (res == haystack + 3);
+  g_assert_true (res == haystack + 3);
   g_assert_cmpstr (res, ==, "BarFooBarFoo");
 
   res = g_strstr_len (haystack, -1, "Bar");
-  g_assert (res == haystack + 3);
+  g_assert_true (res == haystack + 3);
   g_assert_cmpstr (res, ==, "BarFooBarFoo");
 
   /* strrstr */
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_strrstr (NULL, "xxx");
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_strrstr ("xxx", NULL);
+      g_test_assert_expected_messages ();
+    }
+
   res = g_strrstr (haystack, "xxx");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strrstr (haystack, "FooBarFooBarFooBar");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strrstr (haystack, "");
-  g_assert (res == haystack);
+  g_assert_true (res == haystack);
   g_assert_cmpstr (res, ==, "FooBarFooBarFoo");
 
   res = g_strrstr (haystack, "Bar");
-  g_assert (res == haystack + 9);
+  g_assert_true (res == haystack + 9);
   g_assert_cmpstr (res, ==, "BarFoo");
 
   /* strrstr_len */
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_strrstr_len (NULL, 14, "xxx");
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      res = g_strrstr_len ("xxx", 14, NULL);
+      g_test_assert_expected_messages ();
+    }
+
   res = g_strrstr_len (haystack, 14, "xxx");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strrstr_len (haystack, 14, "FooBarFooBarFooBar");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strrstr_len (haystack, 3, "Bar");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   res = g_strrstr_len (haystack, 14, "BarFoo");
-  g_assert (res == haystack + 3);
+  g_assert_true (res == haystack + 3);
   g_assert_cmpstr (res, ==, "BarFooBarFoo");
 
   res = g_strrstr_len (haystack, 15, "BarFoo");
-  g_assert (res == haystack + 9);
+  g_assert_true (res == haystack + 9);
   g_assert_cmpstr (res, ==, "BarFoo");
 
   res = g_strrstr_len (haystack, -1, "BarFoo");
-  g_assert (res == haystack + 9);
+  g_assert_true (res == haystack + 9);
   g_assert_cmpstr (res, ==, "BarFoo");
 
   /* test case for strings with \0 in the middle */
   *(haystack + 7) = '\0';
   res = g_strstr_len (haystack, 15, "BarFoo");
-  g_assert (res == NULL);
+  g_assert_null (res);
 
   g_free (haystack);
 }
 
+/* Testing g_strtod() function with various positive and negative cases */
+static void
+test_strtod (void)
+{
+  gchar *str_end = NULL;
+  double value = 0.0;
+  const double gold_ratio = 1.61803398874989484;
+  const gchar *gold_ratio_str = "1.61803398874989484";
+  const gchar *minus_gold_ratio_str = "-1.61803398874989484";
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      value = g_strtod (NULL, NULL);
+      g_test_assert_expected_messages ();
+      g_assert_cmpfloat (value, ==, 0.0);
+    }
+
+  g_assert_cmpfloat (g_strtod ("\x00\x00\x00\x00", NULL), ==, 0.0);
+  g_assert_cmpfloat (g_strtod ("\x00\x00\x00\x00", &str_end), ==, 0.0);
+  g_assert_cmpstr (str_end, ==, "");
+  g_assert_cmpfloat (g_strtod ("\xff\xff\xff\xff", NULL), ==, 0.0);
+  g_assert_cmpfloat (g_strtod ("\xff\xff\xff\xff", &str_end), ==, 0.0);
+  g_assert_cmpstr (str_end, ==, "\xff\xff\xff\xff");
+
+  /* Testing normal usage cases */
+  g_assert_cmpfloat (g_strtod (gold_ratio_str, NULL), ==, gold_ratio);
+  g_assert_cmpfloat (g_strtod (gold_ratio_str, &str_end), ==, gold_ratio);
+  g_assert_true (str_end == gold_ratio_str + strlen (gold_ratio_str));
+  g_assert_cmpfloat (g_strtod (minus_gold_ratio_str, NULL), ==, -gold_ratio);
+  g_assert_cmpfloat (g_strtod (minus_gold_ratio_str, &str_end), ==, -gold_ratio);
+  g_assert_true (str_end == minus_gold_ratio_str + strlen (minus_gold_ratio_str));
+}
+
+/* Testing g_strdelimit() function */
+static void
+test_strdelimit (void)
+{
+  const gchar *const_string = "ABCDE<*>Q";
+  gchar *string;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      string = g_strdelimit (NULL, "ABCDE", 'N');
+      g_test_assert_expected_messages ();
+    }
+
+  string = g_strdelimit (g_strdup (const_string), "<>", '?');
+  g_assert_cmpstr (string, ==, "ABCDE?*?Q");
+  g_free (string);
+
+  string = g_strdelimit (g_strdup (const_string), NULL, '?');
+  g_assert_cmpstr (string, ==, "ABCDE?*?Q");
+  g_free (string);
+}
+
+/* Testing g_str_has_prefix() */
 static void
 test_has_prefix (void)
 {
@@ -675,13 +1172,13 @@ test_has_prefix (void)
                              "*assertion*!= NULL*");
       res = g_str_has_prefix ("foo", NULL);
       g_test_assert_expected_messages ();
-      g_assert (res == FALSE);
+      g_assert_false (res);
 
       g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                              "*assertion*!= NULL*");
       res = g_str_has_prefix (NULL, "foo");
       g_test_assert_expected_messages ();
-      g_assert (res == FALSE);
+      g_assert_false (res);
     }
 
   res = g_str_has_prefix ("foo", "bar");
@@ -717,35 +1214,35 @@ test_has_suffix (void)
                              "*assertion*!= NULL*");
       res = g_str_has_suffix ("foo", NULL);
       g_test_assert_expected_messages ();
-      g_assert (res == FALSE);
+      g_assert_false (res);
 
       g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                              "*assertion*!= NULL*");
       res = g_str_has_suffix (NULL, "foo");
       g_test_assert_expected_messages ();
-      g_assert (res == FALSE);
+      g_assert_false (res);
     }
 
   res = g_str_has_suffix ("foo", "bar");
-  g_assert_cmpint (res, ==, FALSE);
+  g_assert_false (res);
 
   res = g_str_has_suffix ("bar", "foobar");
-  g_assert_cmpint (res, ==, FALSE);
+  g_assert_false (res);
 
   res = g_str_has_suffix ("foobar", "foo");
-  g_assert_cmpint (res, ==, FALSE);
+  g_assert_false (res);
 
   res = g_str_has_suffix ("foobar", "bar");
-  g_assert_cmpint (res, ==, TRUE);
+  g_assert_true (res);
 
   res = g_str_has_suffix ("foo", "");
-  g_assert_cmpint (res, ==, TRUE);
+  g_assert_true (res);
 
   res = g_str_has_suffix ("foo", "foo");
-  g_assert_cmpint (res, ==, TRUE);
+  g_assert_true (res);
 
   res = g_str_has_suffix ("", "");
-  g_assert_cmpint (res, ==, TRUE);
+  g_assert_true (res);
 }
 
 static void
@@ -761,7 +1258,7 @@ strv_check (gchar **strv, ...)
       const gchar *str = va_arg (list, const char *);
       if (strv[i] == NULL)
 	{
-	  g_assert (str == NULL);
+	  g_assert_null (str);
 	  break;
 	}
       if (str == NULL)
@@ -779,9 +1276,34 @@ strv_check (gchar **strv, ...)
   g_strfreev (strv);
 }
 
+/* Testing g_strsplit() function with various positive and negative cases */
 static void
 test_strsplit (void)
 {
+  gchar **string = NULL;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      string = g_strsplit (NULL, ",", 0);
+      g_test_assert_expected_messages ();
+      g_assert_null (string);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      string = g_strsplit ("x", NULL, 0);
+      g_test_assert_expected_messages ();
+      g_assert_null (string);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'delimiter[0] != \'\\0\'*");
+      string = g_strsplit ("x", "", 0);
+      g_test_assert_expected_messages ();
+      g_assert_null (string);
+    }
+
   strv_check (g_strsplit ("", ",", 0), NULL);
   strv_check (g_strsplit ("x", ",", 0), "x", NULL);
   strv_check (g_strsplit ("x,y", ",", 0), "x", "y", NULL);
@@ -822,9 +1344,28 @@ test_strsplit (void)
   strv_check (g_strsplit (",,x,,y,,z,,", ",,", 2), "", "x,,y,,z,,", NULL);
 }
 
+/* Testing function g_strsplit_set() */
 static void
 test_strsplit_set (void)
 {
+  gchar **string = NULL;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      string = g_strsplit_set (NULL, ",/", 0);
+      g_test_assert_expected_messages ();
+      g_assert_null (string);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      string = g_strsplit_set ("", NULL, 0);
+      g_test_assert_expected_messages ();
+      g_assert_null (string);
+    }
+
   strv_check (g_strsplit_set ("", ",/", 0), NULL);
   strv_check (g_strsplit_set (":def/ghi:", ":/", -1), "", "def", "ghi", "", NULL);
   strv_check (g_strsplit_set ("abc:def/ghi", ":/", -1), "abc", "def", "ghi", NULL);
@@ -846,7 +1387,7 @@ test_strsplit_set (void)
   strv_check (g_strsplit_set (",x,y.z,", ",.", 1), ",x,y.z,", NULL);
   strv_check (g_strsplit_set (",,x,.y,,z,,", ",.", 1), ",,x,.y,,z,,", NULL);
   strv_check (g_strsplit_set (",.x,,y,,z,,", ",,..", 1), ",.x,,y,,z,,", NULL);
-   
+
   strv_check (g_strsplit_set ("", ",", 0), NULL);
   strv_check (g_strsplit_set ("x", ",", 0), "x", NULL);
   strv_check (g_strsplit_set ("x,y", ",", 0), "x", "y", NULL);
@@ -883,10 +1424,11 @@ test_strsplit_set (void)
   strv_check (g_strsplit_set (",x,y,z", ",", 2), "", "x,y,z", NULL);
   strv_check (g_strsplit_set (",x,y,z,", ",", 2), "", "x,y,z,", NULL);
   strv_check (g_strsplit_set (",,x,,y,,z,,", ",", 2), "", ",x,,y,,z,,", NULL);
-  
+
   strv_check (g_strsplit_set (",,x,.y,..z,,", ",.", 3), "", "", "x,.y,..z,,", NULL);
 }
 
+/* Testing g_strv_length() function with various positive and negative cases */
 static void
 test_strv_length (void)
 {
@@ -914,13 +1456,13 @@ static void
 check_strtod_string (gchar    *number,
 		     double    res,
 		     gboolean  check_end,
-		     gint      correct_len)
+		     gsize      correct_len)
 {
   double d;
-  gint l;
+  gsize l;
   gchar *dummy;
 
-  /* we try a copy of number, with some free space for malloc before that. 
+  /* we try a copy of number, with some free space for malloc before that.
    * This is supposed to smash the some wrong pointer calculations. */
 
   dummy = g_malloc (100000);
@@ -933,8 +1475,9 @@ check_strtod_string (gchar    *number,
 
       setlocale (LC_NUMERIC, locales[l]);
       d = g_ascii_strtod (number, &end);
-      g_assert (isnan (res) ? isnan (d) : (d == res));
-      g_assert ((end - number) == (check_end ? correct_len : strlen (number)));
+      g_assert_true (isnan (res) ? isnan (d) : (d == res));
+      g_assert_true ((gsize) (end - number) ==
+                     (check_end ? correct_len : strlen (number)));
     }
 
   g_free (number);
@@ -943,7 +1486,7 @@ check_strtod_string (gchar    *number,
 static void
 check_strtod_number (gdouble num, gchar *fmt, gchar *str)
 {
-  int l;
+  gsize l;
   gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
 
   for (l = 0; l < G_N_ELEMENTS (locales); l++)
@@ -954,8 +1497,9 @@ check_strtod_number (gdouble num, gchar *fmt, gchar *str)
     }
 }
 
+/* Testing g_ascii_strtod() function with various positive and negative cases */
 static void
-test_strtod (void)
+test_ascii_strtod (void)
 {
   gdouble d, our_nan, our_inf;
   char buffer[G_ASCII_DTOSTR_BUF_SIZE];
@@ -966,15 +1510,25 @@ test_strtod (void)
   /* Do this before any call to setlocale.  */
   our_nan = atof ("NaN");
 #endif
-  g_assert (isnan (our_nan));
+  g_assert_true (isnan (our_nan));
 
 #ifdef INFINITY
   our_inf = INFINITY;
 #else
   our_inf = atof ("Infinity");
 #endif
-  g_assert (our_inf > 1 && our_inf == our_inf / 2);
+  g_assert_true (our_inf > 1 && our_inf == our_inf / 2);
 
+  /* Testing degenerated cases */
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      d = g_ascii_strtod (NULL, NULL);
+      g_test_assert_expected_messages ();
+    }
+
+  /* Testing normal cases */
   check_strtod_string ("123.123", 123.123, FALSE, 0);
   check_strtod_string ("123.123e2", 123.123e2, FALSE, 0);
   check_strtod_string ("123.123e-2", 123.123e-2, FALSE, 0);
@@ -1006,17 +1560,17 @@ test_strtod (void)
 #ifndef _MSC_VER
   /* the values of d in the following 2 tests generate a C1064 compiler limit error */
   d = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
-  g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
+  g_assert_true (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
 
   d = -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
-  g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
+  g_assert_true (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
 #endif
-  
+
   d = pow (2.0, -1024.1);
-  g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-  
+  g_assert_true (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
+
   d = -pow (2.0, -1024.1);
-  g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
+  g_assert_true (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
 
   /* for #343899 */
   check_strtod_string (" 0.75", 0.75, FALSE, 0);
@@ -1055,9 +1609,9 @@ check_uint64 (const gchar *str,
   actual = g_ascii_strtoull (str, &endptr, base);
   err = errno;
 
-  g_assert (actual == result);
+  g_assert_true (actual == result);
   g_assert_cmpstr (end, ==, endptr);
-  g_assert (err == error);
+  g_assert_true (err == error);
 }
 
 static void
@@ -1075,9 +1629,9 @@ check_int64 (const gchar *str,
   actual = g_ascii_strtoll (str, &endptr, base);
   err = errno;
 
-  g_assert (actual == result);
+  g_assert_true (actual == result);
   g_assert_cmpstr (end, ==, endptr);
-  g_assert (err == error);
+  g_assert_true (err == error);
 }
 
 static void
@@ -1103,6 +1657,34 @@ test_strtoll (void)
   check_int64 ("-001", "", 10, -1, 0);
 }
 
+/* Testing g_str_match_string() function with various cases */
+static void
+test_str_match_string (void)
+{
+  gboolean result = TRUE;
+  const gchar *str = "The quick brown fox¸ jumps over the lazy dog.";
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_str_match_string (NULL, "AAA", TRUE);
+      g_test_assert_expected_messages ();
+      g_assert_false (result);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_str_match_string (str, NULL, TRUE);
+      g_test_assert_expected_messages ();
+      g_assert_false (result);
+    }
+
+  g_assert_false (g_str_match_string (str, "AAA", TRUE));
+  g_assert_false (g_str_match_string (str, "AAA", FALSE));
+}
+
+/* Testing functions bounds */
 static void
 test_bounds (void)
 {
@@ -1129,12 +1711,12 @@ test_bounds (void)
   g_mapped_file_unref (before);
   g_mapped_file_unref (after);
 
-  g_assert (file != NULL);
+  g_assert_nonnull (file);
   g_assert_cmpint (g_mapped_file_get_length (file), ==, 4096);
   string = g_mapped_file_get_contents (file);
 
   /* ensure they're all non-nul */
-  g_assert (memchr (string, '\0', 4096) == NULL);
+  g_assert_null (memchr (string, '\0', 4096));
 
   /* test set 1: ensure that nothing goes past its maximum length, even in
    *             light of a missing nul terminator.
@@ -1146,7 +1728,7 @@ test_bounds (void)
   g_free (tmp);
 
   /* found no bugs in gnome, i hope :) */
-  g_assert (g_strstr_len (string, 4096, "BUGS") == NULL);
+  g_assert_null (g_strstr_len (string, 4096, "BUGS"));
   g_strstr_len (string, 4096, "B");
   g_strstr_len (string, 4096, ".");
   g_strstr_len (string, 4096, "");
@@ -1225,8 +1807,8 @@ test_bounds (void)
 
   tmp = g_ascii_strdown (string, -1);
   tmp2 = g_ascii_strdown (tmp, -1);
-  g_assert_cmpint (strlen(tmp), ==, strlen(tmp2));
-  g_assert_cmpint (strlen(string), ==, strlen(tmp));
+  g_assert_cmpint (strlen (tmp), ==, strlen (tmp2));
+  g_assert_cmpint (strlen (string), ==, strlen (tmp));
   g_assert_cmpint (g_ascii_strncasecmp (string, tmp, -1), ==, 0);
   g_assert_cmpint (g_ascii_strncasecmp (string, tmp2, -1), ==, 0);
   g_assert_cmpint (g_ascii_strncasecmp (tmp, tmp2, -1), ==, 0);
@@ -1235,8 +1817,8 @@ test_bounds (void)
 
   tmp = g_ascii_strup (string, -1);
   tmp2 = g_ascii_strup (string, -1);
-  g_assert_cmpint (strlen(tmp), ==, strlen(tmp2));
-  g_assert_cmpint (strlen(string), ==, strlen(tmp));
+  g_assert_cmpint (strlen (tmp), ==, strlen (tmp2));
+  g_assert_cmpint (strlen (string), ==, strlen (tmp));
   g_assert_cmpint (g_ascii_strncasecmp (string, tmp, -1), ==, 0);
   g_assert_cmpint (g_ascii_strncasecmp (string, tmp2, -1), ==, 0);
   g_assert_cmpint (g_ascii_strncasecmp (tmp, tmp2, -1), ==, 0);
@@ -1295,6 +1877,7 @@ test_bounds (void)
   g_mapped_file_unref (file);
 }
 
+/* Testing g_strip_context() function with various cases */
 static void
 test_strip_context (void)
 {
@@ -1302,23 +1885,22 @@ test_strip_context (void)
   const gchar *msgval;
   const gchar *s;
 
-
   msgid = "blabla";
   msgval = "bla";
   s = g_strip_context (msgid, msgval);
-  g_assert (s == msgval);
+  g_assert_true (s == msgval);
 
   msgid = msgval = "blabla";
   s = g_strip_context (msgid, msgval);
-  g_assert (s == msgval);
+  g_assert_true (s == msgval);
 
   msgid = msgval = "blabla|foo";
   s = g_strip_context (msgid, msgval);
-  g_assert (s == msgval + 7);
+  g_assert_true (s == msgval + 7);
 
   msgid = msgval = "blabla||bar";
   s = g_strip_context (msgid, msgval);
-  g_assert (s == msgval + 7);
+  g_assert_true (s == msgval + 7);
 }
 
 /* Test the strings returned by g_strerror() are valid and unique. On Windows,
@@ -1340,15 +1922,16 @@ test_strerror (void)
       gboolean is_unknown;
       str = g_strerror (i);
       is_unknown = (strcmp (str, unknown_str) == 0);
-      g_assert (str != NULL);
-      g_assert (g_utf8_validate (str, -1, NULL));
+      g_assert_nonnull (str);
+      g_assert_true (g_utf8_validate (str, -1, NULL));
       g_assert_true (!g_hash_table_contains (strs, str) || is_unknown);
-      g_hash_table_add (strs, (char *)str);
+      g_hash_table_add (strs, (gpointer) str);
     }
 
   g_hash_table_unref (strs);
 }
 
+/* Testing g_strsignal() function with various cases */
 static void
 test_strsignal (void)
 {
@@ -1358,23 +1941,49 @@ test_strsignal (void)
   for (i = 1; i < 20; i++)
     {
       str = g_strsignal (i);
-      g_assert (str != NULL);
-      g_assert (g_utf8_validate (str, -1, NULL));
+      g_assert_nonnull (str);
+      g_assert_true (g_utf8_validate (str, -1, NULL));
     }
 }
 
+/* Testing g_strup(), g_strdown() and g_strcasecmp() */
 static void
 test_strup (void)
 {
-  gchar *s;
+  gchar *s = NULL;
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      s = g_strup (NULL);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      s = g_strdown (NULL);
+      g_test_assert_expected_messages ();
 
-  s = g_strdup ("lower");
-  g_assert_cmpstr (g_strup (s), ==, "LOWER");
-  g_assert_cmpstr (g_strdown (s), ==, "lower");
-  g_assert (g_strcasecmp ("lower", "LOWER") == 0);
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      g_strcasecmp (NULL, "ABCD");
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      g_strcasecmp ("abcd", NULL);
+      g_test_assert_expected_messages ();
+    }
+
+  s = g_strdup ("lower UPPER");
+  g_assert_cmpstr (g_strup (s), ==, "LOWER UPPER");
+  g_assert_cmpstr (g_strdown (s), ==, "lower upper");
+  g_assert_true (g_strcasecmp ("lower", "LOWER") == 0);
   g_free (s);
 }
 
+/* Testing g_str_to_ascii() function with various cases */
 static void
 test_transliteration (void)
 {
@@ -1481,12 +2090,30 @@ test_transliteration (void)
   g_free (out);
 }
 
+/* Testing g_strv_contains() function with various cases */
 static void
 test_strv_contains (void)
 {
-  static const gchar *strv_simple[] = { "hello", "there", NULL };
-  static const gchar *strv_dupe[] = { "dupe", "dupe", NULL };
-  static const gchar *strv_empty[] = { NULL };
+  gboolean result = TRUE;
+  const gchar *strv_simple[] = { "hello", "there", NULL };
+  const gchar *strv_dupe[] = { "dupe", "dupe", NULL };
+  const gchar *strv_empty[] = { NULL };
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_strv_contains (NULL, "hello");
+      g_test_assert_expected_messages ();
+      g_assert_false (result);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_strv_contains (strv_simple, NULL);
+      g_test_assert_expected_messages ();
+      g_assert_false (result);
+    }
 
   g_assert_true (g_strv_contains (strv_simple, "hello"));
   g_assert_true (g_strv_contains (strv_simple, "there"));
@@ -1503,6 +2130,7 @@ test_strv_contains (void)
 static void
 test_strv_equal (void)
 {
+  gboolean result = TRUE;
   const gchar *strv_empty[] = { NULL };
   const gchar *strv_empty2[] = { NULL };
   const gchar *strv_simple[] = { "hello", "you", NULL };
@@ -1511,6 +2139,22 @@ test_strv_equal (void)
   const gchar *strv_simple_superset[] = { "hello", "you", "again", NULL };
   const gchar *strv_another[] = { "not", "a", "coded", "message", NULL };
 
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_strv_equal (NULL, strv_simple2);
+      g_test_assert_expected_messages ();
+      g_assert_false (result);
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_strv_equal (strv_simple, NULL);
+      g_test_assert_expected_messages ();
+      g_assert_false (result);
+    }
+
   g_assert_true (g_strv_equal (strv_empty, strv_empty));
   g_assert_true (g_strv_equal (strv_empty, strv_empty2));
   g_assert_true (g_strv_equal (strv_empty2, strv_empty));
@@ -1551,8 +2195,11 @@ const TestData test_data[] = {
   { "+0", SIGNED, 10, -2,  2,  0, FALSE, 0                                   },
   { "-0", SIGNED, 10, -2,  2,  0, FALSE, 0                                   },
   { "-2", SIGNED, 10, -2,  2, -2, FALSE, 0                                   },
+  {"-02", SIGNED, 10, -2,  2, -2, FALSE, 0                                   },
   { "2",  SIGNED, 10, -2,  2,  2, FALSE, 0                                   },
+  { "02", SIGNED, 10, -2,  2,  2, FALSE, 0                                   },
   { "+2", SIGNED, 10, -2,  2,  2, FALSE, 0                                   },
+  {"+02", SIGNED, 10, -2,  2,  2, FALSE, 0                                   },
   { "3",  SIGNED, 10, -2,  2,  0, TRUE,  G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS },
   { "+3", SIGNED, 10, -2,  2,  0, TRUE,  G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS },
   { "-3", SIGNED, 10, -2,  2,  0, TRUE,  G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS },
@@ -1597,6 +2244,7 @@ const TestData test_data[] = {
   /* hexadecimal numbers */
   { "a",     SIGNED,   16,   0, 15, 10, FALSE, 0                             },
   { "a",     UNSIGNED, 16,   0, 15, 10, FALSE, 0                             },
+  { "0a",    UNSIGNED, 16,   0, 15, 10, FALSE, 0                             },
   { "0xa",   SIGNED,   16,   0, 15,  0, TRUE,  G_NUMBER_PARSER_ERROR_INVALID },
   { "0xa",   UNSIGNED, 16,   0, 15,  0, TRUE,  G_NUMBER_PARSER_ERROR_INVALID },
   { "-0xa",  SIGNED,   16, -15, 15,  0, TRUE,  G_NUMBER_PARSER_ERROR_INVALID },
@@ -1609,23 +2257,136 @@ const TestData test_data[] = {
   { "+ 0xa", UNSIGNED, 16,   0, 15,  0, TRUE,  G_NUMBER_PARSER_ERROR_INVALID },
 };
 
+/* Testing g_ascii_string_to_signed() and g_ascii_string_to_unsigned() functions */
 static void
 test_ascii_string_to_number_usual (void)
 {
   gsize idx;
+  gboolean result;
+  GError *error = NULL;
+  const TestData *data;
+  gint value;
+  gint64 value64 = 0;
+  guint64 valueu64 = 0;
+
+  /*** g_ascii_string_to_signed() ***/
+  data = &test_data[0]; /* Setting data to signed data */
+
+  if (g_test_undefined ())
+    {
+      /* Testing degenerated cases */
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_ascii_string_to_signed (NULL,
+                                         data->base,
+                                         data->min,
+                                         data->max,
+                                         &value64,
+                                         &error);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'base >= 2 && base <= 36\'*");
+      result = g_ascii_string_to_signed (data->str,
+                                         1,
+                                         data->min,
+                                         data->max,
+                                         &value64,
+                                         &error);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'base >= 2 && base <= 36\'*");
+      result = g_ascii_string_to_signed (data->str,
+                                         40,
+                                         data->min,
+                                         data->max,
+                                         &value64,
+                                         &error);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'min <= max\'*");
+      result = g_ascii_string_to_signed (data->str,
+                                         data->base,
+                                         data->max,
+                                         data->min,
+                                         &value64,
+                                         &error);
+      g_test_assert_expected_messages ();
+    }
 
+  /* Catching first part of (error == NULL || *error == NULL) */
+  result = g_ascii_string_to_signed (data->str,
+                                     data->base,
+                                     data->min,
+                                     data->max,
+                                     &value64,
+                                     NULL);
+
+  /*** g_ascii_string_to_unsigned() ***/
+  data = &test_data[12]; /* Setting data to unsigned data */
+
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      result = g_ascii_string_to_unsigned (NULL,
+                                           data->base,
+                                           data->min,
+                                           data->max,
+                                           &valueu64,
+                                           &error);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'base >= 2 && base <= 36\'*");
+      result = g_ascii_string_to_unsigned (data->str,
+                                           1,
+                                           data->min,
+                                           data->max,
+                                           &valueu64,
+                                           &error);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'base >= 2 && base <= 36\'*");
+      result = g_ascii_string_to_unsigned (data->str,
+                                           40,
+                                           data->min,
+                                           data->max,
+                                           &valueu64,
+                                           &error);
+      g_test_assert_expected_messages ();
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion \'min <= max\'*");
+      result = g_ascii_string_to_unsigned (data->str,
+                                           data->base,
+                                           data->max,
+                                           data->min,
+                                           &valueu64,
+                                           &error);
+      g_test_assert_expected_messages ();
+    }
+
+  /* Catching first part of (error == NULL || *error == NULL) */
+  result = g_ascii_string_to_unsigned (data->str,
+                                       data->base,
+                                       data->min,
+                                       data->max,
+                                       &valueu64,
+                                       NULL);
+
+  /* Testing usual cases */
   for (idx = 0; idx < G_N_ELEMENTS (test_data); ++idx)
     {
-      GError *error = NULL;
-      const TestData *data = &test_data[idx];
-      gboolean result;
-      gint value;
+      data = &test_data[idx];
 
       switch (data->sign_type)
         {
         case SIGNED:
           {
-            gint64 value64 = 0;
             result = g_ascii_string_to_signed (data->str,
                                                data->base,
                                                data->min,
@@ -1658,7 +2419,7 @@ test_ascii_string_to_number_usual (void)
       if (data->should_fail)
         {
           g_assert_false (result);
-          g_assert_error (error, G_NUMBER_PARSER_ERROR, data->error_code);
+          g_assert_error (error, G_NUMBER_PARSER_ERROR, (gint) data->error_code);
           g_clear_error (&error);
         }
       else
@@ -1670,6 +2431,7 @@ test_ascii_string_to_number_usual (void)
     }
 }
 
+/* Testing pathological cases for g_ascii_string_to_(un)signed()  */
 static void
 test_ascii_string_to_number_pathological (void)
 {
@@ -1751,39 +2513,50 @@ main (int   argc,
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/strfuncs/test-is-to-digit", test_is_to_digit);
+  g_test_add_func ("/strfuncs/ascii-strcasecmp", test_ascii_strcasecmp);
+  g_test_add_func ("/strfuncs/ascii-string-to-num/pathological", test_ascii_string_to_number_pathological);
+  g_test_add_func ("/strfuncs/ascii-string-to-num/usual", test_ascii_string_to_number_usual);
+  g_test_add_func ("/strfuncs/ascii_strdown", test_ascii_strdown);
+  g_test_add_func ("/strfuncs/ascii_strdup", test_ascii_strup);
+  g_test_add_func ("/strfuncs/ascii_strtod", test_ascii_strtod);
+  g_test_add_func ("/strfuncs/bounds-check", test_bounds);
+  g_test_add_func ("/strfuncs/has-prefix", test_has_prefix);
+  g_test_add_func ("/strfuncs/has-suffix", test_has_suffix);
+  g_test_add_func ("/strfuncs/memdup", test_memdup);
+  g_test_add_func ("/strfuncs/stpcpy", test_stpcpy);
+  g_test_add_func ("/strfuncs/str_match_string", test_str_match_string);
+  g_test_add_func ("/strfuncs/str_tokenize_and_fold", test_str_tokenize_and_fold);
+  g_test_add_func ("/strfuncs/strcanon", test_strcanon);
+  g_test_add_func ("/strfuncs/strchomp", test_strchomp);
+  g_test_add_func ("/strfuncs/strchug", test_strchug);
+  g_test_add_func ("/strfuncs/strcompress-strescape", test_strcompress_strescape);
+  g_test_add_func ("/strfuncs/strconcat", test_strconcat);
+  g_test_add_func ("/strfuncs/strdelimit", test_strdelimit);
   g_test_add_func ("/strfuncs/strdup", test_strdup);
-  g_test_add_func ("/strfuncs/strndup", test_strndup);
   g_test_add_func ("/strfuncs/strdup-printf", test_strdup_printf);
   g_test_add_func ("/strfuncs/strdupv", test_strdupv);
-  g_test_add_func ("/strfuncs/strnfill", test_strnfill);
-  g_test_add_func ("/strfuncs/strconcat", test_strconcat);
+  g_test_add_func ("/strfuncs/strerror", test_strerror);
+  g_test_add_func ("/strfuncs/strip-context", test_strip_context);
   g_test_add_func ("/strfuncs/strjoin", test_strjoin);
-  g_test_add_func ("/strfuncs/strcanon", test_strcanon);
-  g_test_add_func ("/strfuncs/strcompress-strescape", test_strcompress_strescape);
-  g_test_add_func ("/strfuncs/ascii-strcasecmp", test_ascii_strcasecmp);
-  g_test_add_func ("/strfuncs/strchug", test_strchug);
-  g_test_add_func ("/strfuncs/strchomp", test_strchomp);
-  g_test_add_func ("/strfuncs/strreverse", test_strreverse);
+  g_test_add_func ("/strfuncs/strjoinv", test_strjoinv);
+  g_test_add_func ("/strfuncs/strlcat", test_strlcat);
+  g_test_add_func ("/strfuncs/strlcpy", test_strlcpy);
   g_test_add_func ("/strfuncs/strncasecmp", test_strncasecmp);
-  g_test_add_func ("/strfuncs/strstr", test_strstr);
-  g_test_add_func ("/strfuncs/has-prefix", test_has_prefix);
-  g_test_add_func ("/strfuncs/has-suffix", test_has_suffix);
+  g_test_add_func ("/strfuncs/strndup", test_strndup);
+  g_test_add_func ("/strfuncs/strnfill", test_strnfill);
+  g_test_add_func ("/strfuncs/strreverse", test_strreverse);
+  g_test_add_func ("/strfuncs/strsignal", test_strsignal);
   g_test_add_func ("/strfuncs/strsplit", test_strsplit);
   g_test_add_func ("/strfuncs/strsplit-set", test_strsplit_set);
-  g_test_add_func ("/strfuncs/strv-length", test_strv_length);
+  g_test_add_func ("/strfuncs/strstr", test_strstr);
   g_test_add_func ("/strfuncs/strtod", test_strtod);
   g_test_add_func ("/strfuncs/strtoull-strtoll", test_strtoll);
-  g_test_add_func ("/strfuncs/bounds-check", test_bounds);
-  g_test_add_func ("/strfuncs/strip-context", test_strip_context);
-  g_test_add_func ("/strfuncs/strerror", test_strerror);
-  g_test_add_func ("/strfuncs/strsignal", test_strsignal);
   g_test_add_func ("/strfuncs/strup", test_strup);
-  g_test_add_func ("/strfuncs/transliteration", test_transliteration);
   g_test_add_func ("/strfuncs/strv-contains", test_strv_contains);
   g_test_add_func ("/strfuncs/strv-equal", test_strv_equal);
-  g_test_add_func ("/strfuncs/ascii-string-to-num/usual", test_ascii_string_to_number_usual);
-  g_test_add_func ("/strfuncs/ascii-string-to-num/pathological", test_ascii_string_to_number_pathological);
+  g_test_add_func ("/strfuncs/strv-length", test_strv_length);
+  g_test_add_func ("/strfuncs/test-is-to-digit", test_is_to_digit);
+  g_test_add_func ("/strfuncs/transliteration", test_transliteration);
 
   return g_test_run();
 }
diff --git a/glib/tests/testing-helper.c b/glib/tests/testing-helper.c
index b0e1f4a98..07820f6e7 100644
--- a/glib/tests/testing-helper.c
+++ b/glib/tests/testing-helper.c
@@ -17,6 +17,7 @@
  */
 
 #include <glib.h>
+#include <locale.h>
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
@@ -46,12 +47,22 @@ test_incomplete (void)
   g_test_incomplete ("mind reading not implemented yet");
 }
 
+static void
+test_summary (void)
+{
+  g_test_summary ("Tests that g_test_summary() works with TAP, by outputting a "
+                  "known summary message in testing-helper, and checking for "
+                  "it in the TAP output later.");
+}
+
 int
 main (int   argc,
       char *argv[])
 {
   char *argv1;
 
+  setlocale (LC_ALL, "");
+
 #ifdef G_OS_WIN32
   /* Windows opens std streams in text mode, with \r\n EOLs.
    * Sometimes it's easier to force a switch to binary mode than
@@ -101,6 +112,20 @@ main (int   argc,
       g_test_add_func ("/incomplete", test_incomplete);
       g_test_add_func ("/fail", test_fail);
     }
+  else if (g_strcmp0 (argv1, "skip-options") == 0)
+    {
+      /* The caller is expected to skip some of these with
+       * -p, -s and/or --GTestSkipCount */
+      g_test_add_func ("/a", test_pass);
+      g_test_add_func ("/b/a", test_pass);
+      g_test_add_func ("/b/b", test_pass);
+      g_test_add_func ("/c/a", test_pass);
+      g_test_add_func ("/d/a", test_pass);
+    }
+  else if (g_strcmp0 (argv1, "summary") == 0)
+    {
+      g_test_add_func ("/summary", test_summary);
+    }
   else
     {
       g_assert_not_reached ();
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index 03b9ca2c4..98fe66fba 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -29,7 +29,7 @@
 #define G_LOG_DOMAIN "testing"
 
 #include <glib.h>
-
+#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -1063,6 +1063,187 @@ test_tap (void)
   g_assert_no_error (error);
 
   g_ptr_array_unref (argv);
+
+  g_test_message ("--GTestSkipCount");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "skip-options");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, "--GTestSkipCount");
+  g_ptr_array_add (argv, "2");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (strstr (output, "1..5\n"));
+  g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP\n"));
+  g_assert_nonnull (strstr (output, "\nok 2 /b/a # SKIP\n"));
+  g_assert_nonnull (strstr (output, "\nok 3 /b/b\n"));
+  g_assert_nonnull (strstr (output, "\nok 4 /c/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 5 /d/a\n"));
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("--GTestSkipCount=0 is the same as omitting it");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "skip-options");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, "--GTestSkipCount");
+  g_ptr_array_add (argv, "0");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (strstr (output, "1..5\n"));
+  g_assert_nonnull (strstr (output, "\nok 1 /a\n"));
+  g_assert_nonnull (strstr (output, "\nok 2 /b/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 3 /b/b\n"));
+  g_assert_nonnull (strstr (output, "\nok 4 /c/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 5 /d/a\n"));
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("--GTestSkipCount > number of tests skips all");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "skip-options");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, "--GTestSkipCount");
+  g_ptr_array_add (argv, "6");
+  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_assert_nonnull (strstr (output, "1..5\n"));
+  g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP\n"));
+  g_assert_nonnull (strstr (output, "\nok 2 /b/a # SKIP\n"));
+  g_assert_nonnull (strstr (output, "\nok 3 /b/b # SKIP\n"));
+  g_assert_nonnull (strstr (output, "\nok 4 /c/a # SKIP\n"));
+  g_assert_nonnull (strstr (output, "\nok 5 /d/a # SKIP\n"));
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("-p");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "skip-options");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/c/a");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/c/a");
+  g_ptr_array_add (argv, "-p");
+  g_ptr_array_add (argv, "/b");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+  g_assert_nonnull (strstr (output, "\nok 1 /c/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 2 /c/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 3 /b/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 4 /b/b\n"));
+  g_assert_nonnull (strstr (output, "\n1..4\n"));
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_free (output);
+  g_ptr_array_unref (argv);
+
+  g_test_message ("-s");
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "skip-options");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, "-s");
+  g_ptr_array_add (argv, "/a");
+  g_ptr_array_add (argv, "-s");
+  g_ptr_array_add (argv, "/b");
+  g_ptr_array_add (argv, "-s");
+  g_ptr_array_add (argv, "/c/a");
+  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_assert_nonnull (strstr (output, "1..5\n"));
+  g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP by request"));
+  /* "-s /b" would skip a test named exactly /b, but not a test named
+   * /b/anything */
+  g_assert_nonnull (strstr (output, "\nok 2 /b/a\n"));
+  g_assert_nonnull (strstr (output, "\nok 3 /b/b\n"));
+  g_assert_nonnull (strstr (output, "\nok 4 /c/a # SKIP by request"));
+  g_assert_nonnull (strstr (output, "\nok 5 /d/a\n"));
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+
+  g_free (output);
+  g_ptr_array_unref (argv);
+}
+
+static void
+test_tap_summary (void)
+{
+  const char *testing_helper;
+  GPtrArray *argv;
+  GError *error = NULL;
+  int status;
+  gchar *output;
+
+  g_test_summary ("Test the output of g_test_summary() from the TAP output of a test.");
+
+  testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL);
+
+  argv = g_ptr_array_new ();
+  g_ptr_array_add (argv, (char *) testing_helper);
+  g_ptr_array_add (argv, "summary");
+  g_ptr_array_add (argv, "--tap");
+  g_ptr_array_add (argv, NULL);
+
+  g_spawn_sync (NULL, (char **) argv->pdata, NULL,
+                G_SPAWN_STDERR_TO_DEV_NULL,
+                NULL, NULL, &output, NULL, &status,
+                &error);
+  g_assert_no_error (error);
+
+  g_spawn_check_exit_status (status, &error);
+  g_assert_no_error (error);
+  /* Note: The test path in the output is not `/tap/summary` because it’s the
+   * test path from testing-helper, not from this function. */
+  g_assert_nonnull (strstr (output, "\n# /summary summary: Tests that g_test_summary() "
+                                    "works with TAP, by outputting a known "
+                                    "summary message in testing-helper, and "
+                                    "checking for it in the TAP output later.\n"));
+  g_free (output);
+  g_ptr_array_unref (argv);
 }
 
 int
@@ -1071,6 +1252,8 @@ main (int   argc,
 {
   argv0 = argv[0];
 
+  setlocale (LC_ALL, "");
+
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/random-generator/rand-1", test_rand1);
@@ -1142,6 +1325,7 @@ main (int   argc,
   g_test_add_func ("/misc/timeout", test_subprocess_timed_out);
 
   g_test_add_func ("/tap", test_tap);
+  g_test_add_func ("/tap/summary", test_tap_summary);
 
   return g_test_run();
 }
diff --git a/glib/tests/unicode.c b/glib/tests/unicode.c
index 34c697150..3858b7732 100644
--- a/glib/tests/unicode.c
+++ b/glib/tests/unicode.c
@@ -25,19 +25,27 @@
 /* We are testing some deprecated APIs here */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 
+#include <locale.h>
+
 #include "glib.h"
 
+#include "glib/gunidecomp.h"
+
+/* Test that g_unichar_validate() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_unichar_validate (void)
 {
-  g_assert (g_unichar_validate ('j'));
-  g_assert (g_unichar_validate (8356));
-  g_assert (g_unichar_validate (8356));
-  g_assert (g_unichar_validate (0xfdd1));
-  g_assert (g_unichar_validate (917760));
-  g_assert (!g_unichar_validate (0x110000));
+  g_assert_true (g_unichar_validate ('j'));
+  g_assert_true (g_unichar_validate (8356));
+  g_assert_true (g_unichar_validate (8356));
+  g_assert_true (g_unichar_validate (0xFDD1));
+  g_assert_true (g_unichar_validate (917760));
+  g_assert_false (g_unichar_validate (0x110000));
 }
 
+/* Test that g_unichar_type() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_unichar_character_type (void)
 {
@@ -82,8 +90,21 @@ test_unichar_character_type (void)
     {
       g_assert_cmpint (g_unichar_type (examples[i].c), ==, examples[i].type);
     }
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_cmpint (g_unichar_type (0x3FF5), ==, 0x07);
+  /* U+FFEFF Plane 15 Private Use */
+  g_assert_cmpint (g_unichar_type (0xFFEFF), ==, 0x03);
+  /* U+E0001 Language Tag */
+  g_assert_cmpint (g_unichar_type (0xE0001), ==, 0x01);
+  g_assert_cmpint (g_unichar_type (G_UNICODE_LAST_CHAR), ==, 0x02);
+  g_assert_cmpint (g_unichar_type (G_UNICODE_LAST_CHAR + 1), ==, 0x02);
+  g_assert_cmpint (g_unichar_type (G_UNICODE_LAST_CHAR_PART1), ==, 0x02);
+  g_assert_cmpint (g_unichar_type (G_UNICODE_LAST_CHAR_PART1 + 1), ==, 0x02);
 }
 
+/* Test that g_unichar_break_type() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_unichar_break_type (void)
 {
@@ -143,6 +164,8 @@ test_unichar_break_type (void)
     }
 }
 
+/* Test that g_unichar_get_script() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_unichar_script (void)
 {
@@ -304,11 +327,17 @@ test_unichar_script (void)
     { G_UNICODE_SCRIPT_MEDEFAIDRIN,            0x16E40 },
     { G_UNICODE_SCRIPT_OLD_SOGDIAN,            0x10F00 },
     { G_UNICODE_SCRIPT_SOGDIAN,                0x10F30 },
+    { G_UNICODE_SCRIPT_ELYMAIC,                0x10FE0 },
+    { G_UNICODE_SCRIPT_NANDINAGARI,            0x119A0 },
+    { G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG, 0x1E100 },
+    { G_UNICODE_SCRIPT_WANCHO,                 0x1E2C0 },
   };
   for (i = 0; i < G_N_ELEMENTS (examples); i++)
     g_assert_cmpint (g_unichar_get_script (examples[i].c), ==, examples[i].script);
 }
 
+/* Test that g_unichar_combining_class() returns the correct value for
+ * various ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_combining_class (void)
 {
@@ -357,58 +386,503 @@ test_combining_class (void)
     }
 }
 
+/* Test that g_unichar_get_mirror() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_mirror (void)
 {
   gunichar mirror;
 
-  g_assert (g_unichar_get_mirror_char ('(', &mirror));
+  g_assert_true (g_unichar_get_mirror_char ('(', &mirror));
   g_assert_cmpint (mirror, ==, ')');
-  g_assert (g_unichar_get_mirror_char (')', &mirror));
+  g_assert_true (g_unichar_get_mirror_char (')', &mirror));
   g_assert_cmpint (mirror, ==, '(');
-  g_assert (g_unichar_get_mirror_char ('{', &mirror));
+  g_assert_true (g_unichar_get_mirror_char ('{', &mirror));
   g_assert_cmpint (mirror, ==, '}');
-  g_assert (g_unichar_get_mirror_char ('}', &mirror));
+  g_assert_true (g_unichar_get_mirror_char ('}', &mirror));
   g_assert_cmpint (mirror, ==, '{');
-  g_assert (g_unichar_get_mirror_char (0x208D, &mirror));
+  g_assert_true (g_unichar_get_mirror_char (0x208D, &mirror));
   g_assert_cmpint (mirror, ==, 0x208E);
-  g_assert (g_unichar_get_mirror_char (0x208E, &mirror));
+  g_assert_true (g_unichar_get_mirror_char (0x208E, &mirror));
   g_assert_cmpint (mirror, ==, 0x208D);
-  g_assert (!g_unichar_get_mirror_char ('a', &mirror));
+  g_assert_false (g_unichar_get_mirror_char ('a', &mirror));
+}
+
+/* Test that g_utf8_strup() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_strup (void)
+{
+  char *str_up = NULL;
+  const char *str = "AaZz09x;\x03\x45"
+    "\xEF\xBD\x81"  /* Unichar 'A' (U+FF21) */
+    "\xEF\xBC\xA1"; /* Unichar 'a' (U+FF41) */
+
+  /* Testing degenerated cases */
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_up = g_utf8_strup (NULL, 0);
+      g_test_assert_expected_messages ();
+    }
+
+  str_up = g_utf8_strup (str, strlen (str));
+  /* Tricky, comparing two unicode strings with an ASCII function */
+  g_assert_cmpstr (str_up, ==, "AAZZ09X;\003E\357\274\241\357\274\241");
+  g_free (str_up);
+}
+
+/* Test that g_utf8_strdown() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_strdown (void)
+{
+  char *str_down = NULL;
+  const char *str = "AaZz09x;\x03\x07"
+    "\xEF\xBD\x81"  /* Unichar 'A' (U+FF21) */
+    "\xEF\xBC\xA1"; /* Unichar 'a' (U+FF41) */
+
+  /* Testing degenerated cases */
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_down = g_utf8_strdown (NULL, 0);
+      g_test_assert_expected_messages ();
+    }
+
+  str_down = g_utf8_strdown (str, strlen (str));
+  /* Tricky, comparing two unicode strings with an ASCII function */
+  g_assert_cmpstr (str_down, ==, "aazz09x;\003\007\357\275\201\357\275\201");
+  g_free (str_down);
+}
+
+/* Test that g_utf8_casefold() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_casefold (void)
+{
+  char *str_casefold = NULL;
+  const char *str = "AaZz09x;"
+    "\xEF\xBD\x81"  /* Unichar 'A' (U+FF21) */
+    "\xEF\xBC\xA1"; /* Unichar 'a' (U+FF41) */
+
+  /* Testing degenerated cases */
+  if (g_test_undefined ())
+    {
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*assertion*!= NULL*");
+      str_casefold = g_utf8_casefold (NULL, 0);
+      g_test_assert_expected_messages ();
+    }
+
+  str_casefold = g_utf8_casefold (str, strlen (str));
+  /* Tricky, comparing two unicode strings with an ASCII function */
+  g_assert_cmpstr (str_casefold, ==, "aazz09x;\357\275\201\357\275\201");
+  g_free (str_casefold);
 }
 
+/* Test that g_unichar_ismark() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_mark (void)
 {
-  g_assert (g_unichar_ismark (0x0903));
-  g_assert (g_unichar_ismark (0x20DD));
-  g_assert (g_unichar_ismark (0xA806));
-  g_assert (!g_unichar_ismark ('a'));
+  g_assert_true (g_unichar_ismark (0x0903));
+  g_assert_true (g_unichar_ismark (0x20DD));
+  g_assert_true (g_unichar_ismark (0xA806));
+  g_assert_false (g_unichar_ismark ('a'));
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_ismark (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_ismark (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_ismark (0xE0001));
+  g_assert_false (g_unichar_ismark (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_ismark (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_ismark (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_ismark (G_UNICODE_LAST_CHAR_PART1 + 1));
 }
 
+/* Test that g_unichar_isspace() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_space (void)
+{
+  g_assert_false (g_unichar_isspace ('a'));
+  g_assert_true (g_unichar_isspace (' '));
+  g_assert_true (g_unichar_isspace ('\t'));
+  g_assert_true (g_unichar_isspace ('\n'));
+  g_assert_true (g_unichar_isspace ('\r'));
+  g_assert_true (g_unichar_isspace ('\f'));
+  g_assert_false (g_unichar_isspace (0xff41)); /* Unicode fullwidth 'a' */
+  g_assert_true (g_unichar_isspace (0x202F)); /* Unicode space separator */
+  g_assert_true (g_unichar_isspace (0x2028)); /* Unicode line separator */
+  g_assert_true (g_unichar_isspace (0x2029)); /* Unicode paragraph separator */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_isspace (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_isspace (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isspace (0xE0001));
+  g_assert_false (g_unichar_isspace (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isspace (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isspace (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isspace (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_isalnum() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_alnum (void)
+{
+  g_assert_false (g_unichar_isalnum (' '));
+  g_assert_true (g_unichar_isalnum ('a'));
+  g_assert_true (g_unichar_isalnum ('z'));
+  g_assert_true (g_unichar_isalnum ('0'));
+  g_assert_true (g_unichar_isalnum ('9'));
+  g_assert_true (g_unichar_isalnum ('A'));
+  g_assert_true (g_unichar_isalnum ('Z'));
+  g_assert_false (g_unichar_isalnum ('-'));
+  g_assert_false (g_unichar_isalnum ('*'));
+  g_assert_true (g_unichar_isalnum (0xFF21));  /* Unichar fullwidth 'A' */
+  g_assert_true (g_unichar_isalnum (0xFF3A));  /* Unichar fullwidth 'Z' */
+  g_assert_true (g_unichar_isalnum (0xFF41));  /* Unichar fullwidth 'a' */
+  g_assert_true (g_unichar_isalnum (0xFF5A));  /* Unichar fullwidth 'z' */
+  g_assert_true (g_unichar_isalnum (0xFF10));  /* Unichar fullwidth '0' */
+  g_assert_true (g_unichar_isalnum (0xFF19));  /* Unichar fullwidth '9' */
+  g_assert_false (g_unichar_isalnum (0xFF0A)); /* Unichar fullwidth '*' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_true (g_unichar_isalnum (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_isalnum (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isalnum (0xE0001));
+  g_assert_false (g_unichar_isalnum (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isalnum (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isalnum (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isalnum (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_isalpha() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_alpha (void)
+{
+  g_assert_false (g_unichar_isalpha (' '));
+  g_assert_true (g_unichar_isalpha ('a'));
+  g_assert_true (g_unichar_isalpha ('z'));
+  g_assert_false (g_unichar_isalpha ('0'));
+  g_assert_false (g_unichar_isalpha ('9'));
+  g_assert_true (g_unichar_isalpha ('A'));
+  g_assert_true (g_unichar_isalpha ('Z'));
+  g_assert_false (g_unichar_isalpha ('-'));
+  g_assert_false (g_unichar_isalpha ('*'));
+  g_assert_true (g_unichar_isalpha (0xFF21));  /* Unichar fullwidth 'A' */
+  g_assert_true (g_unichar_isalpha (0xFF3A));  /* Unichar fullwidth 'Z' */
+  g_assert_true (g_unichar_isalpha (0xFF41));  /* Unichar fullwidth 'a' */
+  g_assert_true (g_unichar_isalpha (0xFF5A));  /* Unichar fullwidth 'z' */
+  g_assert_false (g_unichar_isalpha (0xFF10)); /* Unichar fullwidth '0' */
+  g_assert_false (g_unichar_isalpha (0xFF19)); /* Unichar fullwidth '9' */
+  g_assert_false (g_unichar_isalpha (0xFF0A)); /* Unichar fullwidth '*' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_true (g_unichar_isalpha (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_isalpha (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isalpha (0xE0001));
+  g_assert_false (g_unichar_isalpha (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isalpha (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isalpha (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isalpha (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_isdigit() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_digit (void)
+{
+  g_assert_false (g_unichar_isdigit (' '));
+  g_assert_false (g_unichar_isdigit ('a'));
+  g_assert_true (g_unichar_isdigit ('0'));
+  g_assert_true (g_unichar_isdigit ('9'));
+  g_assert_false (g_unichar_isdigit ('A'));
+  g_assert_false (g_unichar_isdigit ('-'));
+  g_assert_false (g_unichar_isdigit ('*'));
+  g_assert_false (g_unichar_isdigit (0xFF21)); /* Unichar fullwidth 'A' */
+  g_assert_false (g_unichar_isdigit (0xFF3A)); /* Unichar fullwidth 'Z' */
+  g_assert_false (g_unichar_isdigit (0xFF41)); /* Unichar fullwidth 'a' */
+  g_assert_false (g_unichar_isdigit (0xFF5A)); /* Unichar fullwidth 'z' */
+  g_assert_true (g_unichar_isdigit (0xFF10));  /* Unichar fullwidth '0' */
+  g_assert_true (g_unichar_isdigit (0xFF19));  /* Unichar fullwidth '9' */
+  g_assert_false (g_unichar_isdigit (0xFF0A)); /* Unichar fullwidth '*' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_isdigit (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_isdigit (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isdigit (0xE0001));
+  g_assert_false (g_unichar_isdigit (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isdigit (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isdigit (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isdigit (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_digit_value() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_digit_value (void)
+{
+  g_assert_cmpint (g_unichar_digit_value (' '), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value ('a'), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value ('0'), ==, 0);
+  g_assert_cmpint (g_unichar_digit_value ('9'), ==, 9);
+  g_assert_cmpint (g_unichar_digit_value ('A'), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value ('-'), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value (0xFF21), ==, -1); /* Unichar 'A' */
+  g_assert_cmpint (g_unichar_digit_value (0xFF3A), ==, -1); /* Unichar 'Z' */
+  g_assert_cmpint (g_unichar_digit_value (0xFF41), ==, -1); /* Unichar 'a' */
+  g_assert_cmpint (g_unichar_digit_value (0xFF5A), ==, -1); /* Unichar 'z' */
+  g_assert_cmpint (g_unichar_digit_value (0xFF10), ==, 0);  /* Unichar '0' */
+  g_assert_cmpint (g_unichar_digit_value (0xFF19), ==, 9);  /* Unichar '9' */
+  g_assert_cmpint (g_unichar_digit_value (0xFF0A), ==, -1); /* Unichar '*' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_cmpint (g_unichar_digit_value (0x3FF5), ==, -1);
+   /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_cmpint (g_unichar_digit_value (0xFFEFF), ==, -1);
+  /* U+E0001 Language Tag */
+  g_assert_cmpint (g_unichar_digit_value (0xE0001), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value (G_UNICODE_LAST_CHAR), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value (G_UNICODE_LAST_CHAR + 1), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value (G_UNICODE_LAST_CHAR_PART1), ==, -1);
+  g_assert_cmpint (g_unichar_digit_value (G_UNICODE_LAST_CHAR_PART1 + 1), ==, -1);
+}
+
+/* Test that g_unichar_isxdigit() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_xdigit (void)
+{
+  g_assert_false (g_unichar_isxdigit (' '));
+  g_assert_true (g_unichar_isxdigit ('a'));
+  g_assert_true (g_unichar_isxdigit ('f'));
+  g_assert_false (g_unichar_isxdigit ('g'));
+  g_assert_false (g_unichar_isxdigit ('z'));
+  g_assert_true (g_unichar_isxdigit ('0'));
+  g_assert_true (g_unichar_isxdigit ('9'));
+  g_assert_true (g_unichar_isxdigit ('A'));
+  g_assert_true (g_unichar_isxdigit ('F'));
+  g_assert_false (g_unichar_isxdigit ('G'));
+  g_assert_false (g_unichar_isxdigit ('Z'));
+  g_assert_false (g_unichar_isxdigit ('-'));
+  g_assert_false (g_unichar_isxdigit ('*'));
+  g_assert_true (g_unichar_isxdigit (0xFF21));  /* Unichar fullwidth 'A' */
+  g_assert_true (g_unichar_isxdigit (0xFF26));  /* Unichar fullwidth 'F' */
+  g_assert_false (g_unichar_isxdigit (0xFF27)); /* Unichar fullwidth 'G' */
+  g_assert_false (g_unichar_isxdigit (0xFF3A)); /* Unichar fullwidth 'Z' */
+  g_assert_true (g_unichar_isxdigit (0xFF41));  /* Unichar fullwidth 'a' */
+  g_assert_true (g_unichar_isxdigit (0xFF46));  /* Unichar fullwidth 'f' */
+  g_assert_false (g_unichar_isxdigit (0xFF47)); /* Unichar fullwidth 'g' */
+  g_assert_false (g_unichar_isxdigit (0xFF5A)); /* Unichar fullwidth 'z' */
+  g_assert_true (g_unichar_isxdigit (0xFF10));  /* Unichar fullwidth '0' */
+  g_assert_true (g_unichar_isxdigit (0xFF19));  /* Unichar fullwidth '9' */
+  g_assert_false (g_unichar_isxdigit (0xFF0A)); /* Unichar fullwidth '*' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_isxdigit (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_isxdigit (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isxdigit (0xE0001));
+  g_assert_false (g_unichar_isxdigit (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isxdigit (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isxdigit (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isxdigit (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_xdigit_value() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_xdigit_value (void)
+{
+  g_assert_cmpint (g_unichar_xdigit_value (' '), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value ('a'), ==, 10);
+  g_assert_cmpint (g_unichar_xdigit_value ('f'), ==, 15);
+  g_assert_cmpint (g_unichar_xdigit_value ('g'), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value ('0'), ==, 0);
+  g_assert_cmpint (g_unichar_xdigit_value ('9'), ==, 9);
+  g_assert_cmpint (g_unichar_xdigit_value ('A'), ==, 10);
+  g_assert_cmpint (g_unichar_xdigit_value ('F'), ==, 15);
+  g_assert_cmpint (g_unichar_xdigit_value ('G'), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value ('-'), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF21), ==, 10); /* Unichar 'A' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF26), ==, 15); /* Unichar 'F' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF27), ==, -1); /* Unichar 'G' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF3A), ==, -1); /* Unichar 'Z' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF41), ==, 10); /* Unichar 'a' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF46), ==, 15); /* Unichar 'f' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF47), ==, -1); /* Unichar 'g' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF5A), ==, -1); /* Unichar 'z' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF10), ==, 0);  /* Unichar '0' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF19), ==, 9);  /* Unichar '9' */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFF0A), ==, -1); /* Unichar '*' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_cmpint (g_unichar_xdigit_value (0x3FF5), ==, -1);
+   /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_cmpint (g_unichar_xdigit_value (0xFFEFF), ==, -1);
+  /* U+E0001 Language Tag */
+  g_assert_cmpint (g_unichar_xdigit_value (0xE0001), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value (G_UNICODE_LAST_CHAR), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value (G_UNICODE_LAST_CHAR + 1), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value (G_UNICODE_LAST_CHAR_PART1), ==, -1);
+  g_assert_cmpint (g_unichar_xdigit_value (G_UNICODE_LAST_CHAR_PART1 + 1), ==, -1);
+}
+
+/* Test that g_unichar_ispunct() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_punctuation (void)
+{
+  g_assert_false (g_unichar_ispunct (' '));
+  g_assert_false (g_unichar_ispunct ('a'));
+  g_assert_true (g_unichar_ispunct ('.'));
+  g_assert_true (g_unichar_ispunct (','));
+  g_assert_true (g_unichar_ispunct (';'));
+  g_assert_true (g_unichar_ispunct (':'));
+  g_assert_true (g_unichar_ispunct ('-'));
+
+  g_assert_false (g_unichar_ispunct (0xFF21)); /* Unichar fullwidth 'A' */
+  g_assert_true (g_unichar_ispunct (0x005F));  /* Unichar fullwidth '.' */
+  g_assert_true (g_unichar_ispunct (0x058A));  /* Unichar fullwidth '-' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_ispunct (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_ispunct (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_ispunct (0xE0001));
+  g_assert_false (g_unichar_ispunct (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_ispunct (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_ispunct (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_ispunct (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_iscntrl() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_cntrl (void)
+{
+  g_assert_true (g_unichar_iscntrl (0x08));
+  g_assert_false (g_unichar_iscntrl ('a'));
+  g_assert_true (g_unichar_iscntrl (0x007F)); /* Unichar fullwidth <del> */
+  g_assert_true (g_unichar_iscntrl (0x009F)); /* Unichar fullwidth control */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_iscntrl (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_iscntrl (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_iscntrl (0xE0001));
+  g_assert_false (g_unichar_iscntrl (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_iscntrl (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_iscntrl (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_iscntrl (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_isgraph() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_graph (void)
+{
+  g_assert_false (g_unichar_isgraph (0x08));
+  g_assert_false (g_unichar_isgraph (' '));
+  g_assert_true (g_unichar_isgraph ('a'));
+  g_assert_true (g_unichar_isgraph ('0'));
+  g_assert_true (g_unichar_isgraph ('9'));
+  g_assert_true (g_unichar_isgraph ('A'));
+  g_assert_true (g_unichar_isgraph ('-'));
+  g_assert_true (g_unichar_isgraph ('*'));
+  g_assert_true (g_unichar_isgraph (0xFF21));  /* Unichar fullwidth 'A' */
+  g_assert_true (g_unichar_isgraph (0xFF3A));  /* Unichar fullwidth 'Z' */
+  g_assert_true (g_unichar_isgraph (0xFF41));  /* Unichar fullwidth 'a' */
+  g_assert_true (g_unichar_isgraph (0xFF5A));  /* Unichar fullwidth 'z' */
+  g_assert_true (g_unichar_isgraph (0xFF10));  /* Unichar fullwidth '0' */
+  g_assert_true (g_unichar_isgraph (0xFF19));  /* Unichar fullwidth '9' */
+  g_assert_true (g_unichar_isgraph (0xFF0A));  /* Unichar fullwidth '*' */
+  g_assert_false (g_unichar_isgraph (0x007F)); /* Unichar fullwidth <del> */
+  g_assert_false (g_unichar_isgraph (0x009F)); /* Unichar fullwidth control */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_true (g_unichar_isgraph (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_true (g_unichar_isgraph (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isgraph (0xE0001));
+  g_assert_false (g_unichar_isgraph (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isgraph (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isgraph (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isgraph (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_iszerowidth() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_zerowidth (void)
 {
-  g_assert (!g_unichar_iszerowidth (0x00AD));
-  g_assert (!g_unichar_iszerowidth (0x00AD));
-  g_assert (!g_unichar_iszerowidth (0x115F));
-  g_assert (g_unichar_iszerowidth (0x1160));
-  g_assert (g_unichar_iszerowidth (0x11AA));
-  g_assert (g_unichar_iszerowidth (0x11FF));
-  g_assert (!g_unichar_iszerowidth (0x1200));
-  g_assert (g_unichar_iszerowidth (0x200B));
-  g_assert (g_unichar_iszerowidth (0x591));
+  g_assert_false (g_unichar_iszerowidth (0x00AD));
+  g_assert_false (g_unichar_iszerowidth (0x115F));
+  g_assert_true (g_unichar_iszerowidth (0x1160));
+  g_assert_true (g_unichar_iszerowidth (0x11AA));
+  g_assert_true (g_unichar_iszerowidth (0x11FF));
+  g_assert_false (g_unichar_iszerowidth (0x1200));
+  g_assert_false (g_unichar_iszerowidth (0x200A));
+  g_assert_true (g_unichar_iszerowidth (0x200B));
+  g_assert_true (g_unichar_iszerowidth (0x200C));
+  g_assert_true (g_unichar_iszerowidth (0x591));
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_iszerowidth (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_iszerowidth (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_true (g_unichar_iszerowidth (0xE0001));
+  g_assert_false (g_unichar_iszerowidth (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_iszerowidth (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_iszerowidth (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_iszerowidth (G_UNICODE_LAST_CHAR_PART1 + 1));
 }
 
+/* Test that g_unichar_istitle() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_title (void)
 {
-  g_assert (g_unichar_istitle (0x01c5));
-  g_assert (g_unichar_istitle (0x1f88));
-  g_assert (g_unichar_istitle (0x1fcc));
-  g_assert (!g_unichar_istitle ('a'));
-  g_assert (!g_unichar_istitle ('A'));
-
+  g_assert_true (g_unichar_istitle (0x01c5));
+  g_assert_true (g_unichar_istitle (0x1f88));
+  g_assert_true (g_unichar_istitle (0x1fcc));
+  g_assert_false (g_unichar_istitle ('a'));
+  g_assert_false (g_unichar_istitle ('A'));
+  g_assert_false (g_unichar_istitle (';'));
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_istitle (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_istitle (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_istitle (0xE0001));
+  g_assert_false (g_unichar_istitle (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_istitle (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_istitle (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_istitle (G_UNICODE_LAST_CHAR_PART1 + 1));
+
+  g_assert_cmphex (g_unichar_totitle (0x0000), ==, 0x0000);
   g_assert_cmphex (g_unichar_totitle (0x01c6), ==, 0x01c5);
   g_assert_cmphex (g_unichar_totitle (0x01c4), ==, 0x01c5);
   g_assert_cmphex (g_unichar_totitle (0x01c5), ==, 0x01c5);
@@ -416,17 +890,118 @@ test_title (void)
   g_assert_cmphex (g_unichar_totitle (0x1f88), ==, 0x1f88);
   g_assert_cmphex (g_unichar_totitle ('a'), ==, 'A');
   g_assert_cmphex (g_unichar_totitle ('A'), ==, 'A');
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_cmphex (g_unichar_totitle (0x3FF5), ==, 0x3FF5);
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_cmphex (g_unichar_totitle (0xFFEFF), ==, 0xFFEFF);
+  g_assert_cmphex (g_unichar_totitle (0xDFFFF), ==, 0xDFFFF);
+  /* U+E0001 Language Tag */
+  g_assert_cmphex (g_unichar_totitle (0xE0001), ==, 0xE0001);
+  g_assert_cmphex (g_unichar_totitle (G_UNICODE_LAST_CHAR), ==,
+                   G_UNICODE_LAST_CHAR);
+  g_assert_cmphex (g_unichar_totitle (G_UNICODE_LAST_CHAR + 1), ==,
+                   (G_UNICODE_LAST_CHAR + 1));
+  g_assert_cmphex (g_unichar_totitle (G_UNICODE_LAST_CHAR_PART1), ==,
+                   (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_cmphex (g_unichar_totitle (G_UNICODE_LAST_CHAR_PART1 + 1), ==,
+                   (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_isupper() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_upper (void)
+{
+  g_assert_false (g_unichar_isupper (' '));
+  g_assert_false (g_unichar_isupper ('0'));
+  g_assert_false (g_unichar_isupper ('a'));
+  g_assert_true (g_unichar_isupper ('A'));
+  g_assert_false (g_unichar_isupper (0xff41)); /* Unicode fullwidth 'a' */
+  g_assert_true (g_unichar_isupper (0xff21)); /* Unicode fullwidth 'A' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_isupper (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_isupper (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isupper (0xE0001));
+  g_assert_false (g_unichar_isupper (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isupper (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isupper (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isupper (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_islower() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_lower (void)
+{
+  g_assert_false (g_unichar_islower (' '));
+  g_assert_false (g_unichar_islower ('0'));
+  g_assert_true (g_unichar_islower ('a'));
+  g_assert_false (g_unichar_islower ('A'));
+  g_assert_true (g_unichar_islower (0xff41)); /* Unicode fullwidth 'a' */
+  g_assert_false (g_unichar_islower (0xff21)); /* Unicode fullwidth 'A' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_false (g_unichar_islower (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_false (g_unichar_islower (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_islower (0xE0001));
+  g_assert_false (g_unichar_islower (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_islower (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_islower (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_islower (G_UNICODE_LAST_CHAR_PART1 + 1));
+}
+
+/* Test that g_unichar_isprint() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
+static void
+test_print (void)
+{
+  g_assert_true (g_unichar_isprint (' '));
+  g_assert_true (g_unichar_isprint ('0'));
+  g_assert_true (g_unichar_isprint ('a'));
+  g_assert_true (g_unichar_isprint ('A'));
+  g_assert_true (g_unichar_isprint (0xff41)); /* Unicode fullwidth 'a' */
+  g_assert_true (g_unichar_isprint (0xff21)); /* Unicode fullwidth 'A' */
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_true (g_unichar_isprint (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_true (g_unichar_isprint (0xFFEFF));
+  /* U+E0001 Language Tag */
+  g_assert_false (g_unichar_isprint (0xE0001));
+  g_assert_false (g_unichar_isprint (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isprint (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isprint (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isprint (G_UNICODE_LAST_CHAR_PART1 + 1));
 }
 
+/* Test that g_unichar_toupper() and g_unichar_tolower() return the
+ * correct values for various ASCII and Unicode alphabetic, numeric,
+ * and other, codepoints. */
 static void
 test_cases (void)
 {
+  g_assert_cmphex (g_unichar_toupper (0x0), ==, 0x0);
+  g_assert_cmphex (g_unichar_tolower (0x0), ==, 0x0);
   g_assert_cmphex (g_unichar_toupper ('a'), ==, 'A');
   g_assert_cmphex (g_unichar_toupper ('A'), ==, 'A');
+  /* Unicode fullwidth 'a' == 'A' */
+  g_assert_cmphex (g_unichar_toupper (0xff41), ==, 0xff21);
+  /* Unicode fullwidth 'A' == 'A' */
+  g_assert_cmphex (g_unichar_toupper (0xff21), ==, 0xff21);
   g_assert_cmphex (g_unichar_toupper (0x01C5), ==, 0x01C4);
   g_assert_cmphex (g_unichar_toupper (0x01C6), ==, 0x01C4);
   g_assert_cmphex (g_unichar_tolower ('A'), ==, 'a');
   g_assert_cmphex (g_unichar_tolower ('a'), ==, 'a');
+  /* Unicode fullwidth 'A' == 'a' */
+  g_assert_cmphex (g_unichar_tolower (0xff21), ==, 0xff41);
+  /* Unicode fullwidth 'a' == 'a' */
+  g_assert_cmphex (g_unichar_tolower (0xff41), ==, 0xff41);
   g_assert_cmphex (g_unichar_tolower (0x01C4), ==, 0x01C6);
   g_assert_cmphex (g_unichar_tolower (0x01C5), ==, 0x01C6);
   g_assert_cmphex (g_unichar_tolower (0x1F8A), ==, 0x1F82);
@@ -434,20 +1009,77 @@ test_cases (void)
   g_assert_cmphex (g_unichar_toupper (0x1F8A), ==, 0x1F8A);
   g_assert_cmphex (g_unichar_tolower (0x1FB2), ==, 0x1FB2);
   g_assert_cmphex (g_unichar_toupper (0x1FB2), ==, 0x1FB2);
+
+  /* U+130 is a special case, it's a 'I' with a dot on top */
+  g_assert_cmphex (g_unichar_tolower (0x130), ==, 0x69);
+
+  /* Testing ATTTABLE() border cases */
+  g_assert_cmphex (g_unichar_toupper (0x1D6FE), ==, 0x1D6FE);
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_cmphex (g_unichar_toupper (0x3FF5), ==, 0x3FF5);
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_cmphex (g_unichar_toupper (0xFFEFF), ==, 0xFFEFF);
+  g_assert_cmphex (g_unichar_toupper (0xDFFFF), ==, 0xDFFFF);
+  /* U+E0001 Language Tag */
+  g_assert_cmphex (g_unichar_toupper (0xE0001), ==, 0xE0001);
+  g_assert_cmphex (g_unichar_toupper (G_UNICODE_LAST_CHAR), ==,
+                   G_UNICODE_LAST_CHAR);
+  g_assert_cmphex (g_unichar_toupper (G_UNICODE_LAST_CHAR + 1), ==,
+                   (G_UNICODE_LAST_CHAR + 1));
+  g_assert_cmphex (g_unichar_toupper (G_UNICODE_LAST_CHAR_PART1), ==,
+                   (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_cmphex (g_unichar_toupper (G_UNICODE_LAST_CHAR_PART1 + 1), ==,
+                   (G_UNICODE_LAST_CHAR_PART1 + 1));
+
+  /* Testing ATTTABLE() border cases */
+  g_assert_cmphex (g_unichar_tolower (0x1D6FA), ==, 0x1D6FA);
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_cmphex (g_unichar_tolower (0x3FF5), ==, 0x3FF5);
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_cmphex (g_unichar_tolower (0xFFEFF), ==, 0xFFEFF);
+  g_assert_cmphex (g_unichar_tolower (0xDFFFF), ==, 0xDFFFF);
+  /* U+E0001 Language Tag */
+  g_assert_cmphex (g_unichar_tolower (0xE0001), ==, 0xE0001);
+  g_assert_cmphex (g_unichar_tolower (G_UNICODE_LAST_CHAR), ==,
+                   G_UNICODE_LAST_CHAR);
+  g_assert_cmphex (g_unichar_tolower (G_UNICODE_LAST_CHAR + 1), ==,
+                   (G_UNICODE_LAST_CHAR + 1));
+  g_assert_cmphex (g_unichar_tolower (G_UNICODE_LAST_CHAR_PART1), ==,
+                   G_UNICODE_LAST_CHAR_PART1);
+  g_assert_cmphex (g_unichar_tolower (G_UNICODE_LAST_CHAR_PART1 + 1), ==,
+                   (G_UNICODE_LAST_CHAR_PART1 + 1));
 }
 
+/* Test that g_unichar_isdefined() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_defined (void)
 {
-  g_assert (g_unichar_isdefined (0x0903));
-  g_assert (g_unichar_isdefined (0x20DD));
-  g_assert (g_unichar_isdefined (0x20BA));
-  g_assert (g_unichar_isdefined (0xA806));
-  g_assert (g_unichar_isdefined ('a'));
-  g_assert (!g_unichar_isdefined (0x10C49));
-  g_assert (!g_unichar_isdefined (0x169D));
+  g_assert_true (g_unichar_isdefined (0x0903));
+  g_assert_true (g_unichar_isdefined (0x20DD));
+  g_assert_true (g_unichar_isdefined (0x20BA));
+  g_assert_true (g_unichar_isdefined (0xA806));
+  g_assert_true (g_unichar_isdefined ('a'));
+  g_assert_false (g_unichar_isdefined (0x10C49));
+  g_assert_false (g_unichar_isdefined (0x169D));
+
+  /*** Testing TYPE() border cases ***/
+  g_assert_true (g_unichar_isdefined (0x3FF5));
+  /* U+FFEFF Plane 15 Private Use (needed to be > G_UNICODE_MAX_TABLE_INDEX) */
+  g_assert_true (g_unichar_isdefined (0xFFEFF));
+  g_assert_false (g_unichar_isdefined (0xDFFFF));
+  /* U+E0001 Language Tag */
+  g_assert_true (g_unichar_isdefined (0xE0001));
+  g_assert_false (g_unichar_isdefined (G_UNICODE_LAST_CHAR));
+  g_assert_false (g_unichar_isdefined (G_UNICODE_LAST_CHAR + 1));
+  g_assert_false (g_unichar_isdefined (G_UNICODE_LAST_CHAR_PART1));
+  g_assert_false (g_unichar_isdefined (G_UNICODE_LAST_CHAR_PART1 + 1));
 }
 
+/* Test that g_unichar_iswide() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_wide (void)
 {
@@ -527,78 +1159,86 @@ test_wide (void)
 
   for (i = 0; i < G_N_ELEMENTS (examples); i++)
     {
-      g_assert_cmpint (g_unichar_iswide (examples[i].c), ==, (examples[i].wide == WIDE));
-      g_assert_cmpint (g_unichar_iswide_cjk (examples[i].c), ==, (examples[i].wide != NOT_WIDE));
+      g_assert_cmpint (g_unichar_iswide (examples[i].c), ==,
+                       (examples[i].wide == WIDE));
+      g_assert_cmpint (g_unichar_iswide_cjk (examples[i].c), ==,
+                       (examples[i].wide != NOT_WIDE));
     }
 };
 
+/* Test that g_unichar_compose() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_compose (void)
 {
   gunichar ch;
 
   /* Not composable */
-  g_assert (!g_unichar_compose (0x0041, 0x0042, &ch) && ch == 0);
-  g_assert (!g_unichar_compose (0x0041, 0, &ch) && ch == 0);
-  g_assert (!g_unichar_compose (0x0066, 0x0069, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x0041, 0x0042, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x0041, 0, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x0066, 0x0069, &ch) && ch == 0);
 
   /* Tricky non-composable */
-  g_assert (!g_unichar_compose (0x0308, 0x0301, &ch) && ch == 0); /* !0x0344 */
-  g_assert (!g_unichar_compose (0x0F71, 0x0F72, &ch) && ch == 0); /* !0x0F73 */
+  g_assert_false (g_unichar_compose (0x0308, 0x0301, &ch) && ch == 0); /* !0x0344 */
+  g_assert_false (g_unichar_compose (0x0F71, 0x0F72, &ch) && ch == 0); /* !0x0F73 */
 
   /* Singletons should not compose */
-  g_assert (!g_unichar_compose (0x212B, 0, &ch) && ch == 0);
-  g_assert (!g_unichar_compose (0x00C5, 0, &ch) && ch == 0);
-  g_assert (!g_unichar_compose (0x2126, 0, &ch) && ch == 0);
-  g_assert (!g_unichar_compose (0x03A9, 0, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x212B, 0, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x00C5, 0, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x2126, 0, &ch) && ch == 0);
+  g_assert_false (g_unichar_compose (0x03A9, 0, &ch) && ch == 0);
 
   /* Pairs */
-  g_assert (g_unichar_compose (0x0041, 0x030A, &ch) && ch == 0x00C5);
-  g_assert (g_unichar_compose (0x006F, 0x0302, &ch) && ch == 0x00F4);
-  g_assert (g_unichar_compose (0x1E63, 0x0307, &ch) && ch == 0x1E69);
-  g_assert (g_unichar_compose (0x0073, 0x0323, &ch) && ch == 0x1E63);
-  g_assert (g_unichar_compose (0x0064, 0x0307, &ch) && ch == 0x1E0B);
-  g_assert (g_unichar_compose (0x0064, 0x0323, &ch) && ch == 0x1E0D);
+  g_assert_true (g_unichar_compose (0x0041, 0x030A, &ch) && ch == 0x00C5);
+  g_assert_true (g_unichar_compose (0x006F, 0x0302, &ch) && ch == 0x00F4);
+  g_assert_true (g_unichar_compose (0x1E63, 0x0307, &ch) && ch == 0x1E69);
+  g_assert_true (g_unichar_compose (0x0073, 0x0323, &ch) && ch == 0x1E63);
+  g_assert_true (g_unichar_compose (0x0064, 0x0307, &ch) && ch == 0x1E0B);
+  g_assert_true (g_unichar_compose (0x0064, 0x0323, &ch) && ch == 0x1E0D);
 
   /* Hangul */
-  g_assert (g_unichar_compose (0xD4CC, 0x11B6, &ch) && ch == 0xD4DB);
-  g_assert (g_unichar_compose (0x1111, 0x1171, &ch) && ch == 0xD4CC);
-  g_assert (g_unichar_compose (0xCE20, 0x11B8, &ch) && ch == 0xCE31);
-  g_assert (g_unichar_compose (0x110E, 0x1173, &ch) && ch == 0xCE20);
+  g_assert_true (g_unichar_compose (0xD4CC, 0x11B6, &ch) && ch == 0xD4DB);
+  g_assert_true (g_unichar_compose (0x1111, 0x1171, &ch) && ch == 0xD4CC);
+  g_assert_true (g_unichar_compose (0xCE20, 0x11B8, &ch) && ch == 0xCE31);
+  g_assert_true (g_unichar_compose (0x110E, 0x1173, &ch) && ch == 0xCE20);
 }
 
+/* Test that g_unichar_decompose() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_decompose (void)
 {
   gunichar a, b;
 
   /* Not decomposable */
-  g_assert (!g_unichar_decompose (0x0041, &a, &b) && a == 0x0041 && b == 0);
-  g_assert (!g_unichar_decompose (0xFB01, &a, &b) && a == 0xFB01 && b == 0);
+  g_assert_false (g_unichar_decompose (0x0041, &a, &b) && a == 0x0041 && b == 0);
+  g_assert_false (g_unichar_decompose (0xFB01, &a, &b) && a == 0xFB01 && b == 0);
 
   /* Singletons */
-  g_assert (g_unichar_decompose (0x212B, &a, &b) && a == 0x00C5 && b == 0);
-  g_assert (g_unichar_decompose (0x2126, &a, &b) && a == 0x03A9 && b == 0);
+  g_assert_true (g_unichar_decompose (0x212B, &a, &b) && a == 0x00C5 && b == 0);
+  g_assert_true (g_unichar_decompose (0x2126, &a, &b) && a == 0x03A9 && b == 0);
 
   /* Tricky pairs */
-  g_assert (g_unichar_decompose (0x0344, &a, &b) && a == 0x0308 && b == 0x0301);
-  g_assert (g_unichar_decompose (0x0F73, &a, &b) && a == 0x0F71 && b == 0x0F72);
+  g_assert_true (g_unichar_decompose (0x0344, &a, &b) && a == 0x0308 && b == 0x0301);
+  g_assert_true (g_unichar_decompose (0x0F73, &a, &b) && a == 0x0F71 && b == 0x0F72);
 
   /* Pairs */
-  g_assert (g_unichar_decompose (0x00C5, &a, &b) && a == 0x0041 && b == 0x030A);
-  g_assert (g_unichar_decompose (0x00F4, &a, &b) && a == 0x006F && b == 0x0302);
-  g_assert (g_unichar_decompose (0x1E69, &a, &b) && a == 0x1E63 && b == 0x0307);
-  g_assert (g_unichar_decompose (0x1E63, &a, &b) && a == 0x0073 && b == 0x0323);
-  g_assert (g_unichar_decompose (0x1E0B, &a, &b) && a == 0x0064 && b == 0x0307);
-  g_assert (g_unichar_decompose (0x1E0D, &a, &b) && a == 0x0064 && b == 0x0323);
+  g_assert_true (g_unichar_decompose (0x00C5, &a, &b) && a == 0x0041 && b == 0x030A);
+  g_assert_true (g_unichar_decompose (0x00F4, &a, &b) && a == 0x006F && b == 0x0302);
+  g_assert_true (g_unichar_decompose (0x1E69, &a, &b) && a == 0x1E63 && b == 0x0307);
+  g_assert_true (g_unichar_decompose (0x1E63, &a, &b) && a == 0x0073 && b == 0x0323);
+  g_assert_true (g_unichar_decompose (0x1E0B, &a, &b) && a == 0x0064 && b == 0x0307);
+  g_assert_true (g_unichar_decompose (0x1E0D, &a, &b) && a == 0x0064 && b == 0x0323);
 
   /* Hangul */
-  g_assert (g_unichar_decompose (0xD4DB, &a, &b) && a == 0xD4CC && b == 0x11B6);
-  g_assert (g_unichar_decompose (0xD4CC, &a, &b) && a == 0x1111 && b == 0x1171);
-  g_assert (g_unichar_decompose (0xCE31, &a, &b) && a == 0xCE20 && b == 0x11B8);
-  g_assert (g_unichar_decompose (0xCE20, &a, &b) && a == 0x110E && b == 0x1173);
+  g_assert_true (g_unichar_decompose (0xD4DB, &a, &b) && a == 0xD4CC && b == 0x11B6);
+  g_assert_true (g_unichar_decompose (0xD4CC, &a, &b) && a == 0x1111 && b == 0x1171);
+  g_assert_true (g_unichar_decompose (0xCE31, &a, &b) && a == 0xCE20 && b == 0x11B8);
+  g_assert_true (g_unichar_decompose (0xCE20, &a, &b) && a == 0x110E && b == 0x1173);
 }
 
+/* Test that g_unichar_fully_decompose() returns the correct value for
+ * various ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_fully_decompose_canonical (void)
 {
@@ -648,6 +1288,9 @@ test_fully_decompose_canonical (void)
 #undef TEST_DECOMP
 }
 
+/* Test that g_unicode_canonical_decomposition() returns the correct
+ * value for various ASCII and Unicode alphabetic, numeric, and other,
+ * codepoints. */
 static void
 test_canonical_decomposition (void)
 {
@@ -698,6 +1341,8 @@ test_canonical_decomposition (void)
 #undef TEST_DECOMP
 }
 
+/* Test that g_unichar_decompose() whenever encouttering a char ch
+ * decomposes into a and b, b itself won't decompose any further. */
 static void
 test_decompose_tail (void)
 {
@@ -708,7 +1353,7 @@ test_decompose_tail (void)
 
   for (ch = 0; ch < 0x110000; ch++)
     if (g_unichar_decompose (ch, &a, &b))
-      g_assert (!g_unichar_decompose (b, &c, &d));
+      g_assert_false (g_unichar_decompose (b, &c, &d));
     else
       {
         g_assert_cmpuint (a, ==, ch);
@@ -716,6 +1361,9 @@ test_decompose_tail (void)
       }
 }
 
+/* Test that all canonical decompositions of g_unichar_fully_decompose()
+ * are at most 4 in length, and compatibility decompositions are
+ * at most 18 in length. */
 static void
 test_fully_decompose_len (void)
 {
@@ -731,6 +1379,8 @@ test_fully_decompose_len (void)
   }
 }
 
+/* Test that g_unichar_decompose() returns the correct value for various
+ * ASCII and Unicode alphabetic, numeric, and other, codepoints. */
 static void
 test_iso15924 (void)
 {
@@ -911,17 +1561,28 @@ test_iso15924 (void)
     { G_UNICODE_SCRIPT_MEDEFAIDRIN,            "Medf" },
     { G_UNICODE_SCRIPT_OLD_SOGDIAN,            "Sogo" },
     { G_UNICODE_SCRIPT_SOGDIAN,                "Sogd" },
+
+    /* Unicode 12.0 additions */
+    { G_UNICODE_SCRIPT_ELYMAIC,                "Elym" },
+    { G_UNICODE_SCRIPT_NANDINAGARI,            "Nand" },
+    { G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG, "Hmnp" },
+    { G_UNICODE_SCRIPT_WANCHO,                 "Wcho" },
   };
   guint i;
 
-  g_assert_cmphex (0, ==, g_unicode_script_to_iso15924 (G_UNICODE_SCRIPT_INVALID_CODE));
+  g_assert_cmphex (0, ==,
+                   g_unicode_script_to_iso15924 (G_UNICODE_SCRIPT_INVALID_CODE));
   g_assert_cmphex (0x5A7A7A7A, ==, g_unicode_script_to_iso15924 (1000));
-  g_assert_cmphex (0x41726162, ==, g_unicode_script_to_iso15924 (G_UNICODE_SCRIPT_ARABIC));
+  g_assert_cmphex (0x41726162, ==,
+                   g_unicode_script_to_iso15924 (G_UNICODE_SCRIPT_ARABIC));
 
-  g_assert_cmphex (G_UNICODE_SCRIPT_INVALID_CODE, ==, g_unicode_script_from_iso15924 (0));
-  g_assert_cmphex (G_UNICODE_SCRIPT_UNKNOWN, ==, g_unicode_script_from_iso15924 (0x12345678));
+  g_assert_cmphex (G_UNICODE_SCRIPT_INVALID_CODE, ==,
+                   g_unicode_script_from_iso15924 (0));
+  g_assert_cmphex (G_UNICODE_SCRIPT_UNKNOWN, ==,
+                   g_unicode_script_from_iso15924 (0x12345678));
 
-#define PACK(a,b,c,d) ((guint32)((((guint8)(a))<<24)|(((guint8)(b))<<16)|(((guint8)(c))<<8)|((guint8)(d))))
+#define PACK(a,b,c,d) \
+  ((guint32)((((guint8)(a))<<24)|(((guint8)(b))<<16)|(((guint8)(c))<<8)|((guint8)(d))))
 
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
@@ -943,25 +1604,41 @@ main (int   argc,
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/unicode/validate", test_unichar_validate);
-  g_test_add_func ("/unicode/character-type", test_unichar_character_type);
+  g_test_add_func ("/unicode/alnum", test_alnum);
+  g_test_add_func ("/unicode/alpha", test_alpha);
   g_test_add_func ("/unicode/break-type", test_unichar_break_type);
-  g_test_add_func ("/unicode/script", test_unichar_script);
+  g_test_add_func ("/unicode/canonical-decomposition", test_canonical_decomposition);
+  g_test_add_func ("/unicode/casefold", test_casefold);
+  g_test_add_func ("/unicode/cases", test_cases);
+  g_test_add_func ("/unicode/character-type", test_unichar_character_type);
+  g_test_add_func ("/unicode/cntrl", test_cntrl);
   g_test_add_func ("/unicode/combining-class", test_combining_class);
-  g_test_add_func ("/unicode/mirror", test_mirror);
-  g_test_add_func ("/unicode/mark", test_mark);
-  g_test_add_func ("/unicode/title", test_title);
-  g_test_add_func ("/unicode/zero-width", test_zerowidth);
-  g_test_add_func ("/unicode/defined", test_defined);
-  g_test_add_func ("/unicode/wide", test_wide);
   g_test_add_func ("/unicode/compose", test_compose);
   g_test_add_func ("/unicode/decompose", test_decompose);
-  g_test_add_func ("/unicode/fully-decompose-canonical", test_fully_decompose_canonical);
-  g_test_add_func ("/unicode/canonical-decomposition", test_canonical_decomposition);
   g_test_add_func ("/unicode/decompose-tail", test_decompose_tail);
+  g_test_add_func ("/unicode/defined", test_defined);
+  g_test_add_func ("/unicode/digit", test_digit);
+  g_test_add_func ("/unicode/digit-value", test_digit_value);
+  g_test_add_func ("/unicode/fully-decompose-canonical", test_fully_decompose_canonical);
   g_test_add_func ("/unicode/fully-decompose-len", test_fully_decompose_len);
+  g_test_add_func ("/unicode/graph", test_graph);
   g_test_add_func ("/unicode/iso15924", test_iso15924);
-  g_test_add_func ("/unicode/cases", test_cases);
+  g_test_add_func ("/unicode/lower", test_lower);
+  g_test_add_func ("/unicode/mark", test_mark);
+  g_test_add_func ("/unicode/mirror", test_mirror);
+  g_test_add_func ("/unicode/print", test_print);
+  g_test_add_func ("/unicode/punctuation", test_punctuation);
+  g_test_add_func ("/unicode/script", test_unichar_script);
+  g_test_add_func ("/unicode/space", test_space);
+  g_test_add_func ("/unicode/strdown", test_strdown);
+  g_test_add_func ("/unicode/strup", test_strup);
+  g_test_add_func ("/unicode/title", test_title);
+  g_test_add_func ("/unicode/upper", test_upper);
+  g_test_add_func ("/unicode/validate", test_unichar_validate);
+  g_test_add_func ("/unicode/wide", test_wide);
+  g_test_add_func ("/unicode/xdigit", test_xdigit);
+  g_test_add_func ("/unicode/xdigit-value", test_xdigit_value);
+  g_test_add_func ("/unicode/zero-width", test_zerowidth);
 
   return g_test_run();
 }
diff --git a/gmodule/.gitignore b/gmodule/.gitignore
deleted file mode 100644
index e44c5c646..000000000
--- a/gmodule/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gmoduleconf.h
diff --git a/gobject/.gitignore b/gobject/.gitignore
deleted file mode 100644
index 76cf28264..000000000
--- a/gobject/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-glib-genmarshal
-glib-mkenums
-gmarshal.strings
-gobject-query
-testgobject
-libgobject-gdb.py
-gobject_probes.h
-gobject-public-headers.txt
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index e4ebebeeb..c90bb480b 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -37,13 +37,24 @@
  * @see_also: #GParamSpecBoxed, g_param_spec_boxed()
  * @title: Boxed Types
  *
- * GBoxed is a generic wrapper mechanism for arbitrary C structures. The only
- * thing the type system needs to know about the structures is how to copy and
- * free them, beyond that they are treated as opaque chunks of memory.
+ * #GBoxed is a generic wrapper mechanism for arbitrary C structures. The only
+ * thing the type system needs to know about the structures is how to copy them
+ * (a #GBoxedCopyFunc) and how to free them (a #GBoxedFreeFunc) — beyond that
+ * they are treated as opaque chunks of memory.
  *
  * Boxed types are useful for simple value-holder structures like rectangles or
- * points. They can also be used for wrapping structures defined in non-GObject
- * based libraries.
+ * points. They can also be used for wrapping structures defined in non-#GObject
+ * based libraries. They allow arbitrary structures to be handled in a uniform
+ * way, allowing uniform copying (or referencing) and freeing (or unreferencing)
+ * of them, and uniform representation of the type of the contained structure.
+ * In turn, this allows any type which can be boxed to be set as the data in a
+ * #GValue, which allows for polymorphic handling of a much wider range of data
+ * types, and hence usage of such types as #GObject property values.
+ *
+ * #GBoxed is designed so that reference counted types can be boxed. Use the
+ * type’s ‘ref’ function as the #GBoxedCopyFunc, and its ‘unref’ function as the
+ * #GBoxedFreeFunc. For example, for #GBytes, the #GBoxedCopyFunc is
+ * g_bytes_ref(), and the #GBoxedFreeFunc is g_bytes_unref().
  */
 
 static inline void              /* keep this function in sync with gvalue.c */
diff --git a/gobject/gobject.c b/gobject/gobject.c
index d709a1938..c95311b3e 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -53,6 +53,13 @@
  *
  * ## Floating references # {#floating-ref}
  *
+ * **Note**: Floating references are a C convenience API and should not be
+ * used in modern GObject code. Language bindings in particular find the
+ * concept highly problematic, as floating references are not identifiable
+ * through annotations, and neither are deviations from the floating reference
+ * behavior, like types that inherit from #GInitiallyUnowned and still return
+ * a full reference from g_object_new().
+ *
  * GInitiallyUnowned is derived from GObject. The only difference between
  * the two is that the initial reference of a GInitiallyUnowned is flagged
  * as a "floating" reference. This means that it is not specifically
@@ -83,7 +90,23 @@
  * Since floating references are useful almost exclusively for C convenience,
  * language bindings that provide automated reference and memory ownership
  * maintenance (such as smart pointers or garbage collection) should not
- * expose floating references in their API.
+ * expose floating references in their API. The best practice for handling
+ * types that have initially floating references is to immediately sink those
+ * references after g_object_new() returns, by checking if the #GType
+ * inherits from #GInitiallyUnowned. For instance:
+ *
+ * |[<!-- language="C" -->
+ * GObject *res = g_object_new_with_properties (gtype,
+ *                                              n_props,
+ *                                              prop_names,
+ *                                              prop_values);
+ *
+ * // or: if (g_type_is_a (gtype, G_TYPE_INITIALLY_UNOWNED))
+ * if (G_IS_INITIALLY_UNOWNED (res))
+ *   g_object_ref_sink (res);
+ *
+ * return res;
+ * ]|
  *
  * Some object implementations may need to save an objects floating state
  * across certain code portions (an example is #GtkMenu), to achieve this,
@@ -813,7 +836,7 @@ g_object_class_find_property (GObjectClass *class,
  * g_object_interface_find_property:
  * @g_iface: (type GObject.TypeInterface): any interface vtable for the
  *  interface, or the default vtable for the interface
- * @property_name: name of a property to lookup.
+ * @property_name: name of a property to look up.
  *
  * Find the #GParamSpec with the given name for an
  * interface. Generally, the interface vtable passed in as @g_iface
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 76f1dc93c..551780327 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1243,13 +1243,13 @@ g_signal_lookup (const gchar *name,
     {
       /* give elaborate warnings */
       if (!g_type_name (itype))
-	g_warning (G_STRLOC ": unable to lookup signal \"%s\" for invalid type id '%"G_GSIZE_FORMAT"'",
+	g_warning (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GSIZE_FORMAT"'",
 		   name, itype);
       else if (!G_TYPE_IS_INSTANTIATABLE (itype))
-	g_warning (G_STRLOC ": unable to lookup signal \"%s\" for non instantiatable type '%s'",
+	g_warning (G_STRLOC ": unable to look up signal \"%s\" for non instantiatable type '%s'",
 		   name, g_type_name (itype));
       else if (!g_type_class_peek (itype))
-	g_warning (G_STRLOC ": unable to lookup signal \"%s\" of unloaded type '%s'",
+	g_warning (G_STRLOC ": unable to look up signal \"%s\" of unloaded type '%s'",
 		   name, g_type_name (itype));
     }
   
@@ -3893,3 +3893,33 @@ g_signal_accumulator_first_wins (GSignalInvocationHint *ihint,
   g_value_copy (handler_return, return_accu);
   return FALSE;
 }
+
+/**
+ * g_clear_signal_handler:
+ * @handler_id_ptr: A pointer to a handler ID (of type #gulong) of the handler to be disconnected.
+ * @instance: (type GObject.Object): The instance to remove the signal handler from.
+ *
+ * Disconnects a handler from @instance so it will not be called during
+ * any future or currently ongoing emissions of the signal it has been
+ * connected to. The @handler_id_ptr is then set to zero, which is never a valid handler ID value (see g_signal_connect()).
+ *
+ * If the handler ID is 0 then this function does nothing.
+ *
+ * A macro is also included that allows this function to be used without
+ * pointer casts.
+ *
+ * Since: 2.62
+ */
+#undef g_clear_signal_handler
+void
+g_clear_signal_handler (gulong   *handler_id_ptr,
+                        gpointer  instance)
+{
+  g_return_if_fail (handler_id_ptr != NULL);
+
+  if (*handler_id_ptr != 0)
+    {
+      g_signal_handler_disconnect (instance, *handler_id_ptr);
+      *handler_id_ptr = 0;
+    }
+}
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index 97f847944..7825a863b 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -436,6 +436,21 @@ guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
 					       gpointer		  func,
 					       gpointer		  data);
 
+GLIB_AVAILABLE_IN_2_62
+void	 g_clear_signal_handler		      (gulong            *handler_id_ptr,
+					       gpointer           instance);
+
+#define  g_clear_signal_handler(handler_id_ptr, instance)           \
+  G_STMT_START {                                                    \
+    G_STATIC_ASSERT (sizeof *(handler_id_ptr) == sizeof (gulong));  \
+    gulong _handler_id = *(handler_id_ptr);                         \
+                                                                    \
+    if (_handler_id > 0)                                            \
+      {                                                             \
+        g_signal_handler_disconnect ((instance), _handler_id);      \
+        *(handler_id_ptr) = 0;                                      \
+      }                                                             \
+  } G_STMT_END
 
 /* --- overriding and chaining --- */
 GLIB_AVAILABLE_IN_ALL
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 8a60105e8..67a1eda8b 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -3337,9 +3337,9 @@ g_type_qname (GType type)
 
 /**
  * g_type_from_name:
- * @name: type name to lookup
+ * @name: type name to look up
  *
- * Lookup the type ID from a given type name, returning 0 if no type
+ * Look up the type ID from a given type name, returning 0 if no type
  * has been registered under this name (this is the preferred method
  * to find out by name whether a specific type has been registered
  * yet).
diff --git a/gobject/meson.build b/gobject/meson.build
index db8d3c4e9..81dcffda5 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -166,4 +166,8 @@ if enable_systemtap
     install : true)
 endif
 
-subdir('tests')
+# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
+build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
+if build_tests
+  subdir('tests')
+endif
\ No newline at end of file
diff --git a/gobject/tests/autoptr.c b/gobject/tests/autoptr.c
index 544938fbd..cf7687d84 100644
--- a/gobject/tests/autoptr.c
+++ b/gobject/tests/autoptr.c
@@ -159,6 +159,39 @@ test_autoslist (void)
   g_assert_null (tac3);
 }
 
+/* Verify that an object declared with G_DECLARE_FINAL_TYPE provides by default
+ * autoqueue cleanup functions (defined using the ones of the base type declared
+ * with G_DECLARE_DERIVABLE_TYPE) and so that can be used with g_autoqueue, and
+ * that freeing the queue correctly unrefs the object too */
+static void
+test_autoqueue (void)
+{
+  TestAutoCleanup *tac1 = test_auto_cleanup_new ();
+  TestAutoCleanup *tac2 = test_auto_cleanup_new ();
+  g_autoptr (TestAutoCleanup) tac3 = test_auto_cleanup_new ();
+
+  g_object_add_weak_pointer (G_OBJECT (tac1), (gpointer *) &tac1);
+  g_object_add_weak_pointer (G_OBJECT (tac2), (gpointer *) &tac2);
+  g_object_add_weak_pointer (G_OBJECT (tac3), (gpointer *) &tac3);
+
+  {
+    g_autoqueue (TestAutoCleanup) q = g_queue_new ();
+
+    g_queue_push_head (q, tac1);
+    g_queue_push_tail (q, tac2);
+  }
+
+  /* Only assert if autoptr works */
+#ifdef __GNUC__
+  g_assert_null (tac1);
+  g_assert_null (tac2);
+#endif
+  g_assert_nonnull (tac3);
+
+  g_clear_object (&tac3);
+  g_assert_null (tac3);
+}
+
 int
 main (int argc, gchar *argv[])
 {
@@ -168,6 +201,7 @@ main (int argc, gchar *argv[])
   g_test_add_func ("/autoptr/autoptr_steal", test_autoptr_steal);
   g_test_add_func ("/autoptr/autolist", test_autolist);
   g_test_add_func ("/autoptr/autoslist", test_autoslist);
+  g_test_add_func ("/autoptr/autoqueue", test_autoqueue);
 
   return g_test_run ();
 }
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 9d08d0a34..7c3e5cd9d 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -103,8 +103,7 @@ foreach test_name, extra_args : gobject_tests
     timeout = timeout * 10
   endif
 
-  test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
-    args: ['--tap'])
+  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
 endforeach
 
 test(
diff --git a/gobject/tests/signals.c b/gobject/tests/signals.c
index 23dd49d62..63ce86ea1 100644
--- a/gobject/tests/signals.c
+++ b/gobject/tests/signals.c
@@ -1245,6 +1245,37 @@ test_signal_disconnect_wrong_object (void)
   g_object_unref (object3);
 }
 
+static void
+test_clear_signal_handler (void)
+{
+  GObject *test_obj;
+  gulong handler;
+
+  test_obj = g_object_new (test_get_type (), NULL);
+
+  handler = g_signal_connect (test_obj, "simple", G_CALLBACK (dont_reach), NULL);
+  g_assert_cmpuint (handler, >, 0);
+
+  g_clear_signal_handler (&handler, test_obj);
+  g_assert_cmpuint (handler, ==, 0);
+
+  g_signal_emit_by_name (test_obj, "simple");
+
+  g_clear_signal_handler (&handler, test_obj);
+
+  if (g_test_undefined ())
+    {
+      handler = g_random_int_range (0x01, 0xFF);
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+                             "*instance '0x* has no handler with id *'");
+      g_clear_signal_handler (&handler, test_obj);
+      g_assert_cmpuint (handler, ==, 0);
+      g_test_assert_expected_messages ();
+    }
+
+  g_object_unref (test_obj);
+}
+
 /* --- */
 
 int
@@ -1270,6 +1301,7 @@ main (int argc,
   g_test_add_func ("/gobject/signals/stop-emission", test_stop_emission);
   g_test_add_func ("/gobject/signals/invocation-hint", test_invocation_hint);
   g_test_add_func ("/gobject/signals/test-disconnection-wrong-object", test_signal_disconnect_wrong_object);
+  g_test_add_func ("/gobject/signals/clear-signal-handler", test_clear_signal_handler);
 
   return g_test_run ();
 }
diff --git a/meson.build b/meson.build
index 85433fb3b..6db3e8fe6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('glib', 'c', 'cpp',
-  version : '2.61.0',
+  version : '2.61.1',
   meson_version : '>= 0.48.0',
   default_options : [
     'buildtype=debugoptimized',
@@ -198,7 +198,7 @@ if host_system == 'windows'
   glib_os = '''#define G_OS_WIN32
 #define G_PLATFORM_WIN32'''
 elif host_system == 'cygwin'
-  glib_os = '''#define G_OS_WIN32
+  glib_os = '''#define G_OS_UNIX
 #define G_WITH_CYGWIN'''
 else
   glib_os = '#define G_OS_UNIX'
@@ -593,7 +593,7 @@ if cc.has_header_symbol('dlfcn.h', 'RTLD_GLOBAL')
 endif
 
 have_rtld_next = false
-if cc.has_header_symbol('dlfcn.h', 'RTLD_NEXT')
+if cc.has_header_symbol('dlfcn.h', 'RTLD_NEXT', args: '-D_GNU_SOURCE')
   have_rtld_next = true
   glib_conf.set('HAVE_RTLD_NEXT', 1)
 endif
@@ -1002,20 +1002,20 @@ if cc.links('''#ifndef _GNU_SOURCE
               #include <langinfo.h>
                int main (int argc, char ** argv) {
                  char *str;
-                 str = nl_langinfo (_NL_ALTMON_1);
-                 str = nl_langinfo (_NL_ALTMON_2);
-                 str = nl_langinfo (_NL_ALTMON_3);
-                 str = nl_langinfo (_NL_ALTMON_4);
-                 str = nl_langinfo (_NL_ALTMON_5);
-                 str = nl_langinfo (_NL_ALTMON_6);
-                 str = nl_langinfo (_NL_ALTMON_7);
-                 str = nl_langinfo (_NL_ALTMON_8);
-                 str = nl_langinfo (_NL_ALTMON_9);
-                 str = nl_langinfo (_NL_ALTMON_10);
-                 str = nl_langinfo (_NL_ALTMON_11);
-                 str = nl_langinfo (_NL_ALTMON_12);
+                 str = nl_langinfo (_NL_ABALTMON_1);
+                 str = nl_langinfo (_NL_ABALTMON_2);
+                 str = nl_langinfo (_NL_ABALTMON_3);
+                 str = nl_langinfo (_NL_ABALTMON_4);
+                 str = nl_langinfo (_NL_ABALTMON_5);
+                 str = nl_langinfo (_NL_ABALTMON_6);
+                 str = nl_langinfo (_NL_ABALTMON_7);
+                 str = nl_langinfo (_NL_ABALTMON_8);
+                 str = nl_langinfo (_NL_ABALTMON_9);
+                 str = nl_langinfo (_NL_ABALTMON_10);
+                 str = nl_langinfo (_NL_ABALTMON_11);
+                 str = nl_langinfo (_NL_ABALTMON_12);
                  return 0;
-               }''', name : 'nl_langinfo (_NL_ALTMON_n)')
+               }''', name : 'nl_langinfo (_NL_ABALTMON_n)')
   glib_conf.set('HAVE_LANGINFO_ABALTMON', 1)
 endif
 
@@ -2045,7 +2045,11 @@ subdir('gthread')
 subdir('gmodule')
 subdir('gio')
 subdir('fuzzing')
-subdir('tests')
+# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
+build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
+if build_tests
+  subdir('tests')
+endif
 
 # xgettext is optional (on Windows for instance)
 if find_program('xgettext', required : get_option('nls')).found()
diff --git a/po/.gitignore b/po/.gitignore
deleted file mode 100644
index d17ff3548..000000000
--- a/po/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-POTFILES
-*.gmo
-glib20.pot
diff --git a/po/ca.po b/po/ca.po
index 078d64719..4d7ed9166 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,16 +12,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
-"POT-Creation-Date: 2019-02-12 14:26+0000\n"
-"PO-Revision-Date: 2019-02-21 17:05+0100\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"POT-Creation-Date: 2019-03-05 18:03+0000\n"
+"PO-Revision-Date: 2019-04-17 18:01+0200\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Project-Style: gnome\n"
 
 #: gio/gapplication.c:499
@@ -162,7 +162,8 @@ msgstr ""
 msgid "Usage:\n"
 msgstr "Forma d'ús:\n"
 
-#: gio/gapplication-tool.c:114 gio/gresource-tool.c:558 gio/gsettings-tool.c:696
+#: gio/gapplication-tool.c:114 gio/gresource-tool.c:558
+#: gio/gsettings-tool.c:696
 msgid "Arguments:\n"
 msgstr "Arguments:\n"
 
@@ -391,7 +392,8 @@ msgstr "L'entrada d'adreça «%s» té una parella clau/valor que no té sentit"
 #: gio/gdbusaddress.c:261 gio/gdbusaddress.c:342
 #, c-format
 msgid "Error in address “%s” — the port attribute is malformed"
-msgstr "Hi ha un error a l'adreça «%s»: l'atribut del port no està ben formatat"
+msgstr ""
+"Hi ha un error a l'adreça «%s»: l'atribut del port no està ben formatat"
 
 #: gio/gdbusaddress.c:272 gio/gdbusaddress.c:353
 #, c-format
@@ -560,8 +562,8 @@ msgstr "S'ha trobat una inesperada falta de contingut en llegir una línia"
 #: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr ""
-"S'ha trobat una inesperada falta de contingut en llegir (de forma segura) una "
-"línia"
+"S'ha trobat una inesperada falta de contingut en llegir (de forma segura) "
+"una línia"
 
 #: gio/gdbusauth.c:481
 #, c-format
@@ -583,7 +585,8 @@ msgstr "S'ha produït un error en obtenir la informació del directori «%s»: %
 
 #: gio/gdbusauthmechanismsha1.c:274
 #, c-format
-msgid "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
+msgid ""
+"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
 msgstr ""
 "Els permisos del directori «%s» no estan ben formatats. S'esperava el mode "
 "0700 però s'ha obtingut el 0%o"
@@ -618,8 +621,8 @@ msgstr ""
 msgid ""
 "Second token of line %d of the keyring at “%s” with content “%s” is malformed"
 msgstr ""
-"El segon testimoni de la línia %d de l'anell de claus a «%s» amb el contingut "
-"«%s» no està ben formatat"
+"El segon testimoni de la línia %d de l'anell de claus a «%s» amb el "
+"contingut «%s» no està ben formatat"
 
 #: gio/gdbusauthmechanismsha1.c:421
 #, c-format
@@ -651,7 +654,8 @@ msgstr "S'ha produït un error en desenllaçar el fitxer de blocatge «%s»: %s"
 #: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s” for writing: "
-msgstr "S'ha produït un error en obrir l'anell de claus «%s» per a escriptura: "
+msgstr ""
+"S'ha produït un error en obrir l'anell de claus «%s» per a escriptura: "
 
 #: gio/gdbusauthmechanismsha1.c:850
 #, c-format
@@ -668,19 +672,22 @@ msgid "Timeout was reached"
 msgstr "S'ha esgotat el temps d'espera"
 
 #: gio/gdbusconnection.c:2518
-msgid "Unsupported flags encountered when constructing a client-side connection"
+msgid ""
+"Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
 "S'han trobat senyaladors no implementats en construir-se la part de la "
 "connexió del client"
 
 #: gio/gdbusconnection.c:4147 gio/gdbusconnection.c:4494
 #, 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"
 msgstr ""
 "No existeix la interfície «org.freedesktop.DBus.Properties» en l'objecte al "
 "camí %s"
 
 #: gio/gdbusconnection.c:4289
+#, c-format
 msgid "No such property “%s”"
 msgstr "No existeix la propietat «%s»"
 
@@ -691,7 +698,6 @@ msgstr "La propietat «%s» no és de lectura"
 
 #: gio/gdbusconnection.c:4312
 #, c-format
-#| msgid "Property '%s' is not writable"
 msgid "Property “%s” is not writable"
 msgstr "La propietat «%s» no és d'escriptura"
 
@@ -699,8 +705,8 @@ msgstr "La propietat «%s» no és d'escriptura"
 #, c-format
 msgid "Error setting property “%s”: Expected type “%s” but got “%s”"
 msgstr ""
-"S'ha produït un error en establir la propietat «%s»: s'esperava el tipus «%s» "
-"però s'ha obtingut el «%s»"
+"S'ha produït un error en establir la propietat «%s»: s'esperava el tipus "
+"«%s» però s'ha obtingut el «%s»"
 
 #: gio/gdbusconnection.c:4437 gio/gdbusconnection.c:4645
 #: gio/gdbusconnection.c:6614
@@ -802,13 +808,14 @@ msgstr[1] "Es volien llegir %lu bytes però només s'han rebut %lu"
 #, c-format
 msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr ""
-"S'esperava el byte «NUL» després de la cadena «%s» però s'ha trobat el byte %d"
+"S'esperava el byte «NUL» després de la cadena «%s» però s'ha trobat el byte "
+"%d"
 
 #: gio/gdbusmessage.c:1395
 #, 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”"
+"Expected valid UTF-8 string but found invalid bytes at byte offset %d "
+"(length of string is %d). The valid UTF-8 string up until that point was “%s”"
 msgstr ""
 "S'esperava una cadena UTF-8 vàlida però s'han trobat bytes no vàlids a "
 "l'òfset %d (la llargada de la cadena és %d). La cadena UTF-8 vàlida fins "
@@ -843,8 +850,8 @@ 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'ha trobat una matriu de tipus «a%c» que s'esperava que tingués una llargada "
-"múltiple de %u bytes, però en realitat és de %u bytes"
+"S'ha trobat una matriu de tipus «a%c» que s'esperava que tingués una "
+"llargada múltiple de %u bytes, però en realitat és de %u bytes"
 
 #: gio/gdbusmessage.c:1857
 #, c-format
@@ -862,11 +869,11 @@ msgstr ""
 #: gio/gdbusmessage.c:2066
 #, c-format
 msgid ""
-"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value 0x"
-"%02x"
+"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value "
+"0x%02x"
 msgstr ""
-"Valor d'ordenació de bits (endianness) no vàlid. S'esperava 0x6c («l») o 0x42 "
-"(«B») però s'ha trobat el valor 0x%02x"
+"Valor d'ordenació de bits (endianness) no vàlid. S'esperava 0x6c («l») o "
+"0x42 («B») però s'ha trobat el valor 0x%02x"
 
 #: gio/gdbusmessage.c:2079
 #, c-format
@@ -917,7 +924,8 @@ msgstr ""
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
 msgstr ""
-"El nombre de descriptors de fitxer al missatge (%d) difereix del camp de la capçalera (%d)"
+"El nombre de descriptors de fitxer al missatge (%d) difereix del camp de la "
+"capçalera (%d)"
 
 #: gio/gdbusmessage.c:2686
 msgid "Cannot serialize message: "
@@ -933,7 +941,8 @@ msgstr ""
 #: gio/gdbusmessage.c:2749
 #, c-format
 msgid ""
-"Message body has type signature “%s” but signature in the header field is “%s”"
+"Message body has type signature “%s” but signature in the header field is "
+"“%s”"
 msgstr ""
 "El cos del missatge té el tipus de signatura «%s» però la signatura en el "
 "camp de la capçalera és «%s»"
@@ -961,7 +970,8 @@ msgstr "No s'ha pogut obtenir el perfil de maquinari: %s"
 
 #: gio/gdbusprivate.c:2120
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
-msgstr "No s'ha pogut carregar «/var/lib/dbus/machine-id» o «/etc/machine-id»: "
+msgstr ""
+"No s'ha pogut carregar «/var/lib/dbus/machine-id» o «/etc/machine-id»: "
 
 #: gio/gdbusproxy.c:1617
 #, c-format
@@ -982,8 +992,8 @@ msgid ""
 "and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
 msgstr ""
 "No es pot invocar el mètode: el servidor intermediari és per a un nom ben "
-"conegut %s sense cap propietari i el servidor intermediari s'ha construït amb "
-"el senyalador «G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START»"
+"conegut %s sense cap propietari i el servidor intermediari s'ha construït "
+"amb el senyalador «G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START»"
 
 #: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
@@ -1202,7 +1212,8 @@ msgstr "Error: el nom del mètode «%s» no és vàlid\n"
 #: gio/gdbus-tool.c:1132
 #, c-format
 msgid "Error parsing parameter %d of type “%s”: %s\n"
-msgstr "S'ha produït un error en analitzar el paràmetre %d del tipus «%s»: %s\n"
+msgstr ""
+"S'ha produït un error en analitzar el paràmetre %d del tipus «%s»: %s\n"
 
 #: gio/gdbus-tool.c:1576
 msgid "Destination name to introspect"
@@ -1242,7 +1253,9 @@ msgstr "Fes el seguiment a un objecte remot."
 
 #: gio/gdbus-tool.c:1954
 msgid "Error: can’t monitor a non-message-bus connection\n"
-msgstr "Error: no es pot fer un seguiment d'una connexió que no sigui de missatges del bus\n"
+msgstr ""
+"Error: no es pot fer un seguiment d'una connexió que no sigui de missatges "
+"del bus\n"
 
 #: gio/gdbus-tool.c:2078
 msgid "Service to activate before waiting for the other one (well-known name)"
@@ -1425,7 +1438,8 @@ msgstr "S'ha produït un error en empalmar el fitxer: %s"
 
 #: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
-msgstr "No està implementada la còpia (referències, clonacions) entre muntatges"
+msgstr ""
+"No està implementada la còpia (referències, clonacions) entre muntatges"
 
 #: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
@@ -1459,14 +1473,15 @@ msgstr "el volum no implementa el muntatge"
 
 #: gio/gfile.c:6884 gio/gfile.c:6930
 msgid "No application is registered as handling this file"
-msgstr "No hi ha cap aplicació que s'hagi registrat per gestionar aquest fitxer"
+msgstr ""
+"No hi ha cap aplicació que s'hagi registrat per gestionar aquest fitxer"
 
 #: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "L'enumerador està tancat"
 
-#: 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'enumerador de fitxer té una operació pendent"
 
@@ -1483,8 +1498,9 @@ msgstr "No es pot gestionar la versió %d de la codificació del GFileIcon"
 msgid "Malformed input data for GFileIcon"
 msgstr "Les dades d'entrada pel GFileIcon no són formades correctament"
 
-#: 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 flux no implementa «query_info»"
 
@@ -2317,7 +2333,9 @@ msgstr "Es desconeix l'opció de processament «%s»"
 #: gio/glib-compile-resources.c:427
 #, c-format
 msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
-msgstr "s'ha demanat preprocessar %s, però %s no està configurat, i %s no està al PATH"
+msgstr ""
+"s'ha demanat preprocessar %s, però %s no està configurat, i %s no està al "
+"PATH"
 
 #: gio/glib-compile-resources.c:460
 #, c-format
@@ -2394,13 +2412,16 @@ msgstr "No exportis les funcions, declara-les com a «G_GNUC_INTERNAL»"
 
 #: gio/glib-compile-resources.c:748
 msgid ""
-"Don’t embed resource data in the C file; assume it's linked externally instead"
+"Don’t embed resource data in the C file; assume it's linked externally "
+"instead"
 msgstr ""
-"No incrusteu recursos de dades a un fitxer C; en comptes assumiu que està enllaçat externament"
+"No incrusteu recursos de dades a un fitxer C; en comptes assumiu que està "
+"enllaçat externament"
 
 #: gio/glib-compile-resources.c:749
 msgid "C identifier name used for the generated source code"
-msgstr "El nom de l'identificador de C que s'utilitzarà en el codi font generat"
+msgstr ""
+"El nom de l'identificador de C que s'utilitzarà en el codi font generat"
 
 #: gio/glib-compile-resources.c:775
 msgid ""
@@ -2543,9 +2564,11 @@ msgstr ""
 #: gio/glib-compile-schemas.c:583
 #, c-format
 msgid ""
-"<alias value='%s'/> given when “%s” is already a member of the enumerated type"
+"<alias value='%s'/> given when “%s” is already a member of the enumerated "
+"type"
 msgstr ""
-"s'ha especificat <alias value='%s'/> quan «%s» ja és membre del tipus enumerat"
+"s'ha especificat <alias value='%s'/> quan «%s» ja és membre del tipus "
+"enumerat"
 
 #: gio/glib-compile-schemas.c:589
 #, c-format
@@ -2597,7 +2620,8 @@ msgstr ""
 #: gio/glib-compile-schemas.c:829
 #, c-format
 msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted"
-msgstr "El nom «%s» no és vàlid: no es poden posar dos guionets seguits («--»)."
+msgstr ""
+"El nom «%s» no és vàlid: no es poden posar dos guionets seguits («--»)."
 
 #: gio/glib-compile-schemas.c:838
 #, c-format
@@ -2630,15 +2654,16 @@ msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
 "to modify value"
 msgstr ""
-"La <key name='%s'> emmascara la <key name='%s'> a <schema id='%s'>. Utilitzeu "
-"<override> per modificar-ne el valor."
+"La <key name='%s'> emmascara la <key name='%s'> a <schema id='%s'>. "
+"Utilitzeu <override> per modificar-ne el valor."
 
 #: 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 "L'atribut de la <key> ha de ser necessàriament «type», «enum» o «flags»"
+"Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
+"to <key>"
+msgstr ""
+"L'atribut de la <key> ha de ser necessàriament «type», «enum» o «flags»"
 
 #: gio/glib-compile-schemas.c:1003
 #, c-format
@@ -2705,8 +2730,8 @@ msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
 "does not extend “%s”"
 msgstr ""
-"El <schema id='%s' list-of='%s'> amplia el <schema id='%s' list-of='%s'> però "
-"«%s» no amplia «%s»"
+"El <schema id='%s' list-of='%s'> amplia el <schema id='%s' list-of='%s'> "
+"però «%s» no amplia «%s»"
 
 #: gio/glib-compile-schemas.c:1225
 #, c-format
@@ -2798,8 +2823,8 @@ msgid ""
 "cannot provide per-desktop overrides for localised key “%s” in schema "
 "“%s” (override file “%s”)"
 msgstr ""
-"no es pot proveir la sobreescriptura per escriptori de claus traduïdes «%s» a l'esquema "
-"«%s» (fitxer de sobreescriptura «%s»)"
+"no es pot proveir la sobreescriptura per escriptori de claus traduïdes «%s» "
+"a l'esquema «%s» (fitxer de sobreescriptura «%s»)"
 
 #: gio/glib-compile-schemas.c:2011
 #, c-format
@@ -2826,8 +2851,8 @@ msgstr ""
 #: 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"
+"override for key “%s” in schema “%s” in override file “%s” is not in the "
+"list of valid choices"
 msgstr ""
 "la sobreescriptura de la clau «%s» de l'esquema «%s» en el fitxer de "
 "sobreescriptura «%s» no és a la llista de valors vàlids"
@@ -2887,8 +2912,8 @@ msgstr "El nom del fitxer no és vàlid: %s"
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr ""
-"S'ha produït un error en obtenir la informació del sistema de fitxers per %s: "
-"%s"
+"S'ha produït un error en obtenir la informació del sistema de fitxers per "
+"%s: %s"
 
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
@@ -2945,7 +2970,9 @@ msgstr "No s'ha pogut trobar el directori superior per a la paperera %s"
 #: gio/glocalfile.c:2034
 #, c-format
 msgid "Trashing on system internal mounts is not supported"
-msgstr "No està implementat l'enviament a la paperera en muntatges interns del sistema"
+msgstr ""
+"No està implementat l'enviament a la paperera en muntatges interns del "
+"sistema"
 
 #: gio/glocalfile.c:2118 gio/glocalfile.c:2138
 #, c-format
@@ -3084,7 +3111,8 @@ msgstr "S'ha produït un error en establir el propietari: %s"
 msgid "symlink must be non-NULL"
 msgstr "l'enllaç simbòlic no pot ser nul"
 
-#: gio/glocalfileinfo.c:2307 gio/glocalfileinfo.c:2326 gio/glocalfileinfo.c:2337
+#: gio/glocalfileinfo.c:2307 gio/glocalfileinfo.c:2326
+#: gio/glocalfileinfo.c:2337
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "S'ha produït un error en establir l'enllaç simbòlic: %s"
@@ -3098,7 +3126,8 @@ msgstr ""
 #: gio/glocalfileinfo.c:2442
 #, c-format
 msgid "Error setting modification or access time: %s"
-msgstr "S'ha produït un error en establir el temps de modificació o d'accés: %s"
+msgstr ""
+"S'ha produït un error en establir el temps de modificació o d'accés: %s"
 
 #: gio/glocalfileinfo.c:2465
 msgid "SELinux context must be non-NULL"
@@ -3216,8 +3245,8 @@ msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
 msgstr ""
-"La quantitat de memòria necessària per processar l'escriptura és més gran que "
-"l'espai d'adreces disponible"
+"La quantitat de memòria necessària per processar l'escriptura és més gran "
+"que l'espai d'adreces disponible"
 
 #: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
@@ -3644,7 +3673,8 @@ msgstr ""
 "Ordres:\n"
 "  help                      Mostra aquesta informació\n"
 "  list-schemas              Llista els esquemes instal·lats\n"
-"  list-relocatable-schemas  Llista els esquemes que es poden canviar de lloc\n"
+"  list-relocatable-schemas  Llista els esquemes que es poden canviar de "
+"lloc\n"
 "  list-keys                 Llista les claus d'un esquema\n"
 "  list-children             Llista els fills d'un esquema\n"
 "  list-recursively          Llista les claus i els valors recursivament\n"
@@ -3676,7 +3706,8 @@ msgstr ""
 
 #: gio/gsettings-tool.c:699
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
-msgstr "  DIRECTORI_D'ESQUEMES Un directori on cercar-hi esquemes addicionals\n"
+msgstr ""
+"  DIRECTORI_D'ESQUEMES Un directori on cercar-hi esquemes addicionals\n"
 
 #: gio/gsettings-tool.c:707
 msgid ""
@@ -3762,8 +3793,8 @@ msgstr ""
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
-"No es poden realitzar operacions de datagrames a un sòcol que tingui un temps "
-"d'espera màxim establert."
+"No es poden realitzar operacions de datagrames a un sòcol que tingui un "
+"temps d'espera màxim establert."
 
 #: gio/gsocket.c:1943
 #, c-format
@@ -3903,16 +3934,17 @@ msgstr "No s'ha pogut connectar a %s: "
 msgid "Could not connect: "
 msgstr "No s'ha pogut connectar: "
 
-#: gio/gsocketclient.c:1032 gio/gsocketclient.c:1731
+#: gio/gsocketclient.c:1032 gio/gsocketclient.c:1749
 msgid "Unknown error on connect"
 msgstr "S'ha produït un error desconegut en connectar-se"
 
-#: gio/gsocketclient.c:1086 gio/gsocketclient.c:1640
+#: gio/gsocketclient.c:1086 gio/gsocketclient.c:1657
 msgid "Proxying over a non-TCP connection is not supported."
 msgstr ""
-"Encara no es pot fer de servidor intermediari d'una connexió que no sigui TCP."
+"Encara no es pot fer de servidor intermediari d'una connexió que no sigui "
+"TCP."
 
-#: gio/gsocketclient.c:1115 gio/gsocketclient.c:1666
+#: gio/gsocketclient.c:1115 gio/gsocketclient.c:1683
 #, c-format
 msgid "Proxy protocol “%s” is not supported."
 msgstr "El protocol del servidor intermediari «%s» no està implementat."
@@ -3966,7 +3998,8 @@ msgstr ""
 #: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
 msgstr ""
-"El protocol SOCKSv5 no permet un nom d'usuari o de contrasenya d'aquesta mida."
+"El protocol SOCKSv5 no permet un nom d'usuari o de contrasenya d'aquesta "
+"mida."
 
 #: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
@@ -4046,7 +4079,7 @@ msgid "Temporarily unable to resolve “%s”"
 msgstr "No s'ha pogut resoldre «%s» de forma temporal"
 
 #: gio/gthreadedresolver.c:663 gio/gthreadedresolver.c:840
-#: gio/gthreadedresolver.c:948
+#: gio/gthreadedresolver.c:950
 #, c-format
 msgid "Error resolving “%s”"
 msgstr "S'ha produït un error en resoldre «%s»"
@@ -4073,8 +4106,8 @@ msgstr "No s'ha pogut analitzar el certificat codificat amb PEM"
 
 #: gio/gtlspassword.c:111
 msgid ""
-"This is the last chance to enter the password correctly before your access is "
-"locked out."
+"This is the last chance to enter the password correctly before your access "
+"is locked out."
 msgstr ""
 "Últim intent per introduir la contrasenya correctament abans que se us "
 "bloquegi l'accés."
@@ -4083,8 +4116,8 @@ msgstr ""
 #. * displayed when more than one attempt is allowed.
 #: gio/gtlspassword.c:115
 msgid ""
-"Several passwords entered have been incorrect, and your access will be locked "
-"out after further failures."
+"Several passwords entered have been incorrect, and your access will be "
+"locked out after further failures."
 msgstr ""
 "S'han introduït diverses contrasenyes errònies i se us bloquejarà l'accés "
 "després de més intents."
@@ -4253,14 +4286,14 @@ msgstr "No s'esperava l'atribut «%s» per a l'element «%s»"
 msgid "Attribute “%s” of element “%s” not found"
 msgstr "No s'ha trobat l'atribut «%s» de l'element «%s»"
 
-#: glib/gbookmarkfile.c:1164 glib/gbookmarkfile.c:1229 glib/gbookmarkfile.c:1293
-#: glib/gbookmarkfile.c:1303
+#: 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 "No s'esperava l'etiqueta «%s», s'esperava «%s»"
 
-#: glib/gbookmarkfile.c:1189 glib/gbookmarkfile.c:1203 glib/gbookmarkfile.c:1271
-#: glib/gbookmarkfile.c:1317
+#: 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 "No s'esperava l'etiqueta «%s» dins «%s»"
@@ -4275,12 +4308,15 @@ msgstr ""
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Ja existeix una adreça d'interès per a l'URI «%s»"
 
-#: glib/gbookmarkfile.c: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:3699
+#: 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:3699
 #, c-format
 msgid "No bookmark found for URI “%s”"
 msgstr "No s'ha trobat cap adreça d'interès per a l'URI «%s»"
@@ -4902,8 +4938,8 @@ msgstr "No és un fitxer regular"
 msgid ""
 "Key file contains line “%s” which is not a key-value pair, group, or comment"
 msgstr ""
-"El fitxer de claus conté la línia «%s» que no és una parella clau-valor, grup "
-"o comentari"
+"El fitxer de claus conté la línia «%s» que no és una parella clau-valor, "
+"grup o comentari"
 
 #: glib/gkeyfile.c:1332
 #, c-format
@@ -4944,7 +4980,8 @@ msgstr ""
 
 #: glib/gkeyfile.c:1960 glib/gkeyfile.c:2076 glib/gkeyfile.c:2518
 #, c-format
-msgid "Key file contains key “%s” which has a value that cannot be interpreted."
+msgid ""
+"Key file contains key “%s” which has a value that cannot be interpreted."
 msgstr ""
 "El fitxer de claus conté la clau «%s», que té un valor que no es pot "
 "interpretar."
@@ -4955,8 +4992,8 @@ msgid ""
 "Key file contains key “%s” in group “%s” which has a value that cannot be "
 "interpreted."
 msgstr ""
-"El fitxer de claus conté la clau «%s» en el grup «%s», que té un valor que no "
-"es pot interpretar."
+"El fitxer de claus conté la clau «%s» en el grup «%s», que té un valor que "
+"no es pot interpretar."
 
 #: glib/gkeyfile.c:2814 glib/gkeyfile.c:2891
 #, c-format
@@ -5038,7 +5075,6 @@ msgstr "S'ha produït un error a la línia %d: %s"
 
 #: glib/gmarkup.c:690
 #, c-format
-#| msgid ""
 msgid ""
 "Failed to parse “%-.*s”, which should have been a digit inside a character "
 "reference (&#234; for example) — perhaps the digit is too large"
@@ -5053,8 +5089,8 @@ msgid ""
 "as &amp;"
 msgstr ""
 "La referència del caràcter no acaba amb un punt i coma. Segurament heu "
-"utilitzat un caràcter «&» sense intenció d'iniciar una entitat. Substituïu el "
-"caràcter «&» per &amp;"
+"utilitzat un caràcter «&» sense intenció d'iniciar una entitat. Substituïu "
+"el caràcter «&» per &amp;"
 
 #: glib/gmarkup.c:728
 #, c-format
@@ -5098,7 +5134,8 @@ msgstr ""
 #: glib/gmarkup.c:1270
 #, c-format
 msgid ""
-"Odd character “%s”, expected a “>” character to end the empty-element tag “%s”"
+"Odd character “%s”, expected a “>” character to end the empty-element tag "
+"“%s”"
 msgstr ""
 "S'ha trobat un caràcter estrany: «%s». S'esperava el caràcter «>» per tancar "
 "l'etiqueta d'element buit «%s»"
@@ -5137,8 +5174,8 @@ msgid ""
 "“%s” is not a valid character following the characters “</”; “%s” may not "
 "begin an element name"
 msgstr ""
-"«%s» no és un caràcter vàlid després dels caràcters «</»; «%s» no pot iniciar "
-"un nom d'element"
+"«%s» no és un caràcter vàlid després dels caràcters «</»; «%s» no pot "
+"iniciar un nom d'element"
 
 #: glib/gmarkup.c:1611
 #, c-format
@@ -5181,8 +5218,8 @@ msgstr ""
 #: glib/gmarkup.c:1815
 #, c-format
 msgid ""
-"Document ended unexpectedly, expected to see a close angle bracket ending the "
-"tag <%s/>"
+"Document ended unexpectedly, expected to see a close angle bracket ending "
+"the tag <%s/>"
 msgstr ""
 "El document ha acabat de manera inesperada. S'esperava trobar un símbol «>» "
 "que acabés l'etiqueta <%s/>."
@@ -5206,8 +5243,8 @@ msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
 msgstr ""
-"El document ha acabat de manera inesperada després d'un signe d'igual després "
-"d'un nom d'atribut. No hi ha cap valor d'atribut."
+"El document ha acabat de manera inesperada després d'un signe d'igual "
+"després d'un nom d'atribut. No hi ha cap valor d'atribut."
 
 #: glib/gmarkup.c:1845
 msgid "Document ended unexpectedly while inside an attribute value"
@@ -5221,7 +5258,8 @@ msgstr ""
 "de l'element «%s»"
 
 #: glib/gmarkup.c:1866
-msgid "Document ended unexpectedly inside the close tag for an unopened element"
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
 msgstr ""
 "El document ha acabat de manera inesperada enmig de l'etiqueta de tancament "
 "per un element no obert"
@@ -5311,7 +5349,8 @@ msgstr "s'ha arribat al límit de tornades enrere"
 #: glib/gregex.c:278 glib/gregex.c:286
 msgid "the pattern contains items not supported for partial matching"
 msgstr ""
-"el patró conté elements que no estan implementats en les concordances parcials"
+"el patró conté elements que no estan implementats en les concordances "
+"parcials"
 
 #: glib/gregex.c:280
 msgid "internal error"
@@ -5320,7 +5359,8 @@ msgstr "error intern"
 #: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
-"no s'ha implementat l'ús de referències anteriors per a coincidències parcials"
+"no s'ha implementat l'ús de referències anteriors per a coincidències "
+"parcials"
 
 #: glib/gregex.c:297
 msgid "recursion limit reached"
@@ -5392,7 +5432,8 @@ msgstr "no es reconeix el caràcter després de «(?» o «(?-»"
 
 #: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
-msgstr "només es permeten les classes amb nom de POSIX dins de la pròpia classe"
+msgstr ""
+"només es permeten les classes amb nom de POSIX dins de la pròpia classe"
 
 #: glib/gregex.c:366
 msgid "missing terminating )"
@@ -5872,28 +5913,24 @@ msgstr "%.1f kB"
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2341
 #, c-format
-#| msgid "%.1f MB"
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2343
 #, c-format
-#| msgid "%.1f GB"
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2345
 #, c-format
-#| msgid "%.1f TB"
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2347
 #, c-format
-#| msgid "%.1f PB"
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
@@ -5943,13 +5980,13 @@ msgstr "%.1f EiB"
 #: glib/gutils.c:2367
 #, c-format
 msgid "%.1f kb"
-msgstr "%.1f kB"
+msgstr "%.1f kb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2369
 #, c-format
 msgid "%.1f Mb"
-msgstr "%.1f MB"
+msgstr "%.1f Mb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2371
@@ -6002,14 +6039,12 @@ msgstr "%.1f Tib"
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2389
 #, c-format
-#| msgid "%.1f PiB"
 msgid "%.1f Pib"
-msgstr "%.1f PiB"
+msgstr "%.1f Pib"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
 #: glib/gutils.c:2391
 #, c-format
-#| msgid "%.1f EiB"
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
diff --git a/po/de.po b/po/de.po
index 98c50d012..9cb8221ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2719,7 +2719,7 @@ msgid ""
 "desktop/” or “/system/” are deprecated."
 msgstr ""
 "Warnung: Schema »%s« hat den Pfad »%s«. Mit »/apps/«, »/desktop/« oder »/"
-"system/« beginnende Pfade gelten jecoh als veraltet."
+"system/« beginnende Pfade gelten jedoch als veraltet."
 
 #: gio/glib-compile-schemas.c:1271
 #, c-format
diff --git a/po/es.po b/po/es.po
index f8d31b5a7..253763def 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
-"POT-Creation-Date: 2019-01-24 14:43+0000\n"
-"PO-Revision-Date: 2019-01-28 12:37+0100\n"
+"POT-Creation-Date: 2019-03-19 10:54+0000\n"
+"PO-Revision-Date: 2019-04-23 10:08+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.31.0\n"
+"X-Generator: Gtranslator 3.32.0\n"
 
 #: gio/gapplication.c:499
 msgid "GApplication options"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "APPID"
 msgstr "APPID"
 
-#: gio/gapplication-tool.c:70 gio/gapplication-tool.c:133 gio/gdbus-tool.c:90
+#: gio/gapplication-tool.c:70 gio/gapplication-tool.c:133 gio/gdbus-tool.c:91
 #: gio/gio-tool.c:224
 msgid "COMMAND"
 msgstr "COMANDO"
@@ -290,7 +290,7 @@ msgstr "El flujo ya se cerró"
 msgid "Truncate not supported on base stream"
 msgstr "No se soporta el truncado en el flujo base"
 
-#: gio/gcancellable.c:317 gio/gdbusconnection.c:1867 gio/gdbusprivate.c:1402
+#: gio/gcancellable.c:319 gio/gdbusconnection.c:1867 gio/gdbusprivate.c:1406
 #: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897
 #, c-format
 msgid "Operation was cancelled"
@@ -310,13 +310,13 @@ msgstr "No hay suficiente espacio en el destino"
 
 #: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848
 #: gio/gdatainputstream.c:1261 glib/gconvert.c:455 glib/gconvert.c:885
-#: glib/giochannel.c:1557 glib/giochannel.c:1599 glib/giochannel.c:2443
+#: glib/giochannel.c:1561 glib/giochannel.c:1603 glib/giochannel.c:2447
 #: 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:463 glib/gconvert.c:799
-#: glib/giochannel.c:1564 glib/giochannel.c:2455
+#: glib/giochannel.c:1568 glib/giochannel.c:2459
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Falló durante la conversión: %s"
@@ -325,7 +325,7 @@ msgstr "Falló durante la conversión: %s"
 msgid "Cancellable initialization not supported"
 msgstr "La inicialización cancelable no eestá soportada"
 
-#: gio/gcharsetconverter.c:456 glib/gconvert.c:328 glib/giochannel.c:1385
+#: gio/gcharsetconverter.c:456 glib/gconvert.c:328 glib/giochannel.c:1389
 #, c-format
 msgid "Conversion from character set “%s” to “%s” is not supported"
 msgstr ""
@@ -370,12 +370,18 @@ msgstr "No se soporta la burla de credenciales en este SO"
 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:154 gio/gdbusaddress.c:229 gio/gdbusaddress.c:310
 #, 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:168
+#, 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:177
 #, c-format
 msgid ""
 "Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"
@@ -383,33 +389,33 @@ msgstr ""
 "La dirección «%s» no es válida (se necesita exactamente una ruta, carpeta "
 "temporal o claves abstractas)"
 
-#: 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:244 gio/gdbusaddress.c:325
 #, c-format
 msgid "Error in address “%s” — the port attribute is malformed"
 msgstr "Error en la dirección «%s»; el atributo de puerto está mal formado"
 
-#: gio/gdbusaddress.c:272 gio/gdbusaddress.c:353
+#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:336
 #, 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:423 gio/gdbusaddress.c:673
+#: gio/gdbusaddress.c:406 gio/gdbusaddress.c:670
 #, c-format
 msgid "Unknown or unsupported transport “%s” for address “%s”"
 msgstr "Transporte «%s» desconocido o no soportado para la dirección «%s»"
 
-#: gio/gdbusaddress.c:467
+#: gio/gdbusaddress.c:450
 #, 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:488
+#: gio/gdbusaddress.c:459
+#, c-format
+msgid "Transport name in address element “%s” must not be empty"
+msgstr ""
+"El nombre del transporte en el elemento de dirección «%s» no debe estar vacío"
+
+#: gio/gdbusaddress.c:480
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
@@ -418,7 +424,18 @@ msgstr ""
 "El par clave/valor %d, «%s», en el elemento de dirección «%s», no contiene "
 "un signo de igual"
 
-#: gio/gdbusaddress.c:502
+#: gio/gdbusaddress.c:491
+#, c-format
+#| msgid ""
+#| "Key/Value pair %d, “%s”, in address element “%s” does not contain an "
+#| "equal sign"
+msgid ""
+"Key/Value pair %d, “%s”, in address element “%s” must not have an empty key"
+msgstr ""
+"El par clave/valor %d, «%s», en el elemento de dirección «%s», no debe "
+"contener una clave vacía"
+
+#: gio/gdbusaddress.c:505
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s”, in address element "
@@ -427,7 +444,7 @@ msgstr ""
 "Error al desescapar la clave o el valor en el par clave/valor %d, «%s», en "
 "el elemento de dirección «%s»"
 
-#: gio/gdbusaddress.c:580
+#: gio/gdbusaddress.c:577
 #, c-format
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
@@ -436,97 +453,86 @@ msgstr ""
 "Error en la dirección «%s»: el transporte UNIX requiere exactamente que una "
 "de las claves «path» o «abstract» esté establecida"
 
-#: gio/gdbusaddress.c:616
+#: gio/gdbusaddress.c:613
 #, 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:630
+#: gio/gdbusaddress.c:627
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr ""
 "Error en la dirección «%s»: falta o está mal formado el atributo para el "
 "puerto"
 
-#: gio/gdbusaddress.c:644
+#: gio/gdbusaddress.c:641
 #, 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:665
+#: gio/gdbusaddress.c:662
 msgid "Error auto-launching: "
 msgstr "Error al autolanzar: "
 
-#: gio/gdbusaddress.c:718
+#: gio/gdbusaddress.c:715
 #, 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:737
+#: gio/gdbusaddress.c:734
 #, 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:746
+#: gio/gdbusaddress.c:743
 #, 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:764
+#: gio/gdbusaddress.c:761
 #, 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:973
+#: gio/gdbusaddress.c:970
 msgid "The given address is empty"
 msgstr "La dirección proporcionada está vacía"
 
-#: gio/gdbusaddress.c:1086
+#: gio/gdbusaddress.c:1083
 #, 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:1093
+#: gio/gdbusaddress.c:1090
 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:1100
+#: gio/gdbusaddress.c:1097
 #, 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:1142
+#: gio/gdbusaddress.c:1139
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "Error al lanzar («spawn») el comando «%s»: "
 
-#: gio/gdbusaddress.c:1359
-#, c-format
-msgid "(Type any character to close this window)\n"
-msgstr "(Escriba un carácter cualquiera para cerrar esta ventana)\n"
-
-#: 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:1524
+#: gio/gdbusaddress.c:1208
 #, 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:1662 gio/gdbusconnection.c:7174
+#: gio/gdbusaddress.c:1346 gio/gdbusconnection.c:7174
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -535,7 +541,7 @@ msgstr ""
 "No se puede determinar la dirección del bus desde la variable de entorno "
 "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida"
 
-#: gio/gdbusaddress.c:1671 gio/gdbusconnection.c:7183
+#: gio/gdbusaddress.c:1355 gio/gdbusconnection.c:7183
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -543,7 +549,7 @@ msgstr ""
 "No se puede determinar la dirección del bus porque la variable de entorno "
 "DBUS_STARTER_BUS_TYPE no está establecida"
 
-#: gio/gdbusaddress.c:1681
+#: gio/gdbusaddress.c:1365
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Tipo de bus %d desconocido"
@@ -870,7 +876,7 @@ msgstr ""
 "La versión principal del protocolo no es válida. Se esperaba 1 pero se "
 "encontró %d."
 
-#: gio/gdbusmessage.c:2132 gio/gdbusmessage.c:2724
+#: gio/gdbusmessage.c:2132 gio/gdbusmessage.c:2727
 msgid "Signature header found but is not of type signature"
 msgstr "Cabecera de firma encontrada pero no es del tipo firma"
 
@@ -902,7 +908,7 @@ msgstr[1] ""
 msgid "Cannot deserialize message: "
 msgstr "No se puede deserializar el mensaje: "
 
-#: gio/gdbusmessage.c:2541
+#: gio/gdbusmessage.c:2544
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
@@ -910,7 +916,7 @@ msgstr ""
 "Error al serializar GVariant con el tipo de cadena «%s» al formato de "
 "mensaje de D-Bus"
 
-#: gio/gdbusmessage.c:2678
+#: gio/gdbusmessage.c:2681
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
@@ -918,17 +924,17 @@ msgstr ""
 "El número de descriptores de archivos en el mensaje (%d) es distinto del "
 "campo de cabecera (%d)"
 
-#: gio/gdbusmessage.c:2686
+#: gio/gdbusmessage.c:2689
 msgid "Cannot serialize message: "
 msgstr "No se puede serializar el mensaje: "
 
-#: gio/gdbusmessage.c:2740
+#: gio/gdbusmessage.c:2742
 #, 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:2750
+#: gio/gdbusmessage.c:2752
 #, c-format
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
@@ -937,42 +943,53 @@ msgstr ""
 "El cuerpo del mensaje tiene un tipo de firma «%s» pero la firma en el campo "
 "de cabecera es «%s»"
 
-#: gio/gdbusmessage.c:2766
+#: gio/gdbusmessage.c:2768
 #, 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:3319
+#: gio/gdbusmessage.c:3321
 #, c-format
 msgid "Error return with body of type “%s”"
 msgstr "Error al devolver el cuerpo de tipo «%s»"
 
-#: gio/gdbusmessage.c:3327
+#: gio/gdbusmessage.c:3329
 msgid "Error return with empty body"
 msgstr "Error al devolver un cuepro vacío"
 
-#: gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2233
+#, c-format
+msgid "(Type any character to close this window)\n"
+msgstr "(Escriba un carácter cualquiera para cerrar esta ventana)\n"
+
+#: gio/gdbusprivate.c:2407
+#, 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/gdbusprivate.c:2430
 #, 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:2475
 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:1611
+#: gio/gdbusproxy.c:1617
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Error al llamar StartSereviceByName para %s: "
 
-#: gio/gdbusproxy.c:1634
+#: gio/gdbusproxy.c:1640
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Respuesta %d no esperada del método StartServiceByName(«%s»)"
 
-#: gio/gdbusproxy.c:2734 gio/gdbusproxy.c:2869
+#: gio/gdbusproxy.c:2740 gio/gdbusproxy.c:2875
 #, c-format
 msgid ""
 "Cannot invoke method; proxy is for the well-known name %s without an owner, "
@@ -1007,7 +1024,7 @@ msgstr "La cadena «%s» no es un GUID válido de D-Bus"
 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:96
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1030,54 +1047,54 @@ msgstr ""
 "\n"
 "Use «%s COMANDO --help» para obtener ayuda de cada comando.\n"
 
-#: gio/gdbus-tool.c:185 gio/gdbus-tool.c:252 gio/gdbus-tool.c:324
-#: gio/gdbus-tool.c:348 gio/gdbus-tool.c:834 gio/gdbus-tool.c:1171
-#: gio/gdbus-tool.c:1613
+#: gio/gdbus-tool.c:186 gio/gdbus-tool.c:253 gio/gdbus-tool.c:325
+#: gio/gdbus-tool.c:349 gio/gdbus-tool.c:835 gio/gdbus-tool.c:1172
+#: gio/gdbus-tool.c:1614
 #, 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:197 gio/gdbus-tool.c:266 gio/gdbus-tool.c:1630
 #, 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:235
 #, 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:383
 msgid "Connect to the system bus"
 msgstr "Conectar con el bus del sistema"
 
-#: gio/gdbus-tool.c:383
+#: gio/gdbus-tool.c:384
 msgid "Connect to the session bus"
 msgstr "Conectar con el bus de sesión"
 
-#: gio/gdbus-tool.c:384
+#: gio/gdbus-tool.c:385
 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:395
 msgid "Connection Endpoint Options:"
 msgstr "Opciones de conexión del extremo:"
 
-#: gio/gdbus-tool.c:395
+#: gio/gdbus-tool.c:396
 msgid "Options specifying the connection endpoint"
 msgstr "Opciones para especificar la conexión del extremo:"
 
-#: gio/gdbus-tool.c:417
+#: gio/gdbus-tool.c:418
 #, 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:428
 #, 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:498
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s” does not exist\n"
@@ -1085,7 +1102,7 @@ msgstr ""
 "Advertencia: según la introspección de los datos, la interfaz «%s» no "
 "existe\n"
 
-#: gio/gdbus-tool.c:506
+#: gio/gdbus-tool.c:507
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s” does not exist on "
@@ -1094,162 +1111,162 @@ msgstr ""
 "Advertencia: según la introspección de los datos, el método «%s» no existe "
 "en la interfaz «%s»\n"
 
-#: gio/gdbus-tool.c:568
+#: gio/gdbus-tool.c:569
 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:570
 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:571
 msgid "Signal and interface name"
 msgstr "Nombres de la interfaz y señal"
 
-#: gio/gdbus-tool.c:603
+#: gio/gdbus-tool.c:604
 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:659 gio/gdbus-tool.c:966 gio/gdbus-tool.c:1716
+#: gio/gdbus-tool.c:1945 gio/gdbus-tool.c:2165
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Error al conectar: %s\n"
 
-#: gio/gdbus-tool.c:678
+#: gio/gdbus-tool.c:679
 #, 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
+#: gio/gdbus-tool.c:698 gio/gdbus-tool.c:1009 gio/gdbus-tool.c:1759
 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:721 gio/gdbus-tool.c:1029 gio/gdbus-tool.c:1779
+#: gio/gdbus-tool.c:2016
 #, 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
+#: gio/gdbus-tool.c:741
 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:755
 #, 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:767
 #, 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:773
 #, 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:810 gio/gdbus-tool.c:1141
 #, 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:842
 #, 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:869
 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:870
 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:871
 msgid "Method and interface name"
 msgstr "Nombre de la interfaz y método"
 
-#: gio/gdbus-tool.c:871
+#: gio/gdbus-tool.c:872
 msgid "Timeout in seconds"
 msgstr "Tiempo de expiración en segundos"
 
-#: gio/gdbus-tool.c:910
+#: gio/gdbus-tool.c:911
 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
+#: gio/gdbus-tool.c:983 gio/gdbus-tool.c:1733 gio/gdbus-tool.c:1970
 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:994 gio/gdbus-tool.c:1750 gio/gdbus-tool.c:1981
 #, 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
+#: gio/gdbus-tool.c:1044
 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:1055
 #, 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:1133
 #, 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:1577
 msgid "Destination name to introspect"
 msgstr "Nombre de destino que introspeccionar"
 
-#: gio/gdbus-tool.c:1577
+#: gio/gdbus-tool.c:1578
 msgid "Object path to introspect"
 msgstr "Ruta del objeto que introspeccionar"
 
-#: gio/gdbus-tool.c:1578
+#: gio/gdbus-tool.c:1579
 msgid "Print XML"
 msgstr "Imprimir XML"
 
-#: gio/gdbus-tool.c:1579
+#: gio/gdbus-tool.c:1580
 msgid "Introspect children"
 msgstr "Introspeccionar hijo"
 
-#: gio/gdbus-tool.c:1580
+#: gio/gdbus-tool.c:1581
 msgid "Only print properties"
 msgstr "Solo mostrar propiedades"
 
-#: gio/gdbus-tool.c:1667
+#: gio/gdbus-tool.c:1668
 msgid "Introspect a remote object."
 msgstr "Introspeccionar un objeto remoto."
 
-#: gio/gdbus-tool.c:1870
+#: gio/gdbus-tool.c:1871
 msgid "Destination name to monitor"
 msgstr "Nombre de destino para monitorizar"
 
-#: gio/gdbus-tool.c:1871
+#: gio/gdbus-tool.c:1872
 msgid "Object path to monitor"
 msgstr "Ruta objeto para monitorizar"
 
-#: gio/gdbus-tool.c:1896
+#: gio/gdbus-tool.c:1897
 msgid "Monitor a remote object."
 msgstr "Monitorizar un objeto remoto."
 
-#: gio/gdbus-tool.c:1954
+#: gio/gdbus-tool.c:1955
 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:2079
 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:2082
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1257,32 +1274,32 @@ msgstr ""
 "Tiempo que esperar antes de salir con un error (en segundos); 0 para que no "
 "haya tiempo de expiración (predeterminado)"
 
-#: gio/gdbus-tool.c:2129
+#: gio/gdbus-tool.c:2130
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPCIÓN…] NOMBRE-BUS"
 
-#: gio/gdbus-tool.c:2130
+#: gio/gdbus-tool.c:2131
 msgid "Wait for a bus name to appear."
 msgstr "Esperar a que aparezca el nombre del bus."
 
-#: gio/gdbus-tool.c:2206
+#: gio/gdbus-tool.c:2207
 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
+#: gio/gdbus-tool.c:2212
 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
+#: gio/gdbus-tool.c:2217
 msgid "Error: Too many arguments.\n"
 msgstr "Demasiados argumentos.\n"
 
-#: gio/gdbus-tool.c:2224 gio/gdbus-tool.c:2231
+#: gio/gdbus-tool.c:2225 gio/gdbus-tool.c:2232
 #, 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:2041 gio/gdesktopappinfo.c:4680
+#: gio/gdesktopappinfo.c:2041 gio/gdesktopappinfo.c:4822
 msgid "Unnamed"
 msgstr "Sin nombre"
 
@@ -1294,28 +1311,28 @@ msgstr "El archivo de escritorio no especificó el campo Exec"
 msgid "Unable to find terminal required for application"
 msgstr "Imposible encontrar el terminal requerido por la aplicación"
 
-#: gio/gdesktopappinfo.c:3222
+#: gio/gdesktopappinfo.c:3362
 #, 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:3226
+#: gio/gdesktopappinfo.c:3366
 #, 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:3466 gio/gdesktopappinfo.c:3490
+#: gio/gdesktopappinfo.c:3606 gio/gdesktopappinfo.c:3630
 msgid "Application information lacks an identifier"
 msgstr "La información de la aplicación carece de un identificador"
 
-#: gio/gdesktopappinfo.c:3724
+#: gio/gdesktopappinfo.c:3864
 #, 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:3858
+#: gio/gdesktopappinfo.c:3998
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Definición personalizada para %s"
@@ -1381,7 +1398,7 @@ msgstr "Se esperaba un GEmblem para GEmblemedIconjo"
 #: 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/gfile.c:5410 gio/gfile.c:8114 gio/gfile.c:8204 gio/gfile.c:8288
 #: gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Operación no soportada"
@@ -1394,7 +1411,7 @@ msgstr "Operación no soportada"
 msgid "Containing mount does not exist"
 msgstr "El punto de montaje contenido no existe"
 
-#: gio/gfile.c:2622 gio/glocalfile.c:2441
+#: gio/gfile.c:2622 gio/glocalfile.c:2446
 msgid "Can’t copy over directory"
 msgstr "No se puede copiar sobre la carpeta"
 
@@ -1452,7 +1469,7 @@ msgstr "Los nombres de archivo no pueden contener «%c»"
 msgid "volume doesn’t implement mount"
 msgstr "el volumen no implementa el montaje"
 
-#: gio/gfile.c:6882
+#: gio/gfile.c:6884 gio/gfile.c:6930
 msgid "No application is registered as handling this file"
 msgstr "No hay ninguna aplicación registrada para manejar este archivo"
 
@@ -1706,7 +1723,7 @@ msgstr "Error al escribir en la salida estándar"
 #: 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-monitor.c:203 gio/gio-tool-mount.c:1212 gio/gio-tool-open.c:70
 #: gio/gio-tool-remove.c:48 gio/gio-tool-rename.c:45 gio/gio-tool-set.c:89
 #: gio/gio-tool-trash.c:81 gio/gio-tool-tree.c:239
 msgid "LOCATION"
@@ -1727,7 +1744,7 @@ msgstr ""
 "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:1263 gio/gio-tool-open.c:139
+#: gio/gio-tool-monitor.c:228 gio/gio-tool-mount.c:1263 gio/gio-tool-open.c:96
 #: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "No se han proporcionado ubicaciones"
@@ -2137,7 +2154,7 @@ msgstr ""
 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:75
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
@@ -2274,7 +2291,7 @@ msgstr "Seguir enlaces simbólicos, puntos de montaje y atajos"
 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:1515
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1517
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "No se permite el elemento <%s> dentro de <%s>"
@@ -2331,7 +2348,7 @@ msgstr "Error al comprimir el archivo %s"
 msgid "text may not appear inside <%s>"
 msgstr "El texto no debe aparecer dentro de <%s>"
 
-#: gio/glib-compile-resources.c:737 gio/glib-compile-schemas.c:2139
+#: gio/glib-compile-resources.c:737 gio/glib-compile-schemas.c:2141
 msgid "Show program version and exit"
 msgstr "Mostrar la versión del programa y salir"
 
@@ -2347,8 +2364,8 @@ msgstr ""
 "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:739 gio/glib-compile-schemas.c:2140
-#: gio/glib-compile-schemas.c:2169
+#: gio/glib-compile-resources.c:739 gio/glib-compile-schemas.c:2142
+#: gio/glib-compile-schemas.c:2171
 msgid "DIRECTORY"
 msgstr "CARPETA"
 
@@ -2570,17 +2587,17 @@ msgstr "el alias del objetivo «%s» no está en <choices>"
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> debe contener al menos un <alias>"
 
-#: gio/glib-compile-schemas.c:798
+#: gio/glib-compile-schemas.c:800
 msgid "Empty names are not permitted"
 msgstr "No se permiten nombres vacíos"
 
-#: gio/glib-compile-schemas.c:808
+#: gio/glib-compile-schemas.c:810
 #, 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:820
+#: gio/glib-compile-schemas.c:822
 #, c-format
 msgid ""
 "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
@@ -2589,36 +2606,36 @@ msgstr ""
 "Nombre «%s» no válido: el carácter «%c» no es válido; sólo se permiten "
 "nombres en minúscula, números y guión («-»)"
 
-#: gio/glib-compile-schemas.c:829
+#: gio/glib-compile-schemas.c:831
 #, 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:838
+#: gio/glib-compile-schemas.c:840
 #, 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:846
+#: gio/glib-compile-schemas.c:848
 #, 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:918
+#: gio/glib-compile-schemas.c:920
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> ya especificado"
 
-#: gio/glib-compile-schemas.c:944
+#: gio/glib-compile-schemas.c:946
 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:955
+#: gio/glib-compile-schemas.c:957
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> ya especificada"
 
-#: gio/glib-compile-schemas.c:973
+#: gio/glib-compile-schemas.c:975
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2627,7 +2644,7 @@ msgstr ""
 "<key name='%s'> eclipsa a <key name='%s'> en <schema id='%s'>; use "
 "<override> para modificar el valor"
 
-#: gio/glib-compile-schemas.c:984
+#: gio/glib-compile-schemas.c:986
 #, c-format
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
@@ -2636,56 +2653,56 @@ msgstr ""
 "Se debe especificar exactamente uno de «type», «enum» o «flags» como "
 "atributo para <key>"
 
-#: gio/glib-compile-schemas.c:1003
+#: gio/glib-compile-schemas.c:1005
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> aún no especificado."
 
-#: gio/glib-compile-schemas.c:1018
+#: gio/glib-compile-schemas.c:1020
 #, c-format
 msgid "Invalid GVariant type string “%s”"
 msgstr "Tipo de cadena GVariant «%s» no válida"
 
-#: gio/glib-compile-schemas.c:1048
+#: gio/glib-compile-schemas.c:1050
 msgid "<override> given but schema isn’t extending anything"
 msgstr "Se proporcionó <override> pero el esquema no extiende nada"
 
-#: gio/glib-compile-schemas.c:1061
+#: gio/glib-compile-schemas.c:1063
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "No existe <key name='%s'> para sobrescribir"
 
-#: gio/glib-compile-schemas.c:1069
+#: gio/glib-compile-schemas.c:1071
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> ya especificada"
 
-#: gio/glib-compile-schemas.c:1142
+#: gio/glib-compile-schemas.c:1144
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> ya especificado"
 
-#: gio/glib-compile-schemas.c:1154
+#: gio/glib-compile-schemas.c:1156
 #, 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:1170
+#: gio/glib-compile-schemas.c:1172
 #, 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:1178
+#: gio/glib-compile-schemas.c:1180
 #, 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:1188
+#: gio/glib-compile-schemas.c:1190
 #, 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:1198
+#: gio/glib-compile-schemas.c:1200
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -2693,7 +2710,7 @@ msgstr ""
 "<schema id='%s'> es una lista, extendiendo <schema id='%s'> que no es una "
 "lista"
 
-#: gio/glib-compile-schemas.c:1208
+#: gio/glib-compile-schemas.c:1210
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
@@ -2702,17 +2719,17 @@ msgstr ""
 "<schema id='%s' list-of='%s'> extiende <schema id='%s' list-of='%s'> pero "
 "«%s» no extiende «%s»"
 
-#: gio/glib-compile-schemas.c:1225
+#: gio/glib-compile-schemas.c:1227
 #, 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:1232
+#: gio/glib-compile-schemas.c:1234
 #, 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:1241
+#: gio/glib-compile-schemas.c:1243
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2721,72 +2738,72 @@ msgstr ""
 "Advertencia: el esquema «%s» tiene la ruta «%s».  Las rutas que empiezan por "
 "«/apps/», «/desktop/» o «/system/» están obsoletas."
 
-#: gio/glib-compile-schemas.c:1271
+#: gio/glib-compile-schemas.c:1273
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> ya especificado"
 
-#: gio/glib-compile-schemas.c:1421 gio/glib-compile-schemas.c:1437
+#: gio/glib-compile-schemas.c:1423 gio/glib-compile-schemas.c:1439
 #, 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:1519
+#: gio/glib-compile-schemas.c:1521
 #, 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:1537
+#: gio/glib-compile-schemas.c:1539
 msgid "Element <default> is required in <key>"
 msgstr "Se requiere el elemento <default> en <key>"
 
-#: gio/glib-compile-schemas.c:1627
+#: gio/glib-compile-schemas.c:1629
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "El texto no debe aparecer dentro de <%s>"
 
-#: gio/glib-compile-schemas.c:1695
+#: gio/glib-compile-schemas.c:1697
 #, 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:1834 gio/glib-compile-schemas.c:1910
-#: gio/glib-compile-schemas.c:2025
+#: gio/glib-compile-schemas.c:1836 gio/glib-compile-schemas.c:1912
+#: gio/glib-compile-schemas.c:2027
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "se especificó --strict; saliendo.\n"
 
-#: gio/glib-compile-schemas.c:1844
+#: gio/glib-compile-schemas.c:1846
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Se ha ignorado este archivo completamente.\n"
 
-#: gio/glib-compile-schemas.c:1906
+#: gio/glib-compile-schemas.c:1908
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ignorando este archivo.\n"
 
-#: gio/glib-compile-schemas.c:1959
+#: gio/glib-compile-schemas.c:1961
 #, c-format
 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:1965 gio/glib-compile-schemas.c:1990
-#: gio/glib-compile-schemas.c:2050 gio/glib-compile-schemas.c:2079
+#: gio/glib-compile-schemas.c:1967 gio/glib-compile-schemas.c:1992
+#: gio/glib-compile-schemas.c:2052 gio/glib-compile-schemas.c:2081
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; ignorando la sobrescritura para esta clave.\n"
 
-#: gio/glib-compile-schemas.c:1969 gio/glib-compile-schemas.c:1994
-#: gio/glib-compile-schemas.c:2054 gio/glib-compile-schemas.c:2083
+#: gio/glib-compile-schemas.c:1971 gio/glib-compile-schemas.c:1996
+#: gio/glib-compile-schemas.c:2056 gio/glib-compile-schemas.c:2085
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr "y se especificó --strict; saliendo.\n"
 
-#: gio/glib-compile-schemas.c:1984
+#: gio/glib-compile-schemas.c:1986
 #, c-format
 msgid ""
 "cannot provide per-desktop overrides for localised key “%s” in schema "
@@ -2795,7 +2812,7 @@ 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
+#: gio/glib-compile-schemas.c:2013
 #, c-format
 msgid ""
 "error parsing key “%s” in schema “%s” as specified in override file “%s”: %s."
@@ -2803,12 +2820,12 @@ msgstr ""
 "error al analizar la clave «%s» en el esquema «%s» como se especificó en el "
 "archivo de sobrescritura «%s»: %s."
 
-#: gio/glib-compile-schemas.c:2021
+#: gio/glib-compile-schemas.c:2023
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Ignorando la sobrescritura para esta clave.\n"
 
-#: gio/glib-compile-schemas.c:2040
+#: gio/glib-compile-schemas.c:2042
 #, c-format
 msgid ""
 "override for key “%s” in schema “%s” in override file “%s” is outside the "
@@ -2817,7 +2834,7 @@ 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:2069
+#: gio/glib-compile-schemas.c:2071
 #, c-format
 msgid ""
 "override for key “%s” in schema “%s” in override file “%s” is not in the "
@@ -2826,23 +2843,23 @@ 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:2140
+#: gio/glib-compile-schemas.c:2142
 msgid "where to store the gschemas.compiled file"
 msgstr "dónde almacenar el archivo gschemas.compiled"
 
-#: gio/glib-compile-schemas.c:2141
+#: gio/glib-compile-schemas.c:2143
 msgid "Abort on any errors in schemas"
 msgstr "Abortar ante cualquier error en los esquemas"
 
-#: gio/glib-compile-schemas.c:2142
+#: gio/glib-compile-schemas.c:2144
 msgid "Do not write the gschema.compiled file"
 msgstr "No escribir el archivo gschemas.compiled"
 
-#: gio/glib-compile-schemas.c:2143
+#: gio/glib-compile-schemas.c:2145
 msgid "Do not enforce key name restrictions"
 msgstr "No forzar las restricciones de nombre de las claves"
 
-#: gio/glib-compile-schemas.c:2172
+#: gio/glib-compile-schemas.c:2174
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2853,32 +2870,32 @@ msgstr ""
 "Los archivos de esquema deben tener la extensión .gschema.xml,\n"
 "y el archivo de caché se llama gschemas.compiled."
 
-#: gio/glib-compile-schemas.c:2193
+#: gio/glib-compile-schemas.c:2195
 #, 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:2235
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "No schema files found: "
 msgstr "No se encontró ningún archivo de esquemas: "
 
-#: gio/glib-compile-schemas.c:2238
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "doing nothing.\n"
 msgstr "sin hacer nada.\n"
 
-#: gio/glib-compile-schemas.c:2241
+#: gio/glib-compile-schemas.c:2243
 #, 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:546 gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Nombre de archivo no válido %s"
 
-#: gio/glocalfile.c:1011
+#: gio/glocalfile.c:1013
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Error al obtener la información del sistema de archivos para %s: %s"
@@ -2887,224 +2904,224 @@ msgstr "Error al obtener la información del sistema de archivos para %s: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: gio/glocalfile.c:1150
+#: gio/glocalfile.c:1152
 #, 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:1173
+#: gio/glocalfile.c:1175
 msgid "Can’t rename root directory"
 msgstr "No se puede renombrar la carpeta raíz"
 
-#: gio/glocalfile.c:1191 gio/glocalfile.c:1214
+#: gio/glocalfile.c:1193 gio/glocalfile.c:1216
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Error al leer el archivo %s: %s"
 
-#: gio/glocalfile.c:1198
+#: gio/glocalfile.c:1200
 msgid "Can’t rename file, filename already exists"
 msgstr "No se puede renombrar el archivo, el nombre de archivo ya existe"
 
-#: gio/glocalfile.c:1211 gio/glocalfile.c:2317 gio/glocalfile.c:2345
-#: gio/glocalfile.c:2502 gio/glocalfileoutputstream.c:646
+#: gio/glocalfile.c:1213 gio/glocalfile.c:2322 gio/glocalfile.c:2350
+#: gio/glocalfile.c:2507 gio/glocalfileoutputstream.c:646
 msgid "Invalid filename"
 msgstr "Nombre de archivo no válido"
 
-#: gio/glocalfile.c:1379 gio/glocalfile.c:1394
+#: gio/glocalfile.c:1381 gio/glocalfile.c:1396
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Error al abrir el archivo %s: %s"
 
-#: gio/glocalfile.c:1519
+#: gio/glocalfile.c:1521
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Error al eliminar el archivo %s: %s"
 
-#: gio/glocalfile.c:1958
+#: gio/glocalfile.c:1963
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Error al mover a la papelera el archivo %s: %s"
 
-#: gio/glocalfile.c:1999
+#: gio/glocalfile.c:2004
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "No se pudo crear la carpeta de papelera %s: %s"
 
-#: gio/glocalfile.c:2020
+#: gio/glocalfile.c:2025
 #, 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:2029
+#: gio/glocalfile.c:2034
 #, 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:2113 gio/glocalfile.c:2133
+#: gio/glocalfile.c:2118 gio/glocalfile.c:2138
 #, 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:2168
+#: gio/glocalfile.c:2173
 #, 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:2228
+#: gio/glocalfile.c:2233
 #, 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:2232 gio/glocalfile.c:2288
+#: gio/glocalfile.c:2237 gio/glocalfile.c:2293
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "No se pudo enviar a la papelera el archivo %s: %s"
 
-#: gio/glocalfile.c:2294
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "No se pudo enviar a la papelera el archivo %s"
 
-#: gio/glocalfile.c:2320
+#: gio/glocalfile.c:2325
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Error al crear la carpeta %s: %s"
 
-#: gio/glocalfile.c:2349
+#: gio/glocalfile.c:2354
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "El sistema de archivos no soporta enlaces simbólicos"
 
-#: gio/glocalfile.c:2352
+#: gio/glocalfile.c:2357
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Error al crear el enlace simbólico %s: %s"
 
-#: gio/glocalfile.c:2358 glib/gfileutils.c:2138
+#: gio/glocalfile.c:2363 glib/gfileutils.c:2155
 msgid "Symbolic links not supported"
 msgstr "Enlaces simbólicos no soportados"
 
-#: gio/glocalfile.c:2413 gio/glocalfile.c:2448 gio/glocalfile.c:2505
+#: gio/glocalfile.c:2418 gio/glocalfile.c:2453 gio/glocalfile.c:2510
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Error al mover el archivo %s: %s"
 
-#: gio/glocalfile.c:2436
+#: gio/glocalfile.c:2441
 msgid "Can’t move directory over directory"
 msgstr "No se puede mover una carpeta sobre una carpeta"
 
-#: gio/glocalfile.c:2462 gio/glocalfileoutputstream.c:1030
+#: gio/glocalfile.c:2467 gio/glocalfileoutputstream.c:1030
 #: gio/glocalfileoutputstream.c:1044 gio/glocalfileoutputstream.c:1059
 #: gio/glocalfileoutputstream.c:1076 gio/glocalfileoutputstream.c:1090
 msgid "Backup file creation failed"
 msgstr "Falló la creación del archivo de respaldo"
 
-#: gio/glocalfile.c:2481
+#: gio/glocalfile.c:2486
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Error al eliminar el archivo destino: %s"
 
-#: gio/glocalfile.c:2495
+#: gio/glocalfile.c:2500
 msgid "Move between mounts not supported"
 msgstr "No se soporta mover archivos entre puntos de montaje"
 
-#: gio/glocalfile.c:2686
+#: gio/glocalfile.c:2691
 #, 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:752
 msgid "Attribute value must be non-NULL"
 msgstr "El valor del atributo de ser no nulo"
 
-#: gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:759
 msgid "Invalid attribute type (string expected)"
 msgstr "Tipo de atributo no válido (se esperaba una cadena)"
 
-#: gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:766
 msgid "Invalid extended attribute name"
 msgstr "Nombre extendido del atributo no válido"
 
-#: gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:806
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Error al establecer el atributo extendido «%s»: %s"
 
-#: gio/glocalfileinfo.c:1625
+#: gio/glocalfileinfo.c:1634
 msgid " (invalid encoding)"
 msgstr " (codificación no válida)"
 
-#: gio/glocalfileinfo.c:1789 gio/glocalfileoutputstream.c:908
+#: gio/glocalfileinfo.c:1798 gio/glocalfileoutputstream.c:908
 #, 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:2059
+#: gio/glocalfileinfo.c:2068
 #, 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:2104
+#: gio/glocalfileinfo.c:2113
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Tipo de atributo no válido (se esperaba uint32)"
 
-#: gio/glocalfileinfo.c:2122
+#: gio/glocalfileinfo.c:2131
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Tipo de atributo no válido (se esperaba uint64)"
 
-#: gio/glocalfileinfo.c:2141 gio/glocalfileinfo.c:2160
+#: gio/glocalfileinfo.c:2150 gio/glocalfileinfo.c:2169
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Tipo de atributo no válido (se esperaba una cadena byte)"
 
-#: gio/glocalfileinfo.c:2207
+#: gio/glocalfileinfo.c:2216
 msgid "Cannot set permissions on symlinks"
 msgstr "No se pueden establecer permisos en enlaces simbólicos"
 
-#: gio/glocalfileinfo.c:2223
+#: gio/glocalfileinfo.c:2232
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Error al establecer permisos: %s"
 
-#: gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2283
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Error al establecer el propietario: %s"
 
-#: gio/glocalfileinfo.c:2297
+#: gio/glocalfileinfo.c:2306
 msgid "symlink must be non-NULL"
 msgstr "el enlace simbólico debe ser no nulo"
 
-#: gio/glocalfileinfo.c:2307 gio/glocalfileinfo.c:2326
-#: gio/glocalfileinfo.c:2337
+#: gio/glocalfileinfo.c:2316 gio/glocalfileinfo.c:2335
+#: gio/glocalfileinfo.c:2346
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Error al establecer el enlace simbólico: %s"
 
-#: gio/glocalfileinfo.c:2316
+#: gio/glocalfileinfo.c:2325
 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:2442
+#: gio/glocalfileinfo.c:2451
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Error al establecer o modificar el tiempo de acceso: %s"
 
-#: gio/glocalfileinfo.c:2465
+#: gio/glocalfileinfo.c:2474
 msgid "SELinux context must be non-NULL"
 msgstr "El contexto SELinux debe ser no nulo"
 
-#: gio/glocalfileinfo.c:2480
+#: gio/glocalfileinfo.c:2489
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Error al establecer el contexto SELinux: %s"
 
-#: gio/glocalfileinfo.c:2487
+#: gio/glocalfileinfo.c:2496
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux no está activado en este sistema"
 
-#: gio/glocalfileinfo.c:2579
+#: gio/glocalfileinfo.c:2588
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Establecer el atributo %s no está soportado"
@@ -3127,7 +3144,7 @@ msgstr "Error al buscar en el archivo: %s"
 msgid "Error closing file: %s"
 msgstr "Error al cerrar el archivo: %s"
 
-#: gio/glocalfilemonitor.c:856
+#: gio/glocalfilemonitor.c:858
 msgid "Unable to find default local file monitor type"
 msgstr ""
 "No se pudo encontrar el tipo de monitorización del archivo local "
@@ -3272,7 +3289,7 @@ 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:384
+#: gio/gnetworkaddress.c:388
 #, c-format
 msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "El nombre del equipo «%s» contiene «[» pero no «]»"
@@ -3299,12 +3316,12 @@ msgstr "No se pudo crear el monitor de red: "
 msgid "Could not get network status: "
 msgstr "No se pudo obtener el estado de la red: "
 
-#: gio/gnetworkmonitornm.c:313
+#: gio/gnetworkmonitornm.c:314
 #, c-format
 msgid "NetworkManager not running"
 msgstr "NetworkManager no está en ejecución"
 
-#: gio/gnetworkmonitornm.c:324
+#: gio/gnetworkmonitornm.c:325
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Versión de NetworkManager demasiado antigua"
@@ -3859,27 +3876,27 @@ msgstr "Error al cerrar el socket: %s"
 msgid "Waiting for socket condition: %s"
 msgstr "Esperando la condición del socket: %s"
 
-#: gio/gsocket.c:4612 gio/gsocket.c:4756 gio/gsocket.c:4841 gio/gsocket.c:5021
-#: gio/gsocket.c:5059
+#: gio/gsocket.c:4614 gio/gsocket.c:4616 gio/gsocket.c:4762 gio/gsocket.c:4847
+#: gio/gsocket.c:5027 gio/gsocket.c:5067 gio/gsocket.c:5069
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
-#: gio/gsocket.c:4783
+#: gio/gsocket.c:4789
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage no está soportado en Windows"
 
-#: gio/gsocket.c:5248 gio/gsocket.c:5321 gio/gsocket.c:5548
+#: gio/gsocket.c:5260 gio/gsocket.c:5333 gio/gsocket.c:5560
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Error al recibir el mensaje: %s"
 
-#: gio/gsocket.c:5820
+#: gio/gsocket.c:5832
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "No se pudieron leer las credenciales del socket: %s"
 
-#: gio/gsocket.c:5829
+#: gio/gsocket.c:5841
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials no está implementado en este SO"
 
@@ -3897,16 +3914,16 @@ msgstr "No se pudo conectar a %s: "
 msgid "Could not connect: "
 msgstr "No se pudo conectar: "
 
-#: gio/gsocketclient.c:1032 gio/gsocketclient.c:1714
+#: gio/gsocketclient.c:1033 gio/gsocketclient.c:1750
 msgid "Unknown error on connect"
 msgstr "Error desconocido al conectar"
 
-#: gio/gsocketclient.c:1086 gio/gsocketclient.c:1626
+#: gio/gsocketclient.c:1087 gio/gsocketclient.c:1658
 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:1115 gio/gsocketclient.c:1652
+#: gio/gsocketclient.c:1116 gio/gsocketclient.c:1684
 #, c-format
 msgid "Proxy protocol “%s” is not supported."
 msgstr "El protocolo del proxy «%s» no está soportado."
@@ -4036,7 +4053,7 @@ msgid "Temporarily unable to resolve “%s”"
 msgstr "No se puede resolver «%s» temporalmente"
 
 #: gio/gthreadedresolver.c:663 gio/gthreadedresolver.c:840
-#: gio/gthreadedresolver.c:948
+#: gio/gthreadedresolver.c:950
 #, c-format
 msgid "Error resolving “%s”"
 msgstr "Error al resolver «%s»"
@@ -4844,30 +4861,30 @@ msgstr "La plantilla «%s» no es válida, no debería contener un «%s»"
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "La plantilla «%s» no contiene XXXXXX"
 
-#: glib/gfileutils.c:2116
+#: glib/gfileutils.c:2112 glib/gfileutils.c:2140
 #, 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:1393
 #, 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:1738
 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:1785 glib/giochannel.c:2043 glib/giochannel.c:2130
 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:1866 glib/giochannel.c:1943
 msgid "Channel terminates in a partial character"
 msgstr "El canal termina en un carácter parcial"
 
-#: glib/giochannel.c:1925
+#: glib/giochannel.c:1929
 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"
@@ -5848,157 +5865,157 @@ msgid "Character out of range for UTF-16"
 msgstr "El carácter se sale del rango para UTF-16"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2384
+#: glib/gutils.c:2339
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2386
+#: glib/gutils.c:2341
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2388
+#: glib/gutils.c:2343
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2390
+#: glib/gutils.c:2345
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2392
+#: glib/gutils.c:2347
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2394
+#: glib/gutils.c:2349
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2398
+#: glib/gutils.c:2353
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2400
+#: glib/gutils.c:2355
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2402
+#: glib/gutils.c:2357
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2404
+#: glib/gutils.c:2359
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2406
+#: glib/gutils.c:2361
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2408
+#: glib/gutils.c:2363
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2412
+#: glib/gutils.c:2367
 #, c-format
 msgid "%.1f kb"
 msgstr "%.1f kb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2414
+#: glib/gutils.c:2369
 #, c-format
 msgid "%.1f Mb"
 msgstr "%.1f Mb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2416
+#: glib/gutils.c:2371
 #, c-format
 msgid "%.1f Gb"
 msgstr "%.1f Gb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2418
+#: glib/gutils.c:2373
 #, c-format
 msgid "%.1f Tb"
 msgstr "%.1f Tb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2420
+#: glib/gutils.c:2375
 #, c-format
 msgid "%.1f Pb"
 msgstr "%.1f Pb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2422
+#: glib/gutils.c:2377
 #, c-format
 msgid "%.1f Eb"
 msgstr "%.1f Eb"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2426
+#: glib/gutils.c:2381
 #, c-format
 msgid "%.1f Kib"
 msgstr "%.1f Kib"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2428
+#: glib/gutils.c:2383
 #, c-format
 msgid "%.1f Mib"
 msgstr "%.1f Mib"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2430
+#: glib/gutils.c:2385
 #, c-format
 msgid "%.1f Gib"
 msgstr "%.1f Gib"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2432
+#: glib/gutils.c:2387
 #, c-format
 msgid "%.1f Tib"
 msgstr "%.1f Tib"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2434
+#: glib/gutils.c:2389
 #, c-format
 msgid "%.1f Pib"
 msgstr "%.1f Pib"
 
 #. Translators: Keep the no-break space between %.1f and the unit symbol
-#: glib/gutils.c:2436
+#: glib/gutils.c:2391
 #, c-format
 msgid "%.1f Eib"
 msgstr "%.1f Eib"
 
-#: glib/gutils.c:2470 glib/gutils.c:2596
+#: glib/gutils.c:2425 glib/gutils.c:2551
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
-#: glib/gutils.c:2474
+#: glib/gutils.c:2429
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -6006,7 +6023,7 @@ msgstr[0] "%u bit"
 msgstr[1] "%u bits"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: glib/gutils.c:2541
+#: glib/gutils.c:2496
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -6014,7 +6031,7 @@ msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
 #. Translators: the %s in "%s bits" will always be replaced by a number.
-#: glib/gutils.c:2546
+#: glib/gutils.c:2501
 #, c-format
 msgid "%s bit"
 msgid_plural "%s bits"
@@ -6026,32 +6043,32 @@ msgstr[1] "%s bits"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: glib/gutils.c:2609
+#: glib/gutils.c:2564
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: glib/gutils.c:2614
+#: glib/gutils.c:2569
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: glib/gutils.c:2619
+#: glib/gutils.c:2574
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: glib/gutils.c:2624
+#: glib/gutils.c:2579
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: glib/gutils.c:2629
+#: glib/gutils.c:2584
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: glib/gutils.c:2634
+#: glib/gutils.c:2589
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
diff --git a/po/eu.po b/po/eu.po
index 3812057c0..e7f9f7d41 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,1009 +5,914 @@
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
+# Asier Sarasua Garmendia <asier.sarasua@gmail.com>, 2019.
+#
 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: 2017-08-07 06:44+0000\n"
-"PO-Revision-Date: 2017-08-27 13:30+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+msgstr "Project-Id-Version: glib master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
+"POT-Creation-Date: 2019-04-19 09:02+0000\n"
+"PO-Revision-Date: 2019-04-27 10:00+0100\n"
+"Last-Translator: Asier Sarasua Garmendia <asier.sarasua@gmail.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gio/gapplication.c:490
+#: gio/gapplication.c:499
 msgid "GApplication options"
 msgstr "GApplication-en aukerak"
 
-#: ../gio/gapplication.c:490
+#: gio/gapplication.c:499
 msgid "Show GApplication options"
 msgstr "Erakutsi GApplication-en aukerak"
 
-#: ../gio/gapplication.c:535
+#: gio/gapplication.c:544
 msgid "Enter GApplication service mode (use from D-Bus service files)"
-msgstr ""
-"Sartu GApplication zerbitzu moduan (erabili D-Bus zerbitzuaren "
-"fitxategietatik)"
+msgstr "Sartu GApplication zerbitzu moduan (erabili D-Bus zerbitzuaren fitxategietatik)"
 
-#: ../gio/gapplication.c:547
+#: gio/gapplication.c:556
 msgid "Override the application’s ID"
 msgstr "Gainidatzi aplikazioaren IDa"
 
-#: ../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/gapplication.c:568
+msgid "Replace the running instance"
+msgstr "Ordeztu exekuzioan dagoen instantzia"
+
+#: 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 "Erakutsi laguntza"
 
-#: ../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 "[KOMANDOA]"
 
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
+#: gio/gapplication-tool.c:49 gio/gio-tool.c:228
 msgid "Print version"
-msgstr "Erakutsi bertsioa"
+msgstr "Bistaratu bertsioa"
 
-#: ../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 "Erakutsi bertsioaren informazioa eta irten"
 
-#: ../gio/gapplication-tool.c:52
+#: gio/gapplication-tool.c:52
 msgid "List applications"
 msgstr "Zerrendatu aplikazioak"
 
-#: ../gio/gapplication-tool.c:53
+#: gio/gapplication-tool.c:53
 msgid "List the installed D-Bus activatable applications (by .desktop files)"
-msgstr ""
-"Zerrendatu instalatutako aplikazioak D-Bus-agatik aktibagarriak (.desktop "
-"fitxategien arabera)"
+msgstr "Zerrendatu instalatutako aplikazioak D-Bus-agatik aktibagarriak (.desktop fitxategien arabera)"
 
-#: ../gio/gapplication-tool.c:55
+#: gio/gapplication-tool.c:55
 msgid "Launch an application"
 msgstr "Abiarazi aplikazioa"
 
-#: ../gio/gapplication-tool.c:56
+#: gio/gapplication-tool.c:56
 msgid "Launch the application (with optional files to open)"
 msgstr "Abiarazi aplikazioa (aukerako fitxategiekin irekitzeko)"
 
-#: ../gio/gapplication-tool.c:57
+#: gio/gapplication-tool.c:57
 msgid "APPID [FILE…]"
 msgstr "APPID [FITXATEGIA…]"
 
-#: ../gio/gapplication-tool.c:59
+#: gio/gapplication-tool.c:59
 msgid "Activate an action"
 msgstr "Aktibatu ekintza bat"
 
-#: ../gio/gapplication-tool.c:60
+#: gio/gapplication-tool.c:60
 msgid "Invoke an action on the application"
 msgstr "Deitu aplikazioaren ekintza bati"
 
-#: ../gio/gapplication-tool.c:61
+#: gio/gapplication-tool.c:61
 msgid "APPID ACTION [PARAMETER]"
 msgstr "APP_ID EKINTZA [PARAMETROA]"
 
-#: ../gio/gapplication-tool.c:63
+#: gio/gapplication-tool.c:63
 msgid "List available actions"
 msgstr "Zerrendatu ekintza erabilgarriak"
 
-#: ../gio/gapplication-tool.c:64
+#: gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
 msgstr "Zerrendatu aplikazioaren ekintza estatikoak (.desktop fitxategitik)"
 
-#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:65 gio/gapplication-tool.c:71
 msgid "APPID"
 msgstr "APP_ID"
 
-#: ../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:102
+#: gio/gio-tool.c:224
 msgid "COMMAND"
 msgstr "KOMANDOA"
 
-#: ../gio/gapplication-tool.c:70
+#: gio/gapplication-tool.c:70
 msgid "The command to print detailed help for"
 msgstr "Erakutsi komandoaren laguntza xehea"
 
-#: ../gio/gapplication-tool.c:71
+#: gio/gapplication-tool.c:71
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
-msgstr ""
-"Aplikazioaren identifikatzailea D-bus formatuan (adib: org.example.viewer)"
+msgstr "Aplikazioaren identifikatzailea D-bus formatuan (adib: 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:738
+#: gio/glib-compile-resources.c:744 gio/glib-compile-resources.c:772
+#: gio/gresource-tool.c:502 gio/gresource-tool.c:568
 msgid "FILE"
 msgstr "FITXATEGIA"
 
-#: ../gio/gapplication-tool.c:72
+#: gio/gapplication-tool.c:72
 msgid "Optional relative or absolute filenames, or URIs to open"
 msgstr "Aukerako fitxategi-izen erlatibo edo absolutuak, edo URIak irekitzeko"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "ACTION"
 msgstr "EKINTZA"
 
-#: ../gio/gapplication-tool.c:73
+#: gio/gapplication-tool.c:73
 msgid "The action name to invoke"
 msgstr "Ekintzaren izena deitzeko"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "PARAMETER"
 msgstr "PARAMETROA"
 
-#: ../gio/gapplication-tool.c:74
+#: gio/gapplication-tool.c:74
 msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "Ekintza deitzean emango zaion parametroa, GVariant formatuan"
 
-#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:614
+#: gio/gapplication-tool.c:96 gio/gresource-tool.c:533 gio/gsettings-tool.c:661
 #, c-format
 msgid ""
 "Unknown command %s\n"
 "\n"
-msgstr ""
-"'%s' komando ezezaguna\n"
+msgstr "'%s' komando ezezaguna\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:101
+#: gio/gapplication-tool.c:101
 msgid "Usage:\n"
 msgstr "Erabilera:\n"
 
-#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:649
+#: gio/gapplication-tool.c:114 gio/gresource-tool.c:558
+#: gio/gsettings-tool.c:696
 msgid "Arguments:\n"
 msgstr "Argumentuak:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: gio/gapplication-tool.c:133 gio/gio-tool.c:224
 msgid "[ARGS…]"
 msgstr "[ARGUMENTUAK…]"
 
-#: ../gio/gapplication-tool.c:134
+#: gio/gapplication-tool.c:134
 #, c-format
 msgid "Commands:\n"
 msgstr "Komandoak:\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 ""
-"Erabili “%s help KOMANDOA“  laguntza xehea lortzeko.\n"
+msgstr "Erabili “%s help KOMANDOA“  laguntza xehea lortzeko.\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"
 "\n"
-msgstr ""
-"'%s' komandoak aplikazioaren IDa behar du zuzenean jarraitzeko\n"
+msgstr "'%s' komandoak aplikazioaren IDa behar du zuzenean jarraitzeko\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:171
+#: gio/gapplication-tool.c:171
 #, c-format
 msgid "invalid application id: “%s”\n"
 msgstr "aplikazioaren IDa baliogabea: “%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“ ez du argumenturik hartzen\n"
+msgstr "“%s“ ez du argumenturik hartzen\n"
 "\n"
 
-#: ../gio/gapplication-tool.c:266
+#: gio/gapplication-tool.c:266
 #, c-format
 msgid "unable to connect to D-Bus: %s\n"
 msgstr "ezin da D-Bus-arekin konektatu: %s\n"
 
-#: ../gio/gapplication-tool.c:286
+#: gio/gapplication-tool.c:286
 #, c-format
 msgid "error sending %s message to application: %s\n"
 msgstr "errorea '%s' mezua aplikazioari bidaltzean: %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 "ekintzaren izena eman behar da aplikazioaren IDaren ondoren\n"
 
-#: ../gio/gapplication-tool.c:325
+#: gio/gapplication-tool.c:325
 #, c-format
 msgid ""
 "invalid action name: “%s”\n"
 "action names must consist of only alphanumerics, “-” and “.”\n"
-msgstr ""
-"baliogabeko ekintza-izena: “%s“\n"
+msgstr "baliogabeko ekintza-izena: “%s“\n"
 "ekintzaren izenak soilik alfazenbakizko, “-“ eta “.“ karaktereak\n"
 "eduki ditzake\n"
 
-#: ../gio/gapplication-tool.c:344
+#: gio/gapplication-tool.c:344
 #, c-format
 msgid "error parsing action parameter: %s\n"
 msgstr "errorea ekintzaren parametroa analizatzean: %s\n"
 
-#: ../gio/gapplication-tool.c:356
-#, c-format
+#: gio/gapplication-tool.c:356
 msgid "actions accept a maximum of one parameter\n"
 msgstr "ekintzak gehienez parametro bat onartzen du\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' komandoak soilik aplikazioaren IDa hartzen du"
 
-#: ../gio/gapplication-tool.c:421
+#: gio/gapplication-tool.c:421
 #, c-format
 msgid "unable to find desktop file for application %s\n"
 msgstr "ezin da '%s' aplikazioaren '.desktop' fitxtaegia aurkitu\n"
 
-#: ../gio/gapplication-tool.c:466
+#: gio/gapplication-tool.c:466
 #, c-format
 msgid ""
 "unrecognised command: %s\n"
 "\n"
-msgstr ""
-"komando ezezaguna: %s\n"
+msgstr "komando ezezaguna: %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/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:223 gio/goutputstream.c:1049
+#: gio/gpollableinputstream.c:205 gio/gpollableoutputstream.c:277
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "Zenbaketaren balio handiegia honi pasatuta: %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 "Ez da bilaketarik onartzen oinarrizko korrontean"
 
-#: ../gio/gbufferedinputstream.c:937
+#: gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "Ezin da GBufferedInputStream trunkatu"
 
-#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208
-#: ../gio/giostream.c:300 ../gio/goutputstream.c:1660
+#: gio/gbufferedinputstream.c:982 gio/ginputstream.c:1208 gio/giostream.c:300
+#: gio/goutputstream.c:2198
 msgid "Stream is already closed"
 msgstr "Korrontea jadanik itxita dago"
 
-#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592
+#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592
 msgid "Truncate not supported on base stream"
 msgstr "Trunkatzea ez da onartzen oinarrizko korrontean"
 
-#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
-#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870
-#: ../gio/gsimpleasyncresult.c:896
+#: gio/gcancellable.c:319 gio/gdbusconnection.c:1867 gio/gdbusprivate.c:1409
+#: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897
 #, c-format
 msgid "Operation was cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: ../gio/gcharsetconverter.c:260
+#: gio/gcharsetconverter.c:260
 msgid "Invalid object, not initialized"
 msgstr "Baliogabeko objektua, hasieratu gabe dago"
 
-#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309
+#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309
 msgid "Incomplete multibyte sequence in input"
 msgstr "Byteen sekuentzia baliogabea sarreran"
 
-#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324
+#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324
 msgid "Not enough space in destination"
 msgstr "Ez dago nahikoa lekurik helburuan"
 
-#: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
-#: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845
-#: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598
-#: ../glib/giochannel.c:2442 ../glib/gutf8.c:866 ../glib/gutf8.c:1319
+#: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848
+#: gio/gdatainputstream.c:1261 glib/gconvert.c:447 glib/gconvert.c:877
+#: glib/giochannel.c:1561 glib/giochannel.c:1603 glib/giochannel.c:2450
+#: glib/gutf8.c:869 glib/gutf8.c:1322
 msgid "Invalid byte sequence in conversion input"
 msgstr "Byteen sekuentzia baliogabea bihurketa-sarreran"
 
-#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:446 ../glib/gconvert.c:770
-#: ../glib/giochannel.c:1563 ../glib/giochannel.c:2454
+#: gio/gcharsetconverter.c:347 glib/gconvert.c:455 glib/gconvert.c:791
+#: glib/giochannel.c:1568 glib/giochannel.c:2462
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Errorea bihurtzean: %s"
 
-#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1096
+#: gio/gcharsetconverter.c:445 gio/gsocket.c:1093
 msgid "Cancellable initialization not supported"
 msgstr "Hasieratzea bertan behera uztea ez dago onartuta"
 
-#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:321
-#: ../glib/giochannel.c:1384
+#: gio/gcharsetconverter.c:456 glib/gconvert.c:320 glib/giochannel.c:1389
 #, c-format
 msgid "Conversion from character set “%s” to “%s” is not supported"
 msgstr "“%s“ karaktere-multzoa “%s“ bihurtzea ez da onartzen"
 
-#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:325
+#: gio/gcharsetconverter.c:460 glib/gconvert.c:324
 #, c-format
 msgid "Could not open converter from “%s” to “%s”"
 msgstr "Ezin izan da “%s“(e)tik %s(e)rako bihurtzailea ireki"
 
-#: ../gio/gcontenttype.c:358
+#: gio/gcontenttype.c:452
 #, c-format
 msgid "%s type"
 msgstr "%s mota"
 
-#: ../gio/gcontenttype-win32.c:177
+#: gio/gcontenttype-win32.c:177
 msgid "Unknown type"
 msgstr "Mota ezezaguna"
 
-#: ../gio/gcontenttype-win32.c:179
+#: gio/gcontenttype-win32.c:179
 #, c-format
 msgid "%s filetype"
 msgstr "%s fitxategi mota"
 
-#: ../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 ez dago inplementatuta S.E. honetan"
 
-#: ../gio/gcredentials.c:467
+#: gio/gcredentials.c:470
 msgid "There is no GCredentials support for your platform"
 msgstr "Ez dago GCredentials euskarririk plataforma honetan"
 
-#: ../gio/gcredentials.c:513
+#: gio/gcredentials.c:516
 msgid "GCredentials does not contain a process ID on this OS"
 msgstr "GCredentials-ek ez dauka prozesuaren IDrik S.E. honetan"
 
-#: ../gio/gcredentials.c:565
+#: gio/gcredentials.c:568
 msgid "Credentials spoofing is not possible on this OS"
 msgstr "Kredentzialak usurpatzea ezinezkoa da S.E. honetan"
 
-#: ../gio/gdatainputstream.c:304
+#: gio/gdatainputstream.c:304
 msgid "Unexpected early end-of-stream"
 msgstr "Ustekabeko korronte-amaiera azkarregia"
 
-#: ../gio/gdbusaddress.c:155 ../gio/gdbusaddress.c:243
-#: ../gio/gdbusaddress.c:324
+#: gio/gdbusaddress.c:154 gio/gdbusaddress.c:229 gio/gdbusaddress.c:310
 #, c-format
 msgid "Unsupported key “%s” in address entry “%s”"
 msgstr "Onartu gabeko “%s“ gakoa helbidearen “%s“ sarreran"
 
-#: ../gio/gdbusaddress.c:182
+#: gio/gdbusaddress.c:168
 #, c-format
-msgid ""
-"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"
-msgstr ""
-"“%s“ helbidea baliogabea da (gako hauetariko bat behar du: “path“ (bide-"
-"izena), “tmpdir“ (aldi baterako direktorioa) edo “abstract“ (abstraktua))"
+msgid "Meaningless key/value pair combination in address entry “%s”"
+msgstr "Zentzurik gabeko gakoa/balioa bikotearen konbinazioa “%s“ helbidearen sarreran"
 
-#: ../gio/gdbusaddress.c:195
+#: gio/gdbusaddress.c:177
 #, c-format
-msgid "Meaningless key/value pair combination in address entry “%s”"
-msgstr ""
-"Zentzurik gabeko gakoa/balioa bikotearen konbinazioa “%s“ helbidearen "
-"sarreran"
+msgid ""
+"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"
+msgstr "“%s“ helbidea baliogabea da (gako hauetariko bat behar du: “path“ (bide-izena), “tmpdir“ (aldi baterako direktorioa) edo “abstract“ (abstraktua))"
 
-#: ../gio/gdbusaddress.c:258 ../gio/gdbusaddress.c:339
+#: gio/gdbusaddress.c:244 gio/gdbusaddress.c:325
 #, c-format
 msgid "Error in address “%s” — the port attribute is malformed"
 msgstr "Errorea “%s“ helbidean — atakaren atributua gaizki osatuta dago"
 
-#: ../gio/gdbusaddress.c:269 ../gio/gdbusaddress.c:350
+#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:336
 #, c-format
 msgid "Error in address “%s” — the family attribute is malformed"
 msgstr "Errorea “%s“ helbidean — familiaren atributua gaizki osatuta dago"
 
-#: ../gio/gdbusaddress.c:460
+#: gio/gdbusaddress.c:406 gio/gdbusaddress.c:670
+#, c-format
+msgid "Unknown or unsupported transport “%s” for address “%s”"
+msgstr "“%2$s“ helbidearen “%1$s“ garraioa ezezaguna edo onartu gabea"
+
+#: gio/gdbusaddress.c:450
 #, c-format
 msgid "Address element “%s” does not contain a colon (:)"
 msgstr "“%s“ helbidearen elementuak ez dauka bi punturik (:)"
 
-#: ../gio/gdbusaddress.c:481
+#: gio/gdbusaddress.c:459
+#, c-format
+msgid "Transport name in address element “%s” must not be empty"
+msgstr "“%s“ helbidearen elementuko garraio-izenak ez du hutsik egon behar"
+
+#: gio/gdbusaddress.c:480
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
 "sign"
-msgstr ""
-"%d. gakoa/balioa bikoteak, “%s“, “%s“ helbidearen elementuan, ez dauka "
-"berdina (=) ikurrik"
+msgstr "%d. gakoa/balioa bikoteak, “%s“, “%s“ helbidearen elementuan, ez dauka berdina (=) ikurrik"
+
+#: gio/gdbusaddress.c:491
+#, c-format
+msgid ""
+"Key/Value pair %d, “%s”, in address element “%s” must not have an empty key"
+msgstr "%d. gakoa/balioa bikoteak, “%s“, “%s“ helbidearen elementuan, ez du gakoa hutsik eduki behar"
 
-#: ../gio/gdbusaddress.c:495
+#: gio/gdbusaddress.c:505
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s”, in address element "
 "“%s”"
-msgstr ""
-"Errorea gakoa edo balioa iheseko modutik kentzean %d. gakoa/balioa bikotean, "
-"“%s“, “%s“ helbidearen elementuan"
+msgstr "Errorea gakoa edo balioa iheseko modutik kentzean %d. gakoa/balioa bikotean, “%s“, “%s“ helbidearen elementuan"
 
-#: ../gio/gdbusaddress.c:573
+#: gio/gdbusaddress.c:577
 #, c-format
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
 "“path” or “abstract” to be set"
-msgstr ""
-"Errorea “%s“ helbidean - unix-eko garraioak “path“ edo “abstract“ "
-"gakoetariko bat behar du hain zuzen."
+msgstr "Errorea “%s“ helbidean - unix-eko garraioak “path“ edo “abstract“ gakoetariko bat behar du hain zuzen."
 
-#: ../gio/gdbusaddress.c:609
+#: gio/gdbusaddress.c:613
 #, c-format
 msgid "Error in address “%s” — the host attribute is missing or malformed"
-msgstr ""
-"Errorea “%s“ helbidean — ostalariaren atributua falta da edo gaizki osatuta "
-"dago"
+msgstr "Errorea “%s“ helbidean — ostalariaren atributua falta da edo gaizki osatuta dago"
 
-#: ../gio/gdbusaddress.c:623
+#: gio/gdbusaddress.c:627
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
-msgstr ""
-"Errorea “%s“ helbidean — atakaren atributua falta da edo gaizki osatuta dago"
+msgstr "Errorea “%s“ helbidean — atakaren atributua falta da edo gaizki osatuta dago"
 
-#: ../gio/gdbusaddress.c:637
+#: gio/gdbusaddress.c:641
 #, c-format
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
-msgstr ""
-"Errorea “%s“ helbidean — izendapenaren fitxategiaren atributua falta da edo "
-"gaizki osatuta dago"
+msgstr "Errorea “%s“ helbidean — izendapenaren fitxategiaren atributua falta da edo gaizki osatuta dago"
 
-#: ../gio/gdbusaddress.c:658
+#: gio/gdbusaddress.c:662
 msgid "Error auto-launching: "
 msgstr "Errorea automatikoki abiaraztean: "
 
-#: ../gio/gdbusaddress.c:666
-#, c-format
-msgid "Unknown or unsupported transport “%s” for address “%s”"
-msgstr "“%2$s“ helbidearen “%1$s“ garraioa ezezaguna edo onartu gabea"
-
-#: ../gio/gdbusaddress.c:704
+#: gio/gdbusaddress.c:715
 #, c-format
 msgid "Error opening nonce file “%s”: %s"
 msgstr "Errorea “%s“ izendapeneko fitxategia irekitzean: %s"
 
-#: ../gio/gdbusaddress.c:723
+#: gio/gdbusaddress.c:734
 #, c-format
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Errorea '%s“ izendapeneko fitxategitik irakurtzean: %s"
 
-#: ../gio/gdbusaddress.c:732
+#: gio/gdbusaddress.c:743
 #, c-format
 msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
-msgstr ""
-"Errorea “%s“ izendapeneko fitxategitik irakurtzean: 16 byte espero ziren, "
-"baina %d lortu dira"
+msgstr "Errorea “%s“ izendapeneko fitxategitik irakurtzean: 16 byte espero ziren, baina %d lortu dira"
 
-#: ../gio/gdbusaddress.c:750
+#: gio/gdbusaddress.c:761
 #, c-format
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "Errorea “%s“ izendapeneko fitxategiko edukia korrontean idaztean:"
 
-#: ../gio/gdbusaddress.c:959
+#: gio/gdbusaddress.c:970
 msgid "The given address is empty"
 msgstr "Emandako helbidea hutsik dago"
 
-#: ../gio/gdbusaddress.c:1072
+#: gio/gdbusaddress.c:1083
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "Ezin da mezuaren deia abiarazi 'setuid' duenean"
 
-#: ../gio/gdbusaddress.c:1079
+#: gio/gdbusaddress.c:1090
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "Ezin da mezuaren deia abiarazi makinaren IDrik gabe: "
 
-#: ../gio/gdbusaddress.c:1086
+#: gio/gdbusaddress.c:1097
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "Ezin da D-Bus automatikoki abiarazi X11 $DISPLAY gabe"
 
-#: ../gio/gdbusaddress.c:1128
+#: gio/gdbusaddress.c:1139
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "Errorea “%s“ komando-lerroa abiaraztean: "
 
-#: ../gio/gdbusaddress.c:1345
-#, c-format
-msgid "(Type any character to close this window)\n"
-msgstr "(Sakatu edozer tekla leihoa ixteko)\n"
-
-#: ../gio/gdbusaddress.c:1499
-#, c-format
-msgid "Session dbus not running, and autolaunch failed"
-msgstr ""
-"Saioaren dbus ez da exekutatzen ari, eta abiarazte automatikoak huts egin du"
-
-#: ../gio/gdbusaddress.c:1510
+#: gio/gdbusaddress.c:1208
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
-msgstr ""
-"Ezin da saioaren bus-eko helbidea zehaztu (ez dago S.E. honetan garatuta)"
+msgstr "Ezin da saioaren bus-eko helbidea zehaztu (ez dago S.E. honetan garatuta)"
 
-#: ../gio/gdbusaddress.c:1648
+#: gio/gdbusaddress.c:1346 gio/gdbusconnection.c:7174
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "— unknown value “%s”"
-msgstr ""
-"Ezin da bus-aren helbidea zehaztua inguruneko DBUS_STARTER_BUS_TYPE "
-"aldagaitik. “%s“ balio ezezaguna"
+msgstr "Ezin da bus-aren helbidea zehaztua inguruneko DBUS_STARTER_BUS_TYPE aldagaitik. “%s“ balio ezezaguna"
 
-#: ../gio/gdbusaddress.c:1657 ../gio/gdbusconnection.c:7155
+#: gio/gdbusaddress.c:1355 gio/gdbusconnection.c:7183
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
-msgstr ""
-"Ezin da bus-aren helbidea zehaztua, inguruneko DBUS_STARTER_BUS_TYPE "
-"aldagaia ezarri gabe dagoelako"
+msgstr "Ezin da bus-aren helbidea zehaztua, inguruneko DBUS_STARTER_BUS_TYPE aldagaia ezarri gabe dagoelako"
 
-#: ../gio/gdbusaddress.c:1667
+#: gio/gdbusaddress.c:1365
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "%d bus mota ezezaguna"
 
-#: ../gio/gdbusauth.c:293
+#: gio/gdbusauth.c:293
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Edukiaren zati bat falta da lerro bat irakurtzean"
 
-#: ../gio/gdbusauth.c:337
+#: gio/gdbusauth.c:337
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr "Edukiaren zati bat falta da lerro bat modu seguruan irakurtzean"
 
-#: ../gio/gdbusauth.c:508
+#: gio/gdbusauth.c:481
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
-msgstr ""
-"Autentifikazioko metodo guztiak agortuta (saiatuta: %s) (erabilgarri: %s)"
+msgstr "Autentifikazioko metodo guztiak agortuta (saiatuta: %s) (erabilgarri: %s)"
 
-#: ../gio/gdbusauth.c:1174
+#: gio/gdbusauth.c:1144
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
-msgstr ""
-"Bertan behera utzita GDBusAuthObserver::authorize-authenticated-peer erabiliz"
+msgstr "Bertan behera utzita GDBusAuthObserver::authorize-authenticated-peer erabiliz"
 
-#: ../gio/gdbusauthmechanismsha1.c:262
+#: gio/gdbusauthmechanismsha1.c:262
 #, c-format
 msgid "Error when getting information for directory “%s”: %s"
 msgstr "Errorea “%s“ direktorioaren informazioa eskuratzean: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:274
+#: gio/gdbusauthmechanismsha1.c:274
 #, c-format
 msgid ""
 "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
-msgstr ""
-"“%s“ direktorioko baimenak gaizki osatuta. 0700 modua espero zen, baina 0%o "
-"lortuta"
+msgstr "“%s“ direktorioko baimenak gaizki osatuta. 0700 modua espero zen, baina 0%o lortuta"
 
-#: ../gio/gdbusauthmechanismsha1.c:296
+#: gio/gdbusauthmechanismsha1.c:299
 #, c-format
 msgid "Error creating directory “%s”: %s"
 msgstr "Errorea “%s“ direktorioa sortzean: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:379
+#: gio/gdbusauthmechanismsha1.c:346
 #, c-format
 msgid "Error opening keyring “%s” for reading: "
 msgstr "Errorea “%s“ gako sorta irakurtzeko irekitzean: "
 
-#: ../gio/gdbusauthmechanismsha1.c:403 ../gio/gdbusauthmechanismsha1.c:721
+#: gio/gdbusauthmechanismsha1.c:369 gio/gdbusauthmechanismsha1.c:687
 #, c-format
 msgid "Line %d of the keyring at “%s” with content “%s” is malformed"
-msgstr ""
-"“%2$s“(e)ngo gako sortako %1$d. lerroa (“%3$s“ edukiarekin) gaizki osatuta "
-"dago"
+msgstr "“%2$s“(e)ngo gako sortako %1$d. lerroa (“%3$s“ edukiarekin) gaizki osatuta dago"
 
-#: ../gio/gdbusauthmechanismsha1.c:417 ../gio/gdbusauthmechanismsha1.c:735
+#: 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 ""
-"“%2$s“(e)ngo gako sortako %1$d. lerroko aurreneko tokena (“%3$s“ "
-"edukiarekin) gaizki osatuta dago"
+msgstr "“%2$s“(e)ngo gako sortako %1$d. lerroko aurreneko tokena (“%3$s“ edukiarekin) gaizki osatuta dago"
 
-#: ../gio/gdbusauthmechanismsha1.c:432 ../gio/gdbusauthmechanismsha1.c:749
+#: 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 ""
-"“%2$s“(e)ngo gako sortako %1$d. lerroko bigarren tokena (“%3$s“ edukiarekin) "
-"gaizki osatuta dago"
+msgstr "“%2$s“(e)ngo gako sortako %1$d. lerroko bigarren tokena (“%3$s“ edukiarekin) gaizki osatuta dago"
 
-#: ../gio/gdbusauthmechanismsha1.c:456
+#: gio/gdbusauthmechanismsha1.c:421
 #, c-format
 msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr "Ez da %d IDko cookie-rik aurkitu “%s“(e)ngo gako sortan"
 
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: gio/gdbusauthmechanismsha1.c:503
 #, c-format
 msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Errorea blokeoaren “%s“ fitxategi zaharkitua ezabatzean: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:569
+#: gio/gdbusauthmechanismsha1.c:535
 #, c-format
 msgid "Error creating lock file “%s”: %s"
 msgstr "Errorea blokeoko “%s“ fitxategia sortzean: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:600
+#: gio/gdbusauthmechanismsha1.c:566
 #, c-format
 msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Errorea blokeoko (estekatu gabeko) “%s“ fitxategia ixtean: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:611
+#: gio/gdbusauthmechanismsha1.c:577
 #, c-format
 msgid "Error unlinking lock file “%s”: %s"
 msgstr "Errorea blokeoko “%s“ fitxategia desestekatzean: %s"
 
-#: ../gio/gdbusauthmechanismsha1.c:688
+#: gio/gdbusauthmechanismsha1.c:654
 #, c-format
 msgid "Error opening keyring “%s” for writing: "
 msgstr "Errorea “%s“ gako sorta idazteko irekitzean: "
 
-#: ../gio/gdbusauthmechanismsha1.c:885
+#: gio/gdbusauthmechanismsha1.c:850
 #, c-format
 msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr "(Gainera, “%s“(r)en blokeoa askatzeak ere huts egin du: %s) "
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
+#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2396
 msgid "The connection is closed"
 msgstr "Konexioa itxi egin da"
 
-#: ../gio/gdbusconnection.c:1879
+#: gio/gdbusconnection.c:1897
 msgid "Timeout was reached"
 msgstr "Denbora-mugara iritsi da"
 
-#: ../gio/gdbusconnection.c:2500
+#: gio/gdbusconnection.c:2518
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
-msgstr ""
-"Onartu gabeko banderak aurkitu dira bezeroaren aldeko konexioa eraikitzean"
+msgstr "Onartu gabeko banderak aurkitu dira bezeroaren aldeko konexioa eraikitzean"
 
-#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
+#: gio/gdbusconnection.c:4147 gio/gdbusconnection.c:4494
 #, c-format
 msgid ""
-"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
-msgstr ""
-"Ez dago 'org.freedesktop.DBus.Properties' bezalako interfazerik '%s' bide-"
-"izeneko objektuan"
+"No such interface “org.freedesktop.DBus.Properties” on object at path %s"
+msgstr "Ez dago “org.freedesktop.DBus.Properties” interfazerik %s bide-izeneko objektuan"
 
-#: ../gio/gdbusconnection.c:4266
+#: gio/gdbusconnection.c:4289
 #, c-format
-msgid "No such property '%s'"
-msgstr "Ez dago '%s' bezalako propietaterik"
+msgid "No such property “%s”"
+msgstr "Ez dago “%s“ propietaterik"
 
-#: ../gio/gdbusconnection.c:4278
+#: gio/gdbusconnection.c:4301
 #, c-format
-msgid "Property '%s' is not readable"
-msgstr "%s propietatea ez da irakurgarria"
+msgid "Property “%s” is not readable"
+msgstr "“%s“ propietatea ez da irakurgarria"
 
-#: ../gio/gdbusconnection.c:4289
+#: gio/gdbusconnection.c:4312
 #, c-format
-msgid "Property '%s' is not writable"
-msgstr "%s propietatea ez da idazgarria"
+msgid "Property “%s” is not writable"
+msgstr "“%s“ propietatea ez da idazgarria"
 
-#: ../gio/gdbusconnection.c:4309
+#: gio/gdbusconnection.c:4332
 #, c-format
-msgid "Error setting property '%s': Expected type '%s' but got '%s'"
-msgstr ""
-"Errorea '%s' propietatea ezartzean: '%s' mota espero zen, baina '%s' lortu da"
+msgid "Error setting property “%s”: Expected type “%s” but got “%s”"
+msgstr "Errorea “%s“ propietatea ezartzean: “%s“ mota espero zen, baina “%s“ lortu da"
 
-#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
-#: ../gio/gdbusconnection.c:6586
+#: gio/gdbusconnection.c:4437 gio/gdbusconnection.c:4645
+#: gio/gdbusconnection.c:6614
 #, c-format
-msgid "No such interface '%s'"
-msgstr "Ez dago '%s' bezalako interfazerik"
+msgid "No such interface “%s”"
+msgstr "Ez dago “%s“ interfazerik"
 
-#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095
+#: gio/gdbusconnection.c:4863 gio/gdbusconnection.c:7123
 #, c-format
-msgid "No such interface '%s' on object at path %s"
-msgstr "Ez dago '%s' bezalako interfazerik '%s' bide-izeneko objektuan"
+msgid "No such interface “%s” on object at path %s"
+msgstr "Ez dago “%s“ interfazerik %s bide-izeneko objektuan"
 
-#: ../gio/gdbusconnection.c:4938
+#: gio/gdbusconnection.c:4961
 #, c-format
-msgid "No such method '%s'"
-msgstr "Ez dago '%s' bezalako metodorik"
+msgid "No such method “%s”"
+msgstr "Ez dago “%s“ metodorik"
 
-#: ../gio/gdbusconnection.c:4969
+#: gio/gdbusconnection.c:4992
 #, c-format
-msgid "Type of message, '%s', does not match expected type '%s'"
-msgstr "'%s' mezu mota ez dator bat espero zen '%s' motarekin"
+msgid "Type of message, “%s”, does not match expected type “%s”"
+msgstr "“%s“ mezu mota ez dator bat espero zen “%s“ motarekin"
 
-#: ../gio/gdbusconnection.c:5167
+#: gio/gdbusconnection.c:5190
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Jadanik objektu bat esportatuta dago %s interfazearentzako %s(e)n"
 
-#: ../gio/gdbusconnection.c:5393
+#: gio/gdbusconnection.c:5416
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "Ezin da %s.%s propietatea eskuratu"
 
-#: ../gio/gdbusconnection.c:5449
+#: gio/gdbusconnection.c:5472
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "Ezin da %s.%s propietatea ezarri"
 
-#: ../gio/gdbusconnection.c:5625
+#: gio/gdbusconnection.c:5650
 #, c-format
-msgid "Method '%s' returned type '%s', but expected '%s'"
-msgstr "'%s' metodoak '%s' mota itzuli du, baina '%s' espero zen"
+msgid "Method “%s” returned type “%s”, but expected “%s”"
+msgstr "“%s“ metodoak “%s“ mota itzuli du, baina “%s“ espero zen"
 
-#: ../gio/gdbusconnection.c:6697
+#: gio/gdbusconnection.c:6725
 #, c-format
-msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
-msgstr ""
-"'%2$s' interfazeko '%1$s' metodoa '%3$s' sinadurarekin ez da existitzen"
+msgid "Method “%s” on interface “%s” with signature “%s” does not exist"
+msgstr "“%s“ metodoa, “%s“ interfazekoa eta “%s“ sinadura duena, ez da existitzen"
 
-#: ../gio/gdbusconnection.c:6818
+#: gio/gdbusconnection.c:6846
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Azpizuhaitza jadanik %s(e)ra esportatuta"
 
-#: ../gio/gdbusconnection.c:7146
-#, c-format
-msgid ""
-"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Ezin da bus-aren helbidea zehaztua inguruneko DBUS_STARTER_BUS_TYPE "
-"aldagaitik. '%s' balio ezezaguna"
-
-#: ../gio/gdbusmessage.c:1246
+#: gio/gdbusmessage.c:1251
 msgid "type is INVALID"
 msgstr "mota baliogabea da"
 
-#: ../gio/gdbusmessage.c:1257
+#: gio/gdbusmessage.c:1262
 msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
 msgstr "METHOD_CALL-en mezua: goiburuko PATH edo MEMBER eremua falta da"
 
-#: ../gio/gdbusmessage.c:1268
+#: gio/gdbusmessage.c:1273
 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
 msgstr "METHOD_RETURN-en mezua: goiburuko REPLY_SERIAL eremua falta da"
 
-#: ../gio/gdbusmessage.c:1280
+#: gio/gdbusmessage.c:1285
 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
 msgstr "ERROR-en mezua: goiburuko REPLY_SERIAL edo ERROR_NAME eremua falta da"
 
-#: ../gio/gdbusmessage.c:1293
+#: gio/gdbusmessage.c:1298
 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
 msgstr "SIGNAL-en mezua: goiburuko PATH, INTERFACE edo MEMBER eremua falta da"
 
-#: ../gio/gdbusmessage.c:1301
+#: gio/gdbusmessage.c:1306
 msgid ""
 "SIGNAL message: The PATH header field is using the reserved value /org/"
 "freedesktop/DBus/Local"
-msgstr ""
-"SIGNAL-en mezua: goiburuko PATH eremua '/org/freedesktop/DBus/Local' balio "
-"erreserbatua erabiltzen ari da"
+msgstr "SIGNAL-en mezua: goiburuko PATH eremua '/org/freedesktop/DBus/Local' balio erreserbatua erabiltzen ari da"
 
-#: ../gio/gdbusmessage.c:1309
+#: gio/gdbusmessage.c:1314
 msgid ""
 "SIGNAL message: The INTERFACE header field is using the reserved value org."
 "freedesktop.DBus.Local"
-msgstr ""
-"SIGNAL-en mezua: goiburuko INTERFACE eremua '/org/freedesktop/DBus/Local' "
-"balio erreserbatua erabiltzen ari da"
+msgstr "SIGNAL-en mezua: goiburuko INTERFACE eremua '/org/freedesktop/DBus/Local' balio erreserbatua erabiltzen ari da"
 
-#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
+#: gio/gdbusmessage.c:1362 gio/gdbusmessage.c:1422
 #, 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] "byte %lu irakurtzea nahi zen, baina soilik %lu lortu da"
 msgstr[1] "%lu byte irakurtzea nahi ziren, baina %lu lortu da"
 
-#: ../gio/gdbusmessage.c:1371
+#: gio/gdbusmessage.c:1376
 #, c-format
 msgid "Expected NUL byte after the string “%s” but found byte %d"
-msgstr ""
-"NUL bytea espero zen “%s“ katearen ondoren, baina “%d“ bytea aurkitu da"
+msgstr "NUL bytea espero zen “%s“ katearen ondoren, baina “%d“ bytea aurkitu da"
 
-#: ../gio/gdbusmessage.c:1390
+#: gio/gdbusmessage.c:1395
 #, c-format
 msgid ""
 "Expected valid UTF-8 string but found invalid bytes at byte offset %d "
 "(length of string is %d). The valid UTF-8 string up until that point was “%s”"
-msgstr ""
-"Baliozko UTF-8 katea espero zen, baina baliogabeko byte batzuk aurkitu dira "
-"byteen %d desplazamenduan (katearen luzera: %d). Ordurarteko baliozko UTF-8 "
-"katea honakoa zen: “%s“"
+msgstr "Baliozko UTF-8 katea espero zen, baina baliogabeko byte batzuk aurkitu dira byteen %d desplazamenduan (katearen luzera: %d). Ordurarteko baliozko UTF-8 katea honakoa zen: “%s“"
 
-#: ../gio/gdbusmessage.c:1589
+#: gio/gdbusmessage.c:1598
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus object path"
-msgstr ""
-"Analizatutako “%s“ balioa ez da baliozko D-Bus objektuaren bide-izen bat"
+msgstr "Analizatutako “%s“ balioa ez da baliozko D-Bus objektuaren bide-izen bat"
 
-#: ../gio/gdbusmessage.c:1611
+#: gio/gdbusmessage.c:1620
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature"
 msgstr "Analizatutako “%s“ balioa ez da baliozko D-Bus sinadura"
 
-#: ../gio/gdbusmessage.c:1658
+#: gio/gdbusmessage.c:1667
 #, 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] ""
-"%u byte luzerako matrizea aurkituta. Gehienezko luzera 2<<26 byte da (64 "
-"MiB)."
-msgstr[1] ""
-"%u byte luzerako matrizea aurkituta. Gehienezko luzera 2<<26 byte da (64 "
-"MiB)."
+msgstr[0] "%u byte luzerako matrizea aurkituta. Gehieneko luzera 2<<26 byte da (64 MiB)."
+msgstr[1] "%u byte luzerako matrizea aurkituta. Gehieneko luzera 2<<26 byte da (64 MiB)."
 
-#: ../gio/gdbusmessage.c:1678
+#: gio/gdbusmessage.c:1687
 #, c-format
 msgid ""
 "Encountered array of type “a%c”, expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
-msgstr ""
-"“a%c' motako matrizea aurkitu da, expected to have a length a multiple of %u "
-"byteko multiploko luzera edukitzea espero zen, baina %u byteko luzera du"
+msgstr "“a%c' motako matrizea aurkitu da, expected to have a length a multiple of %u byteko multiploko luzera edukitzea espero zen, baina %u byteko luzera du"
 
-#: ../gio/gdbusmessage.c:1845
+#: gio/gdbusmessage.c:1857
 #, c-format
 msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
-msgstr ""
-"Analizatutako “%s“ balioa aldagaiarentzat ez da baliozko D-Bus sinadura bat"
+msgstr "Analizatutako “%s“ balioa aldagaiarentzat ez da baliozko D-Bus sinadura bat"
 
-#: ../gio/gdbusmessage.c:1869
+#: gio/gdbusmessage.c:1881
 #, c-format
 msgid ""
 "Error deserializing GVariant with type string “%s” from the D-Bus wire format"
-msgstr ""
-"Errorea GVariant deserializatzean “%s“ kate motarekin D-Bus konexioko "
-"formatutik"
+msgstr "Errorea GVariant deserializatzean “%s“ kate motarekin D-Bus konexioko formatutik"
 
-#: ../gio/gdbusmessage.c:2053
+#: gio/gdbusmessage.c:2066
 #, c-format
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value "
 "0x%02x"
-msgstr ""
-"Baliogabeko endian balioa. 0x6c (“l“) edo 0x42 (“B“) espero zen, baina 0x"
-"%02x balioa aurkitu da."
+msgstr "Baliogabeko endian balioa. 0x6c (“l“) edo 0x42 (“B“) espero zen, baina 0x%02x balioa aurkitu da."
 
-#: ../gio/gdbusmessage.c:2066
+#: gio/gdbusmessage.c:2079
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
-msgstr ""
-"Protokoloaren bertsio nagusia baliogabea. 1 espero zen, baina %d aurkitu da"
+msgstr "Protokoloaren bertsio nagusia baliogabea. 1 espero zen, baina %d aurkitu da"
+
+#: gio/gdbusmessage.c:2132 gio/gdbusmessage.c:2727
+msgid "Signature header found but is not of type signature"
+msgstr "Sinaduraren goiburua aurkitu da, baina ez da sinadura motakoa"
 
-#: ../gio/gdbusmessage.c:2122
+#: gio/gdbusmessage.c:2144
 #, c-format
 msgid "Signature header with signature “%s” found but message body is empty"
-msgstr ""
-"Sinaduraren goiburua “%s“ sinadurarekin aurkitu da, baina gorputza hutsik "
-"dago"
+msgstr "Sinaduraren goiburua “%s“ sinadurarekin aurkitu da, baina gorputza hutsik dago"
 
-#: ../gio/gdbusmessage.c:2136
+#: gio/gdbusmessage.c:2159
 #, c-format
 msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
-msgstr ""
-"Analizatutako “%s“ balioa ez da baliozko D-Bus sinadura (gorputzarentzako)"
+msgstr "Analizatutako “%s“ balioa ez da baliozko D-Bus sinadura (gorputzarentzako)"
 
-#: ../gio/gdbusmessage.c:2166
+#: gio/gdbusmessage.c:2190
 #, 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] ""
-"Ez dago sinaduraren goibururik mezuan, baina mezuaren gorputzak %u byte du"
-msgstr[1] ""
-"Ez dago sinaduraren goibururik mezuan, baina mezuaren gorputzak %u byte ditu"
+msgstr[0] "Ez dago sinaduraren goibururik mezuan, baina mezuaren gorputzak %u byte du"
+msgstr[1] "Ez dago sinaduraren goibururik mezuan, baina mezuaren gorputzak %u byte ditu"
 
-#: ../gio/gdbusmessage.c:2176
+#: gio/gdbusmessage.c:2200
 msgid "Cannot deserialize message: "
 msgstr "Ezin da mezua deserializatu: "
 
-#: ../gio/gdbusmessage.c:2517
+#: gio/gdbusmessage.c:2544
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
-msgstr ""
-"Errorea GVariant serializatzean “%s“ kate motarekin D-Bus konexioaren "
-"formatura"
+msgstr "Errorea GVariant serializatzean “%s“ kate motarekin D-Bus konexioaren formatura"
 
-#: ../gio/gdbusmessage.c:2654
+#: gio/gdbusmessage.c:2681
 #, c-format
 msgid ""
-"Message has %d file descriptors but the header field indicates %d file "
-"descriptors"
-msgstr ""
-"Mezuak fitxategi-deskriptore %d du baina goiburuko eremuak %d fitxategi-"
-"deskriptore adierazten ditu"
+"Number of file descriptors in message (%d) differs from header field (%d)"
+msgstr "Mezuko fitxategi-deskriptoreen kopurua (%d) goiburu-eremukoaren (%d) desberdina da"
 
-#: ../gio/gdbusmessage.c:2662
+#: gio/gdbusmessage.c:2689
 msgid "Cannot serialize message: "
 msgstr "Ezin da mezua serializatu: "
 
-#: ../gio/gdbusmessage.c:2706
+#: gio/gdbusmessage.c:2742
 #, c-format
 msgid "Message body has signature “%s” but there is no signature header"
-msgstr ""
-"Mezuaren gorputzak “%s“ sinadura du, baina ez dago sinaduraren goibururik"
+msgstr "Mezuaren gorputzak “%s“ sinadura du, baina ez dago sinaduraren goibururik"
 
-#: ../gio/gdbusmessage.c:2716
+#: gio/gdbusmessage.c:2752
 #, c-format
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
 "“%s”"
-msgstr ""
-"Mezuaren gorputzak “%s“ sinadura mota du, baina goiburuaren eremuko sinadura "
-"“%s“ da"
+msgstr "Mezuaren gorputzak “%s“ sinadura mota du, baina goiburuaren eremuko sinadura “%s“ da"
 
-#: ../gio/gdbusmessage.c:2732
+#: gio/gdbusmessage.c:2768
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)”"
-msgstr ""
-"Mezuaren gorputza hutsik dago, baina goiburuaren eremuko sinadura “(%s)“ da"
+msgstr "Mezuaren gorputza hutsik dago, baina goiburuaren eremuko sinadura “(%s)“ da"
 
-#: ../gio/gdbusmessage.c:3285
+#: gio/gdbusmessage.c:3321
 #, c-format
 msgid "Error return with body of type “%s”"
-msgstr "Errorearen itzulera “'%s“ motako gorputzarekin "
+msgstr "Errorearen itzulera “'%s“ motako gorputzarekin"
 
-#: ../gio/gdbusmessage.c:3293
+#: gio/gdbusmessage.c:3329
 msgid "Error return with empty body"
 msgstr "Errorearen itzulera gorputz hutsarekin"
 
-#: ../gio/gdbusprivate.c:2066
+#: gio/gdbusprivate.c:2243
+#, c-format
+msgid "(Type any character to close this window)\n"
+msgstr "(Sakatu edozer tekla leihoa ixteko)\n"
+
+#: gio/gdbusprivate.c:2417
+#, c-format
+msgid "Session dbus not running, and autolaunch failed"
+msgstr "Saioaren dbus ez da exekutatzen ari, eta abiarazte automatikoak huts egin du"
+
+#: gio/gdbusprivate.c:2440
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Ezin da hardwarearen profila eskuratu: %s"
 
-#: ../gio/gdbusprivate.c:2111
+#: gio/gdbusprivate.c:2485
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "Ezin da /var/lib/dbus/machine-id edo /etc/machine-id kargatu: "
 
-#: ../gio/gdbusproxy.c:1611
+#: gio/gdbusproxy.c:1617
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Errorea %s(r)en StartServiceByName deia egitean: "
 
-#: ../gio/gdbusproxy.c:1634
+#: gio/gdbusproxy.c:1640
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
-msgstr "Ustekabeko %d erantzuna StartServiceByName(\"%s\") metodotik"
+msgstr "Ustekabeko %d erantzuna StartServiceByName(“%s“) metodotik"
 
-#: ../gio/gdbusproxy.c:2719 ../gio/gdbusproxy.c:2853
+#: gio/gdbusproxy.c:2740 gio/gdbusproxy.c:2875
+#, c-format
 msgid ""
-"Cannot invoke method; proxy is for a well-known name without an owner and "
-"proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
-msgstr ""
-"Ezin da metodoari deitu: proxy-ak jaberik gabeko izen ezaguna du eta "
-"G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START banderarekin eraiki zen"
+"Cannot invoke method; proxy is for the well-known name %s without an owner, "
+"and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
+msgstr "Ezin da metodoari deitu: proxyak jaberik gabeko %s izen ezaguna du eta G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START banderarekin eraiki zen"
 
-#: ../gio/gdbusserver.c:708
+#: gio/gdbusserver.c:708
 msgid "Abstract name space not supported"
 msgstr "Izen abstraktuen lekua ez dago onartuta"
 
-#: ../gio/gdbusserver.c:795
+#: gio/gdbusserver.c:795
 msgid "Cannot specify nonce file when creating a server"
 msgstr "Ezin da izendapeneko fitxategia zehaztu zerbitzari bat sortzean"
 
-#: ../gio/gdbusserver.c:876
+#: gio/gdbusserver.c:876
 #, c-format
 msgid "Error writing nonce file at “%s”: %s"
 msgstr "Errorea “%s“ izendapeneko fitxategian idaztean: %s"
 
-#: ../gio/gdbusserver.c:1047
+#: gio/gdbusserver.c:1047
 #, c-format
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "“%s“ katea ez da baliozko D-Bus GUID bat"
 
-#: ../gio/gdbusserver.c:1087
+#: gio/gdbusserver.c:1087
 #, c-format
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Ezin da onartu gabeko “%s“ garraioa entzun"
 
-#: ../gio/gdbus-tool.c:95
-#, c-format
-#| msgid ""
-#| "Commands:\n"
-#| "  help         Shows this information\n"
-#| "  introspect   Introspect a remote object\n"
-#| "  monitor      Monitor a remote object\n"
-#| "  call         Invoke a method on a remote object\n"
-#| "  emit         Emit a signal\n"
-#| "\n"
-#| "Use “%s COMMAND --help” to get help on each command.\n"
+#: gio/gdbus-tool.c:107
+#, c-format
 msgid ""
 "Commands:\n"
 "  help         Shows this information\n"
@@ -1018,8 +923,7 @@ msgid ""
 "  wait         Wait for a bus name to appear\n"
 "\n"
 "Use “%s COMMAND --help” to get help on each command.\n"
-msgstr ""
-"Komandoak:\n"
+msgstr "Komandoak:\n"
 "  help         Informazio hau erakusten du\n"
 "  introspect   Urruneko objektu baten introspekzioa\n"
 "  monitor      Urruneko objektu bat monitorizatzen du\n"
@@ -1029,372 +933,350 @@ msgstr ""
 "\n"
 "Erabili “%s KOMANDOA --help“ komando bakoitzari dagokion laguntza lortzeko.\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:197 gio/gdbus-tool.c:264 gio/gdbus-tool.c:336
+#: gio/gdbus-tool.c:360 gio/gdbus-tool.c:846 gio/gdbus-tool.c:1183
+#: gio/gdbus-tool.c:1668
 #, c-format
 msgid "Error: %s\n"
 msgstr "Errorea: %s\n"
 
-#: ../gio/gdbus-tool.c:176 ../gio/gdbus-tool.c:240 ../gio/gdbus-tool.c:1526
+#: gio/gdbus-tool.c:208 gio/gdbus-tool.c:277 gio/gdbus-tool.c:1684
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Errorea introspekzioko XMLa analizatzean: %s\n"
 
-#: ../gio/gdbus-tool.c:209
+#: gio/gdbus-tool.c:246
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Errorea: '%s' ez da baliozko izena\n"
 
-#: ../gio/gdbus-tool.c:357
+#: gio/gdbus-tool.c:394
 msgid "Connect to the system bus"
 msgstr "Konektatu sistemako bus-arekin"
 
-#: ../gio/gdbus-tool.c:358
+#: gio/gdbus-tool.c:395
 msgid "Connect to the session bus"
 msgstr "Konektatu saioko bus-arekin"
 
-#: ../gio/gdbus-tool.c:359
+#: gio/gdbus-tool.c:396
 msgid "Connect to given D-Bus address"
 msgstr "Konektatu emandako D-Bus helbidera"
 
-#: ../gio/gdbus-tool.c:369
+#: gio/gdbus-tool.c:406
 msgid "Connection Endpoint Options:"
 msgstr "Konexioaren amaierako puntuaren aukerak:"
 
-#: ../gio/gdbus-tool.c:370
+#: gio/gdbus-tool.c:407
 msgid "Options specifying the connection endpoint"
 msgstr "Aukerak konexioaren amaierako puntua zehaztuz"
 
-#: ../gio/gdbus-tool.c:392
+#: gio/gdbus-tool.c:429
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Ez da konexioaren amaierako punturik zehaztu"
 
-#: ../gio/gdbus-tool.c:402
+#: gio/gdbus-tool.c:439
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Konexioaren hainbat amaierako puntu zehaztu dira"
 
-#: ../gio/gdbus-tool.c:472
+#: gio/gdbus-tool.c:509
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s” does not exist\n"
-msgstr ""
-"Abisua: introspekzioko datuen arabera, “%s“ interfazea ez da existitzen\n"
+msgstr "Abisua: introspekzioko datuen arabera, “%s“ interfazea ez da existitzen\n"
 
-#: ../gio/gdbus-tool.c:481
+#: gio/gdbus-tool.c:518
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s” does not exist on "
 "interface “%s”\n"
-msgstr ""
-"Abisua: introspekzioko datuen arabera, “%s“ metodoa ez da existitzen “%s“ "
-"interfazean\n"
+msgstr "Abisua: introspekzioko datuen arabera, “%s“ metodoa ez da existitzen “%s“ interfazean\n"
 
-#: ../gio/gdbus-tool.c:543
+#: gio/gdbus-tool.c:580
 msgid "Optional destination for signal (unique name)"
 msgstr "Seinalearen aukerazko helburua (izen esklusiboa)"
 
-#: ../gio/gdbus-tool.c:544
+#: gio/gdbus-tool.c:581
 msgid "Object path to emit signal on"
 msgstr "Objektuaren bide-izena bere gainera seinalea igortzeko"
 
-#: ../gio/gdbus-tool.c:545
+#: gio/gdbus-tool.c:582
 msgid "Signal and interface name"
 msgstr "Seinale eta interfazearen izena"
 
-#: ../gio/gdbus-tool.c:579
+#: gio/gdbus-tool.c:615
 msgid "Emit a signal."
 msgstr "Igorri seinale bat."
 
-#: ../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:670 gio/gdbus-tool.c:977 gio/gdbus-tool.c:1771
+#: gio/gdbus-tool.c:2003 gio/gdbus-tool.c:2223
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Errorea konektatzean: %s\n"
 
-#: ../gio/gdbus-tool.c:625
+#: gio/gdbus-tool.c:690
 #, c-format
-msgid "Error: object path not specified.\n"
-msgstr "Errorea: objektuaren bide-izena ez da zehaztu.\n"
+msgid "Error: %s is not a valid unique bus name.\n"
+msgstr "Errorea: '%s' ez da bus-aren baliozko izen esklusiboa\n"
+
+#: gio/gdbus-tool.c:709 gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1814
+msgid "Error: Object path is not specified\n"
+msgstr "Errorea: objektuaren bide-izena ez dago zehaztuta\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:732 gio/gdbus-tool.c:1040 gio/gdbus-tool.c:1834
+#: gio/gdbus-tool.c:2074
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Errorea: '%s' ez da objektuaren baliozko bide-izena\n"
 
-#: ../gio/gdbus-tool.c:636
-#, c-format
-msgid "Error: signal not specified.\n"
-msgstr "Errorea: seinalea ez da zehaztu.\n"
+#: gio/gdbus-tool.c:752
+msgid "Error: Signal name is not specified\n"
+msgstr "Errorea: seinalearen izena ez dago zehaztuta\n"
 
-#: ../gio/gdbus-tool.c:643
+#: gio/gdbus-tool.c:766
 #, c-format
-msgid "Error: signal must be the fully-qualified name.\n"
-msgstr "Errorea: seinaleak erabat kualifikatutako izena eduki behar du.\n"
+msgid "Error: Signal name “%s” is invalid\n"
+msgstr "Errorea: “%s“ seinalearen izena baliogabea da\n"
 
-#: ../gio/gdbus-tool.c:651
+#: gio/gdbus-tool.c:778
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Errorea: '%s' ez da interfazearen baliozko izena\n"
 
-#: ../gio/gdbus-tool.c:657
+#: gio/gdbus-tool.c:784
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Errorea: '%s' ez da kidearen baliozko izena\n"
 
-#: ../gio/gdbus-tool.c:663
-#, c-format
-msgid "Error: %s is not a valid unique bus name.\n"
-msgstr "Errorea: '%s' ez da bus-aren baliozko izen esklusiboa\n"
-
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:700 ../gio/gdbus-tool.c:1037
+#: gio/gdbus-tool.c:821 gio/gdbus-tool.c:1152
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Errorea %d parametroa analizatzean: %s\n"
 
-#: ../gio/gdbus-tool.c:732
+#: gio/gdbus-tool.c:853
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Errorea konexioa garbitzean: %s\n"
 
-#: ../gio/gdbus-tool.c:759
+#: gio/gdbus-tool.c:880
 msgid "Destination name to invoke method on"
 msgstr "Helburuaren izena metodoari deitzeko"
 
-#: ../gio/gdbus-tool.c:760
+#: gio/gdbus-tool.c:881
 msgid "Object path to invoke method on"
 msgstr "Objektuaren bide-izena metodoari deitzeko"
 
-#: ../gio/gdbus-tool.c:761
+#: gio/gdbus-tool.c:882
 msgid "Method and interface name"
 msgstr "Metodo eta interfazearen izena"
 
-#: ../gio/gdbus-tool.c:762
+#: gio/gdbus-tool.c:883
 msgid "Timeout in seconds"
 msgstr "Denbora-muga (segundotan)"
 
-#: ../gio/gdbus-tool.c:803
+#: gio/gdbus-tool.c:922
 msgid "Invoke a method on a remote object."
 msgstr "Deitu metodo bati urruneko objektu batean."
 
-#: ../gio/gdbus-tool.c:878 ../gio/gdbus-tool.c:1635 ../gio/gdbus-tool.c:1870
-#, c-format
+#: gio/gdbus-tool.c:994 gio/gdbus-tool.c:1788 gio/gdbus-tool.c:2028
 msgid "Error: Destination is not specified\n"
 msgstr "Errorea: helburua ez dago zehaztuta\n"
 
-#: ../gio/gdbus-tool.c:890 ../gio/gdbus-tool.c:1652 ../gio/gdbus-tool.c:1882
+#: gio/gdbus-tool.c:1005 gio/gdbus-tool.c:1805 gio/gdbus-tool.c:2039
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Errorea: '%s' ez da busaren baliozko izena\n"
 
-#: ../gio/gdbus-tool.c:905 ../gio/gdbus-tool.c:1661
-#, c-format
-msgid "Error: Object path is not specified\n"
-msgstr "Errorea: objektuaren bide-izena ez dago zehaztuta\n"
-
-#: ../gio/gdbus-tool.c:940
-#, c-format
+#: gio/gdbus-tool.c:1055
 msgid "Error: Method name is not specified\n"
 msgstr "Errorea: metodoaren izena ez dago zehaztuta\n"
 
-#: ../gio/gdbus-tool.c:951
+#: gio/gdbus-tool.c:1066
 #, c-format
 msgid "Error: Method name “%s” is invalid\n"
 msgstr "Errorea: “%s“ metodoaren izena baliogabea da\n"
 
-#: ../gio/gdbus-tool.c:1029
+#: gio/gdbus-tool.c:1144
 #, c-format
 msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Errorea “%2$s“ motako %1$d parametroa analizatzean: %3$s\n"
 
-#: ../gio/gdbus-tool.c:1473
+#: gio/gdbus-tool.c:1630
 msgid "Destination name to introspect"
 msgstr "Helburuko izena introspekzioa egiteko"
 
-#: ../gio/gdbus-tool.c:1474
+#: gio/gdbus-tool.c:1631
 msgid "Object path to introspect"
 msgstr "Objektuaren bide-izena introspekzioa egiteko"
 
-#: ../gio/gdbus-tool.c:1475
+#: gio/gdbus-tool.c:1632
 msgid "Print XML"
 msgstr "Inprimatu XML"
 
-#: ../gio/gdbus-tool.c:1476
+#: gio/gdbus-tool.c:1633
 msgid "Introspect children"
 msgstr "Aztertu umeen barnean"
 
-#: ../gio/gdbus-tool.c:1477
+#: gio/gdbus-tool.c:1634
 msgid "Only print properties"
 msgstr "Soilik inprimatzeko propietateak"
 
-#: ../gio/gdbus-tool.c:1568
+#: gio/gdbus-tool.c:1723
 msgid "Introspect a remote object."
 msgstr "Urruneko objektu baten introspekzioa egin."
 
-#: ../gio/gdbus-tool.c:1773
+#: gio/gdbus-tool.c:1929
 msgid "Destination name to monitor"
 msgstr "Helburuko izena monitorizatzeko"
 
-#: ../gio/gdbus-tool.c:1774
+#: gio/gdbus-tool.c:1930
 msgid "Object path to monitor"
 msgstr "Objektuaren bide-izena monitorizatzeko"
 
-#: ../gio/gdbus-tool.c:1803
+#: gio/gdbus-tool.c:1955
 msgid "Monitor a remote object."
 msgstr "Monitorizatu urruneko objektu bat."
 
-#: ../gio/gdbus-tool.c:1980
+#: gio/gdbus-tool.c:2013
+msgid "Error: can’t monitor a non-message-bus connection\n"
+msgstr "Errorea: ezin da monitorizatu non-message-bus konexio bat\n"
+
+#: gio/gdbus-tool.c:2137
 msgid "Service to activate before waiting for the other one (well-known name)"
-msgstr ""
-"Aktibatu beharreko zerbitzua bestearen (izen ezaguna) zain egon aurretik"
+msgstr "Aktibatu beharreko zerbitzua bestearen (izen ezaguna) zain egon aurretik"
 
-#: ../gio/gdbus-tool.c:1983
+#: gio/gdbus-tool.c:2140
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
-msgstr ""
-"Denbora-muga errore batekin irten aurretik zain egoteko (segundotan); "
-"0 denbora-mugarik ez (lehenetsia)"
+msgstr "Denbora-muga errore batekin irten aurretik zain egoteko (segundotan); 0 denbora-mugarik ez (lehenetsia)"
 
-#: ../gio/gdbus-tool.c:2031
-#| msgid "[OPTION…]"
+#: gio/gdbus-tool.c:2188
 msgid "[OPTION…] BUS-NAME"
 msgstr "[AUKERA…] BUS-IZENA"
 
-#: ../gio/gdbus-tool.c:2033
+#: gio/gdbus-tool.c:2189
 msgid "Wait for a bus name to appear."
 msgstr "Bus-izen bat agertzeko zain egon."
 
-#: ../gio/gdbus-tool.c:2109
-#, c-format
-#| msgid "Error: object path not specified.\n"
+#: gio/gdbus-tool.c:2265
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Errorea: zerbitzua zehaztu behar da aktibatzeko.\n"
 
-#: ../gio/gdbus-tool.c:2114
-#, c-format
-#| msgid "Error: object path not specified.\n"
+#: gio/gdbus-tool.c:2270
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Errorea: zerbitzua zehaztu behar da haren zain egoteko.\n"
 
-#: ../gio/gdbus-tool.c:2119
-#, c-format
-#| msgid "Too many arguments"
+#: gio/gdbus-tool.c:2275
 msgid "Error: Too many arguments.\n"
 msgstr "Errorea: argumentu gehiegi.\n"
 
-#: ../gio/gdbus-tool.c:2127 ../gio/gdbus-tool.c:2134
+#: gio/gdbus-tool.c:2283 gio/gdbus-tool.c:2290
 #, c-format
-#| msgid "Error: %s is not a valid bus name\n"
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Errorea: '%s' ez da busaren izen ezagun bat\n"
 
-#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4533
+#: gio/gdesktopappinfo.c:2041 gio/gdesktopappinfo.c:4822
 msgid "Unnamed"
 msgstr "Izengabea"
 
-#: ../gio/gdesktopappinfo.c:2411
+#: gio/gdesktopappinfo.c:2451
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Mahaigaineko fitxategiak ez du Exec eremua zehaztu"
 
-#: ../gio/gdesktopappinfo.c:2696
+#: gio/gdesktopappinfo.c:2710
 msgid "Unable to find terminal required for application"
 msgstr "Ezin izan da aplikazioak eskatzen duen terminala aurkitu"
 
-#: ../gio/gdesktopappinfo.c:3129
+#: gio/gdesktopappinfo.c:3362
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
-msgstr ""
-"Ezin da erabiltzailearen aplikazioaren %s konfigurazio-karpeta sortu: %s"
+msgstr "Ezin da erabiltzailearen aplikazioaren %s konfigurazio-karpeta sortu: %s"
 
-#: ../gio/gdesktopappinfo.c:3133
+#: gio/gdesktopappinfo.c:3366
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Ezin da erabiltzailearen MIMEren %s konfigurazio-karpeta sortu: %s"
 
-#: ../gio/gdesktopappinfo.c:3373 ../gio/gdesktopappinfo.c:3397
+#: gio/gdesktopappinfo.c:3606 gio/gdesktopappinfo.c:3630
 msgid "Application information lacks an identifier"
 msgstr "Aplikazioaren informazioari identifikatzaile bat falta zaio"
 
-#: ../gio/gdesktopappinfo.c:3631
+#: gio/gdesktopappinfo.c:3864
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Ezin da erabiltzailearen mahaigaineko %s fitxategia sortu"
 
-#: ../gio/gdesktopappinfo.c:3765
+#: gio/gdesktopappinfo.c:3998
 #, c-format
 msgid "Custom definition for %s"
 msgstr "%s(r)en definizio pertsonalizatua"
 
-#: ../gio/gdrive.c:417
+#: gio/gdrive.c:417
 msgid "drive doesn’t implement eject"
 msgstr "gailuak ez dauka “egotzi“ inplementatuta"
 
 #. 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 "gailuak ez dauka “egotzi“ edo “egotzi eragiketarekin“ inplementatuta"
 
-#: ../gio/gdrive.c:571
+#: gio/gdrive.c:571
 msgid "drive doesn’t implement polling for media"
 msgstr "gailuak ez dauka euskarria eskaneatzeko inplementaziorik"
 
-#: ../gio/gdrive.c:776
+#: gio/gdrive.c:778
 msgid "drive doesn’t implement start"
 msgstr "gailuak ez dauka “abiatu“ inplementatuta"
 
-#: ../gio/gdrive.c:878
+#: gio/gdrive.c:880
 msgid "drive doesn’t implement stop"
 msgstr "gailuak ez dauka “gelditu“ inplementatuta"
 
-#: ../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 euskarria ez dago erabilgarri"
 
-#: ../gio/gdummytlsbackend.c:419
+#: gio/gdummytlsbackend.c:419
 msgid "DTLS support is not available"
 msgstr "DTLS euskarria ez dago erabilgarri"
 
-#: ../gio/gemblem.c:323
+#: gio/gemblem.c:323
 #, c-format
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Ezin da GEmblem kodeketaren %d bertsioa kudeatu"
 
-#: ../gio/gemblem.c:333
+#: gio/gemblem.c:333
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Gaizki osatutako token kopurua (%d) GEmblem kodeketan"
 
-#: ../gio/gemblemedicon.c:362
+#: gio/gemblemedicon.c:362
 #, c-format
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Ezin da GEmblemedIcon kodeketaren %d bertsioa kudeatu"
 
-#: ../gio/gemblemedicon.c:372
+#: gio/gemblemedicon.c:372
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Gaizki osatutako token kopurua (%d) GEmblemedIcon kodeketan"
 
-#: ../gio/gemblemedicon.c:395
+#: gio/gemblemedicon.c:395
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "GEmblen espero zen GEmblemedIcon-entzako"
 
-#: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345
-#: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696
-#: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901
-#: ../gio/gfile.c:1956 ../gio/gfile.c:3614 ../gio/gfile.c:3669
-#: ../gio/gfile.c:3905 ../gio/gfile.c:3947 ../gio/gfile.c:4415
-#: ../gio/gfile.c:4826 ../gio/gfile.c:4911 ../gio/gfile.c:5001
-#: ../gio/gfile.c:5098 ../gio/gfile.c:5185 ../gio/gfile.c:5286
-#: ../gio/gfile.c:7827 ../gio/gfile.c:7917 ../gio/gfile.c:8001
-#: ../gio/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:8114 gio/gfile.c:8204 gio/gfile.c:8288
+#: gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Eragiketa ez dago onartuta"
 
@@ -1402,206 +1284,206 @@ msgstr "Eragiketa ez dago onartuta"
 #. * 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 "Ontziaren muntaia ez da existitzen"
 
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2377
+#: gio/gfile.c:2622 gio/glocalfile.c:2446
 msgid "Can’t copy over directory"
 msgstr "Ezin da direktorioaren gainean kopiatu"
 
-#: ../gio/gfile.c:2575
+#: gio/gfile.c:2682
 msgid "Can’t copy directory over directory"
 msgstr "Ezin da direktorioa kopiatu direktorio gainean"
 
-#: ../gio/gfile.c:2583
+#: gio/gfile.c:2690
 msgid "Target file exists"
 msgstr "Helburuko fitxategia existitzen da"
 
-#: ../gio/gfile.c:2602
+#: gio/gfile.c:2709
 msgid "Can’t recursively copy directory"
 msgstr "Ezin da direktorioa errekurtsiboki kopiatu"
 
-#: ../gio/gfile.c:2889
+#: gio/gfile.c:2984
 msgid "Splice not supported"
 msgstr "Lotura ez da onartzen"
 
-#: ../gio/gfile.c:2893
+#: gio/gfile.c:2988 gio/gfile.c:3033
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Errorea fitxategia batzean: %s"
 
-#: ../gio/gfile.c:3025
+#: gio/gfile.c:3149
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "Muntaien artean kopiatzea (reflink/clone) ez dago onartuta"
 
-#: ../gio/gfile.c:3029
+#: gio/gfile.c:3153
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopiatzea (reflink/clone) ez dago onartuta edo baliogabea da"
 
-#: ../gio/gfile.c:3034
+#: gio/gfile.c:3158
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Kopiatzea (reflink/clone) ez dago onartuta edo ez du funtzionatzen"
 
-#: ../gio/gfile.c:3097
+#: gio/gfile.c:3221
 msgid "Can’t copy special file"
 msgstr "Ezin da fitxategi berezia kopiatu"
 
-#: ../gio/gfile.c:3895
+#: gio/gfile.c:4019
 msgid "Invalid symlink value given"
 msgstr "Esteka sinbolikoaren baliogabeko balioa eman da"
 
-#: ../gio/gfile.c:4056
+#: gio/gfile.c:4180
 msgid "Trash not supported"
 msgstr "Zakarrontzira botatzea ez dago onartuta"
 
-#: ../gio/gfile.c:4168
+#: gio/gfile.c:4292
 #, c-format
 msgid "File names cannot contain “%c”"
 msgstr "Fitxategi-izenek ezin dute “%c“ eduki"
 
-#: ../gio/gfile.c:6614 ../gio/gvolume.c:363
+#: gio/gfile.c:6773 gio/gvolume.c:364
 msgid "volume doesn’t implement mount"
 msgstr "bolumenak ez dauka muntatzea inplementatuta"
 
-#: ../gio/gfile.c:6723
+#: gio/gfile.c:6884 gio/gfile.c:6930
 msgid "No application is registered as handling this file"
 msgstr "Ez da aplikaziorik erregistratu fitxategi hau kudeatzeko"
 
-#: ../gio/gfileenumerator.c:212
+#: gio/gfileenumerator.c:212
 msgid "Enumerator is closed"
 msgstr "Enumeratzailea itxi da"
 
-#: ../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 "Fitxategiaren enumeratzaileak eragiketa bat du lanean"
 
-#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467
+#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467
 msgid "File enumerator is already closed"
 msgstr "Fitxategiaren enumeratzailea itxita dago jadanik"
 
-#: ../gio/gfileicon.c:236
+#: gio/gfileicon.c:236
 #, c-format
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Ezin da GFileIcon kodeketaren %d bertsioa kudeatu"
 
-#: ../gio/gfileicon.c:246
+#: gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "Gaizki osatutako sarrerako datuak GFileIcon-entzako"
 
-#: ../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 "Korronteak ez du query_info onartzen"
 
-#: ../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 "Ez da bilaketarik onartzen korrontean"
 
-#: ../gio/gfileinputstream.c:369
+#: gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
 msgstr "Trunkatzea ez da baimentzen sarrerako korrontean"
 
-#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447
+#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447
 msgid "Truncate not supported on stream"
 msgstr "Trunkatzea ez da onartzen korrontean"
 
 #
-#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
-#: ../glib/gconvert.c:1650
+#: gio/ghttpproxy.c:91 gio/gresolver.c:386 gio/gresolver.c:538
+#: glib/gconvert.c:1777
 msgid "Invalid hostname"
 msgstr "Ostalari-izen baliogabea"
 
-#: ../gio/ghttpproxy.c:143
+#: gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "HTTP proxy-aren okerreko erantzuna"
 
-#: ../gio/ghttpproxy.c:159
+#: gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "HTTP proxy-aren konexioa ez dago baimenduta"
 
-#: ../gio/ghttpproxy.c:164
+#: gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "HTTP proxy-aren autentifikazioak huts egin du"
 
-#: ../gio/ghttpproxy.c:167
+#: gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "HTTP proxy-aren autentifikazioa behar da"
 
-#: ../gio/ghttpproxy.c:171
+#: gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "HTTP proxy-aren konexioak huts egin du: %i"
 
-#: ../gio/ghttpproxy.c:269
+#: gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "HTTP proxy zerbitzariak konexioa ustekabean itxi du."
 
-#: ../gio/gicon.c:290
+#: gio/gicon.c:298
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Okerreko token kopurua (%d)"
 
-#: ../gio/gicon.c:310
+#: gio/gicon.c:318
 #, c-format
 msgid "No type for class name %s"
 msgstr "Ez dago %s klasearen izen motarik"
 
-#: ../gio/gicon.c:320
+#: gio/gicon.c:328
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "%s motak ez du GIcon interfazea inplementatzen"
 
-#: ../gio/gicon.c:331
+#: gio/gicon.c:339
 #, c-format
 msgid "Type %s is not classed"
 msgstr "%s mota ez du klaserik"
 
-#: ../gio/gicon.c:345
+#: gio/gicon.c:353
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Gaizko osatutako bertsio zenbakia: %s"
 
-#: ../gio/gicon.c:359
+#: gio/gicon.c:367
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "%s motak ez du from_tokens() inplementatzen GIcon interfazean"
 
-#: ../gio/gicon.c:461
+#: gio/gicon.c:469
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Ezin da ikonoaren kodeketaren emandako bertsioa kudeatu"
 
-#: ../gio/ginetaddressmask.c:182
+#: gio/ginetaddressmask.c:182
 msgid "No address specified"
 msgstr "Ez da helbiderik zehaztu"
 
-#: ../gio/ginetaddressmask.c:190
+#: gio/ginetaddressmask.c:190
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "%u luzera luzeegia da helbidearentzako"
 
-#: ../gio/ginetaddressmask.c:223
+#: gio/ginetaddressmask.c:223
 msgid "Address has bits set beyond prefix length"
 msgstr "Helbideak aurrizkiaren luzera baino harago bitak ditu ezarrita"
 
-#: ../gio/ginetaddressmask.c:300
+#: gio/ginetaddressmask.c:300
 #, c-format
 msgid "Could not parse “%s” as IP address mask"
 msgstr "Ezin izan da “%s“ analizatu IP helbide-maskara gisa"
 
-#: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../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 "Ez dago nahikoa lekurik socket helbideentzako"
 
-#: ../gio/ginetsocketaddress.c:235
+#: gio/ginetsocketaddress.c:235
 msgid "Unsupported socket address"
 msgstr "Onartu gabeko socket helbidea"
 
-#: ../gio/ginputstream.c:188
+#: gio/ginputstream.c:188
 msgid "Input stream doesn’t implement read"
 msgstr "Sarrerako korronteak ez dauka irakurtzea inplementatuta"
 
@@ -1611,1300 +1493,1223 @@ msgstr "Sarrerako korronteak ez dauka irakurtzea inplementatuta"
 #. 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:1670
+#: gio/ginputstream.c:1218 gio/giostream.c:310 gio/goutputstream.c:2208
 msgid "Stream has outstanding operation"
 msgstr "Korronteak eragiketa bat du lanean"
 
-#: ../gio/gio-tool.c:160
+#: gio/gio-tool.c:160
 msgid "Copy with file"
 msgstr "Kopiatu fitxategiarekin"
 
-#: ../gio/gio-tool.c:164
+#: gio/gio-tool.c:164
 msgid "Keep with file when moved"
 msgstr "Mantendu fitxategiarekin lekuz aldatzean"
 
-#: ../gio/gio-tool.c:205
+#: gio/gio-tool.c:205
 msgid "“version” takes no arguments"
 msgstr "“version“ ez du argumenturik hartzen"
 
-#: ../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:861
 msgid "Usage:"
 msgstr "Erabilera:"
 
-#: ../gio/gio-tool.c:210
+#: gio/gio-tool.c:210
 msgid "Print version information and exit."
 msgstr "Erakutsi bertsioaren informazioa eta irten"
 
-#: ../gio/gio-tool.c:224
-msgid "[ARGS...]"
-msgstr "[ARGUMENTUAK...]"
-
-#: ../gio/gio-tool.c:226
+#: gio/gio-tool.c:226
 msgid "Commands:"
 msgstr "Komandoak:"
 
-#: ../gio/gio-tool.c:229
+#: gio/gio-tool.c:229
 msgid "Concatenate files to standard output"
 msgstr "Kateatu fitxategiak irteera estandarrera"
 
-#: ../gio/gio-tool.c:230
+#: gio/gio-tool.c:230
 msgid "Copy one or more files"
 msgstr "Kopiatu fitxategi bat edo gehiago"
 
-#: ../gio/gio-tool.c:231
+#: gio/gio-tool.c:231
 msgid "Show information about locations"
 msgstr "Erakutsi kokalekuei buruzko informazioa"
 
-#: ../gio/gio-tool.c:232
+#: gio/gio-tool.c:232
 msgid "List the contents of locations"
 msgstr "Zerrendatu kokalekuen edukia"
 
-#: ../gio/gio-tool.c:233
+#: gio/gio-tool.c:233
 msgid "Get or set the handler for a mimetype"
 msgstr "lortu edo ezarri MIME mota baten kudeatzailea"
 
-#: ../gio/gio-tool.c:234
+#: gio/gio-tool.c:234
 msgid "Create directories"
 msgstr "Sortu direktorioak"
 
-#: ../gio/gio-tool.c:235
+#: gio/gio-tool.c:235
 msgid "Monitor files and directories for changes"
 msgstr "Monitorizatu fitxategi eta direktorioen aldaketak"
 
-#: ../gio/gio-tool.c:236
+#: gio/gio-tool.c:236
 msgid "Mount or unmount the locations"
 msgstr "Muntatu edo desmuntatu kokalekuak"
 
-#: ../gio/gio-tool.c:237
+#: gio/gio-tool.c:237
 msgid "Move one or more files"
 msgstr "Aldatu fitxategi bat edo gehiago lekuz"
 
-#: ../gio/gio-tool.c:238
+#: gio/gio-tool.c:238
 msgid "Open files with the default application"
 msgstr "Ireki fitxategiak aplikazio lehenetsiarekin"
 
-#: ../gio/gio-tool.c:239
+#: gio/gio-tool.c:239
 msgid "Rename a file"
 msgstr "Aldatu fitxategi-izena"
 
-#: ../gio/gio-tool.c:240
+#: gio/gio-tool.c:240
 msgid "Delete one or more files"
 msgstr "Ezabatu fitxategi bat edo gehiago"
 
-#: ../gio/gio-tool.c:241
+#: gio/gio-tool.c:241
 msgid "Read from standard input and save"
 msgstr "Irakurri sarrera estandarretik eta gorde"
 
-#: ../gio/gio-tool.c:242
+#: gio/gio-tool.c:242
 msgid "Set a file attribute"
 msgstr "Ezarri fitxategiaren atributua"
 
-#: ../gio/gio-tool.c:243
+#: gio/gio-tool.c:243
 msgid "Move files or directories to the trash"
 msgstr "Bota fitxategi edo direktorioak zakarrontzira"
 
-#: ../gio/gio-tool.c:244
+#: gio/gio-tool.c:244
 msgid "Lists the contents of locations in a tree"
 msgstr "Zerrendatu kokalekuen edukia zuhaitz batean"
 
-#: ../gio/gio-tool.c:246
+#: gio/gio-tool.c:246
 #, c-format
 msgid "Use %s to get detailed help.\n"
 msgstr "Erabili %s laguntza xehea lortzeko.\n"
 
-#: ../gio/gio-tool-cat.c:83
-#| msgid "Error writing to file: %s"
+#: gio/gio-tool-cat.c:87
 msgid "Error writing to stdout"
 msgstr "Errorea irteera arruntean (stdout) idaztean"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-cat.c:127 ../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-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:70
+#: gio/gio-tool-remove.c:48 gio/gio-tool-rename.c:45 gio/gio-tool-set.c:89
+#: gio/gio-tool-trash.c:81 gio/gio-tool-tree.c:239
 msgid "LOCATION"
 msgstr "KOKALEKUA"
 
-#: ../gio/gio-tool-cat.c:132
+#: gio/gio-tool-cat.c:138
 msgid "Concatenate files and print to standard output."
 msgstr "Kateatu fitxategiak eta erakutsi irteera estandarrean"
 
-#: ../gio/gio-tool-cat.c:134
+#: gio/gio-tool-cat.c:140
 msgid ""
 "gio cat works just like the traditional cat utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
 "like smb://server/resource/file.txt as location."
-msgstr ""
-"'cat' tresna bezala erabiltzen da 'gio cat', baina GIOren kokalekuak "
-"erabiliz lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil "
-"dezakezu kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt"
+msgstr "'cat' tresna bezala erabiltzen da 'gio cat', baina GIOren kokalekuak erabiliz lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil dezakezu kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt"
 
-#: ../gio/gio-tool-cat.c:156 ../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-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:96
+#: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:136
 msgid "No locations given"
 msgstr "Ez da kokalekurik eman"
 
-#: ../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 "Ez dago helburuko direktorioa"
 
-#: ../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 "Erakutsi jarraipena"
 
-#: ../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 "Galdetu gainidatzi aurretik"
 
-#: ../gio/gio-tool-copy.c:45
+#: gio/gio-tool-copy.c:45
 msgid "Preserve all attributes"
 msgstr "Mantendu atributu guztiak"
 
-#: ../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 "Egin existitzen diren helburuko fitxategien babeskopia"
 
-#: ../gio/gio-tool-copy.c:47
+#: gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
 msgstr "Inoiz ez jarraitu esteka sinbolikoak"
 
-#: ../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 "Transferituta: %s / %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 "ITURBURUA"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
-#: ../gio/gio-tool-save.c:165
+#: gio/gio-tool-copy.c:98 gio/gio-tool-move.c:94 gio/gio-tool-save.c:160
 msgid "DESTINATION"
 msgstr "HELBURUA"
 
-#: ../gio/gio-tool-copy.c:103
+#: gio/gio-tool-copy.c:103
 msgid "Copy one or more files from SOURCE to DESTINATION."
 msgstr "Kopiatu fitxategi bat edo gehiago ITURBURUtik HELBURUra."
 
-#: ../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"
 "like smb://server/resource/file.txt as location."
-msgstr ""
-"'cp' tresna bezala erabiltzen da 'gio copy', baina GIOren kokalekuak "
-"erabiliz lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil "
-"dezakezu kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt"
+msgstr "'cp' tresna bezala erabiltzen da 'gio copy', baina GIOren kokalekuak erabiliz lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil dezakezu kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt"
 
-#: ../gio/gio-tool-copy.c:147
+#: gio/gio-tool-copy.c:147
 #, c-format
 msgid "Destination %s is not a directory"
 msgstr "'%s' helburua ez da direktorio bat"
 
-#: ../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: gainidatzi “%s“? "
 
-#: ../gio/gio-tool-info.c:34
+#: gio/gio-tool-info.c:34
 msgid "List writable attributes"
 msgstr "Zerrendatu atributu idazgarriak"
 
-#: ../gio/gio-tool-info.c:35
+#: gio/gio-tool-info.c:35
 msgid "Get file system info"
 msgstr "Lortu fitxategi-sistemako informazioa"
 
-#: ../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 "Atributuak lortzeko"
 
-#: ../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 "ATRIBUTUAK"
 
-#: ../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 "Ez jarraitu esteka sinbolikoak"
 
-#: ../gio/gio-tool-info.c:75
-#, c-format
+#: gio/gio-tool-info.c:75
 msgid "attributes:\n"
 msgstr "atributuak:\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 "bistaratu izena: %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 "editatu izena: %s\n"
 
-#: ../gio/gio-tool-info.c:138
+#: gio/gio-tool-info.c:138
 #, c-format
 msgid "name: %s\n"
 msgstr "izena: %s\n"
 
-#: ../gio/gio-tool-info.c:145
+#: gio/gio-tool-info.c:145
 #, c-format
 msgid "type: %s\n"
 msgstr "mota: %s\n"
 
-#: ../gio/gio-tool-info.c:151
-#, c-format
+#: gio/gio-tool-info.c:151
 msgid "size: "
 msgstr "tamaina: "
 
-#: ../gio/gio-tool-info.c:156
-#, c-format
+#: gio/gio-tool-info.c:156
 msgid "hidden\n"
 msgstr "ezkutukoa\n"
 
-#: ../gio/gio-tool-info.c:159
+#: gio/gio-tool-info.c:159
 #, c-format
 msgid "uri: %s\n"
 msgstr "URIa: %s\n"
 
-#: ../gio/gio-tool-info.c:228
-#, c-format
+#: gio/gio-tool-info.c:228
 msgid "Settable attributes:\n"
 msgstr "Atributu ezargarriak:\n"
 
-#: ../gio/gio-tool-info.c:252
-#, c-format
+#: gio/gio-tool-info.c:252
 msgid "Writable attribute namespaces:\n"
 msgstr "Atributu idazgarrien izen-espazioak:\n"
 
-#: ../gio/gio-tool-info.c:287
+#: gio/gio-tool-info.c:287
 msgid "Show information about locations."
 msgstr "Erakutsi kokalekuei buruzko informazioa."
 
-#: ../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"
 "like smb://server/resource/file.txt as location. File attributes can\n"
 "be specified with their GIO name, e.g. standard::icon, or just by\n"
 "namespace, e.g. unix, or by “*”, which matches all attributes"
-msgstr ""
-"“ls“ tresna bezala erabiltzen da “gio info“, baina GIOren kokalekuak "
-"erabiliz \n"
+msgstr "“ls“ tresna bezala erabiltzen da “gio info“, baina GIOren kokalekuak erabiliz \n"
 "lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil dezakezu\n"
 "kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt. Fitxategiaren\n"
 "atributuak haien GIO izenekin zehatz daiteke, adibidez, standard::icon edo\n"
 "izen-espazioarekin, adib. unix edo “*“ (atributu guztiekin bat datorrelarik)."
 
-#: ../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 "Erakutsi ezkutuko fitxategiak"
 
-#: ../gio/gio-tool-list.c:37
+#: gio/gio-tool-list.c:37
 msgid "Use a long listing format"
 msgstr "Erabili zerrenda luzeen formatua"
 
-#: ../gio/gio-tool-list.c:39
+#: gio/gio-tool-list.c:39
 msgid "Print full URIs"
 msgstr "Erakutsi URI osoak"
 
-#: ../gio/gio-tool-list.c:170
+#: gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
 msgstr "Zerrendatu kokalekuen edukia."
 
-#: ../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"
 "like smb://server/resource/file.txt as location. File attributes can\n"
 "be specified with their GIO name, e.g. standard::icon"
-msgstr ""
-"'ls' tresna bezala erabiltzen da 'gio list', baina GIOren kokalekuak "
-"erabiliz \n"
+msgstr "'ls' tresna bezala erabiltzen da 'gio list', baina GIOren kokalekuak erabiliz \n"
 "lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil dezakezu\n"
 "kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt. Fixategiaren\n"
 "atributuak haien GIO izenekin zehatz daiteke, adibidez, standard::icon"
 
 #. Translators: commandline placeholder
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "MIMETYPE"
 msgstr "MIMEMOTA"
 
-#: ../gio/gio-tool-mime.c:71
+#: gio/gio-tool-mime.c:71
 msgid "HANDLER"
 msgstr "KUDEATZAILEA"
 
-#: ../gio/gio-tool-mime.c:76
+#: gio/gio-tool-mime.c:76
 msgid "Get or set the handler for a mimetype."
 msgstr "Lortu edo ezarri MIME mota baten kudeatzailea."
 
-#: ../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 ""
-"Ez bada kudeatzailerik ematen, MIME motarentzako erregistratutako\n"
+msgstr "Ez bada kudeatzailerik ematen, MIME motarentzako erregistratutako\n"
 "eta gomendatutako aplikazio guztiak zerrendatzen ditu. Kudeatzaile\n"
 "bat ematen bada, MIME motaren kudeatzaile lehenetsi gisa ezarriko da."
 
-#: ../gio/gio-tool-mime.c:100
+#: gio/gio-tool-mime.c:100
 msgid "Must specify a single mimetype, and maybe a handler"
 msgstr "MIME mota bakarra zehaztu behar da, eta agian kudeatzaile bat"
 
-#: ../gio/gio-tool-mime.c:116
+#: gio/gio-tool-mime.c:116
 #, c-format
 msgid "No default applications for “%s”\n"
 msgstr "Ez dago “%s“(r)en aplikazio lehenetsirik\n"
 
-#: ../gio/gio-tool-mime.c:122
+#: gio/gio-tool-mime.c:122
 #, c-format
 msgid "Default application for “%s”: %s\n"
 msgstr "“%s“(r)en aplikazio lehenetsia: %s\n"
 
-#: ../gio/gio-tool-mime.c:127
-#, c-format
+#: gio/gio-tool-mime.c:127
 msgid "Registered applications:\n"
 msgstr "Erregistratutako aplikazioak:\n"
 
-#: ../gio/gio-tool-mime.c:129
-#, c-format
+#: gio/gio-tool-mime.c:129
 msgid "No registered applications\n"
 msgstr "Ez dago erregistratutako aplikaziorik\n"
 
-#: ../gio/gio-tool-mime.c:140
-#, c-format
+#: gio/gio-tool-mime.c:140
 msgid "Recommended applications:\n"
 msgstr "Gomendatutako aplikazioak:\n"
 
-#: ../gio/gio-tool-mime.c:142
-#, c-format
+#: gio/gio-tool-mime.c:142
 msgid "No recommended applications\n"
 msgstr "Ez dago gomendatutako aplikaziorik\n"
 
-#: ../gio/gio-tool-mime.c:162
+#: gio/gio-tool-mime.c:162
 #, c-format
-#| msgid "Failed to load info for handler “%s”\n"
 msgid "Failed to load info for handler “%s”"
 msgstr "Huts egin du ”%s” kudeatzailearen informazioa kargatzean"
 
-#: ../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 ""
-"Huts egin du “%s“ kudeatzaile lehenetsi gisa ezartzean “%s“(r)entzako: %s\n"
+msgstr "Huts egin du “%s“ kudeatzaile lehenetsi gisa ezartzean “%s“(r)entzako: %s\n"
 
-#: ../gio/gio-tool-mkdir.c:31
+#: gio/gio-tool-mkdir.c:31
 msgid "Create parent directories"
 msgstr "Sortu direktorio gurasoak"
 
-#: ../gio/gio-tool-mkdir.c:52
+#: gio/gio-tool-mkdir.c:52
 msgid "Create directories."
 msgstr "Sortu direktorioak."
 
-#: ../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"
 "like smb://server/resource/mydir as location."
-msgstr ""
-"'mkdir' tresna bezala erabiltzen da 'gio mkdir', baina GIOren kokalekuak\n"
-"erabiliz lokaleko fitxategien ordez Adibidez, honelako zerbait erabil "
-"dezakezu\n"
+msgstr "'mkdir' tresna bezala erabiltzen da 'gio mkdir', baina GIOren kokalekuak\n"
+"erabiliz lokaleko fitxategien ordez Adibidez, honelako zerbait erabil dezakezu\n"
 "kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt"
 
-#: ../gio/gio-tool-monitor.c:37
+#: gio/gio-tool-monitor.c:37
 msgid "Monitor a directory (default: depends on type)"
 msgstr "Monitorizatu direktorio bat (lehenetsia: motaren arabera)"
 
-#: ../gio/gio-tool-monitor.c:39
+#: gio/gio-tool-monitor.c:39
 msgid "Monitor a file (default: depends on type)"
 msgstr "Monitorizatu direktorio bat (lehenetsia: motaren arabera)"
 
-#: ../gio/gio-tool-monitor.c:41
+#: gio/gio-tool-monitor.c:41
 msgid "Monitor a file directly (notices changes made via hardlinks)"
-msgstr ""
-"Monitorizatu fitxategi bat (esteka gogorren bidez egindako aldaketaz "
-"ohartzen du)"
+msgstr "Monitorizatu fitxategi bat (esteka gogorren bidez egindako aldaketaz ohartzen du)"
 
-#: ../gio/gio-tool-monitor.c:43
+#: gio/gio-tool-monitor.c:43
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Monitorizatu fitxategi bat zuzenean, baina ez eman aldaketen berri"
 
-#: ../gio/gio-tool-monitor.c:45
+#: gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
 msgstr "Eman leku eta izen aldaketen berri ezabatutako/sortutako gertaera gisa"
 
-#: ../gio/gio-tool-monitor.c:47
+#: gio/gio-tool-monitor.c:47
 msgid "Watch for mount events"
 msgstr "Zaindu muntaketen gertaerak"
 
-#: ../gio/gio-tool-monitor.c:208
+#: gio/gio-tool-monitor.c:208
 msgid "Monitor files or directories for changes."
 msgstr "Monitorizatu fitxategi edo direktorioen aldaketak"
 
-#: ../gio/gio-tool-mount.c:58
+#: gio/gio-tool-mount.c:63
 msgid "Mount as mountable"
 msgstr "Muntatu muntagarri gisa"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:64
 msgid "Mount volume with device file"
 msgstr "Muntatu bolumena gailu-fitxategiarekin"
 
-#: ../gio/gio-tool-mount.c:59
+#: gio/gio-tool-mount.c:64 gio/gio-tool-mount.c:67
 msgid "DEVICE"
 msgstr "GAILUA"
 
-#: ../gio/gio-tool-mount.c:60
+#: gio/gio-tool-mount.c:65
 msgid "Unmount"
 msgstr "Desmuntatu"
 
-#: ../gio/gio-tool-mount.c:61
+#: gio/gio-tool-mount.c:66
 msgid "Eject"
 msgstr "Egotzi"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:67
+msgid "Stop drive with device file"
+msgstr "Gelditu unitatea gailu-fitxategiarekin"
+
+#: gio/gio-tool-mount.c:68
 msgid "Unmount all mounts with the given scheme"
 msgstr "Desmuntatu muntatze-puntu guztiak emandako eskemarekin"
 
-#: ../gio/gio-tool-mount.c:62
+#: gio/gio-tool-mount.c:68
 msgid "SCHEME"
 msgstr "ESKEMA"
 
-#: ../gio/gio-tool-mount.c:63
+#: gio/gio-tool-mount.c:69
 msgid "Ignore outstanding file operations when unmounting or ejecting"
-msgstr ""
-"Ez ikusi egin amaitu gabeko fitxategien eragiketei desmuntatzean edo "
-"egozketan"
+msgstr "Ez ikusi egin amaitu gabeko fitxategien eragiketei desmuntatzean edo egozketan"
 
-#: ../gio/gio-tool-mount.c:64
+#: gio/gio-tool-mount.c:70
 msgid "Use an anonymous user when authenticating"
 msgstr "Erabili erabiltzaile anonimoa autentifikatzean"
 
 #. 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 "Zerrenda"
 
-#: ../gio/gio-tool-mount.c:67
+#: gio/gio-tool-mount.c:73
 msgid "Monitor events"
 msgstr "Monitorearen gertaerak"
 
-#: ../gio/gio-tool-mount.c:68
+#: gio/gio-tool-mount.c:74
 msgid "Show extra information"
 msgstr "Erakutsi informazio gehigarria"
 
-#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
-#| msgid "Error mounting location: Anonymous access denied\n"
+#: gio/gio-tool-mount.c:75
+msgid "The numeric PIM when unlocking a VeraCrypt volume"
+msgstr "Zenbakizko PIMa VeraCrypt bolumen bat desblokeatzean"
+
+#: gio/gio-tool-mount.c:75
+msgid "PIM"
+msgstr "PIM"
+
+#: gio/gio-tool-mount.c:76
+msgid "Mount a TCRYPT hidden volume"
+msgstr "Muntatu TCRYPT bolumen ezkutu bat"
+
+#: gio/gio-tool-mount.c:77
+msgid "Mount a TCRYPT system volume"
+msgstr "Muntatu TCRYPT sistema-bolumen bat"
+
+#: gio/gio-tool-mount.c:265 gio/gio-tool-mount.c:297
 msgid "Anonymous access denied"
 msgstr "Anonimoki atzitzea debekatua"
 
-#: ../gio/gio-tool-mount.c:897
+#: gio/gio-tool-mount.c:522
+msgid "No drive for device file"
+msgstr "Ez dago unitaterik gailu-fitxategirako"
+
+#: gio/gio-tool-mount.c:975
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s hemen muntatuta: %s\n"
 
-#: ../gio/gio-tool-mount.c:950
-#| msgid "No volume for device file %s\n"
+#: gio/gio-tool-mount.c:1027
 msgid "No volume for device file"
 msgstr "Ez dago bolumenik gailu-fitxategiarentzako"
 
-#: ../gio/gio-tool-mount.c:1145
+#: gio/gio-tool-mount.c:1216
 msgid "Mount or unmount the locations."
 msgstr "Muntatu edo desmuntatu kokalekuak."
 
-#: ../gio/gio-tool-move.c:42
+#: gio/gio-tool-move.c:42
 msgid "Don’t use copy and delete fallback"
 msgstr "Ez erabili ordezkoaren kopia eta ezabatzea"
 
-#: ../gio/gio-tool-move.c:99
+#: gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "Aldatu fitxategi bat edo gehiago lekuz ITURBURUtik HELBURUra."
 
-#: ../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"
 "like smb://server/resource/file.txt as location"
-msgstr ""
-"'mv' tresna bezala erabiltzen da 'gio move', baina GIOren kokalekuak\n"
+msgstr "'mv' tresna bezala erabiltzen da 'gio move', baina GIOren kokalekuak\n"
 "erabiliz lokaleko fitxategien ordez Adibidez, honelako zerbait erabil\n"
 "dezakezu kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt"
 
-#: ../gio/gio-tool-move.c:142
+#: gio/gio-tool-move.c:143
 #, c-format
 msgid "Target %s is not a directory"
 msgstr "%s helburua ez da direktorioa"
 
-#: ../gio/gio-tool-open.c:50
+#: gio/gio-tool-open.c:75
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
-msgstr ""
-"Ireki fitxategiak mota honetako fitxategiak kudeatzeko\n"
+msgstr "Ireki fitxategiak mota honetako fitxategiak kudeatzeko\n"
 "erregistratuta dagoen aplikazio lehenetsiarekin."
 
-#: ../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 "Ez ikusi egin existitzen ez diren fitxategiei, inoiz ere ez galdetu"
 
-#: ../gio/gio-tool-remove.c:52
+#: gio/gio-tool-remove.c:52
 msgid "Delete the given files."
 msgstr "Ezabatu emandako fitxategiak"
 
-#: ../gio/gio-tool-rename.c:45
+#: gio/gio-tool-rename.c:45
 msgid "NAME"
 msgstr "IZENA"
 
-#: ../gio/gio-tool-rename.c:50
+#: gio/gio-tool-rename.c:50
 msgid "Rename a file."
 msgstr "Aldatu fitxategi-izena."
 
-#: ../gio/gio-tool-rename.c:70
+#: gio/gio-tool-rename.c:70
 msgid "Missing argument"
 msgstr "Argumentua falta da"
 
-#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:195
-#: ../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 "Argumentu gehiegi"
 
-#: ../gio/gio-tool-rename.c:95
+#: gio/gio-tool-rename.c:95
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Izenez ongi aldatu da. URI berria: %s\n"
 
-#: ../gio/gio-tool-save.c:50
+#: gio/gio-tool-save.c:50
 msgid "Only create if not existing"
 msgstr "Sortu soilik ez bada existitzen"
 
-#: ../gio/gio-tool-save.c:51
+#: gio/gio-tool-save.c:51
 msgid "Append to end of file"
 msgstr "Erantsi fitxategiaren amaieran"
 
-#: ../gio/gio-tool-save.c:52
+#: gio/gio-tool-save.c:52
 msgid "When creating, restrict access to the current user"
 msgstr "Sortzean, murriztu uneko erabiltzailearen atzipena"
 
-#: ../gio/gio-tool-save.c:53
+#: gio/gio-tool-save.c:53
 msgid "When replacing, replace as if the destination did not exist"
 msgstr "Ordeztean, ordeztu helburukoa existituko ez balitz bezala"
 
 #. 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 "Inprimatu entitate-etiketa (etag) berria amaieran"
 
 #. 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 "Fitxategiaren entitate-etiketa (etag) gainidazten ari da"
 
-#: ../gio/gio-tool-save.c:57
+#: gio/gio-tool-save.c:57
 msgid "ETAG"
 msgstr "ENTITATE-ETIKETA (ETAG)"
 
-#: ../gio/gio-tool-save.c:119
-#| msgid "Error reading from handle: %s"
+#: gio/gio-tool-save.c:113
 msgid "Error reading from standard input"
 msgstr "Errorea sarrera arruntetik (stdin) irakurtzean"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:145
-#, c-format
+#: gio/gio-tool-save.c:139
 msgid "Etag not available\n"
 msgstr "Entitate-etiketa ez dago eskuragarri\n"
 
-#: ../gio/gio-tool-save.c:168
+#: gio/gio-tool-save.c:163
 msgid "Read from standard input and save to DEST."
 msgstr "Irakurri sarrera estandarretik eta gorde HELBIDEAN."
 
-#: ../gio/gio-tool-save.c:188
+#: gio/gio-tool-save.c:183
 msgid "No destination given"
 msgstr "Ez da helbururik eman"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "Type of the attribute"
 msgstr "Atributu mota"
 
-#: ../gio/gio-tool-set.c:33
+#: gio/gio-tool-set.c:33
 msgid "TYPE"
 msgstr "MOTA"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
 msgstr "ATRIBUTUA"
 
-#: ../gio/gio-tool-set.c:89
+#: gio/gio-tool-set.c:89
 msgid "VALUE"
 msgstr "BALIOA"
 
-#: ../gio/gio-tool-set.c:93
+#: gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr "Ezarri fitxategiaren KOKALEKUA atributua"
 
-#: ../gio/gio-tool-set.c:113
+#: gio/gio-tool-set.c:113
 msgid "Location not specified"
 msgstr "Ez da kokalekurik zehaztu"
 
-#: ../gio/gio-tool-set.c:120
+#: gio/gio-tool-set.c:120
 msgid "Attribute not specified"
 msgstr "Ez da atributurik zehaztu"
 
-#: ../gio/gio-tool-set.c:130
+#: gio/gio-tool-set.c:130
 msgid "Value not specified"
 msgstr "Ez da baliorik zehaztu"
 
-#: ../gio/gio-tool-set.c:180
+#: gio/gio-tool-set.c:180
 #, c-format
-#| msgid "Invalid attribute type %s\n"
 msgid "Invalid attribute type “%s”"
 msgstr "Baliogabeko ”%s” atributu mota"
 
-#: ../gio/gio-tool-trash.c:32
+#: gio/gio-tool-trash.c:32
 msgid "Empty the trash"
 msgstr "Hustu zakarrontzia"
 
-#: ../gio/gio-tool-trash.c:86
+#: gio/gio-tool-trash.c:86
 msgid "Move files or directories to the trash."
 msgstr "Bota fitxategi edo direktorioak zakarrontzira."
 
-#: ../gio/gio-tool-tree.c:33
+#: gio/gio-tool-tree.c:33
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "Jarraitu esteka sinbolikoak, muntatze-puntuak eta lasterbideak"
 
-#: ../gio/gio-tool-tree.c:244
+#: gio/gio-tool-tree.c:244
 msgid "List contents of directories in a tree-like format."
 msgstr "Zerrendatu direktorioen edukia zuhaitz baten bezalako formatuan."
 
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1517
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "<%s> elementua ez da <%s>(r)en barruan onartzen"
 
-#: ../gio/glib-compile-resources.c:146
+#: gio/glib-compile-resources.c:147
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "<%s> elementua ez da maila gorenean onartzen"
 
-#: ../gio/glib-compile-resources.c:237
+#: gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "%s fitxategia hainbat aldiz agertzen da baliabidean"
 
-#: ../gio/glib-compile-resources.c:248
+#: gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate “%s” in any source directory"
 msgstr "Huts egin du “%s“ bilatzean edozein iturburuko direktoriotan"
 
-#: ../gio/glib-compile-resources.c:259
+#: gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate “%s” in current directory"
 msgstr "Huts egin du “%s“ bilatzean uneko direktorioan"
 
-#: ../gio/glib-compile-resources.c:290
+#: gio/glib-compile-resources.c:293
 #, c-format
 msgid "Unknown processing option “%s”"
 msgstr "Prozesuaren “%s“ aukera ezezaguna"
 
-#: ../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 "Huts egin du aldi baterako fitxategia sortu: %s"
+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH"
+msgstr "%s aurreprozesatzea eskatu da, baina %s ez dago ezarrita eta %s ez dago BIDE-IZENA aukeran"
 
-#: ../gio/glib-compile-resources.c:382
+#: gio/glib-compile-resources.c:460
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Errorea '%s' fitxategia irakurtzean: %s"
 
-#: ../gio/glib-compile-resources.c:402
+#: gio/glib-compile-resources.c:480
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Errorea %s fitxategia konprimitzean"
 
-#: ../gio/glib-compile-resources.c:469
+#: gio/glib-compile-resources.c:541
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "testua ezin da <%s>(r)en barruan egon"
 
-#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
+#: gio/glib-compile-resources.c:737 gio/glib-compile-schemas.c:2141
 msgid "Show program version and exit"
 msgstr "Erakutsi programaren bertsioa eta irten"
 
-#: ../gio/glib-compile-resources.c:665
-msgid "name of the output file"
-msgstr "irteerako fitxategiaren izena"
+#: gio/glib-compile-resources.c:738
+msgid "Name of the output file"
+msgstr "Irteerako fitxategiaren izena"
 
-#: ../gio/glib-compile-resources.c:666
+#: gio/glib-compile-resources.c:739
 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 ""
-"Direktorioak, horietarik fitxategiak irakurtzeko (lehenetsia uneko "
-"direktorioa)"
+msgstr "FITXATEGIA atributuak erreferentziatutako fitxategiak kargatzeko direktorioak (lehenetsia: uneko direktorioa)"
 
-#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
-#: ../gio/glib-compile-schemas.c:2096
+#: gio/glib-compile-resources.c:739 gio/glib-compile-schemas.c:2142
+#: gio/glib-compile-schemas.c:2171
 msgid "DIRECTORY"
 msgstr "DIREKTORIOA"
 
-#: ../gio/glib-compile-resources.c:667
+#: gio/glib-compile-resources.c:740
 msgid ""
 "Generate output in the format selected for by the target filename extension"
-msgstr ""
-"Sortu irteera hautatutako formatuan helburuko fitxategiaren luzapenaren "
-"arabera"
+msgstr "Sortu irteera hautatutako formatuan helburuko fitxategiaren luzapenaren arabera"
 
-#: ../gio/glib-compile-resources.c:668
+#: gio/glib-compile-resources.c:741
 msgid "Generate source header"
 msgstr "Sortu iturburuaren goiburua"
 
-#: ../gio/glib-compile-resources.c:669
-msgid "Generate sourcecode used to link in the resource file into your code"
-msgstr ""
-"Sortu iturburuaren kodea (baliabidearen fitxategia zure kodean estekatzeko "
-"erabilita)"
+#: gio/glib-compile-resources.c:742
+msgid "Generate source code used to link in the resource file into your code"
+msgstr "Sortu iturburu-kodea (baliabidearen fitxategia zure kodean estekatzeko erabilita)"
 
-#: ../gio/glib-compile-resources.c:670
+#: gio/glib-compile-resources.c:743
 msgid "Generate dependency list"
 msgstr "Sortu mendekotasunen zerrenda"
 
-#: ../gio/glib-compile-resources.c:671
-msgid "name of the dependency file to generate"
-msgstr "mendekotasunen fitxategiaren izena sortzeko"
+#: gio/glib-compile-resources.c:744
+msgid "Name of the dependency file to generate"
+msgstr "Sortuko den mendekotasun-fitxategiaren izena"
 
-#: ../gio/glib-compile-resources.c:672
+#: gio/glib-compile-resources.c:745
 msgid "Include phony targets in the generated dependency file"
 msgstr "Sartu helburu faltsuak sortutako mendekotasun-fitxategian"
 
-#: ../gio/glib-compile-resources.c:673
+#: gio/glib-compile-resources.c:746
 msgid "Don’t automatically create and register resource"
-msgstr "Ez sortu eta erregistratu baliabidea automatikoki "
+msgstr "Ez sortu eta erregistratu baliabidea automatikoki"
 
-#: ../gio/glib-compile-resources.c:674
+#: gio/glib-compile-resources.c:747
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Ez esportatu funtzioak: deklaratu haiek G_GNUC_INTERNAL gisa"
 
-#: ../gio/glib-compile-resources.c:675
+#: gio/glib-compile-resources.c:748
+msgid ""
+"Don’t embed resource data in the C file; assume it's linked externally "
+"instead"
+msgstr "Ez kapsulatu baliabide-datuak C fitxategian; onartu kanpotik estekatuta dagoela"
+
+#: gio/glib-compile-resources.c:749
 msgid "C identifier name used for the generated source code"
 msgstr "C identifikatzailearen izena (sortutako iturburuaren kodean erabilita)"
 
-#: ../gio/glib-compile-resources.c:701
+#: gio/glib-compile-resources.c:775
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
 "and the resource file have the extension called .gresource."
-msgstr ""
-"Konpilatu baliabidearen zehaztapen bat baliabideko fitxategi batean.\n"
+msgstr "Konpilatu baliabidearen zehaztapen bat baliabideko fitxategi batean.\n"
 "Baliabideen zehaztapenen fitxategiak .gresource.xml luzapena dute,\n"
 "eta baliabideen fitxategiek berriz .gresource luzapena."
 
-#: ../gio/glib-compile-resources.c:723
-#, c-format
+#: gio/glib-compile-resources.c:797
 msgid "You should give exactly one file name\n"
 msgstr "Fitxategi baten izena bakarrik eman behar duzu\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 "goitizenak gutxienez 2 karaktere eduki behar ditu"
 
-#: ../gio/glib-compile-schemas.c:106
+#: gio/glib-compile-schemas.c:106
 #, c-format
-#| msgid "Invalid symlink value given"
 msgid "Invalid numeric value"
 msgstr "Baliogabeko zenbakizko balioa"
 
-#: ../gio/glib-compile-schemas.c:114
+#: gio/glib-compile-schemas.c:114
 #, c-format
-#| msgid "<%s id='%s'> already specified"
 msgid "<value nick='%s'/> already specified"
 msgstr "<value nick='%s'/> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:122
+#: gio/glib-compile-schemas.c:122
 #, c-format
-#| msgid "<key name='%s'> already specified"
 msgid "value='%s' already specified"
 msgstr "\"value='%s'\"  jadanik zehaztuta"
 
-#: ../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 "balioen banderek 1 bit ezarrita eduki behar dute"
 
-#: ../gio/glib-compile-schemas.c:161
+#: gio/glib-compile-schemas.c:161
 #, c-format
 msgid "<%s> must contain at least one <value>"
 msgstr "<%s>(e)k gutxienez <value> bat eduki behar du"
 
-#: ../gio/glib-compile-schemas.c:315
+#: gio/glib-compile-schemas.c:317
 #, c-format
-#| msgid "No connection endpoint specified"
 msgid "<%s> is not contained in the specified range"
 msgstr "<%s> ez dago zehaztutako barrutian"
 
-#: ../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> ez da zehaztutako zenbatutako motaren baliozko kidea"
 
-#: ../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>(e)k badu katerik zehaztutako bandera motetan ez dagoena"
 
-#: ../gio/glib-compile-schemas.c:339
+#: gio/glib-compile-schemas.c:341
 #, c-format
 msgid "<%s> contains a string not in <choices>"
 msgstr "<%s>(e)k badu katerik <choices>-en ez dagoena"
 
-#: ../gio/glib-compile-schemas.c:373
-#| msgid "<key name='%s'> already specified"
+#: gio/glib-compile-schemas.c:375
 msgid "<range/> already specified for this key"
 msgstr "<range/> jadanik zehaztuta gako honentzat"
 
-#: ../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> ez dago baimenduta \"%s\" motako gakoentzako"
+msgstr "<range> ez dago baimenduta “%s“ motako gakoentzako"
 
-#: ../gio/glib-compile-schemas.c:408
+#: gio/glib-compile-schemas.c:410
 #, c-format
 msgid "<range> specified minimum is greater than maximum"
-msgstr "<range> zehaztutako gutxienekoa gehienezkoa baino handiagoa da"
+msgstr "<range> zehaztutako gutxienekoa gehienekoa baino handiagoa da"
 
-#: ../gio/glib-compile-schemas.c:433
+#: gio/glib-compile-schemas.c:435
 #, c-format
 msgid "unsupported l10n category: %s"
 msgstr "onartu gabeko l10n kategoria: %s"
 
-#: ../gio/glib-compile-schemas.c:441
+#: gio/glib-compile-schemas.c:443
 msgid "l10n requested, but no gettext domain given"
 msgstr "l10n eskatuta, baina ez da gettext-en domeinurik eman"
 
-#: ../gio/glib-compile-schemas.c:453
+#: gio/glib-compile-schemas.c:455
 msgid "translation context given for value without l10n enabled"
 msgstr "balioaren emandako itzulpenaren testuingurua l10n gaitu gabe"
 
-#: ../gio/glib-compile-schemas.c:475
+#: gio/glib-compile-schemas.c:477
 #, c-format
-#| msgid "Failed to create file “%s”: %s"
 msgid "Failed to parse <default> value of type “%s”: "
-msgstr "Huts egin du \"%s\" motaren <default> balioa analizatzean"
+msgstr "Huts egin du “%s“ motaren <default> balioa analizatzean "
 
-#: ../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 ""
-"Ezin da <choices> zehaztu zenbatutako mota bat baluten bezalako etiketatutako "
-"gakoentzako"
+msgstr "Ezin da <choices> zehaztu zenbatutako mota bat baluten bezalako etiketatutako gakoentzako"
 
-#: ../gio/glib-compile-schemas.c:501
-#| msgid "<child name='%s'> already specified"
+#: gio/glib-compile-schemas.c:503
 msgid "<choices> already specified for this key"
 msgstr "<choices> jadanik zehaztuta gakoarentzako"
 
-#: ../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> ez dago baimenduta \"%s\" motako gakoentzako"
+msgstr "<choices> ez dago baimenduta “%s“ motako gakoentzako"
 
-#: ../gio/glib-compile-schemas.c:529
+#: gio/glib-compile-schemas.c:531
 #, c-format
-#| msgid "<child name='%s'> already specified"
 msgid "<choice value='%s'/> already given"
 msgstr "<choice value='%s'/>  jadanik emanda"
 
-#: ../gio/glib-compile-schemas.c:544
+#: gio/glib-compile-schemas.c:546
 #, c-format
 msgid "<choices> must contain at least one <choice>"
 msgstr "<choices>-ek gutxienez <choice> bat eduki behar du"
 
-#: ../gio/glib-compile-schemas.c:558
-#| msgid "<child name='%s'> already specified"
+#: gio/glib-compile-schemas.c:560
 msgid "<aliases> already specified for this key"
 msgstr "<aliases> jadanik zehaztuta gako honentzako"
 
-#: ../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> soilik zehatz daitezke zenbatuta edo banderak motetako gakoekin, "
-"edo "
-"<choices> ondoren"
+msgstr "<aliases> soilik zehatz daitezke zenbatuta edo banderak motetako gakoekin, edo <choices> ondoren"
 
-#: ../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'/> eman da \"%s\" jadanik zenbatuta motako kide denean"
+msgstr "<alias value='%s'/> eman da “%s“ jadanik zenbatuta motako kide denean"
 
-#: ../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'/> eman da jadanik <choice value='%s'/> emanda dagoenean"
+msgstr "<alias value='%s'/> eman da jadanik <choice value='%s'/> emanda dagoenean"
 
-#: ../gio/glib-compile-schemas.c:595
+#: gio/glib-compile-schemas.c:597
 #, c-format
-#| msgid "<%s id='%s'> already specified"
 msgid "<alias value='%s'/> already specified"
 msgstr "<alias value='%s'/> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:605
+#: gio/glib-compile-schemas.c:607
 #, c-format
-#| msgid "The pathname “%s” is not an absolute path"
 msgid "alias target “%s” is not in enumerated type"
 msgstr "helburuko “%s” aliasa ez da zenbatuta motakoa"
 
-#: ../gio/glib-compile-schemas.c:606
+#: gio/glib-compile-schemas.c:608
 #, c-format
 msgid "alias target “%s” is not in <choices>"
 msgstr "helburuko “%s” aliasa ez dagon <choices>-en"
 
-#: ../gio/glib-compile-schemas.c:621
+#: gio/glib-compile-schemas.c:623
 #, c-format
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases>-ek gutxienez <alias> bat eduki behar du"
 
-#: ../gio/glib-compile-schemas.c:786
-#| msgid "empty names are not permitted"
+#: gio/glib-compile-schemas.c:800
 msgid "Empty names are not permitted"
 msgstr "Izen hutsak ez daude baimenduta"
 
-#: ../gio/glib-compile-schemas.c:796
+#: gio/glib-compile-schemas.c:810
 #, 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 "“%s“ izena baliogabea: izenak letra minuskula batekin hasi behar dira"
 
-#: ../gio/glib-compile-schemas.c:808
+#: gio/glib-compile-schemas.c:822
 #, c-format
-#| msgid ""
-#| "invalid name '%s': invalid character '%c'; only lowercase letters, "
-#| "numbers and hyphen ('-') are permitted."
 msgid ""
 "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
 "and hyphen (“-”) are permitted"
-msgstr ""
-"“%s“ izena baliogabea: “%c“ karakterea baliogabea. soilik letra minuskulak, "
-"zenbakiak eta hipenazioa (“-“) onartzen dira."
+msgstr "“%s“ izena baliogabea: “%c“ karakterea baliogabea. soilik letra minuskulak, zenbakiak eta hipenazioa (“-“) onartzen dira."
 
-#: ../gio/glib-compile-schemas.c:817
+#: gio/glib-compile-schemas.c:831
 #, c-format
-#| msgid "invalid name '%s': two successive hyphens ('--') are not permitted."
 msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted"
 msgstr "“%s“ izena baliogabea: bi hipenazio jarraian (“--“) ez dago onartuta."
 
-#: ../gio/glib-compile-schemas.c:826
+#: gio/glib-compile-schemas.c:840
 #, c-format
-#| msgid "invalid name '%s': the last character may not be a hyphen ('-')."
 msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)"
 msgstr "“%s“ izena baliogabea: azken karakterea ezin da hipenazioa (“-“) izan."
 
-#: ../gio/glib-compile-schemas.c:834
+#: gio/glib-compile-schemas.c:848
 #, c-format
-#| msgid "invalid name '%s': maximum length is 1024"
 msgid "Invalid name “%s”: maximum length is 1024"
-msgstr "“%s“ izena baliogabea: gehienezko luzera 1024 da"
+msgstr "“%s“ izena baliogabea: gehieneko luzera 1024 da"
 
-#: ../gio/glib-compile-schemas.c:904
+#: gio/glib-compile-schemas.c:920
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:930
-#| msgid "cannot add keys to a 'list-of' schema"
+#: gio/glib-compile-schemas.c:946
 msgid "Cannot add keys to a “list-of” schema"
 msgstr "Ezin zaio gakorik gehitu “list-of“ eskema bati"
 
-#: ../gio/glib-compile-schemas.c:941
+#: gio/glib-compile-schemas.c:957
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:959
+#: gio/glib-compile-schemas.c:975
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
 "to modify value"
-msgstr ""
-"<key name='%s'>-ek <key name='%s'> iluntzen du <schema id='%s'>-en; erabili "
-"<override> balioa aldatzeko"
+msgstr "<key name='%s'>-ek <key name='%s'> iluntzen du <schema id='%s'>-en; erabili <override> balioa aldatzeko"
 
-#: ../gio/glib-compile-schemas.c:970
+#: gio/glib-compile-schemas.c:986
 #, c-format
-#| msgid ""
-#| "exactly one of 'type', 'enum' or 'flags' must be specified as an "
-#| "attribute to <key>"
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
 "to <key>"
-msgstr ""
-"<key>-rentzako hauetariko bat zehaztu behar da atributu gisa: “type“, “enum“"
-"edo “flags“"
+msgstr "<key>-rentzako hauetariko bat zehaztu behar da atributu gisa: “type“, “enum“edo “flags“"
 
-#: ../gio/glib-compile-schemas.c:989
+#: gio/glib-compile-schemas.c:1005
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> ez dago (oraindik) definituta."
 
-#: ../gio/glib-compile-schemas.c:1004
+#: gio/glib-compile-schemas.c:1020
 #, c-format
-#| msgid "invalid GVariant type string '%s'"
 msgid "Invalid GVariant type string “%s”"
 msgstr "Baliogabeko GVariant motako “%s“ katea"
 
-#: ../gio/glib-compile-schemas.c:1034
-#| msgid "<override> given but schema isn't extending anything"
+#: gio/glib-compile-schemas.c:1050
 msgid "<override> given but schema isn’t extending anything"
 msgstr "<override> eman da, baina eskema ez da ezer hedatzen ari"
 
-#: ../gio/glib-compile-schemas.c:1047
+#: gio/glib-compile-schemas.c:1063
 #, c-format
-#| msgid "no <key name='%s'> to override"
 msgid "No <key name='%s'> to override"
 msgstr "Ez dago <key name='%s'>(e)rik gainidazteko"
 
-#: ../gio/glib-compile-schemas.c:1055
+#: gio/glib-compile-schemas.c:1071
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:1128
+#: gio/glib-compile-schemas.c:1144
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:1140
+#: gio/glib-compile-schemas.c:1156
 #, c-format
-#| msgid "<schema id='%s'> extends not yet existing schema '%s'"
 msgid "<schema id='%s'> extends not yet existing schema “%s”"
 msgstr "<schema id='%s'>  oraindik existitzen ez den “%s“ eskema hedatzen du"
 
-#: ../gio/glib-compile-schemas.c:1156
+#: gio/glib-compile-schemas.c:1172
 #, c-format
-#| msgid "<schema id='%s'> is list of not yet existing schema '%s'"
 msgid "<schema id='%s'> is list of not yet existing schema “%s”"
 msgstr "<schema id='%s'> oraindik existitzen ez den “%s“ eskemaren zerrenda da"
 
-#: ../gio/glib-compile-schemas.c:1164
+#: gio/glib-compile-schemas.c:1180
 #, c-format
-#| msgid "Can not be a list of a schema with a path"
 msgid "Cannot be a list of a schema with a path"
 msgstr "Ezin da bide-izena duen eskema baten zerrenda izan"
 
-#: ../gio/glib-compile-schemas.c:1174
+#: gio/glib-compile-schemas.c:1190
 #, c-format
-#| msgid "Can not extend a schema with a path"
 msgid "Cannot extend a schema with a path"
 msgstr "Ezin da eskema bat bide-izen batekin hedatu"
 
-#: ../gio/glib-compile-schemas.c:1184
+#: gio/glib-compile-schemas.c:1200
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
-msgstr ""
-"<schema id='%s'> zerrenda bat da, zerrenda ez den <schema id='%s'> hedatzen "
-"duena"
+msgstr "<schema id='%s'> zerrenda bat da, zerrenda ez den <schema id='%s'> hedatzen duena"
 
-#: ../gio/glib-compile-schemas.c:1194
+#: gio/glib-compile-schemas.c:1210
 #, c-format
-#| msgid ""
-#| "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but "
-#| "'%s' does not extend '%s'"
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
 "does not extend “%s”"
-msgstr ""
-"<schema id='%s' list-of='%s'>(e)k <schema id='%s' list-of='%s'> hedatzen du, "
-"baina “%s“(e)k ez du “%s“ hedatzen"
+msgstr "<schema id='%s' list-of='%s'>(e)k <schema id='%s' list-of='%s'> hedatzen du, baina “%s“(e)k ez du “%s“ hedatzen"
 
-#: ../gio/glib-compile-schemas.c:1211
+#: gio/glib-compile-schemas.c:1227
 #, c-format
-#| msgid "a path, if given, must begin and end with a slash"
 msgid "A path, if given, must begin and end with a slash"
 msgstr "Bide-izen bat ematen bada, barra batekin (/) hasi eta amaitu behar da"
 
-#: ../gio/glib-compile-schemas.c:1218
+#: gio/glib-compile-schemas.c:1234
 #, c-format
-#| msgid "the path of a list must end with ':/'"
 msgid "The path of a list must end with “:/”"
 msgstr "Zerrenda bateko bide-izena “:/“-rekin amaitu behar da"
 
-#: ../gio/glib-compile-schemas.c:1227
+#: gio/glib-compile-schemas.c:1243
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
 "desktop/” or “/system/” are deprecated."
-msgstr ""
-"Abisua: \"%s\" eskemak \"%s\" bide-izena du. \"/apps/\", \"/desktop/\" edo "
-"\"/system/\"-ekin "
-"hasten diren bide-izenak zaharkituta daude."
+msgstr "Abisua: “%s“ eskemak “%s“ bide-izena du. \"/apps/\", \"/desktop/\" edo \"/system/\"-ekin hasten diren bide-izenak zaharkituta daude."
 
-#: ../gio/glib-compile-schemas.c:1257
+#: gio/glib-compile-schemas.c:1273
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> jadanik zehaztuta"
 
-#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
+#: gio/glib-compile-schemas.c:1423 gio/glib-compile-schemas.c:1439
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
 msgstr "Soilik <%s> elementu bakarra onartzen da <%s>(r)en barruan"
 
-#: ../gio/glib-compile-schemas.c:1505
+#: gio/glib-compile-schemas.c:1521
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr "<%s> elementua ez da maila gorenean onartzen"
 
-#: ../gio/glib-compile-schemas.c:1523
+#: gio/glib-compile-schemas.c:1539
 msgid "Element <default> is required in <key>"
 msgstr "<default> elementua behar da <key>-en"
 
-#: ../gio/glib-compile-schemas.c:1613
+#: gio/glib-compile-schemas.c:1629
 #, c-format
-#| msgid "text may not appear inside <%s>"
 msgid "Text may not appear inside <%s>"
 msgstr "Testua ezin da <%s>(r)en barruan egon"
 
-#: ../gio/glib-compile-schemas.c:1681
+#: gio/glib-compile-schemas.c:1697
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Abisua: definitu gabeko erreferentzia  <schema id='%s'/>-erako"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
-#: ../gio/glib-compile-schemas.c:1970
+#: gio/glib-compile-schemas.c:1836 gio/glib-compile-schemas.c:1912
+#: gio/glib-compile-schemas.c:2027
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict zehaztu da; irtetzen.\n"
 
-#: ../gio/glib-compile-schemas.c:1830
+#: gio/glib-compile-schemas.c:1846
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Fitxategi oso honi ezikusi egin zaio.\n"
 
-#: ../gio/glib-compile-schemas.c:1890
+#: gio/glib-compile-schemas.c:1908
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Fitxategi honi ezikusi egiten.\n"
 
-#: ../gio/glib-compile-schemas.c:1930
+#: gio/glib-compile-schemas.c:1961
 #, c-format
-msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
-msgstr ""
-"Ez dago '%s' bezalako gakorik '%s' eskeman gainidazteko '%s' fitxategian "
-"ageri den bezala"
+msgid "No such key “%s” in schema “%s” as specified in override file “%s”"
+msgstr "Ez dago “%s” gakorik “%s” eskeman gainidazteko “%s” fitxategian ageri den bezala"
 
-#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
-#: ../gio/glib-compile-schemas.c:2022
+#: gio/glib-compile-schemas.c:1967 gio/glib-compile-schemas.c:1992
+#: gio/glib-compile-schemas.c:2052 gio/glib-compile-schemas.c:2081
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; gainidazketari ezikusi egiten gako honentzako.\n"
 
-#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
-#: ../gio/glib-compile-schemas.c:2026
+#: gio/glib-compile-schemas.c:1971 gio/glib-compile-schemas.c:1996
+#: gio/glib-compile-schemas.c:2056 gio/glib-compile-schemas.c:2085
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " eta --strict zehaztu da; irtetzen.\n"
 
-#: ../gio/glib-compile-schemas.c:1956
+#: gio/glib-compile-schemas.c:1986
+#, c-format
+msgid ""
+"cannot provide per-desktop overrides for localised key “%s” in schema "
+"“%s” (override file “%s”)"
+msgstr "ezin dira mahaigainaren araberako gaindidazteak hornitu “%s” gako lokalizatuetarako “%s” eskeman (gainidatzi “%s” fitxategia)"
+
+#: gio/glib-compile-schemas.c:2013
 #, c-format
 msgid ""
-"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
-msgstr ""
-"errorea '%2$s' eskemako '%1$s' gakoa analizatzean gainidazteko '%3$s' "
-"fitxategian ageri den bezala: %4$s."
+"error parsing key “%s” in schema “%s” as specified in override file “%s”: %s."
+msgstr "errorea \"%s\" gakoa (“%s“ eskemakoa) analizatzean “%s” gainidazte-fitxategian ageri den bezala: %s."
 
-#: ../gio/glib-compile-schemas.c:1966
+#: gio/glib-compile-schemas.c:2023
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Gainidazketari ezikusi egiten gako honentzako.\n"
 
-#: ../gio/glib-compile-schemas.c:1984
+#: gio/glib-compile-schemas.c:2042
 #, 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 ""
-"gainidazteko '%3$s' fitxategiko '%2$s' eskemako '%1$s' gakoa gainidaztea "
-"barrutitik kanpo dago emandako eskeman"
+msgstr "\"%s\" gakoaren gainidaztea (“%s“ eskemakoa) “%s” gainidazte-fitxategian ageri den bezala, eskeman emandako barrutitik kanpo dago"
 
-#: ../gio/glib-compile-schemas.c:2012
+#: gio/glib-compile-schemas.c:2071
 #, 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 ""
-"gainidazteko '%3$s' fitxategiko '%2$s' eskemako '%1$s' gakoa gainidaztea ez "
-"dago baliozko aukeren zerrendan"
+msgstr "\"%s\" gakoaren gainidaztea (“%s“ eskemakoa) “%s” gainidazte-fitxategian ageri den bezala, ez dago baliozko aukeren zerrendan"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: gio/glib-compile-schemas.c:2142
 msgid "where to store the gschemas.compiled file"
 msgstr "non gorde gschemas.compiled fitxategia"
 
-#: ../gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2143
 msgid "Abort on any errors in schemas"
 msgstr "Abortatu eskemetan edozer motako erroreak agertzean"
 
-#: ../gio/glib-compile-schemas.c:2070
+#: gio/glib-compile-schemas.c:2144
 msgid "Do not write the gschema.compiled file"
 msgstr "Ez idatzi gschema.compiled fitxategia"
 
-#: ../gio/glib-compile-schemas.c:2071
+#: gio/glib-compile-schemas.c:2145
 msgid "Do not enforce key name restrictions"
 msgstr "Ez derrigortu gako-izenen murriztapenik"
 
-#: ../gio/glib-compile-schemas.c:2099
+#: gio/glib-compile-schemas.c:2174
 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 ""
-"Konpilatu GSettings eskemen fitxategi guztiak eskema-cache batean.\n"
+msgstr "Konpilatu GSettings eskemen fitxategi guztiak eskema-cache batean.\n"
 "Eskemen fitxategiek .gschema.xml luzapena eduki behar dute,\n"
 "eta cache-ko fitxategia gschemas.compiled deitzen da."
 
-#: ../gio/glib-compile-schemas.c:2120
+#: gio/glib-compile-schemas.c:2195
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Direktorio baten izena bakarrik eman behar duzu\n"
 
-#: ../gio/glib-compile-schemas.c:2162
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "No schema files found: "
 msgstr "Ez da eskemen fitxategirik aurkitu: "
 
-#: ../gio/glib-compile-schemas.c:2165
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "doing nothing.\n"
 msgstr "ezer ez da egiten ari.\n"
 
-#: ../gio/glib-compile-schemas.c:2168
+#: gio/glib-compile-schemas.c:2243
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "existitzen den irteerako fitxategia kenduta.\n"
 
 #
-#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
+#: gio/glocalfile.c:546 gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "%s fitxategi-izen baliogabea"
 
-#: ../gio/glocalfile.c:1037
+#: gio/glocalfile.c:1013
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Errorea %s(r)en fitxategi-sistemako informazioa lortzean: %s"
@@ -2913,496 +2718,511 @@ msgstr "Errorea %s(r)en fitxategi-sistemako informazioa lortzean: %s"
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
 #.
-#: ../gio/glocalfile.c:1176
+#: gio/glocalfile.c:1152
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "Ez da %s fitxategiaren muntai-puntua aurkitzen"
 
-#: ../gio/glocalfile.c:1199
+#: gio/glocalfile.c:1175
 msgid "Can’t rename root directory"
 msgstr "Ezin da erroko direktorioa izenez aldatu"
 
-#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240
+#: gio/glocalfile.c:1193 gio/glocalfile.c:1216
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Errorea '%s' fitxategia izenez aldatzean: %s"
 
-#: ../gio/glocalfile.c:1224
+#: gio/glocalfile.c:1200
 msgid "Can’t rename file, filename already exists"
 msgstr "Ezin da fitxategia izenez aldatu, fitxategi-izena badago lehendik ere"
 
 #
-#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2253 ../gio/glocalfile.c:2281
-#: ../gio/glocalfile.c:2438 ../gio/glocalfileoutputstream.c:549
+#: gio/glocalfile.c:1213 gio/glocalfile.c:2322 gio/glocalfile.c:2350
+#: gio/glocalfile.c:2507 gio/glocalfileoutputstream.c:646
 msgid "Invalid filename"
 msgstr "Fitxategi-izen baliogabea"
 
-#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419
+#: gio/glocalfile.c:1381 gio/glocalfile.c:1396
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Errorea '%s' fitxategia irekitzean: %s"
 
-#: ../gio/glocalfile.c:1544
+#: gio/glocalfile.c:1521
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Errorea '%s' fitxategia kentzean: %s"
 
-#: ../gio/glocalfile.c:1928
+#: gio/glocalfile.c:1963
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Errorea '%s' fitxategia zakarrontzira botatzean: %s"
 
-#: ../gio/glocalfile.c:1951
+#: gio/glocalfile.c:2004
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Ezin izan da zakarrontziaren '%s' direktorioa sortu: %s"
 
-#: ../gio/glocalfile.c:1971
+#: gio/glocalfile.c:2025
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Ezin da '%s' zakarrontziaren goi-mailako direktorioa aurkitu"
 
-#: ../gio/glocalfile.c:2050 ../gio/glocalfile.c:2070
+#: gio/glocalfile.c:2034
+#, c-format
+msgid "Trashing on system internal mounts is not supported"
+msgstr "Sistemaren barneko muntaietan ez da onartzen zakarrontzira botatzea"
+
+#: gio/glocalfile.c:2118 gio/glocalfile.c:2138
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Ezin da '%s' zakarrontziaren direktorioa aurkitu edo sortu"
 
-#: ../gio/glocalfile.c:2105
+#: gio/glocalfile.c:2173
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr "Ezin da '%s' fitxategiaren zakarrontzi-informazioa sortu: %s"
 
-#: ../gio/glocalfile.c:2164
+#: gio/glocalfile.c:2233
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr "Ezin da '%s' fitxategia fitxategi-sistemen arteko zakarrontzira bota"
 
-#: ../gio/glocalfile.c:2168 ../gio/glocalfile.c:2224
+#: gio/glocalfile.c:2237 gio/glocalfile.c:2293
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Ezin da '%s' fitxategia zakarrontzira bota: %s"
 
-#: ../gio/glocalfile.c:2230
+#: gio/glocalfile.c:2299
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Ezin da '%s' fitxategia zakarrontzira bota"
 
-#: ../gio/glocalfile.c:2256
+#: gio/glocalfile.c:2325
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Errorea '%s' direktorioa sortzean: %s"
 
-#: ../gio/glocalfile.c:2285
+#: gio/glocalfile.c:2354
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Fitxategi-sistemak ez ditu esteka sinbolikorik onartzen"
 
-#: ../gio/glocalfile.c:2288
+#: gio/glocalfile.c:2357
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Errorea '%s' esteka sinbolikoa sortzean: %s"
 
-#: ../gio/glocalfile.c:2294 ../glib/gfileutils.c:2077
+#: gio/glocalfile.c:2363 glib/gfileutils.c:2155
 msgid "Symbolic links not supported"
 msgstr "Esteka sinbolikoak ez dira onartzen"
 
-#: ../gio/glocalfile.c:2349 ../gio/glocalfile.c:2384 ../gio/glocalfile.c:2441
+#: gio/glocalfile.c:2418 gio/glocalfile.c:2453 gio/glocalfile.c:2510
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Errorea '%s' fitxategia lekuz aldatzean: %s"
 
-#: ../gio/glocalfile.c:2372
+#: gio/glocalfile.c:2441
 msgid "Can’t move directory over directory"
 msgstr "Ezin da direktorioa lekuz aldatu direktorioaren gainera"
 
-#: ../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:2467 gio/glocalfileoutputstream.c:1030
+#: gio/glocalfileoutputstream.c:1044 gio/glocalfileoutputstream.c:1059
+#: gio/glocalfileoutputstream.c:1076 gio/glocalfileoutputstream.c:1090
 msgid "Backup file creation failed"
 msgstr "Huts egin du babeskopia sortzean"
 
-#: ../gio/glocalfile.c:2417
+#: gio/glocalfile.c:2486
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Errorea helburuko fitxategia kentzean: %s"
 
-#: ../gio/glocalfile.c:2431
+#: gio/glocalfile.c:2500
 msgid "Move between mounts not supported"
 msgstr "Muntaien artean lekuz aldatzea ez dago onartuta"
 
-#: ../gio/glocalfile.c:2622
+#: gio/glocalfile.c:2691
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Ezin izan da '%s' diskoaren erabilpena zehaztu: %s"
 
-#: ../gio/glocalfileinfo.c:731
+#: gio/glocalfileinfo.c:752
 msgid "Attribute value must be non-NULL"
 msgstr "Atributuaren balioa NULL ezin da izan"
 
-#: ../gio/glocalfileinfo.c:738
+#: gio/glocalfileinfo.c:759
 msgid "Invalid attribute type (string expected)"
 msgstr "Atributu mota baliogabea (katea espero zen)"
 
-#: ../gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:766
 msgid "Invalid extended attribute name"
 msgstr "Atributu hedatuaren izen baliogabea"
 
-#: ../gio/glocalfileinfo.c:785
+#: gio/glocalfileinfo.c:806
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Errorea “%s“ atributu hedatua ezartzean: %s"
 
-#: ../gio/glocalfileinfo.c:1586
+#: gio/glocalfileinfo.c:1634
 msgid " (invalid encoding)"
 msgstr " (baliogabeko kodeketa)"
 
-#: ../gio/glocalfileinfo.c:1777 ../gio/glocalfileoutputstream.c:811
+#: gio/glocalfileinfo.c:1798 gio/glocalfileoutputstream.c:908
 #, c-format
 msgid "Error when getting information for file “%s”: %s"
 msgstr "Errorea “'%s“ fitxategiaren informazioa eskuratzean: %s"
 
-#: ../gio/glocalfileinfo.c:2028
+#: gio/glocalfileinfo.c:2068
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
-msgstr "Errorea fitxategiaren deskriptorearen informazioa irakurtzean: %s "
+msgstr "Errorea fitxategiaren deskriptorearen informazioa irakurtzean: %s"
 
-#: ../gio/glocalfileinfo.c:2073
+#: gio/glocalfileinfo.c:2113
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Baliogabeko atributu mota (uint32 espero zen)"
 
-#: ../gio/glocalfileinfo.c:2091
+#: gio/glocalfileinfo.c:2131
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Baliogabeko atributu mota (uint64 espero zen)"
 
-#: ../gio/glocalfileinfo.c:2110 ../gio/glocalfileinfo.c:2129
+#: gio/glocalfileinfo.c:2150 gio/glocalfileinfo.c:2169
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Baliogabeko atributu mota (byte katea espero zen)"
 
-#: ../gio/glocalfileinfo.c:2164
+#: gio/glocalfileinfo.c:2216
 msgid "Cannot set permissions on symlinks"
 msgstr "Ezin da baimenik ezarri esteka sinbolikoetan"
 
-#: ../gio/glocalfileinfo.c:2180
+#: gio/glocalfileinfo.c:2232
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Errorea baimenak ezartzean: %s"
 
-#: ../gio/glocalfileinfo.c:2231
+#: gio/glocalfileinfo.c:2283
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Errorea jabea ezartzean: %s"
 
-#: ../gio/glocalfileinfo.c:2254
+#: gio/glocalfileinfo.c:2306
 msgid "symlink must be non-NULL"
 msgstr "esteka sinbolikoak NULL-en desberdina izan behar du"
 
-#: ../gio/glocalfileinfo.c:2264 ../gio/glocalfileinfo.c:2283
-#: ../gio/glocalfileinfo.c:2294
+#: gio/glocalfileinfo.c:2316 gio/glocalfileinfo.c:2335
+#: gio/glocalfileinfo.c:2346
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Errorea esteka sinbolikoa ezartzean: %s"
 
-#: ../gio/glocalfileinfo.c:2273
+#: gio/glocalfileinfo.c:2325
 msgid "Error setting symlink: file is not a symlink"
-msgstr ""
-"Errorea esteka sinbolikoa ezartzean: fitxategia ez da esteka sinboliko bat"
+msgstr "Errorea esteka sinbolikoa ezartzean: fitxategia ez da esteka sinboliko bat"
 
-#: ../gio/glocalfileinfo.c:2399
+#: gio/glocalfileinfo.c:2451
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Errorea eraldaketa edo atzipen ordua ezartzean: %s"
 
-#: ../gio/glocalfileinfo.c:2422
+#: gio/glocalfileinfo.c:2474
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux testuinguruak NULL-en desberdina izan behar du"
 
-#: ../gio/glocalfileinfo.c:2437
+#: gio/glocalfileinfo.c:2489
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Errorea SELinux testuingurua ezartzean: %s"
 
-#: ../gio/glocalfileinfo.c:2444
+#: gio/glocalfileinfo.c:2496
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux ez dago gaituta sistema honetan"
 
-#: ../gio/glocalfileinfo.c:2536
+#: gio/glocalfileinfo.c:2588
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "%s atributuaren ezarpena ez dago onartuta"
 
-#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:694
+#: gio/glocalfileinputstream.c:168 gio/glocalfileoutputstream.c:791
 #, c-format
 msgid "Error reading from file: %s"
-msgstr "Errorea fitxategitik irakurtzean: %s "
+msgstr "Errorea fitxategitik irakurtzean: %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/glocalfileinputstream.c:199 gio/glocalfileinputstream.c:211
+#: gio/glocalfileinputstream.c:225 gio/glocalfileinputstream.c:333
+#: gio/glocalfileoutputstream.c:553 gio/glocalfileoutputstream.c:1108
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "Errorea fitxategian bilatzean: %s"
 
-#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:246
-#: ../gio/glocalfileoutputstream.c:340
+#: gio/glocalfileinputstream.c:255 gio/glocalfileoutputstream.c:343
+#: gio/glocalfileoutputstream.c:437
 #, c-format
 msgid "Error closing file: %s"
 msgstr "Errorea fitxategia ixtean: %s"
 
-#: ../gio/glocalfilemonitor.c:840
+#: gio/glocalfilemonitor.c:858
 msgid "Unable to find default local file monitor type"
 msgstr "Ezin da lokaleko fitxategi lehenetsiaren monitorizazio mota aurkitu"
 
-#: ../gio/glocalfileoutputstream.c:194 ../gio/glocalfileoutputstream.c:226
-#: ../gio/glocalfileoutputstream.c:715
+#: gio/glocalfileoutputstream.c:208 gio/glocalfileoutputstream.c:286
+#: gio/glocalfileoutputstream.c:323 gio/glocalfileoutputstream.c:812
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "Errorea fitxategian idaztean: %s"
 
-#: ../gio/glocalfileoutputstream.c:273
+#: gio/glocalfileoutputstream.c:370
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Errorea babeskopiaren esteka zaharra kentzean: %s"
 
-#: ../gio/glocalfileoutputstream.c:287 ../gio/glocalfileoutputstream.c:300
+#: gio/glocalfileoutputstream.c:384 gio/glocalfileoutputstream.c:397
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "Errorea babeskopiaren kopia sortzean: %s"
 
-#: ../gio/glocalfileoutputstream.c:318
+#: gio/glocalfileoutputstream.c:415
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Errorea aldi baterako fitxategia izenez aldatzean: %s"
 
-#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1062
+#: gio/glocalfileoutputstream.c:599 gio/glocalfileoutputstream.c:1159
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "Errorea fitxategia trunkatzean: %s"
 
-#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:793
-#: ../gio/glocalfileoutputstream.c:1043 ../gio/gsubprocess.c:380
+#: gio/glocalfileoutputstream.c:652 gio/glocalfileoutputstream.c:890
+#: gio/glocalfileoutputstream.c:1140 gio/gsubprocess.c:380
 #, c-format
 msgid "Error opening file “%s”: %s"
 msgstr "Errorea “%s“ fitxategia irekitzean: %s"
 
-#: ../gio/glocalfileoutputstream.c:824
+#: gio/glocalfileoutputstream.c:921
 msgid "Target file is a directory"
 msgstr "Helburuko fitxategia direktorio bat da"
 
-#: ../gio/glocalfileoutputstream.c:829
+#: gio/glocalfileoutputstream.c:926
 msgid "Target file is not a regular file"
 msgstr "Helburuko fitxategia ez da fitxategi arrunta"
 
-#: ../gio/glocalfileoutputstream.c:841
+#: gio/glocalfileoutputstream.c:938
 msgid "The file was externally modified"
 msgstr "Fitxategia kanpotik aldatu da"
 
-#: ../gio/glocalfileoutputstream.c:1027
+#: gio/glocalfileoutputstream.c:1124
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Errorea fitxategi zaharra kentzean: %s"
 
-#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
+#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "Baliogabeko GSeekType eman da"
 
 #
-#: ../gio/gmemoryinputstream.c:484
+#: gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "Bilaketa-eskaera baliogabea"
 
-#: ../gio/gmemoryinputstream.c:508
+#: gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "Ezin da GMemoryInputStream trunkatu"
 
-#: ../gio/gmemoryoutputstream.c:567
+#: gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Ezin da memoriaren irteeraren korrontea tamainaz aldatu"
 
-#: ../gio/gmemoryoutputstream.c:583
+#: gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Huts egin du memoriaren irteeraren korrontea tamainaz aldatzean"
 
-#: ../gio/gmemoryoutputstream.c:673
+#: gio/gmemoryoutputstream.c:673
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
-msgstr ""
-"Idazketa lantzeko behar den memoria kopurua erabilgarri dagoen helbide-"
-"espazioa baino handiagoa da"
+msgstr "Idazketa lantzeko behar den memoria kopurua erabilgarri dagoen helbide-espazioa baino handiagoa da"
 
-#: ../gio/gmemoryoutputstream.c:782
+#: gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "Bilaketa eskatu da korrontearen hasieraren aurretik"
 
-#: ../gio/gmemoryoutputstream.c:797
+#: gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "Bilaketa eskatu da korrontearen amaieraren ondoren"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: ../gio/gmount.c:393
+#: gio/gmount.c:399
 msgid "mount doesn’t implement “unmount”"
 msgstr "muntaiak ez dauka “unmount“ (desmuntatu) inplementatuta"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: ../gio/gmount.c:469
+#: gio/gmount.c:475
 msgid "mount doesn’t implement “eject”"
 msgstr "muntaiak ez dauka “eject“ (egotzi) inplementatuta"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:547
+#: gio/gmount.c:553
 msgid "mount doesn’t implement “unmount” or “unmount_with_operation”"
-msgstr ""
-"muntaiak ez dauka “unmount“ (desmuntatzea) edo "
-"“unmount_with_operation“ (desmuntatu eragiketarekin) inplementatuta"
+msgstr "muntaiak ez dauka “unmount“ (desmuntatzea) edo “unmount_with_operation“ (desmuntatu eragiketarekin) inplementatuta"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:632
+#: gio/gmount.c:638
 msgid "mount doesn’t implement “eject” or “eject_with_operation”"
-msgstr ""
-"muntaiak ez dauka “eject“ (egotzi) edo “eject_with_operation“ (egotzi "
-"eragiketarekin) inplementatuta"
+msgstr "muntaiak ez dauka “eject“ (egotzi) edo “eject_with_operation“ (egotzi eragiketarekin) inplementatuta"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: ../gio/gmount.c:720
+#: gio/gmount.c:726
 msgid "mount doesn’t implement “remount”"
 msgstr "muntaiak ez dauka “remount“ (birmuntaketa) inplementatuta"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:802
+#: gio/gmount.c:808
 msgid "mount doesn’t implement content type guessing"
 msgstr "muntaiak ez dauka eduki mota sinkronoa asmatzea inplementatuta"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: ../gio/gmount.c:889
+#: gio/gmount.c:895
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "muntaiak ez dauka eduki mota sinkronoa asmatzea inplementatuta"
 
-#: ../gio/gnetworkaddress.c:378
+#: gio/gnetworkaddress.c:388
 #, c-format
 msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "“%s“ ostalariak “[“dauka, baina ez “]“"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
+#: gio/gnetworkmonitorbase.c:211 gio/gnetworkmonitorbase.c:315
 msgid "Network unreachable"
 msgstr "Sarea atziezina"
 
-#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274
+#: gio/gnetworkmonitorbase.c:249 gio/gnetworkmonitorbase.c:279
 msgid "Host unreachable"
 msgstr "Ostalaria atziezina"
 
-#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108
-#: ../gio/gnetworkmonitornetlink.c:127
+#: gio/gnetworkmonitornetlink.c:99 gio/gnetworkmonitornetlink.c:111
+#: gio/gnetworkmonitornetlink.c:130
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "Ezin izan da sareko monitorea sortu: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:117
+#: gio/gnetworkmonitornetlink.c:120
 msgid "Could not create network monitor: "
 msgstr "Ezin izan da sareko monitorea sortu: "
 
-#: ../gio/gnetworkmonitornetlink.c:175
+#: gio/gnetworkmonitornetlink.c:183
 msgid "Could not get network status: "
 msgstr "Ezin izan da sarearen egoera eskuratu: "
 
-#: ../gio/gnetworkmonitornm.c:329
+#: gio/gnetworkmonitornm.c:314
+#, c-format
+msgid "NetworkManager not running"
+msgstr "NetworkManager ez dago abian"
+
+#: gio/gnetworkmonitornm.c:325
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "NetworkManager-en bertsioa zaharregia"
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
+#: gio/goutputstream.c:232 gio/goutputstream.c:775
 msgid "Output stream doesn’t implement write"
 msgstr "Irteerako korronteak ez dauka idaztea inplementatuta"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
+#: gio/goutputstream.c:472 gio/goutputstream.c:1533
+#, c-format
+msgid "Sum of vectors passed to %s too large"
+msgstr "%s(e)ri pasatutako bektoreen batuketa handiegia da"
+
+#: gio/goutputstream.c:736 gio/goutputstream.c:1761
 msgid "Source stream is already closed"
 msgstr "Iturburuko korrontea jadanik itxi da"
 
-#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
-#: ../gio/gthreadedresolver.c:126
+#: gio/gresolver.c:351 gio/gthreadedresolver.c:150 gio/gthreadedresolver.c:168
 #, c-format
 msgid "Error resolving “%s”: %s"
 msgstr "Errorea “%s“ ebaztean: %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
+#. Translators: The placeholder is for a function name.
+#: gio/gresolver.c:398 gio/gresolver.c:556
+#, c-format
+msgid "%s not implemented"
+msgstr "%s ez dago inplementatuta"
+
+#
+#: gio/gresolver.c:924 gio/gresolver.c:976
+msgid "Invalid domain"
+msgstr "Baliogabeko domeinua"
+
+#: gio/gresource.c:665 gio/gresource.c:924 gio/gresource.c:963
+#: gio/gresource.c:1087 gio/gresource.c:1159 gio/gresource.c:1232
+#: gio/gresource.c:1313 gio/gresourcefile.c:476 gio/gresourcefile.c:599
+#: gio/gresourcefile.c:736
 #, c-format
 msgid "The resource at “%s” does not exist"
 msgstr "“%s“(e)ko baliabidea ez da existitzen"
 
-#: ../gio/gresource.c:771
+#: gio/gresource.c:830
 #, c-format
 msgid "The resource at “%s” failed to decompress"
 msgstr "Huts egin du “%s“(e)ko baliabidea deskonprimitzean"
 
-#: ../gio/gresourcefile.c:709
+#: gio/gresourcefile.c:732
 #, c-format
 msgid "The resource at “%s” is not a directory"
 msgstr "“%s“(e)ko baliabidea ez da direktorio bat"
 
-#: ../gio/gresourcefile.c:917
+#: gio/gresourcefile.c:940
 msgid "Input stream doesn’t implement seek"
 msgstr "Sarrerako korronteak ez dauka bilaketa inplementatuta"
 
-#: ../gio/gresource-tool.c:494
+#: gio/gresource-tool.c:501
 msgid "List sections containing resources in an elf FILE"
 msgstr "Zerrendatu baliabideak dituzten atalak elf fitxategi batean"
 
-#: ../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"
 "If PATH is given, only list matching resources"
-msgstr ""
-"Zerrendatu baliabideak\n"
+msgstr "Zerrendatu baliabideak\n"
 "ATALA ematen bada, soilik atal honetako baliabideak zerrendatu\n"
 "BIDE-IZENA ematen bada, bat datozen baliabideak soilik zerrendatu"
 
-#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513
+#: gio/gresource-tool.c:510 gio/gresource-tool.c:520
 msgid "FILE [PATH]"
 msgstr "FITXATEGIA [BIDE-IZENA]"
 
-#: ../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 "ATALA"
 
-#: ../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"
 "If PATH is given, only list matching resources\n"
 "Details include the section, size and compression"
-msgstr ""
-"Zerrendatu baliabideak xehetasunez\n"
+msgstr "Zerrendatu baliabideak xehetasunez\n"
 "ATALA ematen bada, soilik atal honetako baliabideak zerrendatu\n"
 "BIDE-IZENA ematen bada, bat datozen baliabideak soilik zerrendatu\n"
 "Xehetasunek atala, tamaina eta konpresioa daukate"
 
-#: ../gio/gresource-tool.c:519
+#: gio/gresource-tool.c:526
 msgid "Extract a resource file to stdout"
 msgstr "Erauzi baliabidearen fitxategia irteera estandarrean (stdout)"
 
-#: ../gio/gresource-tool.c:520
+#: gio/gresource-tool.c:527
 msgid "FILE PATH"
 msgstr "FITXATEGIA BIDE-IZENA"
 
-#: ../gio/gresource-tool.c:534
+#: gio/gresource-tool.c:541
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3416,8 +3236,7 @@ msgid ""
 "\n"
 "Use “gresource help COMMAND” to get detailed help.\n"
 "\n"
-msgstr ""
-"Erabilera:\n"
+msgstr "Erabilera:\n"
 "  gresource [--section ATALA] KOMANDOA [ARGUMENTUAK...]\n"
 "\n"
 "Komandoak:\n"
@@ -3430,7 +3249,7 @@ msgstr ""
 "Erabili “gresource help KOMANDOA“ laguntza xehea eskuratzeko.\n"
 "\n"
 
-#: ../gio/gresource-tool.c:548
+#: gio/gresource-tool.c:555
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3438,184 +3257,168 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-msgstr ""
-"Erabilera:\n"
+msgstr "Erabilera:\n"
 "  gresource %s%s%s %s\n"
 "\n"
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:555
+#: gio/gresource-tool.c:562
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  ATALA   elf atalaren izena (aukerakoa)\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:656
+#: gio/gresource-tool.c:566 gio/gsettings-tool.c:703
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  KOMANDOA   (aukerako) komandoa deskribatzeko\n"
 
-#: ../gio/gresource-tool.c:565
+#: gio/gresource-tool.c:572
 msgid "  FILE      An elf file (a binary or a shared library)\n"
-msgstr ""
-"  FITXATEGIA      Elf fitxategia (bitarra edo partekatutako liburutegia)\n"
+msgstr "  FITXATEGIA      Elf fitxategia (bitarra edo partekatutako liburutegia)\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"
-msgstr ""
-"  FITXATEGIA      Elf fitxategia (bitarra edo partekatutako liburutegia)\n"
+msgstr "  FITXATEGIA      Elf fitxategia (bitarra edo partekatutako liburutegia)\n"
 "                        edo konpilatutako baliabidearen fitxategi bat\n"
 
-#: ../gio/gresource-tool.c:572
+#: gio/gresource-tool.c:579
 msgid "[PATH]"
 msgstr "[BIDE-IZENA]"
 
-#: ../gio/gresource-tool.c:574
+#: gio/gresource-tool.c:581
 msgid "  PATH      An (optional) resource path (may be partial)\n"
-msgstr ""
-"  BIDE-IZENA      (aukerakoa) baliabidearen bide-izena (partziala izan "
-"daiteke)\n"
+msgstr "  BIDE-IZENA      (aukerakoa) baliabidearen bide-izena (partziala izan daiteke)\n"
 
-#: ../gio/gresource-tool.c:575
+#: gio/gresource-tool.c:582
 msgid "PATH"
 msgstr "BIDE-IZENA"
 
-#: ../gio/gresource-tool.c:577
+#: gio/gresource-tool.c:584
 msgid "  PATH      A resource path\n"
 msgstr "  BIDE-IZENA      Baliabidearen bide-izena\n"
 
-#: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:853
+#: gio/gsettings-tool.c:51 gio/gsettings-tool.c:72 gio/gsettings-tool.c:908
 #, c-format
 msgid "No such schema “%s”\n"
 msgstr "Ez dago “%s“ bezalako eskemarik\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“ eskema ezin da lekuz aldatu (bide-izena ez da zehaztu behar)\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“ eskema lekuz alda daiteke (bide-izena zehaztu behar da)\n"
 
-#: ../gio/gsettings-tool.c:92
-#, c-format
+#: gio/gsettings-tool.c:92
 msgid "Empty path given.\n"
 msgstr "Bide-izen hutsa eman da.\n"
 
-#: ../gio/gsettings-tool.c:98
-#, c-format
+#: gio/gsettings-tool.c:98
 msgid "Path must begin with a slash (/)\n"
 msgstr "Bide-izena barra batekin (/) hasi behar da\n"
 
-#: ../gio/gsettings-tool.c:104
-#, c-format
+#: gio/gsettings-tool.c:104
 msgid "Path must end with a slash (/)\n"
 msgstr "Bide-izena barra batekin (/) amaitu behar da\n"
 
-#: ../gio/gsettings-tool.c:110
-#, c-format
+#: gio/gsettings-tool.c:110
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Bide-izenak ezin ditu bi barra jarraian eduki (//)\n"
 
-#: ../gio/gsettings-tool.c:491
-#, c-format
+#: gio/gsettings-tool.c:538
 msgid "The provided value is outside of the valid range\n"
 msgstr "Emandako balioa baliozko barrutitik kanpo dago\n"
 
-#: ../gio/gsettings-tool.c:498
-#, c-format
+#: gio/gsettings-tool.c:545
 msgid "The key is not writable\n"
 msgstr "Gakoa ez da idazgarria\n"
 
-#: ../gio/gsettings-tool.c:534
+#: gio/gsettings-tool.c:581
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Zerrendatu instalatutako eskemak (lekuz ezin direnak aldatu)"
 
-#: ../gio/gsettings-tool.c:540
+#: gio/gsettings-tool.c:587
 msgid "List the installed relocatable schemas"
 msgstr "Zerrendatu instalatutako eskemak (lekuz alda daitezkeenak)"
 
-#: ../gio/gsettings-tool.c:546
+#: gio/gsettings-tool.c:593
 msgid "List the keys in SCHEMA"
 msgstr "Zerrendatu ESKEMAko gakoak"
 
-#: ../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 "ESKEMA[:bide-izena]"
 
-#: ../gio/gsettings-tool.c:552
+#: gio/gsettings-tool.c:599
 msgid "List the children of SCHEMA"
 msgstr "Zerrendatu ESKEMAren umeak"
 
-#: ../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"
-msgstr ""
-"Zerrendatu gako eta balioak, errekurtsiboki\n"
+msgstr "Zerrendatu gako eta balioak, errekurtsiboki\n"
 "Ez bada ESKEMArik ematen, zerrendatu gako guztiak\n"
 
-#: ../gio/gsettings-tool.c:560
+#: gio/gsettings-tool.c:607
 msgid "[SCHEMA[:PATH]]"
 msgstr "[ESKEMA[:BIDE-IZENA]]"
 
-#: ../gio/gsettings-tool.c:565
+#: gio/gsettings-tool.c:612
 msgid "Get the value of KEY"
 msgstr "Lortu GAKOAren balioa"
 
-#: ../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 "ESKEMA[:BIDE-IZENA] GAKOA"
 
-#: ../gio/gsettings-tool.c:571
+#: gio/gsettings-tool.c:618
 msgid "Query the range of valid values for KEY"
 msgstr "Kontsultatu GAKOAren baliozko balioen barrutiari buruz"
 
-#: ../gio/gsettings-tool.c:577
+#: gio/gsettings-tool.c:624
 msgid "Query the description for KEY"
 msgstr "Kontsultatu GAKOAren azalpena"
 
-#: ../gio/gsettings-tool.c:583
+#: gio/gsettings-tool.c:630
 msgid "Set the value of KEY to VALUE"
 msgstr "Ezarri GAKOAren balioa BALIOArekin"
 
-#: ../gio/gsettings-tool.c:584
+#: gio/gsettings-tool.c:631
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "ESKEMA[:BIDE-IZENA] GAKOA BALIOA"
 
-#: ../gio/gsettings-tool.c:589
+#: gio/gsettings-tool.c:636
 msgid "Reset KEY to its default value"
 msgstr "Berrezarri GAKOA bere balio lehenetsira"
 
-#: ../gio/gsettings-tool.c:595
+#: gio/gsettings-tool.c:642
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Berrezarri ESKEMAko gako guztiak beraien balio lehenetsietara"
 
-#: ../gio/gsettings-tool.c:601
+#: gio/gsettings-tool.c:648
 msgid "Check if KEY is writable"
 msgstr "Begiratu GAKOA idazgarria den edo ez"
 
-#: ../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"
 "Use ^C to stop monitoring.\n"
-msgstr ""
-"Monitorizatu GAKOAren aldaketak.\n"
+msgstr "Monitorizatu GAKOAren aldaketak.\n"
 "Ez bada GAKOA zehazten, ESKEMAko gako guztiak monitorizatuko ditu.\n"
 "Erabili ^C monitorizazioa gelditzeko.\n"
 
-#: ../gio/gsettings-tool.c:610
+#: gio/gsettings-tool.c:657
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "ESKEMA[:BIDE-IZENA] GAKOA"
 
-#: ../gio/gsettings-tool.c:622
+#: gio/gsettings-tool.c:669
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3639,8 +3442,7 @@ msgid ""
 "\n"
 "Use “gsettings help COMMAND” to get detailed help.\n"
 "\n"
-msgstr ""
-"Erabilera:\n"
+msgstr "Erabilera:\n"
 "  gsettings --version\n"
 "  gsettings [--schemadir ESKEMA-DIREKTORIOA] KOMANDOA [ARGUMENTUAK...]\n"
 "\n"
@@ -3665,7 +3467,7 @@ msgstr ""
 "Erabili “gsettings help KOMANDOA“ laguntza xehea lortzeko.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:646
+#: gio/gsettings-tool.c:693
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3673,2355 +3475,2304 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-msgstr ""
-"Erabilera:\n"
+msgstr "Erabilera:\n"
 "  gsettings [--schemadir ESKEMA-DIREKTORIOA] %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 "  ESKEMA-DIREKTORIOA    Eskema gehigarriak bilatzeko direkotrioa\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"
-msgstr ""
-"  ESKEMA            Eskemaren izena\n"
+msgstr "  ESKEMA            Eskemaren izena\n"
 "  BIDE-IZENA       Bide-izena, lekuz alda daitezkeen eskementzako\n"
 
-#: ../gio/gsettings-tool.c:665
+#: gio/gsettings-tool.c:712
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  GAKOA       Eskema barruko (aukerako) gakoa\n"
 
-#: ../gio/gsettings-tool.c:669
+#: gio/gsettings-tool.c:716
 msgid "  KEY       The key within the schema\n"
 msgstr "  GAKOA       Eskema barruko gakoa\n"
 
-#: ../gio/gsettings-tool.c:673
+#: gio/gsettings-tool.c:720
 msgid "  VALUE     The value to set\n"
 msgstr "  BALIOA     Ezarriko den balioa\n"
 
-#: ../gio/gsettings-tool.c:728
+#: gio/gsettings-tool.c:775
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "Ezin izan dira eskemarik '%s'(e)ndik kargatu : %s\n"
 
-#: ../gio/gsettings-tool.c:740
-#, c-format
+#: gio/gsettings-tool.c:787
 msgid "No schemas installed\n"
 msgstr "Ez dago eskemarik instalatuta\n"
 
-#: ../gio/gsettings-tool.c:811
-#, c-format
+#: gio/gsettings-tool.c:866
 msgid "Empty schema name given\n"
 msgstr "Eskemaren izen hutsa eman da\n"
 
-#: ../gio/gsettings-tool.c:866
+#: gio/gsettings-tool.c:921
 #, c-format
 msgid "No such key “%s”\n"
 msgstr "Ez dago “%s“ bezalako gakorik\n"
 
-#: ../gio/gsocket.c:379
+#: gio/gsocket.c:373
 msgid "Invalid socket, not initialized"
 msgstr "Baliogabeko socket-a, hasieratu gabe dago"
 
-#: ../gio/gsocket.c:386
+#: gio/gsocket.c:380
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Baliogabeko socket-a, hasieratzeak huts egin du: %s"
 
-#: ../gio/gsocket.c:394
+#: gio/gsocket.c:388
 msgid "Socket is already closed"
 msgstr "Socket-a jadanik itxita dago"
 
-#: ../gio/gsocket.c:409 ../gio/gsocket.c:2765 ../gio/gsocket.c:3950
-#: ../gio/gsocket.c:4008
+#: gio/gsocket.c:403 gio/gsocket.c:3027 gio/gsocket.c:4244 gio/gsocket.c:4302
 msgid "Socket I/O timed out"
-msgstr "S/Iko socket-aren denbora-muga gaindituta"
+msgstr "S/Iko socketaren denbora-muga gaindituta"
 
-#: ../gio/gsocket.c:541
+#: gio/gsocket.c:538
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocket sortzen fd-tik: %s"
 
-#: ../gio/gsocket.c:570 ../gio/gsocket.c:624 ../gio/gsocket.c:631
+#: gio/gsocket.c:567 gio/gsocket.c:621 gio/gsocket.c:628
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ezin da socket-a sortu: %s"
 
-#: ../gio/gsocket.c:624
+#: gio/gsocket.c:621
 msgid "Unknown family was specified"
 msgstr "Familia ezezaguna zehaztu da"
 
-#: ../gio/gsocket.c:631
+#: gio/gsocket.c:628
 msgid "Unknown protocol was specified"
 msgstr "Protokolo ezezaguna zehaztu da"
 
-#: ../gio/gsocket.c:1122
+#: gio/gsocket.c:1119
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
-msgstr ""
-"Ezin da datagramen eragiketarik erabili datagramak ez diren socket-etan."
+msgstr "Ezin da datagramen eragiketarik erabili datagramak ez diren socket-etan."
 
-#: ../gio/gsocket.c:1139
+#: gio/gsocket.c:1136
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
-msgstr ""
-"Ezin da datagramen eragiketarik erabili socket-etan iraungitze-denborarik "
-"ezarri gabe."
+msgstr "Ezin da datagramen eragiketarik erabili socket-etan iraungitze-denborarik ezarri gabe."
 
-#: ../gio/gsocket.c:1943
+#: gio/gsocket.c:1943
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ezin izan da lokaleko helbidea lortu: %s"
 
-#: ../gio/gsocket.c:1986
+#: gio/gsocket.c:1989
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ezin izan da urruneko helbidea lortu: %s"
 
-#: ../gio/gsocket.c:2052
+#: gio/gsocket.c:2055
 #, c-format
 msgid "could not listen: %s"
 msgstr "ezin izan da entzun: %s"
 
-#: ../gio/gsocket.c:2151
+#: gio/gsocket.c:2157
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Errorea helbidea lotzean: %s"
 
-#: ../gio/gsocket.c:2266 ../gio/gsocket.c:2303
+#: gio/gsocket.c:2215 gio/gsocket.c:2252 gio/gsocket.c:2362 gio/gsocket.c:2387
+#: gio/gsocket.c:2460 gio/gsocket.c:2518 gio/gsocket.c:2536
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Errorea multidifusioko taldean elkartzean: %s"
 
-#: ../gio/gsocket.c:2267 ../gio/gsocket.c:2304
+#: gio/gsocket.c:2216 gio/gsocket.c:2253 gio/gsocket.c:2363 gio/gsocket.c:2388
+#: gio/gsocket.c:2461 gio/gsocket.c:2519 gio/gsocket.c:2537
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Errorea multidifusioko taldea uztean: %s"
 
-#: ../gio/gsocket.c:2268
+#: gio/gsocket.c:2217
 msgid "No support for source-specific multicast"
 msgstr "Iturburu zehatzeko multidifusiorik ez da onartzen"
 
-#: ../gio/gsocket.c:2488
+#: gio/gsocket.c:2364
+msgid "Unsupported socket family"
+msgstr "Onartzen ez den socket familia"
+
+#: gio/gsocket.c:2389
+msgid "source-specific not an IPv4 address"
+msgstr "Iturburu zehatzekoa ez IPv4 helbidea"
+
+#: gio/gsocket.c:2407 gio/gsocket.c:2436 gio/gsocket.c:2486
+#, c-format
+msgid "Interface not found: %s"
+msgstr "Interfazea ez da aurkitu: %s"
+
+#: gio/gsocket.c:2423
+#, c-format
+msgid "Interface name too long"
+msgstr "Interfaze-izena luzeegia da"
+
+#: gio/gsocket.c:2462
+msgid "No support for IPv4 source-specific multicast"
+msgstr "IPv4 iturburu zehatzeko multidifusiorik ez da onartzen"
+
+#: gio/gsocket.c:2520
+msgid "No support for IPv6 source-specific multicast"
+msgstr "IPv6 iturburu zehatzeko multidifusiorik ez da onartzen"
+
+#: gio/gsocket.c:2729
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Errorea konexioa onartzean: %s"
 
-#: ../gio/gsocket.c:2609
+#: gio/gsocket.c:2855
 msgid "Connection in progress"
 msgstr "Konexioa lantzen"
 
-#: ../gio/gsocket.c:2658
+#: gio/gsocket.c:2906
 msgid "Unable to get pending error: "
 msgstr "Ezin da falta diren erroreak lortu: "
 
-#: ../gio/gsocket.c:2828
+#: gio/gsocket.c:3092
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Errorea datuak jasotzean: %s"
 
-#: ../gio/gsocket.c:3023
+#: gio/gsocket.c:3289
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Errorea datuak bidaltzean: %s"
 
-#: ../gio/gsocket.c:3210
+#: gio/gsocket.c:3476
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Ezin da socket-a itzali: %s"
 
-#: ../gio/gsocket.c:3291
+#: gio/gsocket.c:3557
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Errorea socket-a ixtean: %s"
 
-#: ../gio/gsocket.c:3943
+#: gio/gsocket.c:4237
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Socket-aren baldintzen zai: %s"
 
-#: ../gio/gsocket.c:4417 ../gio/gsocket.c:4497 ../gio/gsocket.c:4675
+#: gio/gsocket.c:4614 gio/gsocket.c:4616 gio/gsocket.c:4762 gio/gsocket.c:4847
+#: gio/gsocket.c:5027 gio/gsocket.c:5067 gio/gsocket.c:5069
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Errorea mezua bidaltzean: %s"
 
-#: ../gio/gsocket.c:4441
+#: gio/gsocket.c:4789
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage ez da Windows sisteman onartzen"
 
-#: ../gio/gsocket.c:4894 ../gio/gsocket.c:4967 ../gio/gsocket.c:5193
+#: gio/gsocket.c:5260 gio/gsocket.c:5333 gio/gsocket.c:5560
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Errorea mezua jasotzean: %s"
 
-#: ../gio/gsocket.c:5465
+#: gio/gsocket.c:5832
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Ezin da socket-aren kredentzialik irakurri: %s"
 
-#: ../gio/gsocket.c:5474
+#: gio/gsocket.c:5841
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials ez dago S.E. honetan inplementatuta"
 
-#: ../gio/gsocketclient.c:176
+#: gio/gsocketclient.c:181
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Ezin izan da %s proxy zerbitzariarekin konektatu: "
 
-#: ../gio/gsocketclient.c:190
+#: gio/gsocketclient.c:195
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Ezin izan da %s(r)ekin konektatu: "
 
-#: ../gio/gsocketclient.c:192
+#: gio/gsocketclient.c:197
 msgid "Could not connect: "
 msgstr "Ezin izan da konektatu: "
 
-#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599
+#: gio/gsocketclient.c:1033 gio/gsocketclient.c:1750
 msgid "Unknown error on connect"
 msgstr "Errore ezezaguna konexioan"
 
-#: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535
+#: gio/gsocketclient.c:1087 gio/gsocketclient.c:1658
 msgid "Proxying over a non-TCP connection is not supported."
-msgstr ""
-"TCP motakoak ez diren konexioen gainean proxy-a egitea ez dago onartuta."
+msgstr "TCP motakoak ez diren konexioen gainean proxy-a egitea ez dago onartuta."
 
-#: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
+#: gio/gsocketclient.c:1116 gio/gsocketclient.c:1684
 #, c-format
 msgid "Proxy protocol “%s” is not supported."
 msgstr "Proxy-aren “%s“ protokoloa ez dago onartuta."
 
-#: ../gio/gsocketlistener.c:218
+#: gio/gsocketlistener.c:225
 msgid "Listener is already closed"
 msgstr "Entzulea jadanik itxita dago"
 
-#: ../gio/gsocketlistener.c:264
+#: gio/gsocketlistener.c:271
 msgid "Added socket is closed"
 msgstr "Gehitutako socket-a itxi da"
 
-#: ../gio/gsocks4aproxy.c:118
+#: gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4-ek ez du “%s“ IPv6 helbidea onartzen"
 
-#: ../gio/gsocks4aproxy.c:136
+#: gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
 msgstr "Erabiltzaile-izena luzeegia da SOCKSv4 protokoloarentzako"
 
-#: ../gio/gsocks4aproxy.c:153
+#: gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "“%s“ ostalari-izena luzeegia da SOCKSv4 protokoloarentzako"
 
-#: ../gio/gsocks4aproxy.c:179
+#: gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
 msgstr "Zerbitzaria ez da SOCKSv4 proxy zerbitzari bat."
 
-#: ../gio/gsocks4aproxy.c:186
+#: gio/gsocks4aproxy.c:186
 msgid "Connection through SOCKSv4 server was rejected"
 msgstr "SOCKSv4 zerbitzariaren bidezko konexioa ukatu da"
 
-#: ../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 "Zerbitzaria ez da SOCKSv5 proxy zerbitzari bat."
 
-#: ../gio/gsocks5proxy.c:167
+#: gio/gsocks5proxy.c:167
 msgid "The SOCKSv5 proxy requires authentication."
 msgstr "SOCKSv5 proxy-ak autentifikazioa eskatzen du."
 
-#: ../gio/gsocks5proxy.c:177
+#: gio/gsocks5proxy.c:177
 msgid ""
 "The SOCKSv5 proxy requires an authentication method that is not supported by "
 "GLib."
-msgstr ""
-"SOCKSv5-ek autentifikatzeko metodo bat eskatzen du (Glib-ek onartzen ez "
-"duena)."
+msgstr "SOCKSv5-ek autentifikatzeko metodo bat eskatzen du (Glib-ek onartzen ez duena)."
 
-#: ../gio/gsocks5proxy.c:206
+#: gio/gsocks5proxy.c:206
 msgid "Username or password is too long for SOCKSv5 protocol."
-msgstr ""
-"Erabiltzaile-izena edo pasahitza luzeegia da SOCKSv5 protokoloarentzako."
+msgstr "Erabiltzaile-izena edo pasahitza luzeegia da SOCKSv5 protokoloarentzako."
 
-#: ../gio/gsocks5proxy.c:236
+#: gio/gsocks5proxy.c:236
 msgid "SOCKSv5 authentication failed due to wrong username or password."
-msgstr ""
-"SOCKSv5 autentifikazioak huts egin du erabiltzaile-izena edo pasahitza "
-"okerra delako."
+msgstr "SOCKSv5 autentifikazioak huts egin du erabiltzaile-izena edo pasahitza okerra delako."
 
-#: ../gio/gsocks5proxy.c:286
+#: gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "“%s“ ostalari-izena luzeegia da SOCKSv5 protokoloarentzako"
 
-#: ../gio/gsocks5proxy.c:348
+#: gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
 msgstr "SOCKSv5 proxy zerbitzariak helbide mota ezezagunak erabiltzen ditu."
 
-#: ../gio/gsocks5proxy.c:355
+#: gio/gsocks5proxy.c:355
 msgid "Internal SOCKSv5 proxy server error."
 msgstr "SOCKSv5 proxy-aren zerbitzariaren barneko errorea."
 
-#: ../gio/gsocks5proxy.c:361
+#: gio/gsocks5proxy.c:361
 msgid "SOCKSv5 connection not allowed by ruleset."
 msgstr "Arauen multzoak ez du SOCKSv5 konexioa baimentzen."
 
-#: ../gio/gsocks5proxy.c:368
+#: gio/gsocks5proxy.c:368
 msgid "Host unreachable through SOCKSv5 server."
 msgstr "Ostalaria atziezina SOCKSv5 zerbitzariaren bidez."
 
-#: ../gio/gsocks5proxy.c:374
+#: gio/gsocks5proxy.c:374
 msgid "Network unreachable through SOCKSv5 proxy."
 msgstr "Sarea atziezina SOCKSv5 proxy-aren bidez."
 
-#: ../gio/gsocks5proxy.c:380
+#: gio/gsocks5proxy.c:380
 msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Konexioa ukatuta SOCKSv5 proxy-aren bidez."
 
-#: ../gio/gsocks5proxy.c:386
+#: gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "SOCKSv5 proxy-ak ez du “connect“ komandoa onartzen."
 
-#: ../gio/gsocks5proxy.c:392
+#: gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
 msgstr "SOCKSv5 proxy-ak ez du emandako helbide mota onartzen."
 
-#: ../gio/gsocks5proxy.c:398
+#: gio/gsocks5proxy.c:398
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "SOCKSv5 proxy-aren errore ezezaguna."
 
-#: ../gio/gthemedicon.c:518
+#: gio/gthemedicon.c:595
 #, c-format
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Ezin da GThemedIcon kodeketaren %d bertsioa kudeatu"
 
-#: ../gio/gthreadedresolver.c:118
+#: gio/gthreadedresolver.c:152
 msgid "No valid addresses were found"
 msgstr "Ez da baliozko helbiderik aurkitu"
 
-#: ../gio/gthreadedresolver.c:213
+#: gio/gthreadedresolver.c:334
 #, c-format
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "Errorea “%s“ alderantziz ebaztean: %s"
 
-#: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
-#: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
+#: gio/gthreadedresolver.c:671 gio/gthreadedresolver.c:750
+#: gio/gthreadedresolver.c:848 gio/gthreadedresolver.c:898
 #, c-format
 msgid "No DNS record of the requested type for “%s”"
 msgstr "Ez dago eskatutako motaren DNS erregistrorik “%s“(r)entzako"
 
-#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
+#: gio/gthreadedresolver.c:676 gio/gthreadedresolver.c:853
 #, c-format
 msgid "Temporarily unable to resolve “%s”"
 msgstr "Ezin da “%s“ ebatzi aldi batean"
 
-#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
+#: gio/gthreadedresolver.c:681 gio/gthreadedresolver.c:858
+#: gio/gthreadedresolver.c:968
 #, c-format
 msgid "Error resolving “%s”"
 msgstr "Errorea “%s“ ebaztean"
 
-#: ../gio/gtlscertificate.c:250
-msgid "Cannot decrypt PEM-encoded private key"
-msgstr "Ezin da PEMekin kodetutako gako pribatua desenkriptatu"
-
-#: ../gio/gtlscertificate.c:255
+#: gio/gtlscertificate.c:243
 msgid "No PEM-encoded private key found"
 msgstr "Ez da PEMekin kodetutako ziurtagirik aurkitu"
 
-#: ../gio/gtlscertificate.c:265
+#: gio/gtlscertificate.c:253
+msgid "Cannot decrypt PEM-encoded private key"
+msgstr "Ezin da PEMekin kodetutako gako pribatua deszifratu"
+
+#: gio/gtlscertificate.c:264
 msgid "Could not parse PEM-encoded private key"
 msgstr "Ezin izan da PEMekin kodetutako gako pribatua analizatu"
 
-#: ../gio/gtlscertificate.c:290
+#: gio/gtlscertificate.c:291
 msgid "No PEM-encoded certificate found"
 msgstr "Ez da PEMekin kodetutako ziurtagirik aurkitu"
 
-#: ../gio/gtlscertificate.c:299
+#: gio/gtlscertificate.c:300
 msgid "Could not parse PEM-encoded certificate"
 msgstr "Ezin izan da PEMekin kodetutako ziurtagiririk analizatu"
 
-#: ../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."
-msgstr ""
-"Hau azken aukera da pasahitza ongi sartzeko, zure sarbidetza blokeatu "
-"aurretik."
+msgstr "Hau azken aukera da pasahitza ongi sartzeko, zure sarbidetza blokeatu aurretik."
 
 #. 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
-#| msgid ""
-#| "Several password entered have been incorrect, and your access will be "
-#| "locked out after further failures."
+#: gio/gtlspassword.c:115
 msgid ""
 "Several passwords entered have been incorrect, and your access will be "
 "locked out after further failures."
-msgstr ""
-"Sartu diren hainbat pasahitz ez dira zuzenak, eta zure sarbidetza blokeatu "
-"egingo da hutsegite gehiagoren ondoren."
+msgstr "Sartu diren hainbat pasahitz ez dira zuzenak, eta zure sarbidetza blokeatu egingo da hutsegite gehiagoren ondoren."
 
-#: ../gio/gtlspassword.c:117
+#: gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Sartutako pasahitza okerrekoa da."
 
-#: ../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] "Kontroleko mezu 1 espero zen, %d lortu da"
-msgstr[1] "Kontroleko mezu 1 espero zen, %d lortu dira"
+msgstr[1] "Kontroleko mezu 1 espero zen, %d lortu da"
 
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
+#: gio/gunixconnection.c:182 gio/gunixconnection.c:575
 msgid "Unexpected type of ancillary data"
 msgstr "Ustekabeko datu-laguntzaile mota"
 
-#: ../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] "fd bat espero zen, baina %d lortu da\n"
-msgstr[1] "fd bat espero zen, baina %d lortu dira\n"
+msgstr[1] "fd bat espero zen, baina %d lortu da\n"
 
-#: ../gio/gunixconnection.c:219
+#: gio/gunixconnection.c:219
 msgid "Received invalid fd"
 msgstr "Baliogabeko fd jasota"
 
-#: ../gio/gunixconnection.c:355
+#: gio/gunixconnection.c:355
 msgid "Error sending credentials: "
 msgstr "Errorea kredentzialak bidaltzean: "
 
-#: ../gio/gunixconnection.c:504
+#: gio/gunixconnection.c:504
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Errorea SO_PASSCRED gaituta dagoen begiratzean socket-arentzako: %s"
 
-#: ../gio/gunixconnection.c:520
+#: gio/gunixconnection.c:520
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Errorea SO_PASSCRED gaitzean: %s"
 
-#: ../gio/gunixconnection.c:549
+#: gio/gunixconnection.c:549
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
-msgstr ""
-"Harrerako kredentzialentzako byte bakar bat irakurtzea espero zen, baina "
-"zero byte irakurri dira."
+msgstr "Harrerako kredentzialentzako byte bakar bat irakurtzea espero zen, baina zero byte irakurri dira."
 
-#: ../gio/gunixconnection.c:589
+#: gio/gunixconnection.c:589
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Ez zen kontroleko mezurik espero, baina %d lortu dira"
 
-#: ../gio/gunixconnection.c:614
+#: gio/gunixconnection.c:614
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Errorea SO_PASSCRED desgaitzean: %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 "Errorea fitxategiaren deskriptoretik irakurtzean: %s "
+msgstr "Errorea fitxategiaren deskriptoretik irakurtzean: %s"
 
-#: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:411
-#: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204
+#: gio/gunixinputstream.c:426 gio/gunixoutputstream.c:534
+#: gio/gwin32inputstream.c:217 gio/gwin32outputstream.c:204
 #, c-format
 msgid "Error closing file descriptor: %s"
-msgstr "Errorea fitxategiaren deskriptorea ixtean: %s "
+msgstr "Errorea fitxategiaren deskriptorea ixtean: %s"
 
-#: ../gio/gunixmounts.c:2430 ../gio/gunixmounts.c:2483
+#: gio/gunixmounts.c:2661 gio/gunixmounts.c:2714
 msgid "Filesystem root"
 msgstr "Fitxategi-sistemaren erroa"
 
-#: ../gio/gunixoutputstream.c:358 ../gio/gunixoutputstream.c:378
+#: gio/gunixoutputstream.c:371 gio/gunixoutputstream.c:391
+#: gio/gunixoutputstream.c:478 gio/gunixoutputstream.c:498
+#: gio/gunixoutputstream.c:675
 #, c-format
 msgid "Error writing to file descriptor: %s"
 msgstr "Errorea fitxategiaren deskriptorean idaztean: %s"
 
-#: ../gio/gunixsocketaddress.c:241
+#: gio/gunixsocketaddress.c:243
 msgid "Abstract UNIX domain socket addresses not supported on this system"
-msgstr ""
-"UNIX-eko domeinuen socket helbide abstraktuak ez daude sistema honetan "
-"onartuta"
+msgstr "UNIX-eko domeinuen socket helbide abstraktuak ez daude sistema honetan onartuta"
 
-#: ../gio/gvolume.c:437
+#: gio/gvolume.c:438
 msgid "volume doesn’t implement eject"
 msgstr "bolumenak ez dauka “egotzi“ inplementatuta"
 
 #. 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 "bolumenak ez dauka “egotzi“ edo “egotzi eragiketarekin“ inplementatuta"
 
-#: ../gio/gwin32inputstream.c:185
+#: gio/gwin32inputstream.c:185
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Errorea heldulekutik irakurtzean: %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 "Errorea heldulekua ixtean: %s"
 
-#: ../gio/gwin32outputstream.c:172
+#: gio/gwin32outputstream.c:172
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Errorea heldulekuan idaztean: %s"
 
-#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347
+#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347
 msgid "Not enough memory"
 msgstr "Ez dago nahikoa memoriarik"
 
-#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354
+#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354
 #, c-format
 msgid "Internal error: %s"
 msgstr "Barneko errorea: %s"
 
-#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368
+#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368
 msgid "Need more input"
 msgstr "Sarrera gehiago behar dira"
 
 #
-#: ../gio/gzlibdecompressor.c:340
+#: gio/gzlibdecompressor.c:340
 msgid "Invalid compressed data"
 msgstr "Konprimitutako datu baliogabeak"
 
-#: ../gio/tests/gdbus-daemon.c:18
+#: gio/tests/gdbus-daemon.c:18
 msgid "Address to listen on"
 msgstr "Helbidea entzuteko"
 
-#: ../gio/tests/gdbus-daemon.c:19
+#: gio/tests/gdbus-daemon.c:19
 msgid "Ignored, for compat with GTestDbus"
 msgstr "Ez ikusi egin GTestDBus-ekin bateragarria izateko"
 
-#: ../gio/tests/gdbus-daemon.c:20
+#: gio/tests/gdbus-daemon.c:20
 msgid "Print address"
 msgstr "Erakutsi helbidea"
 
-#: ../gio/tests/gdbus-daemon.c:21
+#: gio/tests/gdbus-daemon.c:21
 msgid "Print address in shell mode"
 msgstr "Erakutsi helbidea shell moduan"
 
-#: ../gio/tests/gdbus-daemon.c:28
+#: gio/tests/gdbus-daemon.c:28
 msgid "Run a dbus service"
 msgstr "Exekutatu dbus zerbitzua"
 
-#: ../gio/tests/gdbus-daemon.c:42
-#, c-format
+#: gio/tests/gdbus-daemon.c:42
 msgid "Wrong args\n"
 msgstr "Okerreko argumentuak\n"
 
-#: ../glib/gbookmarkfile.c:754
+#: glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "“%2$s“ elementuaren ustekabeko “%1$s“ atributua"
 
-#: ../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 "“%2$s“ elementuaren “%1$s“ atributua ez da aurkitu"
 
-#: ../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 "Ustekabeko “%s“ etiketa, “%s“ espero zen"
 
-#: ../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 "“%2$s“ barruan ustekabeko “%1$s“ etiketa"
 
-#: ../glib/gbookmarkfile.c:1756
+#: glib/gbookmarkfile.c:1813
 msgid "No valid bookmark file found in data dirs"
-msgstr ""
-"Ezin izan da baliozko laster-marken fitxategia aurkitu datuen direktorioan"
+msgstr "Ezin izan da baliozko laster-marken fitxategia aurkitu datuen direktorioan"
 
-#: ../glib/gbookmarkfile.c:1957
+#: glib/gbookmarkfile.c:2014
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "“%s“ URIaren laster-marka badago lehendik ere"
 
-#: ../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
+#: 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:3699
 #, c-format
 msgid "No bookmark found for URI “%s”"
 msgstr "Ez da “%s“ URIaren laster-markarik aurkitu"
 
-#: ../glib/gbookmarkfile.c:2335
+#: glib/gbookmarkfile.c:2392
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Ez dago “%s“ URIaren laster-markan MIME motarik definituta"
 
-#: ../glib/gbookmarkfile.c:2420
+#: glib/gbookmarkfile.c:2477
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "“%s“ URIaren laster-markan ez dago bandera pribaturik definituta"
 
-#: ../glib/gbookmarkfile.c:2799
+#: glib/gbookmarkfile.c:2856
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "“%s“ URIaren laster-markan ez dago talderik ezarrita"
 
-#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
+#: glib/gbookmarkfile.c:3255 glib/gbookmarkfile.c:3412
 #, c-format
 msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr "“%s“ izeneko aplikaziorik ez du erregistratu laster-markarik '%s'(e)n"
 
-#: ../glib/gbookmarkfile.c:3377
+#: glib/gbookmarkfile.c:3435
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Huts egin du “%s“ exekuzioko lerroa “%s“ URIarekin hedatzean"
 
-#: ../glib/gconvert.c:477 ../glib/gutf8.c:862 ../glib/gutf8.c:1074
-#: ../glib/gutf8.c:1211 ../glib/gutf8.c:1315
+#: glib/gconvert.c:466
+msgid "Unrepresentable character in conversion input"
+msgstr "Adierazi ezin den karakterea bihurketa-sarreran"
+
+#: glib/gconvert.c:493 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 "Karaktere-sekuentzia partziala sarreraren amaieran"
 
-#: ../glib/gconvert.c:742
+#: glib/gconvert.c:762
 #, c-format
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Ezin da “%s“ atzerapena “%s“ kode-multzo bihurtu"
 
-#: ../glib/gconvert.c:1513
+#: glib/gconvert.c:934
+msgid "Embedded NUL byte in conversion input"
+msgstr "NUL byte baliogabea bihurketa-sarreran"
+
+#: glib/gconvert.c:955
+msgid "Embedded NUL byte in conversion output"
+msgstr "NUL byte kapsulatua bihurketa-sarreran"
+
+#: glib/gconvert.c:1640
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "“%s“ URIa ez da “fitxategi“-eskema erabiltzen duen URI absolutua"
 
-#: ../glib/gconvert.c:1523
+#: glib/gconvert.c:1650
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "Baliteke “%s“ URI fitxategi lokalak “#“ ez edukitzea"
 
-#: ../glib/gconvert.c:1540
+#: glib/gconvert.c:1667
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "“%s“ URI baliogabea da"
 
-#: ../glib/gconvert.c:1552
+#: glib/gconvert.c:1679
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "“%s“ URIaren ostalari-izena baliogabea da"
 
-#: ../glib/gconvert.c:1568
+#: glib/gconvert.c:1695
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "“%s“ URIak ihes-karaktere baliogabeak ditu"
 
-#: ../glib/gconvert.c:1640
+#: glib/gconvert.c:1767
 #, c-format
 msgid "The pathname “%s” is not an absolute path"
 msgstr "“%s“ bide-izena ez da bide-izen absolutua"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:202
+#: glib/gdatetime.c:214
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%y-%m-%d %T %Z"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:205
+#: glib/gdatetime.c:217
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:208
+#: glib/gdatetime.c:220
 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
+#: glib/gdatetime.c:223
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 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:262
 msgctxt "full month name"
 msgid "January"
 msgstr "Urtarrila"
 
-#: ../glib/gdatetime.c:226
+#: glib/gdatetime.c:264
 msgctxt "full month name"
 msgid "February"
 msgstr "Otsaila"
 
-#: ../glib/gdatetime.c:228
+#: glib/gdatetime.c:266
 msgctxt "full month name"
 msgid "March"
 msgstr "Martxoa"
 
-#: ../glib/gdatetime.c:230
+#: glib/gdatetime.c:268
 msgctxt "full month name"
 msgid "April"
 msgstr "Apirila"
 
-#: ../glib/gdatetime.c:232
+#: glib/gdatetime.c:270
 msgctxt "full month name"
 msgid "May"
 msgstr "Maiatza"
 
-#: ../glib/gdatetime.c:234
+#: glib/gdatetime.c:272
 msgctxt "full month name"
 msgid "June"
 msgstr "Ekaina"
 
-#: ../glib/gdatetime.c:236
+#: glib/gdatetime.c:274
 msgctxt "full month name"
 msgid "July"
 msgstr "Uztaila"
 
-#: ../glib/gdatetime.c:238
+#: glib/gdatetime.c:276
 msgctxt "full month name"
 msgid "August"
 msgstr "Abuztua"
 
-#: ../glib/gdatetime.c:240
+#: glib/gdatetime.c:278
 msgctxt "full month name"
 msgid "September"
 msgstr "Iraila"
 
-#: ../glib/gdatetime.c:242
+#: glib/gdatetime.c:280
 msgctxt "full month name"
 msgid "October"
 msgstr "Urria"
 
-#: ../glib/gdatetime.c:244
+#: glib/gdatetime.c:282
 msgctxt "full month name"
 msgid "November"
 msgstr "Azaroa"
 
-#: ../glib/gdatetime.c:246
+#: glib/gdatetime.c:284
 msgctxt "full month name"
 msgid "December"
 msgstr "Abendua"
 
-#: ../glib/gdatetime.c:261
+#. Translators: Some languages need different grammatical forms of
+#. * month names depending on whether they are standalone or in a complete
+#. * date context, with the day number.  Some may prefer starting with
+#. * uppercase when they are standalone and with lowercase when they are
+#. * in a full date context.  However, as these names are abbreviated
+#. * the grammatical difference is visible probably only in Belarusian
+#. * and Russian.  In other languages there is no difference between
+#. * the standalone and complete date form when they are abbreviated.
+#. * If your system is Linux with the glibc version 2.27 (released
+#. * Feb 1, 2018) or newer then you can refer to the date command line
+#. * utility and see what the command `date +%Ob' produces.  Also in
+#. * the latest Linux the command `locale ab_alt_mon' in your native
+#. * locale produces a complete list of month names almost ready to copy
+#. * and paste here.  Note that this feature is not yet supported by any
+#. * other platform.  Here are abbreviated month names in a form
+#. * appropriate when they are used standalone.
+#.
+#: glib/gdatetime.c:316
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Urt."
 
-#: ../glib/gdatetime.c:263
+#: glib/gdatetime.c:318
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Ots."
 
-#: ../glib/gdatetime.c:265
+#: glib/gdatetime.c:320
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Mar."
 
-#: ../glib/gdatetime.c:267
+#: glib/gdatetime.c:322
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Apr."
 
-#: ../glib/gdatetime.c:269
+#: glib/gdatetime.c:324
 msgctxt "abbreviated month name"
 msgid "May"
-msgstr "Mai"
+msgstr "Maiatza"
 
-#: ../glib/gdatetime.c:271
+#: glib/gdatetime.c:326
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Eka."
 
-#: ../glib/gdatetime.c:273
+#: glib/gdatetime.c:328
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Uzt."
 
-#: ../glib/gdatetime.c:275
+#: glib/gdatetime.c:330
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "Abu."
 
-#: ../glib/gdatetime.c:277
+#: glib/gdatetime.c:332
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Ira."
 
-#: ../glib/gdatetime.c:279
+#: glib/gdatetime.c:334
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Urr."
 
-#: ../glib/gdatetime.c:281
+#: glib/gdatetime.c:336
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Aza."
 
-#: ../glib/gdatetime.c:283
+#: glib/gdatetime.c:338
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Abe."
 
-#: ../glib/gdatetime.c:298
+#: glib/gdatetime.c:353
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Astelehena"
 
-#: ../glib/gdatetime.c:300
+#: glib/gdatetime.c:355
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: ../glib/gdatetime.c:302
+#: glib/gdatetime.c:357
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: ../glib/gdatetime.c:304
+#: glib/gdatetime.c:359
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: ../glib/gdatetime.c:306
+#: glib/gdatetime.c:361
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Ostirala"
 
-#: ../glib/gdatetime.c:308
+#: glib/gdatetime.c:363
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: ../glib/gdatetime.c:310
+#: glib/gdatetime.c:365
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Igandea"
 
-#: ../glib/gdatetime.c:325
+#: glib/gdatetime.c:380
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Al."
 
-#: ../glib/gdatetime.c:327
+#: glib/gdatetime.c:382
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Ar."
 
-#: ../glib/gdatetime.c:329
+#: glib/gdatetime.c:384
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Az."
 
-#: ../glib/gdatetime.c:331
+#: glib/gdatetime.c:386
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Og."
 
-#: ../glib/gdatetime.c:333
+#: glib/gdatetime.c:388
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Or."
 
-#: ../glib/gdatetime.c:335
+#: glib/gdatetime.c:390
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Lr."
 
-#: ../glib/gdatetime.c:337
+#: glib/gdatetime.c:392
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Ig."
 
+#. 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:456
+msgctxt "full month name with day"
+msgid "January"
+msgstr "Urtarrila"
+
+#: glib/gdatetime.c:458
+msgctxt "full month name with day"
+msgid "February"
+msgstr "Otsaila"
+
+#: glib/gdatetime.c:460
+msgctxt "full month name with day"
+msgid "March"
+msgstr "Martxoa"
+
+#: glib/gdatetime.c:462
+msgctxt "full month name with day"
+msgid "April"
+msgstr "Apirila"
+
+#: glib/gdatetime.c:464
+msgctxt "full month name with day"
+msgid "May"
+msgstr "Maiatza"
+
+#: glib/gdatetime.c:466
+msgctxt "full month name with day"
+msgid "June"
+msgstr "Ekaina"
+
+#: glib/gdatetime.c:468
+msgctxt "full month name with day"
+msgid "July"
+msgstr "Uztaila"
+
+#: glib/gdatetime.c:470
+msgctxt "full month name with day"
+msgid "August"
+msgstr "Abuztua"
+
+#: glib/gdatetime.c:472
+msgctxt "full month name with day"
+msgid "September"
+msgstr "Iraila"
+
+#: glib/gdatetime.c:474
+msgctxt "full month name with day"
+msgid "October"
+msgstr "Urria"
+
+#: glib/gdatetime.c:476
+msgctxt "full month name with day"
+msgid "November"
+msgstr "Azaroa"
+
+#: glib/gdatetime.c:478
+msgctxt "full month name with day"
+msgid "December"
+msgstr "Abendua"
+
+#. 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:543
+msgctxt "abbreviated month name with day"
+msgid "Jan"
+msgstr "Urt."
+
+#: glib/gdatetime.c:545
+msgctxt "abbreviated month name with day"
+msgid "Feb"
+msgstr "Ots."
+
+#: glib/gdatetime.c:547
+msgctxt "abbreviated month name with day"
+msgid "Mar"
+msgstr "Mar."
+
+#: glib/gdatetime.c:549
+msgctxt "abbreviated month name with day"
+msgid "Apr"
+msgstr "Apr."
+
+#: glib/gdatetime.c:551
+msgctxt "abbreviated month name with day"
+msgid "May"
+msgstr "Maiatza"
+
+#: glib/gdatetime.c:553
+msgctxt "abbreviated month name with day"
+msgid "Jun"
+msgstr "Eka."
+
+#: glib/gdatetime.c:555
+msgctxt "abbreviated month name with day"
+msgid "Jul"
+msgstr "Uzt."
+
+#: glib/gdatetime.c:557
+msgctxt "abbreviated month name with day"
+msgid "Aug"
+msgstr "Abu."
+
+#: glib/gdatetime.c:559
+msgctxt "abbreviated month name with day"
+msgid "Sep"
+msgstr "Ira."
+
+#: glib/gdatetime.c:561
+msgctxt "abbreviated month name with day"
+msgid "Oct"
+msgstr "Urr."
+
+#: glib/gdatetime.c:563
+msgctxt "abbreviated month name with day"
+msgid "Nov"
+msgstr "Aza."
+
+#: glib/gdatetime.c:565
+msgctxt "abbreviated month name with day"
+msgid "Dec"
+msgstr "Abe."
+
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:354
+#: glib/gdatetime.c:582
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:357
+#: glib/gdatetime.c:585
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
-#: ../glib/gdir.c:155
+#: glib/gdir.c:154
 #, c-format
 msgid "Error opening directory “%s”: %s"
-msgstr "Errorea “%s“ direktorioa irekitzean: %s "
+msgstr "Errorea “%s“ direktorioa irekitzean: %s"
 
-#: ../glib/gfileutils.c:706 ../glib/gfileutils.c:798
+#: 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] "Ezin izan da byte %lu esleitu “%s“ fitxategia irakurtzeko"
 msgstr[1] "Ezin izan dira %lu byte esleitu “%s“ fitxategia irakurtzeko"
 
-#: ../glib/gfileutils.c:723
+#: glib/gfileutils.c:733
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "Errorea “%s“ fitxategia irakurtzean: %s"
 
-#: ../glib/gfileutils.c:759
+#: glib/gfileutils.c:769
 #, c-format
 msgid "File “%s” is too large"
 msgstr "“%s“ fitxategia handiegia da"
 
-#: ../glib/gfileutils.c:823
+#: glib/gfileutils.c:833
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "Ezin izan da “%s“ fitxategitik irakurri: %s"
 
-#: ../glib/gfileutils.c:871 ../glib/gfileutils.c:943
+#: glib/gfileutils.c:881 glib/gfileutils.c:953
 #, c-format
 msgid "Failed to open file “%s”: %s"
-msgstr "Ezin izan da “%s“ fitxategia ireki: %s "
+msgstr "Ezin izan da “%s“ fitxategia ireki: %s"
 
-#: ../glib/gfileutils.c:883
+#: glib/gfileutils.c:893
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
-msgstr ""
-"Ezin izan dira “%s“ fitxategiko atributuak lortu, fstat() funtzioak huts "
-"egin du: %s"
+msgstr "Ezin izan dira “%s“ fitxategiko atributuak lortu, fstat() funtzioak huts egin du: %s"
 
-#: ../glib/gfileutils.c:913
+#: glib/gfileutils.c:923
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
-msgstr ""
-"Ezin izan da “%s“ fitxategia ireki, fdopen() funtzioak huts egin du: %s"
+msgstr "Ezin izan da “%s“ fitxategia ireki, fdopen() funtzioak huts egin du: %s"
 
-#: ../glib/gfileutils.c:1012
+#: glib/gfileutils.c:1022
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
-msgstr ""
-"Ezin izan da “%s“ fitxategia “%s“ gisa berrizendatu, g_rename() funtzioak "
-"huts egin du: %s"
+msgstr "Ezin izan da “%s“ fitxategia “%s“ gisa berrizendatu, g_rename() funtzioak huts egin du: %s"
 
-#: ../glib/gfileutils.c:1047 ../glib/gfileutils.c:1554
+#: glib/gfileutils.c:1057 glib/gfileutils.c:1575
 #, c-format
 msgid "Failed to create file “%s”: %s"
 msgstr "Ezin izan da “%s“ fitxategia sortu: %s"
 
-#: ../glib/gfileutils.c:1074
+#: glib/gfileutils.c:1084
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
-msgstr ""
-"Huts egin du “%s“ fitxategian idaztean: fwrite() funtzioak huts egin du: %s"
+msgstr "Huts egin du “%s“ fitxategian idaztean: fwrite() funtzioak huts egin du: %s"
 
-#: ../glib/gfileutils.c:1117
+#: glib/gfileutils.c:1127
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
-msgstr ""
-"Huts egin du “%s“ fitxategia idaztean: fsync() funtzioak huts egin du: %s"
+msgstr "Huts egin du “%s“ fitxategia idaztean: fsync() funtzioak huts egin du: %s"
 
-#: ../glib/gfileutils.c:1241
+#: glib/gfileutils.c:1262
 #, c-format
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
-msgstr ""
-"“%s“ fitxategia ezin izan da kendu, g_unlik() funtzioak huts egin du: %s"
+msgstr "“%s“ fitxategia ezin izan da kendu, g_unlik() funtzioak huts egin du: %s"
 
-#: ../glib/gfileutils.c:1520
+#: glib/gfileutils.c:1541
 #, c-format
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "“%s“ txantiloia baliogabea da, ez luke “%s“ eduki behar"
 
-#: ../glib/gfileutils.c:1533
+#: glib/gfileutils.c:1554
 #, c-format
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "“%s“ txantiloiak ez dauka: XXXXXX"
 
-#: ../glib/gfileutils.c:2058
+#: glib/gfileutils.c:2112 glib/gfileutils.c:2140
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Ezin izan da “%s“ esteka sinbolikorik irakurri: %s"
 
-#: ../glib/giochannel.c:1388
+#: glib/giochannel.c:1393
 #, c-format
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Ezin izan da “%s“(e)tik “%s“(e)rako bihurtzailea ireki: %s"
 
-#: ../glib/giochannel.c:1733
+#: glib/giochannel.c:1738
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr "Ezin dira datu gordinak irakurri “g_io_channel_read_line_string“-en"
 
-#: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038
-#: ../glib/giochannel.c:2125
+#: glib/giochannel.c:1785 glib/giochannel.c:2043 glib/giochannel.c:2130
 msgid "Leftover unconverted data in read buffer"
 msgstr "Irakurketa-bufferrean geratu diren bihurtu gabeko datuak"
 
-#: ../glib/giochannel.c:1861 ../glib/giochannel.c:1938
+#: glib/giochannel.c:1866 glib/giochannel.c:1943
 msgid "Channel terminates in a partial character"
 msgstr "Kanala karaktere partzial batean bukatzen da"
 
-#: ../glib/giochannel.c:1924
+#: glib/giochannel.c:1929
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Ezin dira datu gordinak irakurri “g_io_channel_read_to_end“-etik"
 
-#: ../glib/gkeyfile.c:736
+#: glib/gkeyfile.c:789
 msgid "Valid key file could not be found in search dirs"
 msgstr "Ezin izan da baliozko gakoa datuen direktorioan aurkitu"
 
-#: ../glib/gkeyfile.c:773
+#: glib/gkeyfile.c:826
 msgid "Not a regular file"
 msgstr "Ez da fitxategi arrunta"
 
-#: ../glib/gkeyfile.c:1218
+#: glib/gkeyfile.c:1275
 #, c-format
 msgid ""
 "Key file contains line “%s” which is not a key-value pair, group, or comment"
-msgstr ""
-"Gako-fitxategiak “%s“ lerroa du, gako-balioa bikotea, taldea edo iruzkinik "
-"ez daukalarik"
+msgstr "Gako-fitxategiak “%s“ lerroa du, gako-balioa bikotea, taldea edo iruzkinik ez daukalarik"
 
 #
-#: ../glib/gkeyfile.c:1275
+#: glib/gkeyfile.c:1332
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Taldearen izen baliogabea: %s"
 
-#: ../glib/gkeyfile.c:1297
+#: glib/gkeyfile.c:1354
 msgid "Key file does not start with a group"
 msgstr "Gako-fitxategiak ez da talde batekin hasten"
 
 #
-#: ../glib/gkeyfile.c:1323
+#: glib/gkeyfile.c:1380
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Gakoaren izen baliogabea: %s"
 
-#: ../glib/gkeyfile.c:1350
+#: glib/gkeyfile.c:1407
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "Gako-fitxategiak onartzen ez den “%s“ kodeketa du"
 
-#: ../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
+#: glib/gkeyfile.c:1650 glib/gkeyfile.c:1823 glib/gkeyfile.c:3276
+#: glib/gkeyfile.c:3339 glib/gkeyfile.c:3469 glib/gkeyfile.c:3601
+#: glib/gkeyfile.c:3747 glib/gkeyfile.c:3976 glib/gkeyfile.c:4043
 #, c-format
 msgid "Key file does not have group “%s”"
 msgstr "Gako-fitxategiak ez dauka “%s“ taldea"
 
-#: ../glib/gkeyfile.c:1721
+#: glib/gkeyfile.c:1778
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Gako-fitxategiak ez dauka “%s“ gakoa (“%s“ taldean)"
 
-#: ../glib/gkeyfile.c:1883 ../glib/gkeyfile.c:1999
+#: glib/gkeyfile.c:1940 glib/gkeyfile.c:2056
 #, c-format
 msgid "Key file contains key “%s” with value “%s” which is not UTF-8"
 msgstr "Gako-fitxategiak “%s“ gakoa dauka (%s balioduna) baina ez da UTF-8"
 
-#: ../glib/gkeyfile.c:1903 ../glib/gkeyfile.c:2019 ../glib/gkeyfile.c:2388
+#: glib/gkeyfile.c:1960 glib/gkeyfile.c:2076 glib/gkeyfile.c:2518
 #, c-format
 msgid ""
 "Key file contains key “%s” which has a value that cannot be interpreted."
-msgstr ""
-"Gako-fitxategiak “%s“ gakoa dauka, baina ezin den interpretatu balio bat "
-"dauka."
+msgstr "Gako-fitxategiak “%s“ gakoa dauka, baina ezin den interpretatu balio bat dauka."
 
-#: ../glib/gkeyfile.c:2606 ../glib/gkeyfile.c:2975
+#: glib/gkeyfile.c:2736 glib/gkeyfile.c:3105
 #, c-format
 msgid ""
 "Key file contains key “%s” in group “%s” which has a value that cannot be "
 "interpreted."
-msgstr ""
-"Gako-fitxategiak “%s“ gakoa dauka ('%s taldean), baina dagokion balioa ezin "
-"da interpretatu."
+msgstr "Gako-fitxategiak “%s“ gakoa dauka ('%s taldean), baina dagokion balioa ezin da interpretatu."
 
-#: ../glib/gkeyfile.c:2684 ../glib/gkeyfile.c:2761
+#: glib/gkeyfile.c:2814 glib/gkeyfile.c:2891
 #, c-format
 msgid "Key “%s” in group “%s” has value “%s” where %s was expected"
 msgstr "“%2$s“ taldeko “%1$s“ gakoaren balioa “%3$s“ da, “%4$s“ izan ordez."
 
-#: ../glib/gkeyfile.c:4149
+#: glib/gkeyfile.c:4283
 msgid "Key file contains escape character at end of line"
 msgstr "Gako-fitxategiak ihes-karakterea dauka lerro amaieran"
 
-#: ../glib/gkeyfile.c:4171
+#: glib/gkeyfile.c:4305
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Gako-fitxategiak “%s“ ihes-sekuentzia baliogabea dauka"
 
-#: ../glib/gkeyfile.c:4315
+#: glib/gkeyfile.c:4449
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "“%s“ balioa ezin da zenbaki gisa interpretatu"
 
-#: ../glib/gkeyfile.c:4329
+#: glib/gkeyfile.c:4463
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "“%s“ osoko balioa barrutitik kanpo"
 
-#: ../glib/gkeyfile.c:4362
+#: glib/gkeyfile.c:4496
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "“%s“ balioa ezin da zenbaki mugikor gisa interpretatu."
 
-#: ../glib/gkeyfile.c:4401
+#: glib/gkeyfile.c:4535
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "“%s“ balioa ezin da boolear gisa interpretatu"
 
-#: ../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 ""
-"Huts egin du “%s%s%s%s“ fitxategiaren atributuak lortzean. fstat() funtzioak "
-"huts egin du: %s"
+msgstr "Huts egin du “%s%s%s%s“ fitxategiaren atributuak lortzean. fstat() funtzioak huts egin du: %s"
 
-#: ../glib/gmappedfile.c:195
+#: glib/gmappedfile.c:195
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "Huts egin %s%s%s%s mapatzean. mmap() funtzioak huts egin du: %s"
 
-#: ../glib/gmappedfile.c:262
+#: glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Ezin izan da “%s“ fitxategia ireki, open() funtzioak huts egin du: %s"
 
-#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
+#: glib/gmarkup.c:398 glib/gmarkup.c:440
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "Errorea %d lerroko %d karakterean: "
 
-#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
+#: glib/gmarkup.c:462 glib/gmarkup.c:545
 #, c-format
-msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
-msgstr "UTF-8 gisa kodetutako testu baliogabea izenean - '%s' ez da baliozkoa"
+msgid "Invalid UTF-8 encoded text in name — not valid “%s”"
+msgstr "UTF-8 gisa kodetutako testu baliogabea izenean - “%s” ez da baliozkoa"
 
-#: ../glib/gmarkup.c:472
+#: glib/gmarkup.c:473
 #, c-format
-msgid "'%s' is not a valid name"
-msgstr "'%s' ez da baliozko izena "
+msgid "“%s” is not a valid name"
+msgstr "“%s” ez da baliozko izena"
 
-#: ../glib/gmarkup.c:488
+#: glib/gmarkup.c:489
 #, c-format
-msgid "'%s' is not a valid name: '%c'"
-msgstr "'%s' ez da baliozko izena: '%c' "
+msgid "“%s” is not a valid name: “%c”"
+msgstr "“%s” ez da baliozko izena: “%c”"
 
-#: ../glib/gmarkup.c:598
+#: glib/gmarkup.c:613
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Errorea %d lerroan: %s"
 
-#: ../glib/gmarkup.c:675
+#: glib/gmarkup.c:690
 #, 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"
-msgstr ""
-"Ezin izan da '%-.*s' analizatu, digitu bat izan behar zuen karaktere-"
-"erreferentzia baten barruan (&#234; adibidez); agian digitua handiegia da"
+"Failed to parse “%-.*s”, which should have been a digit inside a character "
+"reference (&#234; for example) — perhaps the digit is too large"
+msgstr "Ezin izan da “%-.*s” analizatu, digitu bat izan behar zuen karaktere-erreferentzia baten barruan (&#234; adibidez); agian digitua handiegia da"
 
-#: ../glib/gmarkup.c:687
+#: glib/gmarkup.c:702
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity - escape ampersand "
+"ampersand character without intending to start an entity — escape ampersand "
 "as &amp;"
-msgstr ""
-"Karaktere-erreferentzia ez da puntu eta komaz bukatzen; ziurrenik & ikurra "
-"erabiliko zenuen entitatea hasteko asmorik gabe. Izendatu & karakterea &amp; "
-"gisa;"
+msgstr "Karaktere-erreferentzia ez da puntu eta komaz bukatzen; ziurrenik & ikurra erabiliko zenuen entitatea hasteko asmorik gabe. Izendatu & karakterea &amp; gisa"
 
-#: ../glib/gmarkup.c:713
+#: glib/gmarkup.c:728
 #, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
-msgstr ""
-"'%-.*s' karaktere-erreferentziak ez du baimendutako karaktere bat kodetzen"
+msgid "Character reference “%-.*s” does not encode a permitted character"
+msgstr "“%-.*s” karaktere-erreferentziak ez du baimendutako karaktere bat kodetzen"
 
-#: ../glib/gmarkup.c:751
+#: glib/gmarkup.c:766
 msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
-msgstr ""
-"'&;' entitatea hutsik dago; baliozko entitateak hauek dira: &amp; &quot; "
-"&lt; &gt; &apos;"
+"Empty entity “&;” seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+msgstr "“&;” entitatea hutsik dago; baliozko entitateak hauek dira: &amp; &quot; &lt; &gt; &apos;"
 
-#: ../glib/gmarkup.c:759
+#: glib/gmarkup.c:774
 #, c-format
-msgid "Entity name '%-.*s' is not known"
-msgstr "'%-.*s' entitate-izena ezezaguna da"
+msgid "Entity name “%-.*s” is not known"
+msgstr "“%-.*s” entitate-izena ezezaguna da"
 
-#: ../glib/gmarkup.c:764
+#: glib/gmarkup.c:779
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity - escape ampersand as &amp;"
-msgstr ""
-"Entitatea ez da puntu eta komaz bukatzen; normalean & ikurra erabiltzen da "
-"entitatea hasteko asmorik gabe; izendatu & karakterea &amp; gisa;"
+"character without intending to start an entity — escape ampersand as &amp;"
+msgstr "Entitatea ez da puntu eta komaz bukatzen; normalean & ikurra erabiltzen da entitatea hasteko asmorik gabe; izendatu & karakterea &amp; gisa"
 
-#: ../glib/gmarkup.c:1170
+#: glib/gmarkup.c:1187
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokumentuak elementu batez hasi behar du (adibidez, <book>)"
 
-#: ../glib/gmarkup.c:1210
+#: glib/gmarkup.c:1227
 #, 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' ez da karaktere balioduna '<' karakterearen atzetik; baliteke elementu "
-"baten izena ez hastea"
+msgstr "“%s”  ez da baliozko karakterea '<' karakterearen atzetik; baliteke elementu baten izena ez hastea"
 
-#: ../glib/gmarkup.c:1252
+#: glib/gmarkup.c:1270
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag "
-"'%s'"
-msgstr ""
-"'%s' karaktere bitxia, '>' karakterea espero zen '%s' elementuaren etiketa "
-"hutsa amaitzeko"
+"Odd character “%s”, expected a “>” character to end the empty-element tag "
+"“%s”"
+msgstr "“%s” karaktere bitxia, '>' karakterea espero zen “%s” elementuaren etiketa hutsa amaitzeko"
 
-#: ../glib/gmarkup.c:1333
+#: glib/gmarkup.c:1352
 #, c-format
 msgid ""
-"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
-msgstr ""
-"'%s' karaktere bitxia, '=' espero zen '$2%s' elementuaren '$1%s' "
-"atributuaren ondoren"
+"Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”"
+msgstr "“%s” karaktere bitxia, '=' espero zen “%s” atributuaren ondoren “%s” elementuan"
 
-#: ../glib/gmarkup.c:1374
+#: glib/gmarkup.c:1394
 #, c-format
 msgid ""
-"Odd character '%s', expected a '>' or '/' character to end the start tag of "
-"element '%s', or optionally an attribute; perhaps you used an invalid "
+"Odd character “%s”, expected a “>” or “/” character to end the start tag of "
+"element “%s”, or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
-msgstr ""
-"'%s' karaktere bitxia, '>' edo '/' karakterea espero zen '%s' elementuaren "
-"hasiera-etiketa bukatzeko, edo bestela atributu bat. Agian karaktere "
-"baliogabea erabili duzu atributu-izen batean"
+msgstr "“%s” atributuaren ondoren karaktere bitxia, “>“ edo “/“ karakterea espero zen “%s” atributuaren ondoren elementuaren hasiera-etiketa bukatzeko, edo bestela atributu bat. Agian karaktere baliogabea erabili duzu atributu-izen batean"
 
-#: ../glib/gmarkup.c:1418
+#: glib/gmarkup.c:1439
 #, c-format
 msgid ""
-"Odd character '%s', expected an open quote mark after the equals sign when "
-"giving value for attribute '%s' of element '%s'"
-msgstr ""
-"'%s' karaktere bitxia, komatxo irekia espero zen berdin ikurraren ondoren "
-"'$2%s' elementuaren '$1%s' atributuari balioa ematean"
+"Odd character “%s”, expected an open quote mark after the equals sign when "
+"giving value for attribute “%s” of element “%s”"
+msgstr "“%s“ karaktere bitxia, komatxo irekia espero zen berdin ikurraren ondoren “%s“ atributuari balioa ematean “%s“ elementuan"
 
-#: ../glib/gmarkup.c:1551
+#: glib/gmarkup.c:1573
 #, 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' ez da karaktere balioduna '</'; karaktereen atzetik; baliteke '%s'e(k) "
-"elementu baten izena ez hastea"
+msgstr "“%s“ ez da karaktere balioduna “</“; karaktereen atzetik; baliteke “%s“ atributuak elementu baten izena ez hastea"
 
-#: ../glib/gmarkup.c:1587
+#: glib/gmarkup.c:1611
 #, c-format
 msgid ""
-"'%s' is not a valid character following the close element name '%s'; the "
-"allowed character is '>'"
-msgstr ""
-"'%s' karaktere baliogabea da '%s' itxiera-elementuaren izenaren atzetik; "
-"baimendutako karakterea '>' da"
+"“%s” is not a valid character following the close element name “%s”; the "
+"allowed character is “>”"
+msgstr "“%s“ ez da baliozko karakterea da “%s“ itxiera-elementuaren izenaren atzetik; baimendutako karakterea “>“ da"
 
-#: ../glib/gmarkup.c:1598
+#: glib/gmarkup.c:1623
 #, c-format
-msgid "Element '%s' was closed, no element is currently open"
-msgstr "'%s' elementua itxi egin da, unean ez dago elementurik irekita"
+msgid "Element “%s” was closed, no element is currently open"
+msgstr "“%s“ elementua itxi egin da, unean ez dago elementurik irekita"
 
-#: ../glib/gmarkup.c:1607
+#: glib/gmarkup.c:1632
 #, c-format
-msgid "Element '%s' was closed, but the currently open element is '%s'"
-msgstr "'%s' elementua itxi egin da, baina unean '%s' elementua dago irekita"
+msgid "Element “%s” was closed, but the currently open element is “%s”"
+msgstr "“%s“ elementua itxi egin da, baina unean “%s“ elementua dago irekita"
 
-#: ../glib/gmarkup.c:1760
+#: glib/gmarkup.c:1785
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokumentua hutsik dago edo zuriuneak bakarrik ditu"
 
-#: ../glib/gmarkup.c:1774
-msgid "Document ended unexpectedly just after an open angle bracket '<'"
-msgstr "Dokumentua ustekabean itxi da angelu-parentesi ireki baten ondoren '<'"
+#: glib/gmarkup.c:1799
+msgid "Document ended unexpectedly just after an open angle bracket “<”"
+msgstr "Dokumentua ustekabean itxi da “<“ angelu-parentesi ireki baten ondoren"
 
-#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
+#: glib/gmarkup.c:1807 glib/gmarkup.c:1852
 #, 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 ""
-"Dokumentua ustekabean amaitu da oraindik irekita zeuden elementuekin. '%s' "
-"irekitako azken elementua da"
+msgstr "Dokumentua ustekabean amaitu da oraindik irekita zeuden elementuekin. “%s“ irekitako azken elementua da"
 
-#: ../glib/gmarkup.c:1790
+#: glib/gmarkup.c:1815
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
-msgstr ""
-"Dokumentua ustekabean amaitu da, angelu-parentesi itxia ikustea espero nuen <"
-"%s/> etiketa amaitzen"
+msgstr "Dokumentua ustekabean amaitu da, angelu-parentesi itxia ikustea espero zen <%s/> etiketa amaitzen"
 
-#: ../glib/gmarkup.c:1796
+#: glib/gmarkup.c:1821
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Dokumentua ustekabean amaitu da elementu-izen baten barruan"
 
-#: ../glib/gmarkup.c:1802
+#: glib/gmarkup.c:1827
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Dokumentua ustekabean amaitu da atributu-izen baten barruan"
 
-#: ../glib/gmarkup.c:1807
+#: glib/gmarkup.c:1832
 msgid "Document ended unexpectedly inside an element-opening tag."
-msgstr ""
-"Dokumentua ustekabean amaitu da elementua irekitzeko etiketa baten barruan."
+msgstr "Dokumentua ustekabean amaitu da elementua irekitzeko etiketa baten barruan."
 
-#: ../glib/gmarkup.c:1813
+#: glib/gmarkup.c:1838
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
-msgstr ""
-"Dokumentua ustekabean amaitu da atributu-izen baten ondorengo berdin "
-"ikurraren atzetik; ez dago atributu-baliorik"
+msgstr "Dokumentua ustekabean amaitu da atributu-izen baten ondorengo berdin ikurraren atzetik; ez dago atributu-baliorik"
 
-#: ../glib/gmarkup.c:1820
+#: glib/gmarkup.c:1845
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Dokumentua ustekabean amaitu da atributu-balio baten barruan"
 
-#: ../glib/gmarkup.c:1836
+#: glib/gmarkup.c:1862
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element '%s'"
-msgstr ""
-"Dokumentua ustekabean amaitu da '%s' elementuaren itxiera-etiketaren barruan"
+msgid "Document ended unexpectedly inside the close tag for element “%s”"
+msgstr "Dokumentua ustekabean amaitu da “%s“ elementuaren itxiera-etiketaren barruan"
+
+#: glib/gmarkup.c:1866
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
+msgstr "Dokumentua ustekabean amaitu da ireki gabeko elementu baten itxiera-etiketaren barruan"
 
-#: ../glib/gmarkup.c:1842
+#: glib/gmarkup.c:1872
 msgid "Document ended unexpectedly inside a comment or processing instruction"
-msgstr ""
-"Dokumentua ustekabean amaitu da iruzkin baten barruan edo prozesatzen ari "
-"zen instrukzio baten barruan"
+msgstr "Dokumentua ustekabean amaitu da iruzkin baten barruan edo prozesatzen ari zen instrukzio baten barruan"
 
-#: ../glib/goption.c:861
+#: glib/goption.c:865
 msgid "[OPTION…]"
 msgstr "[AUKERA…]"
 
-#: ../glib/goption.c:977
+#: glib/goption.c:981
 msgid "Help Options:"
 msgstr "Laguntzako aukerak:"
 
-#: ../glib/goption.c:978
+#: glib/goption.c:982
 msgid "Show help options"
 msgstr "Erakutsi laguntzako aukerak"
 
-#: ../glib/goption.c:984
+#: glib/goption.c:988
 msgid "Show all help options"
 msgstr "Erakutsi laguntzako aukera guztiak"
 
-#: ../glib/goption.c:1047
+#: glib/goption.c:1051
 msgid "Application Options:"
 msgstr "Aplikazio-aukerak:"
 
-#: ../glib/goption.c:1049
+#: glib/goption.c:1053
 msgid "Options:"
 msgstr "Aukerak:"
 
-#: ../glib/goption.c:1113 ../glib/goption.c:1183
+#: glib/goption.c:1117 glib/goption.c:1187
 #, c-format
 msgid "Cannot parse integer value “%s” for %s"
 msgstr "Ezin da “%2$s“(r)en “%1$s“ osoko balioa analizatu"
 
-#: ../glib/goption.c:1123 ../glib/goption.c:1191
+#: glib/goption.c:1127 glib/goption.c:1195
 #, c-format
 msgid "Integer value “%s” for %s out of range"
 msgstr "%2$s(r)en “%1$s“ osoko balioa barrutitik kanpo"
 
-#: ../glib/goption.c:1148
+#: glib/goption.c:1152
 #, c-format
 msgid "Cannot parse double value “%s” for %s"
 msgstr "Ezin da “%2$s“(r)en “%1$s“ balio bikoitza analizatu"
 
-#: ../glib/goption.c:1156
+#: glib/goption.c:1160
 #, c-format
 msgid "Double value “%s” for %s out of range"
 msgstr "%2$s(r)en “%1$s“ balio bikoitza barrutitik kanpo"
 
-#: ../glib/goption.c:1448 ../glib/goption.c:1527
+#: glib/goption.c:1452 glib/goption.c:1531
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Errorea %s aukera analizatzean"
 
-#: ../glib/goption.c:1558 ../glib/goption.c:1671
+#: glib/goption.c:1562 glib/goption.c:1675
 #, c-format
 msgid "Missing argument for %s"
 msgstr "%s(e)ko argumentua falta da"
 
-#: ../glib/goption.c:2132
+#: glib/goption.c:2181
 #, c-format
 msgid "Unknown option %s"
 msgstr "%s aukera ezezaguna"
 
-#: ../glib/gregex.c:257
+#: glib/gregex.c:257
 msgid "corrupted object"
 msgstr "hondatutako objektua"
 
-#: ../glib/gregex.c:259
+#: glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "barneko errorea edo hondatutako objektua"
 
-#: ../glib/gregex.c:261
+#: glib/gregex.c:261
 msgid "out of memory"
 msgstr "Memoriarik ez"
 
-#: ../glib/gregex.c:266
+#: glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "atzera-jotzearen mugara gainditua"
 
-#: ../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 ""
-"ereduak zenbait elementu ditu bat etortze partzialetan onartzen ez direnak"
+msgstr "ereduak zenbait elementu ditu bat etortze partzialetan onartzen ez direnak"
 
-#: ../glib/gregex.c:280
+#: glib/gregex.c:280
 msgid "internal error"
 msgstr "barneko errorea"
 
-#: ../glib/gregex.c:288
+#: glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
-msgstr ""
-"aurreko erreferentziak baldintza gisa ez daude onartuta bat etortze "
-"partzialetan"
+msgstr "aurreko erreferentziak baldintza gisa ez daude onartuta bat etortze partzialetan"
 
-#: ../glib/gregex.c:297
+#: glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "errekurtsioaren muga gainditua"
 
-#: ../glib/gregex.c:299
+#: glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "lerro-jauzien banderen baliogabeko konbinazioa"
 
-#: ../glib/gregex.c:301
+#: glib/gregex.c:301
 msgid "bad offset"
 msgstr "okerreko desplazamendua"
 
-#: ../glib/gregex.c:303
+#: glib/gregex.c:303
 msgid "short utf8"
 msgstr "utf8 laburra"
 
-#: ../glib/gregex.c:305
+#: glib/gregex.c:305
 msgid "recursion loop"
 msgstr "errekurtsioaren begizta"
 
-#: ../glib/gregex.c:309
+#: glib/gregex.c:309
 msgid "unknown error"
 msgstr "errore ezezaguna"
 
-#: ../glib/gregex.c:329
+#: glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ ereduaren amaieran"
 
-#: ../glib/gregex.c:332
+#: glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c ereduaren amaieran"
 
-#: ../glib/gregex.c:335
+#: glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "karaktere ezezagunak jarraitzen dio \\ karaktereari"
 
-#: ../glib/gregex.c:338
+#: glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "zenbakiak barrutitik kanpo {} kuantifikatzailean"
 
-#: ../glib/gregex.c:341
+#: glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "zenbaki handiegiak {} kuantifikatzaileak"
 
-#: ../glib/gregex.c:344
+#: glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "karaktere-klasearen amaierako ] falta da"
 
-#: ../glib/gregex.c:347
+#: glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "karaktere-klasean baliogabeko ihes sekuentzia"
 
-#: ../glib/gregex.c:350
+#: glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "karaktere-klaseko barrutia barrutitik kanpo"
 
-#: ../glib/gregex.c:353
+#: glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "ezer ez errepikatzeko"
 
-#: ../glib/gregex.c:357
+#: glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "ustekabeko begizta"
 
-#: ../glib/gregex.c:360
+#: glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "karaktere ezezaguna (? edo (?- karaktereen atzetik"
 
-#: ../glib/gregex.c:363
+#: glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "POSIX izeneko klaseak soilik onartzen dira klase baten barruan"
 
-#: ../glib/gregex.c:366
+#: glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "amaierako ) falta da"
 
-#: ../glib/gregex.c:369
+#: glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "existitzen ez den azpieredu baten erreferentzia"
 
-#: ../glib/gregex.c:372
+#: glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "iruzkinaren ondoren ) falta da"
 
-#: ../glib/gregex.c:375
+#: glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "adierazpen erregularra luzeegia da"
 
-#: ../glib/gregex.c:378
+#: glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "huts egin du memoria lortzean"
 
-#: ../glib/gregex.c:382
+#: glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") dago irekierako ( gabe"
 
-#: ../glib/gregex.c:386
+#: glib/gregex.c:386
 msgid "code overflow"
 msgstr "kodea gainezkatua"
 
-#: ../glib/gregex.c:390
+#: glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "karaktere ezezaguna (?< karaktereen atzetik"
 
-#: ../glib/gregex.c:393
+#: glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "'lookbehind' baieztapenak ez du luzera finkorik"
 
-#: ../glib/gregex.c:396
+#: glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "gaizki osatutako zenbakia edo izena (?(-ren atzetik"
 
-#: ../glib/gregex.c:399
+#: glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "baldintza taldeak bi adar baino gehiago ditu"
 
-#: ../glib/gregex.c:402
+#: glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "baieztapena espero zen (?)-ren atzetik"
 
 #. 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 edo (?[+-] digituak )-rekin jarraitu behar dira"
 
-#: ../glib/gregex.c:412
+#: glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "POSIX klasearen izen ezezaguna"
 
-#: ../glib/gregex.c:415
+#: glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "Tartekatutako POSIX elementuak ez daude onartuta"
 
-#: ../glib/gregex.c:418
+#: glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "\\x{...} sekuentziako karaktere-balioa luzeegia da"
 
-#: ../glib/gregex.c:421
+#: glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "baliogabeko (?(0) baldintza"
 
-#: ../glib/gregex.c:424
+#: glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C ez dago baimenduta 'lookbehind' baieztapenean"
 
-#: ../glib/gregex.c:431
+#: glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "\\L, \\l, \\N{izena}, \\U, eta \\u ihes-karaktereak ez daude onartuta"
 
-#: ../glib/gregex.c:434
+#: glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "dei errekurtsiboa amaierarik gabeko begiztan sar daiteke"
 
-#: ../glib/gregex.c:438
+#: glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "karaktere ezezaguna (?P karaktereen atzetik"
 
-#: ../glib/gregex.c:441
+#: glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "amaierako karakterea falta da azpiereduko izenean"
 
-#: ../glib/gregex.c:444
+#: glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "bi azpiereduk izen berdina dute"
 
-#: ../glib/gregex.c:447
+#: glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "gaizki osatutako \\P edo \\p sekuentzia"
 
-#: ../glib/gregex.c:450
+#: glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "propietate-izen ezezaguna \\P edo \\p atzetik"
 
-#: ../glib/gregex.c:453
+#: glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "azpiereduaren izena luzeegia (32 karaktere gehienez)"
 
-#: ../glib/gregex.c:456
+#: glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "izendun azpieredu gehiegi (10.000 gehienez)"
 
-#: ../glib/gregex.c:459
+#: glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "balio zortzitarra \\377 baino handiagoa"
 
-#: ../glib/gregex.c:463
+#: glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "konpilazioaren laneko area gainezkatua"
 
-#: ../glib/gregex.c:467
+#: glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "ez da aurrez egiaztatutako erreferentziatutako azpieredua aurkitu"
 
-#: ../glib/gregex.c:470
+#: glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE taldeak adar bat baino gehiago ditu"
 
-#: ../glib/gregex.c:473
+#: glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "NEWLINE aukera kontraesankorra"
 
-#: ../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"
-msgstr ""
-"\\g ez da parentesi, kortxete edo aipu motako izena edo zenbaki, edo zenbaki "
-"soil batekin jarraitzen"
+msgstr "\\g ez da parentesi, kortxete edo aipu motako izena edo zenbaki, edo zenbaki soil batekin jarraitzen"
 
-#: ../glib/gregex.c:480
+#: glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "zenbatutako erreferentzia bat ezin du zero izan"
 
-#: ../glib/gregex.c:483
+#: glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
-msgstr ""
-"argumentu bat ez dago onartuta (*ACCEPT), (*FAIL), edo (*COMMIT)-entzako"
+msgstr "argumentu bat ez dago onartuta (*ACCEPT), (*FAIL), edo (*COMMIT)-entzako"
 
-#: ../glib/gregex.c:486
+#: glib/gregex.c:486
 msgid "(*VERB) not recognized"
-msgstr "(*VERB) ez da ezagutzen "
+msgstr "(*VERB) ez da ezagutzen"
 
-#: ../glib/gregex.c:489
+#: glib/gregex.c:489
 msgid "number is too big"
 msgstr "zenbakia handiegia da"
 
-#: ../glib/gregex.c:492
+#: glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "azpiereduaren izena falta da (?& ondoren"
 
-#: ../glib/gregex.c:495
+#: glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "digitua espero zen (?+ ondoren"
 
-#: ../glib/gregex.c:498
+#: glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
-msgstr ""
-"] datuen baliogabeko karaktere bat da JavaScript-en bateragarritasun moduan "
+msgstr "] datuen baliogabeko karaktere bat da JavaScript-en bateragarritasun moduan"
 
-#: ../glib/gregex.c:501
+#: glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "zenbaki berdinaren azpiereduen izen desberdinak ez daude onartuta"
 
-#: ../glib/gregex.c:504
+#: glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) argumentu bat eduki behar du"
 
-#: ../glib/gregex.c:507
+#: glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "\\c ondoren ASCII karaktere bat behar da"
 
-#: ../glib/gregex.c:510
+#: glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
-msgstr "\\k ondoren ez dago parentesi, kortxete edo aipatutako izen bat  "
+msgstr "\\k ondoren ez dago parentesi, kortxete edo aipatutako izen bat"
 
-#: ../glib/gregex.c:513
+#: glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N ez dago klase batean onartuta"
 
-#: ../glib/gregex.c:516
+#: glib/gregex.c:516
 msgid "too many forward references"
 msgstr "aurreranzko erreferentzia gehiegi"
 
-#: ../glib/gregex.c:519
+#: glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "izena luzeegia da  (*MARK), (*PRUNE), (*SKIP), edo (*THEN)-en"
 
-#: ../glib/gregex.c:522
+#: glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "\\u sekuentziako karaktere-balioa luzeegia da"
 
-#: ../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 "Errorea %s adierazpen erregularra bilatzean: %s"
 
-#: ../glib/gregex.c:1316
+#: glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE liburutegia UTF8 euskarri gabe konpilatua"
 
-#: ../glib/gregex.c:1320
+#: glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE liburutegia UTF8 propietateen euskarri gabe konpilatua"
 
-#: ../glib/gregex.c:1328
+#: glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "PCRE liburutegia aukera bateragarririk gabe konpilatua"
 
-#: ../glib/gregex.c:1357
+#: glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Errorea %s adierazpen erregularra optimizatzean: %s"
 
-#: ../glib/gregex.c:1437
+#: glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Errorea %s adierazpen erregularra %d karakterean konpilatzean: %s"
 
-#: ../glib/gregex.c:2413
+#: glib/gregex.c:2419
 msgid "hexadecimal digit or “}” expected"
 msgstr "digitu hamaseitarra edo “}“ espero zen"
 
-#: ../glib/gregex.c:2429
+#: glib/gregex.c:2435
 msgid "hexadecimal digit expected"
 msgstr "digitu hamaseitarra espero zen"
 
-#: ../glib/gregex.c:2469
+#: glib/gregex.c:2475
 msgid "missing “<” in symbolic reference"
 msgstr "“<“ falta da erreferentzia sinbolikoan"
 
-#: ../glib/gregex.c:2478
+#: glib/gregex.c:2484
 msgid "unfinished symbolic reference"
 msgstr "amaitu gabeko erreferentzia sinbolikoa"
 
-#: ../glib/gregex.c:2485
+#: glib/gregex.c:2491
 msgid "zero-length symbolic reference"
 msgstr "zero luzerako erreferentzia sinbolikoa"
 
-#: ../glib/gregex.c:2496
+#: glib/gregex.c:2502
 msgid "digit expected"
 msgstr "digitua espero zen"
 
-#: ../glib/gregex.c:2514
+#: glib/gregex.c:2520
 msgid "illegal symbolic reference"
 msgstr "erreferentzia sinboliko ilegala"
 
-#: ../glib/gregex.c:2576
+#: glib/gregex.c:2583
 msgid "stray final “\\”"
 msgstr "“\\“ katearen amaieran"
 
-#: ../glib/gregex.c:2580
+#: glib/gregex.c:2587
 msgid "unknown escape sequence"
 msgstr "ihes-sekuentzi ezezaguna"
 
-#: ../glib/gregex.c:2590
+#: glib/gregex.c:2597
 #, c-format
 msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Errorea ordezko “%s“ testua analizatzean %lu karakterean: %s"
 
-#: ../glib/gshell.c:94
+#: glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Komatxo arteko testua ez da komatxoekin hasten"
 
-#: ../glib/gshell.c:184
+#: glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
-msgstr ""
-"Bat ez datozen komatxoak daude komando-lerroan edo shell-ak aipatutako beste "
-"testu batean"
+msgstr "Bat ez datozen komatxoak daude komando-lerroan edo shell-ak aipatutako beste testu batean"
 
-#: ../glib/gshell.c:580
+#: glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr "Testua “\\“ karakterearen atzetik amaitu da (testua “%s“ zen)"
 
-#: ../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 ""
-"Testua %c(r)en komatxoak aurkitu baino lehen amaitu da (testua “%s“ zen)"
+msgstr "Testua %c(r)en komatxoak aurkitu baino lehen amaitu da (testua “%s“ zen)"
 
-#: ../glib/gshell.c:599
+#: glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Testua hutsik dago (edo zuriuneak bakarrik ditu)"
 
-#: ../glib/gspawn.c:250
+#: glib/gspawn.c:315
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Ezin izan da daturik irakurri prozesu umetik (%s)"
 
-#: ../glib/gspawn.c:394
+#: glib/gspawn.c:463
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Ustekabeko errorea select()-en, datuak prozesu umetik irakurtzen (%s)"
 
-#: ../glib/gspawn.c:479
+#: glib/gspawn.c:548
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Ustekabeko errorea waitpid()-en (%s)"
 
-#: ../glib/gspawn.c:886 ../glib/gspawn-win32.c:1231
+#: glib/gspawn.c:1056 glib/gspawn-win32.c:1329
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Prozesu umea amaitu da %ld kodearekin"
 
-#: ../glib/gspawn.c:894
+#: glib/gspawn.c:1064
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Prozesu umea %ld seinaleak hilda"
 
-#: ../glib/gspawn.c:901
+#: glib/gspawn.c:1071
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Prozesu umea %ld seinaleak geldituta"
 
-#: ../glib/gspawn.c:908
+#: glib/gspawn.c:1078
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Prozesu umea ustekabean amaituta"
 
-#: ../glib/gspawn.c:1313 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
+#: glib/gspawn.c:1405 glib/gspawn-win32.c:350 glib/gspawn-win32.c:358
 #, c-format
 msgid "Failed to read from child pipe (%s)"
-msgstr "Ezin izan da kanalizazio umetik irakurri (%s) "
+msgstr "Ezin izan da kanalizazio umetik irakurri (%s)"
+
+#: glib/gspawn.c:1653
+#, c-format
+msgid "Failed to spawn child process “%s” (%s)"
+msgstr "Ezin izan da “%s“ prozesu umea abiarazi (%s)"
 
-#: ../glib/gspawn.c:1383
+#: glib/gspawn.c:1692
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Ezin da sardetu (%s)"
 
-#: ../glib/gspawn.c:1532 ../glib/gspawn-win32.c:368
+#: glib/gspawn.c:1841 glib/gspawn-win32.c:381
 #, c-format
 msgid "Failed to change to directory “%s” (%s)"
 msgstr "Ezin izan da “%s“ direktoriora aldatu (%s)"
 
-#: ../glib/gspawn.c:1542
+#: glib/gspawn.c:1851
 #, c-format
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "Ezin izan da “%s“ prozesu umea exekutatu (%s)"
 
-#: ../glib/gspawn.c:1552
+#: glib/gspawn.c:1861
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Ezin izan da prozesu umearen irteera edo sarrera birbideratu (%s)"
 
-#: ../glib/gspawn.c:1561
+#: glib/gspawn.c:1870
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Ezin izan da prozesu umea sardetu (%s)"
 
-#: ../glib/gspawn.c:1569
+#: glib/gspawn.c:1878
 #, c-format
 msgid "Unknown error executing child process “%s”"
 msgstr "Errore ezezaguna “%s“ prozesu umea exekutatzean"
 
-#: ../glib/gspawn.c:1593
+#: glib/gspawn.c:1902
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Ezin izan da nahikoa datu irakurri pid kanalizazio umetik (%s)"
 
-#: ../glib/gspawn-win32.c:281
+#: glib/gspawn-win32.c:294
 msgid "Failed to read data from child process"
 msgstr "Ezin izan da daturik irakurri prozesu umetik"
 
-#: ../glib/gspawn-win32.c:298
+#: glib/gspawn-win32.c:311
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
-msgstr "Ezin izan da kanalizazioa sortu prozesu umearekin komunikatzeko (%s) "
+msgstr "Ezin izan da kanalizazioa sortu prozesu umearekin komunikatzeko (%s)"
 
-#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
+#: glib/gspawn-win32.c:387 glib/gspawn-win32.c:392 glib/gspawn-win32.c:511
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Ezin izan da prozesu umea exekutatu (%s)"
 
 #
-#: ../glib/gspawn-win32.c:443
+#: glib/gspawn-win32.c:461
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Programaren izen baliogabea: %s"
 
-#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: glib/gspawn-win32.c:471 glib/gspawn-win32.c:725
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Kate baliogabea %d(e)ko bektorearen argumentuan: %s"
 
-#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: glib/gspawn-win32.c:482 glib/gspawn-win32.c:740
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Kate baliogabea ingurunean: %s"
 
-#: ../glib/gspawn-win32.c:716
+#: glib/gspawn-win32.c:721
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Laneko direktorio baliogabea: %s"
 
 #
-#: ../glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:783
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Ezin izan da laguntza-programa exekutatu (%s)"
 
-#: ../glib/gspawn-win32.c:995
+#: glib/gspawn-win32.c:1056
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
-msgstr ""
-"Ustekabeko errorea gertatu da 'g_io_channel_win32_poll()'-en prozesu umetik "
-"datuak irakurtzean"
+msgstr "Ustekabeko errorea gertatu da 'g_io_channel_win32_poll()'-en prozesu umetik datuak irakurtzean"
 
-#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+#: glib/gstrfuncs.c:3287 glib/gstrfuncs.c:3389
 msgid "Empty string is not a number"
 msgstr "Kate hutsa ez da zenbaki bat"
 
-#: ../glib/gstrfuncs.c:3271
+#: glib/gstrfuncs.c:3311
 #, c-format
-#| msgid "'%s' is not a valid name"
 msgid "“%s” is not a signed number"
 msgstr "“%s” ez da zeinudun zenbaki bat"
 
-#: ../glib/gstrfuncs.c:3281 ../glib/gstrfuncs.c:3384
+#: glib/gstrfuncs.c:3321 glib/gstrfuncs.c:3425
 #, c-format
 msgid "Number “%s” is out of bounds [%s, %s]"
 msgstr "“%s” zenbakia barrutitik kanpo [%s, %s]"
 
-#: ../glib/gstrfuncs.c:3374
+#: glib/gstrfuncs.c:3415
 #, c-format
-#| msgid "'%s' is not a valid name"
 msgid "“%s” is not an unsigned number"
 msgstr "“%s” ez da zeinurik gabeko zenbaki bat"
 
-#: ../glib/gutf8.c:808
+#: glib/gutf8.c:811
 msgid "Failed to allocate memory"
 msgstr "Huts egin du memoria esleitzean"
 
-#: ../glib/gutf8.c:941
+#: glib/gutf8.c:944
 msgid "Character out of range for UTF-8"
 msgstr "Karakterea UTF-8 barrutitik kanpo"
 
-#: ../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 "Sekuentzia baliogabea bihurketa-sarreran"
 
-#: ../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 "Karakterea UTF-16 barrutitik kanpo"
 
-#: ../glib/gutils.c:2149 ../glib/gutils.c:2176 ../glib/gutils.c:2282
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2317
 #, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "byte %u"
-msgstr[1] "%u byte"
+msgid "%.1f kB"
+msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2155
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2319
 #, c-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
+msgid "%.1f MB"
+msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2157
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2321
 #, c-format
-msgid "%.1f MiB"
-msgstr "%.1f MiB"
+msgid "%.1f GB"
+msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2160
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2323
 #, c-format
-msgid "%.1f GiB"
-msgstr "%.1f GiB"
+msgid "%.1f TB"
+msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2163
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2325
 #, c-format
-msgid "%.1f TiB"
-msgstr "%.1f TiB"
+msgid "%.1f PB"
+msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2166
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2327
 #, c-format
-msgid "%.1f PiB"
-msgstr "%.1f PiB"
+msgid "%.1f EB"
+msgstr "%.1f EB"
 
-#: ../glib/gutils.c:2169
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2331
 #, c-format
-msgid "%.1f EiB"
-msgstr "%.1f EiB"
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2182
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2333
 #, c-format
-msgid "%.1f kB"
-msgstr "%.1f kB"
+msgid "%.1f MiB"
+msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2185 ../glib/gutils.c:2300
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2335
 #, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
+msgid "%.1f GiB"
+msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2188 ../glib/gutils.c:2305
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2337
 #, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
+msgid "%.1f TiB"
+msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2190 ../glib/gutils.c:2310
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2339
 #, c-format
-msgid "%.1f TB"
-msgstr "%.1f TB"
+msgid "%.1f PiB"
+msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2193 ../glib/gutils.c:2315
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2341
 #, c-format
-msgid "%.1f PB"
-msgstr "%.1f PB"
+msgid "%.1f EiB"
+msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2196 ../glib/gutils.c:2320
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2345
 #, c-format
-msgid "%.1f EB"
-msgstr "%.1f EB"
+msgid "%.1f kb"
+msgstr "%.1f kb"
 
-#. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2233
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2347
 #, c-format
-msgid "%s byte"
-msgid_plural "%s bytes"
-msgstr[0] "byte %s"
-msgstr[1] "%s byte"
+msgid "%.1f Mb"
+msgstr "%.1f Mb"
 
-#. 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:2295
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2349
 #, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-msgctxt "full month name with day"
-msgid "January"
-msgstr "Urtarrila"
-
-msgctxt "full month name with day"
-msgid "February"
-msgstr "Otsaila"
-
-msgctxt "full month name with day"
-msgid "March"
-msgstr "Martxoa"
-
-msgctxt "full month name with day"
-msgid "April"
-msgstr "Apirila"
-
-msgctxt "full month name with day"
-msgid "May"
-msgstr "Maiatza"
-
-msgctxt "full month name with day"
-msgid "June"
-msgstr "Ekaina"
-
-msgctxt "full month name with day"
-msgid "July"
-msgstr "Uztaila"
-
-msgctxt "full month name with day"
-msgid "August"
-msgstr "Abuztua"
-
-msgctxt "full month name with day"
-msgid "September"
-msgstr "Iraila"
+msgid "%.1f Gb"
+msgstr "%.1f Gb"
 
-msgctxt "full month name with day"
-msgid "October"
-msgstr "Urria"
-
-msgctxt "full month name with day"
-msgid "November"
-msgstr "Azaroa"
-
-msgctxt "full month name with day"
-msgid "December"
-msgstr "Abendua"
-
-msgctxt "abbreviated month name with day"
-msgid "Jan"
-msgstr "Urt."
-
-msgctxt "abbreviated month name with day"
-msgid "Feb"
-msgstr "Ots."
-
-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 "Eka."
-
-msgctxt "abbreviated month name with day"
-msgid "Jul"
-msgstr "Uzt."
-
-msgctxt "abbreviated month name with day"
-msgid "Aug"
-msgstr "Abu."
-
-msgctxt "abbreviated month name with day"
-msgid "Sep"
-msgstr "Ira."
-
-msgctxt "abbreviated month name with day"
-msgid "Oct"
-msgstr "Urr."
-
-msgctxt "abbreviated month name with day"
-msgid "Nov"
-msgstr "Aza."
-
-msgctxt "abbreviated month name with day"
-msgid "Dec"
-msgstr "Abe."
-
-#~ msgid "No such interface"
-#~ msgstr "Ez dago halako interfazerik"
-
-#~ msgid "No files given"
-#~ msgstr "Ez da fitxategirik eman"
-
-#~ msgid "Error getting writable attributes: %s\n"
-#~ msgstr "Errorea atributu idazgarriak lortzean: %s\n"
-
-#~ msgid "Error mounting location: %s\n"
-#~ msgstr "Errorea kokalekua muntatzean: %s\n"
-
-#~ msgid "Error unmounting mount: %s\n"
-#~ msgstr "Errorea muntatze-puntua desmuntatzean: %s\n"
-
-#~ msgid "Error finding enclosing mount: %s\n"
-#~ msgstr "Errorea muntai inguratua aurkitzean: %s\n"
-
-#~ msgid "Error ejecting mount: %s\n"
-#~ msgstr "Errorea muntatze-puntua egoztean: %s\n"
-
-#~ msgid "Error mounting %s: %s\n"
-#~ msgstr "Errorea %s muntatzean: %s\n"
-
-#~ msgid "No files to open"
-#~ msgstr "Ez dago fitxategirik irekitzeko"
-
-#~ msgid "No files to delete"
-#~ msgstr "Ez dago fitxategirik ezabatzeko"
-
-#~ msgid "Error setting attribute: %s\n"
-#~ msgstr "Errorea atributua ezartzean: %s\n"
-
-#~ msgid "Error creating directory '%s': %s"
-#~ msgstr "Errorea '%s' direktorioa sortzean: %s"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2351
+#, c-format
+msgid "%.1f Tb"
+msgstr "%.1f Tb"
 
-#~ msgid "Error opening file '%s': %s"
-#~ msgstr "Errorea '%s' fitxategia irekitzean: %s"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2353
+#, c-format
+msgid "%.1f Pb"
+msgstr "%.1f Pb"
 
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "Errorea '%s' fitxategia irakurtzean: %s"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2355
+#, c-format
+msgid "%.1f Eb"
+msgstr "%.1f Eb"
 
-#~ msgid "Error renaming file: %s"
-#~ msgstr "Errorea fitxategia izenez aldatzean: %s"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2359
+#, c-format
+msgid "%.1f Kib"
+msgstr "%.1f Kib"
 
-#~ msgid "Error opening file: %s"
-#~ msgstr "Errorea fitxategia irekitzean: %s"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2361
+#, c-format
+msgid "%.1f Mib"
+msgstr "%.1f Mib"
 
-#~ msgid "Error creating directory: %s"
-#~ msgstr "Errorea direktorioa sortzean: %s"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2363
+#, c-format
+msgid "%.1f Gib"
+msgstr "%.1f Gib"
 
-#~ msgid "association changes not supported on win32"
-#~ msgstr "asoziazioaren aldaketak ez dira onartzen win32 sisteman"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2365
+#, c-format
+msgid "%.1f Tib"
+msgstr "%.1f Tib"
 
-#~ msgid "Association creation not supported on win32"
-#~ msgstr "Asoziazioa sortzea ez da onartzen win32 sisteman"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2367
+#, c-format
+msgid "%.1f Pib"
+msgstr "%.1f Pib"
 
-#~ msgid "Unable to find default local directory monitor type"
-#~ msgstr ""
-#~ "Ezin da lokaleko direktorio lehenetsiaren monitorizazio mota aurkitu"
+#. Translators: Keep the no-break space between %.1f and the unit symbol
+#: glib/gutils.c:2369
+#, c-format
+msgid "%.1f Eib"
+msgstr "%.1f Eib"
 
-#~ msgid "URIs not supported"
-#~ msgstr "URIak ez daude onartuta"
+#: glib/gutils.c:2403 glib/gutils.c:2529
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "byte %u"
+msgstr[1] "%u byte"
 
-#~ msgid "Key file does not have key '%s'"
-#~ msgstr "Gako-fitxategiak ez dauka '%s' gakoa"
+#: glib/gutils.c:2407
+#, c-format
+msgid "%u bit"
+msgid_plural "%u bits"
+msgstr[0] "bit %u"
+msgstr[1] "%u bit"
 
-#~ msgid ""
-#~ "Error processing input file with xmllint:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Errorea sarrerako fitxategia xmllint-ekin prozesatzean:\n"
-#~ "%s"
+#. Translators: the %s in "%s bytes" will always be replaced by a number.
+#: glib/gutils.c:2474
+#, c-format
+msgid "%s byte"
+msgid_plural "%s bytes"
+msgstr[0] "byte %s"
+msgstr[1] "%s byte"
 
-#~ msgid ""
-#~ "Error processing input file with to-pixdata:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Errorea sarrerako fitxategia 'to-pixdata'-rekin prozesatzean:\n"
-#~ "%s"
+#. Translators: the %s in "%s bits" will always be replaced by a number.
+#: glib/gutils.c:2479
+#, c-format
+msgid "%s bit"
+msgid_plural "%s bits"
+msgstr[0] "bit %s"
+msgstr[1] "%s byte"
 
-#~ msgid "Unable to get pending error: %s"
-#~ msgstr "Ezin da falta diren erroreak lortu: %s"
+#. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to
+#. * mean 1024 bytes.  I am aware that 'KB' is not correct, but it has been preserved for reasons of
+#. * compatibility.  Users will not see this string unless a program is using this deprecated function.
+#. * Please translate as literally as possible.
+#.
+#: glib/gutils.c:2542
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
 
-#~ msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
-#~ msgstr ""
-#~ "Ezin izan da '%s' fitxategia idazteko ireki, fdopen() funtzioak huts egin "
-#~ "du: %s"
+#: glib/gutils.c:2547
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
 
-#~ msgid "Failed to write file '%s': fflush() failed: %s"
-#~ msgstr ""
-#~ "Huts egin du '%s' fitxategia idaztean: fflush() funtzioak huts egin du: %s"
+#: glib/gutils.c:2552
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
 
-#~ msgid "Failed to close file '%s': fclose() failed: %s"
-#~ msgstr ""
-#~ "Ezin izan da '%s' fitxategia itxi, fclose() funtzioak huts egin du: %s"
+#: glib/gutils.c:2557
+#, c-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
 
-#~ msgid "Abnormal program termination spawning command line '%s': %s"
-#~ msgstr "Ustekabeko programaren amaiera '%s' komando-lerroa abiaraztean: %s"
+#: glib/gutils.c:2562
+#, c-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
 
-#~ msgid "Command line '%s' exited with non-zero exit status %d: %s"
-#~ msgstr "'%s' komando-lerroa zero ez den %d egoerarekin irten da: %s"
+#: glib/gutils.c:2567
+#, c-format
+msgid "%.1f EB"
+msgstr "%.1f EB"
 
-#~ msgid "No service record for '%s'"
-#~ msgstr "Ez dago '%s' zerbitzuaren erregistrorik"
-
-#~ msgid ""
-#~ "Unexpected option length while checking if SO_PASSCRED is enabled for "
-#~ "socket. Expected %d bytes, got %d"
-#~ msgstr ""
-#~ "Ustekabeko aukeraren luzera SO_PASSCRED gaituta dagoen begiratzean socket-"
-#~ "arentzako. %d byte espero ziren, baina %d lortu dira"
-
-#~ msgid "workspace limit for empty substrings reached"
-#~ msgstr "azpikate hutsen lan arearen muga gainditua"
-
-#~ msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
-#~ msgstr ""
-#~ "hemen ez dira ihesdun letrak (\\l, \\L, \\u, \\U) erabiltzen uzten "
-#~ "(maiuskulaz eta minuskulaz)"
-
-#~ msgid "repeating a DEFINE group is not allowed"
-#~ msgstr "DEFINE taldea errepikatzea ez dago onartuta"
-
-#~ msgid "File is empty"
-#~ msgstr "Fitxategia hutsik dago"
-
-#~ msgid ""
-#~ "Key file contains key '%s' which has value that cannot be interpreted."
-#~ msgstr ""
-#~ "Gako-fitxategiak '%s' gakoa dauka, baina dagokion balioa ezin da "
-#~ "interpretatu."
-
-#~ msgid "This option will be removed soon."
-#~ msgstr "Aukera hau laster kenduko da."
-
-#~ msgid "Error stating file '%s': %s"
-#~ msgstr "Errorea '%s' fitxategiaren egoera irakurtzean: %s"
-
-#~ msgid "Error connecting: "
-#~ msgstr "Errorea konektatzean: "
-
-#~ msgid "Error connecting: %s"
-#~ msgstr "Errorea konektatzean: %s"
-
-#~ msgid "SOCKSv4 implementation limits username to %i characters"
-#~ msgstr ""
-#~ "SOCKSv4 inplementazioak erabiltzaile-izena %i karakteretara mugatzen du"
-
-#~ msgid "SOCKSv4a implementation limits hostname to %i characters"
-#~ msgstr "SOCKSv4 inplementazioak ostalari-izena %i karakteretara mugatzen du"
-
-#~ msgid "Error reading from unix: %s"
-#~ msgstr "Errorea UNIXetik irakurtzean: %s"
-
-#~ msgid "Error writing to unix: %s"
-#~ msgstr "Errorea UNIXen idaztean: %s"
-
-#~ msgid "Type of return value is incorrect, got '%s', expected '%s'"
-#~ msgstr ""
-#~ "Itzulerako balioaren mota ez da zuzena: '%s' jaso da, baina '%s' espero "
-#~ "zen"
-
-#~ msgid ""
-#~ "Trying to set property %s of type %s but according to the expected "
-#~ "interface the type is %s"
-#~ msgstr ""
-#~ "'%2$s' motaren '%1$s' propietatea ezartzen saiatzen, baina espero zen "
-#~ "interfazearen arabera, mota '%3$s' da"
-
-#~ msgid "No such schema '%s' specified in override file '%s'"
-#~ msgstr ""
-#~ "Ez da '%s' bezalako eskemarik zehaztu gainidazketako '%s' fitxategian"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "  help        Show this information\n"
-#~ "  get         Get the value of a key\n"
-#~ "  set         Set the value of a key\n"
-#~ "  reset       Reset the value of a key\n"
-#~ "  monitor     Monitor a key for changes\n"
-#~ "  writable    Check if a key is writable\n"
-#~ "\n"
-#~ "Use '%s COMMAND --help' to get help for individual commands.\n"
-#~ msgstr ""
-#~ "Komandoak:\n"
-#~ "  help        Erakutsi informazio hau\n"
-#~ "  get         Lortu gako baten balioa\n"
-#~ "  set         Ezarri gako baten balioa\n"
-#~ "  reset       Berrezarri gako baten balioa\n"
-#~ "  monitor     Monitorizatu gako bat aldaketentzako\n"
-#~ "  writable    Begiratu gakoa idazgarria den\n"
-#~ "\n"
-#~ "Erabili '%s KOMANDOA --help' komando bakoitzari dagokion laguntza "
-#~ "lortzeko.\n"
-
-#~ msgid "Specify the path for the schema"
-#~ msgstr "Zehaztu eskemaren bide-izena"
-
-#~ msgid ""
-#~ "Arguments:\n"
-#~ "  SCHEMA      The id of the schema\n"
-#~ "  KEY         The name of the key\n"
-#~ "  VALUE       The value to set key to, as a serialized GVariant\n"
-#~ msgstr ""
-#~ "Argumentuak:\n"
-#~ "  ESKEMA      Eskemaren IDa\n"
-#~ "  GAKOA        Gakoaren izena\n"
-#~ "  BALIOA        Gakoari ezarriko zaion balioa, serializatutako GVariant "
-#~ "gisa\n"
-
-#~ msgid ""
-#~ "Monitor KEY for changes and print the changed values.\n"
-#~ "Monitoring will continue until the process is terminated."
-#~ msgstr ""
-#~ "Monitorizatu GAKOA bere aldaketen jarraipena egiteko eta inprimatu "
-#~ "aldatutako balioak.\n"
-#~ "Monitorizazioak jarraitu egingo du prozesua amaitu bitartean."
-
-#~ msgctxt "GDateTime"
-#~ msgid "am"
-#~ msgstr "am"
-
-#~ msgctxt "GDateTime"
-#~ msgid "pm"
-#~ msgstr "pm"
diff --git a/po/id.po b/po/id.po
index eb0881a59..2917be3d7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,12 +5,13 @@
 # Mohammad DAMT <mdamt@bisnisweb.com>, 2005.
 # Dirgita <dirgitadevina@yahoo.co.id>, 2010, 2012.
 # Andika Triwidada <andika@gmail.com>, 2010-2013, 2015, 2018.
+# Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
-"POT-Creation-Date: 2019-02-12 14:26+0000\n"
-"PO-Revision-Date: 2019-02-14 22:06+0700\n"
+"POT-Creation-Date: 2019-03-19 10:54+0000\n"
+"PO-Revision-Date: 2019-04-25 15:47+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -103,7 +104,7 @@ msgstr "Buat daftar aksi statik bagi suatu aplikasi (dari berkas .desktop)"
 msgid "APPID"
 msgstr "APPID"
 
-#: gio/gapplication-tool.c:70 gio/gapplication-tool.c:133 gio/gdbus-tool.c:90
+#: gio/gapplication-tool.c:70 gio/gapplication-tool.c:133 gio/gdbus-tool.c:91
 #: gio/gio-tool.c:224
 msgid "COMMAND"
 msgstr "PERINTAH"
@@ -279,7 +280,7 @@ msgstr "Stream telah ditutup"
 msgid "Truncate not supported on base stream"
 msgstr "Pemenggalan tak didukung pada stream basis"
 
-#: gio/gcancellable.c:317 gio/gdbusconnection.c:1867 gio/gdbusprivate.c:1402
+#: gio/gcancellable.c:319 gio/gdbusconnection.c:1867 gio/gdbusprivate.c:1406
 #: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897
 #, c-format
 msgid "Operation was cancelled"
@@ -299,13 +300,13 @@ msgstr "Tak cukup ruang di tujuan"
 
 #: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848
 #: gio/gdatainputstream.c:1261 glib/gconvert.c:455 glib/gconvert.c:885
-#: glib/giochannel.c:1557 glib/giochannel.c:1599 glib/giochannel.c:2443
+#: glib/giochannel.c:1561 glib/giochannel.c:1603 glib/giochannel.c:2447
 #: glib/gutf8.c:869 glib/gutf8.c:1322
 msgid "Invalid byte sequence in conversion input"
 msgstr "Rangkaian bita dalam input konversi tidak benar"
 
 #: gio/gcharsetconverter.c:347 glib/gconvert.c:463 glib/gconvert.c:799
-#: glib/giochannel.c:1564 glib/giochannel.c:2455
+#: glib/giochannel.c:1568 glib/giochannel.c:2459
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Galat ketika konversi: %s"
@@ -314,7 +315,7 @@ msgstr "Galat ketika konversi: %s"
 msgid "Cancellable initialization not supported"
 msgstr "Inisialisasi yang dapat dibatalkan tak didukung"
 
-#: gio/gcharsetconverter.c:456 glib/gconvert.c:328 glib/giochannel.c:1385
+#: gio/gcharsetconverter.c:456 glib/gconvert.c:328 glib/giochannel.c:1389
 #, c-format
 msgid "Conversion from character set “%s” to “%s” is not supported"
 msgstr "Konversi dari gugus karakter \"%s\" ke \"%s\" tak didukung"
@@ -358,12 +359,17 @@ msgstr "Pemalsuan kredensial tak diimplementasikan di OS ini"
 msgid "Unexpected early end-of-stream"
 msgstr "Akhir stream terlalu dini, tak diharapkan"
 
-#: gio/gdbusaddress.c:158 gio/gdbusaddress.c:246 gio/gdbusaddress.c:327
+#: gio/gdbusaddress.c:154 gio/gdbusaddress.c:229 gio/gdbusaddress.c:310
 #, c-format
 msgid "Unsupported key “%s” in address entry “%s”"
 msgstr "Kunci \"%s\" tak didukung pada entri alamat \"%s\""
 
-#: gio/gdbusaddress.c:185
+#: gio/gdbusaddress.c:168
+#, c-format
+msgid "Meaningless key/value pair combination in address entry “%s”"
+msgstr "Kombinasi pasangan kunci/nilai tanpa arti di entri alamat \"%s\""
+
+#: gio/gdbusaddress.c:177
 #, c-format
 msgid ""
 "Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"
@@ -371,32 +377,32 @@ msgstr ""
 "Alamat \"%s\" tak valid (perlu hanya salah satu dari path, tmpdir, atau "
 "kunci abstrak)"
 
-#: gio/gdbusaddress.c:198
-#, c-format
-msgid "Meaningless key/value pair combination in address entry “%s”"
-msgstr "Kombinasi pasangan kunci/nilai tanpa arti di entri alamat \"%s\""
-
-#: gio/gdbusaddress.c:261 gio/gdbusaddress.c:342
+#: gio/gdbusaddress.c:244 gio/gdbusaddress.c:325
 #, c-format
 msgid "Error in address “%s” — the port attribute is malformed"
 msgstr "Galat dalam alamat \"%s\" — atribut port salah bentuk"
 
-#: gio/gdbusaddress.c:272 gio/gdbusaddress.c:353
+#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:336
 #, c-format
 msgid "Error in address “%s” — the family attribute is malformed"
 msgstr "Galat dalam alamat \"%s\" — atribut family salah bentuk"
 
-#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:673
+#: gio/gdbusaddress.c:406 gio/gdbusaddress.c:670
 #, c-format
 msgid "Unknown or unsupported transport “%s” for address “%s”"
 msgstr "Transport \"%s\" tak dikenal atau tak didukung bagi alamat \"%s\""
 
-#: gio/gdbusaddress.c:467
+#: gio/gdbusaddress.c:450
 #, c-format
 msgid "Address element “%s” does not contain a colon (:)"
 msgstr "Elemen alamat \"%s\" tak memuat titik dua (:)"
 
-#: gio/gdbusaddress.c:488
+#: gio/gdbusaddress.c:459
+#, c-format
+msgid "Transport name in address element “%s” must not be empty"
+msgstr "Nama transport dalam elemen alamat “%s” tidak boleh kosong"
+
+#: gio/gdbusaddress.c:480
 #, c-format
 msgid ""
 "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
@@ -405,7 +411,15 @@ msgstr ""
 "Pasangan kunci/nilai %d, \"%s\", dalam elemen alamat \"%s\" tak memuat tanda "
 "sama dengan"
 
-#: gio/gdbusaddress.c:502
+#: gio/gdbusaddress.c:491
+#, c-format
+msgid ""
+"Key/Value pair %d, “%s”, in address element “%s” must not have an empty key"
+msgstr ""
+"Pasangan kunci/nilai %d, \"%s\", dalam elemen alamat \"%s\" tak boleh "
+"memiliki kunci kosong"
+
+#: gio/gdbusaddress.c:505
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s”, in address element "
@@ -414,7 +428,7 @@ msgstr ""
 "Galat saat membongkar kunci atau nilai dalam pasangan Key/Value %d, \"%s\", "
 "dalam elemen alamat \"%s\""
 
-#: gio/gdbusaddress.c:580
+#: gio/gdbusaddress.c:577
 #, c-format
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
@@ -423,85 +437,75 @@ msgstr ""
 "Galat dalam alamat \"%s\" — transport unix memerlukan hanya satu dari kunci "
 "\"path\" atau \"abstract\" untuk ditata"
 
-#: gio/gdbusaddress.c:616
+#: gio/gdbusaddress.c:613
 #, c-format
 msgid "Error in address “%s” — the host attribute is missing or malformed"
 msgstr "Galat dalam alamat \"%s\" — atribut host kurang atau salah bentuk"
 
-#: gio/gdbusaddress.c:630
+#: gio/gdbusaddress.c:627
 #, c-format
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr "Galat dalam alamat \"%s\" — atribut portt kurang atau salah bentuk"
 
-#: gio/gdbusaddress.c:644
+#: gio/gdbusaddress.c:641
 #, c-format
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
 msgstr "Galat di alamat \"%s\" — atribut berkas nonce kurang atau salah bentuk"
 
-#: gio/gdbusaddress.c:665
+#: gio/gdbusaddress.c:662
 msgid "Error auto-launching: "
 msgstr "Galat saat meluncurkan otomatis: "
 
-#: gio/gdbusaddress.c:718
+#: gio/gdbusaddress.c:715
 #, c-format
 msgid "Error opening nonce file “%s”: %s"
 msgstr "Galat saat membuka berkas nonce \"%s\": %s"
 
-#: gio/gdbusaddress.c:737
+#: gio/gdbusaddress.c:734
 #, c-format
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Galat saat membaca berkas nonce \"%s\": %s"
 
-#: gio/gdbusaddress.c:746
+#: gio/gdbusaddress.c:743
 #, c-format
 msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
 msgstr "Galat saat membaca berkas nonce \"%s\", berharap 16 bita, mendapat %d"
 
-#: gio/gdbusaddress.c:764
+#: gio/gdbusaddress.c:761
 #, c-format
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "Galat saat menulis isi dari berkas nonce \"%s\" ke stream:"
 
-#: gio/gdbusaddress.c:973
+#: gio/gdbusaddress.c:970
 msgid "The given address is empty"
 msgstr "Tidak ada alamat yang diberikan"
 
-#: gio/gdbusaddress.c:1086
+#: gio/gdbusaddress.c:1083
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "Tidak bisa spawn suatu bus pesan ketika setuid"
 
-#: gio/gdbusaddress.c:1093
+#: gio/gdbusaddress.c:1090
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "Tidak bisa spawn suatu bus pesan tanpa id-mesin: "
 
-#: gio/gdbusaddress.c:1100
+#: gio/gdbusaddress.c:1097
 #, c-format
 msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
 msgstr "Tidak bisa meluncurkan mandiri D-Bus tanpa $DISPLAY X11"
 
-#: gio/gdbusaddress.c:1142
+#: gio/gdbusaddress.c:1139
 #, c-format
 msgid "Error spawning command line “%s”: "
 msgstr "Galat saat spawn baris perintah \"%s\": "
 
-#: gio/gdbusaddress.c:1359
-#, c-format
-msgid "(Type any character to close this window)\n"
-msgstr "(Ketikkan karakter apapun untuk menutup jendela ini)\n"
-
-#: gio/gdbusaddress.c:1513
-#, c-format
-msgid "Session dbus not running, and autolaunch failed"
-msgstr "dbus sesi tak sedang berjalan, dan peluncuran-otomatis gagal"
-
-#: gio/gdbusaddress.c:1524
+#: gio/gdbusaddress.c:1208
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Tidak bisa menentukan alamat bus sesi (tidak diimplementasi bagi OS ini)"
 
-#: gio/gdbusaddress.c:1662 gio/gdbusconnection.c:7174
+#: gio/gdbusaddress.c:1346 gio/gdbusconnection.c:7174
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -510,7 +514,7 @@ msgstr ""
 "Tak bisa menentukan alamat bus dari variabel lingkungan "
 "DBUS_STARTER_BUS_TYPE — nilai tak dikenal \"%s\""
 
-#: gio/gdbusaddress.c:1671 gio/gdbusconnection.c:7183
+#: gio/gdbusaddress.c:1355 gio/gdbusconnection.c:7183
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -518,7 +522,7 @@ msgstr ""
 "Tak bisa menentukan alamat bus karena variabel lingkungan "
 "DBUS_STARTER_BUS_TYPE tak diisi"
 
-#: gio/gdbusaddress.c:1681
+#: gio/gdbusaddress.c:1365
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Tipe bus %d tak dikenal"
@@ -835,7 +839,7 @@ msgstr ""
 msgid "Invalid major protocol version. Expected 1 but found %d"
 msgstr "Versi protokol mayor tak valid. Berharap 1 tapi menemui %d"
 
-#: gio/gdbusmessage.c:2132 gio/gdbusmessage.c:2724
+#: gio/gdbusmessage.c:2132 gio/gdbusmessage.c:2727
 msgid "Signature header found but is not of type signature"
 msgstr "Tajuk tanda tangan ditemukan tetapi bukan tipe tanda tangan"
 
@@ -866,7 +870,7 @@ msgstr[1] ""
 msgid "Cannot deserialize message: "
 msgstr "Tidak bisa men-deserialisasi pesan: "
 
-#: gio/gdbusmessage.c:2541
+#: gio/gdbusmessage.c:2544
 #, c-format
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
@@ -874,23 +878,23 @@ msgstr ""
 "Kesalahan serialisasi GVariant dengan type string \"%s\" ke format kabel D-"
 "Bus"
 
-#: gio/gdbusmessage.c:2678
+#: gio/gdbusmessage.c:2681
 #, c-format
 msgid ""
 "Number of file descriptors in message (%d) differs from header field (%d)"
 msgstr ""
 "Jumlah deskriptor berkas dalam pesan (%d) berbeda dari field header (%d)"
 
-#: gio/gdbusmessage.c:2686
+#: gio/gdbusmessage.c:2689
 msgid "Cannot serialize message: "
 msgstr "Tidak bisa men-serialisasi pesan: "
 
-#: gio/gdbusmessage.c:2739
+#: gio/gdbusmessage.c:2742
 #, c-format
 msgid "Message body has signature “%s” but there is no signature header"
 msgstr "Body pesan punya tanda tangan \"%s\" tapi tak ada header tanda tangan"
 
-#: gio/gdbusmessage.c:2749
+#: gio/gdbusmessage.c:2752
 #, c-format
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
@@ -899,26 +903,36 @@ msgstr ""
 "Tubuh pesan memiliki tanda tangan tipe \"%s\" tapi tanda tangan di ruas "
 "header adalah \"(%s)\""
 
-#: gio/gdbusmessage.c:2765
+#: gio/gdbusmessage.c:2768
 #, c-format
 msgid "Message body is empty but signature in the header field is “(%s)”"
 msgstr "Tubuh pesan kosong tapi tanda tangan pada ruas header adalah \"(%s)\""
 
-#: gio/gdbusmessage.c:3318
+#: gio/gdbusmessage.c:3321
 #, c-format
 msgid "Error return with body of type “%s”"
 msgstr "Galat balikan dengan tubuh bertipe \"%s\""
 
-#: gio/gdbusmessage.c:3326
+#: gio/gdbusmessage.c:3329
 msgid "Error return with empty body"
 msgstr "Galat balikan dengan body kosong"
 
-#: gio/gdbusprivate.c:2075
+#: gio/gdbusprivate.c:2233
+#, c-format
+msgid "(Type any character to close this window)\n"
+msgstr "(Ketikkan karakter apapun untuk menutup jendela ini)\n"
+
+#: gio/gdbusprivate.c:2407
+#, c-format
+msgid "Session dbus not running, and autolaunch failed"
+msgstr "dbus sesi tak sedang berjalan, dan peluncuran-otomatis gagal"
+
+#: gio/gdbusprivate.c:2430
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Tak bisa mendapat profil perangkat keras: %s"
 
-#: gio/gdbusprivate.c:2120
+#: gio/gdbusprivate.c:2475
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "Tak bisa memuat /var/lib/dbus/machine-id ata /etc/machine-id: "
 
@@ -964,7 +978,7 @@ msgstr "String \"%s\" bukan suatu GUID D-Bus yang valid"
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Tidak dapat mendengarkan pada transport yang tak didukung \"%s\""
 
-#: gio/gdbus-tool.c:95
+#: gio/gdbus-tool.c:96
 #, c-format
 msgid ""
 "Commands:\n"
@@ -988,60 +1002,60 @@ msgstr ""
 "Gunakan \"%s PERINTAH --help\" untuk memperoleh bantuan pada setiap "
 "perintah.\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:186 gio/gdbus-tool.c:253 gio/gdbus-tool.c:325
+#: gio/gdbus-tool.c:349 gio/gdbus-tool.c:835 gio/gdbus-tool.c:1172
+#: gio/gdbus-tool.c:1614
 #, c-format
 msgid "Error: %s\n"
 msgstr "Galat: %s\n"
 
-#: gio/gdbus-tool.c:196 gio/gdbus-tool.c:265 gio/gdbus-tool.c:1629
+#: gio/gdbus-tool.c:197 gio/gdbus-tool.c:266 gio/gdbus-tool.c:1630
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Galat saat mengurai XML introspeksi: %s\n"
 
-#: gio/gdbus-tool.c:234
+#: gio/gdbus-tool.c:235
 #, c-format
 msgid "Error: %s is not a valid name\n"
 msgstr "Galat: %s bukan nama yang valid\n"
 
-#: gio/gdbus-tool.c:382
+#: gio/gdbus-tool.c:383
 msgid "Connect to the system bus"
 msgstr "Menyambung ke bus sistem"
 
-#: gio/gdbus-tool.c:383
+#: gio/gdbus-tool.c:384
 msgid "Connect to the session bus"
 msgstr "Menyambung ke bus sesi"
 
-#: gio/gdbus-tool.c:384
+#: gio/gdbus-tool.c:385
 msgid "Connect to given D-Bus address"
 msgstr "Menyambung ke alamat D-Bus yang diberikan"
 
-#: gio/gdbus-tool.c:394
+#: gio/gdbus-tool.c:395
 msgid "Connection Endpoint Options:"
 msgstr "Opsi Titik Ujung Sambungan:"
 
-#: gio/gdbus-tool.c:395
+#: gio/gdbus-tool.c:396
 msgid "Options specifying the connection endpoint"
 msgstr "Opsi yang menyatakan titik ujung sambungan"
 
-#: gio/gdbus-tool.c:417
+#: gio/gdbus-tool.c:418
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "Titik ujung sambungan tak dinyatakan"
 
-#: gio/gdbus-tool.c:427
+#: gio/gdbus-tool.c:428
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "Telah dinyatakan titik ujung sambungan berganda"
 
-#: gio/gdbus-tool.c:497
+#: gio/gdbus-tool.c:498
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface “%s” does not exist\n"
 msgstr "Peringatan: Menurut data introspeksi, antar muka \"%s\" tak ada\n"
 
-#: gio/gdbus-tool.c:506
+#: gio/gdbus-tool.c:507
 #, c-format
 msgid ""
 "Warning: According to introspection data, method “%s” does not exist on "
@@ -1050,163 +1064,163 @@ msgstr ""
 "Peringatan: Menurut data introspeksi, metoda \"%s\" tak ada pada antar muka "
 "\"%s\"\n"
 
-#: gio/gdbus-tool.c:568
+#: gio/gdbus-tool.c:569
 msgid "Optional destination for signal (unique name)"
 msgstr "Tujuan opsional bagi sinyal (nama unik)"
 
-#: gio/gdbus-tool.c:569
+#: gio/gdbus-tool.c:570
 msgid "Object path to emit signal on"
 msgstr "Path objek untuk dipancari sinyal"
 
-#: gio/gdbus-tool.c:570
+#: gio/gdbus-tool.c:571
 msgid "Signal and interface name"
 msgstr "Nama antar muka dan sinyal"
 
-#: gio/gdbus-tool.c:603
+#: gio/gdbus-tool.c:604
 msgid "Emit a signal."
 msgstr "Pancarkan sinyal."
 
-#: 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:659 gio/gdbus-tool.c:966 gio/gdbus-tool.c:1716
+#: gio/gdbus-tool.c:1945 gio/gdbus-tool.c:2165
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Galat saat menyambung: %s\n"
 
-#: gio/gdbus-tool.c:678
+#: gio/gdbus-tool.c:679
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "Galat: '%s' bukan nama bus unik yang valid\n"
 
-#: gio/gdbus-tool.c:697 gio/gdbus-tool.c:1008 gio/gdbus-tool.c:1758
+#: gio/gdbus-tool.c:698 gio/gdbus-tool.c:1009 gio/gdbus-tool.c:1759
 msgid "Error: Object path is not specified\n"
 msgstr "Galat: Lokasi objek tak dinyatakan\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:721 gio/gdbus-tool.c:1029 gio/gdbus-tool.c:1779
+#: gio/gdbus-tool.c:2016
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Galat: '%s' bukan suatu lokasi objek yang valid\n"
 
-#: gio/gdbus-tool.c:740
+#: gio/gdbus-tool.c:741
 msgid "Error: Signal name is not specified\n"
 msgstr "Galat: Nama sinyal tak dinyatakan\n"
 
-#: gio/gdbus-tool.c:754
+#: gio/gdbus-tool.c:755
 #, c-format
 msgid "Error: Signal name “%s” is invalid\n"
 msgstr "Galat: Nama sinyal \"%s\" tak valid\n"
 
-#: gio/gdbus-tool.c:766
+#: gio/gdbus-tool.c:767
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "Galat: '%s' bukan nama antar muka yang valid\n"
 
-#: gio/gdbus-tool.c:772
+#: gio/gdbus-tool.c:773
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "Galat: '%s' bukan nama anggota yang valid\n"
 
 #. Use the original non-"parse-me-harder" error
-#: gio/gdbus-tool.c:809 gio/gdbus-tool.c:1140
+#: gio/gdbus-tool.c:810 gio/gdbus-tool.c:1141
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "Galat saat mengurai parameter %d: %s\n"
 
-#: gio/gdbus-tool.c:841
+#: gio/gdbus-tool.c:842
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "Galat saat menggelontor sambungan: %s\n"
 
-#: gio/gdbus-tool.c:868
+#: gio/gdbus-tool.c:869
 msgid "Destination name to invoke method on"
 msgstr "Nama tujuan tempat menjalankan metoda"
 
-#: gio/gdbus-tool.c:869
+#: gio/gdbus-tool.c:870
 msgid "Object path to invoke method on"
 msgstr "Lokasi objek tempat menjalankan metoda"
 
-#: gio/gdbus-tool.c:870
+#: gio/gdbus-tool.c:871
 msgid "Method and interface name"
 msgstr "Nama metoda dan antar muka"
 
-#: gio/gdbus-tool.c:871
+#: gio/gdbus-tool.c:872
 msgid "Timeout in seconds"
 msgstr "Tenggat waktu dalam detik"
 
-#: gio/gdbus-tool.c:910
+#: gio/gdbus-tool.c:911
 msgid "Invoke a method on a remote object."
 msgstr "Jalankan suatu metoda pada suatu objek jauh."
 
-#: gio/gdbus-tool.c:982 gio/gdbus-tool.c:1732 gio/gdbus-tool.c:1969
+#: gio/gdbus-tool.c:983 gio/gdbus-tool.c:1733 gio/gdbus-tool.c:1970
 msgid "Error: Destination is not specified\n"
 msgstr "Galat: Tujuan tak dinyatakan\n"
 
-#: gio/gdbus-tool.c:993 gio/gdbus-tool.c:1749 gio/gdbus-tool.c:1980
+#: gio/gdbus-tool.c:994 gio/gdbus-tool.c:1750 gio/gdbus-tool.c:1981
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "Galat: %s bukan nama bus yang valid\n"
 
-#: gio/gdbus-tool.c:1043
+#: gio/gdbus-tool.c:1044
 msgid "Error: Method name is not specified\n"
 msgstr "Galat: Nama metoda tak dinyatakan\n"
 
-#: gio/gdbus-tool.c:1054
+#: gio/gdbus-tool.c:1055
 #, c-format
 msgid "Error: Method name “%s” is invalid\n"
 msgstr "Galat: Nama metoda \"%s\" tak valid\n"
 
-#: gio/gdbus-tool.c:1132
+#: gio/gdbus-tool.c:1133
 #, c-format
 msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Galat ketika mengurai parameter ke-%d bertipe \"%s\": %s\n"
 
-#: gio/gdbus-tool.c:1576
+#: gio/gdbus-tool.c:1577
 msgid "Destination name to introspect"
 msgstr "Nama tujuan untuk introspeksi"
 
-#: gio/gdbus-tool.c:1577
+#: gio/gdbus-tool.c:1578
 msgid "Object path to introspect"
 msgstr "Lokasi objek untuk introspeksi"
 
-#: gio/gdbus-tool.c:1578
+#: gio/gdbus-tool.c:1579
 msgid "Print XML"
 msgstr "Cetak XML"
 
-#: gio/gdbus-tool.c:1579
+#: gio/gdbus-tool.c:1580
 msgid "Introspect children"
 msgstr "Introspeksi anak"
 
-#: gio/gdbus-tool.c:1580
+#: gio/gdbus-tool.c:1581
 msgid "Only print properties"
 msgstr "Hanya cetak properti"
 
-#: gio/gdbus-tool.c:1667
+#: gio/gdbus-tool.c:1668
 msgid "Introspect a remote object."
 msgstr "Introspeksi suatu objek jauh."
 
-#: gio/gdbus-tool.c:1870
+#: gio/gdbus-tool.c:1871
 msgid "Destination name to monitor"
 msgstr "Nama tujuan untuk dipantau"
 
-#: gio/gdbus-tool.c:1871
+#: gio/gdbus-tool.c:1872
 msgid "Object path to monitor"
 msgstr "Lokasi objek untuk dipantau"
 
-#: gio/gdbus-tool.c:1896
+#: gio/gdbus-tool.c:1897
 msgid "Monitor a remote object."
 msgstr "Memantau suatu objek jauh."
 
-#: gio/gdbus-tool.c:1954
+#: gio/gdbus-tool.c:1955
 msgid "Error: can’t monitor a non-message-bus connection\n"
 msgstr "Galat: tidak dapat memonitor koneksi non bus pesan\n"
 
-#: gio/gdbus-tool.c:2078
+#: gio/gdbus-tool.c:2079
 msgid "Service to activate before waiting for the other one (well-known name)"
 msgstr ""
 "Layanan yang akan diaktifkan sebelum menunggu yang lain (nama yang dikenal "
 "baik)"
 
-#: gio/gdbus-tool.c:2081
+#: gio/gdbus-tool.c:2082
 msgid ""
 "Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
 "(default)"
@@ -1214,27 +1228,27 @@ msgstr ""
 "Tenggat waktu menunggu sebelum keluar dengan suatu kesalahan (detik); 0 "
 "untuk tanpa tenggat (baku)"
 
-#: gio/gdbus-tool.c:2129
+#: gio/gdbus-tool.c:2130
 msgid "[OPTION…] BUS-NAME"
 msgstr "[OPSI…] NAMA-BUS"
 
-#: gio/gdbus-tool.c:2130
+#: gio/gdbus-tool.c:2131
 msgid "Wait for a bus name to appear."
 msgstr "Tunggu suatu nama bus muncul."
 
-#: gio/gdbus-tool.c:2206
+#: gio/gdbus-tool.c:2207
 msgid "Error: A service to activate for must be specified.\n"
 msgstr "Galat: Suatu layanan yang akan diaktifkan mesti dinyatakan\n"
 
-#: gio/gdbus-tool.c:2211
+#: gio/gdbus-tool.c:2212
 msgid "Error: A service to wait for must be specified.\n"
 msgstr "Galat: Suatu layanan yang mesti ditunggu harus dinyatakan\n"
 
-#: gio/gdbus-tool.c:2216
+#: gio/gdbus-tool.c:2217
 msgid "Error: Too many arguments.\n"
 msgstr "Galat: Terlalu banyak argumen.\n"
 
-#: gio/gdbus-tool.c:2224 gio/gdbus-tool.c:2231
+#: gio/gdbus-tool.c:2225 gio/gdbus-tool.c:2232
 #, c-format
 msgid "Error: %s is not a valid well-known bus name.\n"
 msgstr "Galat: %s bukan nama bus yang dikenal baik dan valid\n"
@@ -1337,7 +1351,7 @@ msgstr "Berharap suatu GEmblem bagi GEmblemedIcon"
 #: 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:8113 gio/gfile.c:8203 gio/gfile.c:8287
+#: gio/gfile.c:5410 gio/gfile.c:8114 gio/gfile.c:8204 gio/gfile.c:8288
 #: gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Operasi tak didukung"
@@ -2227,7 +2241,7 @@ msgstr "Ikuti taut simbolik, kait, dan pintasan"
 msgid "List contents of directories in a tree-like format."
 msgstr "Tampilkan daftar isi direktori dalam format mirip pohon."
 
-#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1515
+#: gio/glib-compile-resources.c:143 gio/glib-compile-schemas.c:1517
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Elemen <%s> tidak diijinkan di dalam <%s>"
@@ -2282,7 +2296,7 @@ msgstr "Galat saat memampatkan berkas %s"
 msgid "text may not appear inside <%s>"
 msgstr "teks tidak boleh muncul di dalam <%s>"
 
-#: gio/glib-compile-resources.c:737 gio/glib-compile-schemas.c:2139
+#: gio/glib-compile-resources.c:737 gio/glib-compile-schemas.c:2141
 msgid "Show program version and exit"
 msgstr "Tampilkan versi program dan keluar"
 
@@ -2298,8 +2312,8 @@ msgstr ""
 "Direktori untuk memuat berkas yang direferensikan dalam FILE darinya "
 "(bawaan: direktori saat ini)"
 
-#: gio/glib-compile-resources.c:739 gio/glib-compile-schemas.c:2140
-#: gio/glib-compile-schemas.c:2169
+#: gio/glib-compile-resources.c:739 gio/glib-compile-schemas.c:2142
+#: gio/glib-compile-schemas.c:2171
 msgid "DIRECTORY"
 msgstr "DIREKTORI"
 
@@ -2520,16 +2534,16 @@ msgstr "alias target \"%s\" tidak ada di <choices>"
 msgid "<aliases> must contain at least one <alias>"
 msgstr "<aliases> harus berisi setidaknya satu <alias>"
 
-#: gio/glib-compile-schemas.c:798
+#: gio/glib-compile-schemas.c:800
 msgid "Empty names are not permitted"
 msgstr "Nama yang kosong tidak diperbolehkan"
 
-#: gio/glib-compile-schemas.c:808
+#: gio/glib-compile-schemas.c:810
 #, c-format
 msgid "Invalid name “%s”: names must begin with a lowercase letter"
 msgstr "Nama \"%s\" tak valid: nama mesti diawali dengan huruf kecil"
 
-#: gio/glib-compile-schemas.c:820
+#: gio/glib-compile-schemas.c:822
 #, c-format
 msgid ""
 "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
@@ -2538,38 +2552,38 @@ msgstr ""
 "Nama \"%s\" tak valid: karakter \"%c\" tak valid; hanya huruf kecil, angka, "
 "dan tanda hubung (\"-\") yang diijinkan"
 
-#: gio/glib-compile-schemas.c:829
+#: gio/glib-compile-schemas.c:831
 #, c-format
 msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted"
 msgstr ""
 "Nama \"%s\" tak valid: dua tanda hubung berturutan (\"--\") tak diijinkan"
 
-#: gio/glib-compile-schemas.c:838
+#: gio/glib-compile-schemas.c:840
 #, c-format
 msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)"
 msgstr ""
 "Nama \"%s\" tak valid: karakter terakhir tak boleh tanda hubung (\"-\")."
 
-#: gio/glib-compile-schemas.c:846
+#: gio/glib-compile-schemas.c:848
 #, c-format
 msgid "Invalid name “%s”: maximum length is 1024"
 msgstr "Nama \"%s\" tak valid: panjang maksimum 1024"
 
-#: gio/glib-compile-schemas.c:918
+#: gio/glib-compile-schemas.c:920
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> telah dinyatakan"
 
-#: gio/glib-compile-schemas.c:944
+#: gio/glib-compile-schemas.c:946
 msgid "Cannot add keys to a “list-of” schema"
 msgstr "Tak bisa menambah kunci ke skema \"list-of\""
 
-#: gio/glib-compile-schemas.c:955
+#: gio/glib-compile-schemas.c:957
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> telah dinyatakan"
 
-#: gio/glib-compile-schemas.c:973
+#: gio/glib-compile-schemas.c:975
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2578,7 +2592,7 @@ msgstr ""
 "<key name='%s'> membayangi <key name='%s'> di <schema id='%s'>; gunakan "
 "<override> untuk mengubah nilai"
 
-#: gio/glib-compile-schemas.c:984
+#: gio/glib-compile-schemas.c:986
 #, c-format
 msgid ""
 "Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
@@ -2587,63 +2601,63 @@ msgstr ""
 "Persis satu dari 'type', 'enum', atau 'flags' mesti dinyatakan sebagai "
 "atribut dari <key>"
 
-#: gio/glib-compile-schemas.c:1003
+#: gio/glib-compile-schemas.c:1005
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'> belum didefinisikan."
 
-#: gio/glib-compile-schemas.c:1018
+#: gio/glib-compile-schemas.c:1020
 #, c-format
 msgid "Invalid GVariant type string “%s”"
 msgstr "String jenis GVariant \"%s\" tidak sah"
 
-#: gio/glib-compile-schemas.c:1048
+#: gio/glib-compile-schemas.c:1050
 msgid "<override> given but schema isn’t extending anything"
 msgstr "<override> diberikan tapi skema tak memperluas apapun"
 
-#: gio/glib-compile-schemas.c:1061
+#: gio/glib-compile-schemas.c:1063
 #, c-format
 msgid "No <key name='%s'> to override"
 msgstr "Tak ada <key name='%s'> untuk ditimpa"
 
-#: gio/glib-compile-schemas.c:1069
+#: gio/glib-compile-schemas.c:1071
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> telah dinyatakan"
 
-#: gio/glib-compile-schemas.c:1142
+#: gio/glib-compile-schemas.c:1144
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> sudah ditentukan"
 
-#: gio/glib-compile-schemas.c:1154
+#: gio/glib-compile-schemas.c:1156
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema “%s”"
 msgstr "<schema id='%s'> memperluas skema \"%s\" yang belum ada"
 
-#: gio/glib-compile-schemas.c:1170
+#: gio/glib-compile-schemas.c:1172
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema “%s”"
 msgstr "<schema id='%s'> adalah daftar dari skema \"%s\"' yang belum ada"
 
-#: gio/glib-compile-schemas.c:1178
+#: gio/glib-compile-schemas.c:1180
 #, c-format
 msgid "Cannot be a list of a schema with a path"
 msgstr "Tak mungkin berupa suatu daftar skema dengan path"
 
-#: gio/glib-compile-schemas.c:1188
+#: gio/glib-compile-schemas.c:1190
 #, c-format
 msgid "Cannot extend a schema with a path"
 msgstr "Tak bisa memperluas suatu skema dengan path"
 
-#: gio/glib-compile-schemas.c:1198
+#: gio/glib-compile-schemas.c:1200
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
 msgstr ""
 "<schema id='%s'> adalah daftar, memperluas <schema id='%s'> yang bukan daftar"
 
-#: gio/glib-compile-schemas.c:1208
+#: gio/glib-compile-schemas.c:1210
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
@@ -2652,18 +2666,18 @@ msgstr ""
 "<schema id='%s' list-of='%s'> memperluas <schema id='%s' list-of='%s'> tapi "
 "\"%s\" tak memperluas \"%s\""
 
-#: gio/glib-compile-schemas.c:1225
+#: gio/glib-compile-schemas.c:1227
 #, c-format
 msgid "A path, if given, must begin and end with a slash"
 msgstr ""
 "Suatu path, bila diberikan, harus dimulai dan diakhiri dengan garis miring"
 
-#: gio/glib-compile-schemas.c:1232
+#: gio/glib-compile-schemas.c:1234
 #, c-format
 msgid "The path of a list must end with “:/”"
 msgstr "Path dari suatu daftar mesti diakhiri dengan “:/”"
 
-#: gio/glib-compile-schemas.c:1241
+#: gio/glib-compile-schemas.c:1243
 #, c-format
 msgid ""
 "Warning: Schema “%s” has path “%s”.  Paths starting with “/apps/”, “/"
@@ -2672,72 +2686,72 @@ msgstr ""
 "Peringatan: Skema \"%s\" memiliki path \"%s\".  Path yang dimulai dengan \"/"
 "apps/\", \"/desktop/\" atau \"/system/\" tidak digunakan lagi."
 
-#: gio/glib-compile-schemas.c:1271
+#: gio/glib-compile-schemas.c:1273
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> sudah ditentukan"
 
-#: gio/glib-compile-schemas.c:1421 gio/glib-compile-schemas.c:1437
+#: gio/glib-compile-schemas.c:1423 gio/glib-compile-schemas.c:1439
 #, c-format
 msgid "Only one <%s> element allowed inside <%s>"
 msgstr "Hanya satu elemen <%s> diizinkan di dalam <%s>"
 
-#: gio/glib-compile-schemas.c:1519
+#: gio/glib-compile-schemas.c:1521
 #, c-format
 msgid "Element <%s> not allowed at the top level"
 msgstr "Elemen <%s> tidak diijinkan pada aras puncak"
 
-#: gio/glib-compile-schemas.c:1537
+#: gio/glib-compile-schemas.c:1539
 msgid "Element <default> is required in <key>"
 msgstr "Elemen <default> diperlukan di <key>"
 
-#: gio/glib-compile-schemas.c:1627
+#: gio/glib-compile-schemas.c:1629
 #, c-format
 msgid "Text may not appear inside <%s>"
 msgstr "Teks tidak boleh muncul di dalam <%s>"
 
-#: gio/glib-compile-schemas.c:1695
+#: gio/glib-compile-schemas.c:1697
 #, c-format
 msgid "Warning: undefined reference to <schema id='%s'/>"
 msgstr "Peringatan: referensi terdefinisi ke <schema id='%s'/>"
 
 #. Translators: Do not translate "--strict".
-#: gio/glib-compile-schemas.c:1834 gio/glib-compile-schemas.c:1910
-#: gio/glib-compile-schemas.c:2025
+#: gio/glib-compile-schemas.c:1836 gio/glib-compile-schemas.c:1912
+#: gio/glib-compile-schemas.c:2027
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict dinyatakan; keluar.\n"
 
-#: gio/glib-compile-schemas.c:1844
+#: gio/glib-compile-schemas.c:1846
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Seluruh berkas telah diabaikan.\n"
 
-#: gio/glib-compile-schemas.c:1906
+#: gio/glib-compile-schemas.c:1908
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Mengabaikan berkas ini.\n"
 
-#: gio/glib-compile-schemas.c:1959
+#: gio/glib-compile-schemas.c:1961
 #, c-format
 msgid "No such key “%s” in schema “%s” as specified in override file “%s”"
 msgstr ""
 "Tak ada kunci “%s” dalam skema “%s” sebagaimana dinyatakan di berkas penimpa "
 "“%s”"
 
-#: gio/glib-compile-schemas.c:1965 gio/glib-compile-schemas.c:1990
-#: gio/glib-compile-schemas.c:2050 gio/glib-compile-schemas.c:2079
+#: gio/glib-compile-schemas.c:1967 gio/glib-compile-schemas.c:1992
+#: gio/glib-compile-schemas.c:2052 gio/glib-compile-schemas.c:2081
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; mengabaikan penimpaan kunci ini.\n"
 
-#: gio/glib-compile-schemas.c:1969 gio/glib-compile-schemas.c:1994
-#: gio/glib-compile-schemas.c:2054 gio/glib-compile-schemas.c:2083
+#: gio/glib-compile-schemas.c:1971 gio/glib-compile-schemas.c:1996
+#: gio/glib-compile-schemas.c:2056 gio/glib-compile-schemas.c:2085
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " dan --strict dinyatakan; keluar.\n"
 
-#: gio/glib-compile-schemas.c:1984
+#: gio/glib-compile-schemas.c:1986
 #, c-format
 msgid ""
 "cannot provide per-desktop overrides for localised key “%s” in schema "
@@ -2746,7 +2760,7 @@ msgstr ""
 "tidak dapat menyediakan penimpa per-destop untuk kunci \"%s\" yang "
 "dilokalkan dalam skema \"%s\" (menimpa berkas \"%s\")"
 
-#: gio/glib-compile-schemas.c:2011
+#: gio/glib-compile-schemas.c:2013
 #, c-format
 msgid ""
 "error parsing key “%s” in schema “%s” as specified in override file “%s”: %s."
@@ -2754,12 +2768,12 @@ msgstr ""
 "galat saat mengurai kunci “%s” dalam skema “%s” sebagaimana dinyatakan di "
 "berkas penimpa “%s”: %s."
 
-#: gio/glib-compile-schemas.c:2021
+#: gio/glib-compile-schemas.c:2023
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Mengabaikan penimpaan bagi kunci ini.\n"
 
-#: gio/glib-compile-schemas.c:2040
+#: gio/glib-compile-schemas.c:2042
 #, c-format
 msgid ""
 "override for key “%s” in schema “%s” in override file “%s” is outside the "
@@ -2768,7 +2782,7 @@ msgstr ""
 "penimpa bagi kunci “%s” dalam skema “%s” di berkas penimpa “%s” di luar "
 "jangkauan yang diberikan di dalam skema"
 
-#: gio/glib-compile-schemas.c:2069
+#: gio/glib-compile-schemas.c:2071
 #, c-format
 msgid ""
 "override for key “%s” in schema “%s” in override file “%s” is not in the "
@@ -2777,23 +2791,23 @@ msgstr ""
 "penimpa bagi kunci “%s” dalam skema “%s” di berkas penimpa “%s” tak ada di "
 "dalam daftar pilihan yang valid"
 
-#: gio/glib-compile-schemas.c:2140
+#: gio/glib-compile-schemas.c:2142
 msgid "where to store the gschemas.compiled file"
 msgstr "dimana menyimpan berkas gschemas.compiled"
 
-#: gio/glib-compile-schemas.c:2141
+#: gio/glib-compile-schemas.c:2143
 msgid "Abort on any errors in schemas"
 msgstr "Gugurkan pada sebarang galat dalam skema"
 
-#: gio/glib-compile-schemas.c:2142
+#: gio/glib-compile-schemas.c:2144
 msgid "Do not write the gschema.compiled file"
 msgstr "Jangan menulis berkas gschema.compiled"
 
-#: gio/glib-compile-schemas.c:2143
+#: gio/glib-compile-schemas.c:2145
 msgid "Do not enforce key name restrictions"
 msgstr "Jangan paksakan pembatasan nama kunci"
 
-#: gio/glib-compile-schemas.c:2172
+#: gio/glib-compile-schemas.c:2174
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2803,22 +2817,22 @@ msgstr ""
 "Berkas skema diharuskan memiliki ekstensi .gschema.xml,\n"
 "dan berkas singgahan dinamai gschemas.compiled."
 
-#: gio/glib-compile-schemas.c:2193
+#: gio/glib-compile-schemas.c:2195
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Anda mesti memberikan hanya satu nama direktori\n"
 
-#: gio/glib-compile-schemas.c:2235
+#: gio/glib-compile-schemas.c:2237
 #, c-format
 msgid "No schema files found: "
 msgstr "Tidak menemukan berkas skema: "
 
-#: gio/glib-compile-schemas.c:2238
+#: gio/glib-compile-schemas.c:2240
 #, c-format
 msgid "doing nothing.\n"
 msgstr "tak melakukan apapun.\n"
 
-#: gio/glib-compile-schemas.c:2241
+#: gio/glib-compile-schemas.c:2243
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "menghapus berkas keluaran yang telah ada.\n"
@@ -2932,7 +2946,7 @@ msgstr "Sistem berkas tak mendukung taut simbolik"
 msgid "Error making symbolic link %s: %s"
 msgstr "Galat saat membuat taut simbolis %s: %s"
 
-#: gio/glocalfile.c:2363 glib/gfileutils.c:2138
+#: gio/glocalfile.c:2363 glib/gfileutils.c:2155
 msgid "Symbolic links not supported"
 msgstr "Taut simbolik tidak didukung"
 
@@ -2965,96 +2979,96 @@ msgstr "Perpindahan antar kait tak didukung"
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Tak bisa menentukan penggunaan diska dari %s: %s"
 
-#: gio/glocalfileinfo.c:745
+#: gio/glocalfileinfo.c:752
 msgid "Attribute value must be non-NULL"
 msgstr "Nilai atribut tak boleh NULL"
 
-#: gio/glocalfileinfo.c:752
+#: gio/glocalfileinfo.c:759
 msgid "Invalid attribute type (string expected)"
 msgstr "Tipe atribut tak valid (diharapkan string)"
 
-#: gio/glocalfileinfo.c:759
+#: gio/glocalfileinfo.c:766
 msgid "Invalid extended attribute name"
 msgstr "Nama atribut tambahan yang tak valid"
 
-#: gio/glocalfileinfo.c:799
+#: gio/glocalfileinfo.c:806
 #, c-format
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Galat saat menata atribut yang diperluas \"%s\": %s"
 
-#: gio/glocalfileinfo.c:1625
+#: gio/glocalfileinfo.c:1634
 msgid " (invalid encoding)"
 msgstr " (pengkodean tak valid)"
 
-#: gio/glocalfileinfo.c:1789 gio/glocalfileoutputstream.c:908
+#: gio/glocalfileinfo.c:1798 gio/glocalfileoutputstream.c:908
 #, c-format
 msgid "Error when getting information for file “%s”: %s"
 msgstr "Galat saat mengambil informasi bagi berkas \"%s\": %s"
 
-#: gio/glocalfileinfo.c:2059
+#: gio/glocalfileinfo.c:2068
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Galat saat mengambil informasi bagi descriptor berkas: %s"
 
-#: gio/glocalfileinfo.c:2104
+#: gio/glocalfileinfo.c:2113
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Tipe atribut tak valid (diharapkan uint32)"
 
-#: gio/glocalfileinfo.c:2122
+#: gio/glocalfileinfo.c:2131
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Tipe atribut tak valid (diharapkan uint64)"
 
-#: gio/glocalfileinfo.c:2141 gio/glocalfileinfo.c:2160
+#: gio/glocalfileinfo.c:2150 gio/glocalfileinfo.c:2169
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Jenis atribut tidak sah (diharapkan bita berjenis string)"
 
-#: gio/glocalfileinfo.c:2207
+#: gio/glocalfileinfo.c:2216
 msgid "Cannot set permissions on symlinks"
 msgstr "Tak bisa menata ijin pada taut simbolik"
 
-#: gio/glocalfileinfo.c:2223
+#: gio/glocalfileinfo.c:2232
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Galat saat menata ijin: %s"
 
-#: gio/glocalfileinfo.c:2274
+#: gio/glocalfileinfo.c:2283
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Galat saat menata pemilik: %s"
 
-#: gio/glocalfileinfo.c:2297
+#: gio/glocalfileinfo.c:2306
 msgid "symlink must be non-NULL"
 msgstr "symlink tak boleh NULL"
 
-#: gio/glocalfileinfo.c:2307 gio/glocalfileinfo.c:2326
-#: gio/glocalfileinfo.c:2337
+#: gio/glocalfileinfo.c:2316 gio/glocalfileinfo.c:2335
+#: gio/glocalfileinfo.c:2346
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Galat saat menata taut simbolis: %s"
 
-#: gio/glocalfileinfo.c:2316
+#: gio/glocalfileinfo.c:2325
 msgid "Error setting symlink: file is not a symlink"
 msgstr "Galat saat menata symlink: berkas bukan suatu link simbolik"
 
-#: gio/glocalfileinfo.c:2442
+#: gio/glocalfileinfo.c:2451
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Galat saat menata waktu modifikasi atau akses: %s"
 
-#: gio/glocalfileinfo.c:2465
+#: gio/glocalfileinfo.c:2474
 msgid "SELinux context must be non-NULL"
 msgstr "Konteks SELinux tak boleh NULL"
 
-#: gio/glocalfileinfo.c:2480
+#: gio/glocalfileinfo.c:2489
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Galat saat menata konteks SELinux: %s"
 
-#: gio/glocalfileinfo.c:2487
+#: gio/glocalfileinfo.c:2496
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux tak diaktifkan di sistem ini"
 
-#: gio/glocalfileinfo.c:2579
+#: gio/glocalfileinfo.c:2588
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Penataan atribut %s tak didukung"
@@ -3077,7 +3091,7 @@ msgstr "Galat saat men-seek di berkas: %s"
 msgid "Error closing file: %s"
 msgstr "Galat saat menutup berkas: %s"
 
-#: gio/glocalfilemonitor.c:856
+#: gio/glocalfilemonitor.c:858
 msgid "Unable to find default local file monitor type"
 msgstr "Tak bisa temukan tipe pemantauan berkas lokal baku"
 
@@ -3242,12 +3256,12 @@ msgstr "Tak bisa membuat pemantau jaringan: "
 msgid "Could not get network status: "
 msgstr "Tak bisa mendapat status jaringan: "
 
-#: gio/gnetworkmonitornm.c:313
+#: gio/gnetworkmonitornm.c:314
 #, c-format
 msgid "NetworkManager not running"
 msgstr "NetworkManager tidak berjalan"
 
-#: gio/gnetworkmonitornm.c:324
+#: gio/gnetworkmonitornm.c:325
 #, c-format
 msgid "NetworkManager version too old"
 msgstr "Versi NetworkManager terlalu tua"
@@ -3835,15 +3849,15 @@ msgstr "Tak bisa menyambung ke %s: "
 msgid "Could not connect: "
 msgstr "Tak bisa menyambung: "
 
-#: gio/gsocketclient.c:1032 gio/gsocketclient.c:1731
+#: gio/gsocketclient.c:1033 gio/gsocketclient.c:1750
 msgid "Unknown error on connect"
 msgstr "Galat tak dikenal saat hubungan"
 
-#: gio/gsocketclient.c:1086 gio/gsocketclient.c:1640
+#: gio/gsocketclient.c:1087 gio/gsocketclient.c:1658
 msgid "Proxying over a non-TCP connection is not supported."
 msgstr "Proksi melalui koneksi bukan TCP tidak didukung."
 
-#: gio/gsocketclient.c:1115 gio/gsocketclient.c:1666
+#: gio/gsocketclient.c:1116 gio/gsocketclient.c:1684
 #, c-format
 msgid "Proxy protocol “%s” is not supported."
 msgstr "Protokol proksi \"%s\" tidak didukung."
@@ -3967,7 +3981,7 @@ msgid "Temporarily unable to resolve “%s”"
 msgstr "Sementara tidak dapat mengurai \"%s\""
 
 #: gio/gthreadedresolver.c:663 gio/gthreadedresolver.c:840
-#: gio/gthreadedresolver.c:948
+#: gio/gthreadedresolver.c:950
 #, c-format
 msgid "Error resolving “%s”"
 msgstr "Galat saat mengurai \"%s\""
@@ -4775,30 +4789,30 @@ msgstr "Templat \"%s\" tidak valid, tidak boleh mengandung \"%s\""
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Templat \"%s\" tidak memuat XXXXXX"
 
-#: glib/gfileutils.c:2116
+#: glib/gfileutils.c:2112 glib/gfileutils.c:2140
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Gagal membaca taut simbolik \"%s\": %s"
 
-#: glib/giochannel.c:1389
+#: glib/giochannel.c:1393
 #, c-format
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Tidak dapat membuka pengubah dari \"%s\" menjadi \"%s\": %s"
 
-#: glib/giochannel.c:1734
+#: glib/giochannel.c:1738
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr ""
 "Tidak dapat melakukan pembacaan mentah dalam g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1781 glib/giochannel.c:2039 glib/giochannel.c:2126
+#: glib/giochannel.c:1785 glib/giochannel.c:2043 glib/giochannel.c:2130
 msgid "Leftover unconverted data in read buffer"
 msgstr "Ada data tersisa yang belum dikonversi pada penyangga read"
 
-#: glib/giochannel.c:1862 glib/giochannel.c:1939
+#: glib/giochannel.c:1866 glib/giochannel.c:1943
 msgid "Channel terminates in a partial character"
 msgstr "Kanal terputus pada karakter sebagian"
 
-#: glib/giochannel.c:1925
+#: glib/giochannel.c:1929
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Tidak dapat melakukan pembacaan mentah dalam g_io_channel_read_to_end"
 
diff --git a/template-tap.test.in b/template-tap.test.in
index 30cd16686..c7d50dcf0 100644
--- a/template-tap.test.in
+++ b/template-tap.test.in
@@ -1,4 +1,4 @@
 [Test]
 Type=session
-Exec=@env@@installed_tests_dir@/@program@ --tap
+Exec=@env@@installed_tests_dir@/@program@
 Output=TAP
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 18560fcb2..000000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,76 +0,0 @@
-assert-msg-test
-asyncqueue-test
-atomic-test
-base64-test
-bit-test
-bookmarkfile-test
-child-test
-closures
-collate.out
-completion-test
-convert-test
-cxx-test
-datetime
-deftype
-dirname-test
-env-test
-file-test
-file-test-get-contents
-gio-test
-iochannel-test
-iochannel-test-outfile
-list-test
-mainloop-test
-mapchild
-mapping-test
-maptest
-markup-collect
-markup-escape-test
-markup-test
-module-test
-objects
-objects2
-onceinit
-patterntest
-properties
-properties2
-properties3
-properties4
-qsort-test
-queue-test
-regex-test
-relation-test
-scannerapi
-sequence-test
-shell-test
-signal1
-signal2
-signal3
-signal4
-slice-color
-slice-concurrent
-slice-test
-slice-threadinit
-slist-test
-sources
-spawn-test
-testgdate
-testgdateparser
-testglib
-testgobject
-testingbase64
-testmarshal.c
-testmarshal.h
-thread-test
-threadpool-test
-timeloop
-timeloop-closure
-tree-test
-type-test
-unicode-caseconv
-unicode-collate
-unicode-encoding
-unicode-normalize
-uri-test
-utf8-pointer
-utf8-validate
diff --git a/tests/casefold.txt b/tests/casefold.txt
index f59c48eba..61ce15e93 100644
--- a/tests/casefold.txt
+++ b/tests/casefold.txt
@@ -1,4 +1,4 @@
-# Test cases generated from Unicode 11.0.0 data
+# Test cases generated from Unicode 12.1.0 data
 # by gen-casefold-txt.py. Do not edit.
 #
 # Some special hand crafted tests
@@ -1144,6 +1144,13 @@ Z	z
 Ꞵ	ꞵ
 Ꞷ	ꞷ
 Ꞹ	ꞹ
+Ꞻ	ꞻ
+Ꞽ	ꞽ
+Ꞿ	ꞿ
+Ꟃ	ꟃ
+Ꞔ	ꞔ
+Ʂ	ʂ
+Ᶎ	ᶎ
 ꭰ	Ꭰ
 ꭱ	Ꭱ
 ꭲ	Ꭲ
diff --git a/tests/casemap.txt b/tests/casemap.txt
index 5bc76badb..b5e1a618d 100644
--- a/tests/casemap.txt
+++ b/tests/casemap.txt
@@ -1,4 +1,4 @@
-# Test cases generated from Unicode 11.0.0 data
+# Test cases generated from Unicode 12.1.0 data
 # by gen-casemap-txt.py. Do not edit.
 #
 # Some special hand crafted tests
@@ -541,7 +541,7 @@ lt_LT.UTF-8	Į́	į̇́	Į́	Į́	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	ɿ	ɿ			#  27F
 	ʀ	ʀ	Ʀ	Ʀ	#  280
 	ʁ	ʁ			#  281
-	ʂ	ʂ			#  282
+	ʂ	ʂ	Ʂ	Ʂ	#  282
 	ʃ	ʃ	Ʃ	Ʃ	#  283
 	ʄ	ʄ			#  284
 	ʅ	ʅ			#  285
@@ -1398,7 +1398,7 @@ lt_LT.UTF-8	Į́	į̇́	Į́	Į́	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	ᶋ	ᶋ			# 1D8B
 	ᶌ	ᶌ			# 1D8C
 	ᶍ	ᶍ			# 1D8D
-	ᶎ	ᶎ			# 1D8E
+	ᶎ	ᶎ	Ᶎ	Ᶎ	# 1D8E
 	ᶏ	ᶏ			# 1D8F
 	ᶐ	ᶐ			# 1D90
 	ᶑ	ᶑ			# 1D91
@@ -2383,7 +2383,7 @@ lt_LT.UTF-8	Į́	į̇́	Į́	Į́	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	ꞑ	ꞑ	Ꞑ	Ꞑ	# A791
 	Ꞓ	ꞓ		Ꞓ	# A792
 	ꞓ	ꞓ	Ꞓ	Ꞓ	# A793
-	ꞔ	ꞔ			# A794
+	ꞔ	ꞔ	Ꞔ	Ꞔ	# A794
 	ꞕ	ꞕ			# A795
 	Ꞗ	ꞗ		Ꞗ	# A796
 	ꞗ	ꞗ	Ꞗ	Ꞗ	# A797
@@ -2421,6 +2421,17 @@ lt_LT.UTF-8	Į́	į̇́	Į́	Į́	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	ꞷ	ꞷ	Ꞷ	Ꞷ	# A7B7
 	Ꞹ	ꞹ		Ꞹ	# A7B8
 	ꞹ	ꞹ	Ꞹ	Ꞹ	# A7B9
+	Ꞻ	ꞻ		Ꞻ	# A7BA
+	ꞻ	ꞻ	Ꞻ	Ꞻ	# A7BB
+	Ꞽ	ꞽ		Ꞽ	# A7BC
+	ꞽ	ꞽ	Ꞽ	Ꞽ	# A7BD
+	Ꞿ	ꞿ		Ꞿ	# A7BE
+	ꞿ	ꞿ	Ꞿ	Ꞿ	# A7BF
+	Ꟃ	ꟃ		Ꟃ	# A7C2
+	ꟃ	ꟃ	Ꟃ	Ꟃ	# A7C3
+	Ꞔ	ꞔ		Ꞔ	# A7C4
+	Ʂ	ʂ		Ʂ	# A7C5
+	Ᶎ	ᶎ		Ᶎ	# A7C6
 	ꟺ	ꟺ			# A7FA
 	ꬰ	ꬰ			# AB30
 	ꬱ	ꬱ			# AB31
@@ -2471,6 +2482,8 @@ lt_LT.UTF-8	Į́	į̇́	Į́	Į́	 # LATIN CAPITAL LETTER I WITH OGONEK (with ac
 	ꭣ	ꭣ			# AB63
 	ꭤ	ꭤ			# AB64
 	ꭥ	ꭥ			# AB65
+	ꭦ	ꭦ			# AB66
+	ꭧ	ꭧ			# AB67
 	ꭰ	ꭰ	Ꭰ	Ꭰ	# AB70
 	ꭱ	ꭱ	Ꭱ	Ꭱ	# AB71
 	ꭲ	ꭲ	Ꭲ	Ꭲ	# AB72
diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build
index eabaea5b2..24ceda0d3 100644
--- a/tests/gobject/meson.build
+++ b/tests/gobject/meson.build
@@ -60,7 +60,6 @@ foreach test_name, extra_args : gobject_tests
   extra_sources = extra_args.get('extra_sources', [])
   install = installed_tests_enabled and extra_args.get('install', true)
   template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
-  test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
 
   if install
     test_conf = configuration_data()
@@ -86,8 +85,7 @@ foreach test_name, extra_args : gobject_tests
   suite = ['gobject'] + extra_args.get('suite', [])
   timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
   # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
-  test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
-    args : test_command_args)
+  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
 endforeach
 
 # Don't install these ones, and keep them out of 'make check' because they take too long...
diff --git a/tests/meson.build b/tests/meson.build
index 288c5b847..ce3044258 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -103,7 +103,6 @@ foreach test_name, extra_args : tests
   extra_sources = extra_args.get('extra_sources', [])
   install = installed_tests_enabled and extra_args.get('install', true)
   template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
-  test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
 
   if install
     test_conf = configuration_data()
@@ -131,8 +130,7 @@ foreach test_name, extra_args : tests
   suite = ['glib'] + extra_args.get('suite', [])
   timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
   # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
-  test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
-    args : test_command_args)
+  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
 endforeach
 
 foreach program_name, extra_args : test_extra_programs