Github messages for voidlinux
 help / color / mirror / Atom feed
From: slymattz <slymattz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.7.0
Date: Tue, 17 Dec 2024 16:44:54 +0100	[thread overview]
Message-ID: <20241217154454.693DA2179F@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-52240@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

There is an updated pull request by slymattz against master on the void-packages repository

https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240

New package: python3-pynitrokey-0.7.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Dependencies

1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml

EDIT 12/13/24: Updating firmware on NK3 as a non-root user requires the following udev rule:
`ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="42dd", MODE="666"`
The Nitrokey team is already aware of the issue caused by a broken dependency (python3-hidapi ver. 0.14.post4) and is working on fixing the problem in the future release. For reference, see https://github.com/Nitrokey/pynitrokey/pull/602/commits/687e4b787073c9e0eb0228c96766a68696d4ae10

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
  - x86_64-musl
  - armv6l-musl (crossbuild)
  - aarch64-glibc (crossbuild)
  - armv7l-musl (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 4821532 bytes --]

From 2dd4ad065462ab0039d91ae6a6b165ea35b5f8ca Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/13] New package: python3-hidapi-0.14.0

---
 srcpkgs/python3-hidapi/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/python3-hidapi/template

diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..e7ec01293a120c
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+_subver=post2
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython pkg-config"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.${_subver}.tar.gz"
+checksum=6c0e97ba6b059a309d51b495a8f0d5efbcea8756b640d98b6f6bb9fdef2458ac
+
+if [ $CROSS_BUILD ]; then
+	# without the following line, the compiler complains about the lack of hidapi.h
+	hostmakedepends+=" hidapi-devel"
+fi
+
+post_install() {
+	vlicense LICENSE-bsd.txt
+}

From a027792b510a30830d5e827dc958cf5ecfda7b83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 02/13] New package: python3-nitrokey-0.2.3

---
 srcpkgs/python3-nitrokey/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-nitrokey/template

diff --git a/srcpkgs/python3-nitrokey/template b/srcpkgs/python3-nitrokey/template
new file mode 100644
index 00000000000000..506f15fe9287ee
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-poetry-core"
+depends="python3-fido2 python3-requests python3-semver python3-tlv8
+ python3-crcmod python3-cryptography python3-hidapi
+ python3-protobuf python3-pyserial python3-typing_extensions"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=f088362c8ef0694fc86d4c00a72148d93c2d6ab4f96d8a2581eab5e128266c4a
+
+post_install() {
+	vlicense LICENSES/MIT.txt
+}

From ec0a391bf48c3687a1730349b0b5bbf402ebbd36 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 03/13] New package: python3-pynitrokey-0.7.0

---
 srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
 srcpkgs/python3-pynitrokey/template          | 26 ++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/python3-pynitrokey/files/LICENSE-MIT
 create mode 100644 srcpkgs/python3-pynitrokey/template

diff --git a/srcpkgs/python3-pynitrokey/files/LICENSE-MIT b/srcpkgs/python3-pynitrokey/files/LICENSE-MIT
new file mode 100644
index 00000000000000..31aa79387f27e7
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/files/LICENSE-MIT
@@ -0,0 +1,23 @@
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/python3-pynitrokey/template b/srcpkgs/python3-pynitrokey/template
new file mode 100644
index 00000000000000..11f2152dc611c2
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.7.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-cffi python3-click
+ python3-click-aliases python3-semver python3-libusb1
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-usb python3-requests python3-intelhex
+ python3-nkdfu python3-nitrokey python3-protobuf
+ python3-nethsm python3-pyscard libnitrokey
+ python3-tqdm python3-tlv8 python3-chardet"
+short_desc="CLI for the Nitrokey FIDO2, Nitrokey Start, Nitrokey 3 and NetHSM"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=3854cf4ceb68b3da0fd31594ab21e8c62c901a3b7286cd93185e184ec343d4dc
+
+post_install() {
+	# PyPi package does not include LICENSE files
+	vlicense "${FILESDIR}/LICENSE-MIT"
+}

From 66e1967d809b697f73997b39ebb98680a7ce2043 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 04/13] New package: python3-click-aliases-1.0.4

---
 srcpkgs/python3-click-aliases/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-click-aliases/template

diff --git a/srcpkgs/python3-click-aliases/template b/srcpkgs/python3-click-aliases/template
new file mode 100644
index 00000000000000..58525800ae6599
--- /dev/null
+++ b/srcpkgs/python3-click-aliases/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-click-aliases'
+pkgname=python3-click-aliases
+version=1.0.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+	vlicense LICENSE
+}

From 86ab2bfe39e7bf423c11d9ec9902a83d008c580a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 05/13] New package: python3-intelhex-2.3.0

---
 srcpkgs/python3-intelhex/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-intelhex/template

diff --git a/srcpkgs/python3-intelhex/template b/srcpkgs/python3-intelhex/template
new file mode 100644
index 00000000000000..88ffc7b7a827c5
--- /dev/null
+++ b/srcpkgs/python3-intelhex/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-intelhex'
+pkgname=python3-intelhex
+version=2.3.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python library for Intel HEX files manipulations"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-intelhex/intelhex"
+distfiles="${PYPI_SITE}/i/intelhex/intelhex-${version}.tar.gz"
+checksum=892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 36d33addb9e48eca09e827b2e1c67dc72ae69582 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 06/13] New package: python3-nkdfu-0.2

---
 srcpkgs/python3-nkdfu/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-nkdfu/template

diff --git a/srcpkgs/python3-nkdfu/template b/srcpkgs/python3-nkdfu/template
new file mode 100644
index 00000000000000..f04a65bf8ab0f0
--- /dev/null
+++ b/srcpkgs/python3-nkdfu/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-nkdfu'
+pkgname=python3-nkdfu
+version=0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-fire python3-intelhex python3-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8

From 11f756b13a91cc50244d6f08a4bb8172452d42a1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 07/13] New package: python3-tlv8-0.10.0

---
 srcpkgs/python3-tlv8/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-tlv8/template

diff --git a/srcpkgs/python3-tlv8/template b/srcpkgs/python3-tlv8/template
new file mode 100644
index 00000000000000..e218fa5684ac1c
--- /dev/null
+++ b/srcpkgs/python3-tlv8/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-tlv8'
+pkgname=python3-tlv8
+version=0.10.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Module to handle type-length-value (TLV)"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684

From 95f3c093b422ada72d5fe95789f1b2fef60f1561 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 08/13] New package: python3-fire-0.6.0

---
 srcpkgs/python3-fire/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-fire/template

diff --git a/srcpkgs/python3-fire/template b/srcpkgs/python3-fire/template
new file mode 100644
index 00000000000000..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core python3-wheel"
+depends="python3-six python3-termcolor"
+short_desc="Library for automatically generating command line interfaces"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66

From 369d03a6567cde3548cbb9e49de48a426b966edd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 09/13] python3-protobuf: update to 5.28.0

---
 srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
 srcpkgs/python3-protobuf/template            | 21 ++++++--------------
 2 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/python3-protobuf/patches/cpp17.patch

diff --git a/srcpkgs/python3-protobuf/patches/cpp17.patch b/srcpkgs/python3-protobuf/patches/cpp17.patch
deleted file mode 100644
index 97b81e1bfa5ad6..00000000000000
--- a/srcpkgs/python3-protobuf/patches/cpp17.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/python/setup.py	2023-07-05 23:53:30.000000000 +0200
-+++ -	2023-07-14 16:19:35.949677747 +0200
-@@ -370,7 +370,7 @@
-       extra_compile_args.append('-Wno-invalid-offsetof')
-       extra_compile_args.append('-Wno-sign-compare')
-       extra_compile_args.append('-Wno-unused-variable')
--      extra_compile_args.append('-std=c++14')
-+      extra_compile_args.append('-std=c++17')
- 
-     if sys.platform == 'darwin':
-       extra_compile_args.append('-Wno-shorten-64-to-32')
diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
 revision=1
 build_style=python3-module
-build_wrksrc=python
 hostmakedepends="python3-setuptools python3-wheel protobuf"
+makedepends="python3-devel protobuf-devel"
 depends="python3-setuptools python3-six"
 checkdepends="python3-numpy"
 short_desc="Python3 bindings for Google Protocol Buffers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
-# PyPi release does not have bits for cppext
-distfiles="https://github.com/protocolbuffers/protobuf/releases/download/v${version#*.}/protobuf-${version#*.}.tar.gz"
-checksum=8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871
-make_check=no # ImportError: cannot import name 'unittest_retention_pb2' from 'google.protobuf'
+distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
+checksum=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
 
-build_options="cppext"
-build_options_default="cppext"
-desc_option_cppext="Build C++ extension to improve performance"
-
-if [ "$build_option_cppext" ]; then
-	make_build_args="--cpp_implementation"
-	make_install_args="--cpp_implementation"
-	makedepends+=" python3-devel protobuf-devel"
-fi
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
 
 post_install() {
 	sed -n 1,29p google/protobuf/__init__.py >LICENSE

From baa61bc5d74e01109df20829b6ac9dcbba22a8b0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 10/13] hidapi: update to 0.14.0

---
 srcpkgs/hidapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index 365e8eac36cacd..66bc48f737c9b2 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -1,6 +1,6 @@
 # Template file for 'hidapi'
 pkgname=hidapi
-version=0.13.1
+version=0.14.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/libusb/hidapi"
 changelog="https://github.com/libusb/hidapi/releases"
 distfiles="https://github.com/libusb/hidapi/archive/refs/tags/hidapi-${version}.tar.gz"
-checksum=476a2c9a4dc7d1fc97dd223b84338dbea3809a84caea2dcd887d9778725490e3
+checksum=a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd
 
 post_install() {
 	vlicense LICENSE-bsd.txt LICENSE

From 24b1803c264d7f70871f2de13a0022b3e4a62540 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 11/13] python3-ecdsa: update to 0.19.0

---
 srcpkgs/python3-ecdsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ecdsa'
 pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tlsfuzzer/python-ecdsa/"
 distfiles="https://github.com/tlsfuzzer/python-ecdsa/archive/python-ecdsa-${version}.tar.gz"
-checksum=5d33bcc7c45be2d0bf0bd7d3a1e6502fac16efde1b69bc988c9a3ee7680c17d7
+checksum=1ba39e8358eaeebef1ba2a772db619528375ddf3fe0e1b20e43372d7d5ab3f77
 
 do_check() {
 	coverage run --branch -m pytest src/ecdsa

From 190c7d2c6528124075d900d1d51ab463362797bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 12/13] New package: python3-nethsm-1.2.1

---
 srcpkgs/python3-nethsm/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-nethsm/template

diff --git a/srcpkgs/python3-nethsm/template b/srcpkgs/python3-nethsm/template
new file mode 100644
index 00000000000000..9e01b4084a1163
--- /dev/null
+++ b/srcpkgs/python3-nethsm/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-nethsm'
+pkgname=python3-nethsm
+version=1.2.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-certifi python3-cryptography python3-dateutil python3-typing_extensions python3-urllib3"
+short_desc="Python Library to manage NetHSM(s)"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001

From 433ac0073314436a2e83f0b809ef2e76b87cb70c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 17 Dec 2024 16:44:23 +0100
Subject: [PATCH 13/13] Revert "Merge branch 'master' into nitrokey-0.5.0"

This reverts commit edbca6afd5f3f1978743e1bfd89d84650418d0c8, reversing
changes made to 190c7d2c6528124075d900d1d51ab463362797bf.
---
 Manual.md                                     |     7 -
 common/build-helper/meson.sh                  |     2 +-
 common/build-helper/python3.sh                |     2 -
 .../environment/build-style/python3-module.sh |     3 -
 .../environment/build-style/python3-pep517.sh |     5 +-
 common/environment/setup-subpkg/subpkg.sh     |     6 -
 common/environment/setup/python.sh            |     2 +-
 common/hooks/do-pkg/00-gen-pkg.sh             |    22 +-
 .../04-create-xbps-metadata-scripts.sh        |     2 +-
 .../post-install/06-strip-and-debug-pkgs.sh   |     2 +-
 .../hooks/post-install/98-shlib-provides.sh   |     9 +-
 .../hooks/pre-configure/02-script-wrapper.sh  |     2 +-
 common/hooks/pre-pkg/04-generate-provides.sh  |    29 -
 .../hooks/pre-pkg/04-generate-runtime-deps.sh |     4 +-
 .../pre-pkg/05-generate-32bit-runtime-deps.sh |    22 +-
 common/hooks/pre-pkg/06-verify-python-deps.sh |    17 -
 common/hooks/pre-pkg/99-pkglint.sh            |     4 +-
 common/hooks/pre-pkg/999-collected-rdeps.sh   |     4 +-
 common/scripts/parse-py-metadata.py           |   203 -
 common/shlibs                                 |    18 +-
 common/xbps-src/shutils/show.sh               |     6 +-
 srcpkgs/Carla/template                        |     2 +-
 srcpkgs/DSView/template                       |     2 +-
 srcpkgs/DisplayCAL/template                   |     2 +-
 srcpkgs/GCP-Guest-Environment/template        |     2 +-
 srcpkgs/Grammalecte/template                  |     2 +-
 srcpkgs/Komikku/template                      |     2 +-
 srcpkgs/LabJackPython/template                |     2 +-
 srcpkgs/OpenLP/template                       |     2 +-
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch     |    29 +
 srcpkgs/OpenSubdiv/template                   |     6 +-
 srcpkgs/PackageKit/template                   |     2 +-
 srcpkgs/PhotoCollage/template                 |     6 +-
 srcpkgs/PyInstaller/template                  |     2 +-
 srcpkgs/QMPlay2/template                      |     6 +-
 srcpkgs/ReText/template                       |     2 +-
 srcpkgs/SoapySDR/template                     |     2 +-
 srcpkgs/Solaar/template                       |     2 +-
 srcpkgs/Trimage/template                      |     2 +-
 srcpkgs/TwitchNotifier/template               |     2 +-
 srcpkgs/act/template                          |     2 +-
 srcpkgs/activityrelay/template                |     2 +-
 srcpkgs/afew/template                         |     2 +-
 srcpkgs/afl++/template                        |     2 +-
 srcpkgs/aircrack-ng/template                  |     2 +-
 srcpkgs/alienfx/template                      |     2 +-
 srcpkgs/alot/template                         |     2 +-
 srcpkgs/android-studio/template               |     3 +-
 srcpkgs/angrysearch/template                  |     2 +-
 srcpkgs/ansible-core/template                 |     2 +-
 srcpkgs/ansible/template                      |     2 +-
 srcpkgs/apostrophe/template                   |     5 +-
 srcpkgs/apparmor/template                     |     2 +-
 srcpkgs/arandr/template                       |     2 +-
 srcpkgs/asciidoc/template                     |     2 +-
 srcpkgs/asciinema/template                    |     2 +-
 srcpkgs/ast-grep/template                     |     4 +-
 srcpkgs/attic/template                        |     2 +-
 srcpkgs/audit/template                        |     2 +-
 srcpkgs/autopep8/template                     |     2 +-
 srcpkgs/autorandr/template                    |     2 +-
 srcpkgs/autotiling/template                   |     2 +-
 srcpkgs/avahi-discover/template               |    15 +-
 srcpkgs/avideo/template                       |     2 +-
 srcpkgs/avr-gdb/patches/constness.patch       |    11 +
 srcpkgs/avr-gdb/template                      |     8 +-
 srcpkgs/aws-cli/template                      |     2 +-
 srcpkgs/awsume/template                       |     2 +-
 srcpkgs/azote/template                        |     2 +-
 srcpkgs/bCNC/template                         |     2 +-
 srcpkgs/backblaze-b2/template                 |     2 +-
 srcpkgs/backintime/template                   |     2 +-
 srcpkgs/bcc/template                          |     6 +-
 srcpkgs/beancount/template                    |     2 +-
 srcpkgs/beets/template                        |     2 +-
 srcpkgs/binwalk/template                      |     2 +-
 srcpkgs/black/template                        |     2 +-
 srcpkgs/blender/patches/0001-musl-fixes.patch |    16 +-
 .../blender/patches/0002-fix-includes.patch   |    38 -
 srcpkgs/blender/patches/altivec-all.patch     |    32 +
 .../blender/patches/python-3.12-regex.patch   |    36 +
 srcpkgs/blender/patches/python-3.13.patch     |   626 -
 .../patches/python3.12-pylongobject.patch     |   134 +
 srcpkgs/blender/template                      |    12 +-
 srcpkgs/bluefish/template                     |     2 +-
 srcpkgs/blueman/template                      |     2 +-
 srcpkgs/blueprint-compiler/template           |     2 +-
 srcpkgs/boost/template                        |     6 +-
 srcpkgs/bootchart2/template                   |     2 +-
 srcpkgs/borg/template                         |     2 +-
 srcpkgs/borgmatic/template                    |     2 +-
 srcpkgs/botan/template                        |     2 +-
 srcpkgs/brltty/patches/python3-bindings.patch |    28 -
 srcpkgs/brltty/template                       |    29 +-
 srcpkgs/btrfs-backup/template                 |     2 +-
 srcpkgs/bum/template                          |     2 +-
 srcpkgs/bumblebee-status/template             |     2 +-
 srcpkgs/bup/template                          |     2 +-
 srcpkgs/cadence/template                      |     2 +-
 srcpkgs/caffeine-ng/template                  |     2 +-
 srcpkgs/cairo-dock-plugins/template           |     2 +-
 srcpkgs/calibre/template                      |     2 +-
 .../canto-curses/patches/python-3.13.patch    |    20 -
 srcpkgs/canto-curses/template                 |     2 +-
 srcpkgs/canto-next/template                   |     2 +-
 srcpkgs/capstone/template                     |     2 +-
 srcpkgs/cargo-update/files/Cargo.lock         |   879 +
 srcpkgs/cargo-update/template                 |     4 +-
 srcpkgs/caribou/template                      |     2 +-
 srcpkgs/castero/template                      |     2 +-
 srcpkgs/catfish/template                      |     2 +-
 srcpkgs/ccsm/template                         |     2 +-
 srcpkgs/certbot-apache/template               |     2 +-
 srcpkgs/certbot-nginx/template                |     2 +-
 srcpkgs/certbot/template                      |     2 +-
 srcpkgs/chirp/template                        |     2 +-
 .../cinnamon-control-center/patches/musl.diff |    19 +
 srcpkgs/cinnamon-control-center/template      |    11 +-
 srcpkgs/cinnamon-desktop/template             |     4 +-
 srcpkgs/cinnamon-menus/template               |     6 +-
 srcpkgs/cinnamon-screensaver/template         |     6 +-
 srcpkgs/cinnamon-session/template             |     6 +-
 srcpkgs/cinnamon-settings-daemon/template     |     8 +-
 srcpkgs/cinnamon-translations/template        |     4 +-
 srcpkgs/cinnamon/template                     |    23 +-
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch |    46 +
 srcpkgs/cjs/template                          |     8 +-
 srcpkgs/clearine/template                     |     2 +-
 srcpkgs/cmakelang/template                    |     2 +-
 srcpkgs/coccigrep/template                    |     2 +-
 srcpkgs/collectd/template                     |     2 +-
 srcpkgs/compizconfig-python/template          |     2 +-
 srcpkgs/configshell-fb/template               |     2 +-
 srcpkgs/console-setup/template                |     4 +-
 srcpkgs/cookiecutter/template                 |     2 +-
 srcpkgs/coursera-dl/template                  |     2 +-
 srcpkgs/cozy/template                         |     6 +-
 srcpkgs/cppman/template                       |     2 +-
 srcpkgs/cpuset/template                       |     2 +-
 srcpkgs/criu/template                         |     2 +-
 srcpkgs/cropgui/template                      |     2 +-
 srcpkgs/cross-arm-none-eabi-gdb/template      |    19 +-
 srcpkgs/csound/template                       |     2 +-
 srcpkgs/ctop/template                         |     2 +-
 .../curl/patches/fix-content-encoding.patch   |    26 +
 srcpkgs/curl/patches/fix-netrc.patch          |   214 +
 srcpkgs/curl/template                         |     6 +-
 srcpkgs/curseradio/template                   |     2 +-
 srcpkgs/cutter/template                       |     2 +-
 srcpkgs/d-feet/template                       |     2 +-
 srcpkgs/deluge/template                       |     2 +-
 srcpkgs/devedeng/template                     |     2 +-
 srcpkgs/diffoscope/template                   |     2 +-
 srcpkgs/discord/template                      |     4 +-
 srcpkgs/distcc/template                       |     2 +-
 srcpkgs/docker-cli/template                   |     4 +-
 srcpkgs/downloader-cli/template               |     2 +-
 srcpkgs/dtrx/template                         |     2 +-
 srcpkgs/duckdb/template                       |     2 +-
 srcpkgs/duplicity/template                    |     4 +-
 srcpkgs/eduvpn-common/template                |     2 +-
 srcpkgs/edx-dl/template                       |     2 +-
 srcpkgs/electrum/template                     |     2 +-
 srcpkgs/eog-plugins/template                  |     2 +-
 srcpkgs/eolie/template                        |     2 +-
 srcpkgs/epy/template                          |     2 +-
 srcpkgs/ergo/template                         |     2 +-
 srcpkgs/esptool/template                      |     2 +-
 srcpkgs/etcetera/template                     |     2 +-
 srcpkgs/etesync-dav/template                  |     2 +-
 srcpkgs/evemu/template                        |     2 +-
 ...8fb0227c714d7ed0613a28142613aa4a9c6b.patch |    53 +
 srcpkgs/extension-manager/template            |     8 +-
 srcpkgs/eyeD3/template                        |     2 +-
 srcpkgs/eza/template                          |     8 +-
 srcpkgs/fail2ban/template                     |    10 +-
 srcpkgs/fava/template                         |     2 +-
 srcpkgs/fenrir/template                       |     2 +-
 srcpkgs/fetchmail/template                    |     2 +-
 srcpkgs/fftw/patches/clock-gettime.patch      |    70 -
 srcpkgs/fftw/template                         |     2 +-
 srcpkgs/fierce/template                       |     2 +-
 srcpkgs/fifengine/template                    |     2 +-
 srcpkgs/firefox/template                      |     6 +-
 srcpkgs/flake8/template                       |     2 +-
 srcpkgs/flannel/template                      |     4 +-
 srcpkgs/flinks/template                       |     2 +-
 srcpkgs/fnott/template                        |     6 +-
 srcpkgs/font-sarasa-gothic/template           |     4 +-
 srcpkgs/fontforge/patches/l10n.patch          |  8803 ----------
 srcpkgs/fontforge/template                    |     2 +-
 srcpkgs/fonttools/template                    |     2 +-
 srcpkgs/freecad/template                      |     6 +-
 srcpkgs/freeorion/template                    |     4 +-
 srcpkgs/frr/patches/python-3.13.patch         |    79 -
 srcpkgs/frr/template                          |     2 +-
 srcpkgs/fwupd/template                        |     4 +-
 srcpkgs/gajim/template                        |     2 +-
 srcpkgs/gallery-dl/template                   |     2 +-
 srcpkgs/gammastep/template                    |     2 +-
 srcpkgs/gbinder-python/template               |     2 +-
 srcpkgs/gcalcli/template                      |     2 +-
 srcpkgs/gcovr/template                        |     2 +-
 srcpkgs/gdb/template                          |     2 +-
 srcpkgs/gdm-settings/template                 |     2 +-
 srcpkgs/gdown/template                        |     2 +-
 srcpkgs/gedit-plugins/template                |     2 +-
 srcpkgs/gedit/template                        |     2 +-
 srcpkgs/gef/template                          |     2 +-
 srcpkgs/geis/template                         |     2 +-
 srcpkgs/gfeeds/template                       |     2 +-
 srcpkgs/gi-docgen/template                    |     2 +-
 srcpkgs/git-cola/template                     |     4 +-
 srcpkgs/git-delete-merged-branches/template   |     2 +-
 srcpkgs/git-filter-repo/template              |     2 +-
 srcpkgs/git-review/template                   |     2 +-
 srcpkgs/git-revise/template                   |     2 +-
 srcpkgs/gitg/template                         |     2 +-
 srcpkgs/glade3/template                       |     2 +-
 srcpkgs/glances/template                      |     2 +-
 srcpkgs/gleam/template                        |     4 +-
 srcpkgs/glib/template                         |     2 +-
 srcpkgs/glusterfs/template                    |     2 +-
 srcpkgs/gnome-browser-connector/template      |     2 +-
 srcpkgs/gnome-builder/template                |     2 +-
 srcpkgs/gnome-music/template                  |     2 +-
 srcpkgs/gnome-passbook/template               |     2 +-
 srcpkgs/gnome-secrets/template                |     2 +-
 srcpkgs/gnome-tweaks/template                 |     2 +-
 srcpkgs/gns3-gui/template                     |     2 +-
 srcpkgs/gns3-net-converter/template           |     2 +-
 srcpkgs/gns3-server/template                  |     2 +-
 srcpkgs/gnubg/template                        |     2 +-
 srcpkgs/gnucash/template                      |     2 +-
 srcpkgs/gnuradio-nrsc5/template               |     2 +-
 srcpkgs/gnuradio-osmosdr/template             |     2 +-
 srcpkgs/gnuradio-rds/template                 |     2 +-
 srcpkgs/gnuradio/template                     |     2 +-
 .../gobject-introspection-bootstrap/template  |     2 +-
 srcpkgs/gobject-introspection/template        |     2 +-
 srcpkgs/gom/template                          |     2 +-
 srcpkgs/gpgme/template                        |    11 +-
 srcpkgs/gpodder/template                      |     2 +-
 srcpkgs/gpsd/template                         |     2 +-
 srcpkgs/gramps/template                       |     2 +-
 srcpkgs/greg/template                         |     2 +-
 srcpkgs/grip/template                         |     2 +-
 srcpkgs/gscreenshot/template                  |     2 +-
 srcpkgs/gst1-editing-services/template        |     2 +-
 srcpkgs/gst1-python3/template                 |     2 +-
 srcpkgs/gtk-doc/template                      |     2 +-
 srcpkgs/guake/template                        |     2 +-
 srcpkgs/gufw/template                         |     2 +-
 srcpkgs/gwe/template                          |     2 +-
 srcpkgs/gwenview/template                     |     4 +-
 srcpkgs/hamlib/template                       |     6 +-
 srcpkgs/hatch-fancy-pypi-readme/template      |     2 +-
 srcpkgs/hatch-jupyter-builder/template        |     2 +-
 srcpkgs/hatch-nodejs-version/template         |     2 +-
 srcpkgs/hatch-vcs/template                    |     2 +-
 srcpkgs/hatch/template                        |     2 +-
 srcpkgs/hatchling/template                    |     2 +-
 srcpkgs/heisenbridge/template                 |     2 +-
 srcpkgs/hexchat/template                      |     2 +-
 srcpkgs/hg-evolve/template                    |     2 +-
 srcpkgs/hg-git/template                       |     2 +-
 srcpkgs/hivex/template                        |     2 +-
 srcpkgs/hobbits/template                      |     2 +-
 srcpkgs/hplip/template                        |     2 +-
 srcpkgs/httpie/template                       |     2 +-
 srcpkgs/hugin/template                        |     2 +-
 srcpkgs/hugo/template                         |     4 +-
 srcpkgs/hydrus/template                       |     2 +-
 srcpkgs/i2c-tools/template                    |     2 +-
 srcpkgs/ibus/template                         |    17 +-
 srcpkgs/icdiff/template                       |     2 +-
 srcpkgs/idjc/template                         |     2 +-
 srcpkgs/imath/template                        |     4 +-
 srcpkgs/img2pdf/template                      |     2 +-
 srcpkgs/impacket/template                     |     2 +-
 srcpkgs/instaloader/template                  |     2 +-
 srcpkgs/iotop/template                        |     2 +-
 srcpkgs/ite8291r3-ctl/template                |     2 +-
 srcpkgs/jack_mixer/template                   |     8 +-
 srcpkgs/janet/template                        |     4 +-
 srcpkgs/jaq/template                          |     5 +-
 srcpkgs/jc/template                           |     2 +-
 srcpkgs/jep/template                          |     2 +-
 srcpkgs/jrnl/template                         |     2 +-
 srcpkgs/jujutsu/template                      |     5 +-
 srcpkgs/jupyterlab/template                   |     2 +-
 srcpkgs/justbuild/template                    |     4 +-
 srcpkgs/kapidox/template                      |     2 +-
 .../kdevelop-python/patches/python-3.13.patch |    26 -
 srcpkgs/kdevelop-python/template              |    10 +-
 srcpkgs/keystone/template                     |     2 +-
 srcpkgs/kf6-solid/template                    |     4 +-
 srcpkgs/khal/template                         |     2 +-
 srcpkgs/khard/template                        |     2 +-
 srcpkgs/kicad/template                        |     2 +-
 ...boost-python-bindung-with-boost-1.67.patch |    95 +
 srcpkgs/kig/template                          |     6 +-
 srcpkgs/kitty/template                        |     2 +-
 srcpkgs/knot/template                         |     4 +-
 srcpkgs/kodi/patches/no-werror.patch          |    19 -
 srcpkgs/kodi/template                         |     9 +-
 srcpkgs/kore/patches/python-3.13.patch        |    69 -
 srcpkgs/kore/template                         |     2 +-
 srcpkgs/krita/patches/python-3.13.patch       |   120 -
 srcpkgs/krita/template                        |     2 +-
 srcpkgs/ktoblzcheck/template                  |     2 +-
 srcpkgs/kubernetes/template                   |     4 +-
 srcpkgs/kupfer/template                       |     2 +-
 srcpkgs/kvirc/template                        |     2 +-
 srcpkgs/labwc/template                        |     4 +-
 srcpkgs/ldapdomaindump/template               |     2 +-
 srcpkgs/ldb/template                          |     2 +-
 srcpkgs/legendary/template                    |     2 +-
 srcpkgs/lensfun/template                      |     2 +-
 srcpkgs/lesspass/template                     |     2 +-
 srcpkgs/lfm/template                          |     2 +-
 srcpkgs/libaccounts-glib/template             |     2 +-
 srcpkgs/libblockdev/template                  |     2 +-
 srcpkgs/libbytesize/template                  |     2 +-
 srcpkgs/libcap-ng/template                    |     2 +-
 srcpkgs/libcec/patches/python-3.13.patch      |    12 -
 srcpkgs/libcec/template                       |     2 +-
 srcpkgs/libffado/template                     |     2 +-
 srcpkgs/libgdal/template                      |     2 +-
 srcpkgs/libgexiv2/template                    |     2 +-
 srcpkgs/libgit2-glib/template                 |     2 +-
 srcpkgs/libgpiod/template                     |     2 +-
 srcpkgs/libiio/template                       |     2 +-
 .../libimobiledevice/patches/00.cython3.patch |    24 -
 .../libimobiledevice/patches/01.cython3.patch |    50 -
 srcpkgs/libimobiledevice/template             |     4 +-
 srcpkgs/libixion/template                     |     2 +-
 srcpkgs/libkdcraw5/template                   |     5 +-
 srcpkgs/libkdumpfile/template                 |     2 +-
 srcpkgs/liblouis/template                     |     2 +-
 srcpkgs/libnvme/template                      |     2 +-
 srcpkgs/libopenshot/template                  |     2 +-
 srcpkgs/liborcus/template                     |     2 +-
 srcpkgs/libpeas/template                      |     2 +-
 srcpkgs/libpeas2/template                     |     2 +-
 srcpkgs/libpfm4/template                      |     2 +-
 srcpkgs/libplist/template                     |     2 +-
 srcpkgs/libproxy/template                     |     2 +-
 srcpkgs/libpwquality/template                 |     2 +-
 srcpkgs/libreoffice/template                  |     2 +-
 srcpkgs/libsearpc/template                    |     2 +-
 srcpkgs/libsigrokdecode/template              |     2 +-
 srcpkgs/libsmbios/template                    |     2 +-
 srcpkgs/libtorrent-rasterbar/template         |     4 +-
 srcpkgs/libvirt-python3/template              |     4 +-
 srcpkgs/libvoikko/template                    |     2 +-
 srcpkgs/libxml2/template                      |     2 +-
 srcpkgs/libxslt/template                      |     2 +-
 srcpkgs/lightdm-gtk-greeter-settings/template |     2 +-
 srcpkgs/limine/template                       |     6 +-
 srcpkgs/linux-tools/template                  |     2 +-
 srcpkgs/linux4.19/files/DocBook/Makefile      |   282 +
 srcpkgs/linux4.19/files/arm-dotconfig         |  6552 ++++++++
 srcpkgs/linux4.19/files/arm64-dotconfig       |  8721 ++++++++++
 srcpkgs/linux4.19/files/i386-dotconfig        |  8682 ++++++++++
 srcpkgs/linux4.19/files/mv-debug              |     7 +
 srcpkgs/linux4.19/files/ppc-dotconfig         |  6958 ++++++++
 srcpkgs/linux4.19/files/ppc64-dotconfig       |  8793 ++++++++++
 srcpkgs/linux4.19/files/ppc64le-dotconfig     |  8554 ++++++++++
 srcpkgs/linux4.19/files/x86_64-dotconfig      |  8897 ++++++++++
 .../linux4.19/patches/ppc64-be-elfv2.patch    |    86 +
 .../linux4.19/patches/ppcle-broken-vdso.patch |    21 +
 srcpkgs/linux4.19/patches/ppcle-enable.patch  |    33 +
 .../patches/ppcle-ll-compat-sys.patch         |   107 +
 srcpkgs/linux4.19/template                    |   338 +
 srcpkgs/linux6.10/files/arm64-dotconfig       | 13501 +++++++++++++++
 srcpkgs/linux6.10/files/i386-dotconfig        | 11111 +++++++++++++
 srcpkgs/linux6.10/files/mv-debug              |     8 +
 srcpkgs/linux6.10/files/x86_64-dotconfig      | 11578 +++++++++++++
 .../linux6.10/patches/fix-musl-btf-ids.patch  |    15 +
 .../linux6.10/patches/fix-musl-objtool.patch  |    14 +
 .../linux6.10/patches/fixdep-largefile.patch  |    11 +
 ...d-in-kernel-pd-mapper-implementation.patch |  1853 +++
 srcpkgs/linux6.10/template                    |   351 +
 srcpkgs/linux6.11/files/arm64-dotconfig       | 13598 ++++++++++++++++
 srcpkgs/linux6.11/files/i386-dotconfig        | 11169 +++++++++++++
 srcpkgs/linux6.11/files/mv-debug              |     8 +
 srcpkgs/linux6.11/files/x86_64-dotconfig      | 11641 +++++++++++++
 .../linux6.11/patches/fix-musl-btf-ids.patch  |    15 +
 .../linux6.11/patches/fix-musl-objtool.patch  |    14 +
 .../linux6.11/patches/fixdep-largefile.patch  |    11 +
 srcpkgs/linux6.11/patches/x13s-camera.patch   |   105 +
 srcpkgs/linux6.11/template                    |   351 +
 srcpkgs/linux6.12/files/arm64-dotconfig       |     5 +-
 srcpkgs/linux6.12/files/i386-dotconfig        |     5 +-
 srcpkgs/linux6.12/files/x86_64-dotconfig      |     5 +-
 srcpkgs/linux6.12/template                    |     4 +-
 srcpkgs/linux6.6/files/arm64-dotconfig        |     6 +-
 srcpkgs/linux6.6/files/i386-dotconfig         |     4 +-
 srcpkgs/linux6.6/files/x86_64-dotconfig       |     4 +-
 srcpkgs/linux6.6/template                     |     4 +-
 srcpkgs/lite-xl/template                      |     6 +-
 srcpkgs/litecli/template                      |     2 +-
 srcpkgs/litterbox/template                    |     2 +-
 srcpkgs/llvm17/template                       |    20 +-
 srcpkgs/llvm18/template                       |    26 +-
 srcpkgs/llvm19/template                       |     2 +-
 srcpkgs/lollypop/template                     |     2 +-
 srcpkgs/lowdown/template                      |     6 +-
 srcpkgs/lutris/template                       |     2 +-
 srcpkgs/lxqt-notificationd/template           |     4 +-
 srcpkgs/lxqt-panel/template                   |     4 +-
 srcpkgs/magic-wormhole/template               |     2 +-
 srcpkgs/mailnag-goa-plugin/template           |     2 +-
 srcpkgs/mailnag/template                      |     2 +-
 srcpkgs/manuskript/template                   |     2 +-
 srcpkgs/massren/template                      |     6 +-
 srcpkgs/mat2/template                         |     2 +-
 srcpkgs/mate-menu/template                    |     2 +-
 srcpkgs/mate-tweak/template                   |     2 +-
 srcpkgs/maturin/template                      |     4 +-
 srcpkgs/mcelog/template                       |     4 +-
 srcpkgs/mcg/template                          |     2 +-
 srcpkgs/mcomix/template                       |     2 +-
 srcpkgs/med/patches/include-dir.patch         |    13 -
 srcpkgs/med/template                          |    20 +-
 srcpkgs/meld/template                         |     2 +-
 srcpkgs/memray/template                       |     2 +-
 srcpkgs/menulibre/template                    |     2 +-
 srcpkgs/menumaker/template                    |     2 +-
 srcpkgs/mercurial/template                    |     2 +-
 srcpkgs/mesa/template                         |     7 +-
 srcpkgs/meson-cmake-wrapper/template          |     2 +-
 srcpkgs/meson/template                        |     2 +-
 srcpkgs/mimeo/template                        |     2 +-
 srcpkgs/minigalaxy/template                   |     2 +-
 srcpkgs/mininet/template                      |     2 +-
 srcpkgs/mirage/template                       |     2 +-
 srcpkgs/mitmproxy/template                    |     2 +-
 srcpkgs/mkchromecast/template                 |     2 +-
 srcpkgs/mlt7/template                         |     2 +-
 srcpkgs/moby/template                         |     6 +-
 srcpkgs/mod_wsgi/template                     |     2 +-
 srcpkgs/mongo-c-driver/template               |     6 +-
 srcpkgs/monit/template                        |     6 +-
 srcpkgs/mopidy-local/template                 |     2 +-
 srcpkgs/mopidy-mpd/template                   |     2 +-
 srcpkgs/mopidy-multisonic/template            |     2 +-
 srcpkgs/mopidy-podcast/template               |     2 +-
 srcpkgs/mopidy/template                       |     2 +-
 srcpkgs/mozo/template                         |     2 +-
 srcpkgs/mpd-sima/template                     |     2 +-
 srcpkgs/muffin/template                       |    11 +-
 srcpkgs/mugshot/template                      |     2 +-
 srcpkgs/multibootusb/template                 |     2 +-
 srcpkgs/muse/template                         |     7 +-
 srcpkgs/mymcplus/template                     |     2 +-
 srcpkgs/mypaint/template                      |     2 +-
 srcpkgs/nagstamon/template                    |     2 +-
 srcpkgs/nautilus-python/template              |     2 +-
 srcpkgs/navit/template                        |     2 +-
 srcpkgs/nemo-audio-tab/template               |     4 +-
 srcpkgs/nemo-compare/template                 |     7 +-
 srcpkgs/nemo-emblems/template                 |     4 +-
 srcpkgs/nemo-extensions/template              |     2 +-
 srcpkgs/nemo-fileroller/template              |     6 +-
 srcpkgs/nemo-image-converter/template         |     6 +-
 srcpkgs/nemo-preview/template                 |     8 +-
 srcpkgs/nemo-python/template                  |     6 +-
 srcpkgs/nemo-terminal/template                |     4 +-
 srcpkgs/nemo/template                         |     9 +-
 srcpkgs/neovim-remote/template                |     2 +-
 srcpkgs/network-ups-tools/template            |     2 +-
 srcpkgs/newt/template                         |     2 +-
 srcpkgs/nftables/template                     |     2 +-
 srcpkgs/nicotine+/template                    |     2 +-
 srcpkgs/ninja/template                        |     2 +-
 srcpkgs/nitroshare/template                   |     2 +-
 srcpkgs/nmap/template                         |    10 +-
 srcpkgs/nodeenv/patches/python-3.13.patch     |    73 -
 srcpkgs/nodeenv/template                      |     2 +-
 srcpkgs/notmuch/template                      |     2 +-
 srcpkgs/nsd/template                          |     6 +-
 srcpkgs/ntpd-rs/template                      |     4 +-
 srcpkgs/nyx/template                          |     2 +-
 srcpkgs/obs/template                          |     2 +-
 srcpkgs/offlineimap/template                  |     2 +-
 srcpkgs/offpunk/template                      |     2 +-
 srcpkgs/olm-python3/template                  |     2 +-
 srcpkgs/onboard/template                      |     2 +-
 srcpkgs/opencamlib/template                   |     4 +-
 srcpkgs/opencolorio/template                  |     2 +-
 srcpkgs/opencv/template                       |     2 +-
 srcpkgs/openimagedenoise/template             |     6 +-
 srcpkgs/openimageio/template                  |     6 +-
 srcpkgs/openrazer-meta/template               |     2 +-
 srcpkgs/openshot/template                     |     2 +-
 srcpkgs/openvswitch/template                  |     2 +-
 srcpkgs/opera/template                        |     4 +-
 srcpkgs/orca/template                         |     2 +-
 srcpkgs/osc/template                          |     2 +-
 srcpkgs/othman/template                       |     2 +-
 srcpkgs/pacman/template                       |    13 +-
 srcpkgs/pahole/template                       |     4 +-
 srcpkgs/pam_wrapper/template                  |     2 +-
 srcpkgs/pantalaimon/template                  |     2 +-
 srcpkgs/papis/template                        |     2 +-
 srcpkgs/pass-git-helper/template              |     2 +-
 srcpkgs/pass-import/template                  |     2 +-
 srcpkgs/passt/template                        |     4 +-
 srcpkgs/pdfarranger/template                  |     2 +-
 srcpkgs/peframe/template                      |     2 +-
 srcpkgs/pekwm/template                        |     7 +-
 srcpkgs/pelican/template                      |     2 +-
 srcpkgs/perl-Locale-Codes/template            |     4 +-
 srcpkgs/persepolis/template                   |     2 +-
 srcpkgs/peru/template                         |     2 +-
 srcpkgs/pex/template                          |     2 +-
 srcpkgs/pgcli/template                        |     2 +-
 srcpkgs/photofilmstrip/template               |     2 +-
 srcpkgs/picard/template                       |     2 +-
 srcpkgs/pinktrace/template                    |     2 +-
 srcpkgs/piper/template                        |     2 +-
 srcpkgs/platformio/template                   |     2 +-
 srcpkgs/playitslowly/template                 |     2 +-
 srcpkgs/playonlinux/template                  |     2 +-
 srcpkgs/plover/template                       |     2 +-
 srcpkgs/plplot/template                       |     2 +-
 srcpkgs/pluma/template                        |     2 +-
 srcpkgs/pmbootstrap/template                  |     2 +-
 srcpkgs/pockyt/template                       |     2 +-
 srcpkgs/podman-compose/template               |     2 +-
 srcpkgs/poezio/template                       |     2 +-
 srcpkgs/polychromatic/template                |     2 +-
 srcpkgs/polysh/template                       |     2 +-
 srcpkgs/portage/template                      |     2 +-
 srcpkgs/postgresql15/template                 |     2 +-
 srcpkgs/postgresql16/template                 |     2 +-
 srcpkgs/pre-commit/template                   |     2 +-
 srcpkgs/profanity/template                    |     2 +-
 srcpkgs/proplib/template                      |     8 +-
 srcpkgs/protontricks/template                 |     2 +-
 srcpkgs/protonvpn-cli/template                |     2 +-
 srcpkgs/ps_mem/template                       |     2 +-
 srcpkgs/puddletag/template                    |     2 +-
 srcpkgs/pulseaudio-equalizer-ladspa/template  |     2 +-
 srcpkgs/pv/template                           |     6 +-
 srcpkgs/py3status/template                    |     2 +-
 srcpkgs/pychess/template                      |     6 +-
 srcpkgs/pycp/template                         |     2 +-
 srcpkgs/pyliblo/patches/cython3.patch         |    32 -
 srcpkgs/pyliblo/patches/python-3.11.patch     |    19 -
 srcpkgs/pyliblo/template                      |     8 +-
 srcpkgs/pylint/template                       |     2 +-
 srcpkgs/pymol/template                        |     2 +-
 srcpkgs/pyotherside/template                  |     2 +-
 srcpkgs/pyradio/template                      |     2 +-
 srcpkgs/pysolfc/template                      |     2 +-
 srcpkgs/python/template                       |     2 +-
 srcpkgs/python3-3to2/template                 |     2 +-
 srcpkgs/python3-Arpeggio/template             |     2 +-
 srcpkgs/python3-Arrow/template                |     2 +-
 srcpkgs/python3-Babel/template                |     2 +-
 srcpkgs/python3-BeautifulSoup4/template       |     2 +-
 srcpkgs/python3-Bottleneck/template           |     2 +-
 srcpkgs/python3-Brotli/template               |     2 +-
 srcpkgs/python3-Cheroot/template              |     2 +-
 srcpkgs/python3-CherryPy/template             |     2 +-
 srcpkgs/python3-ConfigArgParse/template       |     2 +-
 srcpkgs/python3-Cython/template               |     2 +-
 srcpkgs/python3-Cython0.29/template           |    31 +
 srcpkgs/python3-Cython0.29/update             |     3 +
 srcpkgs/python3-EasyProcess/template          |     5 +-
 srcpkgs/python3-Faker/template                |     2 +-
 srcpkgs/python3-Flask-Babel/template          |     2 +-
 srcpkgs/python3-Flask-Cors/template           |     2 +-
 srcpkgs/python3-Flask-HTTPAuth/template       |     2 +-
 srcpkgs/python3-Flask-Login/template          |     2 +-
 srcpkgs/python3-Flask-RESTful/template        |     4 +-
 srcpkgs/python3-Flask-WTF/template            |     4 +-
 srcpkgs/python3-Flask/template                |     2 +-
 srcpkgs/python3-GitPython/template            |     2 +-
 srcpkgs/python3-IPy/template                  |     2 +-
 srcpkgs/python3-Inflector/template            |     2 +-
 srcpkgs/python3-Jinja2/template               |     2 +-
 srcpkgs/python3-Levenshtein/template          |     8 +-
 srcpkgs/python3-M2Crypto/template             |     2 +-
 srcpkgs/python3-Mako/template                 |     2 +-
 srcpkgs/python3-Markdown/template             |     2 +-
 srcpkgs/python3-MarkupSafe/template           |     8 +-
 srcpkgs/python3-Markups/template              |     2 +-
 srcpkgs/python3-MechanicalSoup/template       |     2 +-
 srcpkgs/python3-MiniMock/template             |     2 +-
 srcpkgs/python3-MyST-Parser/template          |     2 +-
 srcpkgs/python3-PGPy/template                 |     2 +-
 srcpkgs/python3-Pebble/template               |     2 +-
 srcpkgs/python3-Pillow/template               |     4 +-
 srcpkgs/python3-PyAudio/template              |     2 +-
 srcpkgs/python3-PyBrowserID/template          |     2 +-
 srcpkgs/python3-PyFxA/template                |     2 +-
 srcpkgs/python3-PyHamcrest/template           |     2 +-
 srcpkgs/python3-PyICU/template                |     2 +-
 srcpkgs/python3-PyJWT/template                |     2 +-
 srcpkgs/python3-PyOpenGL-accelerate/template  |     2 +-
 srcpkgs/python3-PyOpenGL/template             |     2 +-
 srcpkgs/python3-PyQt-builder/template         |     2 +-
 srcpkgs/python3-PyQt5-networkauth/template    |     2 +-
 srcpkgs/python3-PyQt5-webengine/template      |     2 +-
 srcpkgs/python3-PyQt5/template                |     2 +-
 srcpkgs/python3-PyVirtualDisplay/template     |     2 +-
 srcpkgs/python3-Pygments/template             |     2 +-
 srcpkgs/python3-Pyphen/template               |     2 +-
 srcpkgs/python3-Pyro4/template                |     2 +-
 srcpkgs/python3-QtAwesome/template            |     2 +-
 srcpkgs/python3-QtPy/template                 |     2 +-
 srcpkgs/python3-RPi.GPIO/template             |     2 +-
 srcpkgs/python3-ReParser/template             |     2 +-
 srcpkgs/python3-Ropper/template               |     2 +-
 srcpkgs/python3-SQLAlchemy/template           |     6 +-
 srcpkgs/python3-SQLAlchemy/update             |     2 -
 srcpkgs/python3-SQLAlchemy2/template          |     6 +-
 srcpkgs/python3-SQLAlchemy2/update            |     1 -
 srcpkgs/python3-SecretStorage/template        |     2 +-
 srcpkgs/python3-SoCo/template                 |     2 +-
 srcpkgs/python3-Sphinx/template               |     2 +-
 srcpkgs/python3-Telethon/template             |     2 +-
 srcpkgs/python3-Twisted/template              |     2 +-
 srcpkgs/python3-TxSNI/template                |     2 +-
 srcpkgs/python3-Unidecode/template            |     2 +-
 srcpkgs/python3-WTForms/template              |     2 +-
 srcpkgs/python3-WeasyPrint/template           |     2 +-
 srcpkgs/python3-WebOb/template                |     2 +-
 srcpkgs/python3-Werkzeug/template             |     2 +-
 srcpkgs/python3-Whoosh/template               |     2 +-
 srcpkgs/python3-XlsxWriter/template           |     2 +-
 srcpkgs/python3-Yapsy/template                |     2 +-
 srcpkgs/python3-aalib/template                |     2 +-
 srcpkgs/python3-acme/template                 |     2 +-
 srcpkgs/python3-adblock/template              |     2 +-
 srcpkgs/python3-aioamqp/template              |     2 +-
 srcpkgs/python3-aiodns/template               |     2 +-
 srcpkgs/python3-aiofiles/template             |     2 +-
 srcpkgs/python3-aiohappyeyeballs/template     |     4 +-
 srcpkgs/python3-aiohttp-cors/template         |     2 +-
 srcpkgs/python3-aiohttp-sse-client/template   |     2 +-
 srcpkgs/python3-aiohttp/template              |     2 +-
 srcpkgs/python3-aiohttp_socks/template        |     2 +-
 srcpkgs/python3-aioinflux/template            |     2 +-
 srcpkgs/python3-aionotify/template            |     2 +-
 srcpkgs/python3-aioresponses/template         |     2 +-
 srcpkgs/python3-aiorpcx/template              |     2 +-
 srcpkgs/python3-aiosignal/template            |     2 +-
 srcpkgs/python3-aiostream/template            |     4 +-
 srcpkgs/python3-ajsonrpc/template             |     2 +-
 srcpkgs/python3-alabaster/template            |     2 +-
 srcpkgs/python3-alembic/template              |     2 +-
 srcpkgs/python3-alsa/template                 |     2 +-
 srcpkgs/python3-altgraph/template             |     2 +-
 srcpkgs/python3-aniso8601/template            |     2 +-
 srcpkgs/python3-annotated-types/template      |     2 +-
 srcpkgs/python3-ansible-compat/template       |     2 +-
 srcpkgs/python3-ansible-lint/template         |     2 +-
 srcpkgs/python3-ansicolor/template            |     2 +-
 srcpkgs/python3-ansicolors/template           |     2 +-
 srcpkgs/python3-ansiwrap/template             |     2 +-
 srcpkgs/python3-anyio/template                |     2 +-
 srcpkgs/python3-anytree/template              |     4 +-
 srcpkgs/python3-appdirs/template              |     2 +-
 srcpkgs/python3-applib/template               |     2 +-
 srcpkgs/python3-apprise/template              |     2 +-
 srcpkgs/python3-apsw/template                 |     2 +-
 srcpkgs/python3-aputils/template              |     2 +-
 srcpkgs/python3-argcomplete/template          |     2 +-
 srcpkgs/python3-argh/template                 |     2 +-
 srcpkgs/python3-argon2-cffi-bindings/template |     2 +-
 srcpkgs/python3-argon2/template               |     2 +-
 srcpkgs/python3-art/template                  |     2 +-
 srcpkgs/python3-arxiv2bib/template            |     2 +-
 srcpkgs/python3-asgiref/template              |     2 +-
 srcpkgs/python3-asn1crypto/template           |     2 +-
 srcpkgs/python3-aspectlib/template            |     2 +-
 srcpkgs/python3-asteval/template              |     2 +-
 srcpkgs/python3-astral/template               |     2 +-
 srcpkgs/python3-astroid/template              |     2 +-
 srcpkgs/python3-asttokens/template            |     4 +-
 srcpkgs/python3-async-lru/template            |     2 +-
 srcpkgs/python3-async-timeout/template        |     2 +-
 srcpkgs/python3-async_generator/template      |     2 +-
 srcpkgs/python3-atomicwrites/template         |     2 +-
 srcpkgs/python3-atspi/template                |     2 +-
 srcpkgs/python3-attrs/template                |     2 +-
 srcpkgs/python3-audioread/template            |     2 +-
 srcpkgs/python3-augeas/template               |     2 +-
 srcpkgs/python3-authres/template              |     2 +-
 srcpkgs/python3-autobahn/template             |     2 +-
 .../python3-autocommand/patches/license.patch |     9 -
 srcpkgs/python3-autocommand/template          |     2 +-
 srcpkgs/python3-automat/template              |     2 +-
 srcpkgs/python3-axolotl-curve25519/template   |     2 +-
 srcpkgs/python3-axolotl/template              |     2 +-
 srcpkgs/python3-b2sdk/template                |     2 +-
 srcpkgs/python3-babelfish/template            |     2 +-
 srcpkgs/python3-backcall/template             |     2 +-
 srcpkgs/python3-bcrypt/template               |     2 +-
 srcpkgs/python3-beniget/template              |     2 +-
 srcpkgs/python3-betamax-matchers/template     |     2 +-
 srcpkgs/python3-betamax/template              |     2 +-
 srcpkgs/python3-bibtexparser/template         |     2 +-
 srcpkgs/python3-binaryornot/template          |     2 +-
 srcpkgs/python3-bitarray/template             |     2 +-
 srcpkgs/python3-bitbucket-api/template        |     2 +-
 srcpkgs/python3-bitstring/template            |     2 +-
 srcpkgs/python3-bleach/template               |     2 +-
 srcpkgs/python3-blessed/template              |     2 +-
 srcpkgs/python3-blessings/template            |     2 +-
 srcpkgs/python3-blinker/template              |     2 +-
 srcpkgs/python3-bokeh/template                |     4 +-
 srcpkgs/python3-boltons/template              |     2 +-
 srcpkgs/python3-boolean.py/template           |     2 +-
 srcpkgs/python3-boto3/template                |     2 +-
 srcpkgs/python3-botocore/template             |     2 +-
 srcpkgs/python3-bottle/template               |     6 +-
 srcpkgs/python3-bracex/template               |     2 +-
 srcpkgs/python3-breathe/template              |     2 +-
 srcpkgs/python3-bsddb3/template               |     2 +-
 srcpkgs/python3-build/template                |     4 +-
 srcpkgs/python3-cached-property/template      |     2 +-
 srcpkgs/python3-cachetools/template           |     2 +-
 srcpkgs/python3-cairo/template                |     2 +-
 srcpkgs/python3-cairocffi/template            |     2 +-
 srcpkgs/python3-cairosvg/template             |     2 +-
 srcpkgs/python3-calver/template               |     2 +-
 srcpkgs/python3-canonicaljson/template        |     2 +-
 srcpkgs/python3-casttube/template             |     2 +-
 srcpkgs/python3-cattrs/template               |     2 +-
 srcpkgs/python3-cchardet/template             |     2 +-
 srcpkgs/python3-certifi/template              |     2 +-
 srcpkgs/python3-cffi/template                 |     2 +-
 srcpkgs/python3-cfgv/template                 |     2 +-
 srcpkgs/python3-changelogs/template           |    19 +
 srcpkgs/python3-chardet/template              |     2 +-
 srcpkgs/python3-charset-normalizer/template   |     2 +-
 srcpkgs/python3-cheetah3/template             |     2 +-
 srcpkgs/python3-chess/template                |     2 +-
 srcpkgs/python3-chromecast/template           |     2 +-
 srcpkgs/python3-chroot/template               |     2 +-
 srcpkgs/python3-ciso8601/template             |     4 +-
 srcpkgs/python3-cjkwrap/template              |     2 +-
 srcpkgs/python3-cli-ui/template               |     2 +-
 srcpkgs/python3-cli_helpers/template          |     2 +-
 srcpkgs/python3-click-log/template            |     2 +-
 srcpkgs/python3-click-plugins/template        |     2 +-
 srcpkgs/python3-click-repl/template           |     2 +-
 srcpkgs/python3-click-threading/template      |     2 +-
 srcpkgs/python3-click/template                |     2 +-
 srcpkgs/python3-cloudscraper/template         |     2 +-
 srcpkgs/python3-cmdln/template                |     2 +-
 srcpkgs/python3-codespell/template            |     2 +-
 srcpkgs/python3-colorama/template             |     2 +-
 srcpkgs/python3-colorclass/template           |     2 +-
 srcpkgs/python3-colored-traceback/template    |     2 +-
 srcpkgs/python3-colorlog/template             |     2 +-
 srcpkgs/python3-colour/template               |     2 +-
 srcpkgs/python3-comm/template                 |     2 +-
 srcpkgs/python3-commonmark/template           |     2 +-
 srcpkgs/python3-configobj/template            |     2 +-
 srcpkgs/python3-confuse/template              |     2 +-
 srcpkgs/python3-constantly/template           |     2 +-
 srcpkgs/python3-construct/template            |     2 +-
 srcpkgs/python3-contourpy/template            |     2 +-
 srcpkgs/python3-conway-polynomials/template   |     2 +-
 srcpkgs/python3-coverage/template             |     2 +-
 srcpkgs/python3-coveralls/template            |     2 +-
 srcpkgs/python3-cppy/template                 |     6 +-
 srcpkgs/python3-cram/template                 |     2 +-
 srcpkgs/python3-crccheck/template             |     4 +-
 srcpkgs/python3-crcmod/template               |     2 +-
 srcpkgs/python3-cryptography/template         |     4 +-
 srcpkgs/python3-cryptography_vectors/template |     4 +-
 srcpkgs/python3-css-parser/template           |     8 +-
 srcpkgs/python3-cssselect/template            |     2 +-
 srcpkgs/python3-cssselect2/template           |     2 +-
 srcpkgs/python3-cssutils/template             |     2 +-
 srcpkgs/python3-cups/template                 |     2 +-
 srcpkgs/python3-curio/template                |     2 +-
 srcpkgs/python3-curl/template                 |     2 +-
 srcpkgs/python3-curtsies/template             |     2 +-
 srcpkgs/python3-cvxopt/template               |     2 +-
 srcpkgs/python3-cwcwidth/template             |     2 +-
 srcpkgs/python3-cycler/template               |     2 +-
 srcpkgs/python3-cypari2/template              |     2 +-
 srcpkgs/python3-cysignals/template            |     2 +-
 srcpkgs/python3-daemonize/template            |     2 +-
 srcpkgs/python3-dateparser/template           |     2 +-
 srcpkgs/python3-dateutil/template             |     2 +-
 srcpkgs/python3-dbus-next/template            |     2 +-
 srcpkgs/python3-dbus/template                 |     2 +-
 srcpkgs/python3-dbusmock/template             |     2 +-
 srcpkgs/python3-ddt/template                  |     2 +-
 srcpkgs/python3-debian/template               |     2 +-
 srcpkgs/python3-decorator/template            |     2 +-
 srcpkgs/python3-defusedxml/template           |     2 +-
 srcpkgs/python3-deprecated/template           |     6 +-
 srcpkgs/python3-deprecation/template          |     2 +-
 srcpkgs/python3-dill/template                 |     2 +-
 srcpkgs/python3-dirty-equals/template         |     2 +-
 srcpkgs/python3-discid/template               |     2 +-
 srcpkgs/python3-discogs_client/template       |     2 +-
 srcpkgs/python3-distlib/template              |     2 +-
 srcpkgs/python3-distro/template               |     2 +-
 srcpkgs/python3-distutils-extra/template      |     2 +-
 srcpkgs/python3-dkimpy/template               |     2 +-
 srcpkgs/python3-dnspython/template            |     2 +-
 srcpkgs/python3-dnsrecon/template             |     2 +-
 srcpkgs/python3-docker/template               |     2 +-
 srcpkgs/python3-dockerpty/template            |     2 +-
 srcpkgs/python3-docopt/template               |     2 +-
 .../python3-docstring-to-markdown/template    |     2 +-
 srcpkgs/python3-docutils/template             |     2 +-
 srcpkgs/python3-dogpile.cache/template        |     2 +-
 srcpkgs/python3-doi/template                  |     2 +-
 srcpkgs/python3-dominate/template             |     2 +-
 srcpkgs/python3-dotenv/template               |     2 +-
 srcpkgs/python3-dotty-dict/template           |     2 +-
 srcpkgs/python3-dpkt/template                 |     2 +-
 srcpkgs/python3-drgn/template                 |     2 +-
 srcpkgs/python3-dulwich/template              |     2 +-
 srcpkgs/python3-easygui/template              |     2 +-
 srcpkgs/python3-editables/template            |     2 +-
 srcpkgs/python3-editor/template               |     2 +-
 srcpkgs/python3-eduvpn-client/template        |     2 +-
 srcpkgs/python3-efl/template                  |    40 +
 srcpkgs/python3-elementpath/template          |     2 +-
 srcpkgs/python3-email-validator/template      |     2 +-
 srcpkgs/python3-emoji/template                |     2 +-
 srcpkgs/python3-empy/template                 |     2 +-
 srcpkgs/python3-enchant/template              |     2 +-
 srcpkgs/python3-enrich/template               |     2 +-
 srcpkgs/python3-entrypoints/template          |     2 +-
 srcpkgs/python3-envdir/template               |     2 +-
 srcpkgs/python3-enzyme/template               |     2 +-
 srcpkgs/python3-esprima/template              |     2 +-
 srcpkgs/python3-et-xmlfile/template           |     2 +-
 srcpkgs/python3-etebase/template              |     2 +-
 srcpkgs/python3-etesync/template              |     2 +-
 srcpkgs/python3-evdev/template                |     2 +-
 srcpkgs/python3-ewmh/template                 |     2 +-
 srcpkgs/python3-execnet/template              |     2 +-
 srcpkgs/python3-executing/template            |     2 +-
 srcpkgs/python3-exifread/template             |     2 +-
 srcpkgs/python3-fasteners/template            |     2 +-
 srcpkgs/python3-fastjsonschema/template       |     2 +-
 srcpkgs/python3-feedgenerator/template        |     2 +-
 srcpkgs/python3-feedparser/template           |     2 +-
 srcpkgs/python3-ffmpeg-python/template        |     2 +-
 srcpkgs/python3-fido2/template                |     2 +-
 srcpkgs/python3-fields/template               |     2 +-
 srcpkgs/python3-filebytes/template            |     2 +-
 srcpkgs/python3-filelock/template             |     2 +-
 srcpkgs/python3-filetype/template             |     2 +-
 srcpkgs/python3-fishnet/template              |     2 +-
 srcpkgs/python3-flaky/template                |     2 +-
 srcpkgs/python3-flasgger/template             |     2 +-
 srcpkgs/python3-flexmock/template             |     2 +-
 srcpkgs/python3-flit_core-bootstrap/template  |    30 -
 srcpkgs/python3-flit_core/template            |     6 +-
 srcpkgs/python3-fpylll/template               |     2 +-
 srcpkgs/python3-freezegun/template            |     2 +-
 srcpkgs/python3-frozendict/template           |     2 +-
 .../patches/no-expandvars.patch               |    23 -
 srcpkgs/python3-frozenlist/template           |     8 +-
 srcpkgs/python3-furl/template                 |     2 +-
 srcpkgs/python3-fuse/template                 |     2 +-
 srcpkgs/python3-future/template               |     2 +-
 srcpkgs/python3-fuzzyfinder/template          |     2 +-
 srcpkgs/python3-gast/template                 |     2 +-
 srcpkgs/python3-geojson/template              |     2 +-
 srcpkgs/python3-gevent/template               |     2 +-
 .../patches/setup.cfg.patch                   |    25 +
 .../patches/setup.py.patch                    |    25 +
 srcpkgs/python3-gitchangelog/template         |    17 +
 srcpkgs/python3-gitdb/template                |     2 +-
 srcpkgs/python3-gitea-client/template         |     2 +-
 srcpkgs/python3-github3/template              |     2 +-
 srcpkgs/python3-gitlab/template               |     2 +-
 srcpkgs/python3-glad/template                 |     2 +-
 srcpkgs/python3-gmpy2/template                |     2 +-
 srcpkgs/python3-gntp/template                 |     2 +-
 srcpkgs/python3-gnupg/template                |     2 +-
 srcpkgs/python3-gobject/template              |     4 +-
 srcpkgs/python3-google-api-core/template      |     2 +-
 .../python3-google-api-python-client/template |     2 +-
 srcpkgs/python3-google-auth-httplib2/template |     2 +-
 srcpkgs/python3-google-auth-oauthlib/template |     2 +-
 srcpkgs/python3-google-auth/template          |     2 +-
 srcpkgs/python3-google-i18n-address/template  |     2 +-
 .../python3-googleapis-common-protos/template |     2 +-
 srcpkgs/python3-graphviz/template             |     2 +-
 srcpkgs/python3-greenlet/template             |     4 +-
 srcpkgs/python3-grequests/template            |     4 +-
 .../python3-grpcio-tools/patches/cross.patch  |    13 -
 srcpkgs/python3-grpcio-tools/template         |     6 +-
 srcpkgs/python3-grpcio/template               |     8 +-
 srcpkgs/python3-guessit/template              |     2 +-
 srcpkgs/python3-h11/template                  |     2 +-
 srcpkgs/python3-h2/template                   |     2 +-
 srcpkgs/python3-h5py/template                 |     4 +-
 srcpkgs/python3-habanero/template             |     2 +-
 srcpkgs/python3-halo/template                 |     2 +-
 srcpkgs/python3-hawkauthlib/template          |     2 +-
 srcpkgs/python3-hcloud/template               |     2 +-
 srcpkgs/python3-hid/template                  |     4 +-
 srcpkgs/python3-hiredis/template              |     2 +-
 srcpkgs/python3-hjson/template                |     2 +-
 srcpkgs/python3-hkdf/template                 |     2 +-
 srcpkgs/python3-hoedown/template              |     2 +-
 srcpkgs/python3-hpack/template                |     2 +-
 srcpkgs/python3-html2text/template            |     2 +-
 srcpkgs/python3-html5-parser/template         |     2 +-
 srcpkgs/python3-html5lib/template             |     2 +-
 srcpkgs/python3-httmock/template              |     2 +-
 srcpkgs/python3-httpbin/template              |     2 +-
 srcpkgs/python3-httpcore/template             |     2 +-
 srcpkgs/python3-httplib2/template             |     2 +-
 srcpkgs/python3-httpx/template                |     2 +-
 srcpkgs/python3-humanize/template             |     2 +-
 srcpkgs/python3-hypercorn/template            |     2 +-
 srcpkgs/python3-hyperframe/template           |     2 +-
 srcpkgs/python3-hyperlink/template            |     2 +-
 srcpkgs/python3-hypothesis/template           |     4 +-
 srcpkgs/python3-i3ipc/template                |     2 +-
 srcpkgs/python3-icalendar/template            |     2 +-
 srcpkgs/python3-identify/template             |     2 +-
 srcpkgs/python3-idna/template                 |     2 +-
 srcpkgs/python3-ifaddr/template               |     2 +-
 srcpkgs/python3-ijson/template                |     2 +-
 srcpkgs/python3-imageio/template              |     4 +-
 srcpkgs/python3-imagesize/template            |     2 +-
 srcpkgs/python3-imaplib2/template             |     2 +-
 srcpkgs/python3-immutabledict/template        |     2 +-
 srcpkgs/python3-importlib_metadata/template   |     2 +-
 srcpkgs/python3-incremental/template          |     2 +-
 srcpkgs/python3-inflate64/template            |     2 +-
 srcpkgs/python3-inflect/template              |     2 +-
 srcpkgs/python3-influxdb/template             |     2 +-
 srcpkgs/python3-iniconfig/template            |     2 +-
 srcpkgs/python3-injector/template             |     2 +-
 srcpkgs/python3-inotify/template              |     2 +-
 srcpkgs/python3-installer-bootstrap/template  |    41 -
 srcpkgs/python3-installer/template            |     2 +-
 srcpkgs/python3-intervaltree/template         |     2 +-
 srcpkgs/python3-iptools/template              |     2 +-
 srcpkgs/python3-ipyparallel/template          |     4 +-
 srcpkgs/python3-ipython/template              |     4 +-
 srcpkgs/python3-ipython_genutils/template     |     2 +-
 srcpkgs/python3-ipython_ipykernel/template    |     2 +-
 srcpkgs/python3-irc/template                  |     2 +-
 srcpkgs/python3-isbnlib/template              |     2 +-
 srcpkgs/python3-iso8601/template              |     2 +-
 srcpkgs/python3-isodate/template              |     2 +-
 srcpkgs/python3-isort/template                |     2 +-
 srcpkgs/python3-iterable-io/template          |     2 +-
 srcpkgs/python3-itsdangerous/template         |     2 +-
 srcpkgs/python3-itunespy/template             |     2 +-
 srcpkgs/python3-iwlib/template                |     2 +-
 srcpkgs/python3-janus/template                |     2 +-
 srcpkgs/python3-jaraco.classes/template       |     2 +-
 srcpkgs/python3-jaraco.collections/template   |     2 +-
 srcpkgs/python3-jaraco.context/template       |     2 +-
 srcpkgs/python3-jaraco.functools/template     |     2 +-
 srcpkgs/python3-jaraco.logging/template       |     2 +-
 srcpkgs/python3-jaraco.stream/template        |     2 +-
 srcpkgs/python3-jaraco.text/template          |     2 +-
 srcpkgs/python3-jedi/template                 |     2 +-
 srcpkgs/python3-jeepney/template              |     2 +-
 srcpkgs/python3-jellyfish/template            |     6 +-
 srcpkgs/python3-jmespath/template             |     2 +-
 srcpkgs/python3-joblib/template               |     2 +-
 srcpkgs/python3-josepy/template               |     2 +-
 srcpkgs/python3-jq/template                   |     6 +-
 srcpkgs/python3-json-logger/template          |     2 +-
 srcpkgs/python3-json5/template                |     2 +-
 srcpkgs/python3-jsondiff/template             |     4 +-
 srcpkgs/python3-jsonpatch/template            |     2 +-
 srcpkgs/python3-jsonpointer/template          |     2 +-
 srcpkgs/python3-jsonrpclib/template           |     2 +-
 srcpkgs/python3-jsonschema-path/template      |     2 +-
 .../template                                  |     2 +-
 srcpkgs/python3-jsonschema/template           |     2 +-
 srcpkgs/python3-jupyter/template              |     2 +-
 srcpkgs/python3-jupyter_client/template       |     2 +-
 srcpkgs/python3-jupyter_console/template      |     2 +-
 srcpkgs/python3-jupyter_core/template         |     2 +-
 srcpkgs/python3-jupyter_events/template       |     2 +-
 srcpkgs/python3-jupyter_ipywidgets/template   |     2 +-
 srcpkgs/python3-jupyter_nbconvert/template    |     2 +-
 srcpkgs/python3-jupyter_nbformat/template     |     2 +-
 srcpkgs/python3-jupyter_notebook/template     |     2 +-
 srcpkgs/python3-jupyter_packaging/template    |     2 +-
 srcpkgs/python3-jupyter_qtconsole/template    |     2 +-
 srcpkgs/python3-jupyter_server/template       |     2 +-
 .../python3-jupyter_server_terminals/template |     2 +-
 .../template                                  |     2 +-
 srcpkgs/python3-jupyterlab_pygments/template  |     2 +-
 srcpkgs/python3-jupyterlab_server/template    |     2 +-
 srcpkgs/python3-kaitaistruct/template         |     2 +-
 srcpkgs/python3-kaptan/template               |     2 +-
 srcpkgs/python3-keyring/template              |     2 +-
 srcpkgs/python3-keyrings-alt/template         |     2 +-
 srcpkgs/python3-keyutils/template             |     2 +-
 srcpkgs/python3-kitchen/template              |     2 +-
 srcpkgs/python3-kiwisolver/template           |     2 +-
 srcpkgs/python3-lazy-object-proxy/template    |     2 +-
 srcpkgs/python3-lazy_loader/template          |     2 +-
 srcpkgs/python3-ldap/template                 |     2 +-
 srcpkgs/python3-ldap3/template                |     2 +-
 srcpkgs/python3-libarchive-c/template         |     2 +-
 srcpkgs/python3-libevdev/template             |     2 +-
 srcpkgs/python3-libsass/template              |    21 -
 srcpkgs/python3-libtmux/template              |     2 +-
 srcpkgs/python3-libusb1/template              |     2 +-
 srcpkgs/python3-license-expression/template   |     2 +-
 srcpkgs/python3-listparser/template           |     2 +-
 srcpkgs/python3-llfuse/template               |     2 +-
 srcpkgs/python3-log_symbols/template          |     2 +-
 srcpkgs/python3-logbook/template              |    11 +-
 srcpkgs/python3-logfury/template              |     2 +-
 srcpkgs/python3-loguru/template               |     2 +-
 srcpkgs/python3-looseversion/template         |     2 +-
 srcpkgs/python3-lrcalc/template               |     2 +-
 srcpkgs/python3-lsp-jsonrpc/template          |     2 +-
 srcpkgs/python3-lsp-server/template           |     2 +-
 .../patches/cython3-fix-test.patch            |    32 +
 .../python3-lxml/patches/cython3-legacy.patch |    12 +
 .../python3-lxml/patches/libxml-2.10.4.patch  |    17 +
 .../python3-lxml/patches/libxml-2.11.0.patch  |    14 +
 ...sl.patch => tests-fix-encoding-name.patch} |    15 +-
 srcpkgs/python3-lxml/template                 |     8 +-
 srcpkgs/python3-lz4/template                  |     2 +-
 srcpkgs/python3-macaroons/template            |     2 +-
 srcpkgs/python3-macholib/template             |     2 +-
 srcpkgs/python3-magic/template                |     2 +-
 srcpkgs/python3-makefun/template              |     2 +-
 srcpkgs/python3-marisa-trie/template          |     2 +-
 srcpkgs/python3-markdown-it/template          |     2 +-
 srcpkgs/python3-markdown-math/template        |     2 +-
 srcpkgs/python3-markdown2/template            |     2 +-
 srcpkgs/python3-marshmallow/template          |     2 +-
 srcpkgs/python3-matplotlib-inline/template    |     2 +-
 srcpkgs/python3-matplotlib/template           |     4 +-
 srcpkgs/python3-matrix-common/template        |     2 +-
 srcpkgs/python3-matrix-nio/template           |     2 +-
 srcpkgs/python3-mautrix/template              |     2 +-
 srcpkgs/python3-mccabe/template               |     2 +-
 srcpkgs/python3-md2gemini/template            |     2 +-
 srcpkgs/python3-mdit-py-plugins/template      |     2 +-
 srcpkgs/python3-mdurl/template                |     2 +-
 srcpkgs/python3-mechanize/template            |     2 +-
 srcpkgs/python3-mediafile/template            |     2 +-
 srcpkgs/python3-memory_allocator/template     |     2 +-
 srcpkgs/python3-meson-python/template         |     6 +-
 srcpkgs/python3-milc/template                 |     2 +-
 srcpkgs/python3-minidb/template               |     2 +-
 srcpkgs/python3-miniupnpc/template            |     2 +-
 srcpkgs/python3-misaka/template               |     2 +-
 srcpkgs/python3-mistune/template              |     2 +-
 srcpkgs/python3-mistune2/template             |     2 +-
 srcpkgs/python3-mitmproxy_wireguard/template  |     2 +-
 srcpkgs/python3-mock/template                 |     2 +-
 srcpkgs/python3-more-itertools/template       |     2 +-
 srcpkgs/python3-mpd2/template                 |     2 +-
 srcpkgs/python3-mpdnotify/template            |     2 +-
 srcpkgs/python3-mpi4py/template               |     4 +-
 srcpkgs/python3-mpmath/template               |     2 +-
 srcpkgs/python3-mpv/template                  |     2 +-
 srcpkgs/python3-msgpack/template              |     2 +-
 srcpkgs/python3-msoffcrypto-tool/template     |     2 +-
 srcpkgs/python3-mtranslate/template           |     2 +-
 srcpkgs/python3-multidict/template            |     2 +-
 srcpkgs/python3-multivolumefile/template      |     2 +-
 srcpkgs/python3-munkres/template              |     2 +-
 srcpkgs/python3-musicbrainzngs/template       |     2 +-
 srcpkgs/python3-musicpd/template              |     2 +-
 srcpkgs/python3-mutagen/template              |     2 +-
 srcpkgs/python3-mygpoclient/template          |     2 +-
 srcpkgs/python3-mypy/template                 |     2 +-
 srcpkgs/python3-mypy_extensions/template      |     2 +-
 srcpkgs/python3-mysqlclient/template          |     2 +-
 srcpkgs/python3-namedlist/template            |     2 +-
 srcpkgs/python3-nanobind/template             |     4 +-
 srcpkgs/python3-natsort/template              |     2 +-
 .../patches/python3.13.patch                  |    41 -
 srcpkgs/python3-nbclassic/template            |     7 +-
 srcpkgs/python3-nbclient/template             |     2 +-
 srcpkgs/python3-nbxmpp/template               |     2 +-
 srcpkgs/python3-ndg_httpsclient/template      |     2 +-
 srcpkgs/python3-neovim/template               |     2 +-
 srcpkgs/python3-nest_asyncio/template         |     2 +-
 srcpkgs/python3-netaddr/template              |     2 +-
 srcpkgs/python3-netifaces/template            |     2 +-
 srcpkgs/python3-networkx/template             |     2 +-
 srcpkgs/python3-niapy/template                |     2 +-
 srcpkgs/python3-nose-random/template          |    18 +
 srcpkgs/python3-nose/patches/setup.py.patch   |    18 +
 srcpkgs/python3-nose/template                 |    22 +
 srcpkgs/python3-nose2/template                |     2 +-
 srcpkgs/python3-notebook_shim/template        |     2 +-
 srcpkgs/python3-notify2/template              |     2 +-
 srcpkgs/python3-npyscreen/template            |     2 +-
 srcpkgs/python3-ntlm-auth/template            |     2 +-
 srcpkgs/python3-ntplib/template               |     2 +-
 srcpkgs/python3-numexpr/template              |     2 +-
 srcpkgs/python3-numpy-stl/template            |     2 +-
 srcpkgs/python3-numpy/template                |     4 +-
 srcpkgs/python3-nvml/template                 |     2 +-
 srcpkgs/python3-oauth2client/template         |     2 +-
 srcpkgs/python3-oauthlib/template             |     2 +-
 srcpkgs/python3-objgraph/template             |     2 +-
 srcpkgs/python3-occ/template                  |     2 +-
 srcpkgs/python3-olefile/template              |     2 +-
 srcpkgs/python3-oletools/template             |     2 +-
 srcpkgs/python3-omemo-dr/template             |     2 +-
 srcpkgs/python3-opcua/template                |     2 +-
 srcpkgs/python3-openai/template               |     2 +-
 srcpkgs/python3-openapi-core/template         |     2 +-
 .../python3-openapi-schema-validator/template |     2 +-
 .../python3-openapi-spec-validator/template   |     2 +-
 srcpkgs/python3-openpyxl/template             |     2 +-
 srcpkgs/python3-openssl/template              |     2 +-
 srcpkgs/python3-orderedmultidict/template     |     2 +-
 srcpkgs/python3-orjson/template               |     2 +-
 srcpkgs/python3-orocos-kdl/template           |     2 +-
 srcpkgs/python3-outcome/template              |     2 +-
 srcpkgs/python3-overrides/template            |     2 +-
 srcpkgs/python3-owm/template                  |     2 +-
 srcpkgs/python3-owslib/template               |     2 +-
 srcpkgs/python3-packaging-bootstrap/template  |    40 -
 srcpkgs/python3-packaging/template            |     4 +-
 srcpkgs/python3-pafy/template                 |     2 +-
 srcpkgs/python3-paho_mqtt/template            |     2 +-
 srcpkgs/python3-pam/template                  |     2 +-
 srcpkgs/python3-pamqp/template                |     2 +-
 srcpkgs/python3-pandas-msgpack/template       |     2 +-
 srcpkgs/python3-pandas/template               |     2 +-
 srcpkgs/python3-pandocfilters/template        |     2 +-
 srcpkgs/python3-parameterized/template        |     2 +-
 srcpkgs/python3-paramiko/template             |     2 +-
 srcpkgs/python3-parse/template                |     2 +-
 srcpkgs/python3-parsedatetime/template        |     2 +-
 srcpkgs/python3-parsing/template              |     4 +-
 srcpkgs/python3-parso/template                |     2 +-
 srcpkgs/python3-parver/template               |     2 +-
 srcpkgs/python3-passlib/template              |     4 +-
 srcpkgs/python3-path-and-address/template     |     2 +-
 srcpkgs/python3-path/template                 |     2 +-
 srcpkgs/python3-pathable/template             |     2 +-
 srcpkgs/python3-pathlib2/template             |     2 +-
 srcpkgs/python3-pathspec/template             |     2 +-
 srcpkgs/python3-pathtools/template            |     2 +-
 srcpkgs/python3-pathvalidate/template         |     2 +-
 srcpkgs/python3-pbkdf2/template               |     2 +-
 srcpkgs/python3-pbr/template                  |     2 +-
 srcpkgs/python3-pcodedmp/template             |     2 +-
 srcpkgs/python3-pdfminer.six/template         |     2 +-
 srcpkgs/python3-pdfrw/template                |     2 +-
 srcpkgs/python3-pdm-backend/template          |     2 +-
 srcpkgs/python3-peewee/template               |     8 +-
 srcpkgs/python3-pefile/template               |     2 +-
 srcpkgs/python3-pem/template                  |     2 +-
 srcpkgs/python3-pendulum/template             |     2 +-
 srcpkgs/python3-pep440/template               |     2 +-
 srcpkgs/python3-perf/template                 |     2 +-
 srcpkgs/python3-pexpect/template              |     2 +-
 srcpkgs/python3-pgmigrate/template            |     2 +-
 srcpkgs/python3-pgspecial/template            |     2 +-
 srcpkgs/python3-pgzero/template               |     2 +-
 srcpkgs/python3-phonenumbers/template         |     2 +-
 srcpkgs/python3-phx-class-registry/template   |     2 +-
 srcpkgs/python3-picamera/template             |     2 +-
 srcpkgs/python3-pickleshare/template          |     2 +-
 srcpkgs/python3-piexif/template               |     2 +-
 srcpkgs/python3-pikepdf/template              |     2 +-
 srcpkgs/python3-pillow-simd/template          |    15 +-
 srcpkgs/python3-pillow_heif/template          |     2 +-
 srcpkgs/python3-pip/template                  |     4 +-
 srcpkgs/python3-pipenv/template               |     2 +-
 srcpkgs/python3-pipx/template                 |     2 +-
 srcpkgs/python3-pivy/patches/python3.12.patch |    23 +
 srcpkgs/python3-pivy/template                 |    12 +-
 srcpkgs/python3-pkgconfig/template            |     2 +-
 srcpkgs/python3-pkginfo/template              |     2 +-
 srcpkgs/python3-platformdirs/template         |     2 +-
 srcpkgs/python3-plotly/template               |     2 +-
 srcpkgs/python3-plover_stroke/template        |     2 +-
 srcpkgs/python3-pluggy/template               |     2 +-
 srcpkgs/python3-ply/template                  |     2 +-
 srcpkgs/python3-pmw/template                  |     2 +-
 srcpkgs/python3-podcastparser/template        |     2 +-
 srcpkgs/python3-poetry-core/template          |     2 +-
 srcpkgs/python3-polib/template                |     2 +-
 srcpkgs/python3-pooch/template                |     2 +-
 srcpkgs/python3-portend/template              |     2 +-
 srcpkgs/python3-potr/template                 |     2 +-
 srcpkgs/python3-pplpy/template                |     2 +-
 srcpkgs/python3-prctl/template                |     2 +-
 srcpkgs/python3-precis-i18n/template          |     2 +-
 srcpkgs/python3-pretend/template              |     2 +-
 srcpkgs/python3-primecountpy/template         |     2 +-
 srcpkgs/python3-priority/template             |     2 +-
 srcpkgs/python3-process-tests/template        |     2 +-
 srcpkgs/python3-progress/template             |     2 +-
 srcpkgs/python3-progressbar/template          |     2 +-
 srcpkgs/python3-prometheus_client/template    |     2 +-
 srcpkgs/python3-prompt_toolkit/template       |     2 +-
 srcpkgs/python3-proselint/template            |     2 +-
 srcpkgs/python3-psutil/template               |     2 +-
 srcpkgs/python3-psycopg/template              |     2 +-
 srcpkgs/python3-psycopg2/template             |     2 +-
 srcpkgs/python3-ptyprocess/template           |     2 +-
 srcpkgs/python3-publicsuffix2/template        |     2 +-
 srcpkgs/python3-pulsectl-asyncio/template     |     2 +-
 srcpkgs/python3-pulsectl/template             |     2 +-
 srcpkgs/python3-pure-protobuf/template        |     2 +-
 srcpkgs/python3-pure_eval/template            |     2 +-
 srcpkgs/python3-puremagic/template            |     2 +-
 srcpkgs/python3-pwntools/template             |     2 +-
 srcpkgs/python3-py-cpuinfo/template           |     2 +-
 srcpkgs/python3-py/template                   |     2 +-
 srcpkgs/python3-py7zr/template                |     2 +-
 srcpkgs/python3-pyDes/template                |     2 +-
 srcpkgs/python3-pyFFTW/template               |     6 +-
 srcpkgs/python3-pyacoustid/template           |     2 +-
 srcpkgs/python3-pyaes/template                |     2 +-
 srcpkgs/python3-pyasn1-modules/template       |     2 +-
 srcpkgs/python3-pyasn1/template               |     2 +-
 srcpkgs/python3-pyasynchat/template           |     2 +-
 srcpkgs/python3-pyasyncore/template           |     2 +-
 srcpkgs/python3-pybcj/template                |     2 +-
 srcpkgs/python3-pybind11/template             |     2 +-
 srcpkgs/python3-pycares/template              |     2 +-
 srcpkgs/python3-pycdio/template               |     2 +-
 srcpkgs/python3-pychm/template                |     2 +-
 srcpkgs/python3-pyclip/template               |     2 +-
 srcpkgs/python3-pyclipper/template            |     4 +-
 srcpkgs/python3-pycodestyle/template          |     2 +-
 srcpkgs/python3-pycollada/template            |     2 +-
 srcpkgs/python3-pycotap/template              |     2 +-
 srcpkgs/python3-pycountry/template            |     2 +-
 srcpkgs/python3-pycparser/template            |     2 +-
 srcpkgs/python3-pycryptodome/template         |     2 +-
 srcpkgs/python3-pycryptodomex/template        |     2 +-
 srcpkgs/python3-pydantic-core/template        |    19 +-
 srcpkgs/python3-pydantic/template             |     2 +-
 srcpkgs/python3-pydbus/template               |     2 +-
 srcpkgs/python3-pydyf/template                |     2 +-
 srcpkgs/python3-pyelftools/template           |     2 +-
 srcpkgs/python3-pyfavicon/template            |     2 +-
 srcpkgs/python3-pyfiglet/template             |     2 +-
 srcpkgs/python3-pyflakes/template             |     2 +-
 srcpkgs/python3-pyfuse3/template              |     6 +-
 srcpkgs/python3-pygame/template               |    12 +-
 srcpkgs/python3-pygccxml/template             |     2 +-
 srcpkgs/python3-pygdbmi/template              |     2 +-
 srcpkgs/python3-pygit2/template               |     2 +-
 srcpkgs/python3-pyglet/template               |     2 +-
 srcpkgs/python3-pyinfra/template              |     2 +-
 srcpkgs/python3-pykeepass/template            |     2 +-
 srcpkgs/python3-pykka/template                |     2 +-
 srcpkgs/python3-pykwalify/template            |     2 +-
 srcpkgs/python3-pylast/template               |     2 +-
 srcpkgs/python3-pylibgen/template             |     2 +-
 srcpkgs/python3-pylru/template                |     2 +-
 srcpkgs/python3-pymediainfo/template          |     2 +-
 srcpkgs/python3-pynacl/template               |     2 +-
 srcpkgs/python3-pyopencl/template             |     6 +-
 srcpkgs/python3-pyotp/template                |     2 +-
 srcpkgs/python3-pypandoc/template             |     2 +-
 srcpkgs/python3-pypdf/template                |     2 +-
 srcpkgs/python3-pyperclip/template            |     2 +-
 srcpkgs/python3-pypng/template                |     2 +-
 srcpkgs/python3-pyppmd/template               |     2 +-
 srcpkgs/python3-pyproject-api/template        |     2 +-
 srcpkgs/python3-pyproject-hooks/template      |     2 +-
 srcpkgs/python3-pyproject-metadata/template   |     4 +-
 srcpkgs/python3-pyqt5-qsci/template           |     2 +-
 srcpkgs/python3-pyqt6-3d/template             |     2 +-
 srcpkgs/python3-pyqt6-charts/template         |     2 +-
 srcpkgs/python3-pyqt6-networkauth/template    |     2 +-
 srcpkgs/python3-pyqt6-qsci/template           |     2 +-
 srcpkgs/python3-pyqt6-sip/template            |     2 +-
 srcpkgs/python3-pyqt6-webengine/template      |     2 +-
 srcpkgs/python3-pyqt6/template                |     2 +-
 srcpkgs/python3-pyqtgraph/template            |     2 +-
 srcpkgs/python3-pyrfc3339/template            |     2 +-
 srcpkgs/python3-pyrsistent/template           |     2 +-
 srcpkgs/python3-pyscard/template              |     2 +-
 srcpkgs/python3-pyscss/template               |     2 +-
 srcpkgs/python3-pysdl2/template               |     2 +-
 srcpkgs/python3-pyserial/template             |     2 +-
 srcpkgs/python3-pyside6/template              |     2 +-
 srcpkgs/python3-pysigset/template             |     2 +-
 srcpkgs/python3-pysocks/template              |     2 +-
 srcpkgs/python3-pysol_cards/template          |     2 +-
 srcpkgs/python3-pyspnego/template             |     2 +-
 srcpkgs/python3-pysrt/template                |     2 +-
 srcpkgs/python3-pystache/patches/setup.patch  |    27 +
 srcpkgs/python3-pystache/template             |    24 +
 srcpkgs/python3-pytaglib/template             |     2 +-
 srcpkgs/python3-pyte/template                 |     2 +-
 srcpkgs/python3-pytest-aiohttp/template       |     2 +-
 srcpkgs/python3-pytest-asyncio/template       |     2 +-
 srcpkgs/python3-pytest-benchmark/template     |     2 +-
 srcpkgs/python3-pytest-black/template         |     2 +-
 .../python3-pytest-console-scripts/template   |     2 +-
 srcpkgs/python3-pytest-cov/template           |     2 +-
 .../patches/no_setuptools_git.patch           |    11 +
 .../python3-pytest-fixture-config/template    |     6 +-
 srcpkgs/python3-pytest-flake8/template        |     2 +-
 srcpkgs/python3-pytest-forked/template        |     2 +-
 srcpkgs/python3-pytest-httpbin/template       |     2 +-
 srcpkgs/python3-pytest-httpserver/template    |     2 +-
 srcpkgs/python3-pytest-import-check/template  |     2 +-
 srcpkgs/python3-pytest-isort/template         |     2 +-
 srcpkgs/python3-pytest-jupyter/template       |     2 +-
 srcpkgs/python3-pytest-lazy-fixture/template  |     2 +-
 srcpkgs/python3-pytest-localserver/template   |     2 +-
 srcpkgs/python3-pytest-mock/template          |     2 +-
 srcpkgs/python3-pytest-qt/template            |     2 +-
 srcpkgs/python3-pytest-subtests/template      |     6 +-
 srcpkgs/python3-pytest-sugar/template         |     2 +-
 srcpkgs/python3-pytest-timeout/template       |     2 +-
 srcpkgs/python3-pytest-trio/template          |     2 +-
 srcpkgs/python3-pytest-xdist/template         |     2 +-
 srcpkgs/python3-pytest-xvfb/template          |     2 +-
 srcpkgs/python3-pytest/template               |     2 +-
 srcpkgs/python3-python-multipart/template     |     2 +-
 srcpkgs/python3-pythondialog/template         |     2 +-
 srcpkgs/python3-pytools/template              |     8 +-
 srcpkgs/python3-pytz/template                 |     2 +-
 .../python3-pytz_deprecation_shim/template    |     2 +-
 srcpkgs/python3-pytzdata/template             |     2 +-
 srcpkgs/python3-pyudev/template               |     2 +-
 srcpkgs/python3-pywayland/template            |     2 +-
 srcpkgs/python3-pywinrm/template              |     2 +-
 srcpkgs/python3-pywlroots/template            |     2 +-
 srcpkgs/python3-pywt/template                 |     4 +-
 srcpkgs/python3-pyx/template                  |     2 +-
 srcpkgs/python3-pyxattr/template              |     2 +-
 srcpkgs/python3-pyzbar/template               |     2 +-
 srcpkgs/python3-pyzmq/template                |     2 +-
 srcpkgs/python3-pyzstd/template               |     2 +-
 srcpkgs/python3-qrcode/template               |     2 +-
 srcpkgs/python3-qtile-extras/template         |     2 +-
 srcpkgs/python3-quart/template                |     4 +-
 srcpkgs/python3-random2/template              |     2 +-
 srcpkgs/python3-rapidfuzz/template            |     2 +-
 srcpkgs/python3-rarfile/template              |     2 +-
 srcpkgs/python3-raven/template                |     2 +-
 srcpkgs/python3-rdflib/template               |     2 +-
 srcpkgs/python3-re-assert/template            |     2 +-
 srcpkgs/python3-readability-lxml/template     |     2 +-
 srcpkgs/python3-readlike/template             |     2 +-
 srcpkgs/python3-rebulk/template               |     2 +-
 srcpkgs/python3-recommonmark/template         |     2 +-
 srcpkgs/python3-redis/template                |     4 +-
 srcpkgs/python3-reedsolo/template             |     2 +-
 srcpkgs/python3-referencing/template          |     2 +-
 srcpkgs/python3-reflink/template              |     2 +-
 srcpkgs/python3-regex/template                |     2 +-
 srcpkgs/python3-rencode/template              |     2 +-
 srcpkgs/python3-reportlab/template            |     2 +-
 .../template                                  |     2 +-
 srcpkgs/python3-requests-file/template        |     2 +-
 srcpkgs/python3-requests-mock/template        |     2 +-
 srcpkgs/python3-requests-ntlm/template        |     2 +-
 srcpkgs/python3-requests-oauthlib/template    |     2 +-
 srcpkgs/python3-requests-toolbelt/template    |     2 +-
 srcpkgs/python3-requests-unixsocket/template  |     2 +-
 srcpkgs/python3-requests/template             |     2 +-
 srcpkgs/python3-resolvelib/template           |     2 +-
 srcpkgs/python3-responses/template            |     2 +-
 srcpkgs/python3-rfc3339-validator/template    |     2 +-
 srcpkgs/python3-rfc3986-validator/template    |     2 +-
 srcpkgs/python3-rfc3986/template              |     2 +-
 srcpkgs/python3-rfc3987/template              |     2 +-
 srcpkgs/python3-rfc6555/template              |     2 +-
 srcpkgs/python3-rich/template                 |     2 +-
 srcpkgs/python3-ripe-atlas-cousteau/template  |     2 +-
 srcpkgs/python3-ripe-atlas-sagan/template     |     2 +-
 srcpkgs/python3-ropgadget/template            |     2 +-
 srcpkgs/python3-rpds-py/template              |     2 +-
 srcpkgs/python3-rsa/template                  |     2 +-
 srcpkgs/python3-rss2email/template            |     2 +-
 srcpkgs/python3-rst2ansi/template             |     2 +-
 srcpkgs/python3-rtf_tokenize/template         |     2 +-
 srcpkgs/python3-rtree/template                |     2 +-
 srcpkgs/python3-ruamel.yaml.clib/template     |     2 +-
 srcpkgs/python3-ruamel.yaml/template          |     2 +-
 srcpkgs/python3-rx/template                   |     2 +-
 srcpkgs/python3-s-tui/template                |     2 +-
 srcpkgs/python3-s3transfer/template           |     2 +-
 srcpkgs/python3-sabctools/template            |     2 +-
 srcpkgs/python3-saml2/template                |     2 +-
 srcpkgs/python3-scandir/template              |     2 +-
 srcpkgs/python3-scikit-build-core/template    |     2 +-
 srcpkgs/python3-scikit-build/template         |     2 +-
 srcpkgs/python3-scikit-image/template         |     2 +-
 srcpkgs/python3-scikit-learn/template         |     2 +-
 srcpkgs/python3-scipy/template                |     2 +-
 srcpkgs/python3-scour/template                |     2 +-
 srcpkgs/python3-scruffy/template              |     4 +-
 srcpkgs/python3-scrypt/template               |     2 +-
 srcpkgs/python3-seaborn/template              |     2 +-
 srcpkgs/python3-semanticversion/template      |     2 +-
 srcpkgs/python3-semver/template               |     2 +-
 srcpkgs/python3-send2trash/template           |     2 +-
 srcpkgs/python3-sentry/template               |     2 +-
 srcpkgs/python3-serpent/template              |     2 +-
 srcpkgs/python3-service_identity/template     |     2 +-
 srcpkgs/python3-setproctitle/template         |     2 +-
 srcpkgs/python3-setuptools-rust/template      |     2 +-
 srcpkgs/python3-setuptools/template           |     4 +-
 srcpkgs/python3-setuptools_scm/template       |     2 +-
 srcpkgs/python3-sgmllib/template              |     2 +-
 srcpkgs/python3-sh/template                   |     2 +-
 srcpkgs/python3-shapely/template              |     6 +-
 srcpkgs/python3-shellingham/template          |     2 +-
 srcpkgs/python3-shodan/template               |     2 +-
 srcpkgs/python3-shxparser/template            |     2 +-
 srcpkgs/python3-signedjson/template           |     2 +-
 srcpkgs/python3-simber/template               |     2 +-
 srcpkgs/python3-simplebayes/template          |     2 +-
 srcpkgs/python3-simplegeneric/template        |     2 +-
 srcpkgs/python3-simplejson/template           |     2 +-
 srcpkgs/python3-sip-PyQt5/template            |     2 +-
 srcpkgs/python3-six/template                  |     2 +-
 srcpkgs/python3-slixmpp/template              |     2 +-
 srcpkgs/python3-slugify/template              |     2 +-
 srcpkgs/python3-smartypants/template          |     2 +-
 srcpkgs/python3-smbc/template                 |     2 +-
 srcpkgs/python3-smmap/template                |     2 +-
 srcpkgs/python3-snakeoil/template             |     2 +-
 srcpkgs/python3-snappy/template               |     2 +-
 srcpkgs/python3-sniffio/template              |     2 +-
 srcpkgs/python3-snowballstemmer/template      |     2 +-
 srcpkgs/python3-socketIO-client/template      |     2 +-
 srcpkgs/python3-socks/template                |     2 +-
 srcpkgs/python3-socksio/template              |     2 +-
 srcpkgs/python3-sortedcontainers/template     |     2 +-
 srcpkgs/python3-soupsieve/template            |     2 +-
 srcpkgs/python3-spake2/template               |     2 +-
 srcpkgs/python3-sphinx-automodapi/template    |     2 +-
 srcpkgs/python3-sphinx-copybutton/template    |     2 +-
 .../python3-sphinx-markdown-tables/template   |     2 +-
 srcpkgs/python3-sphinx-tabs/template          |     2 +-
 srcpkgs/python3-sphinx_rtd_theme/template     |     2 +-
 .../python3-sphinxcontrib-applehelp/template  |     2 +-
 .../python3-sphinxcontrib-devhelp/template    |     2 +-
 .../python3-sphinxcontrib-htmlhelp/template   |     2 +-
 srcpkgs/python3-sphinxcontrib-jsmath/template |     2 +-
 srcpkgs/python3-sphinxcontrib-qthelp/template |     2 +-
 .../template                                  |     2 +-
 srcpkgs/python3-sphinxcontrib/template        |     2 +-
 srcpkgs/python3-spinners/template             |     2 +-
 srcpkgs/python3-spotipy/template              |     2 +-
 srcpkgs/python3-sqlparse/template             |     2 +-
 srcpkgs/python3-stack_data/template           |     2 +-
 srcpkgs/python3-starlette/template            |     2 +-
 srcpkgs/python3-stem/template                 |     2 +-
 srcpkgs/python3-stevedore/template            |     2 +-
 srcpkgs/python3-straight.plugin/template      |     2 +-
 srcpkgs/python3-strict-rfc3339/template       |     2 +-
 srcpkgs/python3-subprocess-tee/template       |     2 +-
 srcpkgs/python3-subunit/template              |     2 +-
 srcpkgs/python3-suds/template                 |     6 +-
 srcpkgs/python3-svg.path/template             |     2 +-
 srcpkgs/python3-svgelements/template          |     2 +-
 srcpkgs/python3-sympy/template                |     2 +-
 srcpkgs/python3-syndom/template               |     2 +-
 .../python3-tables/patches/numpy-2.0.patch    |   149 +
 srcpkgs/python3-tables/template               |    32 +
 srcpkgs/python3-tabulate/template             |     2 +-
 srcpkgs/python3-tasklib/template              |     2 +-
 srcpkgs/python3-telegram/template             |     2 +-
 srcpkgs/python3-tempita/template              |     3 +-
 srcpkgs/python3-tempora/template              |     2 +-
 srcpkgs/python3-tenacity/template             |     2 +-
 srcpkgs/python3-term-image/template           |     2 +-
 srcpkgs/python3-termcolor/template            |     2 +-
 srcpkgs/python3-terminado/template            |     2 +-
 srcpkgs/python3-terminaltables/template       |     2 +-
 srcpkgs/python3-testpath/template             |     2 +-
 srcpkgs/python3-testtools/template            |     2 +-
 srcpkgs/python3-text-unidecode/template       |     2 +-
 srcpkgs/python3-texttable/template            |     2 +-
 srcpkgs/python3-textual/template              |     2 +-
 srcpkgs/python3-thefuzz/template              |     2 +-
 srcpkgs/python3-threadpoolctl/template        |     2 +-
 srcpkgs/python3-tifffile/template             |     2 +-
 srcpkgs/python3-time-machine/template         |     2 +-
 srcpkgs/python3-tinycss/template              |     2 +-
 srcpkgs/python3-tinycss2/template             |     2 +-
 srcpkgs/python3-tinyhtml5/template            |     2 +-
 .../patches/musl-pgo-tests.patch              |     1 -
 srcpkgs/python3-tkinter/template              |     8 +-
 srcpkgs/python3-tldextract/template           |     2 +-
 srcpkgs/python3-tmuxp/template                |     2 +-
 srcpkgs/python3-tokenize-rt/template          |     2 +-
 srcpkgs/python3-toml/template                 |     2 +-
 srcpkgs/python3-tomli-w/template              |     2 +-
 srcpkgs/python3-tomli/template                |     4 +-
 srcpkgs/python3-tomlkit/template              |     2 +-
 srcpkgs/python3-tornado/template              |     2 +-
 srcpkgs/python3-tqdm/template                 |     2 +-
 srcpkgs/python3-traitlets/template            |     2 +-
 srcpkgs/python3-treq/template                 |     2 +-
 srcpkgs/python3-trimesh/template              |     2 +-
 srcpkgs/python3-trio-websocket/template       |     2 +-
 srcpkgs/python3-trio/template                 |     2 +-
 srcpkgs/python3-trove-classifiers/template    |     2 +-
 srcpkgs/python3-trustme/template              |     2 +-
 srcpkgs/python3-ttystatus/template            |     2 +-
 srcpkgs/python3-tweepy/template               |     2 +-
 srcpkgs/python3-twitter/template              |     2 +-
 srcpkgs/python3-txaio/template                |     2 +-
 srcpkgs/python3-txredisapi/template           |     2 +-
 srcpkgs/python3-txtorcon/template             |     2 +-
 srcpkgs/python3-typed-ast/template            |    19 +
 srcpkgs/python3-typeguard/template            |     2 +-
 srcpkgs/python3-typing_extensions/template    |     4 +-
 srcpkgs/python3-typogrify/template            |     2 +-
 srcpkgs/python3-tzlocal/template              |     2 +-
 srcpkgs/python3-ultrajson/template            |     2 +-
 srcpkgs/python3-unittest-mixins/template      |     2 +-
 srcpkgs/python3-unpaddedbase64/template       |     2 +-
 srcpkgs/python3-urbandict/template            |     2 +-
 srcpkgs/python3-uritemplate/template          |     2 +-
 srcpkgs/python3-uritools/template             |     2 +-
 srcpkgs/python3-urlgrabber/template           |     2 +-
 srcpkgs/python3-urllib3/template              |     2 +-
 srcpkgs/python3-urwid/template                |     2 +-
 srcpkgs/python3-urwid_readline/template       |     2 +-
 srcpkgs/python3-urwidgets/template            |     2 +-
 srcpkgs/python3-urwidtrees/template           |     2 +-
 srcpkgs/python3-usb/template                  |     2 +-
 srcpkgs/python3-userpath/template             |     2 +-
 srcpkgs/python3-utils/template                |     2 +-
 srcpkgs/python3-uvicorn/template              |     2 +-
 srcpkgs/python3-uvloop/template               |     6 +-
 srcpkgs/python3-validators/template           |     2 +-
 srcpkgs/python3-vdf/template                  |     2 +-
 srcpkgs/python3-versioneer/template           |     2 +-
 srcpkgs/python3-versioningit/template         |     2 +-
 srcpkgs/python3-vint/template                 |     2 +-
 srcpkgs/python3-virtualenv-clone/template     |     2 +-
 srcpkgs/python3-virtualenv/template           |     2 +-
 srcpkgs/python3-virustotal-api/template       |     2 +-
 srcpkgs/python3-vispy/template                |     2 +-
 srcpkgs/python3-vlc/template                  |     2 +-
 srcpkgs/python3-vobject/template              |     2 +-
 srcpkgs/python3-voluptuous/template           |     2 +-
 srcpkgs/python3-waitress/template             |     2 +-
 srcpkgs/python3-watchdog/template             |     2 +-
 srcpkgs/python3-watchman/template             |     2 +-
 srcpkgs/python3-wcmatch/template              |     2 +-
 srcpkgs/python3-wcwidth/template              |     2 +-
 srcpkgs/python3-webassets/template            |     2 +-
 srcpkgs/python3-webencodings/template         |     2 +-
 srcpkgs/python3-websocket-client/template     |     2 +-
 srcpkgs/python3-websockets/template           |     4 +-
 srcpkgs/python3-wheel/template                |     4 +-
 srcpkgs/python3-wikipedia/template            |     2 +-
 srcpkgs/python3-wrapt/template                |     2 +-
 srcpkgs/python3-wsproto/template              |     2 +-
 srcpkgs/python3-xapp/template                 |     2 +-
 .../python3-xcffib/patches/fix-build.patch    |    30 -
 srcpkgs/python3-xcffib/template               |     2 +-
 srcpkgs/python3-xdg-base-dirs/template        |     2 +-
 srcpkgs/python3-xdg/template                  |     2 +-
 srcpkgs/python3-xkbcommon/template            |     2 +-
 srcpkgs/python3-xlib/template                 |     2 +-
 srcpkgs/python3-xlrd/template                 |     2 +-
 srcpkgs/python3-xmlschema/template            |     2 +-
 srcpkgs/python3-xmltodict/template            |     2 +-
 srcpkgs/python3-xvfbwrapper/template          |     2 +-
 srcpkgs/python3-xxhash/template               |     2 +-
 srcpkgs/python3-xyzservices/template          |     2 +-
 srcpkgs/python3-yaml/template                 |     2 +-
 srcpkgs/python3-yamllint/template             |     2 +-
 srcpkgs/python3-yapf/template                 |     2 +-
 srcpkgs/python3-yara/template                 |     2 +-
 srcpkgs/python3-yarl/template                 |     2 +-
 srcpkgs/python3-yattag/template               |     2 +-
 srcpkgs/python3-youtube-search/template       |     2 +-
 srcpkgs/python3-youtubesearch/template        |     2 +-
 srcpkgs/python3-ytmusicapi/template           |     2 +-
 srcpkgs/python3-zc.lockfile/template          |     2 +-
 srcpkgs/python3-zeroconf/template             |     2 +-
 srcpkgs/python3-zipfile-deflate64/template    |     2 +-
 srcpkgs/python3-zipp/template                 |     2 +-
 srcpkgs/python3-zipstream-ng/template         |     2 +-
 srcpkgs/python3-zipstream/template            |     2 +-
 .../python3-zope.cachedescriptors/template    |     2 +-
 srcpkgs/python3-zope.component/template       |     2 +-
 srcpkgs/python3-zope.configuration/template   |     2 +-
 srcpkgs/python3-zope.copy/template            |     2 +-
 srcpkgs/python3-zope.deferredimport/template  |     2 +-
 srcpkgs/python3-zope.deprecation/template     |     2 +-
 srcpkgs/python3-zope.event/template           |     2 +-
 srcpkgs/python3-zope.exceptions/template      |     2 +-
 srcpkgs/python3-zope.hookable/template        |     2 +-
 srcpkgs/python3-zope.i18nmessageid/template   |     4 +-
 srcpkgs/python3-zope.interface/template       |     2 +-
 srcpkgs/python3-zope.location/template        |     2 +-
 srcpkgs/python3-zope.proxy/template           |     2 +-
 srcpkgs/python3-zope.schema/template          |     2 +-
 srcpkgs/python3-zope.security/template        |     8 +-
 srcpkgs/python3-zope.testing/template         |     2 +-
 srcpkgs/python3-zope.testrunner/template      |     2 +-
 srcpkgs/python3-zstandard/template            |     2 +-
 srcpkgs/python3-zulip/template                |     2 +-
 srcpkgs/python3-zxcvbn/template               |     2 +-
 srcpkgs/python3/patches/musl-pgo-tests.patch  |    44 -
 srcpkgs/python3/patches/ppc-fixes.patch       |    45 +
 srcpkgs/python3/template                      |    14 +-
 srcpkgs/pythran/patches/gast-0.6.patch        |    76 +
 srcpkgs/pythran/template                      |     6 +-
 srcpkgs/pywal/template                        |     2 +-
 srcpkgs/qgis/template                         |     2 +-
 srcpkgs/qmk/template                          |     2 +-
 srcpkgs/qomui/template                        |     2 +-
 srcpkgs/qtile/template                        |     2 +-
 srcpkgs/quodlibet/template                    |     2 +-
 srcpkgs/qutebrowser/template                  |     2 +-
 srcpkgs/qytdl/template                        |     2 +-
 srcpkgs/radicale/template                     |     2 +-
 srcpkgs/ranger/template                       |     2 +-
 srcpkgs/rdiff-backup/template                 |     2 +-
 srcpkgs/re2c/template                         |     4 +-
 srcpkgs/recoll/patches/musl.patch             |    17 +
 srcpkgs/recoll/template                       |    18 +-
 srcpkgs/rednotebook/template                  |     2 +-
 srcpkgs/redshift/template                     |     2 +-
 srcpkgs/remhind/template                      |     2 +-
 srcpkgs/remmina/template                      |     2 +-
 srcpkgs/removed-packages/template             |     9 -
 srcpkgs/renderdoc/patches/python-3.13.patch   |    11 -
 srcpkgs/renderdoc/template                    |     2 +-
 srcpkgs/reuse/template                        |     2 +-
 srcpkgs/rhythmbox/template                    |     5 +-
 srcpkgs/ripe-atlas-tools/template             |     2 +-
 srcpkgs/river/template                        |     4 +-
 srcpkgs/rmlint/template                       |     2 +-
 srcpkgs/rofi-rbw/template                     |     2 +-
 srcpkgs/rofimoji/template                     |     2 +-
 srcpkgs/root/template                         |     2 +-
 srcpkgs/rpm/template                          |     2 +-
 srcpkgs/rrdtool/template                      |     2 +-
 srcpkgs/rsyslog/files/rsyslog.conf            |     2 +-
 srcpkgs/rsyslog/template                      |     7 +-
 srcpkgs/rtags/template                        |     4 +-
 srcpkgs/rtslib-fb/template                    |     2 +-
 srcpkgs/rubber/template                       |     2 +-
 srcpkgs/ruff/template                         |     2 +-
 srcpkgs/s3cmd/template                        |     2 +-
 srcpkgs/sabnzbd/template                      |     2 +-
 srcpkgs/safeeyes/template                     |     2 +-
 srcpkgs/sagemath/template                     |     2 +-
 srcpkgs/salt/template                         |     2 +-
 srcpkgs/samba/template                        |     2 +-
 srcpkgs/sbcl/template                         |    10 +-
 srcpkgs/sc-controller/template                |     2 +-
 srcpkgs/scapy/template                        |     2 +-
 srcpkgs/scons/template                        |     2 +-
 srcpkgs/screenkey/template                    |     2 +-
 srcpkgs/screenplain/template                  |     2 +-
 srcpkgs/scribus/template                      |     2 +-
 srcpkgs/seafile-libclient/template            |     2 +-
 srcpkgs/setconf/template                      |     2 +-
 srcpkgs/setzer/template                       |     2 +-
 srcpkgs/sigil/template                        |     2 +-
 srcpkgs/sip/template                          |     2 +-
 srcpkgs/sip4/template                         |     2 +-
 srcpkgs/skim/template                         |     4 +-
 srcpkgs/sonata/template                       |     2 +-
 srcpkgs/soundconverter/template               |     2 +-
 srcpkgs/speech-dispatcher/template            |     2 +-
 srcpkgs/speedtest-cli/template                |     2 +-
 srcpkgs/spotify-qt/template                   |     6 +-
 srcpkgs/sqlmap/template                       |     2 +-
 srcpkgs/ssh-audit/template                    |     2 +-
 srcpkgs/sshuttle/template                     |     2 +-
 srcpkgs/sssd/template                         |     2 +-
 srcpkgs/stcgal/template                       |     2 +-
 srcpkgs/stig/template                         |     2 +-
 srcpkgs/streamlink/template                   |     2 +-
 srcpkgs/subliminal/template                   |     2 +-
 srcpkgs/subuser/template                      |     2 +-
 srcpkgs/subversion/template                   |     2 +-
 srcpkgs/sumo/template                         |     2 +-
 srcpkgs/synapse/template                      |     2 +-
 srcpkgs/syncplay/template                     |     2 +-
 srcpkgs/syncthing-gtk/template                |     2 +-
 srcpkgs/system-config-printer/template        |     2 +-
 srcpkgs/talloc/template                       |     2 +-
 srcpkgs/targetcli-fb/template                 |     2 +-
 srcpkgs/tbb/template                          |     2 +-
 srcpkgs/tcpdump/template                      |     4 +-
 srcpkgs/tdb/template                          |     2 +-
 srcpkgs/telegram-tg/template                  |     2 +-
 srcpkgs/telepresence/patches/python3.12.patch |    14 +
 srcpkgs/telepresence/template                 |    26 +-
 srcpkgs/termdown/template                     |     2 +-
 srcpkgs/terminator/template                   |     2 +-
 srcpkgs/termtosvg/template                    |     2 +-
 srcpkgs/terraform/template                    |     4 +-
 srcpkgs/terragrunt/template                   |     4 +-
 srcpkgs/tevent/template                       |     2 +-
 srcpkgs/texworks/template                     |     2 +-
 srcpkgs/tgt/template                          |     4 +-
 srcpkgs/thefuck/template                      |     2 +-
 srcpkgs/thinkpad-scripts/template             |     2 +-
 srcpkgs/timer-cli/template                    |     2 +-
 srcpkgs/tlpui/template                        |     2 +-
 srcpkgs/tlsh/template                         |     2 +-
 srcpkgs/todoman/template                      |     2 +-
 srcpkgs/toot/template                         |     2 +-
 srcpkgs/torbrowser-launcher/template          |     2 +-
 srcpkgs/totem/template                        |     2 +-
 srcpkgs/touchegg/template                     |     6 +-
 srcpkgs/tox/template                          |     2 +-
 srcpkgs/trackma/template                      |     2 +-
 srcpkgs/transifex-cli/template                |     2 +-
 srcpkgs/transset/template                     |     4 +-
 srcpkgs/trash-cli/template                    |     2 +-
 srcpkgs/treeline/template                     |     2 +-
 srcpkgs/tryton/template                       |     2 +-
 srcpkgs/tuimoji/template                      |     2 +-
 srcpkgs/tuir/template                         |     2 +-
 srcpkgs/tuxedo-drivers/template               |     4 +-
 srcpkgs/txt2tags/template                     |     2 +-
 srcpkgs/tzupdate/template                     |     2 +-
 srcpkgs/udiskie/patches/setuptools.patch      |    45 -
 srcpkgs/udiskie/template                      |     4 +-
 srcpkgs/ueberzug/template                     |     2 +-
 srcpkgs/ufw/template                          |     2 +-
 srcpkgs/ulauncher/template                    |     2 +-
 srcpkgs/unicorn/template                      |     2 +-
 srcpkgs/unknown-horizons/template             |     2 +-
 srcpkgs/urh/patches/numpy.patch               |    22 -
 srcpkgs/urh/template                          |    11 +-
 srcpkgs/urlscan/template                      |     2 +-
 srcpkgs/urlwatch/template                     |     2 +-
 srcpkgs/uv/template                           |     2 +-
 srcpkgs/uwsgi/template                        |     2 +-
 srcpkgs/vapoursynth/template                  |     2 +-
 srcpkgs/variety/template                      |     2 +-
 srcpkgs/vaultwarden/template                  |     6 +-
 srcpkgs/vdirsyncer/template                   |     2 +-
 srcpkgs/victoria-logs/template                |     4 +-
 srcpkgs/victoria-metrics/template             |     6 +-
 srcpkgs/vidcutter/patches/mpv-0.35-1.patch    |   387 +
 srcpkgs/vidcutter/patches/mpv-0.35-2.patch    |    24 +
 srcpkgs/vidcutter/template                    |    21 +-
 srcpkgs/vim/template                          |     2 +-
 srcpkgs/vimiv/template                        |     2 +-
 srcpkgs/virt-manager/template                 |     2 +-
 srcpkgs/virtme/template                       |     2 +-
 srcpkgs/virtualenvwrapper/template            |     2 +-
 srcpkgs/visidata/template                     |     2 +-
 srcpkgs/vit/template                          |     2 +-
 srcpkgs/volctl/template                       |     2 +-
 srcpkgs/volk/template                         |     2 +-
 srcpkgs/volta/template                        |     4 +-
 srcpkgs/voltron/template                      |     2 +-
 srcpkgs/volume_key/template                   |     2 +-
 srcpkgs/vpn-slice/template                    |     2 +-
 srcpkgs/vtk/template                          |     2 +-
 srcpkgs/waydroid/template                     |     2 +-
 srcpkgs/weather/template                      |     2 +-
 srcpkgs/weechat/template                      |     2 +-
 srcpkgs/wfuzz/template                        |     2 +-
 srcpkgs/whipper/template                      |     2 +-
 srcpkgs/wicd/template                         |     2 +-
 srcpkgs/wlroots0.18/template                  |     4 +-
 srcpkgs/wpgtk/template                        |     2 +-
 srcpkgs/wxPython/patches/wxsvg-cython.patch   |    12 -
 srcpkgs/wxPython/template                     |     9 +-
 srcpkgs/xapps/template                        |     4 +-
 srcpkgs/xcb-proto/template                    |     2 +-
 srcpkgs/xdg-desktop-portal-xapp/template      |    17 -
 srcpkgs/xdot/template                         |     2 +-
 srcpkgs/xen/template                          |     2 +-
 srcpkgs/xfce4-i3-workspaces-plugin/template   |     3 +-
 srcpkgs/xkcdpass/template                     |     2 +-
 srcpkgs/xml2rfc/template                      |     2 +-
 srcpkgs/xmldiff/template                      |     2 +-
 srcpkgs/xmlto/template                        |    18 +-
 srcpkgs/xonsh/template                        |     2 +-
 srcpkgs/xpra/template                         |     4 +-
 ...8a884c8cf3257ea1f053a82784da078999ed.patch |   192 +
 srcpkgs/xreader/template                      |     8 +-
 srcpkgs/xsnow/template                        |     6 +-
 srcpkgs/xterm/template                        |     6 +-
 srcpkgs/yewtube/template                      |     2 +-
 srcpkgs/you-get/template                      |     2 +-
 srcpkgs/youtube-dl/template                   |     4 +-
 srcpkgs/yq/template                           |     2 +-
 srcpkgs/yt-dlp/template                       |     2 +-
 srcpkgs/ytcc/template                         |     2 +-
 srcpkgs/ytmdl/template                        |     2 +-
 srcpkgs/yubikey-manager/template              |     2 +-
 srcpkgs/z3/template                           |     2 +-
 srcpkgs/zbar/template                         |     2 +-
 srcpkgs/zeek/template                         |     2 +-
 srcpkgs/zeitgeist/template                    |     2 +-
 srcpkgs/zet/patches/fix-rust178.patch         |    23 +
 srcpkgs/zet/template                          |     7 +-
 srcpkgs/zim/template                          |     2 +-
 srcpkgs/zmap/template                         |     6 +-
 srcpkgs/znc/template                          |     2 +-
 srcpkgs/zulip-term/template                   |     2 +-
 xbps-src                                      |     2 +-
 1823 files changed, 138547 insertions(+), 13111 deletions(-)
 delete mode 100644 common/hooks/pre-pkg/04-generate-provides.sh
 delete mode 100644 common/hooks/pre-pkg/06-verify-python-deps.sh
 delete mode 100644 common/scripts/parse-py-metadata.py
 create mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch
 create mode 100644 srcpkgs/avr-gdb/patches/constness.patch
 delete mode 100644 srcpkgs/blender/patches/0002-fix-includes.patch
 create mode 100644 srcpkgs/blender/patches/altivec-all.patch
 create mode 100644 srcpkgs/blender/patches/python-3.12-regex.patch
 delete mode 100644 srcpkgs/blender/patches/python-3.13.patch
 create mode 100644 srcpkgs/blender/patches/python3.12-pylongobject.patch
 delete mode 100644 srcpkgs/brltty/patches/python3-bindings.patch
 delete mode 100644 srcpkgs/canto-curses/patches/python-3.13.patch
 create mode 100644 srcpkgs/cargo-update/files/Cargo.lock
 create mode 100644 srcpkgs/cinnamon-control-center/patches/musl.diff
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
 create mode 100644 srcpkgs/curl/patches/fix-content-encoding.patch
 create mode 100644 srcpkgs/curl/patches/fix-netrc.patch
 create mode 100644 srcpkgs/extension-manager/patches/f3768fb0227c714d7ed0613a28142613aa4a9c6b.patch
 delete mode 100644 srcpkgs/fftw/patches/clock-gettime.patch
 delete mode 100644 srcpkgs/fontforge/patches/l10n.patch
 delete mode 100644 srcpkgs/frr/patches/python-3.13.patch
 delete mode 100644 srcpkgs/kdevelop-python/patches/python-3.13.patch
 create mode 100644 srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
 delete mode 100644 srcpkgs/kodi/patches/no-werror.patch
 delete mode 100644 srcpkgs/kore/patches/python-3.13.patch
 delete mode 100644 srcpkgs/krita/patches/python-3.13.patch
 delete mode 100644 srcpkgs/libcec/patches/python-3.13.patch
 delete mode 100644 srcpkgs/libimobiledevice/patches/00.cython3.patch
 delete mode 100644 srcpkgs/libimobiledevice/patches/01.cython3.patch
 create mode 100644 srcpkgs/linux4.19/files/DocBook/Makefile
 create mode 100644 srcpkgs/linux4.19/files/arm-dotconfig
 create mode 100644 srcpkgs/linux4.19/files/arm64-dotconfig
 create mode 100644 srcpkgs/linux4.19/files/i386-dotconfig
 create mode 100755 srcpkgs/linux4.19/files/mv-debug
 create mode 100644 srcpkgs/linux4.19/files/ppc-dotconfig
 create mode 100644 srcpkgs/linux4.19/files/ppc64-dotconfig
 create mode 100644 srcpkgs/linux4.19/files/ppc64le-dotconfig
 create mode 100644 srcpkgs/linux4.19/files/x86_64-dotconfig
 create mode 100644 srcpkgs/linux4.19/patches/ppc64-be-elfv2.patch
 create mode 100644 srcpkgs/linux4.19/patches/ppcle-broken-vdso.patch
 create mode 100644 srcpkgs/linux4.19/patches/ppcle-enable.patch
 create mode 100644 srcpkgs/linux4.19/patches/ppcle-ll-compat-sys.patch
 create mode 100644 srcpkgs/linux4.19/template
 create mode 100644 srcpkgs/linux6.10/files/arm64-dotconfig
 create mode 100644 srcpkgs/linux6.10/files/i386-dotconfig
 create mode 100755 srcpkgs/linux6.10/files/mv-debug
 create mode 100644 srcpkgs/linux6.10/files/x86_64-dotconfig
 create mode 100644 srcpkgs/linux6.10/patches/fix-musl-btf-ids.patch
 create mode 100644 srcpkgs/linux6.10/patches/fix-musl-objtool.patch
 create mode 100644 srcpkgs/linux6.10/patches/fixdep-largefile.patch
 create mode 100644 srcpkgs/linux6.10/patches/soc-qcom-add-in-kernel-pd-mapper-implementation.patch
 create mode 100644 srcpkgs/linux6.10/template
 create mode 100644 srcpkgs/linux6.11/files/arm64-dotconfig
 create mode 100644 srcpkgs/linux6.11/files/i386-dotconfig
 create mode 100755 srcpkgs/linux6.11/files/mv-debug
 create mode 100644 srcpkgs/linux6.11/files/x86_64-dotconfig
 create mode 100644 srcpkgs/linux6.11/patches/fix-musl-btf-ids.patch
 create mode 100644 srcpkgs/linux6.11/patches/fix-musl-objtool.patch
 create mode 100644 srcpkgs/linux6.11/patches/fixdep-largefile.patch
 create mode 100644 srcpkgs/linux6.11/patches/x13s-camera.patch
 create mode 100644 srcpkgs/linux6.11/template
 delete mode 100644 srcpkgs/med/patches/include-dir.patch
 delete mode 100644 srcpkgs/nodeenv/patches/python-3.13.patch
 delete mode 100644 srcpkgs/pyliblo/patches/cython3.patch
 delete mode 100644 srcpkgs/pyliblo/patches/python-3.11.patch
 create mode 100644 srcpkgs/python3-Cython0.29/template
 create mode 100644 srcpkgs/python3-Cython0.29/update
 delete mode 100644 srcpkgs/python3-SQLAlchemy/update
 delete mode 100644 srcpkgs/python3-SQLAlchemy2/update
 delete mode 100644 srcpkgs/python3-autocommand/patches/license.patch
 create mode 100644 srcpkgs/python3-changelogs/template
 create mode 100644 srcpkgs/python3-efl/template
 delete mode 100644 srcpkgs/python3-flit_core-bootstrap/template
 delete mode 100644 srcpkgs/python3-frozenlist/patches/no-expandvars.patch
 create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
 create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.py.patch
 create mode 100644 srcpkgs/python3-gitchangelog/template
 delete mode 100644 srcpkgs/python3-grpcio-tools/patches/cross.patch
 delete mode 100644 srcpkgs/python3-installer-bootstrap/template
 delete mode 100644 srcpkgs/python3-libsass/template
 create mode 100644 srcpkgs/python3-lxml/patches/cython3-fix-test.patch
 create mode 100644 srcpkgs/python3-lxml/patches/cython3-legacy.patch
 create mode 100644 srcpkgs/python3-lxml/patches/libxml-2.10.4.patch
 create mode 100644 srcpkgs/python3-lxml/patches/libxml-2.11.0.patch
 rename srcpkgs/python3-lxml/patches/{fix-encoding-tests-musl.patch => tests-fix-encoding-name.patch} (54%)
 delete mode 100644 srcpkgs/python3-nbclassic/patches/python3.13.patch
 create mode 100644 srcpkgs/python3-nose-random/template
 create mode 100644 srcpkgs/python3-nose/patches/setup.py.patch
 create mode 100644 srcpkgs/python3-nose/template
 delete mode 100644 srcpkgs/python3-packaging-bootstrap/template
 create mode 100644 srcpkgs/python3-pivy/patches/python3.12.patch
 create mode 100644 srcpkgs/python3-pystache/patches/setup.patch
 create mode 100644 srcpkgs/python3-pystache/template
 create mode 100644 srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
 create mode 100644 srcpkgs/python3-tables/patches/numpy-2.0.patch
 create mode 100644 srcpkgs/python3-tables/template
 delete mode 120000 srcpkgs/python3-tkinter/patches/musl-pgo-tests.patch
 create mode 100644 srcpkgs/python3-typed-ast/template
 delete mode 100644 srcpkgs/python3-xcffib/patches/fix-build.patch
 delete mode 100644 srcpkgs/python3/patches/musl-pgo-tests.patch
 create mode 100644 srcpkgs/python3/patches/ppc-fixes.patch
 create mode 100644 srcpkgs/pythran/patches/gast-0.6.patch
 delete mode 100644 srcpkgs/renderdoc/patches/python-3.13.patch
 create mode 100644 srcpkgs/telepresence/patches/python3.12.patch
 delete mode 100644 srcpkgs/udiskie/patches/setuptools.patch
 delete mode 100644 srcpkgs/urh/patches/numpy.patch
 create mode 100644 srcpkgs/vidcutter/patches/mpv-0.35-1.patch
 create mode 100644 srcpkgs/vidcutter/patches/mpv-0.35-2.patch
 delete mode 100644 srcpkgs/wxPython/patches/wxsvg-cython.patch
 delete mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
 create mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
 create mode 100644 srcpkgs/zet/patches/fix-rust178.patch

diff --git a/Manual.md b/Manual.md
index 9d1fabe07d8a18..c39509f5c7f61b 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1639,13 +1639,6 @@ written in Python) or just single Python file ones that live in `/usr/bin`.
 If `python_version` is set to `ignore`, python-containing shebangs will not be rewritten.
 Use this only if a package should not be using a system version of python.
 
-- `python_extras`: Python module extras to consider when verifying Python module dependencies.
-Can be used to ensure additional dependency sets are checked. Example: `python_extras="all"`.
-
-- `nopyprovides`: if set, don't create `provides` entries for Python modules in the package.
-
-- `nopyverifydeps`: if set, don't verify Python module dependencies.
-
 Also, a set of useful variables are defined to use in the templates:
 
 | Variable    | Value                            |
diff --git a/common/build-helper/meson.sh b/common/build-helper/meson.sh
index 51901e893d0440..02fb515f2bea6f 100644
--- a/common/build-helper/meson.sh
+++ b/common/build-helper/meson.sh
@@ -47,7 +47,7 @@ esac
 # Tell meson to run binaries with qemu if desired
 _MESON_EXE_WRAPPER=""
 if [[ "${build_helper}" = *qemu* ]]; then
-	_MESON_EXE_WRAPPER="exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}'"
+	_MESON_EXE_WRAPPER="exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'"
 fi
 
 # Record cross-compiling information in cross file.
diff --git a/common/build-helper/python3.sh b/common/build-helper/python3.sh
index 1a38f32d1d80bb..4707599ef0e068 100644
--- a/common/build-helper/python3.sh
+++ b/common/build-helper/python3.sh
@@ -2,10 +2,8 @@
 if [ -n "$CROSS_BUILD" ]; then
 	export PYPREFIX="$XBPS_CROSS_BASE"
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
-	export CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
 	export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"
 	export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
-	export CXX="${XBPS_CROSS_TRIPLET}-g++ -pthread $CXXFLAGS $LDFLAGS"
 	export LDSHARED="${CC} -shared $LDFLAGS"
 	export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
 	export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}"
diff --git a/common/environment/build-style/python3-module.sh b/common/environment/build-style/python3-module.sh
index 8ab040aaf58a68..638f6be9373a47 100644
--- a/common/environment/build-style/python3-module.sh
+++ b/common/environment/build-style/python3-module.sh
@@ -1,6 +1,3 @@
 lib32disabled=yes
-if [ -z "$nopyprovides" ] || [ -z "$noverifypydeps" ]; then
-	hostmakedepends+=" python3-packaging-bootstrap"
-fi
 makedepends+=" python3"
 build_helper+=" python3"
diff --git a/common/environment/build-style/python3-pep517.sh b/common/environment/build-style/python3-pep517.sh
index b56773720aee72..f4faf980f5080d 100644
--- a/common/environment/build-style/python3-pep517.sh
+++ b/common/environment/build-style/python3-pep517.sh
@@ -1,6 +1,3 @@
-lib32disabled=yes
 hostmakedepends+=" python3-build python3-installer"
-if [ -z "$nopyprovides" ] || [ -z "$noverifypydeps" ]; then
-	hostmakedepends+=" python3-packaging-bootstrap"
-fi
+lib32disabled=yes
 build_helper+=" python3"
diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh
index 379ade740faca5..6edab5d882e114 100644
--- a/common/environment/setup-subpkg/subpkg.sh
+++ b/common/environment/setup-subpkg/subpkg.sh
@@ -11,9 +11,6 @@ unset -v nostrip nostrip_files
 # hooks/post-install/14-fix-permissions
 unset -v nocheckperms nofixperms
 
-# hooks/pre-pkg/04-generate-provides
-unset -v nopyprovides
-
 # hooks/pre-pkg/04-generate-runtime-deps
 unset -v noverifyrdeps skiprdeps allow_unknown_shlibs shlib_requires
 
@@ -23,9 +20,6 @@ unset -v lib32depends lib32disabled lib32files lib32mode lib32symlinks
 # hooks/pre-pkg/06-shlib-provides
 unset -v noshlibprovides shlib_provides
 
-# hooks/pre-pkg/06-verify-python-deps
-unset -v noverifypydeps python_extras
-
 # xbps-triggers: system-accounts
 unset -v system_accounts system_groups
 
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index 75b3399c109e30..ab5c47d52847b1 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"
 
-py3_ver="3.13"
+py3_ver="3.12"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"
diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index 06ff08b903be1f..e61f0532bd71f6 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -1,7 +1,7 @@
 # This hook generates a XBPS binary package from an installed package in destdir.
 
 genpkg() {
-	local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5" suffix="${6:-}"
+	local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5"
 	local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts
 	local _replaces _reverts _mutable_files _conf_files f
 	local _pkglock="$pkgdir/${binpkg}.lock"
@@ -34,23 +34,21 @@ genpkg() {
 	cd $pkgdir
 
 	_preserve=${preserve:+-p}
-	if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-rdeps ]; then
-		_deps="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-rdeps)"
+	if [ -s ${PKGDESTDIR}/rdeps ]; then
+		_deps="$(<${PKGDESTDIR}/rdeps)"
 	fi
-	if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-provides ]; then
-		_shprovides="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-provides)"
+	if [ -s ${PKGDESTDIR}/shlib-provides ]; then
+		_shprovides="$(<${PKGDESTDIR}/shlib-provides)"
 	fi
-	if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-provides ]; then
-		_provides="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-provides)"
-	fi
-	if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-requires ]; then
-		_shrequires="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-requires)"
+	if [ -s ${PKGDESTDIR}/shlib-requires ]; then
+		_shrequires="$(<${PKGDESTDIR}/shlib-requires)"
 	fi
 	if [ -s ${XBPS_STATEDIR}/gitrev ]; then
 		_gitrevs="$(<${XBPS_STATEDIR}/gitrev)"
 	fi
 
 	# Stripping whitespaces
+	local _provides="$(echo $provides)"
 	local _conflicts="$(echo $conflicts)"
 	local _replaces="$(echo $replaces)"
 	local _reverts="$(echo $reverts)"
@@ -144,7 +142,7 @@ hook() {
 		_desc="${short_desc} (debug files)"
 		binpkg=${_pkgver}.${arch}.xbps
 		PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}"
-		genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg} -dbg
+		genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg}
 	fi
 	# Generate 32bit pkg.
 	if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
@@ -163,6 +161,6 @@ hook() {
 		PKGDESTDIR="${XBPS_DESTDIR}/${pkgname}-32bit-${version}"
 		[ -n "${_provides}" ] && export provides="${_provides}"
 		[ -n "${_replaces}" ] && export replaces="${_replaces}"
-		genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg} -32bit
+		genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg}
 	fi
 }
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index cf7868b1067360..70152bad55f4fc 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -274,7 +274,7 @@ _EOF
 	if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
 		pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]\+$')"
 		if [ -z "${pycompile_module}" ]; then
-			pycompile_module="$(find ${PKGDESTDIR}/usr/lib/python*/site-packages* -mindepth 1 -maxdepth 1 '!' -name '*.egg-info' '!' -name '*.dist-info' '!' -name '*.so' '!' -name '*.pth' -printf '%f ')"
+			pycompile_module="$(find ${PKGDESTDIR}/usr/lib/python*/site-packages -mindepth 1 -maxdepth 1 '!' -name '*.egg-info' '!' -name '*.dist-info' '!' -name '*.so' '!' -name '*.pth' -printf '%f ')"
 		fi
 	fi
 
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index ebe3166f09c039..b6bd52320dc8d1 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -51,7 +51,7 @@ create_debug_pkg() {
 		msg_red "$pkgver: failed to create debug pkg\n"
 		return 1
 	fi
-	printf "${pkgver} " >> ${XBPS_STATEDIR}/${pkgname}-dbg-rdeps
+	printf "${pkgver} " >> ${_destdir}/rdeps
 	rmdir --ignore-fail-on-non-empty "${PKGDESTDIR}/usr/lib" 2>/dev/null
 	return 0
 }
diff --git a/common/hooks/post-install/98-shlib-provides.sh b/common/hooks/post-install/98-shlib-provides.sh
index 47e0e3bd3cedc3..a2ccff794b2e66 100644
--- a/common/hooks/post-install/98-shlib-provides.sh
+++ b/common/hooks/post-install/98-shlib-provides.sh
@@ -6,8 +6,7 @@ collect_sonames() {
 	local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
 	local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$"
 	local _tmpfile=$(mktemp) || exit 1
-	local _mainpkg="${2:-}"
-	local _suffix="${3:-}"
+	local _mainpkg="$2"
 	local _shlib_dir="${XBPS_STATEDIR}/shlib-provides"
 	local _no_soname=$(mktemp) || exit 1
 
@@ -51,8 +50,8 @@ collect_sonames() {
 		echo "$f" >> ${_tmpfile}
 	done
 	if [ -s "${_tmpfile}" ]; then
-		tr '\n' ' ' < "${_tmpfile}" > "${XBPS_STATEDIR}/${pkgname}${_suffix}-shlib-provides"
-		echo >> "${XBPS_STATEDIR}/${pkgname}${_suffix}-shlib-provides"
+		tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
+		echo >> ${_destdir}/shlib-provides
 		if [ "$_mainpkg" ]; then
 			cp "${_tmpfile}" "${_shlib_dir}/${pkgname}.soname"
 		fi
@@ -85,5 +84,5 @@ hook() {
 	# native pkg
 	collect_sonames ${PKGDESTDIR} $_mainpkg
 	# 32bit pkg
-	collect_sonames ${_destdir32} "" -32bit
+	collect_sonames ${_destdir32}
 }
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 3d5d6c2ab3b8f3..02f3965be7effb 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -251,7 +251,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.13
+	python_wrapper python3-config 3.12
 	apr_apu_wrapper apu-1-config
 	qemu_wrapper llvm-config
 }
diff --git a/common/hooks/pre-pkg/04-generate-provides.sh b/common/hooks/pre-pkg/04-generate-provides.sh
deleted file mode 100644
index f9c1a68e134c78..00000000000000
--- a/common/hooks/pre-pkg/04-generate-provides.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# vim: set ts=4 sw=4 et:
-#
-# This hook executes the following tasks:
-#	- Generates provides file with provides entries for xbps-create(1)
-
-generate_python_provides() {
-    local py3_bin="${XBPS_MASTERDIR}/usr/bin/python3"
-
-    if [ -z "$nopyprovides" ] && [ -d "${PKGDESTDIR}/${py3_sitelib}" ] && [ -x "${py3_bin}" ]; then
-        PYTHONPATH="${XBPS_MASTERDIR}/${py3_sitelib}-bootstrap" "${py3_bin}" \
-            "${XBPS_COMMONDIR}"/scripts/parse-py-metadata.py \
-            -S "${PKGDESTDIR}/${py3_sitelib}" -v "${pkgver}" provides
-    fi
-}
-
-hook() {
-    local -a _provides=()
-
-    # include explicit values from the template
-    read -r -a _provides <<< "$provides"
-
-    # get the canonical python package names for each python module
-    mapfile -t _provides -O "${#_provides[@]}" < <( generate_python_provides )
-
-    if [ "${#_provides[@]}" -gt 0 ]; then
-        echo "   ${_provides[*]}"
-        echo "${_provides[*]}" > "${XBPS_STATEDIR}/${pkgname}-provides"
-    fi
-}
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 658257b19483c2..78c4be2e63d51b 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -41,7 +41,7 @@ store_pkgdestdir_rundeps() {
                     _curdep="${_curdep}>=0"
                 fi
                 printf "%s " "${_curdep}"
-            done > "${XBPS_STATEDIR}/${pkgname}-rdeps"
+            done > "${PKGDESTDIR}/rdeps"
         fi
 }
 
@@ -149,6 +149,6 @@ hook() {
     store_pkgdestdir_rundeps
 
     if [ -n "${sorequires}" ]; then
-        echo "${sorequires}" | xargs -n1 | sort | xargs > ${XBPS_STATEDIR}/${pkgname}-shlib-requires
+        echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi
 }
diff --git a/common/hooks/pre-pkg/05-generate-32bit-runtime-deps.sh b/common/hooks/pre-pkg/05-generate-32bit-runtime-deps.sh
index a2c79d34770866..3685f762315b0c 100644
--- a/common/hooks/pre-pkg/05-generate-32bit-runtime-deps.sh
+++ b/common/hooks/pre-pkg/05-generate-32bit-runtime-deps.sh
@@ -19,13 +19,13 @@ hook() {
 	# 32bit dependencies.
 	trap - ERR
 
-	: > ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+	: > ${destdir32}/rdeps
 
-	if [ -s "${XBPS_STATEDIR}/${pkgname}-rdeps" ]; then
+	if [ -s "$PKGDESTDIR/rdeps" ]; then
 		if [ -n "$lib32depends" ]; then
 			_deps="${lib32depends}"
 		else
-			_deps="$(<${XBPS_STATEDIR}/${pkgname}-rdeps)"
+			_deps="$(<${PKGDESTDIR}/rdeps)"
 		fi
 		for f in ${_deps}; do
 			unset found pkgn pkgv _shprovides
@@ -43,7 +43,7 @@ hook() {
 			# If dependency is a development pkg switch it to 32bit.
 			if [[ $pkgn == *-devel ]]; then
 				echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (development)"
-				printf "${pkgn}-32bit${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+				printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				continue
 			fi
 			# If dependency does not have "shlib-provides" do not
@@ -60,20 +60,20 @@ hook() {
 				_shprovides="$($XBPS_QUERY_CMD -R --property=shlib-provides "$pkgn")"
 				if [ -n "${_shprovides}" ]; then
 					echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (shlib-provides)"
-					printf "${pkgn}-32bit${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+					printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				else
 					echo "   RDEP: $f -> ${pkgn}${pkgv} (no shlib-provides)"
-					printf "${pkgn}${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+					printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
 				fi
 			else
-				if [ -s "${XBPS_STATEDIR}/${pkgn}-shlib-provides" ]; then
+				if [ -s ${XBPS_DESTDIR}/${pkgn}-${version}/shlib-provides ]; then
 					# Dependency is a subpkg; check if it provides any shlib
 					# and convert to 32bit if true.
 					echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (subpkg, shlib-provides)"
-					printf "${pkgn}-32bit${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+					printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				else
 					echo "   RDEP: $f -> ${pkgn}${pkgv} (subpkg, no shlib-provides)"
-					printf "${pkgn}${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+					printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
 				fi
 			fi
 		done
@@ -81,7 +81,7 @@ hook() {
 	# If it's a development pkg add a dependency to the 64bit pkg.
 	if [[ $pkgn == *-devel ]]; then
 		echo "   RDEP: ${pkgver}"
-		printf "${pkgver} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+		printf "${pkgver} " >> ${destdir32}/rdeps
 	fi
-	printf "\n" >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
+	printf "\n" >> ${destdir32}/rdeps
 }
diff --git a/common/hooks/pre-pkg/06-verify-python-deps.sh b/common/hooks/pre-pkg/06-verify-python-deps.sh
deleted file mode 100644
index a47e5bbbf107d3..00000000000000
--- a/common/hooks/pre-pkg/06-verify-python-deps.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim: set ts=4 sw=4 et:
-#
-# This hook executes the following tasks:
-#	- Verifies python module dependencies from dist-info's METADATA and egg-info's PKG-INFO
-
-hook() {
-    local py3_bin="${XBPS_MASTERDIR}/usr/bin/python3"
-
-    if [ -z "$nopyprovides" ] && [ -d "${PKGDESTDIR}/${py3_sitelib}" ] && [ -x "${py3_bin}" ]; then
-            PYTHONPATH="${XBPS_MASTERDIR}/${py3_sitelib}-bootstrap" "${py3_bin}" \
-                "${XBPS_COMMONDIR}"/scripts/parse-py-metadata.py \
-                ${NOCOLORS:+-C} ${XBPS_STRICT:+-s} -S "${PKGDESTDIR}/${py3_sitelib}" -v "${pkgver}" \
-                depends -e "${python_extras}" \
-                -V <( $XBPS_QUERY_XCMD -R -p provides -s "py3:" ) -D "${XBPS_STATEDIR}/${pkgname}-rdeps" \
-                || msg_error "$pkgver: failed to verify python module dependencies\n"
-    fi
-}
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 2922c1a36f526a..90cb07da3f4aff 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -170,11 +170,11 @@ hook() {
 	fi
 
 	# Check for missing shlibs and SONAME bumps.
-	if [ ! -s "${XBPS_STATEDIR}/${pkgname}-shlib-provides" ]; then
+	if [ ! -s "${PKGDESTDIR}/shlib-provides" ]; then
 		return 0
 	fi
 
-	for filename in $(<"${XBPS_STATEDIR}/${pkgname}-shlib-provides"); do
+	for filename in $(<${PKGDESTDIR}/shlib-provides); do
 		rev=${filename#*.so.}
 		libname=${filename%.so*}
 		_shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
diff --git a/common/hooks/pre-pkg/999-collected-rdeps.sh b/common/hooks/pre-pkg/999-collected-rdeps.sh
index e22b0c5c0f5cdb..67f4a6261e8ab6 100644
--- a/common/hooks/pre-pkg/999-collected-rdeps.sh
+++ b/common/hooks/pre-pkg/999-collected-rdeps.sh
@@ -1,7 +1,7 @@
 # This hook displays resolved dependencies for a pkg.
 
 hook() {
-	if [ -e "${XBPS_STATEDIR}/${pkgname}-rdeps" ]; then
-		echo "   $(cat "${XBPS_STATEDIR}/${pkgname}-rdeps")"
+	if [ -e $PKGDESTDIR/rdeps ]; then
+		echo "   $(cat $PKGDESTDIR/rdeps)"
 	fi
 }
diff --git a/common/scripts/parse-py-metadata.py b/common/scripts/parse-py-metadata.py
deleted file mode 100644
index 150d476a4ceccc..00000000000000
--- a/common/scripts/parse-py-metadata.py
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/python3
-
-# vim: set ts=4 sw=4 et:
-"""
-Usage:
-
-./parse-py-metadata.py -S "$DESTDIR/$py3_sitelib" provides -v "$version"
-
-    extract the names of top-level packages from:
-      - $DESTDIR/$py3_sitelib/*.dist-info/METADATA
-      - $DESTDIR/$py3_sitelib/*.egg-info/PKG-INFO
-
-./parse-py-metadata.py -S "$DESTDIR/$py3_sitelib" [-s] [-C] depends -e "extra1 extra2 ..."
-    -D "$XBPS_STATEDIR/$pkgname-rdeps" -V <( xbps-query -R -p provides -s "py3:" )
-
-    check that the dependencies of a package match what's listed in the python
-    package metadata, using the virtual package provides entries generated by
-    `parse-py-metadata.py provides`.
-
-This script requires python3-packaging-bootstrap to be installed in the chroot
-to run (which should be taken care of by the python3-module and python3-pep517
-build styles).
-"""
-
-import argparse
-from pathlib import Path
-from sys import stderr
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from packaging.metadata import Metadata
-    from packaging.requirements import Requirement
-    from packaging.utils import canonicalize_name
-
-
-def msg_err(msg: str, *, nocolor: bool = False, strict: bool = False):
-    if nocolor:
-        print(msg, flush=True)
-    else:
-        color = "31" if strict else "33"
-        print(f"\033[1m\033[{color}m{msg}\033[m", file=stderr, flush=True)
-
-
-def vpkgname(val: "str | Requirement", *, version: str | None = None) -> str:
-    sfx = ""
-    if version is not None:
-        sfx = f"-{version}"
-    if isinstance(val, Requirement):
-        name = val.name
-    else:
-        name = val
-    return f"py3:{canonicalize_name(name)}{sfx}"
-
-
-def getpkgname(pkgver: str) -> str:
-    return pkgver.rpartition("-")[0]
-
-
-def getpkgversion(pkgver: str) -> str:
-    return pkgver.rpartition("-")[2]
-
-
-def getpkgdepname(pkgdep: str) -> str:
-    if "<" in pkgdep:
-        return pkgdep.partition("<")[0]
-    elif ">" in pkgdep:
-        return pkgdep.partition(">")[0]
-    else:
-        return pkgdep.rpartition("-")[0]
-
-
-def match_markers(req: "Requirement", extras: set[str]) -> bool:
-    # unconditional requirement
-    if req.marker is None:
-        return True
-
-    # check the requirement for each extra we want and without any extras
-    if extras:
-        return req.marker.evaluate() and any(req.marker.evaluate({"extra": e}) for e in extras)
-
-    return req.marker.evaluate()
-
-
-def find_metadata_files(sitepkgs: Path) -> list[Path]:
-    metafiles = list(sitepkgs.glob("*.dist-info/METADATA"))
-    metafiles.extend(sitepkgs.glob("*.egg-info/PKG-INFO"))
-    return metafiles
-
-
-def parse_provides(args):
-    out = set()
-
-    for metafile in find_metadata_files(args.sitepkgs):
-        with metafile.open() as f:
-            raw = f.read()
-
-        meta = Metadata.from_email(raw, validate=False)
-
-        out.add(vpkgname(meta.name, version=getpkgversion(args.pkgver)))
-        if meta.provides_dist is not None:
-            out.update(map(lambda n: vpkgname(n, version=getpkgversion(args.pkgver)), meta.provides_dist))
-        # deprecated but may be used
-        if meta.provides is not None:
-            out.update(map(lambda n: vpkgname(n, version=getpkgversion(args.pkgver)), meta.provides))
-
-        print("\n".join(out), flush=True)
-
-
-def parse_depends(args):
-    depends = dict()
-    vpkgs = dict()
-    extras = set(args.extras.split())
-
-    with args.vpkgs.open() as f:
-        for ln in f.readlines():
-            if not ln.strip():
-                continue
-            pkgver, _, rest = ln.partition(":")
-            vpkgvers, _, _ = rest.strip().partition("(")
-            pkg = getpkgname(pkgver)
-            vpkg = map(getpkgname, vpkgvers.split())
-            for v in vpkg:
-                vpkgs[v] = pkg
-
-    if args.rdeps.exists():
-        with args.rdeps.open() as f:
-            rdeps = list(map(getpkgdepname, f.read().split()))
-    else:
-        rdeps = []
-
-    for metafile in find_metadata_files(args.sitepkgs):
-        with metafile.open() as f:
-            raw = f.read()
-
-        meta = Metadata.from_email(raw, validate=False)
-
-        if meta.requires_dist is not None:
-            depends.update(map(lambda p: (vpkgname(p), None),
-                               filter(lambda r: match_markers(r, extras), meta.requires_dist)))
-        # deprecated but may be used
-        if meta.requires is not None:
-            depends.update(map(lambda p: (vpkgname(p), None), meta.requires))
-
-    err = False
-    unknown = False
-    missing = []
-    for k in depends.keys():
-        if k in vpkgs.keys():
-            pkgname = vpkgs[k]
-            if pkgname in rdeps:
-                print(f"   PYTHON: {k} <-> {pkgname}", flush=True)
-            else:
-                msg_err(f"   PYTHON: {k} <-> {pkgname} NOT IN depends PLEASE FIX!",
-                        nocolor=args.nocolor, strict=args.strict)
-                missing.append(pkgname)
-                err = True
-        else:
-            msg_err(f"   PYTHON: {k} <-> UNKNOWN PKG PLEASE FIX!",
-                    nocolor=args.nocolor, strict=args.strict)
-            unknown = True
-            err = True
-
-    if missing or unknown:
-        msg_err(f"=> {args.pkgver}: missing dependencies detected!",
-                nocolor=args.nocolor, strict=args.strict)
-    if missing:
-        msg_err(f"=> {args.pkgver}: please add these packages to depends: {' '.join(sorted(missing))}",
-                nocolor=args.nocolor, strict=args.strict)
-
-    if err and args.strict:
-        exit(1)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-S", dest="sitepkgs", type=Path)
-    parser.add_argument("-v", dest="pkgver")
-    parser.add_argument("-s", dest="strict", action="store_true")
-    parser.add_argument("-C", dest="nocolor", action="store_true")
-    subparsers = parser.add_subparsers()
-
-    prov_parser = subparsers.add_parser("provides")
-    prov_parser.set_defaults(func=parse_provides)
-
-    deps_parser = subparsers.add_parser("depends")
-    deps_parser.add_argument("-e", dest="extras", default="")
-    deps_parser.add_argument("-V", dest="vpkgs", type=Path)
-    deps_parser.add_argument("-D", dest="rdeps", type=Path)
-    deps_parser.set_defaults(func=parse_depends)
-
-    args = parser.parse_args()
-
-    try:
-        from packaging.metadata import Metadata
-        from packaging.requirements import Requirement
-        from packaging.utils import canonicalize_name
-    except ImportError:
-        msg_err(f"=> WARNING: {args.pkgver}: missing packaging module!\n"
-                f"=> WARNING: {args.pkgver}: please add python3-packaging-bootstrap to hostmakedepends to run this check",
-                nocolor=args.nocolor)
-        exit(0)
-
-    args.func(args)
diff --git a/common/shlibs b/common/shlibs
index e2742f96a693e0..5e8f45495580ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -673,8 +673,8 @@ libboost_stacktrace_noop.so.1.83.0 libboost_stacktrace_noop-1.83.0_1
 libboost_stacktrace_addr2line.so.1.83.0 libboost_stacktrace_addr2line-1.83.0_1
 libboost_stacktrace_basic.so.1.83.0 libboost_stacktrace_basic-1.83.0_1
 libboost_mpi.so.1.83.0 libboost_mpi-1.83.0_1
-libboost_mpi_python313.so.1.83.0 libboost_mpi-python3-1.83.0_5
-libboost_python313.so.1.83.0 boost-python3-1.83.0_5
+libboost_mpi_python311.so.1.83.0 libboost_mpi-python3-1.83.0_1
+libboost_python312.so.1.83.0 boost-python3-1.83.0_1
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
@@ -1730,8 +1730,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.13.0_1
-libpython3.13.so.1.0 python3-3.13.0_1
+libpython3.so python3-3.12.0_1
+libpython3.12.so.1.0 python3-3.12.0_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
 libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
@@ -2328,8 +2328,8 @@ libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF6ThreadWeaver.so.6 kf6-threadweaver-6.0.0_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.5 openimageio-2.5.17.0_1
-libOpenImageIO.so.2.5 openimageio-2.5.17.0_1
+libOpenImageIO_Util.so.2.4 openimageio-2.4.9.0_1
+libOpenImageIO.so.2.4 openimageio-2.4.9.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
@@ -3980,13 +3980,13 @@ librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
 libraft.so.0 raft-0.18.2_1
 libmdnsd.so.1 libmdnsd-0.9_1
-libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1
-libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1
+libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
+libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.11 libcbor-0.11.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libOpenImageDenoise.so.2 openimagedenoise-2.3.0_1
+libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
diff --git a/common/xbps-src/shutils/show.sh b/common/xbps-src/shutils/show.sh
index 39d46b623bfdef..5e9e8a186bb13d 100644
--- a/common/xbps-src/shutils/show.sh
+++ b/common/xbps-src/shutils/show.sh
@@ -62,7 +62,7 @@ show_pkg_var() {
 }
 
 show_pkg_deps() {
-    [ -f "${XBPS_STATEDIR}/${pkgname}-rdeps" ] && cat "${XBPS_STATEDIR}/${pkgname}-rdeps"
+    [ -f "${PKGDESTDIR}/rdeps" ] && cat ${PKGDESTDIR}/rdeps
 }
 
 show_pkg_files() {
@@ -155,9 +155,9 @@ show_pkg_build_options() {
 }
 
 show_pkg_shlib_provides() {
-    [ -f "${XBPS_STATEDIR}/${pkgname}-shlib-provides" ] && cat "${XBPS_STATEDIR}/${pkgname}-shlib-provides"
+    [ -f "${PKGDESTDIR}/shlib-provides" ] && cat ${PKGDESTDIR}/shlib-provides
 }
 
 show_pkg_shlib_requires() {
-    [ -f "${XBPS_STATEDIR}/${pkgname}-shlib-requires" ] && cat "${XBPS_STATEDIR}/${pkgname}-shlib-requires"
+    [ -f "${PKGDESTDIR}/shlib-requires" ] && cat ${PKGDESTDIR}/shlib-requires
 }
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 0a48174b7cb559..e672a58ceaea7a 100755
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.5.8
-revision=2
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
diff --git a/srcpkgs/DSView/template b/srcpkgs/DSView/template
index 0624fd407448e4..b261627b4598da 100644
--- a/srcpkgs/DSView/template
+++ b/srcpkgs/DSView/template
@@ -1,7 +1,7 @@
 # Template file for 'DSView'
 pkgname=DSView
 version=1.3.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="boost-devel fftw-devel libglib-devel libusb-devel python3-devel qt5-devel"
diff --git a/srcpkgs/DisplayCAL/template b/srcpkgs/DisplayCAL/template
index 1f3023f5006023..4c4da7e57e0b6e 100644
--- a/srcpkgs/DisplayCAL/template
+++ b/srcpkgs/DisplayCAL/template
@@ -1,7 +1,7 @@
 # Template file for 'DisplayCAL'
 pkgname=DisplayCAL
 version=3.9.12
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template
index 0827b04d99da06..8cb51827d34a82 100644
--- a/srcpkgs/GCP-Guest-Environment/template
+++ b/srcpkgs/GCP-Guest-Environment/template
@@ -1,7 +1,7 @@
 # Template file for 'GCP-Guest-Environment'
 pkgname=GCP-Guest-Environment
 version=20191210
-revision=6
+revision=5
 build_wrksrc="packages/python-google-compute-engine"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-distro"
diff --git a/srcpkgs/Grammalecte/template b/srcpkgs/Grammalecte/template
index a82a6bed8e0eb7..8218bbdef04370 100644
--- a/srcpkgs/Grammalecte/template
+++ b/srcpkgs/Grammalecte/template
@@ -1,7 +1,7 @@
 # Template file for 'Grammalecte'
 pkgname=Grammalecte
 version=1.6.0
-revision=7
+revision=6
 create_wrksrc=yes
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index cc5d4cc6d24095..822fe4b47d681c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.21.1
-revision=3
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
  desktop-file-utils gtk-update-icon-cache"
diff --git a/srcpkgs/LabJackPython/template b/srcpkgs/LabJackPython/template
index 906117f1d0d694..17fdd03c4505c9 100644
--- a/srcpkgs/LabJackPython/template
+++ b/srcpkgs/LabJackPython/template
@@ -1,7 +1,7 @@
 # Template file for 'LabJackPython'
 pkgname=LabJackPython
 version=2.0.4
-revision=6
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 exodriver"
diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index a05a2b645720de..99948dd9138698 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
 version=3.1.4
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-alembic python3-platformdirs python3-BeautifulSoup4
diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
new file mode 100644
index 00000000000000..5a812c84b21102
--- /dev/null
+++ b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
@@ -0,0 +1,29 @@
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f..8dec0e1 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,7 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 7db0f87a638bd5..76d950301cd01d 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
-version=3.6.0
-revision=1
+version=3.4.3
+revision=4
 build_style=cmake
 # TODO: CUDA/OpenCL support
 # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html"
 distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz"
-checksum=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
+checksum=7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenSubdiv"
diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 798eea87ba3d3f..228ef3cedf1ac6 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
 version=1.2.4
-revision=4
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dgstreamer_plugin=false -Dgtk_module=false
diff --git a/srcpkgs/PhotoCollage/template b/srcpkgs/PhotoCollage/template
index b2f73f003c3475..a563aa6b5e0737 100644
--- a/srcpkgs/PhotoCollage/template
+++ b/srcpkgs/PhotoCollage/template
@@ -1,7 +1,7 @@
 # Template file for 'PhotoCollage'
 pkgname=PhotoCollage
-version=1.4.8
-revision=1
+version=1.4.5
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-Pillow python3-gobject"
@@ -10,4 +10,4 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/adrienverge/PhotoCollage"
 distfiles="https://github.com/adrienverge/PhotoCollage/archive/v${version}.tar.gz"
-checksum=7dae43d9711b7e5e89d8dd75363d967f3d5911b9db65ed3fbe7c95e567215994
+checksum=7dab2de4a098cb68369221bd634591dc768f10df2064a55bb8d6430cf5be5b36
diff --git a/srcpkgs/PyInstaller/template b/srcpkgs/PyInstaller/template
index f2ee5eaa3fdbfb..baebb65246ac8a 100644
--- a/srcpkgs/PyInstaller/template
+++ b/srcpkgs/PyInstaller/template
@@ -1,7 +1,7 @@
 # Template file for 'PyInstaller'
 pkgname=PyInstaller
 version=4.1
-revision=5
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="zlib-devel"
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index d02de5139534de..b58ef7c089bd4e 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=24.12.06
-revision=1
+version=24.06.16
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=dc59d9b87f3af6753195be1793a2e10aebf3ad59d20e2e43a5c21e10a46c7cec
+checksum=7b06be4b95cb15064015934b24e76e583b85398136fc28b622dc1118d07c55b4
 
 QMPlay2-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/ReText/template b/srcpkgs/ReText/template
index aaecedf0883d50..8a28ff8170de85 100644
--- a/srcpkgs/ReText/template
+++ b/srcpkgs/ReText/template
@@ -1,7 +1,7 @@
 # Template file for 'ReText'
 pkgname=ReText
 version=7.2.3
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="ImageMagick python3 qt5-host-tools qt5-tools python3-setuptools"
 makedepends="python3-Markdown python3-Markups python3-PyQt5-webkit qt5-tools"
diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template
index d2c71c9ce6f3cf..61bdbce1827bec 100644
--- a/srcpkgs/SoapySDR/template
+++ b/srcpkgs/SoapySDR/template
@@ -1,7 +1,7 @@
 # Template file for 'SoapySDR'
 pkgname=SoapySDR
 version=0.8.1
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3"
 hostmakedepends="doxygen swig python3 python3-setuptools"
diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
index f8661e50de3a48..a970ae06f33395 100644
--- a/srcpkgs/Solaar/template
+++ b/srcpkgs/Solaar/template
@@ -1,7 +1,7 @@
 # Template file for 'Solaar'
 pkgname=Solaar
 version=1.1.13
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-evdev python3-pyudev python3-psutil python3-yaml python3-dbus
diff --git a/srcpkgs/Trimage/template b/srcpkgs/Trimage/template
index 8e1bee95269a1a..27df5e141fcb72 100644
--- a/srcpkgs/Trimage/template
+++ b/srcpkgs/Trimage/template
@@ -1,7 +1,7 @@
 # Template file for 'Trimage'
 pkgname=Trimage
 version=1.0.6
-revision=7
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 jpegoptim optipng advancecomp pngcrush python3-PyQt5"
diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template
index eb4ac2bd50f705..67297ac166071d 100644
--- a/srcpkgs/TwitchNotifier/template
+++ b/srcpkgs/TwitchNotifier/template
@@ -1,7 +1,7 @@
 # Template file for 'TwitchNotifier'
 pkgname=TwitchNotifier
 version=0.5
-revision=8
+revision=7
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 makedepends="python3-devel"
diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index 32fc2a7d75aab2..842bb5dfb3b879 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"
 short_desc="Run your GitHub Actions locally"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/nektos/act"
 distfiles="https://github.com/nektos/act/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template
index 12fec9fd2977db..fac56f895c1d64 100644
--- a/srcpkgs/activityrelay/template
+++ b/srcpkgs/activityrelay/template
@@ -1,7 +1,7 @@
 # Template file for 'activityrelay'
 pkgname=activityrelay
 version=0.2.4
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-aiohttp python3-aputils python3-cachetools python3-click
diff --git a/srcpkgs/afew/template b/srcpkgs/afew/template
index 49ceb4a9734dfd..c3bf26e3609061 100644
--- a/srcpkgs/afew/template
+++ b/srcpkgs/afew/template
@@ -1,7 +1,7 @@
 # Template file for 'afew'
 pkgname=afew
 version=3.0.1
-revision=7
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx pkg-config"
 depends="notmuch-python3 python3-dkimpy python3-chardet notmuch"
diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template
index 0287ebcdae0919..c92bd1bd7682c5 100644
--- a/srcpkgs/afl++/template
+++ b/srcpkgs/afl++/template
@@ -1,7 +1,7 @@
 # Template file for 'afl++'
 pkgname=afl++
 version=4.21c
-revision=3
+revision=2
 archs="i686* x86_64* aarch64*"
 build_helper="qemu"
 build_style=gnu-makefile
diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index a440b9af54a547..e9910100c99037 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.7
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake ethtool libtool pkg-config python3 python3-setuptools"
 makedepends="libhwloc-devel libnl3-devel libpcap-devel libpciaccess-devel
diff --git a/srcpkgs/alienfx/template b/srcpkgs/alienfx/template
index 39580df96caaad..9ccf0708842ee6 100644
--- a/srcpkgs/alienfx/template
+++ b/srcpkgs/alienfx/template
@@ -1,7 +1,7 @@
 # Template file for 'alienfx'
 pkgname=alienfx
 version=2.4.3
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-usb python3-cairo python3-gobject python3-setuptools
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 4fccd6bd99a116..1eb596387e3260 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,7 +1,7 @@
 # Template file for 'alot'
 pkgname=alot
 version=0.10
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx python3-notmuch2 python3-cffi"
 depends="python3-setuptools python3-Twisted python3-notmuch2 python3-configobj
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 6c7b825cf3b706..016a8f241c3f5c 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,10 +1,9 @@
 # Template file for 'android-studio'
 pkgname=android-studio
 version=2024.2.1.9
-revision=2
+revision=1
 archs="x86_64"
 hostmakedepends="tar"
-depends="libbsd"
 short_desc="Official Android IDE"
 maintainer="Bnyro <bnyro@tutanota.com>"
 license="Apache-2.0"
diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index b7e4f84348070e..149ba8580e2e2f 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,7 +1,7 @@
 # Template file for 'angrysearch'
 pkgname=angrysearch
 version=1.0.3
-revision=3
+revision=2
 pycompile_dirs="usr/share/angrysearch"
 hostmakedepends="python3"
 depends="python3-PyQt5 xdg-utils"
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ea81c7a11a2c2c..90390483d86687 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
 version=2.17.5
-revision=2
+revision=1
 hostmakedepends="python3-setuptools python3-wheel python3-packaging
  python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
 depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 274f21e513245f..0972275964ed5e 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible'
 pkgname=ansible
 version=10.5.0
-revision=2
+revision=1
 build_style="python3-pep517"
 hostmakedepends="python3-setuptools python3-wheel"
 depends="ansible-core"
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 053369a755a509..acd19ae1a7572f 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,12 +1,11 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.6.3
-revision=5
+revision=4
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
-# FIXME: libgladeui3 added only to resolve ordering for Python rebuilds
-makedepends="libglib-devel gtk+3-devel libhandy1-devel libgladeui3"
+makedepends="libglib-devel gtk+3-devel libhandy1-devel"
 depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc
  gspell iso-codes libhandy1 libwebkit2gtk41"
 short_desc="GTK based distraction free Markdown editor"
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 4da6d6a59f866c..51afdea88b2356 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -2,7 +2,7 @@
 pkgname=apparmor
 reverts="4.0.2_1"
 version=3.1.7
-revision=4
+revision=3
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template
index 899a16b047c937..dec79ddade2f6c 100644
--- a/srcpkgs/arandr/template
+++ b/srcpkgs/arandr/template
@@ -1,7 +1,7 @@
 # Template file for 'arandr'
 pkgname=arandr
 version=0.1.11
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-docutils"
 depends="python3-gobject gtk+3 xrandr"
diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index b1b95fe05a6943..8a9b94778e607c 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -1,7 +1,7 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
 version=10.2.0
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="docbook-xsl libxslt python3-setuptools"
 depends="docbook-xsl libxslt python3"
diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template
index 8b70c8a55186a1..1797b49d419687 100644
--- a/srcpkgs/asciinema/template
+++ b/srcpkgs/asciinema/template
@@ -1,7 +1,7 @@
 # Template file for 'asciinema'
 pkgname=asciinema
 version=2.4.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
 depends="python3"
diff --git a/srcpkgs/ast-grep/template b/srcpkgs/ast-grep/template
index a8892d13ea1151..b5928b55e3ce92 100644
--- a/srcpkgs/ast-grep/template
+++ b/srcpkgs/ast-grep/template
@@ -1,6 +1,6 @@
 # Template file for 'ast-grep'
 pkgname=ast-grep
-version=0.31.0
+version=0.30.0
 revision=1
 build_style=cargo
 make_check_args="-- --skip=test_unmatching_id skip=test_merge_with_globs"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://ast-grep.github.io"
 changelog="https://raw.githubusercontent.com/ast-grep/ast-grep/main/CHANGELOG.md"
 distfiles="https://static.crates.io/crates/ast-grep/ast-grep-${version}.crate"
-checksum=3f3bc70c0b82e1712de70725c642b528f0b1544ea7a1ade610826e0659a85816
+checksum=ebbd6bac25f4cbb262a6dff3783f43131091c47ad5a00541e0afddd2197f10ce
 
 do_install() {
 	vbin target/${RUST_TARGET}/release/ast-grep
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index dcb3cfd0ca9598..e7645d6f155c7a 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,7 +1,7 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=25
+revision=24
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx python3-pytz"
 makedepends="python3-devel openssl-devel acl-devel"
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 3f6c65a84f8fa5..c57cdd0812dfc1 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
 version=3.1.4
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"
diff --git a/srcpkgs/autopep8/template b/srcpkgs/autopep8/template
index d49a262c36edfa..e98017abd8f0bd 100644
--- a/srcpkgs/autopep8/template
+++ b/srcpkgs/autopep8/template
@@ -1,7 +1,7 @@
 # Template file for 'autopep8'
 pkgname=autopep8
 version=2.3.1
-revision=2
+revision=1
 build_style=python3-pep517
 # fails in CI due to readonly check
 make_check_args="-k not(io_error)"
diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template
index 46aa5398a15da9..e35e6ce69d156a 100644
--- a/srcpkgs/autorandr/template
+++ b/srcpkgs/autorandr/template
@@ -1,7 +1,7 @@
 # Template file for 'autorandr'
 pkgname=autorandr
 version=1.15
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config desktop-file-utils"
 depends="python3-setuptools xrandr"
diff --git a/srcpkgs/autotiling/template b/srcpkgs/autotiling/template
index 88cedeaa2cbd79..198d01849a18c2 100644
--- a/srcpkgs/autotiling/template
+++ b/srcpkgs/autotiling/template
@@ -1,7 +1,7 @@
 # Template file for 'autotiling'
 pkgname=autotiling
 version=1.9.3
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-wheel"
 depends="python3-i3ipc"
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 767332ec8ebaab..769296f689a88e 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
 #
 pkgname=avahi-discover
 version=0.8
-revision=8
+revision=7
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -53,19 +53,6 @@ pre_configure() {
 	autoreconf -fi
 }
 
-pre_build() {
-	[ -n "${CROSS_BUILD}" ] || return 0
-
-	# TODO: fix this hack!
-	#
-	# GIR_EXTRA_LIBS_PATH in g-ir-scanner-qemuwrapper is not being honored,
-	# and the linker cannot find libavahi-glib.so.1 when scanning. Linking
-	# the missing library alongside the scanner targets is sufficient.
-	local d=avahi-gobject/.libs
-	mkdir -p "${d}"
-	ln -Tsf "../../avahi-glib/.libs/libavahi-glib.so.1" "${d}/libavahi-glib.so.1"
-}
-
 do_install() {
 	mkdir -p ${wrksrc}/tmpinstall/usr/lib
 	ln -s lib ${wrksrc}/tmpinstall/usr/lib${XBPS_TARGET_WORDSIZE}
diff --git a/srcpkgs/avideo/template b/srcpkgs/avideo/template
index d229094ce0e2d4..5e098845dcf65e 100644
--- a/srcpkgs/avideo/template
+++ b/srcpkgs/avideo/template
@@ -1,7 +1,7 @@
 # Template file for 'avideo'
 pkgname=avideo
 version=2017.9.27
-revision=10
+revision=9
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
diff --git a/srcpkgs/avr-gdb/patches/constness.patch b/srcpkgs/avr-gdb/patches/constness.patch
new file mode 100644
index 00000000000000..cc7fe451e46178
--- /dev/null
+++ b/srcpkgs/avr-gdb/patches/constness.patch
@@ -0,0 +1,11 @@
+--- ./gdb/completer.c.orig	2023-09-29 16:16:06.344069450 -0400
++++ ./gdb/completer.c	2023-09-29 16:16:21.522162391 -0400
+@@ -2011,7 +2011,7 @@
+       rl_basic_quote_characters = NULL;
+     }
+ 
+-  return rl_completer_word_break_characters;
++  return (char *)rl_completer_word_break_characters;
+ }
+ 
+ char *
diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 3bfd5e27422116..43799838c10e84 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -1,14 +1,14 @@
 # Template file for 'avr-gdb'
 pkgname=avr-gdb
-version=15.2
-revision=1
+version=12.1
+revision=2
 build_style=gnu-configure
 configure_args="--target=avr --disable-werror --disable-nls --with-system-readline
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
  $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
 hostmakedepends="pkg-config texinfo $(vopt_if guile guile)
  $(vopt_if python "python3-setuptools python3-devel")"
-makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel mpfr-devel
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
  $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')"
 depends="gdb-common"
 short_desc="GNU Debugger for AVR"
@@ -16,7 +16,7 @@ maintainer="Artur Sinila <opensource@logarithmus.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=83350ccd35b5b5a0cba6b334c41294ea968158c573940904f00b92f76345314d
+checksum=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed
 make_check=no  # See gdb/template.
 replaces="cross-avr-gdb>=0"
 
diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 1bfdf13c59c2c0..894be2668d72a2 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
 version=1.22.88
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="groff python3-botocore python3-s3transfer python3-colorama
diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template
index aa8ef36b01d0fd..7c2e7cbf13b4d4 100644
--- a/srcpkgs/awsume/template
+++ b/srcpkgs/awsume/template
@@ -1,7 +1,7 @@
 # Template file for 'awsume'
 pkgname=awsume
 version=4.5.5
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 makedepends="python3-boto3 python3-botocore python3-colorama python3-pluggy python3-psutil python3-xmltodict python3-yaml python3-dateutil"
diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 1ce31a207931d4..ee359faeeb3587 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,7 +1,7 @@
 # Template file for 'azote'
 pkgname=azote
 version=1.13.1
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="gtk+3 libayatana-appindicator python3 python3-cairo python3-gobject
diff --git a/srcpkgs/bCNC/template b/srcpkgs/bCNC/template
index 2d91cc04a6dadd..1704de365a7c96 100644
--- a/srcpkgs/bCNC/template
+++ b/srcpkgs/bCNC/template
@@ -1,7 +1,7 @@
 # Template file for 'bCNC'
 pkgname=bCNC
 version=0.9.15
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy
diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index e9ad155f20698c..be0b87b5502834 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
 version=4.2.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3 python3-build python3-packaging python3-pdm-backend python3-pip python3-setuptools_scm python3-wheel"
 depends="python3-Arrow python3-b2sdk python3-docutils
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index e38ae43fde91f9..a502c09f64d596 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
 # Template file for 'backintime'
 pkgname=backintime
 version=1.5.3
-revision=2
+revision=1
 configure_args="--python3"
 pycompile_dirs="/usr/share/backintime"
 hostmakedepends="gettext python3"
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index f163113f8cd138..0ea88bbe23ba6f 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,14 +1,14 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.32.0
-revision=2
+revision=1
 _llvmver=19
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvmver}"
 hostmakedepends="flex python3-setuptools"
-makedepends="clang${_llvmver} clang-tools-extra${_llvmver} elfutils-devel flex
- lld${_llvmver}-devel llvm${_llvmver}-devel ncurses-devel python3-devel zlib-devel"
+makedepends="clang${_llvmver} clang-tools-extra${_llvmver} elfutils-devel flex lld${_llvmver}-devel llvm${_llvmver}-devel
+ ncurses-devel python3-devel zlib-devel"
 short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template
index 354485b68ec606..dc665645d9b157 100644
--- a/srcpkgs/beancount/template
+++ b/srcpkgs/beancount/template
@@ -1,7 +1,7 @@
 # Template file for 'beancount'
 pkgname=beancount
 version=2.3.6
-revision=4
+revision=3
 build_style=python3-module
 make_check_args="--pyargs beancount --ignore beancount/web/web_test.py
  --deselect beancount/scripts/bake_test.py::TestScriptBake::test_bake_directory
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index f45ef6487d9051..ffac0e9ddac4db 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,7 +1,7 @@
 # Template file for 'beets'
 pkgname=beets
 version=2.0.0
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index 391fdf2dd9fee6..f4e69b040075b2 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,7 +1,7 @@
 # Template file for 'binwalk'
 pkgname=binwalk
 version=2.4.3
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 tar"
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index d62a33c8d7f45f..f88493bbc9abe5 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,7 +1,7 @@
 # Template file for 'black'
 pkgname=black
 version=24.10.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme"
 depends="python3-click python3-platformdirs python3-pathspec python3-packaging
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index 847f369cb304bb..a32821172cba34 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,4 +1,7 @@
-From 8ad26a05598810b9d64722ac48507c145b010e30 Mon Sep 17 00:00:00 2001
+Imported from https://gitlab.alpinelinux.org/alpine/aports/-/raw/47a715de12d0f9ea19dc8b27c417553f5b1b7a39/community/blender/0001-musl-fixes.patch
+adapted to not use __MUSL__ definition
+
+From aae3146f16bfeea88a83a2997196a69ff97a2e4c Mon Sep 17 00:00:00 2001
 From: Leon Marz <main@lmarz.org>
 Date: Wed, 7 Dec 2022 21:18:58 +0100
 Subject: [PATCH 1/2] musl fixes
@@ -7,18 +10,15 @@ Subject: [PATCH 1/2] musl fixes
  extern/glog/src/config_linux.h | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
-index b3a3325..946095a 100644
 --- a/extern/glog/src/config_linux.h
 +++ b/extern/glog/src/config_linux.h
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,9 @@
  #define HAVE_DLFCN_H
  
  /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H
++#ifdef __GLIBC__
+ #define HAVE_EXECINFO_H
++#endif
  
  /* Define if you have the `fcntl' function */
  #define HAVE_FCNTL
--- 
-2.47.0
-
diff --git a/srcpkgs/blender/patches/0002-fix-includes.patch b/srcpkgs/blender/patches/0002-fix-includes.patch
deleted file mode 100644
index 44809f4f158a9b..00000000000000
--- a/srcpkgs/blender/patches/0002-fix-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From af7161dfb4324002e27abef7c4f7a6151f26c34a Mon Sep 17 00:00:00 2001
-From: Leon Marz <main@lmarz.org>
-Date: Wed, 27 Mar 2024 10:40:01 +0100
-Subject: [PATCH 2/2] fix includes
-
----
- source/blender/blenkernel/BKE_volume_enums.hh | 2 ++
- source/blender/blenlib/BLI_index_range.hh     | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/source/blender/blenkernel/BKE_volume_enums.hh b/source/blender/blenkernel/BKE_volume_enums.hh
-index 3817b52..ebcfa44 100644
---- a/source/blender/blenkernel/BKE_volume_enums.hh
-+++ b/source/blender/blenkernel/BKE_volume_enums.hh
-@@ -8,6 +8,8 @@
-  * \ingroup bli
-  */
- 
-+#include <cstdint>
-+
- enum VolumeGridType : int8_t {
-   VOLUME_GRID_UNKNOWN = 0,
-   VOLUME_GRID_BOOLEAN,
-diff --git a/source/blender/blenlib/BLI_index_range.hh b/source/blender/blenlib/BLI_index_range.hh
-index bd9e030..25e9eb7 100644
---- a/source/blender/blenlib/BLI_index_range.hh
-+++ b/source/blender/blenlib/BLI_index_range.hh
-@@ -38,6 +38,7 @@
-  */
- 
- #include <algorithm>
-+#include <cstdint>
- #include <iosfwd>
- 
- #include "BLI_assert.h"
--- 
-2.47.0
-
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
new file mode 100644
index 00000000000000..115e1ea6fd033d
--- /dev/null
+++ b/srcpkgs/blender/patches/altivec-all.patch
@@ -0,0 +1,32 @@
+This applies a better workaround for C++ type conflicts
+in AltiVec/C++, allowing it to build on BE ppc(64).
+
+--- a/extern/clew/include/clew.h
++++ b/extern/clew/include/clew.h
+@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
+ 
+ /* Define basic vector types */
+ /* Workaround for ppc64el platform: conflicts with bool from C++. */
+-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
++#if defined(__VEC__)
+    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+-   typedef vector unsigned char     __cl_uchar16;
+-   typedef vector signed char       __cl_char16;
+-   typedef vector unsigned short    __cl_ushort8;
+-   typedef vector signed short      __cl_short8;
+-   typedef vector unsigned int      __cl_uint4;
+-   typedef vector signed int        __cl_int4;
+-   typedef vector float             __cl_float4;
++   #undef vector
++   #undef bool
++   #undef pixel
++   typedef __vector unsigned char     __cl_uchar16;
++   typedef __vector signed char       __cl_char16;
++   typedef __vector unsigned short    __cl_ushort8;
++   typedef __vector signed short      __cl_short8;
++   typedef __vector unsigned int      __cl_uint4;
++   typedef __vector signed int        __cl_int4;
++   typedef __vector float             __cl_float4;
+    #define  __CL_UCHAR16__  1
+    #define  __CL_CHAR16__   1
+    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/blender/patches/python-3.12-regex.patch b/srcpkgs/blender/patches/python-3.12-regex.patch
new file mode 100644
index 00000000000000..daba4a859fd157
--- /dev/null
+++ b/srcpkgs/blender/patches/python-3.12-regex.patch
@@ -0,0 +1,36 @@
+--- a/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
++++ b/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py
+@@ -852,7 +852,7 @@ class MText(DXFEntity):
+         self.set_default_extrusion()
+ 
+     def lines(self):
+-        return self.raw_text.split('\P')
++        return self.raw_text.split(r'\P')
+ 
+     def plain_text(self, split=False):
+         chars = []
+--- a/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
++++ b/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py
+@@ -22,9 +22,9 @@ class ImageData:
+         return hash(self._data)
+ 
+     def adjusted_name(self):
+-        regex_dot = re.compile("\.")
++        regex_dot = re.compile(r"\.")
+         adjusted_name = re.sub(regex_dot, "_", self.name)
+-        new_name = "".join([char for char in adjusted_name if char not in "!#$&'()*+,/:;<>?@[\]^`{|}~"])
++        new_name = "".join([char for char in adjusted_name if char not in r"!#$&'()*+,/:;<>?@[\]^`{|}~"])
+         return new_name
+ 
+     @property
+--- a/scripts/modules/bl_i18n_utils/settings.py
++++ b/scripts/modules/bl_i18n_utils/settings.py
+@@ -302,7 +302,7 @@ PYGETTEXT_KEYWORDS = (() +
+     # becomes extremely slow to process some (unrelated) source files.
+     ((r"\{(?:(?:\s*\"[^\",]+\"\s*,)|(?:\s*\"\\\"\",)|(?:\s*nullptr\s*,)){4}\s*" +
+       _msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*nullptr\s*,))(?:[^,]+,){2}"
+-      + "(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
++      + r"(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) +
+ 
+     tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
+            r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
diff --git a/srcpkgs/blender/patches/python-3.13.patch b/srcpkgs/blender/patches/python-3.13.patch
deleted file mode 100644
index 0dd6f4b95b4d84..00000000000000
--- a/srcpkgs/blender/patches/python-3.13.patch
+++ /dev/null
@@ -1,626 +0,0 @@
-From d9f38fca5ffe29136cd6f390e318ad8455864582 Mon Sep 17 00:00:00 2001
-From: Campbell Barton <campbell@blender.org>
-Date: Fri, 18 Oct 2024 12:23:34 +1100
-Subject: [PATCH] PyAPI: support Python 3.13
-
-- `_PySet_NextEntry` has been removed, use generic iterator access
-  which will has some additional overhead as it needs to create
-  an iterator to access the values.
-
-- Add v3.13 compatibility defines to account for renaming:
-  _PyObject_LookupAttr -> PyObject_GetOptionalAttr
-  _PyLong_AsInt -> PyLong_AsInt
-
-- Unfortunately use of Python's internal API needs to be used to
-  inspect op-codes in `bpy_driver.cc`.
-
-Testing GLTF/FBX IO there isn't any significant performance impact
-from these changes.
-
-Resolves #123871.
----
- .../blender/python/bmesh/bmesh_py_ops_call.cc |  16 +-
- source/blender/python/generic/py_capi_rna.cc  | 140 ++++++++++--------
- .../blender/python/generic/py_capi_utils.cc   |  56 ++++---
- .../blender/python/generic/py_capi_utils.hh   |   4 +
- .../blender/python/generic/python_compat.hh   |  10 +-
- .../blender/python/gpu/gpu_py_framebuffer.cc  |   6 +-
- source/blender/python/intern/bpy.cc           |  48 +++---
- source/blender/python/intern/bpy_driver.cc    |  37 ++++-
- .../python/intern/bpy_library_write.cc        |  27 ++--
- source/blender/python/intern/bpy_rna.cc       |   6 +-
- 10 files changed, 218 insertions(+), 132 deletions(-)
-
-diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.cc b/source/blender/python/bmesh/bmesh_py_ops_call.cc
-index d5a2e6b02ad..624e4d02e98 100644
---- a/source/blender/python/bmesh/bmesh_py_ops_call.cc
-+++ b/source/blender/python/bmesh/bmesh_py_ops_call.cc
-@@ -548,11 +548,12 @@ static int bpy_slot_from_py(BMesh *bm,
-           break;
-         }
-         case BMO_OP_SLOT_SUBTYPE_MAP_EMPTY: {
--          if (PySet_Size(value) > 0) {
-+          if (PySet_GET_SIZE(value) > 0) {
-+            PyObject *it = PyObject_GetIter(value);
-             PyObject *arg_key;
--            Py_ssize_t arg_pos = 0;
--            Py_ssize_t arg_hash = 0;
--            while (_PySet_NextEntry(value, &arg_pos, &arg_key, &arg_hash)) {
-+            while ((arg_key = PyIter_Next(it))) {
-+              /* Borrow from the set. */
-+              Py_DECREF(arg_key);
- 
-               if (bpy_slot_from_py_elem_check((BPy_BMElem *)arg_key,
-                                               bm,
-@@ -561,11 +562,16 @@ static int bpy_slot_from_py(BMesh *bm,
-                                               slot_name,
-                                               "invalid key in set") == -1)
-               {
--                return -1; /* error is set in bpy_slot_from_py_elem_check() */
-+                /* Error is set in #bpy_slot_from_py_elem_check(). */
-+                break;
-               }
- 
-               BMO_slot_map_empty_insert(bmop, slot, ((BPy_BMElem *)arg_key)->ele);
-             }
-+            Py_DECREF(it);
-+            if (arg_key) {
-+              return -1;
-+            }
-           }
-           break;
-         }
-diff --git a/source/blender/python/generic/py_capi_rna.cc b/source/blender/python/generic/py_capi_rna.cc
-index 11827fa0836..a41e474f619 100644
---- a/source/blender/python/generic/py_capi_rna.cc
-+++ b/source/blender/python/generic/py_capi_rna.cc
-@@ -75,60 +75,66 @@ BLI_bitmap *pyrna_enum_bitmap_from_set(const EnumPropertyItem *items,
-                                        int bitmap_size,
-                                        const char *error_prefix)
- {
--  /* Set looping. */
--  Py_ssize_t pos = 0;
--  Py_ssize_t hash = 0;
--  PyObject *key;
--
-+  BLI_assert(PySet_Check(value));
-   BLI_bitmap *bitmap = BLI_BITMAP_NEW(bitmap_size, __func__);
- 
--  while (_PySet_NextEntry(value, &pos, &key, &hash)) {
--    const char *param = PyUnicode_AsUTF8(key);
--    if (param == nullptr) {
--      PyErr_Format(PyExc_TypeError,
--                   "%.200s expected a string, not %.200s",
--                   error_prefix,
--                   Py_TYPE(key)->tp_name);
--      goto error;
--    }
-+  if (PySet_GET_SIZE(value) > 0) {
-+    /* Set looping. */
-+    PyObject *it = PyObject_GetIter(value);
-+    PyObject *key;
-+    while ((key = PyIter_Next(it))) {
-+      /* Borrow from the set. */
-+      Py_DECREF(key);
- 
--    int ret;
--    if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) {
--      goto error;
--    }
-+      const char *param = PyUnicode_AsUTF8(key);
-+      if (param == nullptr) {
-+        PyErr_Format(PyExc_TypeError,
-+                     "%.200s expected a string, not %.200s",
-+                     error_prefix,
-+                     Py_TYPE(key)->tp_name);
-+        break;
-+      }
- 
--    int index = ret;
-+      int ret;
-+      if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) {
-+        break;
-+      }
- 
--    if (type_convert_sign) {
--      if (type_size == 2) {
--        union {
--          signed short as_signed;
--          ushort as_unsigned;
--        } ret_convert;
--        ret_convert.as_signed = (signed short)ret;
--        index = int(ret_convert.as_unsigned);
--      }
--      else if (type_size == 1) {
--        union {
--          signed char as_signed;
--          uchar as_unsigned;
--        } ret_convert;
--        ret_convert.as_signed = (signed char)ret;
--        index = int(ret_convert.as_unsigned);
--      }
--      else {
--        BLI_assert_unreachable();
-+      int index = ret;
-+
-+      if (type_convert_sign) {
-+        if (type_size == 2) {
-+          union {
-+            signed short as_signed;
-+            ushort as_unsigned;
-+          } ret_convert;
-+          ret_convert.as_signed = (signed short)ret;
-+          index = int(ret_convert.as_unsigned);
-+        }
-+        else if (type_size == 1) {
-+          union {
-+            signed char as_signed;
-+            uchar as_unsigned;
-+          } ret_convert;
-+          ret_convert.as_signed = (signed char)ret;
-+          index = int(ret_convert.as_unsigned);
-+        }
-+        else {
-+          BLI_assert_unreachable();
-+        }
-       }
-+      BLI_assert(index < bitmap_size);
-+      BLI_BITMAP_ENABLE(bitmap, index);
-+    }
-+    Py_DECREF(it);
-+
-+    if (key) {
-+      MEM_freeN(bitmap);
-+      bitmap = nullptr;
-     }
--    BLI_assert(index < bitmap_size);
--    BLI_BITMAP_ENABLE(bitmap, index);
-   }
- 
-   return bitmap;
--
--error:
--  MEM_freeN(bitmap);
--  return nullptr;
- }
- 
- int pyrna_enum_bitfield_from_set(const EnumPropertyItem *items,
-@@ -136,32 +142,40 @@ int pyrna_enum_bitfield_from_set(const EnumPropertyItem *items,
-                                  int *r_value,
-                                  const char *error_prefix)
- {
-+  BLI_assert(PySet_Check(value));
-   /* Set of enum items, concatenate all values with OR. */
--  int ret, flag = 0;
--
--  /* Set looping. */
--  Py_ssize_t pos = 0;
--  Py_ssize_t hash = 0;
--  PyObject *key;
-+  int flag = 0;
- 
-   *r_value = 0;
- 
--  while (_PySet_NextEntry(value, &pos, &key, &hash)) {
--    const char *param = PyUnicode_AsUTF8(key);
-+  PyObject *key = nullptr;
-+  if (PySet_GET_SIZE(value) > 0) {
-+    /* Set looping. */
-+    PyObject *it = PyObject_GetIter(value);
-+    while ((key = PyIter_Next(it))) {
-+      /* Borrow from the set. */
-+      Py_DECREF(key);
- 
--    if (param == nullptr) {
--      PyErr_Format(PyExc_TypeError,
--                   "%.200s expected a string, not %.200s",
--                   error_prefix,
--                   Py_TYPE(key)->tp_name);
-+      const char *param = PyUnicode_AsUTF8(key);
-+      if (param == nullptr) {
-+        PyErr_Format(PyExc_TypeError,
-+                     "%.200s expected a string, not %.200s",
-+                     error_prefix,
-+                     Py_TYPE(key)->tp_name);
-+        break;
-+      }
-+
-+      int ret;
-+      if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) {
-+        break;
-+      }
-+
-+      flag |= ret;
-+    }
-+    Py_DECREF(it);
-+    if (key) {
-       return -1;
-     }
--
--    if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) {
--      return -1;
--    }
--
--    flag |= ret;
-   }
- 
-   *r_value = flag;
-diff --git a/source/blender/python/generic/py_capi_utils.cc b/source/blender/python/generic/py_capi_utils.cc
-index 3311064e7c5..74c829d717e 100644
---- a/source/blender/python/generic/py_capi_utils.cc
-+++ b/source/blender/python/generic/py_capi_utils.cc
-@@ -39,6 +39,11 @@
- #  include "BLI_math_base.h" /* isfinite() */
- #endif
- 
-+#if PY_VERSION_HEX <= 0x030c0000 /* <=3.12 */
-+#  define PyLong_AsInt _PyLong_AsInt
-+#  define PyUnicode_CompareWithASCIIString _PyUnicode_EqualToASCIIString
-+#endif
-+
- /* -------------------------------------------------------------------- */
- /** \name Fast Python to C Array Conversion for Primitive Types
-  * \{ */
-@@ -874,10 +879,12 @@ static void pyc_exception_buffer_handle_system_exit()
-   if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
-     return;
-   }
--  /* Inspecting, follow Python's logic in #_Py_HandleSystemExit & treat as a regular exception. */
-+/* Inspecting, follow Python's logic in #_Py_HandleSystemExit & treat as a regular exception. */
-+#  if 0 /* FIXME: */
-   if (_Py_GetConfig()->inspect) {
-     return;
-   }
-+#  endif
- 
-   /* NOTE(@ideasman42): A `SystemExit` exception will exit immediately (unless inspecting).
-    * So print the error and exit now. Without this #PyErr_Display shows the error stack-trace
-@@ -1424,11 +1431,6 @@ int PyC_FlagSet_ToBitfield(const PyC_FlagSet *items,
-   /* set of enum items, concatenate all values with OR */
-   int ret, flag = 0;
- 
--  /* set looping */
--  Py_ssize_t pos = 0;
--  Py_ssize_t hash = 0;
--  PyObject *key;
--
-   if (!PySet_Check(value)) {
-     PyErr_Format(PyExc_TypeError,
-                  "%.200s expected a set, not %.200s",
-@@ -1439,22 +1441,32 @@ int PyC_FlagSet_ToBitfield(const PyC_FlagSet *items,
- 
-   *r_value = 0;
- 
--  while (_PySet_NextEntry(value, &pos, &key, &hash)) {
--    const char *param = PyUnicode_AsUTF8(key);
-+  if (PySet_GET_SIZE(value) > 0) {
-+    PyObject *it = PyObject_GetIter(value);
-+    PyObject *key;
-+    while ((key = PyIter_Next(it))) {
-+      /* Borrow from the set. */
-+      Py_DECREF(key);
- 
--    if (param == nullptr) {
--      PyErr_Format(PyExc_TypeError,
--                   "%.200s set must contain strings, not %.200s",
--                   error_prefix,
--                   Py_TYPE(key)->tp_name);
-+      const char *param = PyUnicode_AsUTF8(key);
-+      if (param == nullptr) {
-+        PyErr_Format(PyExc_TypeError,
-+                     "%.200s set must contain strings, not %.200s",
-+                     error_prefix,
-+                     Py_TYPE(key)->tp_name);
-+        break;
-+      }
-+
-+      if (PyC_FlagSet_ValueFromID(items, param, &ret, error_prefix) < 0) {
-+        break;
-+      }
-+
-+      flag |= ret;
-+    }
-+    Py_DECREF(it);
-+    if (key != nullptr) {
-       return -1;
-     }
--
--    if (PyC_FlagSet_ValueFromID(items, param, &ret, error_prefix) < 0) {
--      return -1;
--    }
--
--    flag |= ret;
-   }
- 
-   *r_value = flag;
-@@ -1724,7 +1736,7 @@ static ulong pyc_Long_AsUnsignedLong(PyObject *value)
- 
- int PyC_Long_AsBool(PyObject *value)
- {
--  const int test = _PyLong_AsInt(value);
-+  const int test = PyLong_AsInt(value);
-   if (UNLIKELY(test == -1 && PyErr_Occurred())) {
-     return -1;
-   }
-@@ -1737,7 +1749,7 @@ int PyC_Long_AsBool(PyObject *value)
- 
- int8_t PyC_Long_AsI8(PyObject *value)
- {
--  const int test = _PyLong_AsInt(value);
-+  const int test = PyLong_AsInt(value);
-   if (UNLIKELY(test == -1 && PyErr_Occurred())) {
-     return -1;
-   }
-@@ -1750,7 +1762,7 @@ int8_t PyC_Long_AsI8(PyObject *value)
- 
- int16_t PyC_Long_AsI16(PyObject *value)
- {
--  const int test = _PyLong_AsInt(value);
-+  const int test = PyLong_AsInt(value);
-   if (UNLIKELY(test == -1 && PyErr_Occurred())) {
-     return -1;
-   }
-diff --git a/source/blender/python/generic/py_capi_utils.hh b/source/blender/python/generic/py_capi_utils.hh
-index 4a641f78471..81740e0d0ad 100644
---- a/source/blender/python/generic/py_capi_utils.hh
-+++ b/source/blender/python/generic/py_capi_utils.hh
-@@ -339,7 +339,11 @@ uint64_t PyC_Long_AsU64(PyObject *value);
- /* inline so type signatures match as expected */
- Py_LOCAL_INLINE(int32_t) PyC_Long_AsI32(PyObject *value)
- {
-+#if PY_VERSION_HEX <= 0x030c0000 /* <=3.12 */
-   return (int32_t)_PyLong_AsInt(value);
-+#else
-+  return (int32_t)PyLong_AsInt(value);
-+#endif
- }
- Py_LOCAL_INLINE(int64_t) PyC_Long_AsI64(PyObject *value)
- {
-diff --git a/source/blender/python/generic/python_compat.hh b/source/blender/python/generic/python_compat.hh
-index f18d0fb59b3..e2799aeeb46 100644
---- a/source/blender/python/generic/python_compat.hh
-+++ b/source/blender/python/generic/python_compat.hh
-@@ -9,9 +9,17 @@
- 
- #pragma once
- 
-+/* Removes `intialized` member from Python 3.13+. */
-+#if PY_VERSION_HEX >= 0x030d0000
-+#  define PY_ARG_PARSER_HEAD_COMPAT()
-+#elif PY_VERSION_HEX >= 0x030c0000
- /* Add `intialized` member for Python 3.12+. */
--#if PY_VERSION_HEX >= 0x030c0000
- #  define PY_ARG_PARSER_HEAD_COMPAT() 0,
- #else
- #  define PY_ARG_PARSER_HEAD_COMPAT()
- #endif
-+
-+/* Python 3.13 made some changes, use the "new" names. */
-+#if PY_VERSION_HEX < 0x030d0000
-+#  define PyObject_GetOptionalAttr _PyObject_LookupAttr
-+#endif
-diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc
-index 899ad21f770..9bef53654df 100644
---- a/source/blender/python/gpu/gpu_py_framebuffer.cc
-+++ b/source/blender/python/gpu/gpu_py_framebuffer.cc
-@@ -286,14 +286,14 @@ static bool pygpu_framebuffer_new_parse_arg(PyObject *o, GPUAttachment *r_attach
-         return false;
-       }
- 
--      if (c_texture && _PyUnicode_EqualToASCIIString(key, c_texture)) {
-+      if (c_texture && PyUnicode_CompareWithASCIIString(key, c_texture)) {
-         /* Compare only once. */
-         c_texture = nullptr;
-         if (!bpygpu_ParseTexture(value, &tmp_attach.tex)) {
-           return false;
-         }
-       }
--      else if (c_layer && _PyUnicode_EqualToASCIIString(key, c_layer)) {
-+      else if (c_layer && PyUnicode_CompareWithASCIIString(key, c_layer)) {
-         /* Compare only once. */
-         c_layer = nullptr;
-         tmp_attach.layer = PyLong_AsLong(value);
-@@ -301,7 +301,7 @@ static bool pygpu_framebuffer_new_parse_arg(PyObject *o, GPUAttachment *r_attach
-           return false;
-         }
-       }
--      else if (c_mip && _PyUnicode_EqualToASCIIString(key, c_mip)) {
-+      else if (c_mip && PyUnicode_CompareWithASCIIString(key, c_mip)) {
-         /* Compare only once. */
-         c_mip = nullptr;
-         tmp_attach.mip = PyLong_AsLong(value);
-diff --git a/source/blender/python/intern/bpy.cc b/source/blender/python/intern/bpy.cc
-index 7cdd00fc7a3..42ea76e40ac 100644
---- a/source/blender/python/intern/bpy.cc
-+++ b/source/blender/python/intern/bpy.cc
-@@ -610,38 +610,40 @@ PyDoc_STRVAR(
-     "   :rtype: dict\n");
- static PyObject *bpy_wm_capabilities(PyObject *self)
- {
--  static _Py_Identifier PyId_capabilities = {"_wm_capabilities_", -1};
--
-+  PyObject *py_id_capabilities = PyUnicode_FromString("_wm_capabilities_");
-   PyObject *result = nullptr;
--  switch (_PyObject_LookupAttrId(self, &PyId_capabilities, &result)) {
--    case 1:
--      return result;
--    case 0:
--      break;
--    default:
--      /* Unlikely, but there may be an error, forward it. */
--      return nullptr;
--  }
-+  switch (PyObject_GetOptionalAttr(self, py_id_capabilities, &result)) {
-+    case 1: {
-+      result = PyDict_New();
- 
--  result = PyDict_New();
--
--  const eWM_CapabilitiesFlag flag = WM_capabilities_flag();
-+      const eWM_CapabilitiesFlag flag = WM_capabilities_flag();
- 
- #define SetFlagItem(x) \
-   PyDict_SetItemString(result, STRINGIFY(x), PyBool_FromLong((WM_CAPABILITY_##x) & flag));
- 
--  SetFlagItem(CURSOR_WARP);
--  SetFlagItem(WINDOW_POSITION);
--  SetFlagItem(PRIMARY_CLIPBOARD);
--  SetFlagItem(GPU_FRONT_BUFFER_READ);
--  SetFlagItem(CLIPBOARD_IMAGES);
--  SetFlagItem(DESKTOP_SAMPLE);
--  SetFlagItem(INPUT_IME);
--  SetFlagItem(TRACKPAD_PHYSICAL_DIRECTION);
-+      SetFlagItem(CURSOR_WARP);
-+      SetFlagItem(WINDOW_POSITION);
-+      SetFlagItem(PRIMARY_CLIPBOARD);
-+      SetFlagItem(GPU_FRONT_BUFFER_READ);
-+      SetFlagItem(CLIPBOARD_IMAGES);
-+      SetFlagItem(DESKTOP_SAMPLE);
-+      SetFlagItem(INPUT_IME);
-+      SetFlagItem(TRACKPAD_PHYSICAL_DIRECTION);
- 
- #undef SetFlagItem
-+      PyObject_SetAttr(self, py_id_capabilities, result);
-+      break;
-+    }
-+    case 0:
-+      BLI_assert(result != nullptr);
-+      break;
-+    default:
-+      /* Unlikely, but there may be an error, forward it. */
-+      BLI_assert(result == nullptr);
-+      break;
-+  }
- 
--  _PyObject_SetAttrId(self, &PyId_capabilities, result);
-+  Py_DECREF(py_id_capabilities);
-   return result;
- }
- 
-diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc
-index b32bfbc2a56..e589f0992e1 100644
---- a/source/blender/python/intern/bpy_driver.cc
-+++ b/source/blender/python/intern/bpy_driver.cc
-@@ -43,6 +43,13 @@
- #  include <opcode.h>
- #endif
- 
-+#if PY_VERSION_HEX >= 0x030d0000 /* >=3.13 */
-+/* WARNING(@ideasman42): Using `Py_BUILD_CORE` is a last resort,
-+ * the alternative would be not to inspect OP-CODES at all. */
-+#  define Py_BUILD_CORE
-+#  include <internal/pycore_code.h>
-+#endif
-+
- PyObject *bpy_pydriver_Dict = nullptr;
- 
- #ifdef USE_BYTECODE_WHITELIST
-@@ -375,7 +382,35 @@ static bool is_opcode_secure(const int opcode)
-     OK_OP(LOAD_CONST) /* Ok because constants are accepted. */
-     OK_OP(LOAD_NAME)  /* Ok, because `PyCodeObject.names` is checked. */
-     OK_OP(CALL)       /* Ok, because we check its "name" before calling. */
--    OK_OP(KW_NAMES)   /* Ok, because it's used for calling functions with keyword arguments. */
-+#  if PY_VERSION_HEX >= 0x030d0000
-+    OK_OP(CALL_KW) /* Ok, because it's used for calling functions with keyword arguments. */
-+
-+    OK_OP(CALL_FUNCTION_EX);
-+
-+    /* OK because the names are checked. */
-+    OK_OP(CALL_ALLOC_AND_ENTER_INIT)
-+    OK_OP(CALL_BOUND_METHOD_EXACT_ARGS)
-+    OK_OP(CALL_BOUND_METHOD_GENERAL)
-+    OK_OP(CALL_BUILTIN_CLASS)
-+    OK_OP(CALL_BUILTIN_FAST)
-+    OK_OP(CALL_BUILTIN_FAST_WITH_KEYWORDS)
-+    OK_OP(CALL_BUILTIN_O)
-+    OK_OP(CALL_ISINSTANCE)
-+    OK_OP(CALL_LEN)
-+    OK_OP(CALL_LIST_APPEND)
-+    OK_OP(CALL_METHOD_DESCRIPTOR_FAST)
-+    OK_OP(CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS)
-+    OK_OP(CALL_METHOD_DESCRIPTOR_NOARGS)
-+    OK_OP(CALL_METHOD_DESCRIPTOR_O)
-+    OK_OP(CALL_NON_PY_GENERAL)
-+    OK_OP(CALL_PY_EXACT_ARGS)
-+    OK_OP(CALL_PY_GENERAL)
-+    OK_OP(CALL_STR_1)
-+    OK_OP(CALL_TUPLE_1)
-+    OK_OP(CALL_TYPE_1)
-+#  else
-+    OK_OP(KW_NAMES) /* Ok, because it's used for calling functions with keyword arguments. */
-+#  endif
- 
- #  if PY_VERSION_HEX < 0x030c0000
-     OK_OP(PRECALL) /* Ok, because it's used for calling. */
-diff --git a/source/blender/python/intern/bpy_library_write.cc b/source/blender/python/intern/bpy_library_write.cc
-index d1c0b32ac07..59bf476427f 100644
---- a/source/blender/python/intern/bpy_library_write.cc
-+++ b/source/blender/python/intern/bpy_library_write.cc
-@@ -136,20 +136,25 @@ static PyObject *bpy_lib_write(BPy_PropertyRNA *self, PyObject *args, PyObject *
-       PartialWriteContext::IDAddOperations::ADD_DEPENDENCIES |
-       (use_fake_user ? PartialWriteContext::IDAddOperations::SET_FAKE_USER : 0))};
- 
--  Py_ssize_t pos, hash;
--  PyObject *key;
--  ID *id = nullptr;
--
--  pos = hash = 0;
--  while (_PySet_NextEntry(datablocks, &pos, &key, &hash)) {
--    if (!pyrna_id_FromPyObject(key, &id)) {
--      PyErr_Format(PyExc_TypeError, "Expected an ID type, not %.200s", Py_TYPE(key)->tp_name);
--      return nullptr;
--    }
--    else {
-+  if (PySet_GET_SIZE(datablocks) > 0) {
-+    PyObject *it = PyObject_GetIter(datablocks);
-+    PyObject *key;
-+    while ((key = PyIter_Next(it))) {
-+      /* Borrow from the set. */
-+      Py_DECREF(key);
-+      ID *id;
-+      if (!pyrna_id_FromPyObject(key, &id)) {
-+        PyErr_Format(PyExc_TypeError, "Expected an ID type, not %.200s", Py_TYPE(key)->tp_name);
-+        break;
-+      }
-       partial_write_ctx.id_add(id, add_options, nullptr);
-     }
-+    Py_DECREF(it);
-+    if (key) {
-+      return nullptr;
-+    }
-   }
-+
-   BLI_assert(partial_write_ctx.is_valid());
- 
-   /* write blend */
-diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
-index eb365bf0238..a9cb115f57e 100644
---- a/source/blender/python/intern/bpy_rna.cc
-+++ b/source/blender/python/intern/bpy_rna.cc
-@@ -8639,7 +8639,7 @@ static int bpy_class_validate_recursive(PointerRNA *dummy_ptr,
-       continue;
-     }
- 
--    /* TODO(@ideasman42): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */
-+    /* TODO(@ideasman42): Use #PyObject_GetOptionalAttr(), also in the macro below. */
-     identifier = RNA_property_identifier(prop);
-     item = PyObject_GetAttrString(py_class, identifier);
- 
-@@ -9263,7 +9263,7 @@ static PyObject *pyrna_register_class(PyObject * /*self*/, PyObject *py_class)
- 
-   /* Call classed register method.
-    * Note that zero falls through, no attribute, no error. */
--  switch (_PyObject_LookupAttr(py_class, bpy_intern_str_register, &py_cls_meth)) {
-+  switch (PyObject_GetOptionalAttr(py_class, bpy_intern_str_register, &py_cls_meth)) {
-     case 1: {
-       PyObject *ret = PyObject_CallObject(py_cls_meth, nullptr);
-       Py_DECREF(py_cls_meth);
-@@ -9378,7 +9378,7 @@ static PyObject *pyrna_unregister_class(PyObject * /*self*/, PyObject *py_class)
- 
-   /* Call classed unregister method.
-    * Note that zero falls through, no attribute, no error. */
--  switch (_PyObject_LookupAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) {
-+  switch (PyObject_GetOptionalAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) {
-     case 1: {
-       PyObject *ret = PyObject_CallObject(py_cls_meth, nullptr);
-       Py_DECREF(py_cls_meth);
diff --git a/srcpkgs/blender/patches/python3.12-pylongobject.patch b/srcpkgs/blender/patches/python3.12-pylongobject.patch
new file mode 100644
index 00000000000000..80b326809cc95f
--- /dev/null
+++ b/srcpkgs/blender/patches/python3.12-pylongobject.patch
@@ -0,0 +1,134 @@
+https://src.fedoraproject.org/rpms/blender/raw/7045717eb5477c40905f6d29dfd3dbf5ed674e4d/f/blender-3.6.1-py312-pylongobject.patch
+
+--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
++++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
+@@ -188,6 +188,7 @@ PyTypeObject IntegrationType_Type = {
+ 
+ /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
+ 
++#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
+ static PyLongObject _IntegrationType_MEAN = {
+     PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MEAN}};
+ static PyLongObject _IntegrationType_MIN = {PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MIN}};
+@@ -196,6 +197,26 @@ static PyLongObject _IntegrationType_FIR
+     PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){FIRST}};
+ static PyLongObject _IntegrationType_LAST = {
+     PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){LAST}};
++#else
++#define NON_SIZE_BITS 3
++#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
++#define _Py_IntegrationTypeType_DIGIT_INIT(val) \
++    { \
++        .ob_base = PyObject_HEAD_INIT(&IntegrationType_Type) \
++        .long_value  = { \
++            .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
++                (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
++                (val) == 0 ? 0 : 1), \
++            { ((val) >= 0 ? (val) : -(val)) }, \
++        } \
++    }
++
++static PyLongObject _IntegrationType_MEAN = _Py_IntegrationTypeType_DIGIT_INIT(MEAN);
++static PyLongObject _IntegrationType_MIN = _Py_IntegrationTypeType_DIGIT_INIT(MIN);
++static PyLongObject _IntegrationType_MAX = _Py_IntegrationTypeType_DIGIT_INIT(MAX);
++static PyLongObject _IntegrationType_FIRST = _Py_IntegrationTypeType_DIGIT_INIT(FIRST);
++static PyLongObject _IntegrationType_LAST = _Py_IntegrationTypeType_DIGIT_INIT(LAST);
++#endif
+ 
+ #define BPy_IntegrationType_MEAN ((PyObject *)&_IntegrationType_MEAN)
+ #define BPy_IntegrationType_MIN ((PyObject *)&_IntegrationType_MIN)
+--- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp
++++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
+@@ -73,6 +73,7 @@ PyTypeObject MediumType_Type = {
+ 
+ /*-----------------------BPy_IntegrationType instance definitions -------------------------*/
+ 
++#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
+ PyLongObject _BPy_MediumType_DRY_MEDIUM = {
+     PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::DRY_MEDIUM},
+ };
+@@ -82,6 +83,24 @@ PyLongObject _BPy_MediumType_HUMID_MEDIU
+ PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = {
+     PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::OPAQUE_MEDIUM},
+ };
++#else
++#define NON_SIZE_BITS 3
++#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
++#define _Py_MediumType_DIGIT_INIT(val) \
++    { \
++        .ob_base = PyObject_HEAD_INIT(&MediumType_Type) \
++        .long_value  = { \
++            .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
++                (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
++                (val) == 0 ? 0 : 1), \
++            { ((val) >= 0 ? (val) : -(val)) }, \
++        } \
++    }
++
++PyLongObject _BPy_MediumType_DRY_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::DRY_MEDIUM);
++PyLongObject _BPy_MediumType_HUMID_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::HUMID_MEDIUM);
++PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::OPAQUE_MEDIUM);
++#endif
+ 
+ //-------------------MODULE INITIALIZATION--------------------------------
+ 
+--- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
++++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
+@@ -137,6 +137,7 @@ PyTypeObject Nature_Type = {
+ 
+ /*-----------------------BPy_Nature instance definitions ----------------------------------*/
+ 
++#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */
+ static PyLongObject _Nature_POINT = {PyVarObject_HEAD_INIT(&Nature_Type, 0){Nature::POINT}};
+ static PyLongObject _Nature_S_VERTEX = {PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::S_VERTEX}};
+ static PyLongObject _Nature_VIEW_VERTEX = {
+@@ -159,6 +160,36 @@ static PyLongObject _Nature_MATERIAL_BOU
+     PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::MATERIAL_BOUNDARY}};
+ static PyLongObject _Nature_EDGE_MARK = {
+     PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::EDGE_MARK}};
++#else
++#define NON_SIZE_BITS 3
++#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS))
++#define _Py_Nature_TypeType_DIGIT_INIT(val) \
++    { \
++        .ob_base = PyObject_HEAD_INIT(&Nature_Type) \
++        .long_value  = { \
++            .lv_tag = TAG_FROM_SIGN_AND_SIZE( \
++                (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \
++                (val) == 0 ? 0 : 1), \
++            { ((val) >= 0 ? (val) : -(val)) }, \
++        } \
++    }
++
++static PyLongObject _Nature_POINT = _Py_Nature_TypeType_DIGIT_INIT(Nature::POINT);
++static PyLongObject _Nature_S_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::S_VERTEX);
++static PyLongObject _Nature_VIEW_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::VIEW_VERTEX);
++static PyLongObject _Nature_NON_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::NON_T_VERTEX);
++static PyLongObject _Nature_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::T_VERTEX);
++static PyLongObject _Nature_CUSP = _Py_Nature_TypeType_DIGIT_INIT(Nature::CUSP);
++static PyLongObject _Nature_NO_FEATURE = _Py_Nature_TypeType_DIGIT_INIT(Nature::NO_FEATURE);
++static PyLongObject _Nature_SILHOUETTE = _Py_Nature_TypeType_DIGIT_INIT(Nature::SILHOUETTE);
++static PyLongObject _Nature_BORDER = _Py_Nature_TypeType_DIGIT_INIT(Nature::BORDER);
++static PyLongObject _Nature_CREASE = _Py_Nature_TypeType_DIGIT_INIT(Nature::CREASE);
++static PyLongObject _Nature_RIDGE = _Py_Nature_TypeType_DIGIT_INIT(Nature::RIDGE);
++static PyLongObject _Nature_VALLEY = _Py_Nature_TypeType_DIGIT_INIT(Nature::VALLEY);
++static PyLongObject _Nature_SUGGESTIVE_CONTOUR = _Py_Nature_TypeType_DIGIT_INIT(Nature::SUGGESTIVE_CONTOUR);
++static PyLongObject _Nature_MATERIAL_BOUNDARY = _Py_Nature_TypeType_DIGIT_INIT(Nature::MATERIAL_BOUNDARY);
++static PyLongObject _Nature_EDGE_MARK = _Py_Nature_TypeType_DIGIT_INIT(Nature::EDGE_MARK);
++#endif
+ 
+ #define BPy_Nature_POINT ((PyObject *)&_Nature_POINT)
+ #define BPy_Nature_S_VERTEX ((PyObject *)&_Nature_S_VERTEX)
+@@ -249,7 +280,12 @@ static PyObject *BPy_Nature_bitwise(PyOb
+   else {
+     result = PyObject_NewVar(BPy_Nature, &Nature_Type, 1);
+     if (result) {
++#if PY_VERSION_HEX >= 0x030c0000 /* Python 3.12 and newer */
++      result->i.long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE((v > 0 ? 1 : -1), 1);
++      result->i.long_value.ob_digit[0] = v;
++#else
+       result->i.ob_digit[0] = v;
++#endif
+     }
+   }
+   return (PyObject *)result;
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..7e321a9ad525cd 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
-version=4.3.1
-revision=1
+version=4.0.2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -24,23 +24,21 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel
  wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel
  libspnav-devel libwebp-devel potrace-devel Haru-devel
- pulseaudio-devel eigen lzo-devel vulkan-loader-devel shaderc"
+ pulseaudio-devel eigen lzo-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.blender.org"
 distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=81bce671a7eb80d6880b728e042f4a4f65e1c4ccca86429a21615b45f7aef2e9
+checksum=aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3
 python_version=3
 LDFLAGS="-Wl,-z,stack-size=2097152"
 # Blender tests are executed against a system installation of blender. This
 # is currently not supported by xbps-src.
 make_check=no
 
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	configure_args+=" -DWITH_LZMA=OFF"
-else
+if [ "$XBPS_TARGET_LIBC" != musl ]; then
 	makedepends+=" jemalloc-devel"
 fi
 
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index e078072cc2ce1a..bb4115b017bbdb 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -1,7 +1,7 @@
 # Template file for 'bluefish'
 pkgname=bluefish
 version=2.2.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-spell-check --disable-update-databases
  --disable-xml-catalog-update $(vopt_enable python)"
diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index fdcba73b29d4db..ddb98862d354e1 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool iproute2 pkg-config python3-Cython glib-devel
diff --git a/srcpkgs/blueprint-compiler/template b/srcpkgs/blueprint-compiler/template
index 4569bf5e8e2003..3e175a97a4201a 100644
--- a/srcpkgs/blueprint-compiler/template
+++ b/srcpkgs/blueprint-compiler/template
@@ -1,7 +1,7 @@
 # Template file for 'blueprint-compiler'
 pkgname=blueprint-compiler
 version=0.14.0
-revision=2
+revision=1
 build_style=meson
 depends="python3-gobject"
 checkdepends="${depends} libadwaita-devel xvfb-run"
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 2ab14be4992afd..e21c2b3b95971c 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.83.0
-revision=6
+revision=4
 build_style=meta
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel libzstd-devel"
@@ -216,9 +216,7 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	_depends="${subpackages/boost-devel}"
-	_depends="${_depends/libboost_mpi-python3}"
-	depends="${_depends/boost-python3}"
+	depends="boost ${subpackages/boost-devel}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 3d3cc4cb0dea34..60b8d989aa4e0f 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,7 +1,7 @@
 # Template file for 'bootchart2'
 pkgname=bootchart2
 version=0.14.9
-revision=5
+revision=4
 build_style=gnu-makefile
 make_install_args="EARLY_PREFIX=/usr DOCDIR=/usr/share/doc/bootchart2"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index 5ab97fc7100550..aabf178923d305 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,7 +1,7 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.4.0
-revision=2
+revision=1
 build_style=python3-module
 make_check_args="-k not((benchmark)or(readonly))"
 make_check_target="build/lib.*/borg/testsuite"
diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 6ef042f30e7aaa..d584c417c2b487 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,7 +1,7 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
 version=1.9.2
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="borg python3-setuptools python3-ruamel.yaml python3-jsonschema
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 66703f66bcbae6..43573d95864260 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.19.3
-revision=4
+revision=3
 build_style=gnu-makefile
 hostmakedepends="doxygen python3"
 makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
diff --git a/srcpkgs/brltty/patches/python3-bindings.patch b/srcpkgs/brltty/patches/python3-bindings.patch
deleted file mode 100644
index ef977ee8e25ccf..00000000000000
--- a/srcpkgs/brltty/patches/python3-bindings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Python bindings will be built directly in the xbps-src template.
-
---- a/Bindings/Python/Makefile.in
-+++ b/Bindings/Python/Makefile.in
-@@ -45,10 +45,7 @@
- all: $(PYTHON_API)
- 
- $(PYTHON_API): brlapi.auto.c $(API_HDRS) brlapi
--	set -- $(V_setup) build --build-temp .; \
--	[ "@host_os@" != "mingw32" ] || set -- "$${@}" --compiler mingw32; \
--	"$(PYTHON)" ./setup.py "$${@}"
--	[ "@host_os@" != "mingw32" ] || "$(PYTHON)" ./setup.py $(V_setup) bdist_wininst --skip-build
-+	echo "To be built directly..."
- 
- brlapi.auto.c: $(SRC_DIR)/brlapi.pyx $(SRC_DIR)/c_brlapi.pxd constants.auto.pyx
- 	"$(CYTHON)" -$(PYTHON_VERSION) -I. -o $@ $(SRC_DIR)/brlapi.pyx
-@@ -62,10 +59,7 @@
- INSTALLED_FILES = installed-files
- 
- install: all
--	set -- $(V_setup) install --skip-build --record "$(INSTALLED_FILES)"; \
--	[ -z "$(PYTHON_DESTDIR)" ] || set -- "$${@}" --root "$(PYTHON_DESTDIR)"; \
--	[ -z "$(PYTHON_PREFIX)" ] || set -- "$${@}" --prefix "$(PYTHON_PREFIX)"; \
--	"$(PYTHON)" ./setup.py "$${@}"
-+	echo "To be installed directly..."
- 
- uninstall:
- 	[ ! -f "$(INSTALLED_FILES)" ] || rm -f -- `$(AWK) '{printf "%s%s ", "$(PYTHON_DESTDIR)", $$0}' "$(INSTALLED_FILES)"`
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index c29190d18a0e0e..c92b681ea57067 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,8 +1,9 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.4
-revision=12
+revision=11
 build_style=gnu-configure
+build_helper=python3
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
 hostmakedepends="pkg-config python3-Cython"
@@ -28,7 +29,6 @@ pre_configure() {
 		*-musl) # There is no ldconfig in musl libc
 			sed -e "s;/sbin/ldconfig -n;echo;" -i configure ;;
 	esac
-
 	export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}"
 	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 }
@@ -40,31 +40,8 @@ post_configure() {
 	esac
 }
 
-post_build() {
-	# brltty has two problems with the xbps-src cross environment:
-	#
-	# - brltty has a lock.h that will be overshadowed by Python's lock.h
-	#   when the build helper overrides CFLAGS to prefer the cross root
-	#
-	# - The brltty build process drops critical environment variables for
-	#   cross compilation of Python exctensions
-	#
-	# To work around this, just manually build the Python package.
-
-	cd Bindings/Python
-	. "${XBPS_BUILDHELPERDIR}/python3.sh"
-	python3 setup.py build --build-temp .
-}
-
 do_install() {
-	make INSTALL_ROOT="${DESTDIR}" install
-
-	local _inst_args=(
-	 --skip-build --record=installed-files --root="${DESTDIR}" --prefix=/usr
-	)
-
-	( cd Bindings/Python && python3 ./setup.py install "${_inst_args[@]}" )
-
+	make INSTALL_ROOT=${DESTDIR} install
 	vsv brltty
 	vsconf Documents/brltty.conf
 	vdoc Documents/ChangeLog
diff --git a/srcpkgs/btrfs-backup/template b/srcpkgs/btrfs-backup/template
index d8b582aab8f0a0..2fa61f3f215560 100644
--- a/srcpkgs/btrfs-backup/template
+++ b/srcpkgs/btrfs-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-backup'
 pkgname=btrfs-backup
 version=0.3.1
-revision=7
+revision=6
 build_style=python3-module
 pycompile_module="${pkgname/-/_}"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template
index 3d47729dd50fcd..fee78f71f8346c 100644
--- a/srcpkgs/bum/template
+++ b/srcpkgs/bum/template
@@ -1,7 +1,7 @@
 # Template file for 'bum'
 pkgname=bum
 version=0.1.3
-revision=10
+revision=9
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-mpd2 python3-musicbrainzngs python3-mpv"
diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index 0fdec478d798ae..ea126cb4331619 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -1,7 +1,7 @@
 # Template file for 'bumblebee-status'
 pkgname=bumblebee-status
 version=2.1.6
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-psutil python3-requests"
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 2102b619c8c1f5..49203917aea376 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -1,7 +1,7 @@
 # Template file for 'bup'
 pkgname=bup
 version=0.33.4
-revision=2
+revision=1
 build_style=configure
 hostmakedepends="pkg-config python3 perl git pandoc"
 makedepends="python3-devel readline-devel acl-devel"
diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template
index cfcb1f0865f9f6..1be01775dfb6ec 100644
--- a/srcpkgs/cadence/template
+++ b/srcpkgs/cadence/template
@@ -1,7 +1,7 @@
 # Template file for 'cadence'
 pkgname=cadence
 version=0.9.2
-revision=6
+revision=5
 build_style=gnu-makefile
 pycompile_dirs="usr/share/cadence/src"
 hostmakedepends="pkg-config qt5-host-tools python3-PyQt5-devel-tools"
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 0c4b10a4347343..6f18114aaddd9e 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
 version=4.0.2
-revision=6
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 38f29853366ee8..67d50e12697e4a 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=20
+revision=19
 build_style=cmake
 hostmakedepends="gettext pkg-config python3-setuptools python3-devel vala-devel"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index e4ee8bb72b14e7..b5b2724cea9eb2 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=7.21.0
-revision=2
+revision=1
 build_helper=python3
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config cmake python3-BeautifulSoup4 python3-Pillow
diff --git a/srcpkgs/canto-curses/patches/python-3.13.patch b/srcpkgs/canto-curses/patches/python-3.13.patch
deleted file mode 100644
index bba7bfcc21e8e9..00000000000000
--- a/srcpkgs/canto-curses/patches/python-3.13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Taken from Arch. Cf.
-
-  https://gitlab.archlinux.org/archlinux/packaging/packages/canto-curses
-
-diff --unified --recursive --text --new-file canto-curses-0.9.9.orig/canto_curses/widecurse.c canto-curses-0.9.9/canto_curses/widecurse.c
---- canto-curses-0.9.9.orig/canto_curses/widecurse.c	2024-11-19 06:55:26.703201292 +0100
-+++ canto-curses-0.9.9/canto_curses/widecurse.c	2024-11-19 06:55:39.423227011 +0100
-@@ -6,9 +6,12 @@
-    published by the Free Software Foundation.
- */
- 
-+#define NCURSES_INTERNALS 1
- #include <Python.h>
-+#include <curses.h>
- #include <py_curses.h>
- #include <readline/readline.h>
-+#include <wchar.h>
- 
- static PyObject *py_wcwidth(PyObject * self, PyObject * args)
- {
diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index 0b3ce4c3c0daec..ffe8a687fdcbe4 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,7 +1,7 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=11
+revision=10
 build_style=python3-module
 pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index f61782a89824fa..11a2d055da0dcb 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,7 +1,7 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.8
-revision=4
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
index 86e50c8a401772..06ca41eb68b648 100644
--- a/srcpkgs/capstone/template
+++ b/srcpkgs/capstone/template
@@ -1,7 +1,7 @@
 # Template file for 'capstone'
 pkgname=capstone
 version=5.0.1
-revision=3
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/cargo-update/files/Cargo.lock b/srcpkgs/cargo-update/files/Cargo.lock
new file mode 100644
index 00000000000000..138562bb0d9389
--- /dev/null
+++ b/srcpkgs/cargo-update/files/Cargo.lock
@@ -0,0 +1,879 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "array_tool"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cargo-update"
+version = "16.0.0"
+dependencies = [
+ "array_tool",
+ "clap",
+ "curl",
+ "embed-resource",
+ "git2",
+ "hex",
+ "home",
+ "json-deserializer",
+ "semver",
+ "serde",
+ "serde_derive",
+ "tabwriter",
+ "toml",
+ "url",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+dependencies = [
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "atty",
+ "bitflags 1.3.2",
+ "clap_lex",
+ "indexmap 1.9.3",
+ "once_cell",
+ "strsim",
+ "termcolor",
+ "terminal_size",
+ "textwrap",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "curl"
+version = "0.4.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
+dependencies = [
+ "curl-sys",
+ "libc",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "socket2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "curl-sys"
+version = "0.4.77+curl-8.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480"
+dependencies = [
+ "cc",
+ "libc",
+ "libnghttp2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "embed-resource"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa"
+dependencies = [
+ "cc",
+ "memchr",
+ "rustc_version",
+ "toml",
+ "vswhom",
+ "winreg",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "git2"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "openssl-probe",
+ "openssl-sys",
+ "url",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "json-deserializer"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f63b421e16eb4100beb677af56f0b4f3a4f08bab74ef2af079ce5bb92c2683f"
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libgit2-sys"
+version = "0.17.0+1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+dependencies = [
+ "cc",
+ "libc",
+ "libssh2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "libnghttp2-sys"
+version = "0.1.10+1.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "libssh2-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-src"
+version = "300.4.0+3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+dependencies = [
+ "cc",
+ "libc",
+ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "os_str_bytes"
+version = "6.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.37.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.214"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.214"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "2.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tabwriter"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a327282c4f64f6dc37e3bba4c2b6842cc3a992f204fa58d917696a89f691e5f6"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
+dependencies = [
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+dependencies = [
+ "terminal_size",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap 2.6.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "url"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "vswhom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
+dependencies = [
+ "libc",
+ "vswhom-sys",
+]
+
+[[package]]
+name = "vswhom-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index babfc7469121c1..a5ac4608928e43 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -13,11 +13,11 @@ changelog="https://github.com/nabijaczleweli/cargo-update/releases"
 distfiles="https://github.com/nabijaczleweli/cargo-update/archive/refs/tags/v${version}.tar.gz"
 checksum=50ab6c2f4c66057cdb337fe1bbb5df5b018acca88b059db0db58aa1664b44285
 
-post_patch() {
+post_extract() {
 	# Upstream does not ship a lockfile and is very vocal about that being
 	# the right way:
 	# https://github.com/nabijaczleweli/cargo-update/issues/50
-	cargo generate-lockfile
+	cp ${FILESDIR}/Cargo.lock .
 }
 
 post_install() {
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index fe0277f2ef12a2..62a4559e1f9c64 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,7 +1,7 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.21
-revision=9
+revision=8
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module
diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template
index 84ec67e2b22bdf..b63ab64ee2e48c 100644
--- a/srcpkgs/castero/template
+++ b/srcpkgs/castero/template
@@ -1,7 +1,7 @@
 # Template file for 'castero'
 pkgname=castero
 version=0.9.5
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 # taken from https://github.com/xgi/castero/blob/master/requirements.txt,
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 3f49732d0a8b3a..dd4ba0d57ae4d8 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,7 +1,7 @@
 # Template file for 'catfish'
 pkgname=catfish
 version=4.18.0
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
 depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject
diff --git a/srcpkgs/ccsm/template b/srcpkgs/ccsm/template
index 1b5064ce6a7e8c..e0d6e453f77260 100644
--- a/srcpkgs/ccsm/template
+++ b/srcpkgs/ccsm/template
@@ -1,7 +1,7 @@
 # Template file for 'ccsm'
 pkgname=ccsm
 version=0.8.18
-revision=7
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools intltool"
 depends="compizconfig-python python3-xlib python3-gobject"
diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index eb3af81533d080..e2eba12d60275d 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
 version=2.10.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel"
 depends="certbot python3-acme python3-augeas python3-zope.interface"
diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 47b76dbaa1828a..dd8172f7f76e15 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
 version=2.10.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel"
 depends="certbot python3-acme python3-parsing python3-zope.interface"
diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 92650a284532d8..efa83137bbafea 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot'
 pkgname=certbot
 version=2.10.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel"
 depends="python3-acme python3-ConfigArgParse python3-configobj
diff --git a/srcpkgs/chirp/template b/srcpkgs/chirp/template
index bcaf978d39670d..b5673298dacb9a 100644
--- a/srcpkgs/chirp/template
+++ b/srcpkgs/chirp/template
@@ -1,7 +1,7 @@
 # Template file for 'chirp'
 pkgname=chirp
 version=20241025
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-six wxPython python3-pyserial python3-requests
diff --git a/srcpkgs/cinnamon-control-center/patches/musl.diff b/srcpkgs/cinnamon-control-center/patches/musl.diff
new file mode 100644
index 00000000000000..860b0c4195e59a
--- /dev/null
+++ b/srcpkgs/cinnamon-control-center/patches/musl.diff
@@ -0,0 +1,19 @@
+Include networkmanager header after the musl ones, to avoid conflicts.
+
+diff --git a/panels/network/wireless-security/utils.c b/panels/network/wireless-security/utils.c
+index b74424d..2bb543f 100644
+--- a/panels/network/wireless-security/utils.c
++++ b/panels/network/wireless-security/utils.c
+@@ -20,11 +20,10 @@
+  * Copyright 2007 - 2015 Red Hat, Inc.
+  */
+ 
+-#include "nm-default.h"
+-
+ #include <string.h>
+ #include <netinet/ether.h>
+ 
++#include "nm-default.h"
+ #include "utils.h"
+ 
+ /**
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 0a046d5d741c8d..ead98639c4accc 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=6.4.1
+version=5.8.2
 revision=2
 build_style=meson
 build_helper=gir
@@ -10,16 +10,15 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libcanberra-devel libgnomekbd-devel
  libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
-depends="libcinnamon-control-center>=${version}_${revision}
- cinnamon-settings-daemon cinnamon-translations desktop-file-utils
- hicolor-icon-theme gnome-color-manager"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
+depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
+ cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
 short_desc="Cinnamon Control Center"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-control-center"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=a68886524ce3f18952bc79d28061b71fc48a24e5dac5175874e3d390425bad92
+checksum=8905b9ddf0c9b8ef98c47c2f4a1fd5e0b944d4955a05b4534b1c54d13c7241e5
 # requires X and wacom devices?
 make_check=no
 
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 3a3c1361dcef6f..a61bb56b558796 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=6.4.1
+version=5.8.0
 revision=2
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-desktop"
 distfiles="https://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"
-checksum=0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f
+checksum=53080bd27527a8271d659e143a8d3b333d9b85efc82b77e571075f9cf8d3287c
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 72da334005730b..e923c3cc863240 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=6.4.0
-revision=2
+version=5.8.0
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="glib-devel intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-menus"
 distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz"
-checksum=9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452
+checksum=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index a947aaed049f31..906f49f861ea5b 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=6.4.0
-revision=3
+version=5.8.1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext-devel glib-devel pkg-config python3-devel"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-screensaver"
 distfiles="https://github.com/linuxmint/cinnamon-screensaver/archive/${version}.tar.gz"
-checksum=e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422
+checksum=8959f03a9e7e2b2760a8fb5c7129d2431021ca193ff4ebcac59c4bbda95a8319
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index efacd6c3522d53..6dad113168c6e1 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=6.4.0
-revision=2
+version=5.8.1
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="pkg-config gettext-devel dbus-glib-devel glib-devel intltool
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-session"
 distfiles="https://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"
-checksum=464075d920df360b5ad94f72395a09b5fbf8b14f0190406ec76055a17659e243
+checksum=bf8a4b622900c3b9c3d917bcacc1bbaed74aa07c69270f6fc53783a65b4687eb
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 542aeaa00363c6..e1a57b6c278141 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=6.4.2
-revision=2
+version=5.8.1
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="dbus-glib-devel gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
- nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
+ nss-devel polkit-devel pulseaudio-devel upower-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Cinnamon Settings Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-settings-daemon"
 distfiles="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz"
-checksum=15e15d7e87d9c51271c0b042ed4177efa12622cf51bf1f2fa68e374757735512
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 9cc599923b1cb4..794d42bb0dcd8f 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=6.4.1
+version=5.8.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-translations/"
 distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}/cinnamon-translations-${version}.tar.gz"
-checksum=ef2b9e78a4d9bdb0e4374e8d387405f2de16471526dc36aa9b32f9718fa586e3
+checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8
 
 do_install() {
 	vmkdir usr
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index f1ae3d8ed6e5b6..d4184be444372c 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,32 +1,31 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=6.4.2
-revision=3
+version=5.8.4
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
- gtk-doc python3-libsass"
+ gtk-doc"
 makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel
- gcr-devel"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
 depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
- cinnamon-translations>=${version%.*} nemo>=${version%.*} gnome-themes-extra
- gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
- polkit-gnome upower libkeybinder3 python3-dbus python3-gobject
- python3-pam python3-pexpect python3-Pillow python3-inotify python3-tinycss2
- python3-pytz python3-distro python3-requests libtimezonemap libsoup
- xdg-desktop-portal-xapp gettext"
+ cinnamon-translations>=${version%.*} nemo>=${version%.*}
+ gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
+ network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap
+ libsoup"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
-checksum=56e2c5f2449f3fc6b0f378f2da98efdfe7a721b84e3c001fb16a14d85b399a97
+checksum=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
 
 python_version=3
 pycompile_dirs="
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 00000000000000..3c1c7e0599f476
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index f9bf7ed8de3dad..319bae6b2b1302 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=6.4.0
-revision=2
+version=5.8.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="pkg-config glib-devel dbus xvfb-run gtk+3"
-makedepends="readline-devel mozjs115-devel"
+makedepends="readline-devel mozjs102-devel"
 depends="gtk+3"
 short_desc="Javascript for Cinnamon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cjs"
 distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
-checksum=55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a
+checksum=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
 make_check_pre="xvfb-run"
 
 pre_configure() {
diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 629124d9e0633a..3652abb888a14f 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,7 +1,7 @@
 # Template file for 'clearine'
 pkgname=clearine
 version=0.7
-revision=9
+revision=8
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 python3-cairo"
diff --git a/srcpkgs/cmakelang/template b/srcpkgs/cmakelang/template
index 936f72e358a3c0..f3888244216889 100644
--- a/srcpkgs/cmakelang/template
+++ b/srcpkgs/cmakelang/template
@@ -1,7 +1,7 @@
 # Template file for 'cmakelang'
 pkgname=cmakelang
 version=0.6.13
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six"
diff --git a/srcpkgs/coccigrep/template b/srcpkgs/coccigrep/template
index 6dbe65444ef421..b651a489c68da0 100644
--- a/srcpkgs/coccigrep/template
+++ b/srcpkgs/coccigrep/template
@@ -1,7 +1,7 @@
 # Template file for 'coccigrep'
 pkgname=coccigrep
 version=1.20
-revision=6
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="coccinelle python3-Pygments"
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 68115ac7edc94e..1b0b1d192ce8cd 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
index 32f9ec703770f1..9f790d0d663b72 100644
--- a/srcpkgs/compizconfig-python/template
+++ b/srcpkgs/compizconfig-python/template
@@ -1,7 +1,7 @@
 # Template file for 'compizconfig-python'
 pkgname=compizconfig-python
 version=0.8.18
-revision=8
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool pkg-config glib-devel gettext-devel
diff --git a/srcpkgs/configshell-fb/template b/srcpkgs/configshell-fb/template
index 60204d519c0019..f198b1c1ceb1a9 100644
--- a/srcpkgs/configshell-fb/template
+++ b/srcpkgs/configshell-fb/template
@@ -1,7 +1,7 @@
 # Template file for 'configshell-fb'
 pkgname=configshell-fb
 version=1.1.29
-revision=5
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six python3-urwid python3-parsing"
diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
index 70101503437cb9..d0f38678f41633 100644
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'console-setup'
 pkgname=console-setup
-version=1.233
+version=1.232
 revision=1
 hostmakedepends="perl"
 depends="kbd ckbcomp"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/console-setup"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=a53bb455ea02a964d246052c1b18809299d8f13ca6cda07dc2c8b15f498da5c6
+checksum=5eed5aef9ae3aee0bb0d3e6815d788c6ac003c5beee39536ab2c1e53d0cd8f7c
 conf_files="/etc/console-setup/console-setup
  /etc/console-setup/keyboard"
 
diff --git a/srcpkgs/cookiecutter/template b/srcpkgs/cookiecutter/template
index 441e4479553421..d6afe121113457 100644
--- a/srcpkgs/cookiecutter/template
+++ b/srcpkgs/cookiecutter/template
@@ -1,7 +1,7 @@
 # Template file for 'cookiecutter'
 pkgname=cookiecutter
 version=2.6.0
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Arrow python3-Jinja2 python3-binaryornot python3-click
diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template
index bfce84ede1f827..d84bb642f6de0d 100644
--- a/srcpkgs/coursera-dl/template
+++ b/srcpkgs/coursera-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'coursera-dl'
 pkgname=coursera-dl
 version=0.11.5
-revision=7
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-attrs python3-setuptools python3-pyasn1 python3-ConfigArgParse
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 56c4f11d12f6d1..73b171ff953cb9 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,14 +1,12 @@
 # Template file for 'cozy'
 pkgname=cozy
 version=1.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
  python3-mutagen python3-gobject-devel gettext desktop-file-utils
  gtk+3-devel"
-# FIXME: libgladeui3 added only to resolve ordering for Python rebuilds
-makedepends="libadwaita-devel glib-devel python3-gobject-devel libhandy1-devel
- granite-devel libgladeui3"
+makedepends="libadwaita-devel glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite libdazzle"
diff --git a/srcpkgs/cppman/template b/srcpkgs/cppman/template
index 524733390c853d..65402c167c389b 100644
--- a/srcpkgs/cppman/template
+++ b/srcpkgs/cppman/template
@@ -1,7 +1,7 @@
 # Template file for 'cppman'
 pkgname=cppman
 version=0.5.6
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-html5lib python3-lxml"
diff --git a/srcpkgs/cpuset/template b/srcpkgs/cpuset/template
index 7bdb2d8b63bf9c..8bb7fb9b6b4502 100644
--- a/srcpkgs/cpuset/template
+++ b/srcpkgs/cpuset/template
@@ -1,7 +1,7 @@
 # Template file for 'cpuset'
 pkgname=cpuset
 version=1.6.2
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 short_desc="Wrapper to make kernel cpusets facilities easier to use"
diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template
index 4da03cc94d54d9..ebe79c5ce0d793 100644
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@@ -1,7 +1,7 @@
 # Template file for 'criu'
 pkgname=criu
 version=3.18
-revision=3
+revision=2
 # i686 unsupported upstream: https://criu.org/32bit_tasks_C/R#Compatible_applications
 # ppc64 big endian not supported upstream
 archs="x86_64* aarch64* ppc64le* armv6l* armv7l*"
diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template
index c90b5790eb80d3..62f225ee15c46b 100644
--- a/srcpkgs/cropgui/template
+++ b/srcpkgs/cropgui/template
@@ -1,7 +1,7 @@
 # Template file for 'cropgui'
 pkgname=cropgui
 version=0.9
-revision=2
+revision=1
 hostmakedepends="which python3-setuptools"
 depends="python3-Pillow python3-gobject libjpeg-turbo-tools ImageMagick exiftool gtk+3"
 short_desc="Gtk frontend for lossless cropping of jpeg images"
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index 65da639ef08cdf..0d4b70e59bd29d 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -1,17 +1,16 @@
 # Template file for 'cross-arm-none-eabi-gdb'
 pkgname=cross-arm-none-eabi-gdb
-version=15.2
-revision=1
+version=13.2
+revision=2
 build_style=gnu-configure
-configure_args="--target=arm-none-eabi --disable-werror --disable-nls
- --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
- --without-isl $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
-hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel)
- $(vopt_if guile guile)"
+configure_args="--target=arm-none-eabi --disable-werror --disable-nls --with-system-readline
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib --without-isl
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
 # mpfr is necessary to emulate target floating point behavior
 # babeltrace is necessary for Common Trace Format support
-makedepends="expat-devel ncurses-devel readline-devel zlib-devel
- gmp-devel babeltrace-devel mpfr-devel
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ babeltrace-devel mpfr-devel
  $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')"
 depends="gdb-common"
 short_desc="GNU Debugger for ARM"
@@ -19,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=83350ccd35b5b5a0cba6b334c41294ea968158c573940904f00b92f76345314d
+checksum=fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
 make_check=no  # See gdb/template.
 
 if [ "${CROSS_BUILD}" ]; then
diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 0b6e8b49da1cf9..199782284f5be8 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.18.1
-revision=4
+revision=3
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1
diff --git a/srcpkgs/ctop/template b/srcpkgs/ctop/template
index 051daa0116f20a..28566c53adcb2d 100644
--- a/srcpkgs/ctop/template
+++ b/srcpkgs/ctop/template
@@ -1,7 +1,7 @@
 # Template file for 'ctop'
 pkgname=ctop
 version=1.0.0
-revision=9
+revision=8
 build_style=python3-module
 pycompile_module="cgroup_top.py"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/curl/patches/fix-content-encoding.patch b/srcpkgs/curl/patches/fix-content-encoding.patch
new file mode 100644
index 00000000000000..f64546b6e082fe
--- /dev/null
+++ b/srcpkgs/curl/patches/fix-content-encoding.patch
@@ -0,0 +1,26 @@
+From 878bc429f26c27294787dc59d7b53345d9edc5aa Mon Sep 17 00:00:00 2001
+From: Jesus Malo Poyatos <jmalopoy@opentext.com>
+Date: Thu, 7 Nov 2024 14:00:53 +0100
+Subject: [PATCH] setopt: fix CURLOPT_HTTP_CONTENT_DECODING
+
+Regression from 30da1f5974d34841b30c4f (shipped in 8.11.0)
+
+Fixes #15511
+Closes #15510
+---
+ lib/setopt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/setopt.c b/lib/setopt.c
+index 4f0697212739ef..ba80644bc73279 100644
+--- a/lib/setopt.c
++++ b/lib/setopt.c
+@@ -1146,7 +1146,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
+     /*
+      * raw data passed to the application when content encoding is used
+      */
+-    data->set.http_ce_skip = enabled;
++    data->set.http_ce_skip = !enabled; /* reversed */
+     break;
+ 
+ #if !defined(CURL_DISABLE_FTP) || defined(USE_SSH)
diff --git a/srcpkgs/curl/patches/fix-netrc.patch b/srcpkgs/curl/patches/fix-netrc.patch
new file mode 100644
index 00000000000000..39ecce44dde0cb
--- /dev/null
+++ b/srcpkgs/curl/patches/fix-netrc.patch
@@ -0,0 +1,214 @@
+From d8010d956f09069d1d6b474abdee5864569e6920 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 7 Nov 2024 08:52:38 +0100
+Subject: [PATCH] duphandle: also init netrc
+
+The netrc init was only done in the Curl_open, meaning that a duplicated
+handle would not get inited properly.
+
+Added test 2309 to verify. It does netrc auth with a duplicated handle.
+
+Regression from 3b43a05
+
+Reported-by: tranzystorekk on github
+Fixes #15496
+Closes #15...
+---
+ lib/easy.c                 |  1 +
+ tests/data/Makefile.am     |  2 +-
+ tests/data/test2309        | 63 ++++++++++++++++++++++++++++++++++++
+ tests/libtest/Makefile.inc |  5 ++-
+ tests/libtest/lib2309.c    | 66 ++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 135 insertions(+), 2 deletions(-)
+ create mode 100644 tests/data/test2309
+ create mode 100644 tests/libtest/lib2309.c
+
+diff --git a/lib/easy.c b/lib/easy.c
+index d16fa8c07afec0..ac8fab34220d9b 100644
+--- a/lib/easy.c
++++ b/lib/easy.c
+@@ -940,6 +940,7 @@ CURL *curl_easy_duphandle(CURL *d)
+     goto fail;
+ 
+   Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER);
++  Curl_netrc_init(&outcurl->state.netrc);
+ 
+   /* the connection pool is setup on demand */
+   outcurl->state.lastconnect_id = -1;
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index 02bf2ae25bfd49..ea5221c00fd419 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -255,7 +255,7 @@ test2100 \
+ test2200 test2201 test2202 test2203 test2204 test2205 \
+ \
+ test2300 test2301 test2302 test2303 test2304 test2305 test2306 test2307 \
+-test2308 \
++test2308 test2309 \
+ \
+ test2400 test2401 test2402 test2403 test2404 test2405 test2406 \
+ \
+diff --git a/tests/data/test2309 b/tests/data/test2309
+new file mode 100644
+index 00000000000000..a7ab8ed83b4945
+--- /dev/null
++++ b/tests/data/test2309
+@@ -0,0 +1,63 @@
++<testcase>
++<info>
++<keywords>
++netrc
++HTTP
++</keywords>
++</info>
++#
++# Server-side
++<reply>
++<data crlf="yes" nocheck="yes">
++HTTP/1.1 200 OK
++Date: Tue, 09 Nov 2010 14:49:00 GMT
++Server: test-server/fake
++Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
++ETag: "21025-dc7-39462498"
++Accept-Ranges: bytes
++Content-Length: 6
++Connection: close
++Content-Type: text/html
++Funny-head: yesyes
++
++-foo-
++</data>
++</reply>
++
++#
++# Client-side
++<client>
++<server>
++http
++</server>
++
++# Reproducing issue 15496
++<name>
++HTTP with .netrc using duped easy handle
++</name>
++<tool>
++lib%TESTNUMBER
++</tool>
++<command>
++http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
++</command>
++<file name="%LOGDIR/netrc%TESTNUMBER" >
++
++machine github.com
++
++login daniel
++password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1
++</file>
++</client>
++
++<verify>
++<protocol>
++GET http://github.com/ HTTP/1.1
++Host: github.com
++Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%
++Accept: */*
++Proxy-Connection: Keep-Alive
++
++</protocol>
++</verify>
++</testcase>
+diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
+index 339a00fc4ed41e..8f58fd64229d5c 100644
+--- a/tests/libtest/Makefile.inc
++++ b/tests/libtest/Makefile.inc
+@@ -77,7 +77,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq                     \
+  lib1945 lib1946 lib1947 lib1948 lib1955 lib1956 lib1957 lib1958 lib1959 \
+  lib1960 lib1964 \
+  lib1970 lib1971 lib1972 lib1973 lib1974 lib1975 \
+- lib2301 lib2302 lib2304 lib2305 lib2306         lib2308 \
++ lib2301 lib2302 lib2304 lib2305 lib2306         lib2308 lib2309 \
+  lib2402 lib2404 lib2405 \
+  lib2502 \
+  lib3010 lib3025 lib3026 lib3027 \
+@@ -683,6 +683,9 @@ lib2306_LDADD = $(TESTUTIL_LIBS)
+ lib2308_SOURCES = lib2308.c $(SUPPORTFILES)
+ lib2308_LDADD = $(TESTUTIL_LIBS)
+ 
++lib2309_SOURCES = lib2309.c $(SUPPORTFILES)
++lib2309_LDADD = $(TESTUTIL_LIBS)
++
+ lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+ lib2402_LDADD = $(TESTUTIL_LIBS)
+ 
+diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c
+new file mode 100644
+index 00000000000000..009ff92817ab8c
+--- /dev/null
++++ b/tests/libtest/lib2309.c
+@@ -0,0 +1,66 @@
++/***************************************************************************
++ *                                  _   _ ____  _
++ *  Project                     ___| | | |  _ \| |
++ *                             / __| | | | |_) | |
++ *                            | (__| |_| |  _ <| |___
++ *                             \___|\___/|_| \_\_____|
++ *
++ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
++ *
++ * This software is licensed as described in the file COPYING, which
++ * you should have received as part of this distribution. The terms
++ * are also available at https://curl.se/docs/copyright.html.
++ *
++ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
++ * copies of the Software, and permit persons to whom the Software is
++ * furnished to do so, under the terms of the COPYING file.
++ *
++ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
++ * KIND, either express or implied.
++ *
++ * SPDX-License-Identifier: curl
++ *
++ ***************************************************************************/
++
++#include "test.h"
++#include "testtrace.h"
++
++#include <curl/curl.h>
++
++static size_t cb_curl(char *buffer, size_t size, size_t nmemb, void *userp)
++{
++  (void)buffer;
++  (void)size;
++  (void)nmemb;
++  (void)userp;
++  return CURL_WRITEFUNC_ERROR;
++}
++
++CURLcode test(char *URL)
++{
++  CURL *curl;
++  CURL *curldupe;
++  CURLcode res = CURLE_OK;
++
++  global_init(CURL_GLOBAL_ALL);
++  curl = curl_easy_init();
++  if(curl) {
++    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cb_curl);
++    curl_easy_setopt(curl, CURLOPT_URL, URL);
++    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
++    curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg3);
++    curl_easy_setopt(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED);
++    curl_easy_setopt(curl, CURLOPT_NETRC_FILE, libtest_arg2);
++
++    curldupe = curl_easy_duphandle(curl);
++    if(curldupe) {
++      res = curl_easy_perform(curldupe);
++      printf("Returned %d, should be %d.\n", res, CURLE_WRITE_ERROR);
++      fflush(stdout);
++      curl_easy_cleanup(curldupe);
++    }
++    curl_easy_cleanup(curl);
++  }
++  curl_global_cleanup();
++  return CURLE_OK;
++}
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index a6253fd2d9191b..30a17c5eb9930b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=8.11.1
-revision=2
+version=8.11.0
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  --with-random=/dev/urandom
@@ -30,7 +30,7 @@ license="MIT"
 homepage="https://curl.se"
 changelog="https://curl.se/changes.html"
 distfiles="https://curl.se/download/curl-${version}.tar.gz"
-checksum=a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80
+checksum=264537d90e58d2b09dddc50944baf3c38e7089151c8986715e2aaeaaf2b8118f
 build_options="gnutls gssapi idn ldap psl rtmp ssh ssl zstd"
 build_options_default="idn psl ssh ssl zstd"
 vopt_conflict ssl gnutls
diff --git a/srcpkgs/curseradio/template b/srcpkgs/curseradio/template
index 911d56f3a00216..d1e87c73399d41 100644
--- a/srcpkgs/curseradio/template
+++ b/srcpkgs/curseradio/template
@@ -1,7 +1,7 @@
 # Template file for 'curseradio'
 pkgname=curseradio
 version=0.0.20171017
-revision=9
+revision=8
 _commit=1bd4bd0faeec675e0647bac9a100b526cba19f8d
 build_style=python3-module
 pycompile_module="curseradio"
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index fdc3d7db29ea42..ad842ce190294f 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
 # Template file for 'cutter'
 pkgname=cutter
 version=2.3.4
-revision=3
+revision=2
 build_style=cmake
 configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins
  -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
diff --git a/srcpkgs/d-feet/template b/srcpkgs/d-feet/template
index 17211af6d0443b..37e65367988b41 100644
--- a/srcpkgs/d-feet/template
+++ b/srcpkgs/d-feet/template
@@ -1,7 +1,7 @@
 # Template file for 'd-feet'
 pkgname=d-feet
 version=0.3.16
-revision=5
+revision=4
 build_style=meson
 hostmakedepends="pkg-config gettext itstool python3-pycodestyle"
 makedepends="gtk+3-devel gobject-introspection"
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 7c464732902b8c..0c5c0b111553bd 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.1.1
-revision=3
+revision=2
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index 5ec41d20554074..3aff048055456b 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,7 +1,7 @@
 # Template file for 'devedeng'
 pkgname=devedeng
 version=4.17.0
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index a1c0475b7f0dbf..e9eb6999478153 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,7 +1,7 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
 version=260
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-progressbar
diff --git a/srcpkgs/discord/template b/srcpkgs/discord/template
index 7fd0f091e85073..ff6f67c3b13325 100644
--- a/srcpkgs/discord/template
+++ b/srcpkgs/discord/template
@@ -1,6 +1,6 @@
 # Template file for 'discord'
 pkgname=discord
-version=0.0.77
+version=0.0.76
 revision=1
 archs="x86_64"
 depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
@@ -10,7 +10,7 @@ maintainer="Ryan Conwell <ryanconwell@protonmail.com>"
 license="custom:Proprietary"
 homepage="https://discord.com"
 distfiles="https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"
-checksum=326ea477006c20e3a453570d81fc78119abfc5e64fc146f691e281918bf9da14
+checksum=cf96f2579e9b6d740ad28e901fd7267aa76383dff8bdb468866138620286354c
 repository=nonfree
 restricted=yes
 nopie=yes
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 3122b3c83206e1..f1685d9ac0ff2a 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,7 +1,7 @@
 # Template file for 'distcc'
 pkgname=distcc
 version=3.4
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--disable-Werror"
 conf_files="
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 10fe40551e185f..d727e81f632c09 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 # should be kept in sync with moby
 pkgname=docker-cli
-version=27.4.0
+version=27.3.1
 revision=1
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=50140bb5466b4a479dd1a1867cecb05a5536379d0da171c994a6be1334eeae70
+checksum=df7d44387166d90954e290dfbe0a278649bf71d0e89933615bdc0757580b68e4
 system_groups="docker"
 
 pre_build() {
diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index eba586c0494a9a..d2d48437a6e2e3 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
 version=0.3.4
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"
diff --git a/srcpkgs/dtrx/template b/srcpkgs/dtrx/template
index 78bb492442bf4f..f7299e4174270d 100644
--- a/srcpkgs/dtrx/template
+++ b/srcpkgs/dtrx/template
@@ -1,7 +1,7 @@
 # Template file for 'dtrx'
 pkgname=dtrx
 version=8.5.3
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
diff --git a/srcpkgs/duckdb/template b/srcpkgs/duckdb/template
index 93999411b92024..b72ae8fe58453c 100644
--- a/srcpkgs/duckdb/template
+++ b/srcpkgs/duckdb/template
@@ -1,7 +1,7 @@
 # Template file for 'duckdb'
 pkgname=duckdb
 version=1.1.3
-revision=2
+revision=1
 archs="x86_64* aarch64*" # 32-bit FTBFS
 build_style=cmake
 build_helper="python3"
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 1097fcac974fbc..0136439e1e0c8b 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,6 +1,6 @@
 # Template file for 'duplicity'
 pkgname=duplicity
-version=3.0.3.1
+version=2.2.3
 revision=1
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://duplicity.gitlab.io"
 changelog="https://gitlab.com/duplicity/duplicity/-/raw/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/d/duplicity/duplicity-${version}.tar.gz"
-checksum=33b5e5f28384ee51dd750f926273903604606bfc08a0c4a5c738064dc5c99c2e
+checksum=4ad43f93601b1a41fb5f642bdda1706a1fb75f8ef1d6d482dd7f23107eaee87d
 
 duplicity-doc_package() {
 	short_desc+=" - documentation"
diff --git a/srcpkgs/eduvpn-common/template b/srcpkgs/eduvpn-common/template
index 1ec33f0fc22331..43ae352e4b8a79 100644
--- a/srcpkgs/eduvpn-common/template
+++ b/srcpkgs/eduvpn-common/template
@@ -1,7 +1,7 @@
 # Template file for 'eduvpn-common'
 pkgname=eduvpn-common
 version=2.1.0
-revision=3
+revision=2
 build_style=go
 go_import_path=github.com/eduvpn/eduvpn-common
 hostmakedepends="python3-setuptools python3-wheel"
diff --git a/srcpkgs/edx-dl/template b/srcpkgs/edx-dl/template
index 50f3338aa60efb..a2221e54b798a2 100644
--- a/srcpkgs/edx-dl/template
+++ b/srcpkgs/edx-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'edx-dl'
 pkgname=edx-dl
 version=0.1.13
-revision=6
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-html5lib python3-setuptools
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 8f11be9033fea1..58c07e3b45283e 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,7 +1,7 @@
 # Template file for 'electrum'
 pkgname=electrum
 version=4.5.8
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pyqt6-devel-tools"
 depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 3c4f801f00f8fb..317b24e4e623b8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
 version=44.0
-revision=2
+revision=1
 build_style=meson
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config gettext"
diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 662150a2a110dd..3ea105b1295ada 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -1,7 +1,7 @@
 # Template file for 'eolie'
 pkgname=eolie
 version=0.9.101
-revision=3
+revision=2
 _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
 _po=d5aac9503b4af24e3df89f531305cf9a70e26549
 build_style=meson
diff --git a/srcpkgs/epy/template b/srcpkgs/epy/template
index 15ed2f1775c243..3eb1b98ff8dc4b 100644
--- a/srcpkgs/epy/template
+++ b/srcpkgs/epy/template
@@ -1,7 +1,7 @@
 # Template file for 'epy'
 pkgname=epy
 version=2023.6.11
-revision=3
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
 depends="python3"
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
index e55f059e42239e..6da23dff14d04d 100644
--- a/srcpkgs/ergo/template
+++ b/srcpkgs/ergo/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="github.com/ergochat/ergo"
 go_ldflags="-X main.version=$version"
 short_desc="Modern IRC server with integrated bouncer features and services"
-maintainer="Lydia Sobot <chilledfrogs@disroot.org>"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="MIT"
 homepage="https://ergo.chat/"
 changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
diff --git a/srcpkgs/esptool/template b/srcpkgs/esptool/template
index 66d32ee9a2f0c8..558dd2584aa96d 100644
--- a/srcpkgs/esptool/template
+++ b/srcpkgs/esptool/template
@@ -1,7 +1,7 @@
 # Template file for 'esptool'
 pkgname=esptool
 version=4.5.1
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-bitstring python3-cryptography python3-ecdsa python3-pyserial
diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template
index e33bba939c3e8f..786aebc8af17be 100644
--- a/srcpkgs/etcetera/template
+++ b/srcpkgs/etcetera/template
@@ -1,7 +1,7 @@
 # Template file for 'etcetera'
 pkgname=etcetera
 version=1.0
-revision=6
+revision=5
 pycompile_dirs="usr/lib/etcetera"
 depends="python3"
 short_desc="Config file management with a touch of wisdom"
diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index c455d9ddacba3e..3b165869aeb00f 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -1,7 +1,7 @@
 # Template file for 'etesync-dav'
 pkgname=etesync-dav
 version=0.32.1
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-etesync python3-etebase radicale2 python3-Flask python3-Flask-WTF"
diff --git a/srcpkgs/evemu/template b/srcpkgs/evemu/template
index 6bea4fbf7d0256..318860f92bd329 100644
--- a/srcpkgs/evemu/template
+++ b/srcpkgs/evemu/template
@@ -1,7 +1,7 @@
 # Template file for 'evemu'
 pkgname=evemu
 version=2.7.0
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config python3 asciidoc xmlto"
 makedepends="libevdev-devel"
diff --git a/srcpkgs/extension-manager/patches/f3768fb0227c714d7ed0613a28142613aa4a9c6b.patch b/srcpkgs/extension-manager/patches/f3768fb0227c714d7ed0613a28142613aa4a9c6b.patch
new file mode 100644
index 00000000000000..b32f8ab5e22fe1
--- /dev/null
+++ b/srcpkgs/extension-manager/patches/f3768fb0227c714d7ed0613a28142613aa4a9c6b.patch
@@ -0,0 +1,53 @@
+From f3768fb0227c714d7ed0613a28142613aa4a9c6b Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Mon, 29 Apr 2024 13:40:41 -0400
+Subject: [PATCH] backtrace: Define static functions only if `WITH_BACKTRACE`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The static functions are internal to file exm-backtrace.c and are only
+used to facilitate backtrace collection.  In build configurations with
+backtraces disabled ('meson setup -Dbacktrace=false'),
+exm_backtrace_print() will not call the static functions, so they are
+unused and thus need not be defined.
+
+Previously, due to how the preprocessor macros were arranged, the static
+variables in this file would not be defined when backtraces are
+disabled; if any static functions use them, then builds with backtraces
+disabled would fail due to a compiler error like:
+
+    ../extension-manager-0.5.1/src/exm-backtrace.c: In function ‘exm_backtrace_full_cb’:
+    ../extension-manager-0.5.1/src/exm-backtrace.c:58:9: error: ‘frames_omitted_count’ undeclared (first use in this function)
+       58 |         frames_omitted_count++;
+          |
+
+This commit fixes such errors when backtraces are disabled.
+
+Fixes: dcc312e (Make libbacktrace an optional dependency, 2023-06-03)
+Fixes: d63d301 (backtrace: Collate 'null' messages, 2024-04-01)
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/exm-backtrace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/exm-backtrace.c b/src/exm-backtrace.c
+index b6c3ae35..e7a449a8 100644
+--- a/src/exm-backtrace.c
++++ b/src/exm-backtrace.c
+@@ -33,7 +33,6 @@
+ #if WITH_BACKTRACE
+ static struct backtrace_state *state = NULL;
+ static int frames_omitted_count = 0;
+-#endif
+ 
+ static void
+ exm_backtrace_error_cb (void       *data,
+@@ -71,6 +70,7 @@ exm_backtrace_full_cb (GString    *string_builder,
+ 
+     return 0;
+ }
++#endif
+ 
+ void
+ exm_backtrace_init (char *filename)
diff --git a/srcpkgs/extension-manager/template b/srcpkgs/extension-manager/template
index 59b938d8e4ac60..23cbc0fd7a96ab 100644
--- a/srcpkgs/extension-manager/template
+++ b/srcpkgs/extension-manager/template
@@ -1,19 +1,19 @@
 # Template file for 'extension-manager'
 pkgname=extension-manager
-version=0.6.0
+version=0.5.1
 revision=1
 build_style=meson
 configure_args="-Dbacktrace=false"
 hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils
- glib-devel gtk4-update-icon-cache"
-makedepends="libadwaita-devel libsoup3-devel"
+ glib-devel gtk-update-icon-cache"
+makedepends="libadwaita-devel text-engine-devel"
 short_desc="Utility for browsing and installing GNOME Shell Extensions"
 maintainer="chrysos349 <chrysostom349@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mjakeman/extension-manager"
 changelog="https://github.com/mjakeman/extension-manager/releases"
 distfiles="https://github.com/mjakeman/extension-manager/archive/v${version}.tar.gz"
-checksum=7f9798d86e5e4f7213b618e8a69a2f6a943381dde8d37132bc497f5a9a848554
+checksum=b4cd95cbf45a3d046858fb44e78f3e3147a24279e77bfbbe8a422920f20a7b3b
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template
index 0815e9122ad9b6..469383a78e2240 100644
--- a/srcpkgs/eyeD3/template
+++ b/srcpkgs/eyeD3/template
@@ -1,7 +1,7 @@
 # Template file for 'eyeD3'
 pkgname=eyeD3
 version=0.9.6
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pylast python3-setuptools python3-deprecation python3-filetype"
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index 6d89b3ab841191..4b9d80f278dcbd 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
 # Template file for 'eza'
 pkgname=eza
-version=0.20.12
-revision=2
+version=0.20.11
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-1.8-devel"
@@ -12,8 +12,8 @@ homepage="https://eza.rocks"
 changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md"
 distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz
  https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz"
-checksum="c40edf02e662f6bba4997a3d497a30561c3d2de9a329f9869761acf8b7f69562
- 0395bf06eedcdef958ef4132c2fc60be18ba60eb275b10010c5bf1e7af6a3949"
+checksum="1a3ec9fb87c61e2369b46945ff1fafb7cbb5e6cb4693bb59003f4b628a93a04c
+ 325f28fb858618632a7a4737e08d2f03f645d2674133fe7b347fea873621de80"
 
 skip_extraction="man-${version}.tar.gz"
 
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 82db4745a2f5d7..578193b73a8519 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=1.1.0
-revision=1
+version=1.0.2
+revision=4
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
 depends="python3-pyasynchat"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=474fcc25afdaf929c74329d1e4d24420caabeea1ef2e041a267ce19269570bae
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
@@ -19,6 +19,10 @@ conf_files="
  /etc/fail2ban/filter.d/*.conf"
 make_dirs="/var/lib/fail2ban 0700 root root"
 
+pre_build() {
+	./fail2ban-2to3
+}
+
 post_install() {
 	vman man/jail.conf.5
 	rm -rf ${DESTDIR}/${py3_sitelib}/fail2ban/tests
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 7f9708f656401f..c07e969a6dcac7 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,7 +1,7 @@
 # Template file for 'fava'
 pkgname=fava
 version=1.27.3
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel python3-Babel"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
diff --git a/srcpkgs/fenrir/template b/srcpkgs/fenrir/template
index 78cf7be05e3853..b99bbbb973aeca 100644
--- a/srcpkgs/fenrir/template
+++ b/srcpkgs/fenrir/template
@@ -1,7 +1,7 @@
 # Template file for 'fenrir'
 pkgname=fenrir
 version=1.9.8
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3-evdev python3-daemonize python3-dbus python3-pyudev
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index fe8c69f4eaf573..8888f0bcb749ab 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,7 +1,7 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.30
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3 pkg-config"
diff --git a/srcpkgs/fftw/patches/clock-gettime.patch b/srcpkgs/fftw/patches/clock-gettime.patch
deleted file mode 100644
index 2fd37c837a930a..00000000000000
--- a/srcpkgs/fftw/patches/clock-gettime.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8fdc7b71354fbbbbc68fa8b2b810610ee41e052f Mon Sep 17 00:00:00 2001
-From: Frank Hartmann <frank.hartmann@dreamchip.de>
-Date: Fri, 5 Jan 2018 21:27:23 +0100
-Subject: [PATCH 1/2] linux: avoid using CLOCK_SGI_CYCLE
-
-The call clock_gettime(CLOCK_SGI_CYCLE, &t) from function getticks() fails with EINVAL.
-See : http://elixir.free-electrons.com/linux/latest/source/include/uapi/linux/time.h#L62 - "The driver implementing this got removed. The clock ID is kept as a place holder. Do not reuse!"
----
- kernel/cycle.h | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/cycle.h b/kernel/cycle.h
-index fe3dd50d6..21d206e35 100644
---- a/kernel/cycle.h
-+++ b/kernel/cycle.h
-@@ -437,8 +437,18 @@ INLINE_ELAPSED(__inline)
- #define HAVE_TICK_COUNTER
- #endif
- /*----------------------------------------------------------------*/
--/* SGI/Irix */
--#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) && !defined(HAVE_TICK_COUNTER) && !defined(__ANDROID__)
-+/* SGI/Irix/Linux but not android */
-+#if !defined(__ANDROID__)
-+#if defined(HAVE_CLOCK_GETTIME) && !defined(HAVE_TICK_COUNTER)
-+#if defined(CLOCK_MONOTONIC)
-+#define METHOD CLOCK_MONOTONIC
-+#elif defined(CLOCK_REALTIME)
-+#define METHOD CLOCK_REALTIME
-+#elif defined(CLOCK_SGI_CYCLE)
-+#define METHOD CLOCK_SGI_CYCLE
-+#endif
-+#endif
-+
- typedef struct timespec ticks;
- 
- static inline ticks getticks(void)
-
-From c68b27dedad182b0b222502d98cc9795787c2607 Mon Sep 17 00:00:00 2001
-From: Frank Hartmann <frank.hartmann@dreamchip.de>
-Date: Sun, 14 Jan 2018 16:52:30 +0100
-Subject: [PATCH 2/2] linux: avoid using CLOCK_SGI_CYCLE, use METHOD
-
----
- kernel/cycle.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kernel/cycle.h b/kernel/cycle.h
-index 21d206e35..777d1cda5 100644
---- a/kernel/cycle.h
-+++ b/kernel/cycle.h
-@@ -438,8 +438,8 @@ INLINE_ELAPSED(__inline)
- #endif
- /*----------------------------------------------------------------*/
- /* SGI/Irix/Linux but not android */
--#if !defined(__ANDROID__)
--#if defined(HAVE_CLOCK_GETTIME) && !defined(HAVE_TICK_COUNTER)
-+#if !defined(__ANDROID__) && !defined(HAVE_TICK_COUNTER)
-+#if defined(HAVE_CLOCK_GETTIME)
- #if defined(CLOCK_MONOTONIC)
- #define METHOD CLOCK_MONOTONIC
- #elif defined(CLOCK_REALTIME)
-@@ -454,7 +454,7 @@ typedef struct timespec ticks;
- static inline ticks getticks(void)
- {
-      struct timespec t;
--     clock_gettime(CLOCK_SGI_CYCLE, &t);
-+     clock_gettime(METHOD, &t);
-      return t;
- }
- 
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index 5314c877db8146..24354bb396296c 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -1,7 +1,7 @@
 # Template file for 'fftw'
 pkgname=fftw
 version=3.3.10
-revision=3
+revision=2
 hostmakedepends="libtool automake cmake-bootstrap"
 makedepends="libgomp-devel"
 short_desc="Library for computing the discrete Fourier transform (DFT)"
diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template
index ca3dc48a4968e0..17ae6e20ac916e 100644
--- a/srcpkgs/fierce/template
+++ b/srcpkgs/fierce/template
@@ -1,7 +1,7 @@
 # Template file for 'fierce'
 pkgname=fierce
 version=1.6.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
 depends="python3-dnspython"
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index fc9a6f6b528720..826a1ef87524bf 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
 # Template file for 'fifengine'
 pkgname=fifengine
 version=0.4.2
-revision=15
+revision=14
 build_style=cmake
 hostmakedepends="swig python3 python3-setuptools"
 makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 42f11793bf3e90..da04ad2de51080 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=133.0.3
-revision=2
+version=133.0
+revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version/beta/b}/source/firefox-${version/beta/b}.source.tar.xz"
-checksum=f134a5420200bb03ab460f9d2867507c0edb222ce73faf4064cdbea02a0aca1b
+checksum=492b2c9a3b6d215e38ce490624e8b2b9473419accdeaddb24ba00bc6adc3cc60
 
 lib32disabled=yes
 _llvmver=19
diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 5a69f175c87a0a..3708cf9574ca7a 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,7 +1,7 @@
 # Template file for 'flake8'
 pkgname=flake8
 version=7.0.0
-revision=2
+revision=1
 build_style=python3-pep517
 make_check_target="tests/unit"
 make_check_args="--ignore=tests/unit/plugins/pycodestyle_test.py
diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index f1cf858e4d6160..659835de6d4d7f 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,6 +1,6 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.26.2
+version=0.26.1
 revision=1
 build_style=go
 go_mod_mode=off
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/flannel-io/flannel"
 distfiles="https://github.com/flannel-io/flannel/archive/v${version}.tar.gz"
-checksum=20465366cb75907033864fad849513e0810c00313d6d63afde0554e6199db8d4
+checksum=31a8fbd17dabf47d8f07ceb7f98bb512347dd47a57af7051a02b8fda2e5bee46
 
 post_install() {
 	vsv flannel
diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index f44feaa9985187..fdf7d097075d91 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -1,7 +1,7 @@
 # Template file for 'flinks'
 pkgname=flinks
 version=0.5.0
-revision=5
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="lynx python3"
diff --git a/srcpkgs/fnott/template b/srcpkgs/fnott/template
index ca26d2b86bf549..ccd07fd0d71260 100644
--- a/srcpkgs/fnott/template
+++ b/srcpkgs/fnott/template
@@ -1,7 +1,7 @@
 # Template file for 'fnott'
 pkgname=fnott
-version=1.7.0
-revision=2
+version=1.6.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
 makedepends="fcft-devel tllist wayland-devel wayland-protocols"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/fnott/"
 changelog="https://codeberg.org/dnkl/fnott/raw/branch/master/CHANGELOG.md"
 distfiles="https://codeberg.org/dnkl/fnott/archive/${version}.tar.gz"
-checksum=40013d64423332a53aa943b7d9366f25e8cdd3313345f7a74b53c5d33eb49c80
+checksum=fc8a0a9b75995a10afeaf3a670fb30986b21a4f48bd67a7018802de10debc83f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index aa4a77f97151a5..b49b35b78c90cc 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=1.0.25
+version=1.0.24
 revision=1
 depends="font-util"
 short_desc="CJK programming font based on Iosevka and Source Han Sans"
@@ -8,7 +8,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z"
-checksum=e30e4baa237bac413b25360bec97ae504c640e391eb8ef98b2721f3479a4703f
+checksum=0eafa69236cfeba81aebbcebe5b8efaf89bb6b942c6f958b68ae95937068053b
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/fontforge/patches/l10n.patch b/srcpkgs/fontforge/patches/l10n.patch
deleted file mode 100644
index 402ac3a21ca41e..00000000000000
--- a/srcpkgs/fontforge/patches/l10n.patch
+++ /dev/null
@@ -1,8803 +0,0 @@
-From 642d8a3db6d4bc0e70b429622fdf01ecb09c4c10 Mon Sep 17 00:00:00 2001
-From: skef <6175836+skef@users.noreply.github.com>
-Date: Sun, 31 Dec 2023 02:17:59 -0800
-Subject: [PATCH] Update po files from Croudin sources after fixing problems
-
----
- po/ca.po    |   17 +-
- po/de.po    |   25 +-
- po/el.po    |    4 +-
- po/en_GB.po |    8 +-
- po/es.po    |   76 +++-
- po/fr.po    |   93 ++--
- po/hr.po    |  156 ++++++-
- po/it.po    |   12 +-
- po/ja.po    |  217 +++++++--
- po/ka_GE.po | 1231 +++++++++++++++++++++++++++++++++++++++++++--------
- po/ko.po    |   43 +-
- po/ml.po    |    4 +-
- po/pl.po    |   67 ++-
- po/pt.po    |    4 +-
- po/ru.po    |    4 +-
- po/tr_TR.po |    4 +-
- po/uk.po    |   41 +-
- po/vi.po    |  428 +-----------------
- po/zh_CN.po | 1021 +++++++++++++++++++++++++++++++++++-------
- po/zh_TW.po |   24 +-
- 20 files changed, 2485 insertions(+), 994 deletions(-)
-
-diff --git a/po/ca.po b/po/ca.po
-index e2349b6ef5..d25f08928f 100644
---- a/po/ca.po
-+++ b/po/ca.po
-@@ -15,8 +15,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Catalan\n"
- "Language: ca_ES\n"
-@@ -11573,8 +11573,8 @@ msgid "SnapToInt"
- msgstr "Edita amb enters"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Si aquí poseu «A», el primer glif seleccionat s'anomenarà «A.sufix».\n"
-@@ -12345,7 +12345,6 @@ msgstr "Thaana"
- msgid "Thai"
- msgstr "Tai"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -16406,16 +16405,16 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "«%s» a %s no conté una consulta de posicionament per parelles ∆x=%d ∆y=%d "
- "∆x_adv=%d ∆y_adv=%d a %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
- "«%s» a %s no conté una consulta de posicionament ∆x=%d ∆y=%d ∆x_adv=%d "
- "∆y_adv=%d\n"
-diff --git a/po/de.po b/po/de.po
-index 41430ffaed..8b1a248f88 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -18,8 +18,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: German\n"
- "Language: de_DE\n"
-@@ -228,8 +228,8 @@ msgid ""
- "!!!!! Bad Base Coord format (%d) for '%c%c%c%c' in '%c%c%c%c' script in "
- "'BASE' table\n"
- msgstr ""
--"!!!!! Ungültiges Format der Koordinaten des Grundzeichens (%d) für '%c%c%c"
--"%c' im Schriftsystem '%c%c%c%c' in der 'BASE' Tabelle\n"
-+"!!!!! Ungültiges Format der Koordinaten des Grundzeichens (%d) für "
-+"'%c%c%c%c' im Schriftsystem '%c%c%c%c' in der 'BASE' Tabelle\n"
- 
- #, c-format
- msgid ""
-@@ -14770,8 +14770,8 @@ msgid "SnapToInt"
- msgstr "Auf ganze Zahlen einrasten"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Wenn du hier „A“ eingibst, dann bekommt die erste ausgewählte Glyphe den "
-@@ -15763,7 +15763,6 @@ msgstr ""
- "nicht denen in %4$.30s (unterschiedliche Anzahl oder unterschiedliche "
- "Kriterien für Überlappungen)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -16909,8 +16908,8 @@ msgstr ""
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "Die Dickte, Höhe, Tiefe oder Kursiv-Korrektur %s sind zu groß. Tfm-Dateien "
- "können nicht Werte größer als 16 mal die Geviertgröße enthalten. Dickte=%g, "
-@@ -21512,16 +21511,16 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "„%s” in %s enthielt keine Nachschlagetabelle der paarweisen Positionierung "
- "∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
- "„%s” in %s enthielt keine Nachschlagetabelle der Positionierung ∆x=%d ∆y=%d "
- "∆x_adv=%d ∆y_adv=%d\n"
-diff --git a/po/el.po b/po/el.po
-index d942c68c6d..226afbe82c 100644
---- a/po/el.po
-+++ b/po/el.po
-@@ -12,8 +12,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Greek\n"
- "Language: el_GR\n"
-diff --git a/po/en_GB.po b/po/en_GB.po
-index 9bd2d62bb6..40ec187cc7 100644
---- a/po/en_GB.po
-+++ b/po/en_GB.po
-@@ -12,8 +12,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: English, United Kingdom\n"
- "Language: en_GB\n"
-@@ -133,6 +133,9 @@ msgstr ""
- " Use of GDEF rather than lcar/prop\n"
- "If both this and Apple are set, both formats are generated"
- 
-+msgid "Arabic"
-+msgstr "Arabic"
-+
- msgid "Are you sure you don't want to use the cidmap I found?"
- msgstr "Are you sure you do not want to use the cidmap I found?"
- 
-@@ -726,7 +729,6 @@ msgstr "Spiros did not converge"
- msgid "Template Color"
- msgstr "Template Colour"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-diff --git a/po/es.po b/po/es.po
-index 424b0177b6..31603cd120 100644
---- a/po/es.po
-+++ b/po/es.po
-@@ -15,8 +15,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Spanish\n"
- "Language: es_ES\n"
-@@ -453,6 +453,9 @@ msgstr "Argumento"
- msgid "Arabic"
- msgstr "Árabe"
- 
-+msgid "Arabic Supplement"
-+msgstr "Árabe, suplemento"
-+
- msgid "Arakanese"
- msgstr "Arakanés"
- 
-@@ -1223,6 +1226,9 @@ msgstr ""
- "Verificar si una substitución, una clase de interletraje, etc. utiliza un "
- "nombre de glifo que no existe en la fuente"
- 
-+msgid "Cherokee"
-+msgstr "Cheroqui"
-+
- msgid "Chinese (Hong Kong)"
- msgstr "Chino (Hong Kong) zh_CN"
- 
-@@ -1283,6 +1289,9 @@ msgstr "Co_piar margen izquierdo"
- msgid "Com_binations"
- msgstr "Com_binaciones"
- 
-+msgid "Combining Diacritical Marks"
-+msgstr "Marcas diacríticas combinables"
-+
- msgid "Comment"
- msgstr "Comentario"
- 
-@@ -1459,6 +1468,9 @@ msgstr "Cor_tar"
- msgid "Cubic"
- msgstr "Cúbico"
- 
-+msgid "Cuneiform"
-+msgstr "Cuneiforme"
-+
- msgid "Current"
- msgstr "Actual"
- 
-@@ -2538,6 +2550,9 @@ msgstr "Gallego"
- msgid "Gaudeamus Ligature!"
- msgstr "¡Alabemos la ligadura!"
- 
-+msgid "General Punctuation"
-+msgstr "Puntuación general"
-+
- msgid "Generate Mac _Family..."
- msgstr "Generar _familia para Mac..."
- 
-@@ -3517,6 +3532,9 @@ msgstr "Diseños maestros"
- msgid "Mathematical Greek"
- msgstr "Griego para matemáticas"
- 
-+msgid "Mayan Numerals"
-+msgstr "Cifras mayas"
-+
- msgid "Measure distance, angle between points"
- msgstr "Medir distancia, ángulo entre puntos"
- 
-@@ -4099,6 +4117,9 @@ msgstr "Abrir referencia"
- msgid "Open failed"
- msgstr "Error al abrir"
- 
-+msgid "Optical Character Recognition"
-+msgstr "Reconocimiento óptico de caracteres"
-+
- msgid "Options"
- msgstr "Opciones"
- 
-@@ -4668,6 +4689,9 @@ msgstr "Ajustar a la horizo_ntal/vertical"
- msgid "Sa_me Glyph As"
- msgstr "Igual carácter que(_M)"
- 
-+msgid "Samaritan"
-+msgstr "Samaritano"
-+
- msgid "Same as PostScript Names"
- msgstr "Igual que los nombres de PostScript"
- 
-@@ -5117,6 +5141,9 @@ msgstr "Espacia_r regiones..."
- msgid "Space:"
- msgstr "Espaciado:"
- 
-+msgid "Spacing Modifier Letters"
-+msgstr "Letras modificadoras con espaciado"
-+
- msgid "Spanish"
- msgstr "Español"
- 
-@@ -5239,6 +5266,33 @@ msgstr "Trazado..."
- msgid "Style Set 1"
- msgstr "Estilo 1"
- 
-+msgid "Style Set 10"
-+msgstr "Conjunto estilístico 10"
-+
-+msgid "Style Set 11"
-+msgstr "Conjunto estilístico 11"
-+
-+msgid "Style Set 12"
-+msgstr "Conjunto estilístico 12"
-+
-+msgid "Style Set 13"
-+msgstr "Conjunto estilístico 13"
-+
-+msgid "Style Set 14"
-+msgstr "Conjunto estilístico 14"
-+
-+msgid "Style Set 15"
-+msgstr "Conjunto estilístico 15"
-+
-+msgid "Style Set 16"
-+msgstr "Conjunto estilístico 16"
-+
-+msgid "Style Set 17"
-+msgstr "Conjunto estilístico 17"
-+
-+msgid "Style Set 18"
-+msgstr "Conjunto estilístico 18"
-+
- msgid "Style Set 2"
- msgstr "Estilo 2"
- 
-@@ -5251,6 +5305,18 @@ msgstr "Estilo 4"
- msgid "Style Set 5"
- msgstr "Estilo 5"
- 
-+msgid "Style Set 6"
-+msgstr "Conjunto estilístico 6"
-+
-+msgid "Style Set 7"
-+msgstr "Conjunto estilístico 7"
-+
-+msgid "Style Set 8"
-+msgstr "Conjunto estilístico 8"
-+
-+msgid "Style Set 9"
-+msgstr "Conjunto estilístico 9"
-+
- msgid "Style _ID:"
- msgstr "Estilo _ID:"
- 
-@@ -5269,6 +5335,9 @@ msgstr "Sundanese (romano)"
- msgid "Superscript"
- msgstr "Supraíndice"
- 
-+msgid "Superscripts and Subscripts"
-+msgstr "Superíndices y subíndices"
-+
- msgid "Swadaya Aramaic"
- msgstr "Arameo swadaya"
- 
-@@ -5309,6 +5378,9 @@ msgstr "La etiqueta debe constar de 4 caracteres"
- msgid "Tag too long"
- msgstr "Etiqueta demasiado larga"
- 
-+msgid "Tags"
-+msgstr "Etiquetas"
-+
- msgid "Tahitian"
- msgstr "Tahitiano"
- 
-diff --git a/po/fr.po b/po/fr.po
-index 26e446b380..d4b2b7eb05 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -14,8 +14,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: French\n"
- "Language: fr_FR\n"
-@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s"
- #. GT: $4 is the changed flag ('*' for the changed items)
- #, c-format
- msgid "%1$.80s at %2$d from %3$.90s%4$s"
--msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
-+msgstr "%1$.80s à %2$d de %3$.90s%4$s"
- 
- #. GT: This is the title for a window showing a bitmap character
- #. GT: It will look something like:
-@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
- #. GT: $4 is the font name
- #, c-format
- msgid "%1$.80s at %2$d size %3$d from %4$.80s"
--msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs"
-+msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s"
- 
- #, c-format
- msgid "%1$s from lookup subtable %2$.50s"
-@@ -3131,16 +3131,16 @@ msgstr "Glyphe de ligature incorrect. GID %d ne peut être moins que %d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Format de table de lookup incorrect: format=2 (%d/%d), premier=%d dernier=%d "
- "total de glyphes dans la fonte=%d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Format de table de lookup incorrect: format=4 (%d/%d), premier=%d dernier=%d "
- "total de glyphes dans la fonte=%d\n"
-@@ -7433,7 +7433,7 @@ msgid ""
- "Reverting the file will lose those changes.\n"
- "Is that what you want?"
- msgstr ""
--"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n"
-+"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n"
- "Revenir vous fera perdre toutes les modifications.\n"
- "Voulez vous vraiment revenir ?"
- 
-@@ -17879,8 +17879,8 @@ msgid "SnapToInt"
- msgstr "Magnétisme aux entiers"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Donc, si vous tapiez \"A\" ici, le premier glyphe sélectionné serait nommé "
-@@ -19075,7 +19075,6 @@ msgstr ""
- "pas à ceux de %4$.30s (nombre différent ou critères de recouvrement "
- "différents)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -19925,7 +19924,7 @@ msgid ""
- "The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
- "encodings"
- msgstr ""
--"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des "
-+"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des "
- "codages différents"
- 
- #, c-format
-@@ -19933,7 +19932,7 @@ msgid ""
- "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
- "one cubic)"
- msgstr ""
--"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres "
-+"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres "
- "différents (quadratique et cubique)"
- 
- msgid "The generated font won't work with ATM"
-@@ -19968,8 +19967,8 @@ msgid ""
- "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
- "than in %3$.30s"
- msgstr ""
--"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que "
--"dans %3$.30hs"
-+"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que "
-+"dans %3$.30s"
- 
- #, c-format
- msgid ""
-@@ -19984,8 +19983,8 @@ msgid ""
- "The glyph %1$.30s in font %2$.30s has a different number of references than "
- "in %3$.30s"
- msgstr ""
--"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent "
--"dans %3$.30hs"
-+"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent "
-+"dans %3$.30s"
- 
- #, c-format
- msgid ""
-@@ -20295,8 +20294,8 @@ msgid ""
- "Enlarge this to make the autohinter more tolerable to small deviations from "
- "straight lines when detecting stem edges."
- msgstr ""
--"La différence de pente maximale qui permet encore de considérer deux points"
--"\"parallèle\".\n"
-+"La différence de pente maximale qui permet encore de considérer deux "
-+"points\"parallèle\".\n"
- "Augmenter pour rendre la auto-hinter plus tolérant aux petits écarts entre\n"
- "des lignes droites lors de la détection des bords du fut ou de la traverse."
- 
-@@ -20457,7 +20456,7 @@ msgstr ""
- #, c-format
- msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s"
- msgstr ""
--"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs"
-+"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s"
- 
- msgid "The paths that make up this glyph intersect one another"
- msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres"
-@@ -20805,12 +20804,12 @@ msgstr "La largeur de la ligne utilisée pour dessiner les points sélectionnés
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "La largeur, hauteur, profondeur ou correction italique de %s est trop "
--"grande. En TFM, on ne peut pas dépasser 16 fois le EM de la fonte.Largeur="
--"%g, hauteur=%g, profondeur=%g, correction italique=%g"
-+"grande. En TFM, on ne peut pas dépasser 16 fois le EM de la fonte."
-+"Largeur=%g, hauteur=%g, profondeur=%g, correction italique=%g"
- 
- msgid "The x coord of the selected point is near the specified value"
- msgstr "La'abscisse du point sélectionné est proche de la valeur de consigne"
-@@ -21042,7 +21041,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP"
- 
- #, c-format
- msgid "There is already an anchor point named %1$.40s in %2$.40s."
--msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs."
-+msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s."
- 
- msgid "There is another glyph in the font with this name"
- msgstr "Il y a un autre glyphe dans la fonte avec ce nom"
-@@ -21076,8 +21075,8 @@ msgstr "Il n'y a pas de glyphe %s dans cette fonte,"
- 
- msgid "There may be at most one reference with the use-my-metrics bit set"
- msgstr ""
--"Il ne doit pas y avoir plus d'une référence avec le \"use-my metrics bit set"
--"\""
-+"Il ne doit pas y avoir plus d'une référence avec le \"use-my metrics bit "
-+"set\""
- 
- #, c-format
- msgid ""
-@@ -21441,8 +21440,8 @@ msgid ""
- "been able to find is %1$.20s-%2$.20s-%4$d.\n"
- "Shall I use that or let you search?"
- msgstr ""
--"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais "
--"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n"
-+"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais ce "
-+"que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n"
- "Devrais-je utiliser cette valeur ou préférez vous chercher ?"
- 
- msgid ""
-@@ -21671,8 +21670,8 @@ msgid ""
- "FontForge\n"
- "does not support. FontForge only supports 'IK' format fonts.\n"
- msgstr ""
--"Ceci est probablement une fonte URW valide, mais elle est dans un format (% c"
--"% c) que FontForge\n"
-+"Ceci est probablement une fonte URW valide, mais elle est dans un format "
-+"(% c% c) que FontForge\n"
- "ne supporte pas. FontForge ne prend en charge que les fontes de format "
- "'IK'.\n"
- 
-@@ -21770,7 +21769,7 @@ msgid ""
- "with a 0 offset for this combination. Would you like to alter this kerning "
- "class entry (or create a kerning pair for just these two glyphs)?"
- msgstr ""
--"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n"
-+"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n"
- "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette "
- "partie\n"
- "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 "
-@@ -21864,8 +21863,8 @@ msgstr ""
- #, c-format
- msgid "This name was previously used to identify mark class/set #%d."
- msgstr ""
--"Ce nom a précédemment été utilisé pour identifier la classe/jeu de signes #"
--"%d."
-+"Ce nom a précédemment été utilisé pour identifier la classe/jeu de signes "
-+"#%d."
- 
- #, c-format
- msgid "This namelist contains at least one non-ASCII glyph name, namely: %s"
-@@ -23657,8 +23656,8 @@ msgid ""
- "and %s@0x%02x)\n"
- " Only one will be used here.\n"
- msgstr ""
--"Attention: Le codage %d (0x%x) correspond à au moins deux emplacements (%s@0x"
--"%02x et %s@0x%02x)\n"
-+"Attention: Le codage %d (0x%x) correspond à au moins deux emplacements "
-+"(%s@0x%02x et %s@0x%02x)\n"
- " Un seul sera utilisé ici.\n"
- 
- msgid "Warning: Font Bucket version 4 treated as 0.\n"
-@@ -24161,8 +24160,8 @@ msgstr ""
- 
- msgid "When serifs are removed (as first two in \"m\"), replace with:"
- msgstr ""
--"Lors de la suppression des empattements (comme les deux premières dans \"m"
--"\"), remplacer avec:"
-+"Lors de la suppression des empattements (comme les deux premières dans "
-+"\"m\"), remplacer avec:"
- 
- msgid ""
- "When the hint's position is changed\n"
-@@ -24551,8 +24550,8 @@ msgid ""
- "referred to.\n"
- "It will not be copied."
- msgstr ""
--"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
--"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le "
-+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
-+"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le "
- "glyphe auquel il se référait.\n"
- "Le glyphe ne sera pas copié."
- 
-@@ -24562,8 +24561,8 @@ msgid ""
- "But %1$s does not exist in this font.\n"
- "Would you like to copy the original splines (or delete the reference)?"
- msgstr ""
--"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
--"Mais %1$hs n'existe pas dans cette fonte.\n"
-+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
-+"Mais %1$s n'existe pas dans cette fonte.\n"
- "Voulez vous copier le contour d'origine (ou supprimer la référence)?"
- 
- msgid ""
-@@ -26385,16 +26384,16 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "\"%s\" dans %s ne contenait pas de lookup de positionnement par paire ∆x=%d "
- "∆y=%d ∆x_adv=%d ∆y_adv=%d à %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
- "\"%s\" dans %s ne contenait pas de lookup de positionnement ∆x=%d ∆y=%d "
- "∆x_adv=%d ∆y_adv=%d\n"
-diff --git a/po/hr.po b/po/hr.po
-index d261d4ca76..c10a697102 100644
---- a/po/hr.po
-+++ b/po/hr.po
-@@ -11,16 +11,16 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Croatian\n"
- "Language: hr_HR\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
--"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- "X-Crowdin-Project: fontforge\n"
- "X-Crowdin-Project-ID: 368599\n"
- "X-Crowdin-Language: hr\n"
-@@ -237,8 +237,8 @@ msgid ""
- "!!!!! Bad Base Coord format (%d) for '%c%c%c%c' in '%c%c%c%c' script in "
- "'BASE' table\n"
- msgstr ""
--"!!!!! Neispravni format koordinata osnove (%d) za '%c%c%c%c' u pismu '%c%c%c"
--"%c' u 'BASE' tablici\n"
-+"!!!!! Neispravni format koordinata osnove (%d) za '%c%c%c%c' u pismu "
-+"'%c%c%c%c' u 'BASE' tablici\n"
- 
- #, c-format
- msgid ""
-@@ -695,6 +695,15 @@ msgstr "300 Svijetli"
- msgid "32x8 cell window"
- msgstr "Prozor: 32 × 8 polja"
- 
-+msgid "3D Buttons"
-+msgstr "3D gumbovi"
-+
-+msgid "3D Dark Edge Color"
-+msgstr "3D tamna boja ruba"
-+
-+msgid "3D Light Edge Color"
-+msgstr "3D svijetla boja ruba"
-+
- msgid "4"
- msgstr "4"
- 
-@@ -1484,6 +1493,9 @@ msgstr ""
- msgid "Adding points at Extrema..."
- msgstr "Dodavanje točaka ektrema …"
- 
-+msgid "Adding points of inflection..."
-+msgstr "Dodavanje točkaka infleksije …"
-+
- msgid "Additional arguments for autotrace program:"
- msgstr "Dodatni argumenti za program za automatsko precrtavanje:"
- 
-@@ -2065,6 +2077,9 @@ msgstr ""
- "NAPOMENA: 'WinDescent' je POZITIVNI broj, a odnosi se na sve\n"
- "što se nalazi ispod osnovne pismovne linije."
- 
-+msgid "Appea_rance Editor..."
-+msgstr "U_ređivač prikaza …"
-+
- msgid "Append a FONTLOG entry"
- msgstr "Dodaj FONTLOG zapis"
- 
-@@ -2244,6 +2259,9 @@ msgstr "Arapsko, prošireno A"
- msgid "Arabic Extended-B"
- msgstr "Arapsko, prošireno B"
- 
-+msgid "Arabic Extended-C"
-+msgstr "Arapsko prošireno-C"
-+
- msgid "Arabic Mathematical Alphabetic Symbols"
- msgstr "Arapski matematički alfanumerički simboli"
- 
-@@ -2373,6 +2391,9 @@ msgstr ""
- "Uzlazni i silazni potezi moraju imati pozitivne vrijednosti, a njihov zbroj "
- "manji od 16384"
- 
-+msgid "Ascent/Descent Color"
-+msgstr "Boja uzlaznog/silaznog poteza"
-+
- msgid "Ask"
- msgstr "Pitaj"
- 
-@@ -3291,16 +3312,16 @@ msgstr "Neispravni grafem ligature. ID-oznaka grafema %d ne manja od %d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Neispravna tablica definicija: format=2 (%d/%d), prvi=%d zadnji=%d ukupno "
- "grafema u fontu=%d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Neispravna tablica definicija: format=4 (%d/%d), prvi=%d zadnji=%d ukupno "
- "grafema u fontu=%d\n"
-@@ -3797,6 +3818,9 @@ msgstr "Debeli"
- msgid "Bold Italic"
- msgstr "Debeli Kurziv"
- 
-+msgid "Bold font used in the Tile Path dialog"
-+msgstr "Podebljani font za dijalog staza pločica"
-+
- msgid "Bone"
- msgstr "Kosturni"
- 
-@@ -4111,6 +4135,9 @@ msgstr "KJK sjedinjeni ideogrami, proširenje F"
- msgid "CJK Unified Ideographs Extension G"
- msgstr "KJK sjedinjeni ideogrami, proširenje G"
- 
-+msgid "CJK Unified Ideographs Extension H"
-+msgstr "KJK sjedinjeni ideogrami, proširenje H"
-+
- msgid "CS Clarendon"
- msgstr "4.1 – Clarendon"
- 
-@@ -5166,12 +5193,24 @@ msgstr "Boja etiketa grafema kad etiketa nedostaje"
- msgid "Color of the active entry in the main section of a matrix edit"
- msgstr "Boja za aktivne zapise u glavnom odjeljku matrice"
- 
-+msgid "Color of the ascent and descent lines"
-+msgstr "Boja za crte veličina uzlaznih i silaznih poteza"
-+
- msgid "Color of the font used to display glyph information in the fontview"
- msgstr "Boja fonta za prikaz informacija o grafemu u prikazu fonta"
- 
- msgid "Color of the line between label and glyph"
- msgstr "Boja linije između etikete i grafema"
- 
-+msgid "Color of the x=0 and y=0 lines"
-+msgstr "Boja x=0 i y=0 linija"
-+
-+msgid "Color used for (some) glyph names in Show ATT dialog"
-+msgstr "Boja za (neka) imena grafema u dijalogu Prikaži ATT"
-+
-+msgid "Color used for currently selected entry in Show ATT dialog"
-+msgstr "Boja za trenutačno odabrani unos u dijalogu Prikaži ATT"
-+
- msgid "Color used to draw the advance width line of a glyph"
- msgstr "Boja za crtanje linije, koja označuje širinu stošca"
- 
-@@ -5208,6 +5247,18 @@ msgstr "Boja za onačavanje odabranih grafema"
- msgid "Color:"
- msgstr "Boja:"
- 
-+msgid "Colors of lines and fills in outline window"
-+msgstr "Boje linija i ispuna u prozoru kontura"
-+
-+msgid "Colors related to CFF/PostScript hints"
-+msgstr "Boje CFF/PostScript kontrola"
-+
-+msgid "Colors, etc of points in glyph outline window"
-+msgstr "Boje itd. točaka u prozoru kontura grafema"
-+
-+msgid "Colors, etc. related to tool use in outline window"
-+msgstr "Boje itd. koje se odnose na korištenje alata u prozoru kontura"
-+
- msgid "Color|Background"
- msgstr "Stražnja boja"
- 
-@@ -5984,6 +6035,9 @@ msgstr "Ćirilica prošireno-B"
- msgid "Cyrillic Extended-C"
- msgstr "Ćirilica prošireno-C"
- 
-+msgid "Cyrillic Extended-D"
-+msgstr "Ćirilica prošireno-D"
-+
- msgid "Cyrillic Supplement"
- msgstr "Ćirilica, dopuna"
- 
-@@ -6121,6 +6175,9 @@ msgstr "Zadana debljina crte iznad i za nadcrte"
- msgid "Default:"
- msgstr "Zadano:"
- 
-+msgid "DefaultFont"
-+msgstr "Standardni font"
-+
- msgid "Define \"Almost Horizontal\""
- msgstr "Definiraj „Zamalo vodoravno”"
- 
-@@ -6262,6 +6319,9 @@ msgstr "Devanagari"
- msgid "Devanagari Extended"
- msgstr "Devanagari prošireno"
- 
-+msgid "Devanagari Extended-A"
-+msgstr "Devanagari prošireno-A"
-+
- msgid "Devanagari2"
- msgstr "Devanagari2"
- 
-@@ -8098,6 +8158,9 @@ msgstr "Font promijenjen"
- msgid "Font file has bad glyph count field. maxp says: %d sizeof(loca)=>%d"
- msgstr "Font sadrži neipravno polje brojanja. 'maxp' kaže: %d sizeof(loca)=>%d"
- 
-+msgid "Font for Mac Features in Preferences dialog"
-+msgstr "Font za Mac funkcije u dijalogu potavki"
-+
- #, c-format
- msgid "Font to compare with %.20s"
- msgstr "Uspoređivanje fonta s %.20s"
-@@ -8106,6 +8169,9 @@ msgstr "Uspoređivanje fonta s %.20s"
- msgid "Font to merge into %.20s"
- msgstr "Font za sjedinjavanje u %.20s"
- 
-+msgid "Font used in the Glyph Info dialog"
-+msgstr "Korišteni font u dijalogu informacija o grafemu"
-+
- msgid "Font used to draw titles of a matrix edit"
- msgstr "Font za naslove matrice"
- 
-@@ -8909,6 +8975,9 @@ msgstr "Granični okvir grafema uži od"
- msgid "Glyph BB Right Of"
- msgstr "Granični okvir grafema širi od"
- 
-+msgid "Glyph Color"
-+msgstr "Boja grafema"
-+
- msgid "Glyph Composition/Decomposition"
- msgstr "Sastavljanje/Rastavljanje grafema"
- 
-@@ -10225,6 +10294,9 @@ msgstr "Zanemari spojne dijakritičke znakove"
- msgid "Ignore Ligatures"
- msgstr "Zanemari ligature"
- 
-+msgid "Ignore invalid substitutions"
-+msgstr "Zanemari nevažeće zamjene"
-+
- msgid "Ignore this problem in the future"
- msgstr "Ubuduće zanemari ovaj problem"
- 
-@@ -10309,6 +10381,9 @@ msgstr "Uvezi tablicu definicija"
- msgid "Import Parameters"
- msgstr "Uvezi parametre"
- 
-+msgid "Import feature file"
-+msgstr "Uvezi datoteku funkcija"
-+
- msgid "Imports a lookup (and all its subtables) from another font."
- msgstr "Uvozi tablicu definicija (i sve pod-tablice) iz jednog drugog fonta."
- 
-@@ -12737,6 +12812,9 @@ msgstr "Matematički operatori"
- msgid "Mathematical centerline"
- msgstr "Matematička srednja linija"
- 
-+msgid "Mathematical text layout"
-+msgstr "Raspored matematičkog teksta"
-+
- msgid "Matrix Edit"
- msgstr "Matrica za uređivanje"
- 
-@@ -14332,6 +14410,9 @@ msgstr "Normalni bezserifni"
- msgid "Normal Text Color:"
- msgstr "Boja za obični tekst:"
- 
-+msgid "Normal font used in the Tile Path dialog"
-+msgstr "Normalni font za dijalog staza pločica"
-+
- msgid "Normal/Boxed"
- msgstr "Normalno/Kutijasto"
- 
-@@ -15216,15 +15297,24 @@ msgstr "Konturni fontovi"
- msgid "Outline Glyphs\n"
- msgstr "Konturni grafemi\n"
- 
-+msgid "Outline Hints"
-+msgstr "Kontrole kontura"
-+
- msgid "Outline Inner Border"
- msgstr "Unutarnji obrub konture"
- 
-+msgid "Outline Lines/Fills"
-+msgstr "Linije/Ispune konture"
-+
- msgid "Outline Outer Border"
- msgstr "Vanjski obrub konture"
- 
- msgid "Outline Points"
- msgstr "Točke konture"
- 
-+msgid "Outline Tools"
-+msgstr "Alati za konture"
-+
- msgid "Outline View"
- msgstr "Prikaz konture"
- 
-@@ -15399,6 +15489,12 @@ msgstr "Pa_lete"
- msgid "Palestinian Aramaic"
- msgstr "Palestinski aramejski"
- 
-+msgid "Palette Background Color"
-+msgstr "Paleta boje pozadine"
-+
-+msgid "Palette Foreground Color"
-+msgstr "Paleta prednje boje"
-+
- msgid "Palettes"
- msgstr "Palete"
- 
-@@ -17247,6 +17343,9 @@ msgstr "Boja za razdvojne crte"
- msgid "Ruler Big Tick Color"
- msgstr "Boja za velike oznake ravnala"
- 
-+msgid "Ruler Font"
-+msgstr "Font ravnala"
-+
- msgid "Ruler Options"
- msgstr "Opcije ravnala"
- 
-@@ -18235,6 +18334,9 @@ msgstr "'Fuzz' visina serifa"
- msgid "Serif height:"
- msgstr "Visina serifa:"
- 
-+msgid "SerifFont"
-+msgstr "Serifni font"
-+
- msgid "SerifSlopeError"
- msgstr "Greška nagiba serifa"
- 
-@@ -18808,8 +18910,8 @@ msgid "SnapToInt"
- msgstr "Privlači na cjelobrojne vrijednosti"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Prema tome, ako ovdje utipkaš 'A', onda će se prvi odabrani grafem\n"
-@@ -20085,6 +20187,9 @@ msgstr "Temne"
- msgid "Template Color"
- msgstr "Boja za predložak"
- 
-+msgid "Template Outline Color"
-+msgstr "Boja konture predloška"
-+
- msgid "Terminal Forms"
- msgstr "Završni oblici"
- 
-@@ -20154,7 +20259,6 @@ msgstr ""
- "'%1$s' kontrole u grafemu \"%2$.30s\" u fontu %3$.30s se ne poklapaju s "
- "onima u %4$.30s (različiti broj ili različiti kriteriji preklapanja)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -21344,9 +21448,9 @@ msgid ""
- "\n"
- "Would you like to add this script to one of those features?"
- msgstr ""
--"Tablica definicija %.30s je aktivan za grafem %.30s koji ima pismo '%c%c%c"
--"%c', međutim tog pisma čini se nema u niti jednoj funkciji koja primijenjuje "
--"tablicu definicija.\n"
-+"Tablica definicija %.30s je aktivan za grafem %.30s koji ima pismo "
-+"'%c%c%c%c', međutim tog pisma čini se nema u niti jednoj funkciji koja "
-+"primijenjuje tablicu definicija.\n"
- "\n"
- "Želiš li dodati ovo pismo u jednu od tih funkcija?"
- 
-@@ -21960,8 +22064,8 @@ msgstr "Širina linije koja se koristi za crtanje odabranih točaka"
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "Širina, visina, dubina ili ispravljanje kurziva od %s su preveliki. Tfm "
- "datoteke ne smiju sadržati vrijednosti veće od 16 puta veličine četverca "
-@@ -24507,6 +24611,12 @@ msgstr "Koristi novo indijsko pismo"
- msgid "UsePlugins"
- msgstr "Koristi dodatke"
- 
-+msgid "Used for point numbers, hints, etc."
-+msgstr "Koristi se za brojeve točaka, kontrole itd."
-+
-+msgid "Used for ruler numbers and other ruler notations."
-+msgstr "Koristi se za brojeve i druge oznake ravnala."
-+
- msgid "User controls the emboldening with the next two fields"
- msgstr "Korisnik kontrolira podebljavanje pomoću sljedeća dva polja"
- 
-@@ -24874,7 +24984,6 @@ msgstr ""
- "Upozorenje: 'cvar' sadrži međupodatke n-torke.\n"
- " FontForge to ne podržava.\n"
- 
--#, c-format
- msgid "Warning: Accuracy target %lf less than minimum %lf, using %lf instead\n"
- msgstr ""
- "Upozorenje: Ciljana točnost %lf manja je od minimalne %lf, umjesto toga se "
-@@ -24893,7 +25002,6 @@ msgstr "Upozorenje: Kraj konture se nije zatvorio\n"
- msgid "Warning: Contour start did not close\n"
- msgstr "Upozorenje: Početak konture se nije zatvorio\n"
- 
--#, c-format
- msgid "Warning: Coordinate diff %lf greater than margin %lf\n"
- msgstr "Upozorenje: Razlika koordinate %lf veća je od margine %lf\n"
- 
-@@ -27962,16 +28070,16 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "„%s” u %s ne sadrži tablicu definicija pozicioniranja parova ∆x=%d ∆y=%d "
- "∆x_adv=%d ∆y_adv=%d s %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
- "„%s” u %s ne sadrži tablicu definicija pozicioniranja ∆x=%d ∆y=%d ∆x_adv=%d "
- "∆y_adv=%d\n"
-diff --git a/po/it.po b/po/it.po
-index e13711485c..a3136f7bdf 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -13,8 +13,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-31 08:24\n"
- "Last-Translator: \n"
- "Language-Team: Italian\n"
- "Language: it_IT\n"
-@@ -2303,7 +2303,7 @@ msgid ""
- "Reverting the file will lose those changes.\n"
- "Is that what you want?"
- msgstr ""
--"Il font %1$.40s nel file %2$.40hs è stato modificato.\n"
-+"Il font %1$.40s nel file %2$.40s è stato modificato.\n"
- "Ripristinando il file perderai tutte le modifiche.\n"
- "È quello che vuoi fare?"
- 
-@@ -5835,7 +5835,7 @@ msgid ""
- "The glyph %1$.30s has a different number of contours in font %2$.30s than in "
- "%3$.30s"
- msgstr ""
--"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto "
-+"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto "
- "a %3$.30s"
- 
- #, c-format
-@@ -6235,8 +6235,8 @@ msgid ""
- "been able to find is %1$.20s-%2$.20s-%4$d.\n"
- "Shall I use that or let you search?"
- msgstr ""
--"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma "
--"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n"
-+"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma il "
-+"migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n"
- "Devo usare questo valore o preferisci cercare tu stesso?"
- 
- msgid ""
-diff --git a/po/ja.po b/po/ja.po
-index ed9f5a645b..11825c73d4 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -15,8 +15,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Japanese\n"
- "Language: ja_JP\n"
-@@ -388,6 +388,36 @@ msgstr "< 前(_P)"
- msgid "<Nothing>"
- msgstr "<何もしない>"
- 
-+msgid "<Unassigned Plane 10>"
-+msgstr "〈保留未使用面10〉"
-+
-+msgid "<Unassigned Plane 11>"
-+msgstr "〈保留未使用面11〉"
-+
-+msgid "<Unassigned Plane 12>"
-+msgstr "〈保留未使用面12〉"
-+
-+msgid "<Unassigned Plane 13>"
-+msgstr "〈保留未使用面13〉"
-+
-+msgid "<Unassigned Plane 4>"
-+msgstr "〈保留未使用面4〉"
-+
-+msgid "<Unassigned Plane 5>"
-+msgstr "〈保留未使用面5〉"
-+
-+msgid "<Unassigned Plane 6>"
-+msgstr "〈保留未使用面6〉"
-+
-+msgid "<Unassigned Plane 7>"
-+msgstr "〈保留未使用面7〉"
-+
-+msgid "<Unassigned Plane 8>"
-+msgstr "〈保留未使用面8〉"
-+
-+msgid "<Unassigned Plane 9>"
-+msgstr "〈保留未使用面9〉"
-+
- msgid "<Unknown direction>"
- msgstr "<方向不明>"
- 
-@@ -961,7 +991,7 @@ msgstr ""
- "わずかに拡大/縮小します."
- 
- msgid "An outline font editor"
--msgstr "アウトラインフォントエディタ"
-+msgstr "アウトラインフォントエディター"
- 
- msgid "Anchor Control"
- msgstr "アンカーの制御"
-@@ -1023,6 +1053,15 @@ msgstr ""
- "追加されます. ほとんどの場合,このフィールドを0にして\n"
- "\"[*]オフセットを指定\"にチェックを入れるべきでしょう."
- 
-+msgid "Appea_rance Editor..."
-+msgstr "外観エディター(_R)..."
-+
-+msgid "Appearance Editor"
-+msgstr "外観エディター"
-+
-+msgid "Apple"
-+msgstr "アップル社"
-+
- msgid "Apple Advanced Typography"
- msgstr "Apple 高度組版機能"
- 
-@@ -1769,16 +1808,16 @@ msgstr "合字グリフが不正です. GID %d が %d 未満ではありませ
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "フォーマット 2 (%d/%d) の照合テーブルが壊れています.最初=%d 最後=%d フォント"
- "内の全グリフ数=%d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "フォーマット 4 (%d/%d) の照合テーブルが壊れています.最初=%d 最後=%d フォント"
- "内の全グリフ数=%d\n"
-@@ -1786,8 +1825,8 @@ msgstr ""
- #, c-format
- msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n"
- msgstr ""
--"フォーマット 6 の照合テーブルが壊れています.最初=%d フォント内の全グリフ数="
--"%d\n"
-+"フォーマット 6 の照合テーブルが壊れています.最初=%d フォント内の全グリフ数"
-+"=%d\n"
- 
- #, c-format
- msgid "Bad lookup table: format=8, first=%d cnt=%d total glyphs in font=%d\n"
-@@ -2260,6 +2299,9 @@ msgstr "(裸の) CFF CID"
- msgid "CFF version mismatch\n"
- msgstr "CFF のバージョンが合っていません\n"
- 
-+msgid "CID"
-+msgstr "CID"
-+
- msgid "CID findfont Name"
- msgstr "CID findfont名"
- 
-@@ -2554,7 +2596,10 @@ msgid "Change _Weight..."
- msgstr "ウェイトを変更(_W)..."
- 
- msgid "Change _X-Height..."
--msgstr "_Xハイトを変更..."
-+msgstr "Xハイトを変更(_X)..."
-+
-+msgid "Change whether spiro is active or not"
-+msgstr "螺旋描画モード切り替え"
- 
- msgid ""
- "Changing the left side bearing\n"
-@@ -2970,6 +3015,9 @@ msgstr "AFMで合成グリフを使用"
- msgid "Condensed"
- msgstr "コンデンス"
- 
-+msgid "Config_ure Plugins..."
-+msgstr "プラグインの設定(_U)..."
-+
- msgid "Contextual Alternates"
- msgstr "文脈依存の異体字"
- 
-@@ -3023,7 +3071,7 @@ msgstr ""
- "役に立たない場合,無意味なものとされます"
- 
- msgid "Convert By C_Map"
--msgstr "C_Mapを指定して変換"
-+msgstr "CMapを指定して変換(_M)"
- 
- msgid "Convert Design Vector Function:"
- msgstr "デザインベクトル関数を変換:"
-@@ -3790,16 +3838,16 @@ msgid "Edges near horizontal/vertical/italic"
- msgstr "水平/垂直/イタリック角に近い辺"
- 
- msgid "Edit 'cvt '..."
--msgstr "'cvt 'テーブルを編集..."
-+msgstr "'cvt' テーブルを編集..."
- 
- msgid "Edit 'fpgm'..."
--msgstr "'fpgm'テーブルを編集..."
-+msgstr "'fpgm' テーブルを編集..."
- 
- msgid "Edit 'maxp'..."
--msgstr "'maxp'テーブルを編集..."
-+msgstr "'maxp' テーブルを編集..."
- 
- msgid "Edit 'prep'..."
--msgstr "'prep'テーブルを編集..."
-+msgstr "'prep' テーブルを編集..."
- 
- msgid "Edit Chaining Position"
- msgstr "文脈連鎖依存の位置指定を編集"
-@@ -4359,7 +4407,7 @@ msgid "Fixing up References"
- msgstr "リソースの修復中"
- 
- msgid "Fl_attenByCMap"
--msgstr "指定したCM_apで単一化"
-+msgstr "指定したCMapで単一化(_A)"
- 
- msgid "Flared"
- msgstr "フレア"
-@@ -4379,6 +4427,9 @@ msgstr "フラマン語(ベルギーのオランダ語)"
- msgid "Flex Hints"
- msgstr "Flexヒント"
- 
-+msgid "Flip"
-+msgstr "反転"
-+
- msgid "Flip Horizontally"
- msgstr "水平方向に反転"
- 
-@@ -4494,10 +4545,19 @@ msgid ""
- "OpenType, cid-keyed, multi-master, cff, SVG and BitMap (bdf, FON, NFNT) "
- "fonts."
- msgstr ""
--"FontForge はアウトラインおよびビットマップフォントのフォントエディタです。"
--"フォントの作成、編集、変換を行うことができます。 PostScript, TrueType, "
--"OpenType, Cid-keyed, multi-master, cff, SVG, BitMap (bdf, FON, NFNT) フォント"
--"を扱えます。"
-+"FontForge は、アウトラインフォントおよびビットマップフォントの作成、編集、変"
-+"換を行うことができるフォントエディターです。扱える形式は PostScript、"
-+"TrueType、OpenType、CID-Keyed、Multiple Master、CFF、SVG、ビットマップ (BDF、"
-+"FON、NFNT) などです。"
-+
-+msgid ""
-+"FontForge is free Open Source Software written to run on various computer "
-+"operating systems. You can use FontForge Graphically or as a command-line "
-+"tool."
-+msgstr ""
-+"FontForge は、さまざまなコンピュータのオペレーティングシステム上で動作するよ"
-+"うに書かれた無料のオープンソースソフトウェアです。FontForge は GUI を用いて、"
-+"またはコマンドラインツールとして使用できます。"
- 
- msgid ""
- "FontForge loads large images into the background of each glyph\n"
-@@ -5380,6 +5440,9 @@ msgstr "ISO 10646-1 (Unicode, 基本多言語面)"
- msgid "ISO 10646-1 (Unicode, Full)"
- msgstr "ISO 10646-1 (Unicode, 完全)"
- 
-+msgid "ISO 10646:1993"
-+msgstr "ISO 10646:1993"
-+
- msgid "ISO 8859-1  (Latin1)"
- msgstr "ISO 8859-1  (ラテン1/西欧)"
- 
-@@ -6842,6 +6905,9 @@ msgstr "マジャン語"
- msgid "Make Background"
- msgstr "背景として使用"
- 
-+msgid "Make Foreground"
-+msgstr "前面として使用"
-+
- msgid "Make Namelist"
- msgstr "名前リストを作成"
- 
-@@ -7141,6 +7207,9 @@ msgstr "MFの背景をクリア"
- msgid "MfShowErr"
- msgstr "MFエラーを表示"
- 
-+msgid "MicroSoft"
-+msgstr "マイクロソフト社"
-+
- msgid "Min"
- msgstr "最小"
- 
-@@ -7898,8 +7967,8 @@ msgstr ""
- #, c-format
- msgid "Nonsensical class assigned to a glyph-- class=%d is too big. Glyph=%d\n"
- msgstr ""
--"無意味なクラスがグリフに割り当てられています―クラス=%dは大きすぎます. グリフ="
--"%d\n"
-+"無意味なクラスがグリフに割り当てられています―クラス=%dは大きすぎます. グリフ"
-+"=%d\n"
- 
- msgid "Normal"
- msgstr "通常"
-@@ -8095,6 +8164,9 @@ msgstr "O/3次元的"
- msgid "OEM Charset"
- msgstr "OEM 文字セット"
- 
-+msgid "OK"
-+msgstr "OK"
-+
- msgid "OS2Version|Automatic"
- msgstr "自動"
- 
-@@ -8128,6 +8200,12 @@ msgstr "OSS/ベネチアン"
- msgid "OT _Glyph Class:"
- msgstr "OTFグリフクラス(_G):"
- 
-+msgid "O_ff"
-+msgstr "オフ(_F)"
-+
-+msgid "O_n"
-+msgstr "オン(_N)"
-+
- msgid "O_pen Paths"
- msgstr "開いたパス(_P)"
- 
-@@ -8370,6 +8448,9 @@ msgstr "フォントを開く"
- msgid "Open Reference"
- msgstr "参照情報を開く"
- 
-+msgid "Open _Web Page"
-+msgstr "Webページへ(_W)"
-+
- msgid "OpenType"
- msgstr "OpenTypeの仕様"
- 
-@@ -8940,6 +9021,9 @@ msgstr "\"軸の種類\"フィールドを設定してください"
- msgid "Please specify a new supplement for %.20s-%.20s"
- msgstr "%.20s-%.20sの補遺番号を指定し直してください."
- 
-+msgid "Plugin Configuration"
-+msgstr "プラグインの設定"
-+
- msgid "Poin_ts too close"
- msgstr "近すぎる点(_T)"
- 
-@@ -9260,6 +9344,9 @@ msgstr "無変換"
- msgid "Re_move"
- msgstr "削除(_M)"
- 
-+msgid "Re_vert List"
-+msgstr "リストを反転(_V)"
-+
- msgid "Reached end of file when reading composite glyph\n"
- msgstr "合成グリフの読み込み中にファイルの終端に到達しました\n"
- 
-@@ -9633,6 +9720,9 @@ msgstr "ルーマニア語(モルドバ)"
- msgid "Romany"
- msgstr "ロマーニー語"
- 
-+msgid "Rotate"
-+msgstr "回転"
-+
- msgid "Rotate 180°"
- msgstr "180°回転"
- 
-@@ -10232,6 +10322,9 @@ msgstr "常に2番目を選択(_T)"
- msgid "Second glyph of %s"
- msgstr "%sの2つめのグリフ"
- 
-+msgid "SeekCharacter"
-+msgstr "検索文字"
-+
- msgid "Segment Separator"
- msgstr "セグメント区切り"
- 
-@@ -10575,7 +10668,7 @@ msgid "Size of comb delimiters in non-display styles"
- msgstr "非ディスプレイ数式の comb の区切り文字"
- 
- msgid "Skew"
--msgstr "傾き"
-+msgstr "傾斜"
- 
- msgid "Skew Angle"
- msgstr "傾き角"
-@@ -11456,7 +11549,6 @@ msgstr ""
- "フォント%3$.30sのグリフ\"%2$.30s\"に含まれるヒント%1$sは,%4$.30sに含まれるも"
- "のと一致しません(個数または重なり合い方の特徴が異なります)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -12403,8 +12495,8 @@ msgid ""
- "This font contains a \"UniqueId\" variable, but the correct name for it is\n"
- "\t\"UniqueID\" (postscript is case concious)\n"
- msgstr ""
--"このフォントには \"UniqueId\" という名の変数がありますが, 正しくは\t"
--"\"UniqueID\" です (PostScriptでは大文字と小文字は区別されます)\n"
-+"このフォントには \"UniqueId\" という名の変数がありますが, 正しくは"
-+"\t\"UniqueID\" です (PostScriptでは大文字と小文字は区別されます)\n"
- 
- msgid ""
- "This font contains at least one translucent layer, but type3 does not "
-@@ -13308,6 +13400,15 @@ msgstr "辞書 %d に不正な値が含まれています\n"
- msgid "Unicase"
- msgstr "大小文字混在形"
- 
-+msgid "Unicode"
-+msgstr "Unicode"
-+
-+msgid "Unicode 1.0"
-+msgstr "Unicode 1.0"
-+
-+msgid "Unicode 1.1"
-+msgstr "Unicode 1.1"
-+
- msgid "Unicode 2.0+, BMP only"
- msgstr "Unicode 2.0 以降, BMP のみ"
- 
-@@ -14129,7 +14230,7 @@ msgid "X11 bitmap only sfnt (otb)"
- msgstr "X11 ビットマップのみの sfnt (otb)"
- 
- msgid "XHeight:"
--msgstr "xハイト:"
-+msgstr "Xハイト:"
- 
- msgid "XUID-Base"
- msgstr "XUIDの基底"
-@@ -14395,32 +14496,38 @@ msgstr "拡大(_I)"
- msgid "Zulu"
- msgstr "ズールー語"
- 
-+msgid "_128 pixel outline"
-+msgstr "マスの大きさ: 128ピクセル(_1)"
-+
- msgid "_16x4 cell window"
--msgstr "_16×4マス表示"
-+msgstr "16×4マス表示(_1)"
- 
- msgid "_24 pixel outline"
--msgstr "_24 ピクセル アウトライン"
-+msgstr "マスの大きさ: 24ピクセル(_2)"
- 
- msgid "_36 pixel outline"
--msgstr "_36 ピクセル アウトライン"
-+msgstr "マスの大きさ: 36ピクセル(_3)"
-+
-+msgid "_3D Rotate"
-+msgstr "3D 回転"
- 
- msgid "_48 pixel outline"
--msgstr "_48 ピクセル アウトライン"
-+msgstr "マスの大きさ: 48ピクセル(_4)"
- 
- msgid "_72 pixel outline"
--msgstr "_72 ピクセル アウトライン"
-+msgstr "マスの大きさ: 72ピクセル(_7)"
- 
- msgid "_8x2  cell window"
--msgstr " _8×2マス表示"
-+msgstr "8×2マス表示(_8)"
- 
- msgid "_96 pixel outline"
--msgstr "_96 ピクセル アウトライン"
-+msgstr "マスの大きさ: 96ピクセル(_9)"
- 
- msgid "_AA"
- msgstr "階調表示(_A)"
- 
- msgid "_About..."
--msgstr "…について(_A)..."
-+msgstr "このソフトウェアについて(_A)..."
- 
- msgid "_Accept inexact"
- msgstr "不正確な一致を許容(_A)"
-@@ -14479,6 +14586,9 @@ msgstr "周辺も(_A)"
- msgid "_Ascent:"
- msgstr "高さ(_A):"
- 
-+msgid "_Ask"
-+msgstr "尋ねる(_A)"
-+
- msgid "_Aspect"
- msgstr "様相(_A)"
- 
-@@ -14521,7 +14631,7 @@ msgid "_Both"
- msgstr "両方(_B)"
- 
- msgid "_Bottom"
--msgstr "最後(_B)"
-+msgstr "末尾へ(_B)"
- 
- msgid "_Bottom:"
- msgstr "下限(_B):"
-@@ -14535,6 +14645,9 @@ msgstr "アクセントつきグリフを構築(_B)"
- msgid "_Build Syllables"
- msgstr "音節を構築する(_B)"
- 
-+msgid "_CID"
-+msgstr "CID(_C)"
-+
- msgid "_Cancel"
- msgstr "キャンセル(_C)"
- 
-@@ -14568,6 +14681,9 @@ msgstr "定義済みのグリフのみ表示(_C)"
- msgid "_Condense/Extend..."
- msgstr "幅(_C)..."
- 
-+msgid "_Configure"
-+msgstr "設定(_C)"
-+
- msgid "_Contrast"
- msgstr "コントラスト(_C)"
- 
-@@ -14578,7 +14694,7 @@ msgid "_Control Points near horizontal/vertical"
- msgstr "水平/垂直に近い制御点(_C)"
- 
- msgid "_Convert to CID"
--msgstr "_CIDに変換"
-+msgstr "CIDに変換(_C)"
- 
- msgid "_Copies:"
- msgstr "部数(_C):"
-@@ -14614,6 +14730,9 @@ msgstr "グリフの切り離し(_D)"
- msgid "_Diagonal Hints"
- msgstr "斜めのヒント(_D)"
- 
-+msgid "_Disable"
-+msgstr "無効化(_D)"
-+
- msgid "_Display Compositions..."
- msgstr "組合せを表示(_D)..."
- 
-@@ -14659,6 +14778,9 @@ msgstr "EMの大きさ(_E):"
- msgid "_Embeddable"
- msgstr "埋め込み可能(_E)"
- 
-+msgid "_Enable"
-+msgstr "有効化(_E)"
-+
- msgid "_Enabled"
- msgstr "有効(_E)"
- 
-@@ -14683,6 +14805,9 @@ msgstr "極大点を表示(_E)"
- msgid "_FDEF"
- msgstr "_FDEF:"
- 
-+msgid "_FF"
-+msgstr "FF(_F)"
-+
- msgid "_Family Name:"
- msgstr "ファミリー名(_F):"
- 
-@@ -14870,6 +14995,9 @@ msgstr "合字(_L)"
- msgid "_Lining"
- msgstr "線描き(_L)"
- 
-+msgid "_Load"
-+msgstr "読み込み(_L)"
-+
- msgid "_Load Encoding..."
- msgstr "エンコーディングを読み込み(_L)..."
- 
-@@ -14907,6 +15035,9 @@ msgstr "組合せを修正(_M)..."
- msgid "_Mono"
- msgstr "白黒(_M)"
- 
-+msgid "_More Info"
-+msgstr "詳細情報(_M)"
-+
- msgid "_More hints than:"
- msgstr "ヒントの個数の上限(_M):"
- 
-@@ -14958,6 +15089,9 @@ msgstr "なし(_N)"
- msgid "_Normal"
- msgstr "通常(_N)"
- 
-+msgid "_OK"
-+msgstr "OK(_O)"
-+
- msgid "_OS/2 Version"
- msgstr "_OS/2バージョン"
- 
-@@ -15030,6 +15164,9 @@ msgstr "プリンタ(_P):"
- msgid "_Proportion"
- msgstr "幅の比率(_P)"
- 
-+msgid "_Python"
-+msgstr "Python(_P)"
-+
- msgid "_Quit"
- msgstr "終了(_Q)"
- 
-@@ -15184,7 +15321,7 @@ msgid "_Tools"
- msgstr "ツール(_T)"
- 
- msgid "_Top"
--msgstr "最初(_T)"
-+msgstr "先頭へ(_T)"
- 
- msgid "_Top:"
- msgstr "上限(_T):"
-@@ -15202,7 +15339,7 @@ msgid "_Transformations"
- msgstr "変形(_T)"
- 
- msgid "_TrueType Instructions"
--msgstr "_TrueType命令"
-+msgstr "TrueType命令(_T)"
- 
- msgid "_Twilight Pnt Cnt:"
- msgstr "トワイライトポイントの個数(_T):"
-@@ -15289,7 +15426,7 @@ msgid "_X-Ascent"
- msgstr "_xの高さ"
- 
- msgid "_X-Height"
--msgstr "_Xハイト"
-+msgstr "Xハイト(_X)"
- 
- msgid "_Yes"
- msgstr "はい(_Y)"
-diff --git a/po/ka_GE.po b/po/ka_GE.po
-index c55108f08c..ee1e9749d6 100644
---- a/po/ka_GE.po
-+++ b/po/ka_GE.po
-@@ -8,8 +8,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 11:56\n"
- "Last-Translator: \n"
- "Language-Team: Georgian\n"
- "Language: ka_GE\n"
-@@ -23,6 +23,13 @@ msgstr ""
- "X-Crowdin-File: FontForge.pot\n"
- "X-Crowdin-File-ID: 2\n"
- 
-+msgid ""
-+"\n"
-+"Layers:"
-+msgstr ""
-+"\n"
-+"შრეები:"
-+
- #, c-format
- msgid "  Ignoring '%c%c%c%c'\n"
- msgstr "  უგულებელყოფილია „%c%c%c%c“\n"
-@@ -39,14 +46,28 @@ msgstr " ზომის დამატებით შეიქმნება
- 
- #. GT: This continues a multi-line error message, hence the leading space
- msgid " Bad kerning class table, ignored\n"
--msgstr " წანაცვლების კლასის გაუმართავი ცხრილი, უგულებელყოფილია\n"
-+msgstr " შემოკვეცის კლასის უმართებულო ცხრილი, უგულებელყოფილია\n"
- 
- msgid " Bad ligature table, ignored\n"
- msgstr " გადაბმების გაუმართავი ცხრილი, უგულებელყოფილია\n"
- 
- #. GT: This continues a multi-line error message, hence the leading space
- msgid " Bad pairwise kerning table, ignored\n"
--msgstr " წანაცვლებული წყვილების გაუმართავი ცხრილი, უგულებელყოფილია\n"
-+msgstr " შემოკვეცილი წყვილების უმართებულო ცხრილი, უგულებელყოფილია\n"
-+
-+#, c-format
-+msgid " Curvature: %g"
-+msgstr " სიმრუდე: %g"
-+
-+#, c-format
-+msgid " Curvature: %g  Radius: %g"
-+msgstr " სიმრუდე: %g  რადიუსი: %g"
-+
-+msgid " Next CP"
-+msgstr " შემდ. მოსაჭიდი"
-+
-+msgid " Prev CP"
-+msgstr " წინა მოსაჭიდი"
- 
- msgid " Removing a size will delete it."
- msgstr " ზომის მოცილების შედეგად წაიშლება."
-@@ -60,8 +81,8 @@ msgid ""
- "%.100s is not in a known format (or uses features of that format fontforge "
- "does not support, or is so badly corrupted as to be unreadable)"
- msgstr ""
--"%.100s უცნობი სახისაა (ან იმ სახის თვისებებს შეიცავს, რომელთაც FontForge ვერ "
--"აღიქვამს, ანდაც ისეა დაზიანებული, რომ ვერ იკითხება)"
-+"%.100s უცნობი სახისაა (ან იმ სახის თვისებებს იყენებს, რომელთაც FontForge ვერ "
-+"აღიქვამს, ანდა ისეა დაზიანებული, რომ ვერ იკითხება)"
- 
- #. GT: This is the title for a window showing an outline character
- #. GT: It will look something like:
-@@ -72,7 +93,18 @@ msgstr ""
- #. GT: $4 is the changed flag ('*' for the changed items)
- #, c-format
- msgid "%1$.80s at %2$d from %3$.90s%4$s"
--msgstr "%1$.80s უჯრაში %2$d, შრიფტიდან %3$.90s%4$s"
-+msgstr "%1$.80s უჯრაში %2$d შრიფტიდან %3$.90s%4$s"
-+
-+#. GT: This is the title for a window showing a bitmap character
-+#. GT: It will look something like:
-+#. GT:  exclam at 33 size 12 from Arial
-+#. GT: $1 is the name of the glyph
-+#. GT: $2 is the glyph's encoding
-+#. GT: $3 is the pixel size of the bitmap font
-+#. GT: $4 is the font name
-+#, c-format
-+msgid "%1$.80s at %2$d size %3$d from %4$.80s"
-+msgstr "%1$.80s უჯრაში %2$d ზომით%3$d შრიფტიდან %4$.80s"
- 
- #. GT: The user is trying to open a font file which contains multiple fonts and
- #. GT: has asked for a font which is not in that file.
-@@ -88,6 +120,16 @@ msgstr ""
- "%s\n"
- "განაგრძობთ მაინც?"
- 
-+#. GT: There are various broad classes of lookups here and the first string
-+#. GT: describes those: "Contextual Positioning", Contextual Substitution", etc.
-+#. GT: Each of those may be formatted in 3 different ways: by (or perhaps using
-+#. GT: would be a better word) glyphs, classes or coverage tables.
-+#. GT: So this might look like:
-+#. GT:  Contextual Positioning by classes
-+#, c-format
-+msgid "%s by %s"
-+msgstr "%s %sს მიხედვით"
-+
- #. GT: This string is used to generate a name for each OpenType lookup.
- #. GT: The %s will be filled with the user friendly name of the feature used to invoke the lookup
- #. GT: The second %s (if present) is the script
-@@ -103,7 +145,7 @@ msgstr "%s ფაილს არ შეიცავს %.100s"
- 
- #, c-format
- msgid "%s kerning class %d"
--msgstr "%s წანაცვლების კლასი %d"
-+msgstr "%s შემოკვეცის კლასი %d"
- 
- #. GT: This string is used to generate a name for an OpenType lookup subtable.
- #. GT:  %s is the lookup name
-@@ -120,7 +162,7 @@ msgid "'%s' is not the name of a currently known plugin"
- msgstr "„%s“ არ ემთხვევა ამჟამად ცნობილი მოდულების სახელებს"
- 
- msgid "'kern' Horizontal Kerning Table"
--msgstr "'kern' თარაზული წანაცვლების ცხრილი"
-+msgstr "'kern' ცხრილი თარაზული შემოკვეცისთვის"
- 
- msgid "(Adobe now considers XUID/UniqueID unnecessary)"
- msgstr "(Adobe მიიჩნევს, რომ XUID/UniqueID აღარაა აუცილებელი)"
-@@ -225,6 +267,12 @@ msgstr "ჭდე უნდა იყოს 4 ASCII სიმბოლოთი"
- msgid "AMS Names"
- msgstr "AMS სახელები"
- 
-+msgid "A_dd Extrema"
-+msgstr "წვერ_ოს დამატება"
-+
-+msgid "Active Hints"
-+msgstr "მოქმედი მიმთ."
-+
- msgid "Active Layer Color"
- msgstr "მოქმედი შრის ფერი"
- 
-@@ -241,12 +289,18 @@ msgstr "მოქმედი ხელსაწყოს ფერი"
- msgid "Add"
- msgstr "დამატება"
- 
-+msgid "Add All Extrema"
-+msgstr "ყველა წვეროს დამატება"
-+
- msgid "Add Encoding Name..."
- msgstr "დაშიფვრის სახელის დამატება..."
- 
- msgid "Add Encoding Slots..."
- msgstr "დასაშიფრი ადგილების დამატება..."
- 
-+msgid "Add Good Extrema"
-+msgstr "მართებული წვეროს დამატება"
-+
- msgid "Add Language to Script..."
- msgstr "ენის დამატება დამწერლობისთვის..."
- 
-@@ -266,10 +320,10 @@ msgid "Add a curve point"
- msgstr "მრუდის წერტილის დამატება"
- 
- msgid "Add a curve point always either horizontal or vertical"
--msgstr "მრუდის წერტილის დამატება მხოლოდ თარაზულად, ან შვეულად"
-+msgstr "მრუდის წერტილი მხოლოდ თარაზულად ან შვეულად"
- 
- msgid "Add a left \"tangent\" point"
--msgstr "მარცხენა „მხების“ წერტილის დამატება"
-+msgstr "მარცხნივ მიმართული „მხების“ წერტილის დამატება"
- 
- msgid "Add a new layer"
- msgstr "ახალი შრის დამატება"
-@@ -278,7 +332,7 @@ msgid "Add a point, then drag out its control points"
- msgstr "წერტილის დამატება, გადაადგილება და მართვა"
- 
- msgid "Add a right \"tangent\" point"
--msgstr "მარჯვენა „მხების“ წერტილის დამატება"
-+msgstr "მარჯვნივ მიმართული „მხების“ წერტილის დამატება"
- 
- msgid "Add a subtable to which lookup?"
- msgstr "რომეცლ ცნობარს დაემატოს ქვეცხრილი?"
-@@ -287,7 +341,10 @@ msgid "Add a tangent point"
- msgstr "მხების წერტილის დამატება"
- 
- msgid "Adding points at Extrema..."
--msgstr "ემატება კიდურა წერტილები..."
-+msgstr "კიდურა წერტილების დამატება..."
-+
-+msgid "Additional arguments for autotrace program:"
-+msgstr "დამატებითი არგუმენტები თვითგამომხაზველი პროგრამისთვის:"
- 
- #. GT: "Adjust" here means Device Table based pixel adjustments, an OpenType
- #. GT: concept which allows small corrections for small pixel sizes where
-@@ -343,8 +400,8 @@ msgid ""
- "After rotating or skewing a glyph you should probably apply Element->Add "
- "Extrema"
- msgstr ""
--"ასონიშნის მობრუნების ან გადახრის შემდგომ, სასურველია გამოიყენოთ „შემადგენელი "
--"→ კიდურა წერტილის დამატება“"
-+"ასონიშნის მობრუნების ან გადახრის შემდგომ სასურველია გამოიყენოთ „შემადგენელი "
-+"→ წვეროს წერტილის დამატება“"
- 
- msgid "Ahead Classes"
- msgstr "მომდევნო კლასები"
-@@ -352,6 +409,9 @@ msgstr "მომდევნო კლასები"
- msgid "Ahom"
- msgstr "აჰომი"
- 
-+msgid "Align Points"
-+msgstr "წერტილების სწორება"
-+
- msgid "All Files"
- msgstr "ყველანაირი ფაილი"
- 
-@@ -364,8 +424,11 @@ msgstr "ყველა ასონიშანი"
- msgid "Allow _curve smoothing"
- msgstr "_მრუდის დაგლუვების საშუალება"
- 
-+msgid "Allow _removal of extrema"
-+msgstr "წვეროს მო_ცილების ნებართვა"
-+
- msgid "Allows you to select optional behavior when generating the font"
--msgstr "დამატებითი მოქმედების მითითების საშუალება, შრიფტის შედგენისას"
-+msgstr "დამატებითი მოქმედების მითითების საშუალება შრიფტის დამზადებისას"
- 
- msgid "Almost Horizontal/Vertical Curves"
- msgstr "თითქმის თარ./შვეულ. მრუდები"
-@@ -596,6 +659,15 @@ msgstr "ისრები"
- msgid "Arrows & Sup Arrows A/B & Misc Arrows"
- msgstr "ისრები, დანართი A/B და სხვადასხვა ნიშნები"
- 
-+msgid "As CFF fonts"
-+msgstr "როგორც CFF-შრიფტები"
-+
-+msgid "Ascent/Descent Color"
-+msgstr "ზედატანის/ქვედატანის ფერი"
-+
-+msgid "Ask the user for autotrace arguments each time autotrace is invoked"
-+msgstr "არგუმენტების მითითების მოთხოვნა გამოხაზვის ყოველი წამოწყებისას"
-+
- msgid "At most 31 glyphs may be specified in an insert list"
- msgstr "არაუმეტეს 31 ასონიშანი შეიძლება მიეთითოს ჩასამატებელ სიაში"
- 
-@@ -607,13 +679,13 @@ msgid "Auto Width"
- msgstr "სიგანის თვითგანსაზღვრა"
- 
- msgid "AutoHint"
--msgstr "თვითმინიშნება"
-+msgstr "თვითმიმთითებელი"
- 
- msgid "AutoHint changed glyphs before generating a font"
--msgstr "თვითმინიშნებით შესწორებულია ასონიშნები შრიფტის შედგენამდე"
-+msgstr "თვითმიმთითებლით შესწორებულია ასონიშნები შრიფტის დამზადებამდე"
- 
- msgid "AutoKernDialog"
--msgstr "თვითწანაცვლების სარკმელი"
-+msgstr "თვითშემოკვეცის სარკმელი"
- 
- msgid "AutoLBearingSync"
- msgstr "მარცხენა საბჯენის თვითშეწყობა"
-@@ -629,7 +701,16 @@ msgid "Auto_Instr"
- msgstr "თვითმი_თითება"
- 
- msgid "Autokern new entries"
--msgstr "ახლადშეყვანილის თვითწანაცვლება"
-+msgstr "ახლად შეტანილის თვითშემოკვეცა"
-+
-+msgid "AutotraceArgs"
-+msgstr "გამომხაზველის არგუმენტები"
-+
-+msgid "AutotraceAsk"
-+msgstr "მოთხოვნა გამოხაზვისას"
-+
-+msgid "Autotracing..."
-+msgstr "თვითგამოხაზვა..."
- 
- msgid "Axerbaijani (Arabic)"
- msgstr "აზერბაიჯანული (არაბული)"
-@@ -647,6 +728,9 @@ msgstr "აზერი (ლათინური)"
- msgid "BBearing:"
- msgstr "ქვედა საბჯენი:"
- 
-+msgid "BMP"
-+msgstr "BMP"
-+
- #. GT: Background, make it short
- msgid "Back"
- msgstr "უკანა"
-@@ -655,7 +739,7 @@ msgid "Back Classes"
- msgstr "წინა კლასები"
- 
- msgid "Bad Apple Kern Class\n"
--msgstr "Apple-ის გაუმართავი წანაცვლების კლასი\n"
-+msgstr "Apple-ის უმართებულო კლასი შემოკვეცისთვის\n"
- 
- msgid "Bad Class"
- msgstr "გაუმართავი კლასი"
-@@ -705,6 +789,9 @@ msgstr "გაუმართავი არეები"
- msgid "Bad Version"
- msgstr "არამართებული ვერსია"
- 
-+msgid "Bad WOFF header, a field which must be 0 is not."
-+msgstr "უმართებულო WOFF-თავსართი, ველის მნიშვნელობა უნდა ყოფილიყო 0."
-+
- msgid "Bad Weight"
- msgstr "არამართებული სისქე"
- 
-@@ -712,7 +799,7 @@ msgid "Bad class name"
- msgstr "კლასის გაუმართავი სახელი"
- 
- msgid "Bad default baseline"
--msgstr "გაუმართავი საყრდენი ხაზი"
-+msgstr "გაუმართავი ძირითადი ხაზი"
- 
- msgid "Bad encoding file format"
- msgstr "გაუმართავი შიფრის მქონე ფაილი"
-@@ -733,7 +820,7 @@ msgstr "გაუმართავი გამოსახულება: %.1
- 
- #, c-format
- msgid "Bad kern pair: glyphs %d & %d should have been < %d\n"
--msgstr "გაუმართავი წანაცვლების წყვილი: ასონიშნები %d და %d უნდა იყოს < %d\n"
-+msgstr "შემოკვეცის უმართებულო წყვილი: ასონიშნები %d და %d უნდა იყოს < %d\n"
- 
- msgid "Bad language tag"
- msgstr "არამართებული ენის ჭდე"
-@@ -757,6 +844,9 @@ msgstr "არასწორი რიცხვი, Infinity ან NaN: %s\n"
- msgid "Bad rule"
- msgstr "გაუმართავი წესი"
- 
-+msgid "Bad signature in WOFF header."
-+msgstr "უმართებულო ხელმოწერა WOFF-თავსართში."
-+
- #. GT: The words "true" and "false" should be left untranslated. We are restricted
- #. GT: here by what PostScript understands, and it only understands the English
- #. GT: words. You may, of course, change it to something like ("true" (vrai) ou "false" (faux))
-@@ -785,10 +875,10 @@ msgid "Base Ligatures"
- msgstr "ძირითადი გადაბმები"
- 
- msgid "Baseline"
--msgstr "საყრდენი ხაზი"
-+msgstr "ძირითადი ხაზი"
- 
- msgid "Baseline used for Latin, Greek, Cyrillic text."
--msgstr "საყრდენი ხაზი ლათინურის, ბერძნულისა და კირილიცისთვის."
-+msgstr "ძირითადი ხაზი ლათინურის, ბერძნულისა და კირილიცისთვის."
- 
- msgid "Basic Latin"
- msgstr "ძირითადი ლათინური"
-@@ -820,6 +910,9 @@ msgstr "რასტრული გადიდება..."
- msgid "Bitmap _Magnification..."
- msgstr "რასტრული გა_დიდება..."
- 
-+msgid "Bits/Pixel:"
-+msgstr "ბიტი/პიქსელზე:"
-+
- msgid "Bold font used in the Find/Replace window"
- msgstr "მუქი შრიფტი გამოიყენება პოვნა/ძიების ფანჯარაში"
- 
-@@ -925,17 +1018,48 @@ msgstr ""
- msgid "Can't Find Glyph"
- msgstr "ვერ მოინახა ასონიშანი"
- 
-+msgid "Can't create temporary directory"
-+msgstr "ვერ შეიქმნა დროებითი საქაღალდე"
-+
-+msgid "Can't find autotrace"
-+msgstr "ვერ მოიძებნა გამომხაზველი"
-+
-+msgid ""
-+"Can't find autotrace program (set AUTOTRACE environment variable) or "
-+"download from:\n"
-+"  http://sf.net/projects/autotrace/"
-+msgstr ""
-+"ვერ მოიძებნა თვითგამომხაზველი (გამართეთ გარემოს ცვლადი AUTOTRACE) ან "
-+"ჩამოტვირთეთ აქედან:\n"
-+"  http://sf.net/projects/autotrace/"
-+
-+msgid "Can't find mf"
-+msgstr "ვერ მოიძებნა mf (metafont)"
-+
-+msgid ""
-+"Can't find mf program -- metafont (set MF environment variable) or download "
-+"from:\n"
-+"  http://www.tug.org/\n"
-+"  http://www.ctan.org/\n"
-+"It's part of the TeX distribution"
-+msgstr ""
-+"ვერ მოინახა mf-პროგრამა -- metafont (გამართეთ გარემოს ცვლადი MF) ან "
-+"ჩამოტვირთეთ აქედან:\n"
-+"  http://www.tug.org/\n"
-+"  http://www.ctan.org/\n"
-+"TeX-ის შემადგენელი ნაწილია"
-+
- msgid "Can't find the file"
- msgstr "ვერ მოიძებნა ფაილი"
- 
- msgid "Can't insert 'cvt'"
--msgstr "ვერ ჩაისმება 'cvt'"
-+msgstr "ვერ ჩაისმება „cvt“"
- 
- msgid "Can't insert 'fpgm'"
--msgstr "ვერ ჩაისმება 'fpgm'"
-+msgstr "ვერ ჩაისმება „fpgm“"
- 
- msgid "Can't insert 'prep'"
--msgstr "ვერ ჩაისმება 'prep'"
-+msgstr "ვერ ჩაისმება „prep“"
- 
- #, c-format
- msgid "Can't open %s"
-@@ -951,6 +1075,9 @@ msgstr "ვერ იხსნება დროებითი ფაილი
- msgid "Can't open temporary file for truetype output.\n"
- msgstr "ვერ იხსნება დროებითი ფაილი Truetype-გამოტანისთვის.\n"
- 
-+msgid "Can't run mf"
-+msgstr "ვერ გაეშვა mf (metafont)"
-+
- msgid "Cancel"
- msgstr "გაუქმება"
- 
-@@ -1341,9 +1468,15 @@ msgstr "ყველაფრის გასუფთავება"
- msgid "Clear Device Table"
- msgstr "მოწყობილობის ცხრილის გასუფთავება"
- 
-+msgid "Clear Instructions"
-+msgstr "მითითებების გასუფთავება"
-+
- msgid "Clear Special Data"
- msgstr "საგანგებო მონაცემების წაშლა"
- 
-+msgid "Clear _Background"
-+msgstr "_ფონის გასუფთავება"
-+
- msgid ""
- "Click on a range to select characters in that range.\n"
- "Double click on a range to see characters that should be\n"
-@@ -1356,11 +1489,14 @@ msgstr ""
- msgid "Co_py LBearing"
- msgstr "მარცხენა საბჯენის ას_ლი"
- 
-+msgid "Color of the ascent and descent lines"
-+msgstr "ზედატანისა და ქვედატანის ხაზების ფერი"
-+
- msgid "Color used to draw the advance width line of a glyph"
- msgstr "ასონიშნის გაფართოებული სიგანის აღმნიშვნელი ფერი"
- 
- msgid "Color used to draw the kerning line"
--msgstr "წანაცვლების ხაზის აღმნიშვნელი ფერი"
-+msgstr "შემოკვეცის ზოლის აღმნიშვნელი ფერი"
- 
- msgid "Color used to draw the left side bearing"
- msgstr "მარცხენა საბჯენის ფერი"
-@@ -1389,6 +1525,9 @@ msgstr "დასართავი განმასხვავებელ
- msgid "Combining Diacritical Marks for Symbols"
- msgstr "დასართავი განმასხვავებელი ნიშნები პირობითი ნიშნებისთვის"
- 
-+msgid "Comment"
-+msgstr "შენიშვნა"
-+
- msgid "Common Indic Number Forms"
- msgstr "გავრცელებული ინდური რიცხვითი ჩანაწერები"
- 
-@@ -1401,12 +1540,31 @@ msgstr "შემჭირდოებული გახსნისას"
- msgid "Compacted"
- msgstr "შემჭიდროებული"
- 
-+msgid "Compare Layers"
-+msgstr "შრეების შედარება"
-+
-+msgid "Compare Layers..."
-+msgstr "შრეების შედარება..."
-+
- msgid "Compare _Outlines"
- msgstr "_მოხაზულობის შედარება"
- 
-+msgid "Compare two layers"
-+msgstr "ორი შრის შედარება"
-+
- msgid "Complex"
- msgstr "რთული"
- 
-+msgid "Component"
-+msgstr "შემადგენელი"
-+
-+#, c-format
-+msgid "Component %d %.30s (%d,%d)"
-+msgstr "შემადგენელი %d %.30s (%d,%d)"
-+
-+msgid "Components"
-+msgstr "შემადგენლები"
-+
- msgid "Config_ure Plugins..."
- msgstr "მოდულების გამარ_თვა..."
- 
-@@ -1434,6 +1592,9 @@ msgstr "შრეების ასლი"
- msgid "Copy RBearin_g"
- msgstr "მარჯვენა სა_ბჯენის ასლი"
- 
-+msgid "Copy _Fg To Bg"
-+msgstr "ასლი ფ_ონზე"
-+
- msgid "Copy _VWidth"
- msgstr "_შვეული სიგანის ასლი"
- 
-@@ -1447,7 +1608,7 @@ msgid "Copy_right:"
- msgstr "საავ_ტორო უფლება:"
- 
- msgid "Copyright"
--msgstr "საავტორო უფლება"
-+msgstr "საკუთრების უფლება"
- 
- msgid ""
- "Copyright text (in the Names pane) must be entirely ASCII. So, use (c) "
-@@ -1457,7 +1618,11 @@ msgstr ""
- "გამოიყენეთ (c) და არა – ©."
- 
- msgid "Corner"
--msgstr "კუთხე"
-+msgstr "კუთხოვანი"
-+
-+#, c-format
-+msgid "Could not create plugin directory '%s'\n"
-+msgstr "ვერ შეიქმნა მოდულის საქაღალდე: „%s“\n"
- 
- msgid "Could not figure out a lookup type"
- msgstr "ვერ დადგინდა ცნობარის სახეობა"
-@@ -1478,7 +1643,7 @@ msgid "Could not open temporary file."
- msgstr "ვერ გაიხსნა დროებითი ფაილი."
- 
- msgid "Could not read (or perhaps find) mf output file"
--msgstr "ვერ იკითხება (ან უფრო იძებნება) mf-გამოტანის ფაილი"
-+msgstr "ვერ იკითხება (ანდა ვერ იძებნება) mf-გამოტანის ფაილი"
- 
- msgid "Couldn't Load"
- msgstr "ვერ ჩაიტვირთა"
-@@ -1518,6 +1683,9 @@ msgstr "ვერ გაიხსნა ფაილი %.200s"
- msgid "Couldn't open font"
- msgstr "ვერ გაიხსნა შრიფტი"
- 
-+msgid "Cr_eate"
-+msgstr "შე_ქმნა"
-+
- msgid "Cre_ate Named Glyphs..."
- msgstr "სახელიანი ასონიშნების შ_ექმნა..."
- 
-@@ -1527,6 +1695,12 @@ msgstr "მცირე მთავრულის შექმნა"
- msgid "Create Subscript/Superscript"
- msgstr "ხაზზედა/ხაზქვედა ნიშნის შექმნა"
- 
-+msgid "Create directory"
-+msgstr "საქაღალდის შექმნა"
-+
-+msgid "Create directory..."
-+msgstr "საქაღალდის შექმნა..."
-+
- msgid "Create small caps variants for symbols as well as letters"
- msgstr "მცირე მთავრულის შექმნა სიმბოლოებისა და ასოებისთვის"
- 
-@@ -1547,6 +1721,19 @@ msgstr ""
- "ჯერჯერობით, FontForge-ში მხარდაჭერილია მხოლოდ ბიტური (და არა ბაიტური) სახის "
- "type3-გამოტანა"
- 
-+#, c-format
-+msgid "Curvature: %g"
-+msgstr "სიმრუდე: %g"
-+
-+msgid "Curvature: -0.00000000"
-+msgstr "სიმრუდე: -0.00000000"
-+
-+msgid "Curvature: ?"
-+msgstr "სიმრუდე: ?"
-+
-+msgid "Curve"
-+msgstr "მრუდი"
-+
- msgid "Curve Type"
- msgstr "მრუდის სახეობა"
- 
-@@ -1589,8 +1776,11 @@ msgstr "თარიღები"
- msgid "De_activate Spiro"
- msgstr "ხვეულის გა_უქმება"
- 
-+msgid "Decompressed length did not match expected length for table"
-+msgstr "შეუკუმშავი სიგრძე შეუსაბამოა ცხრილისთვის მოსალოდნელ სიგრძესთან"
-+
- msgid "Default Baseline"
--msgstr "საყრდენი ხაზი ნაგულისხმევად"
-+msgstr "ნაგულისხმევი ძირითადი ხაზი"
- 
- msgid "Define Groups"
- msgstr "ჯგუფების განსაზღვრა"
-@@ -1649,11 +1839,14 @@ msgstr "საქაღალდეები თავში"
- msgid "Directories Separate"
- msgstr "საქაღალდეები გამოყოფილად"
- 
-+msgid "Directory name?"
-+msgstr "საქაღალდის სახელი?"
-+
- msgid "Directory|_New"
- msgstr "_ახალი"
- 
- msgid "Discarding a duplicate kerning pair."
--msgstr "ცილდება ერთნაირი წანაცვლებული წყვილები."
-+msgstr "ცილდება ერთნაირი შემოკვეცილი წყვილები."
- 
- msgid "Display"
- msgstr "ჩვენება"
-@@ -1696,6 +1889,12 @@ msgid ""
- msgstr ""
- "გამოაჩენს ყველა მონიშნულ სიმბოლოს, თითოეულს ცალკე გვერდზე, მეტად დიდი ზომით"
- 
-+msgid "Dist"
-+msgstr "სიშორე"
-+
-+msgid "Distance"
-+msgstr "დაშორება"
-+
- msgid "Dives Akuru"
- msgstr "დივეჰი აკურუ"
- 
-@@ -1711,7 +1910,7 @@ msgstr ""
- "(თუ კი, რომლები)"
- 
- msgid "Doesn't look like a valid pdf file, couldn't find xref section"
--msgstr "არ ჰგავს მართებულ PDF-ფაილს, ვერ მოინახა xref-განყოფილება"
-+msgstr "არ ჰგავს მართებულ PDF-ფაილს, ვერ მოინახა xref-არე"
- 
- msgid "Dogra"
- msgstr "დოგრი"
-@@ -1731,6 +1930,9 @@ msgstr "სახელი მეორდება"
- msgid "Duployan"
- msgstr "დუპლოი"
- 
-+msgid "EPS"
-+msgstr "EPS"
-+
- msgid "E_lement"
- msgstr "შ_ემადგენელი"
- 
-@@ -1788,7 +1990,7 @@ msgid "Egyptian Hieroglyphs"
- msgstr "ეგვიპტური იეროგლიფები"
- 
- msgid "Ellipse"
--msgstr "ოვალი"
-+msgstr "კვერცხისებრი"
- 
- msgid "Enclosed Alphanumeric Supplement"
- msgstr "შემოსაზღვრული ასოციფრული დანართი"
-@@ -1854,12 +2056,33 @@ msgstr "აკლია „{“ განსაზღვრისას %d ხ
- msgid "Expor_t..."
- msgstr "გა_ტანა..."
- 
-+msgid "Export"
-+msgstr "გამოტანა"
-+
-+msgid "Export Options"
-+msgstr "გამოტანის პარამეტრები"
-+
-+msgid "ExportClipboard"
-+msgstr "გამოტანის ასლის აღება"
-+
- msgid "Extended"
- msgstr "გაფართოებული"
- 
- msgid "Extended Collection"
- msgstr "გაფართოებული კრებული"
- 
-+#. GT: Extra Space, see below for a full comment
-+#. GT: Extra Space
-+msgid "Extra Sp:"
-+msgstr "დამატ. სივრცე:"
-+
-+msgid ""
-+"Extra arguments for configuring the autotrace program\n"
-+"(either autotrace or potrace)"
-+msgstr ""
-+"დამატებითი არგუმენტები გამომხაზველი პროგრამის გასამართად\n"
-+"(გამოდგება ორივესთვის, Autotrace და Potrace)"
-+
- msgid ""
- "Extra white space to be added after each\n"
- "sub/superscript."
-@@ -1871,12 +2094,16 @@ msgstr "ამოკრეფა PDF-ფაილიდან"
- msgid "F_ind / Replace..."
- msgstr "_პოვნა / ჩანაცვლება..."
- 
-+#. GT: Foreground, make it short
-+msgid "F_ore"
-+msgstr "_წინა"
-+
- msgid "Failed to generate postscript font"
--msgstr "ვერ შეიქმნა PostScript-შრიფტი"
-+msgstr "ვერ დამზადდა PostScript-შრიფტი"
- 
- #, c-format
- msgid "Failed to generate postscript in file %s"
--msgstr "ვერ შეიქმნა PostScript-შრიფტი ფაილში %s"
-+msgstr "ვერ დამზადდა PostScript-შრიფტი ფაილში %s"
- 
- #, c-format
- msgid "Failed to open %s for output"
-@@ -1913,12 +2140,17 @@ msgstr "თვისების ჭდეები მოცილდება"
- msgid "File Exists"
- msgstr "ფაილი არსებობს"
- 
-+msgid ""
-+"File length as specified in the WOFF header does not match the actual file "
-+"length."
-+msgstr "ფაილის სიგრძე მითითებული WOFF-თავსართში არ ემთხვევა არსებულ სიგრძეს."
-+
- #, c-format
- msgid "File, %s, exists. Replace it?"
- msgstr "ფაილი %s უკვე არსებობს. ჩანაცვლდეს?"
- 
- msgid "Filled Ellipse"
--msgstr "სავსე ოვალი"
-+msgstr "სავსე კვერცხისებრი"
- 
- msgid "Filter"
- msgstr "გამორჩევა"
-@@ -1964,22 +2196,22 @@ msgid "Flip"
- msgstr "გადაკეცვა"
- 
- msgid "Flip Horizontally"
--msgstr "თარაზულად შებრუნება"
-+msgstr "თარაზულად გადაკეცვა"
- 
- msgid "Flip Vertically"
--msgstr "შვეულად შებრუნება"
-+msgstr "შვეულად გადაკეცვა"
- 
- msgid "Flip _Horizontally"
--msgstr "თარა_ზულად შებრუნება"
-+msgstr "თარა_ზულად გადაკეცვა"
- 
- msgid "Flip _Vertically"
--msgstr "შ_ვეულად შებრუნება"
-+msgstr "შ_ვეულად გადაკეცვა"
- 
- msgid "Flip the selection"
--msgstr "მონიშნულის სარკისებრი შებრუნება"
-+msgstr "მონიშნულის გადაკეცვა"
- 
- msgid "Flip..."
--msgstr "შებრუნება..."
-+msgstr "გადაკეცვა..."
- 
- msgid "Fo_ntname:"
- msgstr "შრი_ფტის სახელი:"
-@@ -1990,7 +2222,7 @@ msgid ""
- "Do you want to save it?"
- msgstr ""
- "შრიფტი %1$.40s შეცვლილია ფაილში %2$.40s.\n"
--"გსურთ შეინახოს?"
-+"გსურთ შენახვა?"
- 
- #, c-format
- msgid ""
-@@ -2041,6 +2273,21 @@ msgstr ""
- "სისტემებზე გასაშვებად. FontForge შეგიძლიათ გამოიყენოთ როგორც გამოსახულებითი "
- "სახით, აგრეთვე ბრძანებათა ველის მეშვეობით."
- 
-+#, c-format
-+msgid "FontForge supports at most %d layers"
-+msgstr "FontForge-ში მხარდაჭერილია არაუმეტეს %d შრე"
-+
-+msgid ""
-+"FontForge supports two different helper applications to do autotracing\n"
-+" autotrace and potrace\n"
-+"If your system only has one it will use that one, if you have both\n"
-+"use this option to tell FontForge which to pick."
-+msgstr ""
-+"FontForge-თან თავსებადია თვითგამოხაზვის ორი სხვადასხვა დამხმარე პროგრამა\n"
-+" Autotrace და Potrace.\n"
-+"თუ სისტემაში მხოლოდ ერთია, მას გამოიყენებს, თუ ორივეა,\n"
-+"ამ პარამეტრის მეშვეობით მიუთითეთ FontForge-ს, რომელი არჩიოს."
-+
- msgid ""
- "FontForge was unable to load libspiro, spiros are not available for use."
- msgstr ""
-@@ -2060,7 +2307,7 @@ msgstr ""
- "უდიდესი მნიშვნელობები, თითოეული ნიშნის საბჯენებისთვის."
- 
- msgid "FontForge will guess kerning classes for selected glyphs"
--msgstr "FontForge ივარაუდებს წანაცვლების კლასს შერჩეული ასონიშნებისთვის"
-+msgstr "FontForge ივარაუდებს შემოკვეცის კლასს შერჩეული ასონიშნებისთვის"
- 
- msgid ""
- "FontForge will look at the glyphs selected in the font view\n"
-@@ -2069,7 +2316,7 @@ msgid ""
- msgstr ""
- "FontForge გადახედავს ასონიშნებს შრიფტის ხედით\n"
- "და შეეცდება იპოვოს მსგავსი ასონიშნები, რომელთა\n"
--"მონაცემებითაც მიხედვითაც შექმნის წანაცვლების კლასებს."
-+"მონაცემების მიხედვითაც შექმნის შემოკვეცის კლასებს."
- 
- msgid "FontLog Save Failed"
- msgstr "FontLog ვერ შეინახა"
-@@ -2087,10 +2334,19 @@ msgstr "ასონიშნების იძულებით გადა
- msgid "Fore"
- msgstr "წინა"
- 
-+msgid "Forget _to All"
-+msgstr "ყველას და_ვიწყება"
-+
-+msgid "Format:"
-+msgstr "სახეობა:"
-+
- #. GT: This does not mean the program, but freehand drawing
- msgid "Freehand"
- msgstr "თავისუფალი"
- 
-+msgid "Friendly Name"
-+msgstr "იოლი სახელი"
-+
- msgid "From the _other class"
- msgstr "ს_ხვა კლასიდან"
- 
-@@ -2109,6 +2365,9 @@ msgstr "75"
- msgid "Gasp|_Version"
- msgstr "ვე_რსია"
- 
-+msgid "General"
-+msgstr "ძირითადი"
-+
- msgid "General Punctuation"
- msgstr "ძირითადი სასვენი ნიშნები"
- 
-@@ -2116,28 +2375,28 @@ msgid "General/Supplemental Punctuation"
- msgstr "ძირითადი/დამატებითი სასვენი ნიშნები"
- 
- msgid "Generate"
--msgstr "შედგენა"
-+msgstr "დამზადება"
- 
- msgid "Generate Fonts"
--msgstr "შრიფტების შედგენა"
-+msgstr "შრიფტების დამზადება"
- 
- msgid "Generate Mac Family"
--msgstr "შედგენა Mac-კრებულის"
-+msgstr "Mac-კრებულის დამზადება"
- 
- msgid "Generate Mac _Family..."
--msgstr "შედგენა Mac-კ_რებულის..."
-+msgstr "Mac-კ_რებულის დამზადება..."
- 
- msgid "Generate TTC"
--msgstr "შეიქმნას TTC"
-+msgstr "დამზადდეს TTC"
- 
- msgid "Generate TTC..."
--msgstr "შეიქმნას TTC..."
-+msgstr "დამზადდეს TTC..."
- 
- msgid "Generating PostScript Font"
--msgstr "იქმნება PostScript-შრიფტი"
-+msgstr "მზადდება PostScript-შრიფტი"
- 
- msgid "Generating bitmap font"
--msgstr "იქმნება ბიტური შრიფტი"
-+msgstr "მზადდება ბიტური შრიფტი"
- 
- msgid "Generic"
- msgstr "მთავარი"
-@@ -2169,6 +2428,19 @@ msgstr "გლაგოლიცური"
- msgid "Glagolitic Supplement"
- msgstr "გლაგოლიცური დანართი"
- 
-+msgid "Glif"
-+msgstr "Glif"
-+
-+msgid "Glyph Info"
-+msgstr "ასონიშნის შესახებ"
-+
-+#, c-format
-+msgid "Glyph Info for %.40s"
-+msgstr "%.40s ასონიშნის შესახებ"
-+
-+msgid "Glyph Info..."
-+msgstr "ასონიშნის შესახებ..."
-+
- msgid "Glyph Insertion"
- msgstr "ასონიშნის ჩამატება"
- 
-@@ -2182,7 +2454,7 @@ msgid "Glyph Set by Selection"
- msgstr "ასონიშნების კრებული მონიშვნით"
- 
- msgid "Glyph _Info..."
--msgstr "ასო_ნიშნის შესახებ..."
-+msgstr "ასო_ნიშნის მონაცემები..."
- 
- msgid "Glyph in two classes"
- msgstr "ასონიშანი ორ კლასშია"
-@@ -2208,6 +2480,11 @@ msgstr ""
- "ასონიშნის სახელში არსებული სიმბოლოები მხოლოდ ASCII-არეს უნდა ეკუთვნოდეს,\n"
- "თუმცა სახელთა ამ სიაში, ზოგიერთი შეიცავს სიმბოლოებს, რომლებიც სცდება ამ არეს."
- 
-+#, c-format
-+msgid "Glyph, %s, has no hints. FontForge will not produce many instructions."
-+msgstr ""
-+"ასონიშანი %s მიმთითებლების გარეშეა. FontForge ვერ დაამუშავებს ბევრ მითითებას."
-+
- msgid "GlyphName|New"
- msgstr "ახალი"
- 
-@@ -2272,6 +2549,9 @@ msgstr "ჯგუფის სახელი:"
- msgid "Groups"
- msgstr "ჯგუფები"
- 
-+msgid "Guess"
-+msgstr "სავარაუდო"
-+
- #. GT: Guide layer, make it short
- msgid "Guide"
- msgstr "მიმმართველი"
-@@ -2301,7 +2581,7 @@ msgid "HVCurve"
- msgstr "თარ./შვეულ. მრუდი"
- 
- msgid "H_ints"
--msgstr "_მიმნიშნებლები"
-+msgstr "_მიმთითებლები"
- 
- msgid "Hangul Jamo"
- msgstr "ჰანგილ-ჯამო"
-@@ -2315,9 +2595,15 @@ msgstr "ჰანგილ-ჯამო გაფართოებული-B"
- msgid "Hanunoo"
- msgstr "ჰანუნო"
- 
-+msgid "Harmoni_ze"
-+msgstr "შე_ხამება"
-+
- msgid "Harmonizing..."
- msgstr "შეეხამება..."
- 
-+msgid "Has _Vertical Metrics"
-+msgstr "_შვეული აზომვებით"
-+
- msgid "Hebrew"
- msgstr "ებრაული"
- 
-@@ -2325,7 +2611,7 @@ msgid "Height"
- msgstr "სიმაღლე"
- 
- msgid "Height/Kern Data"
--msgstr "სიმაღლის/წანაცვლების მონაცემები"
-+msgstr "სიმაღლის/შემოკვეცის მონაცემები"
- 
- msgid "Hidden"
- msgstr "დამალული"
-@@ -2333,6 +2619,9 @@ msgstr "დამალული"
- msgid "Hide when _Moving"
- msgstr "დამალვა მ_ოძრაობისას"
- 
-+msgid "Hint Mask"
-+msgstr "მიმთ. ნიღაბი"
-+
- msgid "Hiragana"
- msgstr "ჰირაგანა"
- 
-@@ -2362,16 +2651,16 @@ msgid "Horizontal"
- msgstr "თარაზული"
- 
- msgid "Horizontal Baselines"
--msgstr "თარაზული საყრდენები"
-+msgstr "ძირითადი თარაზული ხაზები"
- 
- msgid "Horizontal Kerning"
--msgstr "თარაზული წანაცვლება"
-+msgstr "თარაზული შემოკვეცა"
- 
- #, c-format
- msgid "Horizontal: %d baseline"
- msgid_plural "Horizontal: %d baselines"
--msgstr[0] "თარაზული: %d საყრდენი"
--msgstr[1] "თარაზული: %d საყრდენი"
-+msgstr[0] "თარაზული: %d ძირითადი ხაზი"
-+msgstr[1] "თარაზული: %d ძირითადი ხაზი"
- 
- msgid "How many unencoded glyph slots do you wish to add?"
- msgstr "რამდენი დაუშიფრავი ასონიშნის ადგილის დამატება გსურთ?"
-@@ -2381,8 +2670,8 @@ msgid ""
- "I miscalculated the size of subtable %s, this means the kerning output is "
- "wrong."
- msgstr ""
--"შეცდომა, %s ქვეცხრილის ზომის გამოთვლისას, რაც ნიშნავს, რომ წანაცვლების "
--"გამოტანა არამართებულია."
-+"შეცდომა %s ქვეცხრილის ზომის გამოთვლისას, რაც ნიშნავს, რომ შემოკვეცის "
-+"გამოტანა უმართებულოა."
- 
- msgid ""
- "I'm sorry this file is too complex for me to understand (or is erroneous, or "
-@@ -2454,10 +2743,10 @@ msgid ""
- "in the font, and specify how to position glyphs in this\n"
- "script relative to all active baselines"
- msgstr ""
--"თუ ზემოთ მოცემული საყრდენებიდან რომელიმე მაინც მოქმედია,\n"
-+"თუ ზემოთ მოცემული ძირითადი ხაზებიდან რომელიმე მაინც მოქმედია,\n"
- "უნდა მიუთითოთ ნაგულისხმევი თითოეული დამწერლობისთვის\n"
- "ამ შრიფტში და ისიც, თუ როგორ განთავსდება ასონიშნები ყველა\n"
--"მოქმედი საყრდენი ხაზების მიმართ"
-+"მოქმედი ძირითადი ხაზის მიმართ"
- 
- msgid ""
- "If the old-style 'kern' table contains unencoded glyphs\n"
-@@ -2466,9 +2755,9 @@ msgid ""
- "problematic glyphs from the old-style 'kern' table."
- msgstr ""
- "თუ ძველი სახის „kern“ ცხრილი შეიცავს დაუშიფრავ ასონიშნებს\n"
--"(ან ასოებს BMP-ადგილების მიღმა), ბევრი პროგრამა Windows-ში\n"
--"საერთოდ არ გამოიყენებს წანაცვლებას. ამის მითითებით კი გამოირიცხება\n"
--"ამგვარი ასონიშნებს ძველებური „kern“ ცხრილიდან."
-+"(ან ასოებს BMP-სივრცის გარეთ), ბევრი პროგრამა Windows-ში\n"
-+"საერთოდ არ გამოიყენებს შემოკვეცას. ამის მითითებით კი გამოირიცხება\n"
-+"ამგვარი ასონიშნები ძველებური „kern“ ცხრილიდან."
- 
- msgid ""
- "If the start point of a contour is not an extremum, find a new start point "
-@@ -2499,7 +2788,7 @@ msgid ""
- "If you leave this field blank FontForge will use a default based on\n"
- "either the version string above, or one in the 'name' table."
- msgstr ""
--"თუ ცარიელს დატოვებთ, FontForge თავად შეავსებს ან ვერსიი, ან „სახელის“ "
-+"თუ ცარიელს დატოვებთ, FontForge თავად შეავსებს ან ვერსიის, ან „სახელის“ "
- "ცხრილის მიხედვით."
- 
- msgid "Ignore Ligatures"
-@@ -2509,8 +2798,8 @@ msgid ""
- "In the 'kern' table, a subtable's length does not match the number of "
- "kerning pairs."
- msgstr ""
--"„kern“ ცხრილში, ქვეცხრილების სიგრძე არ ემთხვევა წანაცვლებული წყვილების "
--"რაოდენობას."
-+"შემოკვეცის „kern“ ცხრილში, ქვეცხრილების სიგრძე არ ემთხვევა შემოკვეცილი "
-+"წყვილების რაოდენობას."
- 
- msgid ""
- "In the saved font, force all glyph names to match those in the specified "
-@@ -2537,7 +2826,7 @@ msgid "Increment RBearing By:"
- msgstr "მარჯვენა საბჯენს დაემატოს:"
- 
- msgid "Indic (& Tibetan) hanging baseline"
--msgstr "ინდური (და ტიბეტური) კიდული საყრდენით"
-+msgstr "ინდური (და ტიბეტური) ძირითადი კიდული ხაზით"
- 
- msgid "Insert Before Current Glyph"
- msgstr "მიმდინარე ასონიშნის შემდგომ ჩამატება"
-@@ -2560,9 +2849,26 @@ msgstr "ტექსტის მოხაზულობის ჩამატ
- msgid "Insert random text in the specified script"
- msgstr "ცალკეული დამწერლობის შემთხვევითი ტექსტის ჩამატება"
- 
-+msgid "Instructions out of date"
-+msgstr "მითითებები ვადაგასულია"
-+
- msgid "Interface"
- msgstr "გარსი"
- 
-+msgid "InterpolateCPsOnMotion"
-+msgstr "ჩამატება მოსაჭიდის მოძრაობისას"
-+
-+#. GT: See the long comment at "Property|New"
-+#. GT: The msgstr should contain a translation of "None", ignore "Interpretation|"
-+#. GT: In french this could be "Aucun" or "Aucune" depending on the gender
-+#. GT:  of "Interpretation"
-+msgid "Interpretation|None"
-+msgstr "არა"
-+
-+#, c-format
-+msgid "Invalid compressed table length for '%c%c%c%c'."
-+msgstr "უმართებული სიგრძე შეკუმშული ცხრილისთვის „%c%c%c%c“."
-+
- msgid "Invalid guideline.\n"
- msgstr "გაუმართავი მიმმართველი ხაზი.\n"
- 
-@@ -2575,7 +2881,13 @@ msgid "Invalid or unsupported version (0x%x) for 'kern' table"
- msgstr "არასწორი ან მხარდაუჭერელი ვერსია (0x%x) „kern“ ცხრილისთვის"
- 
- msgid "Is this horizontal or vertical kerning data?"
--msgstr "ეს თარაზული წანაცვლების მონაცემია თუ შვეულის?"
-+msgstr "ეს თარაზული შემოკვეცის მონაცემია თუ შვეულისა?"
-+
-+msgid "Italic Angle"
-+msgstr "დახრის კუთხე"
-+
-+msgid "Italic Angle:"
-+msgstr "დახრის კუთხე:"
- 
- msgid "KOI8-R (Cyrillic)"
- msgstr "KOI8-R (კირილიცა)"
-@@ -2611,61 +2923,61 @@ msgid "Ker_n By Classes..."
- msgstr "წანა_ცვლება კლასებით..."
- 
- msgid "Kern"
--msgstr "წანაცვლება"
-+msgstr "შემოკვეცა"
- 
- msgid "Kern Adjusts"
--msgstr "წანაცვლების დაყენება"
-+msgstr "შემოკვეცის მორგება"
- 
- msgid "Kern By Classes"
--msgstr "წანაცვლება კლასებით"
-+msgstr "შემოკვეცა კლასებით"
- 
- msgid "Kern Line Color"
--msgstr "წანაცვლების ხაზის ფერი"
-+msgstr "შემოკვეცის ზოლის ფერი"
- 
- msgid "Kern Pair Closeup"
--msgstr "წანაცვლებული წყვილის გადახედვა"
-+msgstr "შემოკვეცის წყვილის დათვალიერება"
- 
- msgid "Kern Pair Closeup..."
--msgstr "წანაცვლებული წყვილის გადახედვა..."
-+msgstr "შემოკვეცის წყვილის შეთვალიერება..."
- 
- msgid "Kern Pairs"
- msgstr "Წანაცვლებული წყვილები"
- 
- msgid "Kern Values:"
--msgstr "წანაცვლების მნიშვნელობები:"
-+msgstr "შემოკვეცის მნიშვნ.:"
- 
- msgid "Kern:"
--msgstr "წანაცვლება:"
-+msgstr "შემოკვეცა:"
- 
- msgid "KernClass|_New Lookup..."
- msgstr "_ახალი ცნობარი..."
- 
- msgid "Kerning & such"
--msgstr "წანაცვლება და სხვა დანარჩენი"
-+msgstr "შემოკვეცა და სხვა"
- 
- msgid "Kerning Class"
--msgstr "წანაცვლების კლასი"
-+msgstr "შემოკვეცის კლასი"
- 
- #, c-format
- msgid "Kerning Metrics For %.50s"
--msgstr "წანაცვლების აზომვები – %.50s"
-+msgstr "შემოკვეცის აზომვები – %.50s"
- 
- #. GT: The %s is the name of the lookup subtable containing this kerning class
- #, c-format
- msgid "Kerning by Classes: %s"
--msgstr "წანაცვლება კლასებით: %s"
-+msgstr "შემოკვეცა კლასებით: %s"
- 
- msgid "Kerning direction"
--msgstr "წანაცვლების მიმართულება"
-+msgstr "შემოკვეცის მიმართულება"
- 
- msgid ""
- "Kerning may be specified either by classes of glyphs\n"
- "or by pairwise combinations of individual glyphs.\n"
- "Which do you want for this subtable?"
- msgstr ""
--"წანაცვლები მითითება შეიძლება ან ასონიშნების კლასებით,\n"
--"ან ცალკეული ასონიშნების შეწყვილებით.\n"
--"რომელი გსურთ ამ ქვეცხრილისთვის?"
-+"შემოკვეცის მითითება შეიძლება ან ასონიშნების კლასებით,\n"
-+"ანდა ცალკეული ასონიშნების შეწყვილებით.\n"
-+"რომელს აირჩევთ ამ ქვეცხრილისთვის?"
- 
- msgid "Khmer"
- msgstr "ქმერული"
-@@ -2781,7 +3093,13 @@ msgid "Layer"
- msgstr "შრე"
- 
- msgid "Layer Info..."
--msgstr "შრის შესახებ..."
-+msgstr "შრის მონაცემები..."
-+
-+msgid "Layer Name"
-+msgstr "შრის სახელი"
-+
-+msgid "Layers"
-+msgstr "შრეები"
- 
- msgid "Left Side Bearing"
- msgstr "მარცხენა საბჯენი"
-@@ -2875,6 +3193,9 @@ msgstr "იტვირთება ფონტი წყაროდან %.1
- msgid "Loading..."
- msgstr "იტვირთება..."
- 
-+msgid "Location"
-+msgstr "მდებარეობა"
-+
- msgid "Lookup Name:"
- msgstr "ცნობარის სახელი:"
- 
-@@ -2981,7 +3302,7 @@ msgid ""
- "It may not be set in conjunction with the Apple checkbox.\n"
- "This may confuse other applications though."
- msgstr ""
--"ბევრ პროგრამაში ჯერ კიდევ მხარდაუჭერელია „GPOS“ წანაცვლება.\n"
-+"ბევრ პროგრამაში ჯერ კიდევ მხარდაუჭერელია „GPOS“ შემოკვეცა.\n"
- "თუ გსურთ დაურთოთ ორივე, „GPOS“ და ძველი სახის „kern“\n"
- "ცხრილები, მიუთითეთ ამ უჯრის მონიშვნით.\n"
- "ჯობია, არ მოინიშნოს Apple-ის უჯრასთან ერთად.\n"
-@@ -3000,7 +3321,7 @@ msgid "Mass Glyph _Rename..."
- msgstr "ასონიშნების ერთბაშად გადარ_ქმევა..."
- 
- msgid "Math Kern"
--msgstr "მათემატიკური წანაცვლება"
-+msgstr "მათემატიკური შემოკვეცა"
- 
- msgid "Mathematical Alphanumeric Symbols"
- msgstr "მათემატიკური ასოციფრული ნიშნები"
-@@ -3018,7 +3339,7 @@ msgid "Max Bearing"
- msgstr "საბჯენი არაუმეტეს"
- 
- msgid "Measure distance, angle between points"
--msgstr "წერტილებს შორის დაშორების, კუთხის გაზომვა"
-+msgstr "წერტილთა დაშორების, კუთხის გაზომვა"
- 
- msgid "Mende Kikakui"
- msgstr "მენდე"
-@@ -3029,11 +3350,36 @@ msgstr "მენიუს ზოლი"
- msgid "Menu Name"
- msgstr "მენიუს სახელი"
- 
-+msgid "Merge"
-+msgstr "გაერთიანება"
-+
-+msgid "Merge Fonts"
-+msgstr "შრიფტების გაერთიანება"
-+
-+msgid "Merge Results"
-+msgstr "შედეგების გაერთიანება"
-+
-+msgid "Merge into selection"
-+msgstr "გაერთიანება მონიშნულში"
-+
-+msgid "Merge to Line"
-+msgstr "გაერთიანება ხაზით"
-+
-+msgid ""
-+"Merges two selected (and compatible) lookups into one,\n"
-+"or merges two selected subtables of a lookup into one"
-+msgstr ""
-+"გააერთიანებს ორ შერჩეულ (და თავსებად) ცნობარს,\n"
-+"ან გააერთიანებს ცნობარის ორ შერჩეულ ქვეცხრილს"
-+
-+msgid "MetaFont exited with an error"
-+msgstr "MetaFont დაიხურა შეცდომით"
-+
- msgid "Metrics"
- msgstr "აზომვები"
- 
- msgid "Metrics Baseline Color"
--msgstr "აზომვების საყრდენი ხაზის ფერი"
-+msgstr "აზომვების ძირითადი ხაზის ფერი"
- 
- #, c-format
- msgid "Metrics For %.50s"
-@@ -3157,17 +3503,29 @@ msgstr "მიანმარული გაფართოებული-B"
- msgid "NKo"
- msgstr "ნკო"
- 
-+msgid "N_ever Interpolate"
-+msgstr "ა_რასდროს ჩაემატოს"
-+
- msgid "N_umber Points"
- msgstr "წერტილების გადა_ნომვრა"
- 
- msgid "Name"
- msgstr "სახელი"
- 
-+msgid "Name Contour"
-+msgstr "მოხაზულობის სახელი"
-+
- msgid "Name For Human_s:"
- msgstr "ად_ვილად წასაკითხი:"
- 
-+msgid "Name Point"
-+msgstr "წერტილის სახელი"
-+
-+msgid "Name Point..."
-+msgstr "წერტილის სახელი..."
-+
- msgid "Name this guideline or cancel to create it without a name"
--msgstr "დაარქვით რამე მიმმართველ ხაზს ან გააუქმეთ უსახელოდ შექმნისთვის"
-+msgstr "დაარქვით რამე ან გააუქმეთ უსახელოდ დატოვებისთვის"
- 
- msgid ""
- "Name used for Vendor ID field in\n"
-@@ -3175,7 +3533,7 @@ msgid ""
- "Must be no more than 4 characters"
- msgstr ""
- "სახელი მწარმოებლის ID-ველისთვის\n"
--"ttf-შრიფტის (OS/2-ცხრილი) შესადგენად.\n"
-+"ttf-შრიფტის (OS/2-ცხრილი) დასამზადებლად.\n"
- "არ უნდა აღემატებოდეს 4 სიმბოლოს"
- 
- msgid "Name:"
-@@ -3242,6 +3600,31 @@ msgstr "_აზომვების ახალი ფანჯარა"
- msgid "NewCharset"
- msgstr "ასოთა ახალი ნაკრები"
- 
-+msgid "Next CP Angle"
-+msgstr "შემდ. მოსაჭიდის დახრილობა"
-+
-+msgid "Next CP Color"
-+msgstr "შემდეგი მოსაჭიდის ფერი"
-+
-+msgid "Next CP Dist"
-+msgstr "შემდ. მოსაჭიდის სიშორე"
-+
-+msgid "Next CP X"
-+msgstr "შემდ. მოსაჭიდი X"
-+
-+msgid "Next CP Y"
-+msgstr "შემდ. მოსაჭიდი Y"
-+
-+msgid "Next CP:"
-+msgstr "შემდ. მოსაჭიდი:"
-+
-+#, c-format
-+msgid "Next CP: (%f,%f)"
-+msgstr "შემდ. მოსაჭიდი: (%f,%f)"
-+
-+msgid "Next On Contour"
-+msgstr "ნახაზზე შემდეგ"
-+
- msgid "Next _Defined Glyph"
- msgstr "მომდევნო _განსაზღვრული ასონიშანი"
- 
-@@ -3255,6 +3638,9 @@ msgstr "არ მოიძებნა (გამოსადეგი) ცხ
- msgid "No Bitmap Fonts"
- msgstr "ცხრილური შრიფტები არაა"
- 
-+msgid "No Curvature"
-+msgstr "სიმრუდის გარეშე"
-+
- msgid "No Glyph"
- msgstr "ასონიშანი არაა"
- 
-@@ -3264,8 +3650,14 @@ msgstr "გამეორებული ასონიშნები არ
- msgid "No Groups"
- msgstr "ჯგუფები არაა"
- 
-+msgid "No Instructions"
-+msgstr "მითითებები არაა"
-+
-+msgid "No Intersections"
-+msgstr "არა თანაკვეთები"
-+
- msgid "No Kern Pairs"
--msgstr "არაა წანაცვლებული წყვილები"
-+msgstr "არაა შემოკვეცილი წყვილები"
- 
- msgid "No Lookup Type Selected"
- msgstr "არაა შერჩეული ცნობარის სახეობა"
-@@ -3294,9 +3686,15 @@ msgstr "შვეული აზომვების გარეშე"
- msgid "No _to All"
- msgstr "არა ყ_ველას"
- 
-+msgid "No components"
-+msgstr "არაა შემადგენლები"
-+
-+msgid "No curvature info"
-+msgstr "სიმრუდის შესახებ უცნობია"
-+
- #, c-format
- msgid "No kerning pairs found in %.200s"
--msgstr "წანაცვლებულ წყვილებს არ შეიცავს %.200s"
-+msgstr "შემოკვეცილ წყვილებს არ შეიცავს %.200s"
- 
- msgid "No languages"
- msgstr "ენები არაა"
-@@ -3336,6 +3734,13 @@ msgstr ""
- msgid "Normal font used in the Find/Replace window"
- msgstr "ჩვეულებრივი შრიფტი გამოიყენება პოვნა/ძიების ფანჯარაში"
- 
-+msgid ""
-+"Normally simplify will not remove points at the extrema of curves\n"
-+"(both PostScript and TrueType suggest you retain these points)"
-+msgstr ""
-+"როგორც წესი, გამარტივებით არ იშლება მრუდის კიდურა წერტილები\n"
-+"(ორივე, PostScript და TrueType გთავაზობთ მათი შენარჩუნების საშუალებას)"
-+
- msgid "Not Guides"
- msgstr "მიმმართველის გარეშე"
- 
-@@ -3352,10 +3757,10 @@ msgid ""
- "pairs (eg, they have a Unicode value of -1) To avoid this, go to Generate, "
- "Options, and check the \"Windows-compatible 'kern'\" option."
- msgstr ""
--"შენიშვნა: Windows-ზე ბევრი პროგრამა შეიძლება წააწყდეს სიძნელეს შრიფტის "
--"წანაცვლებული წყვილების გამოყენებისას, ვინაიდან მისი წანაცვლებული ასონიშნების "
--"წყვილების %d ვერ აისახება BMP-უნიკოდის წანაცვლების წყვილებზე (მაგ. მათ "
--"ექნებათ უნიკოდის მნიშვნელობად -1) ამის ასარიდებლად, აირჩიეთ „შედგენა“, "
-+"შენიშვნა: Windows-ზე ბევრი პროგრამა შეიძლება წააწყდეს სიძნელეს ამ შრიფტის "
-+"წყვილების შემოკვეცისას, ვინაიდან %d მისი ასონიშნების შემოკვეცილი წყვილებით "
-+"ვერ აისახება BMP-უნიკოდის შემოკვეცილ წყვილებზე (ანუ მათ ექნებათ უნიკოდის "
-+"მნიშვნელობად -1) ამის ასარიდებლად გადადით მენიუში, აირჩიეთ „დამზადება“, "
- "„პარამეტრები“ და მონიშნეთ „Windows-სთან თავსებადი „kern“."
- 
- msgid "Nothing Loaded"
-@@ -3367,6 +3772,9 @@ msgstr "არაფერია შერჩეული"
- msgid "Nothing on stack to print\n"
- msgstr "არაფერია მითითებული ამოსაბეჭდად\n"
- 
-+msgid "Nothing to trace"
-+msgstr "არაფერია გამოსახაზი"
-+
- msgid "Number Forms"
- msgstr "რიცხვითი ჩანაწერები"
- 
-@@ -3389,12 +3797,21 @@ msgstr "OS/2 → ასოთა ნაკრებები"
- msgid "OS/2 and Windows specific metrics table"
- msgstr "OS/2 და Windows-ის შესაბამისი აზომვების ცხრილი"
- 
-+msgid "OTF 'CFF '"
-+msgstr "OTF 'CFF '"
-+
- msgid "O_ff"
- msgstr "გამო_რთ."
- 
- msgid "O_n"
- msgstr "ჩ_ართ."
- 
-+msgid "Offset"
-+msgstr "წანაცვლება"
-+
-+msgid "Offset %"
-+msgstr "წანაცვლება %"
-+
- msgid "Ofm Save Failed"
- msgstr "Ofm ვერ შეინახა"
- 
-@@ -3456,7 +3873,7 @@ msgid "Only upper case"
- msgstr "მხოლოდ მთავრული"
- 
- msgid "Open AutoKern dialog for new kerning subtables"
--msgstr "თვითწანაცვლების არის გახსნა ახალი ქვეცხრილებისთვის"
-+msgstr "თვითშემოკვეცის სარკმლის გახსნა ახალი ქვეცხრილებისთვის"
- 
- msgid "Open Font"
- msgstr "შრიფტის გახსნა"
-@@ -3470,6 +3887,9 @@ msgstr "_ვებგვერდის გახსნა"
- msgid "OpenType"
- msgstr "OpenType"
- 
-+msgid "OpenType (CFF)"
-+msgstr "OpenType (CFF)"
-+
- msgid "OpenTypeFeature|New"
- msgstr "ახალი"
- 
-@@ -3539,6 +3959,9 @@ msgstr "გამოიტანოს TFM და ENC"
- msgid "Output error"
- msgstr "გამოტანის შეცდომა"
- 
-+msgid "Oval"
-+msgstr "კვერცხისებრი"
-+
- msgid "PDF"
- msgstr "PDF"
- 
-@@ -3551,6 +3974,9 @@ msgstr "ასონიშნის PS-სახელი"
- msgid "PS Names"
- msgstr "PS-სახელი"
- 
-+msgid "PS Private"
-+msgstr "PS-კერძო"
-+
- msgid "PSPrivateDictKey|New"
- msgstr "ახალი"
- 
-@@ -3570,10 +3996,10 @@ msgid "Pahawh Hmong"
- msgstr "ფაჰაუ-მონი"
- 
- msgid "Pair Position (kerning)"
--msgstr "წყვილთა ურთიერთგანლაგება (წანაცვლება)"
-+msgstr "წყვილთა ურთიერთგანლაგება (შემოკვეცა)"
- 
- msgid "Pairwise Positioning (kerning)"
--msgstr "წყვილთა ურთიერთგანლაგება (წანაცვლება)"
-+msgstr "წყვილთა ურთიერთგანლაგება (შემოკვეცა)"
- 
- msgid "PanoseWeight|Any"
- msgstr "ნებისმიერი"
-@@ -3626,6 +4052,12 @@ msgstr "გვერდის არჩევა"
- msgid "Pixel Sizes:"
- msgstr "პიქსელის ზომები:"
- 
-+msgid "Pixel size:"
-+msgstr "პიქსელის ზომა:"
-+
-+msgid "Pixel size?"
-+msgstr "პიქსელის ზომა?"
-+
- msgid "Please choose File/Generate Fonts to save to other formats."
- msgstr "გთხოვთ, იხილოთ ფაილი/შრიფტების წარმოქმნა, სხვა სახით შენახვისთვის."
- 
-@@ -3639,6 +4071,9 @@ msgstr "დაარქვით სახელი %d დაშიფვრა
- msgid "Please name this encoding"
- msgstr "დაარქვით დაშიფვრას სახელი"
- 
-+msgid "Please name this point"
-+msgstr "დაარქვით რამე წერტილს"
-+
- msgid "Please specify a bitmap magnification factor."
- msgstr "გთხოვთ, მიუთითოთ რასტრული გადიდების მამრავლი."
- 
-@@ -3689,18 +4124,49 @@ msgstr "მრავალკუთხედი ან ვარსკვლა
- msgid "Pr_eferences..."
- msgstr "_პარამეტრები..."
- 
-+msgid "PreferPotrace"
-+msgstr "უპირატესია Potrace"
-+
- msgid "Preferences"
- msgstr "პარამეტრები"
- 
- msgid "Preferred Family"
- msgstr "უპირატესი კრებული"
- 
-+msgid "Prefs_App|FontForge recognizes BROWSER, MF and AUTOTRACE."
-+msgstr "Prefs_App|FontForge-ს შეუძლია ამოიცნოს BROWSER, MF და AUTOTRACE."
-+
- msgid "Preserve the names of the GPOS/GSUB lookups and subtables"
- msgstr "GPOS/GSUB-ცნობარებისა და ქვეცხრილების სახელების შენარჩუნება"
- 
-+msgid "Prev CP Angle"
-+msgstr "წინა მოსაჭიდის დახრილობა"
-+
-+msgid "Prev CP Color"
-+msgstr "წინა მოსაჭიდის ფერი"
-+
-+msgid "Prev CP Dist"
-+msgstr "წინა მოსაჭიდის სიშორე"
-+
-+msgid "Prev CP X"
-+msgstr "წინა მოსაჭიდი X"
-+
-+msgid "Prev CP Y"
-+msgstr "წინა მოსაჭიდი Y"
-+
-+msgid "Prev CP:"
-+msgstr "წინა მოსაჭიდი:"
-+
-+#, c-format
-+msgid "Prev CP: (%f,%f)"
-+msgstr "წინა მოსაჭიდი: (%f,%f)"
-+
- msgid "Prev Defined Gl_yph"
- msgstr "წინა განსაზღვრული ას_ონიშანი"
- 
-+msgid "Prev On Contour"
-+msgstr "ნახაზზე წინ"
-+
- msgid "Previe_w"
- msgstr "შეთვა_ლიერება"
- 
-@@ -3722,9 +4188,18 @@ msgstr "ამოსაბეჭდი დოკუმენტი"
- msgid "Printing Font"
- msgstr "შრიფტი იბეჭდება"
- 
-+#. GT: "Private" is a keyword (sort of) in PostScript. Perhaps it
-+#. GT: should remain untranslated?
-+msgid "Private Dictionary"
-+msgstr "კერძო ლექსიკონი"
-+
- msgid "Private Use Area"
- msgstr "კერძო გამოყენების არე"
- 
-+#, c-format
-+msgid "Problem decompressing '%c%c%c%c' table."
-+msgstr "ხარვეზი შეკუმშული „%c%c%c%c“ ცხრილის გახსნისას."
-+
- #. GT: I am told that the use of "|" to provide contextual information in a
- #. GT: gettext string is non-standard. However it is documented in section
- #. GT: 10.2.6 of http://www.gnu.org/software/gettext/manual/html_mono/gettext.html
-@@ -3744,9 +4219,21 @@ msgstr "კერძო გამოყენების არე"
- msgid "Property|New..."
- msgstr "ახალი..."
- 
-+msgid ""
-+"Put CFF fonts into the ttc rather than TTF.\n"
-+" These seem to work on the mac and linux\n"
-+" but are documented not to work on Windows."
-+msgstr ""
-+"განათავსებს CFF-შრიფტებს TTC-ფაილში ნაცვლად TTF-ფაილისა.\n"
-+" სავარაუდოდ, იმუშავებს Mac-სა და Linux-სისტემებში,\n"
-+" მაგრამ დადასტურებულია, რომ არ გამოდგება Windows-ისთვის."
-+
- msgid "RBearing:"
- msgstr "მარჯვენა საბჯენი:"
- 
-+msgid "Re_move"
-+msgstr "მო_ცილება"
-+
- msgid "Re_vert List"
- msgstr "სიის ა_ღდგენა"
- 
-@@ -3756,23 +4243,32 @@ msgstr "ბიტური გამოსახულების ახლი
- msgid "Recen_t"
- msgstr "_ბოლოდროინდელი"
- 
-+msgid "Recover old edit"
-+msgstr "წინათ ჩასწორებულის აღდგენა"
-+
- msgid "Rectangle"
- msgstr "მართკუთხედი"
- 
- msgid "Rectangle or Ellipse"
--msgstr "მართკუთხედი ან ოვალი"
-+msgstr "მართკუთხა ან კვერცხისებრი"
- 
- msgid "Refresh File List"
- msgstr "ფაილების სიის განახლება"
- 
- msgid "Regenerate _Bitmap Glyphs..."
--msgstr "ახლიდან შეიქმნას _ბიტური ასონიშნები..."
-+msgstr "ახლიდან დამზადდეს _ბიტური ასონიშნები..."
-+
-+msgid "Remo_ve Undoes"
-+msgstr "დასაბრუნებლების მო_ცილება"
-+
-+msgid "Remo_ve Undoes..."
-+msgstr "დასაბრუნებლების მო_ცილება..."
- 
- msgid "Remove All Kern _Pairs"
--msgstr "ყველა წანაცვლებული წ_ყვილის მოცილება"
-+msgstr "შემოკვეცის ყველა წ_ყვილის მოცილება"
- 
- msgid "Remove All VKern Pairs"
--msgstr "ყველა შვეულად წანაცვლებული წ_ყვილის მოცილება"
-+msgstr "შვეულად შემოკვეცის ყველა წ_ყვილის მოცილება"
- 
- msgid "Remove Bitmap Glyphs..."
- msgstr "ბიტური ასონიშნების მოცილება..."
-@@ -3784,7 +4280,7 @@ msgid "Remove Encoding"
- msgstr "დაშიფვრის მოცილება"
- 
- msgid "Remove Kern _Pairs"
--msgstr "წანაცვლებული წ_ყვილის მოცილება"
-+msgstr "შემოკვეცის წ_ყვილის მოცილება"
- 
- msgid "Remove Language from Script..."
- msgstr "ენის მოცილება დამწერლობიდან..."
-@@ -3802,11 +4298,14 @@ msgid "Remove This Glyph"
- msgstr "ამ ასონიშნის მოცილება"
- 
- msgid "Remove VKern Pairs"
--msgstr "შვეულად წანაცვლებული წყვილის მოცილება"
-+msgstr "შვეული შემოკვეცის წყვილების მოცილება"
- 
- msgid "Remove _Unused Slots"
- msgstr "გამოუ_ყენებელი ადგილების მოცილება"
- 
-+msgid "Removing instructions cannot be UNDONE!"
-+msgstr "მითითებების მოცილება ᲨᲔᲣᲥᲪᲔᲕᲐᲓᲘᲐ!"
-+
- msgid "Removing overlaps..."
- msgstr "ცილდება გადაფარვები..."
- 
-@@ -3860,6 +4359,12 @@ msgstr "დაბრუნება საწყისზე"
- msgid "Revert To _Backup"
- msgstr "აღდგენა მა_რქაფიდან"
- 
-+msgid "Review Hints"
-+msgstr "მიმთითებლების შეთვალიერება"
-+
-+msgid "RevisionsToRetain"
-+msgstr "შესანახი ვერსიები"
-+
- msgid "Right Side Bearing"
- msgstr "მარჯვენა საბჯენი"
- 
-@@ -3876,24 +4381,24 @@ msgid "Rotate"
- msgstr "მობრუნება"
- 
- msgid "Rotate 180°"
--msgstr "შებრუნება 180°"
-+msgstr "მობრუნება 180°"
- 
- msgid "Rotate 3D Around..."
- msgstr "სივრცული მობრუნება..."
- 
- #. GT: "CW" means Counter-Clockwise
- msgid "Rotate 90° CCW"
--msgstr "შებრუნება 90° საათის საწ."
-+msgstr "მობრუნება 90° საათ. საწ."
- 
- #. GT: "CW" means Clockwise
- msgid "Rotate 90° CW"
--msgstr "შებრუნება 90° საათის მიმართ."
-+msgstr "მობრუნება 90° საათ. მიმართ."
- 
- msgid "Rotate _180°"
--msgstr "შებრუნება _180°"
-+msgstr "მობრუნება _180°"
- 
- msgid "Rotate _90° CCW"
--msgstr "შებრუნება _90° საათის საწ."
-+msgstr "მობრუნება _90° საათ. საწ."
- 
- msgid "Rotate by Ruler..."
- msgstr "მოტრიალება სახაზავით..."
-@@ -3908,7 +4413,7 @@ msgid "Rotate..."
- msgstr "მობრუნება..."
- 
- msgid "Rotate:"
--msgstr "შებრუნება:"
-+msgstr "მობრუნება:"
- 
- msgid "Round To _Int"
- msgstr "დამრგვალება მთე_ლამდე"
-@@ -3925,6 +4430,9 @@ msgstr "სახაზავის პარამეტრები"
- msgid "Runic"
- msgstr "რუნული"
- 
-+msgid "SVG"
-+msgstr "SVG"
-+
- msgid "S_ave Feature File..."
- msgstr "თვისებების ფაილად შენა_ხვა..."
- 
-@@ -4026,8 +4534,8 @@ msgid ""
- "Script '%c%c%c%c' claims baseline '%c%c%c%c' as its default, but that "
- "baseline is not currently active."
- msgstr ""
--"დამწერლობა „%c%c%c%c“ მიუთითებს, რომ ნაგულისხმევი საყრდენია „%c%c%c%c“, "
--"თუმცა ეს ხაზი არაა ამჟამად მოქმედი."
-+"დამწერლობა „%c%c%c%c“ მიუთითებს, რომ ნაგულისხმევი ძირითადი ხაზია „%c%c%c%c“, "
-+"მაგრამ ეს ხაზი არაა ამჟამად მოქმედი."
- 
- msgid "Script File"
- msgstr "სკრიპტის ფაილი"
-@@ -4149,6 +4657,9 @@ msgstr ""
- msgid "Select the class containing the named glyph"
- msgstr "დასახელებული ასონიშნის შემცველი კლასის მონიშვნა"
- 
-+msgid "Selected CP Color"
-+msgstr "შერჩეული მოსაჭიდის ფერი"
-+
- msgid "Selected Glyphs"
- msgstr "შერჩეული ასონიშნები"
- 
-@@ -4176,6 +4687,15 @@ msgstr "ორივე საბჯენის მითითება..."
- msgid "Set Both Side Bearings..."
- msgstr "ორივე მხარეს საბჯენის მითითება..."
- 
-+msgid "Set From N_ame"
-+msgstr "მითითება სა_ხელიდან"
-+
-+msgid "Set From Selection"
-+msgstr "მითითება მონიშნულიდან"
-+
-+msgid "Set From Val_ue"
-+msgstr "მითითება მ_ნიშვნელობიდან"
-+
- msgid "Set LBearing To:"
- msgstr "მარცხენა საბჯენად მიეთითოს:"
- 
-@@ -4212,15 +4732,6 @@ msgstr "სი_განის მითითება..."
- msgid "Set as Default"
- msgstr "ნაგულისხმევად მითითება"
- 
--msgid ""
--"Set the minimum and maximum values by which\n"
--"the glyphs in this script extend below and\n"
--"above the baseline when modified by a feature."
--msgstr ""
--"იმ უკიდურესი მნიშვნელობების მითითება,\n"
--"რომლითაც ამ დამწერლობის ასონიშანი ასცდება და\n"
--"ჩამოსცდება საყრდენ ხაზს გარდაქმნისას."
--
- msgid ""
- "Set the minimum and maximum values by which\n"
- "the glyphs in this script extend below and\n"
-@@ -4228,7 +4739,7 @@ msgid ""
- msgstr ""
- "იმ უკიდურესი მნიშვნელობების მითითება,\n"
- "რომლითაც ამ დამწერლობის ასონიშანი ასცდება და\n"
--"ჩამოსცდება საყრდენ ხაზს. განსხვავდება ენების მიხედვით"
-+"ჩამოსცდება ძირითადი ხაზს. განსხვავდება ენების მიხედვით"
- 
- #, c-format
- msgid ""
-@@ -4254,7 +4765,7 @@ msgid "Show Hidden Files"
- msgstr "დამალული ფაილების გამოჩენა"
- 
- msgid "Show Kerning"
--msgstr "წანაცვლების გამოჩენა"
-+msgstr "შემოკვეცის გამოჩენა"
- 
- msgid "Show V. Metrics"
- msgstr "გამოჩნდეს შვეული აზომვები"
-@@ -4308,7 +4819,7 @@ msgid "Skew by Ruler..."
- msgstr "გადახრა სახაზავით..."
- 
- msgid "Skew the selection"
--msgstr "მონიშნულის გადახრა"
-+msgstr "მონიშნულის დახრა"
- 
- msgid "Skew..."
- msgstr "გადახრა..."
-@@ -4316,6 +4827,9 @@ msgstr "გადახრა..."
- msgid "Skew:"
- msgstr "გადახრა:"
- 
-+msgid "Skip"
-+msgstr "გამოტოვება"
-+
- #, c-format
- msgid "Skipping duplicate group %s.\n"
- msgstr "გამეორებული ჯგუფი %s უგულებელყოფილია.\n"
-@@ -4488,6 +5002,13 @@ msgstr "ზედა საბჯენი:"
- msgid "TT"
- msgstr "TrueType"
- 
-+msgid "TTF Names"
-+msgstr "TTF-სახელები"
-+
-+#, c-format
-+msgid "Table length stretches beyond end of file for '%c%c%c%c'."
-+msgstr "ცხრილის სიგრძე სცდება ზღვარს ფაილისთვის „%c%c%c%c“."
-+
- msgid "Tag must be 4 characters long"
- msgstr "ჭდე უნდა იყოს 4 სიმბოლოიანი"
- 
-@@ -4515,6 +5036,9 @@ msgstr "ტამილური"
- msgid "Tamil Supplement"
- msgstr "ტამილური დანართი"
- 
-+msgid "Tangent"
-+msgstr "მხები"
-+
- msgid "Tangsa"
- msgstr "ტასე-ნაგა"
- 
-@@ -4545,7 +5069,8 @@ msgstr "ტაილანდური"
- 
- msgid "The 'kern' table supports at most 10920 kern pairs in a subtable"
- msgstr ""
--"„kern“ ცხრილში მხარდაჭერილია არაუმეტეს 10920 წანაცვლების წყვილი ქვეცხრილში"
-+"„kern“ ცხრილში მხარდაჭერილია შემოკვეცის არაუმეტეს 10920 წყვილის შემცველი "
-+"ქვეცხრილი"
- 
- msgid ""
- "The Merge operation cannot be reverted.\n"
-@@ -4632,7 +5157,7 @@ msgid "The color of the outline"
- msgstr "ფერი მოხაზულობისთვის"
- 
- msgid "The color of the preview for drawing lines, rectangles, and ellipses"
--msgstr "ფერი შესათვალიერებელი ხაზების, მართკუთხედისა და ოვალებისა"
-+msgstr "ფერი შესათვალიერებლად წრფივი, მართკუთხა და კვერცხისებრი მოხაზულობისა"
- 
- msgid "The color of the selected region"
- msgstr "მონიშნული ნაწილის ფერი"
-@@ -4646,6 +5171,20 @@ msgstr "მსხვილი გარემოხაზულობის ფ
- msgid "The color used to display a new guide line dragged from the ruler."
- msgstr "სახაზავიდან გადაჩოჩებული ახალი მიმმართველი ხაზის ფერი."
- 
-+msgid ""
-+"The color used to draw the active horizontal hint which the Review Hints "
-+"dialog is examining"
-+msgstr ""
-+"მოქმედი თარაზული მიმთითებლის აღმნიშვნელი ფერი შეთვალიერების ფანჯრით "
-+"სარგებლობისას"
-+
-+msgid ""
-+"The color used to draw the active vertical hint which the Review Hints "
-+"dialog is examining"
-+msgstr ""
-+"მოქმედი შვეული მიმთითებლის აღმნიშვნელი ფერი შეთვალიერების ფანჯრით "
-+"სარგებლობისას"
-+
- #, c-format
- msgid ""
- "The feature '%c%c%c%c' is named twice in language %s\n"
-@@ -4672,6 +5211,13 @@ msgstr "თვისების ჭდე ხაზზე %d (%s) უნდა
- msgid "The following error occurred on the selected glyphs: %.100s"
- msgstr "მოცემული შეცდომა წარმოიშვა მონიშნულ ასონიშნებზე: %.100s"
- 
-+msgid ""
-+"The following options influence how glyphs are exported.\n"
-+"Most are specific to one or more formats."
-+msgstr ""
-+"მოცემული პარამეტრები გავლენას ახდენს ასონიშნების გამოტანაზე.\n"
-+"უმეტესობა თავსებადია ერთ ან რამდენიმე ცალკეულ სახეობასთან."
-+
- msgid "The following table(s) in the font have been ignored by FontForge\n"
- msgstr "მოცემულ ცხრილ(ებ)ს შრიფტში არ გაითვალისწინებს FontForge\n"
- 
-@@ -4680,6 +5226,9 @@ msgid ""
- "The font %s is one of the standard fonts. It isn't actually in the file."
- msgstr "შრიფტი %s ერთ-ერთია სტანდარტული შრიფტებიდან. უშუალოდ ფაილში არაა."
- 
-+msgid "The font comment can contain whatever you feel it should"
-+msgstr "შრიფტის შენიშვნაში შეგიძლიათ დაურთოთ რაც მოგესურვებათ"
-+
- #, c-format
- msgid "The font does not contain a glyph named %s."
- msgstr "შრიფტი არ შეიცავს ასონიშანს დასახელებით %s."
-@@ -4700,9 +5249,9 @@ msgid ""
- "continue font generation (and omit this character)?"
- msgstr ""
- "ასონიშანს შიფრით %d დასახელებად აქვს „.notdef“, მაგრამ შეიცავს მოხაზულობას. "
--"ვინაიდან ჰქვია „.notdef“, იგი ვერ მოხვდება შექმნილ შრიფტში. ახალი სახელის "
-+"ვინაიდან ჰქვია „.notdef“, იგი ვერ მოხვდება დამზადებულ შრიფტში. ახალი სახელის "
- "მისანიჭებლად იხილეთ „შემადგენელი → ასონიშნის შესახებ“. გსურთ, განაგრძოთ "
--"შრიფტის წარმოქმნა (ამ ასოს გამოკლებით)?"
-+"შრიფტის დამზადება (ამ ასოს გამოკლებით)?"
- 
- #, c-format
- msgid "The glyph name \"%1$.30s\" occurs in groups %2$.30s and %3$.30s"
-@@ -4723,7 +5272,7 @@ msgid ""
- "You must remove it from one of them."
- msgstr ""
- "ასონიშანი %s აგრეთვე ჩანს ამ კლასის %d რიგში, რომლის საწყისია %.20s...\n"
--"უნდა მოაცილოთ ერთერთიდან."
-+"უნდა მოაცილოთ ერთ-ერთიდან."
- 
- msgid ""
- "The human-readable fontname text (in the Names pane) must be entirely ASCII."
-@@ -4736,6 +5285,19 @@ msgid ""
- "The language, '%s', is not in the list of known languages and will be omitted"
- msgstr "ენა „%s“ არაა ცნობილი ენების სიაში და გამოტოვებული იქნება"
- 
-+msgid "The layers do not match"
-+msgstr "შრეები არ ემთხვევა"
-+
-+msgid ""
-+"The maximum number of Undoes/Redoes stored in a glyph. Use -1 for infinite "
-+"Undoes\n"
-+"(but watch RAM consumption and use the Edit menu's Remove Undoes as needed)"
-+msgstr ""
-+"უდიდესი რიცხვი დასაბრუნებელი/გასამეორებელი მოქმედებების დასამახსოვრებლად "
-+"ასონიშნიშთვის. გამოიყენეთ -1 უსასრულო რაოდენობისთვის.\n"
-+"(ოღონდ გაითვალისწინეთ მეხიერების დატვირთვა და საჭიროების შემთხვევაში "
-+"ჩასწორების მენიუდან მოაცილეთ დამახსოვრებული მოქმედებები)"
-+
- #, c-format
- msgid ""
- "The name of glyph %.40s has changed. This is what I use to find the glyph in "
-@@ -4746,6 +5308,9 @@ msgstr ""
- "ასე რომ ეს ასონიშანი ვეღარ დაბრუნდება.\n"
- "(ამ გაფრთხილებას აღარ იხილავთ მომდევნო ასონიშნებზე.)"
- 
-+msgid "The only valid values for bits/pixel are 1, 2, 4 or 8"
-+msgstr "ბიტ/პიქსელის მართებული მნიშვნელობებია მხოლოდ 1, 2, 4 ან 8"
-+
- msgid "The pattern size (width & height) must be a positive number"
- msgstr "ნიმუშის ზომა (სიგრძე და სიგანე) დადებითი რიცხვი უნდა იყოს"
- 
-@@ -4765,12 +5330,31 @@ msgstr "მოსაძიებელი ნიმუში კვლავ ვ
- msgid "The search pattern was not found in the font %.100s"
- msgstr "მოსაძიებელი ნიმუში ვერ მოინახა შრიფტში %.100s"
- 
-+msgid ""
-+"The selected glyphs have no hints. FontForge will not produce many "
-+"instructions."
-+msgstr ""
-+"შერჩეულ ასონიშნებს არ გააჩნია მიმთითებლები. FontForge ვერ დაამუშავებს ბევრ "
-+"მითითებას."
-+
- msgid "The version text (in the Names pane) must be entirely ASCII."
- msgstr "ვერსიის დასახელება (სახელთა არეში) უნდა იყოს სრულად ლათინური ASCII."
- 
- msgid "The weight text (in the Names pane) must be entirely ASCII."
- msgstr "სისქის დასახელება (სახელთა არეში) უნდა იყოს სრულად ლათინური ASCII."
- 
-+msgid ""
-+"There already exists a 'cvt' table, perhaps legacy. FontForge can use it, "
-+"but can't make any assumptions on values stored there, so generated "
-+"instructions will be of lower quality. If legacy hinting is to be scrapped, "
-+"it is suggested to clear the `cvt` and repeat autoinstructing. "
-+msgstr ""
-+"უკვე არსებობს „cvt“ ცხრილი, სავარაუდოდ, მოძველებული. FontForge შეძლებს მის "
-+"გამოყენებას, მაგრამ პასუხს ვერ აგებს იქ შენახულ მნიშვნელობებზე, ასე რომ, "
-+"მომზადებული მითითებები შეიძლება დაბალი ხარისხის აღმოჩნდეს. თუ მოძველებული "
-+"მიმთითებლები უვარგისი იქნება, უმჯობესია გასუფთავდეს `cvt` და კვლავ "
-+"განმეორდეს თვითმითითება. "
-+
- #, c-format
- msgid "There are %d pages in this file, which do you want?"
- msgstr "ფაილში %d გვერდია, რომელი გნებავთ?"
-@@ -4781,6 +5365,30 @@ msgstr "რამდენიმე ფაილია არქივში, 
- msgid "There are multiple fonts in this file, pick one"
- msgstr "რამდენიმე შრიფტია ფაილში, მიუთითეთ ერთი"
- 
-+msgid ""
-+"There exists a 'fpgm' code that seems incompatible with FontForge's. "
-+"Instructions generated will be of lower quality. If legacy hinting is to be "
-+"scrapped, it is suggested to clear the `fpgm` and repeat autoinstructing. It "
-+"will be then possible to append user's code to FontForge's 'fpgm', but due "
-+"to possible future updates, it is extremely advised to use high numbers for "
-+"user's functions."
-+msgstr ""
-+"უკვე არსებობს „fpgm“ კოდი და როგორც ჩანს, მასთან შეუთავსებელია FontForge. "
-+"მომზადებული მითითებები შეიძლება დაბალი ხარისხის აღმოჩნდეს. თუ მოძველებული "
-+"მიმთითებლები უვარგისი იქნება, უმჯობესია გასუფთავდეს `fpgm` და კვლავ "
-+"განმეორდეს თვითმითითება. შემდეგ უკვე FontForge შეძლებს, მომხმარებლის კოდიც "
-+"შემატოს „fpgm-ს“, მაგრამ მოსალოდნელი განახლებებიდან გამომდინარე მეტად "
-+"სასურველია მაღალი რიცხვების გამოყენება მომხმარებლის ფუნქციებისთვის."
-+
-+msgid ""
-+"There exists a 'prep' code incompatible with FontForge's. It can't be "
-+"guaranteed it will work well. It is suggested to allow FontForge to insert "
-+"its code and then append user's own."
-+msgstr ""
-+"უკვე არსებობს „prep“ კოდი, რომელთანაც შეუთავსებელია FontForge. გამართულად "
-+"მუშაობის საწინდარი არ არსებობს. სასურველი იქნება, თუ FontForge თავის კოდს "
-+"ჩასვამს და შემდეგ მიამატებს მომხმარებლისას."
-+
- #, c-format
- msgid "There is no glyph named %s (used in %s)"
- msgstr "ასონიშანი დასახელებით %s არაა (ფონტში %s)"
-@@ -4789,6 +5397,9 @@ msgstr "ასონიშანი დასახელებით %s არ
- msgid "There is no glyph named %s in the font"
- msgstr "ასონიშანი დასახელებით %s არ მოიპოვება ამ შრიფტში"
- 
-+msgid "Things could be better..."
-+msgstr "სულ არაფერს სჯობია..."
-+
- msgid "This feature code is already used"
- msgstr "ამ თვისების კოდი უკვე გამოყენებულია"
- 
-@@ -4840,22 +5451,33 @@ msgstr ""
- "შედეგად გაიხსნება 10-ზე მეტი ფანჯარა.\n"
- "ნამდვილად გსურთ, ასე მოხდეს?"
- 
-+msgid ""
-+"This italic conversion will be incomplete!\n"
-+"You will probably want to do manual fixups on e, g, k, and v-z\n"
-+"And on в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n"
-+"And on all Greek lower case letters. And maybe everything else."
-+msgstr ""
-+"დახრილად გარდაქმნა არასრულყოფილადაა შესრულებული!\n"
-+"სასურველი იქნება, ხელით გაასწოროთ e, g, k და v-z\n"
-+"აგრეთვე в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n"
-+"და ყველა ბერძნული პატარა ასონიშანი. შესაძლოა – სხვა დანარჩენიც."
-+
- #, c-format
- msgid ""
- "This kerning pair (%.20s and %.20s) is currently part of a kerning class "
- "with a 0 offset for this combination. Would you like to alter this kerning "
- "class entry (or create a kerning pair for just these two glyphs)?"
- msgstr ""
--"წანაცვლებული წყვილი (%.20s და %.20s), ამჟამად კლასის ნაწილია 0 "
--"ურთიერთდაშორებით. გსურთ ამ კლასის ჩანაწერის გადაკეთება (თუ შეიქმნას "
--"წანაცვლების წყვილი მხოლოდ ამ ორი ასონიშნისთვის)?"
-+"შემოკვეცის წყვილი (%.20s და %.20s) ამჟამად 0 წანაცვლების მქონე შემოკვეცის "
-+"კლასს ეკუთვნის. გსურთ ამ კლასის ჩანაწერის გადაკეთება (თუ ცალკე შეიქმნას "
-+"შემოკვეცის წყვილი მხოლოდ ამ ორი ასონიშნისთვის)?"
- 
- msgid ""
- "This must be ASCII, so you may not use the copyright symbol (use (c) "
- "instead)."
- msgstr ""
- "უნდა იყოს ლათინური ASCII, ამიტომ ვერ გამოიყენებთ საავტორო უფლების ნიშანს "
--"(სანაცვლოდ (c) შეიძლება)."
-+"(სანაცვლოდ (c) გამოდგება)."
- 
- msgid "This operation cannot be undone, do it anyway?"
- msgstr "ეს ქმედება შეუქცევადია, მაინც განაგრძობთ?"
-@@ -4915,7 +5537,7 @@ msgid "To _File"
- msgstr "ფ_აილში"
- 
- msgid "Too Many Kerns"
--msgstr "ზედმეტად ბევრი წანაცვლება"
-+msgstr "ზედმეტად ბევრი შემოკვეცა"
- 
- #, c-format
- msgid "Too many dashes (at most %d allowed)"
-@@ -4926,7 +5548,10 @@ msgid "Too many features %d\n"
- msgstr "ზედმეტად ბევრი თვისება %d\n"
- 
- msgid "Too many kern pairs"
--msgstr "ზედმეტად ბევრი წანაცვლებული წყვილი"
-+msgstr "ზედმეტად ბევრი შემოკვეცილი წყვილი"
-+
-+msgid "Too many layers"
-+msgstr "ზედმეტად ბევრი შრე"
- 
- #, c-format
- msgid "Too many lookups %d\n"
-@@ -4941,6 +5566,9 @@ msgstr "ზედა საბჯენი არ იცვლება."
- msgid "Toto"
- msgstr "ტოტო"
- 
-+msgid "Trace Color"
-+msgstr "ფერის გამოხაზვა"
-+
- msgid "Trademark"
- msgstr "სავაჭრო ნიშანი"
- 
-@@ -4960,7 +5588,7 @@ msgid "Transform _Width Too"
- msgstr "გარდაქმნა სიგა_ნიანად"
- 
- msgid "Transform kerning _classes too"
--msgstr "გარდაქმნა _წანაცვლების კლასებიანად"
-+msgstr "გარდაქმნა _შემოკვეცის კლასებიანად"
- 
- msgid "Transform:"
- msgstr "გარდაქმნა:"
-@@ -4987,6 +5615,9 @@ msgstr "უგარითული"
- msgid "Unable to parse the pdf objects that make up %s"
- msgstr "ვერ ხერხდება იმ PDF-ობიექტების გარჩევა, რომლებითაც შექმნილია %s"
- 
-+msgid "Underline _Position:"
-+msgstr "ხაზგასმის _მდებარეობა:"
-+
- msgid "Undo Fontlevel"
- msgstr "დაბრუნება შრიფტის დონეზე"
- 
-@@ -5018,7 +5649,7 @@ msgid "Uniform scaling for horizontal counters and side bearings"
- msgstr "ზომის ერთგვაროვანი ცვლა თარაზული არეებისა და გვერდითი საბჯენების"
- 
- msgid "UniqueID"
--msgstr "ამოსაცნობი ID"
-+msgstr "საცნობი ID"
- 
- msgid "Unknown Language"
- msgstr "უცნობი ენა"
-@@ -5038,9 +5669,9 @@ msgid ""
- "to the original name, and it will copy a modified version of\n"
- "the original glyph into the new one."
- msgstr ""
--"უმეტესი ბრძანებებისგან განსხვავებით, ეს პირდაპირ არ ზემოქმედებს მითითებულ "
--"ასონიშნებზე. სანაცვლოდ, FontForge შექმნის (ან კვლავ გამოიყენებს) ცალკე "
--"ასონიშანს, თავდაპირველის სახელის გაფართოებით და გადაკეთებული ვარიანტის "
-+"უმეტესი ბრძანებებისგან განსხვავებით ეს პირდაპირ არ ზემოქმედებს მითითებულ "
-+"ასონიშნებზე. სანაცვლოდ FontForge შექმნის (ან კვლავ გამოიყენებს) ცალკე "
-+"ასონიშანს თავდაპირველის სახელის გაფართოებით და გადაკეთებულ ვარიანტს "
- "განათავსებს იქ."
- 
- msgid ""
-@@ -5049,7 +5680,7 @@ msgid ""
- "FontForge will create (or reuse) a glyph named \"a.sc\", and\n"
- "it will copy a modified version of the \"A\" glyph into \"a.sc\"."
- msgstr ""
--"უმეტესი ბრძანებებისგან განსხვავებით, ეს პირდაპირ არ ზემოქმედებს მითითებულ "
-+"უმეტესი ბრძანებებისგან განსხვავებით ეს პირდაპირ არ ზემოქმედებს მითითებულ "
- "ასონიშნებზე. სანაცვლოდ, როცა მოინიშნება „A“ (ან „a“), FontForge შექმნის (ან "
- "კვლავ გამოიყენებს) ცალკე ასონიშანს დასახელებით „a.sc“ და გადაკეთებული „A“ "
- "განთავსდება „a.sc“ ადგილას."
-@@ -5063,6 +5694,27 @@ msgstr "ყველას ჩახსნა"
- msgid "Unspecified Language"
- msgstr "განუსაზღვრელი ენა"
- 
-+#, c-format
-+msgid "Unsupported decode filter parameters : %s"
-+msgstr "მხარდაუჭერელი პარამეტრები გამშირავი ფილტრისთვის: %s"
-+
-+#, c-format
-+msgid "Unsupported filter: %s"
-+msgstr "მხარდაუჭერელი ფილტრი: %s"
-+
-+msgid "Unsupported image format"
-+msgstr "მხარდაუჭერელი სახის გამოსახულება"
-+
-+msgid "Unsupported image format must be bmp"
-+msgstr "მხარდაუჭერელი სურათის სახეობა უნდა იყოს bpm"
-+
-+msgid "Unsupported image format must be bmp or png"
-+msgstr "მხარდაუჭერელი სურათის სახეობა უნდა იყოს bpm ან png"
-+
-+#, c-format
-+msgid "Unsupported mime type in data URI: %s\n"
-+msgstr "მხარდაუჭერელი MIME-სახეობა მონაცემთა URI-ში : %s\n"
-+
- msgid "UntitledGroup"
- msgstr "უსათაურო ჯგუფი"
- 
-@@ -5070,10 +5722,23 @@ msgid "Use FreeType"
- msgstr "გამოიყენოს FreeType"
- 
- msgid "Use Kerning Class?"
--msgstr "გამოიყენოს წანაცვლების კლასი?"
-+msgstr "გამოიყენოს შემოკვეცის კლასი?"
-+
-+msgid "Use UniqueID"
-+msgstr "გამოიყენოს UniqueID"
-+
-+msgid "Use XUID"
-+msgstr "გამოიყენოს XUID"
-+
-+msgid ""
-+"Use this as the default base for the filename\n"
-+"when generating a font."
-+msgstr ""
-+"გამოიყენება ძირეულ დასახელებად\n"
-+"შრიფტის ფაილის შექმნისას."
- 
- msgid "Used for point numbers, hints, etc."
--msgstr "გამოიყენება წერტილთა გადასანომრად, მიმნიშნებლებისთვის და სხვ."
-+msgstr "გამოიყენება წერტილთა გადასანომრად, მიმთითებლებისა და სხვ."
- 
- msgid "Uzbek (Cyrillic)"
- msgstr "უზბეკური (კირილიცა)"
-@@ -5082,16 +5747,16 @@ msgid "Uzbek (Latin)"
- msgstr "უზბეკური (ლათინური)"
- 
- msgid "VKern By Classes"
--msgstr "შვეული წანაცვლება კლასებით"
-+msgstr "შვეული შემოკვეცა კლასებით"
- 
- msgid "VKern By Classes..."
--msgstr "შვეული წანაცვლება კლასებით..."
-+msgstr "შვეული შემოკვეცა კლასებით..."
- 
- msgid "VKern From HKern"
--msgstr "შვეული წანაცვლება თარაზულიდან"
-+msgstr "შვეული შემოკვეცა თარაზულიდან"
- 
- msgid "VKern:"
--msgstr "შვეული წანაცვლება:"
-+msgstr "შვეული შემოკვეცა:"
- 
- msgid "Vai"
- msgstr "ვაი"
-@@ -5115,17 +5780,21 @@ msgstr "მწარმოებლის ბმული"
- msgid "Version"
- msgstr "ვერსია"
- 
-+#. GT: "Vert." is an abbreviation for Vertical
-+msgid "Vert. Variants"
-+msgstr "შვეულ. სახესხვაობები"
-+
- msgid "Vertical"
- msgstr "შვეული"
- 
- msgid "Vertical Baselines"
--msgstr "შვეული საყრდენები"
-+msgstr "ძირითადი შვეული ხაზები"
- 
- msgid "Vertical Kerning"
--msgstr "შვეული წანაცვლება"
-+msgstr "შვეული შემოკვეცა"
- 
- msgid "Vertical Kerning Class"
--msgstr "შვეული წანაცვლების კლასი"
-+msgstr "შვეული შემოკვეცის კლასი"
- 
- msgid "Vertical Only"
- msgstr "შვეული მხოლოდ"
-@@ -5142,8 +5811,8 @@ msgstr "შვეული _აზომვის ხაზები"
- #, c-format
- msgid "Vertical: %d baseline"
- msgid_plural "Vertical: %d baselines"
--msgstr[0] "შვეული: %d საყრდენი"
--msgstr[1] "შვეული: %d საყრდენი"
-+msgstr[0] "შვეული: %d ძირითადი ხაზი"
-+msgstr[1] "შვეული: %d ძირითადი ხაზი"
- 
- msgid "Very Extended"
- msgstr "მეტად გაფართოებული"
-@@ -5151,6 +5820,15 @@ msgstr "მეტად გაფართოებული"
- msgid "Vietnamese"
- msgstr "ვიეტნამური"
- 
-+msgid "WOFF"
-+msgstr "WOFF"
-+
-+msgid "WOFF compressed metadata section too large.\n"
-+msgstr "WOFF-ს დართული შეკუმშული მონაცემები ზედმეტად დიდია.\n"
-+
-+msgid "WOFF uncompressed metadata section too large.\n"
-+msgstr "WOFF-ს დართული შეუკუმშავი მონაცემები ზედმეტად დიდია.\n"
-+
- msgid "WWS Subfamily"
- msgstr "WWS-ქვეჯგუფი"
- 
-@@ -5166,16 +5844,48 @@ msgstr "გაფრთხილება"
- msgid "Warning: Font contained no glyphs"
- msgstr "გაფრთხილება: შრიფტი არ შეიცავს ასონიშნებს"
- 
-+#, c-format
-+msgid ""
-+"Warning: Mac and Windows entries in the 'name' table differ for the\n"
-+" %s string in the language %s\n"
-+" Mac String: %s\n"
-+"Windows String: %s\n"
-+msgstr ""
-+"გაფრთხილება: Mac-ისა და Windows-ის ჩანაწერები „name“ ცხრილში განსხვავდება\n"
-+" %s ველში ენისთვის %s\n"
-+" Mac-ჩანაწერია: %s\n"
-+"Windows-ჩანაწერია: %s\n"
-+
- #, c-format
- msgid "Warning: Unlikely number of subtables (%d) for 'kern' table"
- msgstr "გაფრთხილება: შეუსაბამო რაოდენობის ქვეცხრილები (%d) „kern“ ცხრილისთვის"
- 
-+msgid "Warning: Unrecognized or unsupported join type, defaulting to 'nib'.\n"
-+msgstr ""
-+"გაფრთხილება: დაუდგენელი ან მხარდაუჭერელი სახის შეერთება, ნაგულისხმევად "
-+"დაბრუნდება 'nib'.\n"
-+
- msgid "Warnings"
- msgstr "გაფრთხილებები"
- 
- msgid "Warnings.Font"
- msgstr "გაფრთხილებების.შრიფტი"
- 
-+msgid "Web Open Font (WOFF)"
-+msgstr "Web Open Font (WOFF)"
-+
-+msgid "Web Open Font (WOFF2)"
-+msgstr "Web Open Font (WOFF2)"
-+
-+msgid ""
-+"When Saving, keep this number of previous versions of the file. file.sfd-01 "
-+"will be the last saved file, file.sfd-02 will be the file saved before that, "
-+"and so on. If you set this to 0 then no revisions will be retained."
-+msgstr ""
-+"შენახვისას დაიტოვებს მითითებული რაოდენობის გადამუშავებულ ვერსიებს. file."
-+"sfd-01 იქნება ბოლოს შენახული ფაილი, file.sfd-02 იქნება წინა და ა.შ. თუ "
-+"მიუთითებთ 0-ს, მაშინ წინა ვერსიები არ შენარჩუნდება."
-+
- msgid "When a font is opened, should it be made compact?"
- msgstr "შრიფტის გახსნისას, იყოს თუ არა შემჭიდროებული?"
- 
-@@ -5232,24 +5942,67 @@ msgstr "Win"
- msgid "Windows Latin (\"ANSI\")"
- msgstr "Windows ლათინური (\"ANSI\")"
- 
-+msgid "Windows will reject fonts with an OS/2 version number of 0\n"
-+msgstr "Windows უარყოფს შრიფტებს OS/2 ვერსიის ნომრით 0\n"
-+
-+msgid "Windows will reject otf (cff) fonts with an OS/2 version number of 1\n"
-+msgstr "Windows უარყოფს otf (cff) შრიფტებს OS/2 ვერსიის ნომრით 1\n"
-+
- msgid "Windows-compatible 'kern'"
- msgstr "Windows-სთან თავსებადი „kern“"
- 
-+msgid "Woff Major Version:"
-+msgstr "Woff ძირითადი ვერსია:"
-+
-+msgid "Woff Minor Version:"
-+msgstr "Woff დამატებითი ვერსია:"
-+
- #. GT: X is a coordinate
- msgid "X"
- msgstr "X"
- 
-+msgid "XFig"
-+msgstr "XFig"
-+
- #. GT: Y is a coordinate
- #. GT: Y is a coordinate, the leading spaces help to align it
- msgid "Y"
- msgstr "Y"
- 
-+msgid "Yes"
-+msgstr "დიახ"
-+
- msgid "Yes to _All"
- msgstr "დიახ _ყველას"
- 
- msgid "Yes, and don't _remind me again"
- msgstr "დიახ, მომავალში _კითხვის გარეშე"
- 
-+#, c-format
-+msgid ""
-+"You appear to have an old editing session on %s.\n"
-+"Would you like to recover it?"
-+msgstr ""
-+"ჩანს, დაუსრულებელი გაქვთ ადრინდელი ნამუშევარი %s.\n"
-+"გსურთ მისი აღდგენა?"
-+
-+msgid ""
-+"You are about to change the last quadratic\n"
-+"layer to cubic. When this happens FontForge\n"
-+"will remove all truetype instructions.\n"
-+"\n"
-+"This cannot be undone.\n"
-+"\n"
-+"Is this really your intent?"
-+msgstr ""
-+"აპირებთ გადაიყვანოთ ბოლო კვადრატული\n"
-+"შრე კუბურში. შედეგად FontForge\n"
-+"მოაცილებას ყველა truetype-მითითებას.\n"
-+"\n"
-+"ეს ქმედება შეუქცცევადია.\n"
-+"\n"
-+"ნამდვილად გსურთ, განაგრძოთ?"
-+
- msgid ""
- "You are about to delete a layer.\n"
- "This will lose all contours in that layer.\n"
-@@ -5366,18 +6119,38 @@ msgstr "_დასაშიფრი ადგილების დამატ
- msgid "_Advance Width only"
- msgstr "მხოლოდ გა_ფართოებული სიგანე"
- 
-+#. GT: Align these points to their average position
-+msgid "_Align Points"
-+msgstr "წერტილების ურთიერთს_წორება"
-+
- msgid "_Alphabetic"
- msgstr "_ანბანური"
- 
-+msgid "_Always raise this dialog when exporting"
-+msgstr "ამ ფანჯრის _ყოველ ჯერზე ამოგდება გამოტანისას"
-+
- msgid "_Around"
- msgstr "_მიახლოებით"
- 
-+msgid "_Ascent:"
-+msgstr "_ზედატანი:"
-+
- msgid "_Ask"
- msgstr "კით_ხვა"
- 
- msgid "_Auto Width..."
- msgstr "_სიგანის თვითგანსაზღვრა..."
- 
-+#. GT: Background, make it short
-+msgid "_Back"
-+msgstr "_უკანა"
-+
-+msgid "_Base Filename:"
-+msgstr "_ძირეული სახელი:"
-+
-+msgid "_Base:"
-+msgstr "_საყრდენი:"
-+
- msgid "_Bigger Pixel Size"
- msgstr "მო_ზრდილი ზომა პიქსელის"
- 
-@@ -5403,10 +6176,10 @@ msgid "_Changed Glyphs"
- msgstr "შე_ცვლილი ასონიშნები"
- 
- msgid "_Circular (Elliptical)"
--msgstr "_წრიული (ოვალური)"
-+msgstr "_წრიული (კვერცხისებრი)"
- 
- msgid "_Clear Hints"
--msgstr "მიმნიშნებლების გას_უფთავება"
-+msgstr "მიმთითებლების გას_უფთავება"
- 
- msgid "_Close"
- msgstr "_დახურვა"
-@@ -5435,6 +6208,9 @@ msgstr "_ნაგულისხმევი გამოცალკევე
- msgid "_Delete"
- msgstr "_წაშლა"
- 
-+msgid "_Descent:"
-+msgstr "_ქვედატანი:"
-+
- msgid "_Deselect All"
- msgstr "ყველა მონიშვნის მო_ხსნა"
- 
-@@ -5447,8 +6223,11 @@ msgstr "_ჩახსნა ასონიშნების"
- msgid "_Disable"
- msgstr "გამ_ორთვა"
- 
-+msgid "_Docked Palettes"
-+msgstr "ჩამაგ_რებული"
-+
- msgid "_Don't AutoHint"
--msgstr "თვითმინიშნების _გარეშე"
-+msgstr "თვითმიმთითებლის _გარეშე"
- 
- msgid "_Don't Save"
- msgstr "შენახვის _გარეშე"
-@@ -5480,6 +6259,12 @@ msgstr "ში_ფრი თექვსმეტობითში"
- msgid "_Exact"
- msgstr "_ზუსტად"
- 
-+msgid "_Exclude"
-+msgstr "გამორი_ცხვა"
-+
-+msgid "_Extrema"
-+msgstr "_წვერო"
-+
- msgid "_Family Name:"
- msgstr "_კრებულის სახელი:"
- 
-@@ -5492,6 +6277,9 @@ msgstr "შევ_სება"
- msgid "_Filter"
- msgstr "გამორ_ჩევა"
- 
-+msgid "_Find Intersections"
-+msgstr "თანაკვეთის _პოვნა"
-+
- msgid "_Fit"
- msgstr "მ_ორგება"
- 
-@@ -5499,11 +6287,14 @@ msgid "_Flatten bumps on lines"
- msgstr "ბორცვების დაბრტ_ყელება ხაზებზე"
- 
- msgid "_Font Info..."
--msgstr "შრიფ_ტის შესახებ..."
-+msgstr "შრიფ_ტის მონაცემები..."
- 
- msgid "_Force Encoding"
- msgstr "_იძულებით დაშიფვრა"
- 
-+msgid "_Forget about it"
-+msgstr "ამის დავი_წყება"
-+
- msgid "_Freehand"
- msgstr "თა_ვისუფალი"
- 
-@@ -5511,16 +6302,16 @@ msgid "_Full Font Display"
- msgstr "_სრული შრიფტის გამოჩენა"
- 
- msgid "_Generate"
--msgstr "შედ_გენა"
-+msgstr "დამ_ზადება"
- 
- msgid "_Generate Fonts..."
--msgstr "შრიფტების _შედგენა..."
-+msgstr "შრიფტების _დამზადება..."
- 
- msgid "_Glyph Image"
- msgstr "ას_ონიშნის გამოსახულება"
- 
- msgid "_Glyph Info..."
--msgstr "ას_ონიშნის შესახებ..."
-+msgstr "ას_ონიშნის მონაცემები..."
- 
- msgid "_Glyph Tabs"
- msgstr "ას_ონიშნის ჩანართები"
-@@ -5528,6 +6319,9 @@ msgstr "ას_ონიშნის ჩანართები"
- msgid "_Goto"
- msgstr "გადა_სვლა"
- 
-+msgid "_Guess"
-+msgstr "სავარა_უდო"
-+
- #. GT: Guide layer, make it short
- msgid "_Guide"
- msgstr "_მიმმართველი"
-@@ -5551,10 +6345,10 @@ msgid "_Horizontal"
- msgstr "თარა_ზული"
- 
- msgid "_Horizontal Baselines..."
--msgstr "_თარაზული საყრდენები..."
-+msgstr "ძირითადი _თარაზული ხაზები..."
- 
- msgid "_Horizontal Hints"
--msgstr "_თარაზული მიმნიშნებლები"
-+msgstr "_თარაზული მიმთითებლები"
- 
- msgid "_IBM Family:"
- msgstr "_IBM-კრებული:"
-@@ -5571,14 +6365,20 @@ msgstr "ჩამა_ტება"
- msgid "_Insert Random Text..."
- msgstr "შემთხვევითი ტექსტის ჩამა_ტება..."
- 
-+msgid "_Interpolated"
-+msgstr "_ჩამატებული"
-+
-+msgid "_Intersect"
-+msgstr "თანა_კვეთა"
-+
- msgid "_Invert Selection"
- msgstr "შებრ_უნებული მონიშვნა"
- 
- msgid "_Kern Pairs"
--msgstr "_წანაცვლებული წყვილები"
-+msgstr "_შემოკვეცილი წყვილები"
- 
- msgid "_Kerning only"
--msgstr "მხოლოდ _წანაცვლება"
-+msgstr "მხოლოდ _შემოკვეცა"
- 
- msgid "_Knife"
- msgstr "_მოსაჭრელი"
-@@ -5610,14 +6410,20 @@ msgstr "მოა_ხლოება"
- msgid "_Maximum distance between points in a region"
- msgstr "უ_დიდესი დაშორება წერტილებს შორის არეში"
- 
-+msgid "_Merge"
-+msgstr "გა_ერთიანება"
-+
- msgid "_Merge Feature Info..."
- msgstr "_თვისებების მონაცემთა გაერთიანება..."
- 
-+msgid "_Merge Fonts..."
-+msgstr "შრიფტების გა_ერთიანება..."
-+
- msgid "_Metrics"
- msgstr "_აზომვები"
- 
- msgid "_Min Kern:"
--msgstr "უ_მცირესი წანაცვლება:"
-+msgstr "უ_მცირესი შემოკვეცა:"
- 
- msgid "_Min:"
- msgstr "უ_მცირესი:"
-@@ -5625,6 +6431,9 @@ msgstr "უ_მცირესი:"
- msgid "_More Info"
- msgstr "ვრ_ცლად"
- 
-+msgid "_Move Points"
-+msgstr "წერტილების გადა_ტანა"
-+
- msgid "_Multi Size Glyph"
- msgstr "_რამდენიმე ზომით"
- 
-@@ -5667,6 +6476,9 @@ msgstr "_კარგი"
- msgid "_Open"
- msgstr "_გახსნა"
- 
-+msgid "_Options"
-+msgstr "პარამე_ტრები"
-+
- msgid "_Other"
- msgstr "ს_ხვა"
- 
-@@ -5682,6 +6494,9 @@ msgstr "_მოხაზულობა..."
- msgid "_Overview"
- msgstr "_გადახედვა"
- 
-+msgid "_Palettes"
-+msgstr "ხელსაწ_ყოთა არეები"
-+
- msgid "_Partial"
- msgstr "_ნაწილობრივ"
- 
-@@ -5754,8 +6569,11 @@ msgstr "ყველას ა_ღდგენა"
- msgid "_Revert File"
- msgstr "ა_ღდგენა"
- 
-+msgid "_Review Hints..."
-+msgstr "_მიმთითებლების შეთვალიერება..."
-+
- msgid "_Rotate 90° CW"
--msgstr "_შებრუნება 90° საათის მიმართ."
-+msgstr "_მობრუნება 90° საათ. მიმართ."
- 
- msgid "_Ruler"
- msgstr "_სახაზავი"
-@@ -5775,6 +6593,9 @@ msgstr "შრიფტის სახელთა სიის შენა_
- msgid "_Save in UTF8"
- msgstr "შენახ_ვა UTF8-სახით"
- 
-+msgid "_Scale Outlines"
-+msgstr "მოხაზულობის _ზომის ცვლილება"
-+
- msgid "_Scroll"
- msgstr "_გადასაადგილებელი"
- 
-@@ -5802,12 +6623,21 @@ msgstr "_ზომა:"
- msgid "_Skew..."
- msgstr "გა_დახრა..."
- 
-+msgid "_Skip"
-+msgstr "გამ_ოტოვება"
-+
-+msgid "_Skip for now"
-+msgstr "ამჟამად _არიდება"
-+
- msgid "_Smaller Pixel Size"
- msgstr "მომ_ცრო ზომა პიქსელის"
- 
- msgid "_Tag:"
- msgstr "_ჭდე:"
- 
-+msgid "_Tangent"
-+msgstr "_მხები"
-+
- msgid "_Thirds in Width"
- msgstr "სიგანის მ_ესამედში"
- 
-@@ -5826,12 +6656,18 @@ msgstr "გა_რდაქმნა..."
- msgid "_Transformations"
- msgstr "_გარდაქმნები"
- 
-+msgid "_Type3 Multi Layered Font"
-+msgstr "მრავალშრიანი შრიფტი _Type3"
-+
- msgid "_Undo"
- msgstr "_დაბრუნება"
- 
- msgid "_Unicode"
- msgstr "_უნიკოდი"
- 
-+msgid "_UniqueID:"
-+msgstr "_UniqueID:"
-+
- msgid "_Unlink All"
- msgstr "_ჩაიხსნას ყველა"
- 
-@@ -5841,6 +6677,9 @@ msgstr "აწ_ევა"
- msgid "_Use My Metrics"
- msgstr "_საკუთარი აზომვების გამოყენება"
- 
-+msgid "_Use Transform (SVG)"
-+msgstr "„გარდაქმნის“ გამ_ოყენება (SVG)"
-+
- msgid "_Validate..."
- msgstr "შემო_წმება..."
- 
-@@ -5857,10 +6696,10 @@ msgid "_Vertical"
- msgstr "შ_ვეული"
- 
- msgid "_Vertical Baselines..."
--msgstr "_შვეული საყრდენები..."
-+msgstr "ძირითადი _შვეული ხაზები..."
- 
- msgid "_Vertical Hints"
--msgstr "_შვეული მიმნიშნებლები"
-+msgstr "_შვეული მიმთითებლები"
- 
- msgid "_View"
- msgstr "_ხედი"
-@@ -5880,12 +6719,23 @@ msgstr "_ფანჯრის სახეობა"
- msgid "_X:"
- msgstr "_X:"
- 
-+msgid "_XUID:"
-+msgstr "_XUID:"
-+
- msgid "_Y:"
- msgstr "_Y:"
- 
- msgid "_Yes"
- msgstr "_დიახ"
- 
-+#. GT: The dialog looks like:
-+#. GT:   Interpolating between <fontname> and:
-+#. GT: <list of possible fonts>
-+#. GT:   by  <50>%
-+#. GT: So "by" means how much to interpolate.
-+msgid "by"
-+msgstr "მნიშვნ."
-+
- msgid "color bitmap data table"
- msgstr "ფერის ცხრილურ მონაცემთა ნუსხა"
- 
-@@ -5922,6 +6772,9 @@ msgstr "კრებულის სახელი"
- msgid "gaspTableEntry|New"
- msgstr "ახალი"
- 
-+msgid "glyph location table"
-+msgstr "ასონიშნის მდებარეობის ცხრილი"
-+
- msgid "glyph outline table"
- msgstr "ასონიშნის მოხაზულობის ცხრილი"
- 
-@@ -5929,10 +6782,10 @@ msgid "if smaller than"
- msgstr "თუ მოკლეა, ვიდრე"
- 
- msgid "kern pair"
--msgstr "წანაცვლებული წყვილი"
-+msgstr "შემოკვეცილი წყვილი"
- 
- msgid "kerning table"
--msgstr "წანაცვლების ცხრილი"
-+msgstr "შემოკვეცის ცხრილი"
- 
- msgid "language tag table"
- msgstr "ენის ჭდეების ცხრილი"
-@@ -5946,6 +6799,24 @@ msgstr "გრძელი, ვიდრე"
- msgid "metrics variations table"
- msgstr "აზომვის გადახრების ცხრილი"
- 
-+msgid "png"
-+msgstr "png"
-+
-+msgid "points|Merge to Line"
-+msgstr "points|გაერთიანება ხაზით"
-+
-+msgid "points|_Merge"
-+msgstr "points|გა_ერთიანება"
-+
-+msgid "problfixup|Missing Extrema"
-+msgstr "problfixup|აკლია წვერო"
-+
-+msgid "sfnt Revision:"
-+msgstr "sfnt-გადამუშავება:"
-+
-+msgid "sfnt _Revision:"
-+msgstr "sfnt-გადამ_უშავება:"
-+
- msgid "version"
- msgstr "ვერსია"
- 
-@@ -6009,3 +6880,7 @@ msgstr "ბიტური შრიფტები ΤεΧ"
- 
- msgid "ΤεΧ Names"
- msgstr "ΤεΧ სახელები"
-+
-+#, c-format
-+msgid "∆Curvature: %g"
-+msgstr "∆სიმრუდე: %g"
-diff --git a/po/ko.po b/po/ko.po
-index 971b4db03b..c74d554846 100644
---- a/po/ko.po
-+++ b/po/ko.po
-@@ -19,8 +19,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Korean\n"
- "Language: ko_KR\n"
-@@ -3308,16 +3308,16 @@ msgstr "합음자글리프가 부적절합니다. GID %d가 %d 미만이 아닙
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "포맷 2 (%d/%d) 의 참조테이블이 손상되어 있습니다.최초=%d 마지막=%d 폰트내의 "
- "모든 글리프수=%d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "포맷 4 (%d/%d) 의 참조테이블이 손상되어 있습니다.최초=%d 마지막=%d 폰트내의 "
- "모든 글리프수=%d\n"
-@@ -7563,8 +7563,8 @@ msgstr "%2$s의 %1$d행에서 예상되는 콤마 또는 세미콜론"
- msgid ""
- "Expected either \"HorizAxis\" or \"VertAxis\" in BASE table on line %d of %s"
- msgstr ""
--"%2$s의 %1$d행에 있는 베이스 테이블에서 예상되는 \"HorizAxis\" 또는 \"VertAxis"
--"\""
-+"%2$s의 %1$d행에 있는 베이스 테이블에서 예상되는 \"HorizAxis\" 또는 "
-+"\"VertAxis\""
- 
- msgid "Expected glyph file with format==1 or 2"
- msgstr "형식이==1 또는 2인 예상 글리프 파일"
-@@ -9134,8 +9134,8 @@ msgid ""
- " with platform=%d, specific=%d (in 'cmap')\n"
- msgstr ""
- "글리프인덱스가 범위 외의 %d 값으로 되어 있습니다만, %d 미만이어야 합니다.\n"
--"  인코딩 %x 이라는 글리프 (('cmap' 의)세그멘트 %d 의 중에 있음.  이 플랫폼ID="
--"%d, 고유ID=%d) 를 맵핑할 때에   검색합니다.\n"
-+"  인코딩 %x 이라는 글리프 (('cmap' 의)세그멘트 %d 의 중에 있음.  이 플랫폼"
-+"ID=%d, 고유ID=%d) 를 맵핑할 때에   검색합니다.\n"
- 
- msgid ""
- "Glyph names (or unicode code points) may occur at most once in this group "
-@@ -14704,8 +14704,8 @@ msgstr "없음/열림 루프"
- #, c-format
- msgid "Nonsensical class assigned to a glyph-- class=%d is too big. Glyph=%d\n"
- msgstr ""
--"무의미한 클래스가 글리프에 부여되어 있습니다―클래스=%d는 너무 큽니다. 글리프="
--"%d\n"
-+"무의미한 클래스가 글리프에 부여되어 있습니다―클래스=%d는 너무 큽니다. 글리프"
-+"=%d\n"
- 
- msgid "Normal"
- msgstr "보통"
-@@ -19572,8 +19572,8 @@ msgid "SnapToInt"
- msgstr "정수로 스냅"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "그래서 여기서 \"A\"를 입력하면 첫 번째로 선택된 글리프 이름이 \"A.suffix\"가 "
-@@ -20918,7 +20918,6 @@ msgstr ""
- "폰트%3$.30s 글리프\"%2$.30s\"에 포함되는 힌트%1$s는, %4$.30s에 포함되는 것과 "
- "일치하지 않습니다(개수 또는 겹치기 특징이 다릅니다)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -22659,8 +22658,8 @@ msgstr "선택한 점을 그리는 데 사용되는 선의 폭"
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "%s 너비, 높이, 깊이 또는 기울임 꼴 보정이 너무 큽니다. Tfm 파일에 포함 된 em "
- "크기는 글꼴 크기의 16 배를 초과 할 수 없습니다. 폭 = %g, 높이 = %g, 깊이 = "
-@@ -25551,7 +25550,6 @@ msgstr ""
- "경고: 'cvar' 에 중간tuple데이터가 포함되어 있습니다.\n"
- "  FontForge는 이것을 지원하지 않습니다\n"
- 
--#, c-format
- msgid "Warning: Accuracy target %lf less than minimum %lf, using %lf instead\n"
- msgstr "경고: 정확도 목표 %lf는 최소 %lf 미만입니다. 대신 %lf를 사용합니다\n"
- 
-@@ -25570,7 +25568,6 @@ msgstr "경고 : 등고선 엔드가 닫히지 않았습니다\n"
- msgid "Warning: Contour start did not close\n"
- msgstr "경고 : 등고선 시작이 닫 없습니다\n"
- 
--#, c-format
- msgid "Warning: Coordinate diff %lf greater than margin %lf\n"
- msgstr "경고: 좌표 차이 %lf이 여백 %lf를 초과합니다\n"
- 
-@@ -28641,8 +28638,8 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "%2$s의 “%1$s”에서 짝단위 위치지정 ∆x=%3$d ∆y=%4$d ∆x_adv=%5$d ∆y_adv=%6$d(다"
- "음의 글리프%7$s에서 ∆x=%8$d ∆y=%9$d ∆x_adv=%10$d ∆y_adv=%11$d)를 수행하는 참"
-@@ -28650,8 +28647,8 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
- "%2$s의 “%1$s”에서 위치지정 ∆x=%3$d ∆y=%4$d ∆x_adv=%5$d ∆y_adv=%6$d를 수행하"
- "는 참조는 없습니다\n"
-diff --git a/po/ml.po b/po/ml.po
-index a611e01b03..095d50e346 100644
---- a/po/ml.po
-+++ b/po/ml.po
-@@ -11,8 +11,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Malayalam\n"
- "Language: ml_IN\n"
-diff --git a/po/pl.po b/po/pl.po
-index 2bbbf00be6..f6697c2d9c 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -12,17 +12,17 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Polish\n"
- "Language: pl_PL\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
--"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
--"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
-+"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
-+"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
- "X-Crowdin-Project: fontforge\n"
- "X-Crowdin-Project-ID: 368599\n"
- "X-Crowdin-Language: pl\n"
-@@ -221,8 +221,8 @@ msgid ""
- "!!!!! Bad Base Coord format (%d) for '%c%c%c%c' in '%c%c%c%c' script in "
- "'BASE' table\n"
- msgstr ""
--"!!!!! Nieznany format współrzędnej linii podstawowej pisma (%d) w funkcji „%c"
--"%c%c%c” dla pisma „%c%c%c%c” w talicy „BASE”\n"
-+"!!!!! Nieznany format współrzędnej linii podstawowej pisma (%d) w funkcji "
-+"„%c%c%c%c” dla pisma „%c%c%c%c” w talicy „BASE”\n"
- 
- #, c-format
- msgid ""
-@@ -3101,19 +3101,19 @@ msgstr "Błędny glif ligatury: numer znaku %d nie jest mniejszy od %d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
--"Błędna tablica funkcji zecerskich: format=2 (%d/%d), pierwszy=%d, ostatni="
--"%d, liczba glifów w foncie=%d\n"
-+"Błędna tablica funkcji zecerskich: format=2 (%d/%d), pierwszy=%d, "
-+"ostatni=%d, liczba glifów w foncie=%d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
--"Błędna tablica funkcji zecerskich: format=4 (%d/%d), pierwszy=%d, ostatni="
--"%d, liczba glifów w foncie=%d\n"
-+"Błędna tablica funkcji zecerskich: format=4 (%d/%d), pierwszy=%d, "
-+"ostatni=%d, liczba glifów w foncie=%d\n"
- 
- #, c-format
- msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n"
-@@ -10384,8 +10384,8 @@ msgstr "Formy JIS90"
- #, c-format
- msgid "JSTF extension max at priority %d #%d for %c%c%c%c in %c%c%c%c"
- msgstr ""
--"'jstf' graniczne rozbicie wiersza: waga %d #%d, język %c%c%c%c, pismo %c%c%c"
--"%c"
-+"'jstf' graniczne rozbicie wiersza: waga %d #%d, język %c%c%c%c, pismo "
-+"%c%c%c%c"
- 
- #. GT: This string is used to generate a name for an OpenType lookup.
- #. GT:  the %c%c... is the language followed by the script (OT tags)
-@@ -16972,8 +16972,8 @@ msgid ""
- "Script '%c%c%c%c' claims baseline '%c%c%c%c' as its default, but that "
- "baseline is not currently active."
- msgstr ""
--"Pismo „%c%c%c%c” ma mieć ustawioną domyślą linię podstawową systemu „%c%c%c"
--"%c”. Jednakże ten system linii podstawowych nie został wybrany jako "
-+"Pismo „%c%c%c%c” ma mieć ustawioną domyślą linię podstawową systemu "
-+"„%c%c%c%c”. Jednakże ten system linii podstawowych nie został wybrany jako "
- "obsługiwany w foncie."
- 
- #, c-format
-@@ -18281,8 +18281,8 @@ msgid "SnapToInt"
- msgstr "Przyciągaj do całkowitych"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Jeśli wpisane zostanie tu „A”, to nazwa pierwszego zaznaczonego glifu "
-@@ -19550,7 +19550,6 @@ msgstr ""
- "Hinty %1$s w glifie „%2$.30s” w foncie „%3$.30s” nie pasują do tych z "
- "„%4$.30s” (inna liczba lub inne maski hintów)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -20649,8 +20648,8 @@ msgid ""
- "\n"
- "Would you like to add this script to one of those features?"
- msgstr ""
--"Tablica funkcji zecerskich %.30s jest aktywna dla glifu %.30s z pisma „%c%c%c"
--"%c”, ale to pismo nie występuje w żadnej funkcji korzystającej z tej "
-+"Tablica funkcji zecerskich %.30s jest aktywna dla glifu %.30s z pisma "
-+"„%c%c%c%c”, ale to pismo nie występuje w żadnej funkcji korzystającej z tej "
- "tablicy.\n"
- "Czy dodać to pismo do którejś z wymienionych funkcji?"
- 
-@@ -21196,8 +21195,8 @@ msgstr "Grubość obwódki używanej do rysowania zaznaczonych punktów na krzyw
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "Szerokość, wysokość, głębokość lub kompensata pochylenia dla %s jest zbyt "
- "duża. Pliki tfm nie mogą zawierać wartości większych niż 16 × wysokość pola "
-@@ -24978,8 +24977,8 @@ msgstr ""
- #, c-format
- msgid "You have just changed the point numbering of glyph %s.%s%s%s"
- msgstr ""
--"Właśnie uległy zmianie numery poszczególnych punktów tworzących glif %s.%s%s"
--"%s"
-+"Właśnie uległy zmianie numery poszczególnych punktów tworzących glif %s."
-+"%s%s%s"
- 
- msgid "You may change the default instance of this font"
- msgstr "Można zmienić domyślny wariant w tym foncie"
-@@ -26839,19 +26838,19 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "Glif “%s” w %s nie zawiera pozycjonowania ∆x=%d ∆y=%d ∆szer=%d ∆wys=%dw "
- "parze z %s ∆x=%d ∆y=%d ∆szer=%d ∆wys=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
--"Glif „%s” w %s nie zawiera pozycjonowania prostego ∆x=%d ∆y=%d ∆szer=%d ∆wys="
--"%d.\n"
-+"Glif „%s” w %s nie zawiera pozycjonowania prostego ∆x=%d ∆y=%d ∆szer=%d "
-+"∆wys=%d.\n"
- 
- #, c-format
- msgid "“%s” in %s did not contain a substitution lookup to %s\n"
-diff --git a/po/pt.po b/po/pt.po
-index 62ec090e75..76ac806be7 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -14,8 +14,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Portuguese\n"
- "Language: pt_PT\n"
-diff --git a/po/ru.po b/po/ru.po
-index 77b8f11baf..a6dd423420 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -12,8 +12,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Russian\n"
- "Language: ru_RU\n"
-diff --git a/po/tr_TR.po b/po/tr_TR.po
-index f251a13300..4aa28e9761 100644
---- a/po/tr_TR.po
-+++ b/po/tr_TR.po
-@@ -9,8 +9,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Turkish\n"
- "Language: tr_TR\n"
-diff --git a/po/uk.po b/po/uk.po
-index e3768acc3c..8dd79a1c24 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -6,8 +6,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Ukrainian\n"
- "Language: uk_UA\n"
-@@ -3150,16 +3150,16 @@ msgstr "Помилковий гліф лігатури. GID %d не менше 
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Помилкова таблиця фільтрування: формат=2 (%d/%d), перший=%d останній=%d "
- "загалом гліфів у шрифті=%d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Помилкова таблиця фільтрування: формат=4 (%d/%d), перший=%d останній=%d "
- "загалом гліфів у шрифті=%d\n"
-@@ -3167,8 +3167,8 @@ msgstr ""
- #, c-format
- msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n"
- msgstr ""
--"Помилкова таблиця фільтрування: формат=6, перший=%d загалом гліфів у шрифті="
--"%d\n"
-+"Помилкова таблиця фільтрування: формат=6, перший=%d загалом гліфів у "
-+"шрифті=%d\n"
- 
- #, c-format
- msgid "Bad lookup table: format=8, first=%d cnt=%d total glyphs in font=%d\n"
-@@ -8621,8 +8621,8 @@ msgstr ""
- #, c-format
- msgid "Glyph “%s” has vertical advance width %d in %s but %d in %s at %d@%d\n"
- msgstr ""
--"Гліф «%s» має значення вертикальної додаткової ширини %d у %s і %d у %s, %d@"
--"%d\n"
-+"Гліф «%s» має значення вертикальної додаткової ширини %d у %s і %d у %s, "
-+"%d@%d\n"
- 
- #, c-format
- msgid "Glyph “%s” in %s has no truetype instructions\n"
-@@ -18580,8 +18580,8 @@ msgid "SnapToInt"
- msgstr "Округляти до цілого"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Отже, якщо ви введете тут «A», перший позначений гліф буде названо «A."
-@@ -19858,7 +19858,6 @@ msgstr ""
- "Гінти %1$s у гліфі «%2$.30s» у шрифті %3$.30s не відповідають гінтам у "
- "%4$.30s (інша кількість або інші критерії перекриття)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -21581,8 +21580,8 @@ msgstr "Ширина лінії, яку буде використано для 
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "Велична ширини, висоти, глибини або виправлення курсиву %s є надто великою. "
- "У файлах tfm не можна використовувати значення, що перевищують em більше ніж "
-@@ -27293,19 +27292,19 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "«%s» у %s не містив попарного фільтрування розташувань ∆x=%d ∆y=%d ∆x_дод=%d "
- "∆y_дод=%d до %s ∆x=%d ∆y=%d ∆x_дод=%d ∆y_дод=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
--"«%s» у %s не містила фільтрування розташування ∆x=%d ∆y=%d ∆x_дод=%d ∆y_дод="
--"%d\n"
-+"«%s» у %s не містила фільтрування розташування ∆x=%d ∆y=%d ∆x_дод=%d "
-+"∆y_дод=%d\n"
- 
- #, c-format
- msgid "“%s” in %s did not contain a substitution lookup to %s\n"
-diff --git a/po/vi.po b/po/vi.po
-index 6aee8bb3fa..7034fc284b 100644
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -1,18 +1,10 @@
--# Vietnamese translation for FontForge.
--# Copyright (C) 2000-2010 by George Williams
--# Clytie Siddall <clytie@riverland.net.au>, 2007, 2008, 2009, 2010.
--#
--# Translators:
--# Clytie Siddall <clytie@riverland.net.au>, 2007, 2008, 2009, 2010.
--# Clytie Siddall <clytie@riverland.net.au>, 2010-03-15 20:46+0930
--#
--#
-+
- msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 02:46\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Vietnamese\n"
- "Language: vi_VN\n"
-@@ -610,14 +602,6 @@ msgstr "Một hộp được vẽ chung quanh ô điều khiển khác"
- msgid "A canvas (sub-window) wrapped up in a gadget, for drawing"
- msgstr "Một vùng vẽ (cửa sổ phụ) được bao bọc trong một ô điều khiển, để vẽ"
- 
--msgid ""
--"A comma separated list of font family names used to display small example "
--"images of glyphs over the user designed glyphs"
--msgstr ""
--"Danh sách định giới bằng dấu phẩy mà chứa các tên nhóm phông chữ dùng để "
--"hiển thị ảnh thí dụ nhỏ của hình tượng ở trên hình tượng được người dùng "
--"thiết kế"
--
- msgid ""
- "A contour in this glyph contains a different number of points in different "
- "instances"
-@@ -1170,9 +1154,6 @@ msgstr "Bề rộng tiến tới của hình tượng %.30s phải nhỏ hơn 12
- msgid "Adyghe"
- msgstr "TIếng A-di-ghe"
- 
--msgid "Aegean scripts"
--msgstr "Chữ viết Ægean"
--
- msgid "Afar"
- msgstr "TIếng A-pha"
- 
-@@ -1367,21 +1348,9 @@ msgstr "Đường gần nằm ngang/dọc"
- msgid "Almost stem_3 hint"
- msgstr "Gần là lời gợi ý stem_3"
- 
--msgid "Alphabetic"
--msgstr "Chữ cái"
--
--msgid "Alphabetic Extended"
--msgstr "Chữ cái đã mở rộng"
--
- msgid "Alphabetic Presentation Forms"
- msgstr "Hình đại diện chữ cái"
- 
--msgid "Alphabetic and syllabic LTR scripts"
--msgstr "Chữ viết bên trái-qua-phải kiểu chữ cái và âm tiết"
--
--msgid "Alphabetic and syllabic RTL scripts"
--msgstr "Chữ viết bên phải-qua-trái kiểu chữ cái và âm tiết"
--
- msgid "Alsatian"
- msgstr "Tiếng An-xa-ti"
- 
-@@ -1752,9 +1721,6 @@ msgstr "Bên Phải qua Trái ngôn ngữ A Rập"
- msgid "Arabic Supplement"
- msgstr "Phần bổ sung tiếng A Rập"
- 
--msgid "Arakanese"
--msgstr "Tiếng A-ra-ka-ni"
--
- msgid "Archives"
- msgstr "Kho"
- 
-@@ -1816,9 +1782,6 @@ msgstr ""
- msgid "Armenian"
- msgstr "Tiếng Ác-mê-ni"
- 
--msgid "Armenian Ligatures"
--msgstr "Chữ ghép tiếng Ác-mê-ni"
--
- msgid "ArrowAccelFactor"
- msgstr "Tăng Tốc Mũi Tên"
- 
-@@ -1902,9 +1865,6 @@ msgstr ""
- "Bảng thiết bị cho phép bạn ghi rõ giá trị\n"
- "điều chỉnh cho mỗi kích cỡ theo điểm ảnh."
- 
--msgid "Athapaskan"
--msgstr "Tiếng A-ta-pa-x-ca"
--
- #, c-format
- msgid ""
- "Attempt to apply a lookup to a location out of the range of this contextual\n"
-@@ -2120,9 +2080,6 @@ msgstr "Tiếng Ay-ma-ra"
- msgid "Azebaijani (roman)"
- msgstr "Tiếng A-xơ-bai-gianh (La-tinh)"
- 
--msgid "Azeri"
--msgstr "Tiếng A-de-ri"
--
- msgid "Azeri (Cyrillic)"
- msgstr "Tiếng A-xê-ri (Ki-rin)"
- 
-@@ -2498,9 +2455,6 @@ msgstr "Có hàm phụ flex sai trong %s\n"
- msgid "Bad font"
- msgstr "Phông sai"
- 
--msgid "Bad font specification"
--msgstr "Đặc tả phông sai"
--
- msgid "Bad font, offset out of bounds.\n"
- msgstr "Phông sai : giá trị bù ở ngoại phạm vi.\n"
- 
-@@ -2598,8 +2552,8 @@ msgstr "Hình tượng chữ ghép sai : GID %d không phải nhỏ hơn %d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Bảng tra tìm sai:\n"
- " • định dạng=2 (%d/%d)\n"
-@@ -2609,8 +2563,8 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "Bảng tra tìm sai:\n"
- " • định dạng=4 (%d/%d)\n"
-@@ -2815,9 +2769,6 @@ msgstr "Tiếng Ba-li"
- msgid "Balkar"
- msgstr "Tiếng Ban-khă"
- 
--msgid "Balochi"
--msgstr "Tiếng Ba-lô-khi"
--
- msgid "Balti"
- msgstr "Tiếng Ban-thi"
- 
-@@ -2887,9 +2838,6 @@ msgstr "Mặt Phẳng Đa Ngôn Ngữ Cơ Bản"
- msgid "Basque"
- msgstr "Tiếng Bax-quợ"
- 
--msgid "Baule"
--msgstr "Tiếng Bau-le"
--
- msgid "Be_vel"
- msgstr "Cạnh _xiên"
- 
-@@ -3215,21 +3163,12 @@ msgstr "Bạn có muốn làm phông xiên theo góc nào?"
- msgid "Byelorussian"
- msgstr "Tiếng Bie-lo-ru-xi"
- 
--msgid "Byte Order Mark"
--msgstr "Dấu thứ tự byte"
--
- msgid "Byzantine Music"
- msgstr "Âm nhạc La Mã phương Đông"
- 
- msgid "Byzantine Musical Symbols"
- msgstr "Ký hiệu âm nhạc La Mã phương Đông"
- 
--msgid "C0 Control Character"
--msgstr "Ký tự điều khiển C0"
--
--msgid "C1 Control Character"
--msgstr "Ký tự điều khiển C1"
--
- msgid ""
- "CALL function\n"
- "Pops a value, calls the function represented by it"
-@@ -3282,15 +3221,9 @@ msgstr "Chữ viết ghi ý tương thích với tiếng Trung/Nhật/Hàn"
- msgid "CJK Compatibility Ideographs Supplement"
- msgstr "Phần bổ sung Chữ viết Ghi ý Tương thích tiếng Trung/Nhật/Hàn"
- 
--msgid "CJK Enclosed Letters and Months"
--msgstr "Chữ và tháng đã bao bọc tiếng Trung/Nhật/Hàn"
--
- msgid "CJK Ideographic"
- msgstr "Chữ viết ghi ý tiếng Trung/Nhật/Hàn"
- 
--msgid "CJK Phonetics and Symbols"
--msgstr "Ngữ âm và ký hiệu tiếng Trung/Nhật/Hàn"
--
- msgid "CJK Strokes"
- msgstr "Nét tiếng Trung/Nhật/Hàn"
- 
-@@ -3803,18 +3736,6 @@ msgstr "Tiếng Hoa (Xin-ga-po)"
- msgid "Chinese (Taiwan)"
- msgstr "Tiếng Trung (Đài-loan)"
- 
--msgid "Chinese Hong Kong"
--msgstr "Tiếng Trung (Hông Kồng))"
--
--msgid "Chinese Phonetic"
--msgstr "Tiếng Trung ngữ âm"
--
--msgid "Chinese Simplified"
--msgstr "Tiếng Trung phổ thông"
--
--msgid "Chinese Traditional"
--msgstr "Tiếng Trung truyền thống"
--
- msgid "Chipewyan"
- msgstr "Tiếng Chi-pe-ouianh"
- 
-@@ -4273,9 +4194,6 @@ msgstr "Sửa:"
- msgid "Corner"
- msgstr "Đỉnh"
- 
--msgid "Corporate Use"
--msgstr "Dùng bởi công ty"
--
- msgid "Correct Direction"
- msgstr "Sửa hướng"
- 
-@@ -4347,10 +4265,6 @@ msgstr "Không thể mở"
- msgid "Could not open %.100s"
- msgstr "Không thể mở %.100s"
- 
--#, c-format
--msgid "Could not open %s"
--msgstr "Không thể mở %s"
--
- msgid "Could not open file"
- msgstr "Không thể mở tập tin"
- 
-@@ -4394,16 +4308,6 @@ msgstr "Không thể ghi %s."
- msgid "Couldn't create directory"
- msgstr "Không thể tạo thư mục"
- 
--#, c-format
--msgid ""
--"Couldn't create directory: %1$s\n"
--"%2$s\n"
--"%3$s"
--msgstr ""
--"Không thể tạo thư mục: %1$s\n"
--"%2$s\n"
--"%3$s"
--
- #, c-format
- msgid "Couldn't create directory: %s"
- msgstr "Không thể tạo thư mục: %s"
-@@ -4542,9 +4446,6 @@ msgstr "Lập phương"
- msgid "Cuneiform"
- msgstr "Chữ hình nêm"
- 
--msgid "Cuneiform Numbers"
--msgstr "Chữ số hình nêm"
--
- msgid "Currency Symbols"
- msgstr "Ký hiệu tiền tệ"
- 
-@@ -4867,9 +4768,6 @@ msgstr "Khoảng thời gian (theo mili-giây) trước khi cửa sổ tự mở
- msgid "Delete"
- msgstr "Xoá"
- 
--msgid "Delete Character"
--msgstr "Xoá ký tự"
--
- msgid ""
- "Deletes any selected lookups and their subtables, or deletes any selected "
- "subtables.\n"
-@@ -4988,12 +4886,6 @@ msgstr "Tiếng Đe-va-na-ga-ri 2"
- msgid "Device Table Adjustments"
- msgstr "Điều chỉnh bảng thiết bị"
- 
--msgid "Dhivehi"
--msgstr "Tiếng Đi-ve-hi"
--
--msgid "Dhivehi (Obsolete)"
--msgstr "Đi-vê-hi (Cũ)"
--
- msgid "Diagonal Fractions"
- msgstr "Phân số chéo"
- 
-@@ -5159,9 +5051,6 @@ msgstr "Khoảng cách tới mặt phẳng hiện hình:"
- msgid "Divehi"
- msgstr "Tiếng Đi-ve-hi"
- 
--msgid "Djerma"
--msgstr "Tiếng Chơ-ma"
--
- msgid "Do Nothing"
- msgstr "Đừng làm gì"
- 
-@@ -5225,9 +5114,6 @@ msgstr "Không kế thừa từ gì"
- msgid "Doesn't look like a valid pdf file, couldn't find xref section"
- msgstr "Không hình như một tập tin PDF hợp lệ vì không tìm thấy phần xref"
- 
--msgid "Dogri"
--msgstr "Tiếng Đo-gợ-ri"
--
- msgid "Domino Tiles"
- msgstr "Ngói đôminô"
- 
-@@ -6522,9 +6408,6 @@ msgstr ""
- msgid "Font Compare"
- msgstr "So sánh phông"
- 
--msgid "Font Family"
--msgstr "Nhóm phông"
--
- msgid "Font Info"
- msgstr "Thông tin phông"
- 
-@@ -6532,9 +6415,6 @@ msgstr "Thông tin phông"
- msgid "Font Information for %.90s"
- msgstr "Thông tin phông về %.90s"
- 
--msgid "Font Size"
--msgstr "Cỡ phông chữ"
--
- msgid "Font Type:"
- msgstr "Kiểu phông:"
- 
-@@ -6656,27 +6536,6 @@ msgstr ""
- msgid "FontForge time stamp table"
- msgstr "bảng nhãn thời gian FontForge"
- 
--#, c-format
--msgid ""
--"FontForge was unable to find a cidmap file for this font. It is not "
--"essential to have one, but some things will work better if you do. If you "
--"have not done so you might want to download the cidmaps from:\n"
--"   http://FontForge.sourceforge.net/cidmaps.tgz\n"
--"and then gunzip and untar them and move them to:\n"
--"  %.80s\n"
--"\n"
--"Would you like to search your local disk for an appropriate file?"
--msgstr ""
--"Trình FontForge không tìm thấy tập tin sơ đồ CID thích hợp với phông này.\n"
--"Không ép buộc phải dùng tập tin kiểu này, nhưng một số thứ sẽ hoạt động\n"
--"tốt hơn với nó. Nếu bạn chưa tài về các tập tin sơ đồ CID, vẫn có thể tải "
--"xuống:\n"
--"   http://FontForge.sourceforge.net/cidmaps.tgz\n"
--"rồi giải nén và di chuyển vào\n"
--"  %.80s\n"
--"\n"
--"Bạn có muốn tìm kiếm một tập tin thích hợp trên đĩa cục bộ không?"
--
- msgid ""
- "FontForge was unable to load libspiro, spiros are not available for use."
- msgstr ""
-@@ -6748,9 +6607,6 @@ msgstr "Buộc tên hình tượng thành:"
- msgid "Fore"
- msgstr "Gần"
- 
--msgid "Forest Nenets"
--msgstr "Tiếng Ne-net-x rừng"
--
- msgid "Forget _to All"
- msgstr "Quên _tất cả"
- 
-@@ -6900,9 +6756,6 @@ msgstr "Từ :"
- msgid "Frozen Color"
- msgstr "Màu đông cứng"
- 
--msgid "Fulani"
--msgstr "Tiếng Phu-la-ni"
--
- msgid "Fulfulde"
- msgstr "Tiếng Phun-phun-đe"
- 
-@@ -7367,8 +7220,8 @@ msgstr "Hình tượng « %s » có chiều rộng sớm %d trong %s còn là %d
- #, c-format
- msgid "Glyph “%s” has advance width %d in %s but %d in %s at %d@%d\n"
- msgstr ""
--"Hình tượng « %s » có chiều rộng sớm %d trong %s còn là %d trong %s tại %d@"
--"%d\n"
-+"Hình tượng « %s » có chiều rộng sớm %d trong %s còn là %d trong %s tại "
-+"%d@%d\n"
- 
- #, c-format
- msgid "Glyph “%s” has different truetype instructions\n"
-@@ -7518,9 +7371,6 @@ msgstr ""
- "Lớn hơn hay bằng (GTEQ)\n"
- "Bỏ hai giá trị, đẩy (0/1) nếu cái dưới ≥ cái trên"
- 
--msgid "Greek"
--msgstr "Tiếng Hy Lạp"
--
- msgid "Greek (polytonic)"
- msgstr "Tiếng Hy Lạp (đa giọng)"
- 
-@@ -7660,9 +7510,6 @@ msgstr "Nửa hình"
- msgid "Half Widths"
- msgstr "Nửa rộng"
- 
--msgid "Half and Full Width Forms"
--msgstr "Hình nửa và toàn rộng"
--
- msgid "Halfwidth and Fullwidth Forms"
- msgstr "Hình nửa/toàn rộng"
- 
-@@ -7672,9 +7519,6 @@ msgstr "Tiếng Ha-mơ-Ba-na"
- msgid "Hangul Compatibility Jamo"
- msgstr "Hangul tương thích với Jamo"
- 
--msgid "Hangul Jamo Half Width Forms"
--msgstr "Hình nửa rộng Hangul Jamo"
--
- msgid "Hangul Syllables"
- msgstr "Âm tiết Hangul"
- 
-@@ -7699,9 +7543,6 @@ msgstr "Nặng"
- msgid "Hebrew"
- msgstr "Tiếng Do Thái"
- 
--msgid "Hebrew Ligatures/Pointed Letters"
--msgstr "Chữ ghép/chữ nhọn tiếng Do Thái"
--
- msgid "Height"
- msgstr "Cao"
- 
-@@ -7737,9 +7578,6 @@ msgstr "Ẩn khi di chu_yển"
- msgid "High Mari"
- msgstr "Tiếng Ma-ri cao"
- 
--msgid "High Surrogate"
--msgstr "Thay thế cao"
--
- msgid "High-Density Font"
- msgstr "Phông mật độ cao"
- 
-@@ -8259,9 +8097,6 @@ msgstr "Đang bỏ qua mục nhập /CharStrings (chuỗi ký tự) trùng\n"
- msgid "Ignoring duplicate /Subrs entry\n"
- msgstr "Đang bỏ qua mục nhập /Subrs trùng\n"
- 
--msgid "Ijo"
--msgstr "Tiếng I-chô"
--
- msgid "Ilokano"
- msgstr "Tiếng I-lô-ca-nô"
- 
-@@ -8294,10 +8129,6 @@ msgstr "Ảnh dùng cho dấu liệt kê đã bật (ghi đè lên hộp)"
- msgid "Image used instead of the Check Box Off Mark"
- msgstr "Ảnh dùng thay cho Dấu Hộp Chọn bị Tắt"
- 
--msgid ""
--"Image used instead of the Check Box Off Mark (when the radio is disabled)"
--msgstr "Ảnh dùng thay cho Dấu Hộp Chọn bị Tắt (khi nút chọn một bị tắt)"
--
- msgid "Image used instead of the Radio Off Mark"
- msgstr "Ảnh dùng thay cho Dấu Hộp Chọn Một bị Tắt"
- 
-@@ -8632,29 +8463,6 @@ msgstr ""
- msgid "Instruction Gloss (TrueType)"
- msgstr "Chú giải chỉ dẫn (TrueType)"
- 
--msgid ""
--"Instructions in a TrueType font refer to\n"
--"points by number, so if you edit a glyph\n"
--"in such a way that some points have different\n"
--"numbers (add points, remove them, etc.) then\n"
--"the instructions will be applied to the wrong\n"
--"points with disasterous results.\n"
--"  Normally FontForge will remove the instructions\n"
--"if it detects that the points have been renumbered\n"
--"in order to avoid the above problem. You may turn\n"
--"this behavior off -- but be careful!"
--msgstr ""
--"Chỉ dẫn trong phông TrueType tham chiếu\n"
--"đến mỗi điểm theo con số. Vậy nếu bạn chỉnh\n"
--"sửa hình tượng bằng cách mà các điểm có số bị đổi\n"
--"(thêm/bỏ điểm v.v.) thì các chỉ dẫn sẽ được\n"
--"áp dụng cho điểm không đúng, làm kết quả rất xấu.\n"
--"\n"
--"Bình thường, trình FontForge sẽ gỡ bỏ các chỉ dẫn\n"
--"nếu nó phát hiện rằng các điểm đã được đánh số lại,\n"
--"để tránh vấn đề trên. Bạn vẫn có khả năng tắt\n"
--"ưng xử này, nhưng hãy rất cẩn thận."
--
- msgid "Instructions out of date"
- msgstr "Chỉ dẫn quá cũ"
- 
-@@ -8954,9 +8762,6 @@ msgstr ""
- "JuMP Relative\n"
- "Bỏ hiệu (theo byte) để di chuyển con trỏ chỉ lệnh"
- 
--msgid "Judezmo"
--msgstr "Tiếng Giu-đex-mô"
--
- msgid "Jula"
- msgstr "Tiếng Giu-la"
- 
-@@ -9459,12 +9264,6 @@ msgstr "La-tinh đã mở rộng C"
- msgid "Latin Extended-D"
- msgstr "La-tinh đã mở rộng D"
- 
--msgid "Latin Full Width Forms"
--msgstr "Hình toàn rộng La-tinh"
--
--msgid "Latin Ligatures"
--msgstr "Chữ ghép La-tinh"
--
- msgid "Latin-1 Supplement"
- msgstr "Phần bổ sung Latin-1"
- 
-@@ -9937,12 +9736,6 @@ msgstr "Chữ thường sang chữ hoa rất nhỏ"
- msgid "Lowercase to Small Capitals"
- msgstr "Chữ thường sang chữ hoa nhỏ"
- 
--msgid "Luganda"
--msgstr "Tiếng Lu-gan-đa"
--
--msgid "Luhya"
--msgstr "Tiếng Lu-hia"
--
- msgid "Lule Sami"
- msgstr "Tiếng Lu-le Xa-mi"
- 
-@@ -10170,9 +9963,6 @@ msgstr ""
- msgid "Make the counters narrower"
- msgstr "Làm cho bộ đếm hẹp hơn"
- 
--msgid "Makua"
--msgstr "Tiếng Ma-khua"
--
- msgid "Malagasy"
- msgstr "Tiếng Ma-la-ga-xi"
- 
-@@ -10544,9 +10334,6 @@ msgstr "Tên trình đơn"
- msgid "Menu name with no associated script"
- msgstr "Tên trình đơn không có văn lệnh tương ứng"
- 
--msgid "Merge Feature Info"
--msgstr "Trộn thông tin tính năng"
--
- msgid "Merge Fonts"
- msgstr "Trộn phông"
- 
-@@ -10592,9 +10379,6 @@ msgstr "Đơn vị đo %.50s"
- msgid "Metrics Label Color"
- msgstr "Màu nhãn đơn vị đo"
- 
--msgid "MetricsView"
--msgstr "ÔXemĐơnVịĐo"
--
- msgid "MfArgs"
- msgstr "Đối Số MF"
- 
-@@ -10745,21 +10529,12 @@ msgstr "Trục _phụ :"
- msgid "Misc."
- msgstr "Linh tinh"
- 
--msgid "Miscellaneous Math Symbols-A"
--msgstr "Ký hiệu Toán học Linh tinh (A)"
--
--msgid "Miscellaneous Math Symbols-B"
--msgstr "Ký hiệu Toán học Linh tinh (B)"
--
- msgid "Miscellaneous Symbols"
- msgstr "Ký hiệu lặt vặt"
- 
- msgid "Miscellaneous Technical"
- msgstr "Kỹ thuật linh tinh"
- 
--msgid "Miscellaneous Technical Symbols"
--msgstr "Ký hiệu Kỹ thuật Linh tinh"
--
- msgid "Mismatch lookup types inside a parsed lookup"
- msgstr "Sai khớp kiểu sự tra tìm bên trong sự tra tìm đã phân tích"
- 
-@@ -11233,9 +11008,6 @@ msgstr "NFNT (MacBinary)"
- msgid "NFNT (Resource)"
- msgstr "NFNT (tài nguyên)"
- 
--msgid "NUL, Default Character"
--msgstr "Ký tự mặc định NUL"
--
- msgid "N_ever Interpolate"
- msgstr "Không _bao giờ nội suy"
- 
-@@ -11518,9 +11290,6 @@ msgstr "Tiếng Ni-xi"
- msgid "Niuean"
- msgstr "Tiếng Ni-u-e"
- 
--msgid "Nkole"
--msgstr "Tiếng N-cô-le"
--
- #, c-format
- msgid "No (useable) bitmap strikes in this TTF font: %s"
- msgstr "Không có gạch mảng ảnh có ích trong phông TTF này: %s"
-@@ -12009,9 +11778,6 @@ msgstr "Không phải là định dạng CID"
- msgid "Not a CID-keyed font"
- msgstr "Không phải là phông đã khoá CID"
- 
--msgid "Not a Unicode Character"
--msgstr "Không phải ký tự Unicode"
--
- msgid "Not a bdf file"
- msgstr "Không phải là tập tin bdf."
- 
-@@ -12139,9 +11905,6 @@ msgstr "Dạng số"
- msgid "Nyanja/Chewa"
- msgstr "Tiếng Nai-an-gia"
- 
--msgid "Nynorsk"
--msgstr "Tiếng Ny-noa-x-kh"
--
- msgid "O Black Letter"
- msgstr "TH Chữ đen"
- 
-@@ -12539,9 +12302,6 @@ msgstr "Gốc"
- msgid "Origin:"
- msgstr "Gốc:"
- 
--msgid "Original Color"
--msgstr "Màu gốc"
--
- msgid "Original Y Position"
- msgstr "Vị trí Y gốc"
- 
-@@ -12605,12 +12365,6 @@ msgstr "Viền bên trong nét ngoài"
- msgid "Outline Outer Border"
- msgstr "Viền bên ngoài nét ngoài"
- 
--msgid "Outline View"
--msgstr "Ô xem nét ngoài"
--
--msgid "Outline View 2"
--msgstr "Ô xem nét ngoài 2"
--
- msgid "Outline Width"
- msgstr "Bề rộng nét ngoài"
- 
-@@ -13021,26 +12775,6 @@ msgstr "Phần mở rộng ngữ âm"
- msgid "Phonetic Extensions Supplement"
- msgstr "Phần bổ sung phần mở rộng ngữ âm"
- 
--msgid ""
--"Physical screen width, measured in centimeters\n"
--"For this to take effect you must save the resource data (press the [Save] "
--"button)\n"
--"and restart fontforge"
--msgstr ""
--"Chiều rộng vật lý của màn hình, đo theo xen-ti-mét\n"
--"Để thiết lập này có tác động thì bạn cần phải lưu dữ liệu tài nguyên\n"
--"(bấm nút [Lưu]), sau đó khởi chạy lại FontForge."
--
--msgid ""
--"Physical screen width, measured in inches\n"
--"For this to take effect you must save the resource data (press the [Save] "
--"button)\n"
--"and restart fontforge"
--msgstr ""
--"Chiều rộng vật lý của màn hình, đo theo insơ\n"
--"Để thiết lập này có tác động thì bạn cần phải lưu dữ liệu tài nguyên\n"
--"(bấm nút [Lưu]), sau đó khởi chạy lại FontForge."
--
- msgid "Pick a CMap subtable"
- msgstr "Chọn một bảng phụ CMap"
- 
-@@ -13056,9 +12790,6 @@ msgstr "Chọn một trang"
- msgid "Pick a substitution to display in the window."
- msgstr "Chọn một sự thay thế cần hiển thị trong cửa sổ."
- 
--msgid "Pilipino (Filipino)"
--msgstr "Tiếng Phi-li-pi-nô"
--
- msgid "Pixel List"
- msgstr "Danh sách điểm ảnh"
- 
-@@ -13225,9 +12956,6 @@ msgstr "Hình đa g_iác"
- msgid "Polish"
- msgstr "Tiếng Ba Lan"
- 
--msgid "Pollard Phonetic"
--msgstr "Ngữ âm Po-lat"
--
- msgid "Polygon"
- msgstr "Đa giác"
- 
-@@ -13438,9 +13166,6 @@ msgstr "Ưu tiên: %d"
- msgid "Private Dictionary"
- msgstr "Từ điển Riêng"
- 
--msgid "Private Use"
--msgstr "Dùng riêng"
--
- msgid "Private Use Area"
- msgstr "Vùng dùng riêng"
- 
-@@ -13487,9 +13212,6 @@ msgstr "Chữ số tỷ lệ"
- msgid "Proportional Width"
- msgstr "Bề rộng tỷ lệ"
- 
--msgid "Provencal"
--msgstr "Tiếng Pợ-ro-ven-xan"
--
- msgid "Provide a glyph name"
- msgstr "Cung cấp tên hình tượng"
- 
-@@ -14321,9 +14043,6 @@ msgstr "Đang làm tròn thành số nguyên..."
- msgid "Row|New"
- msgstr "Mới"
- 
--msgid "Ruanda"
--msgstr "Tiếng Ru-oanh-đa"
--
- msgid "Ruby Notational Forms"
- msgstr "Hình phụ chú Ruby"
- 
-@@ -14763,12 +14482,6 @@ msgstr "Ký hiệu khoa học in thấp"
- msgid "Scottish Gaelic"
- msgstr "Tiếng Xen-tơ (Ê-cốt)"
- 
--msgid "Screen Width in Centimeters"
--msgstr "Độ rộng màn hình (theo xen-ti-mét)"
--
--msgid "Screen Width in Inches"
--msgstr "Độ rộng màn hình (theo insơ)"
--
- #, c-format
- msgid "Script '%c%c%c%c' "
- msgstr "Chữ viết '%c%c%c%c' "
-@@ -15769,9 +15482,6 @@ msgstr "Hệ số mở rộng vị trí phương hướng bên"
- msgid "Side Bearings:"
- msgstr "Vị trí phương hướng bên:"
- 
--msgid "Signature Mark"
--msgstr "Dấu chữ ký"
--
- msgid "Silte Gurage"
- msgstr "Tiếng Gu-ra-ge Xin-te"
- 
-@@ -15955,8 +15665,8 @@ msgid "SnapToInt"
- msgstr "Đính Số Nguyên"
- 
- msgid ""
--"So if you type \"A\" here the first selected glyph would be named \"A.suffix"
--"\".\n"
-+"So if you type \"A\" here the first selected glyph would be named \"A."
-+"suffix\".\n"
- "The second \"B.suffix\", and so on."
- msgstr ""
- "Vì vậy, nếu bạn gõ vào đây chữ « A », hình tượng đã chọn đầu tiên\n"
-@@ -16059,13 +15769,6 @@ msgstr "Tiếng Nam Xla-vê"
- msgid "Southern Sami"
- msgstr "Tiếng Nam Xă-mi"
- 
--msgid ""
--"Space (in points) left between images and text in labels, buttons, menu "
--"items, etc. which have both"
--msgstr ""
--"Khoảng cách (theo điểm) nên còn lại giửa ảnh và chuỗi chữ trong nhãn, nút, "
--"mục trình đơn v.v. chứa cả hai"
--
- msgid "Space Regions"
- msgstr "Vùng khoảng cách"
- 
-@@ -16758,9 +16461,6 @@ msgstr ""
- "Super ROUND\n"
- "Quá phức tạp. Hãy tra tìm"
- 
--msgid "Super and Sub scripts"
--msgstr "Chữ in cao/thấp"
--
- msgid "Superscript"
- msgstr "Chữ cao"
- 
-@@ -16785,15 +16485,9 @@ msgstr "Mũi tên bổ sung A"
- msgid "Supplemental Arrows-B"
- msgstr "Mũi tên bổ sung B"
- 
--msgid "Supplemental Math Operators"
--msgstr "Toán từ Toán học Bổ sung"
--
- msgid "Supplemental Punctuation"
- msgstr "Dấu chấm câu bổ sung"
- 
--msgid "Supplemental Symbols and Arrows"
--msgstr "Ký hiệu và Mũi tên Bổ sung"
--
- msgid "Supplementary Ideographic Plane"
- msgstr "Mặt phẳng Chữ viết Ghi ý Bổ sung"
- 
-@@ -16812,15 +16506,6 @@ msgstr "Mặt phẳng Mục đích Đặc biệt Bổ sung"
- msgid "Suri"
- msgstr "Tiếng Xu-ri"
- 
--msgid "Surrogate High"
--msgstr "Thay thế cao"
--
--msgid "Surrogate High, Non Private Use"
--msgstr "Thay thế cao, không dùng riêng"
--
--msgid "Surrogate High, Private Use"
--msgstr "Thay thế cao, dùng riêng"
--
- msgid "Sutu"
- msgstr "Tiếng Xu-tu"
- 
-@@ -16839,9 +16524,6 @@ msgstr "Tiếng Xouă-hi-li (Ken-ya)"
- msgid "Swash"
- msgstr "Đuôi tu từ"
- 
--msgid "Swazi"
--msgstr "Tiếng Xouă-xi"
--
- msgid "Swedish"
- msgstr "Tiếng Thuỵ Điển"
- 
-@@ -16875,9 +16557,6 @@ msgstr "Bộ ký tự ký hiệu"
- msgid "Symbolic"
- msgstr "Tượng Trưng"
- 
--msgid "Symbols"
--msgstr "Ký hiệu"
--
- msgid "Symbols:"
- msgstr "Ký hiệu:"
- 
-@@ -17044,9 +16723,6 @@ msgstr "Tiếng Te-lu-gu"
- msgid "Temne"
- msgstr "Tiếng Tem-ne"
- 
--msgid "Template Color"
--msgstr "Màu mẫu"
--
- msgid "Terminal Forms"
- msgstr "Hình cuối"
- 
-@@ -17107,7 +16783,6 @@ msgstr ""
- "Những lời gợi ý %1$s trong hình tượng « %2$.30s » trong phông %3$.30s không "
- "tương ứng với những lời trong %4$.30s (số khác hay tiêu chuẩn chồng lấp khác)"
- 
--#, c-format
- msgid ""
- "The %1$s in the search dialog contains a reference to %2$.20hs which does "
- "not exist in the new font.\n"
-@@ -18515,8 +18190,8 @@ msgstr "Chiều rộng của đường được dùng để vẽ các điểm đ
- #, c-format
- msgid ""
- "The width, height, depth or italic correction of %s is too big. Tfm files "
--"may not contain values bigger than 16 times the em-size of the font. Width="
--"%g, height=%g, depth=%g, italic correction=%g"
-+"may not contain values bigger than 16 times the em-size of the font. "
-+"Width=%g, height=%g, depth=%g, italic correction=%g"
- msgstr ""
- "%s có bề rộng, bề cao, bề sâu hay hệ số sửa in nghiêng mà quá lớn.\n"
- "Tập tin TFM không thể chứa giá trị lớn hơn 16× kích cỡ em của phông.\n"
-@@ -19234,16 +18909,6 @@ msgstr ""
- "Việc này mở hơn 10 cửa sổ.\n"
- "Có hợp với ý muốn không?"
- 
--msgid ""
--"This is an abstract class which defines common features of the\n"
--"FontView, CharView, BitmapView and MetricsView"
--msgstr ""
--"Đây là một hạng trừu tượng mà xác định các tính năng chung của:\n"
--" • FontView — khung xem phông chữ\n"
--" • CharView — khung xem ký tự\n"
--" • BitmapView — khung xem ảnh mảng\n"
--" • MetricsView — khung xem đơn vị đo"
--
- msgid ""
- "This is an identifying number shared by all members of\n"
- "this font family with the same style (I.e. 10pt Bold and\n"
-@@ -19566,12 +19231,6 @@ msgstr ""
- "Phiên bản Fontforge này đã không liên kết với thư viện spiro, do đó không "
- "dùng được."
- 
--msgid "This window displays a single outline glyph"
--msgstr " Cửa sổ này hiển thị một hình tượng nét ngoài riêng lẻ"
--
--msgid "This window displays a single outline glyph (more data)"
--msgstr " Cửa sổ này hiển thị một hình tượng nét ngoài riêng lẻ (dữ liệu thêm)"
--
- msgid "This window displays metrics information about a font"
- msgstr "Cửa sổ này hiển thị thông tin đơn vị đo về một phông chữ nào đó"
- 
-@@ -20009,9 +19668,6 @@ msgstr "Tiếng T-xouă-na"
- msgid "Tulu"
- msgstr "Tiếng Tu-lu"
- 
--msgid "Tundra Nenets"
--msgstr "Tiếng Ne-net-x lãnh nguyên"
--
- msgid "Turkish"
- msgstr "Tiếng Thổ Nhĩ Kỳ"
- 
-@@ -20332,9 +19988,6 @@ msgstr "Unicode 2.0+, chỉ BMP"
- msgid "Unicode 2.0+, all planes"
- msgstr "Unicode 2.0+, mọi mặt phẳng"
- 
--msgid "Unicode Basic Multilingual Plane"
--msgstr "Mặt Phẳng Đa Ngôn Ngữ Cơ Bản Unicode"
--
- msgid "Unicode C_har:"
- msgstr "_Ký tự Unicode:"
- 
-@@ -20344,15 +19997,6 @@ msgstr "Phạm vi Unicode"
- msgid "Unicode Ranges:"
- msgstr "Phạm vi Unicode:"
- 
--msgid "Unicode Supplementary Ideographic Plane"
--msgstr "Mặt phẳng Chữ viết Ghi ý Bổ sung Unicode"
--
--msgid "Unicode Supplementary Multilingual Plane"
--msgstr "Mặt phẳng Đa ngôn ngữ Bổ sung Unicode"
--
--msgid "Unicode Supplementary Special-purpose Plane"
--msgstr "Mặt phẳng Mục đích Đặc biệt Bổ sung Unicode"
--
- msgid "Unicode _Value:"
- msgstr "_Giá trị Unicode:"
- 
-@@ -20793,9 +20437,6 @@ msgstr "Dấu chọn biến đổi (hay 0)"
- msgid "Variation Selectors"
- msgstr "Dấu chọn biến đổi"
- 
--msgid "Variation Selectors B"
--msgstr "Dấu chọn biến đổi B"
--
- #, c-format
- msgid ""
- "Variation selectors are normally between\n"
-@@ -21382,15 +21023,6 @@ msgstr ""
- msgid "When serifs are removed (as first two in \"m\"), replace with:"
- msgstr "Khi bỏ chân (như hai chân thứ nhất của « m ») thì thay thế bằng:"
- 
--msgid ""
--"When the hint's position is changed\n"
--"adjust the postion of any points\n"
--"which lie on that hint"
--msgstr ""
--"Khi vị trí lời gợi ý đã thay đổi,\n"
--"điều chỉnh vị trí của điểm nào\n"
--"nằm trên lời gợi ý đó."
--
- msgid ""
- "When the mouse pointer is within this many pixels\n"
- "of one of the various interesting features (baseline,\n"
-@@ -21579,9 +21211,6 @@ msgstr "Dời X"
- msgid "X Repeat Count"
- msgstr "Số đếm X đã lặp lại"
- 
--msgid "X Resource Editor"
--msgstr "Trình sửa tài nguyên X"
--
- msgid "X Scale Factor"
- msgstr "Hệ số co giãn X"
- 
-@@ -21622,18 +21251,12 @@ msgstr "Y gần¹ bề c_ao chuẩn"
- msgid "Y-Cree"
- msgstr "Tiếng Cợ-ri Y"
- 
--msgid "Yakut"
--msgstr "Tiếng Ya-kut"
--
- msgid "Yes"
- msgstr "Có"
- 
- msgid "Yes to _All"
- msgstr "Đồng ý _với tất cả"
- 
--msgid "Yi"
--msgstr "Tiếng Yi"
--
- msgid "Yi Classic"
- msgstr "Tiếng Yi cổ điển"
- 
-@@ -21892,10 +21515,6 @@ msgstr "Bạn cần phải ghi rõ một đá lát ở giữa"
- msgid "You must specify a pattern"
- msgstr "Phải ghi rõ một mẫu"
- 
--#, c-format
--msgid "You must specify a replacement glyph for %s"
--msgstr "Bạn phải xác định một hình tượng thay thế cho %s"
--
- msgid "You must specify a standard type1 extension (.pfb or .pfa)"
- msgstr "Phải xác định một phần mở rộng kiểu 1 tiêu chuẩn (.pfb hay .pfa)."
- 
-@@ -21968,9 +21587,6 @@ msgstr "Th_u nhỏ"
- msgid "Zande"
- msgstr "Tiếng Xan-đe"
- 
--msgid "Zapf Dingbats"
--msgstr "Ký tự trang trí Zapf"
--
- msgid "Zone:"
- msgstr "Vùng:"
- 
-@@ -22171,9 +21787,6 @@ msgstr "Đón_g"
- msgid "_Cluster"
- msgstr "_Chùm"
- 
--msgid "_Compact"
--msgstr "Nén _chặt"
--
- msgid "_Condense/Extend..."
- msgstr "_Co lại/Dãn ra..."
- 
-@@ -22984,9 +22597,6 @@ msgstr "_Lưới thép"
- msgid "_Wireframe..."
- msgstr "_Lưới thép..."
- 
--msgid "_X Resource Editor..."
--msgstr "Trình sửa tài nguyên _X..."
--
- msgid "_X near¹"
- msgstr "_X gần¹"
- 
-@@ -23441,19 +23051,19 @@ msgstr "Phông mảng ảnh ΤεΧ"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
- "Trong %s, « %s » không chứa sự tra tìm định vị theo hướng cặp ∆x=%d ∆y=%d "
- "∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr ""
--"Trong %s, « %s » không chứa sự tra tìm định vị ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"Trong %s, « %s » không chứa sự tra tìm định vị ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- 
- #, c-format
- msgid "“%s” in %s did not contain a substitution lookup to %s\n"
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 8f8e0e60e8..787be30337 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -22,8 +22,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 03:24\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-31 08:24\n"
- "Last-Translator: \n"
- "Language-Team: Chinese Simplified\n"
- "Language: zh_CN\n"
-@@ -79,6 +79,10 @@ msgstr "  右边=%d"
- msgid "  Stroke _Width:"
- msgstr "  笔画宽度(_W):"
- 
-+#. GT: X is a coordinate, the leading spaces help to align it
-+msgid "  X"
-+msgstr "  X"
-+
- #, c-format
- msgid " %s: line %d\n"
- msgstr " %s: 行 %d\n"
-@@ -120,6 +124,9 @@ msgstr "后"
- msgid " Next CP"
- msgstr "下一控制点"
- 
-+msgid " Perhaps you meant to use the keyword 'sub' rather than 'subs'?"
-+msgstr " 也许您打算使用关键字'sub'而不是'subs'?"
-+
- msgid " Prev"
- msgstr "前"
- 
-@@ -165,6 +172,12 @@ msgstr "符号"
- msgid "%.*s is not a valid class name (or number)"
- msgstr "%.*s 不是有效的类属名(或数值)"
- 
-+#, c-format
-+msgid ""
-+"%.50s contains a flipped reference. This cannot be corrected as is. Would "
-+"you like me to unlink it and then correct it?"
-+msgstr "%.50s 包含一个翻转的引用。此处无法更正。你想要取消链接,然后纠正吗?"
-+
- #, c-format
- msgid "%1$.30s string for %2$.30s"
- msgstr "%1$.30s 字符串向 %2$.30s"
-@@ -218,7 +231,7 @@ msgstr ""
- 
- #, c-format
- msgid "%s No Slope"
--msgstr "%s没有范围"
-+msgstr "%s 无斜率"
- 
- #, c-format
- msgid "%s anchor %d"
-@@ -391,6 +404,12 @@ msgstr "(未指定) SIL Graphite 规则表"
- msgid ") while in %s it is ("
- msgstr ") 但在 %s为 ("
- 
-+msgid "* Cap Widt_h"
-+msgstr "* 端头宽度(_H)"
-+
-+msgid "* Nib _Span"
-+msgstr "* 笔尖跨度(_S)"
-+
- msgid "100 Thin"
- msgstr "100 超细体"
- 
-@@ -568,12 +587,28 @@ msgstr "<无>"
- msgid "<undefined>"
- msgstr "<未定义>"
- 
-+msgid ""
-+"A Convex nib will also be rotated by this amount\n"
-+"although this is not displayed in the dialog."
-+msgstr ""
-+"尽量该量未显示于对话框内,\n"
-+"凸形笔尖亦将按该量旋转。"
-+
- msgid "A Font Family name is required"
- msgstr "需要字体集名称"
- 
- msgid "A PostScript name may not be a number"
- msgstr "PostScript名称不可以用数字"
- 
-+msgid ""
-+"A calligraphic pen or an elliptical pen has two widths\n"
-+"(which may be the same, giving a circular or square pen,\n"
-+"or different giving an elliptical or rectangular pen)."
-+msgstr ""
-+"书法笔或椭圆笔有两个宽度\n"
-+"(可相同,得到圆形或正方形笔;\n"
-+"或不同,得到椭圆形或矩形笔)。"
-+
- msgid "A coverage table:"
- msgstr "范围表:"
- 
-@@ -655,6 +690,9 @@ msgstr "AGL 无 afii"
- msgid "AMS Names"
- msgstr "AMS名称"
- 
-+msgid "A_dd Extrema"
-+msgstr "增添极值点(_D)"
-+
- msgid "A_lign"
- msgstr "对齐(_L)"
- 
-@@ -710,10 +748,10 @@ msgid "Add"
- msgstr "添加"
- 
- msgid "Add 'D_FLT' script"
--msgstr "添加 'D_FLT' 脚本"
-+msgstr "添加 'D_FLT' 文字"
- 
- msgid "Add All Extrema"
--msgstr "添加全部极点"
-+msgstr "添加全部极值"
- 
- msgid "Add Anchor"
- msgstr "增加锚点"
-@@ -728,7 +766,7 @@ msgid "Add E_ncoding Name..."
- msgstr "增加编码名(_N)…"
- 
- msgid "Add E_xtrema"
--msgstr "增加极点(_X)"
-+msgstr "添加极值(_X)"
- 
- msgid "Add Encoding Name..."
- msgstr "增加编码…"
-@@ -743,7 +781,7 @@ msgid "Add Exit Anchor..."
- msgstr "增加已有锚点..."
- 
- msgid "Add Good Extrema"
--msgstr "添加好极点"
-+msgstr "增添良极值"
- 
- msgid "Add Language to Script..."
- msgstr "添加语言到文字..."
-@@ -764,6 +802,9 @@ msgstr "增加标记锚点..."
- msgid "Add OFL"
- msgstr "添加 OFL"
- 
-+msgid "Add Points Of I_nflection"
-+msgstr "添加拐点(_I)"
-+
- msgid "Add Sub_table"
- msgstr "添加子表(_T)"
- 
-@@ -780,7 +821,7 @@ msgid "Add _Missing Glyphs"
- msgstr "添加缺失字形(_M)"
- 
- msgid "Add _Small Capitals..."
--msgstr "添加小大写(_S)..."
-+msgstr "添加小型大写(_S)..."
- 
- msgid "Add a corner point"
- msgstr "增加拐点"
-@@ -824,6 +865,9 @@ msgstr "为选中字形中的各对字形添加字偶距信息"
- msgid "Adding points at Extrema..."
- msgstr "在极值处增加点..."
- 
-+msgid "Adding points of inflection..."
-+msgstr "增添拐点..."
-+
- msgid "Additional arguments for autotrace program:"
- msgstr "autotrace 附加参数:"
- 
-@@ -846,12 +890,25 @@ msgstr ""
- msgid "Adlam"
- msgstr "阿德拉姆文"
- 
-+msgid "Adobe"
-+msgstr "Adobe"
-+
- msgid "Adobe Glyph List"
- msgstr "Adobe 字形列表"
- 
- msgid "Adobe Standard"
- msgstr "Adobe标准"
- 
-+msgid ""
-+"Adobe says that \"big\" splines should not have extrema.\n"
-+"But they don't define what big means.\n"
-+"If the distance between the spline's end-points is bigger than this value, "
-+"then the spline is \"big\" to fontforge."
-+msgstr ""
-+"Adobe 认为大样条不应有极值。\n"
-+"但其未定义上述“大”的意义。\n"
-+"若样条端点间距大于此值,Fontforge 即认其为“大”样条。"
-+
- msgid ""
- "Adobe's fontname spec (5088.FontNames.pdf) says that fontnames should not be "
- "longer than 29 characters. Do you want to continue anyway?"
-@@ -897,7 +954,7 @@ msgstr "南非语"
- msgid ""
- "After rotating or skewing a glyph you should probably apply Element->Add "
- "Extrema"
--msgstr "旋转或倾斜字形后可能要执行“基础->增加极点”"
-+msgstr "旋转或倾斜字形后可能要执行“基础->增加极值”"
- 
- msgid "Ahead Classes"
- msgstr "向前类属"
-@@ -911,6 +968,9 @@ msgstr "阿尔巴尼亚语"
- msgid "Alchemical Symbols"
- msgstr "冶金符号"
- 
-+msgid "Align Points"
-+msgstr "对齐点"
-+
- msgid "Align:"
- msgstr "对齐:"
- 
-@@ -929,6 +989,10 @@ msgstr "所有字形"
- msgid "All characters in the value must be in ASCII"
- msgstr "取值字符均应为ASCII码"
- 
-+#, c-format
-+msgid "All entries in a lookup must have the same type on line %d of %s"
-+msgstr "查找中的所有条目在 %2$s 的第 %1$d 行中必须具有相同的类型"
-+
- msgid "All glyphs"
- msgstr "所有字形"
- 
-@@ -948,7 +1012,7 @@ msgid "Allow _curve smoothing"
- msgstr "允许曲线平滑(_C)"
- 
- msgid "Allow _removal of extrema"
--msgstr "允许移除极点(_R)"
-+msgstr "允许移除极值(_R)"
- 
- msgid "Allow _slopes to change"
- msgstr "允许倾斜改变(_S)"
-@@ -960,7 +1024,7 @@ msgid "Allow:"
- msgstr "允许:"
- 
- msgid "Almost H/V Color"
--msgstr "差不多水平或垂直的颜色"
-+msgstr "近水平/近垂直颜色"
- 
- msgid "Almost Horizontal/Vertical Curves"
- msgstr "几乎水平或垂直的曲线"
-@@ -1092,8 +1156,11 @@ msgstr "角度:"
- msgid "Anti-Alias"
- msgstr "抗锯齿"
- 
-+msgid "Appea_rance Editor..."
-+msgstr "外观选项(_R)..."
-+
- msgid "Appearance Editor"
--msgstr "外观选项"
-+msgstr "外观编辑器(_R)..."
- 
- msgid "Append a FONTLOG entry"
- msgstr "添加FONTLOG信息项"
-@@ -1243,14 +1310,27 @@ msgid "Arabic Right to Left"
- msgstr "阿拉伯文从右到左"
- 
- msgid "Arabic Supplement"
--msgstr "Arabic增补"
-+msgstr "阿拉伯文补充"
- 
- msgid "Archives"
- msgstr "包"
- 
-+msgid "Arcs"
-+msgstr "圆弧"
-+
-+msgid "Arcs Clip:"
-+msgstr "圆弧裁剪:"
-+
- msgid "Are you sure you don't want to use the cidmap I found?"
- msgstr "确定不用我找到的cidmap文件?"
- 
-+msgid ""
-+"Are you sure you want to replace Å?\n"
-+"The ring will not join to the A."
-+msgstr ""
-+"您确定要替换 Å 吗?\n"
-+"环不会加入 A。"
-+
- msgid ""
- "Are you sure you wish to remove these glyphs? This operation cannot be "
- "undone."
-@@ -1414,7 +1494,7 @@ msgid "Automatic"
- msgstr "自动"
- 
- msgid "Autot_race"
--msgstr "自动循迹(_R)"
-+msgstr "自动描边(_R)"
- 
- msgid "AutotraceArgs"
- msgstr "Autotrace参数"
-@@ -1456,7 +1536,7 @@ msgid "Axis Type:"
- msgstr "轴类型:"
- 
- msgid "Axis height of the font"
--msgstr "字体数轴高"
-+msgstr "字体轴高"
- 
- msgid "Axis range not valid"
- msgstr "轴域不可用"
-@@ -1486,6 +1566,9 @@ msgstr "BDF分辨率"
- msgid "BDF bitmap properties table"
- msgstr "BDF 位图属性表"
- 
-+msgid "B_evel"
-+msgstr "截角(_E)"
-+
- msgid "B_uild"
- msgstr "生成(_U)"
- 
-@@ -1627,7 +1710,7 @@ msgid "Bad Lig. Caret Count"
- msgstr "不良连写位计数"
- 
- msgid "Bad MM Weights"
--msgstr "字体集粗细不良"
-+msgstr "多母版字重不良"
- 
- msgid "Bad Mac Family"
- msgstr "不良Mac字族"
-@@ -1636,7 +1719,7 @@ msgid "Bad Metrics"
- msgstr "不良尺寸"
- 
- msgid "Bad Multiple Master Font"
--msgstr "不良的多母版字体"
-+msgstr "不良的多重母版字体"
- 
- msgid "Bad Name"
- msgstr "不良名称"
-@@ -1909,11 +1992,14 @@ msgstr "不良类型"
- msgid "Bad xfig file"
- msgstr "不良 xfig 文件"
- 
-+msgid "Balancing..."
-+msgstr "正在平衡..."
-+
- msgid "Balinese"
- msgstr "巴厘文"
- 
- msgid "Ball (Round Cap)"
--msgstr "圆球(圆头)"
-+msgstr "圆球(圆头)"
- 
- msgid "Bamum"
- msgstr "巴姆穆文"
-@@ -1982,7 +2068,7 @@ msgid "Batak"
- msgstr "巴塔克文"
- 
- msgid "Be_vel"
--msgstr "伞形(_V)"
-+msgstr "截角(_V)"
- 
- msgid "Begin:"
- msgstr "起点:"
-@@ -2055,6 +2141,9 @@ msgstr "位图部件\n"
- msgid "Bitmap Strikes Available"
- msgstr "可用位图部件"
- 
-+msgid "Bitmap View"
-+msgstr "位图视图"
-+
- msgid "Bitmap _Magnification..."
- msgstr "位图缩放(_M)..."
- 
-@@ -2097,6 +2186,9 @@ msgstr "粗体"
- msgid "Bold Italic"
- msgstr "粗斜体"
- 
-+msgid "Bold font used in the Find/Replace window"
-+msgstr "查找/替换窗口中使用的粗体"
-+
- msgid "Bone"
- msgstr "骨"
- 
-@@ -2104,7 +2196,7 @@ msgid "Book"
- msgstr "书体"
- 
- msgid "Bookmark Current Dir"
--msgstr "标记当前方向"
-+msgstr "将当前目录加入书签"
- 
- msgid "Bookmarks"
- msgstr "标记"
-@@ -2136,6 +2228,9 @@ msgstr "边框"
- msgid "Bosnian"
- msgstr "爱沙尼亚语"
- 
-+msgid "Both"
-+msgstr "两者"
-+
- msgid "Both points must be specified, or neither"
- msgstr "两点须都指定或都不指定"
- 
-@@ -2230,7 +2325,7 @@ msgid "Building duplicate encodings"
- msgstr "生成重复编码"
- 
- msgid "Building small capitals"
--msgstr "生成小大写"
-+msgstr "生成小型大写"
- 
- msgid "Building sub/superscripts"
- msgstr "生成上下标"
-@@ -2253,12 +2348,18 @@ msgstr "按钮"
- msgid "By Classes"
- msgstr "按类属"
- 
-+msgid "By Con_tour"
-+msgstr "按轮廓线(_T)"
-+
- msgid "By Coverage"
- msgstr "按范围"
- 
- msgid "By Glyphs"
- msgstr "按字形"
- 
-+msgid "By La_yer"
-+msgstr "按层(_Y)"
-+
- msgid "By _Scripts"
- msgstr "按手写体(_S)"
- 
-@@ -2294,8 +2395,8 @@ msgstr "CID字符标识名称"
- 
- msgid "CJK (& Ext A/B) & CJK Radicals Sup & Kangxi & IDC & Kanbun"
- msgstr ""
--"中日韩表意文字基本区 (& 扩展 A/B) & 中日韩部首补充 & 康熙部首 & 表意文字描述"
--"符 & 汉文训读"
-+"中日韩表意文字基本区(及扩展 A/B)、中日韩部首补充、康熙部首、表意文字描述"
-+"符、汉文训读"
- 
- msgid "CJK Compatibility"
- msgstr "中日韩兼容字符"
-@@ -2354,6 +2455,9 @@ msgstr "中日韩统一表意文字扩展 F"
- msgid "CJK Unified Ideographs Extension G"
- msgstr "中日韩统一表意文字扩展 G"
- 
-+msgid "CJK Unified Ideographs Extension H"
-+msgstr "中日韩统一表意文字扩展 H"
-+
- msgid "CS Clarendon"
- msgstr "CS粗长体"
- 
-@@ -2396,6 +2500,9 @@ msgstr "清除(_L)"
- msgid "C_lasses"
- msgstr "类属(_L)"
- 
-+msgid "C_lear"
-+msgstr "清除(_L)"
-+
- msgid "C_lose Tab"
- msgstr "关闭(_C)页"
- 
-@@ -2411,6 +2518,9 @@ msgstr "角(_O)"
- msgid "C_ustom"
- msgstr "自定义(_U)"
- 
-+msgid "Ca_lligraphic (Rectangular)"
-+msgstr "书法(矩形)(_L)"
-+
- msgid "Call Script"
- msgstr "调用脚本"
- 
-@@ -2541,16 +2651,16 @@ msgid "Canonical Start _Point"
- msgstr "标准起点(_P)"
- 
- msgid "Canonical _Contours"
--msgstr "正则轮廓(_C)"
-+msgstr "正则轮廓线(_C)"
- 
- msgid "Capital Spacing"
- msgstr "大写间隔"
- 
- msgid "Capitals to Petite Capitals"
--msgstr "大写到袖珍大写"
-+msgstr "大写到微型大写"
- 
- msgid "Capitals to Small Capitals"
--msgstr "大写到小大写"
-+msgstr "大写到小型大写"
- 
- msgid "Carian"
- msgstr "加里亚文"
-@@ -2616,7 +2726,7 @@ msgid "Change UniqueID?"
- msgstr "更改UniqueID?"
- 
- msgid "Change Weight"
--msgstr "更改粗细"
-+msgstr "更改字重"
- 
- msgid "Change X-Height"
- msgstr "更改X高"
-@@ -2628,10 +2738,10 @@ msgid "Change _Glyph..."
- msgstr "改变字形(_G)..."
- 
- msgid "Change _Weight..."
--msgstr "更改粗细(_W)..."
-+msgstr "更改字重(_W)..."
- 
- msgid "Change _X-Height..."
--msgstr "更改X高(_X)..."
-+msgstr "更改_x高..."
- 
- msgid "Change whether spiro is active or not"
- msgstr "切换spiro"
-@@ -2973,7 +3083,7 @@ msgid "Check _flipped references"
- msgstr "检查翻转参照(_f)"
- 
- msgid "Check _missing extrema"
--msgstr "检查缺失极点(_M)"
-+msgstr "检查缺失极值(_M)"
- 
- msgid "Check _outermost paths clockwise"
- msgstr "检查顺时针方向最外边的路径"
-@@ -3151,6 +3261,9 @@ msgstr "清除设备表"
- msgid "Clear Instructions"
- msgstr "清除指令"
- 
-+msgid "Clear Special Data"
-+msgstr "清除特殊数据"
-+
- msgid "Clear _Background"
- msgstr "清除背景(_B)"
- 
-@@ -3192,10 +3305,10 @@ msgid "Cloc_kwise"
- msgstr "顺时针(_K)"
- 
- msgid "Close Open Contours"
--msgstr "关闭所有已打开的轮廓"
-+msgstr "闭合开放的轮廓线"
- 
- msgid "Co_py LBearing"
--msgstr "复制左边位(_p)"
-+msgstr "复制左边位(_P)"
- 
- msgid "Collage"
- msgstr "拼贴画"
-@@ -3305,7 +3418,7 @@ msgid "Compare Layers"
- msgstr "比较层"
- 
- msgid "Compare Layers..."
--msgstr "比较层…"
-+msgstr "比较图层…"
- 
- msgid "Compare _Bitmaps"
- msgstr "比较位图(_B)"
-@@ -3372,6 +3485,12 @@ msgstr "配置"
- msgid "Conflict Hint Color"
- msgstr "冲突渲调提示颜色"
- 
-+msgid "Conjunct Form After Ro"
-+msgstr "Ro 后的连结形式"
-+
-+msgid "Conjunct Forms"
-+msgstr "连结形式"
-+
- msgid "Connectors"
- msgstr "连接"
- 
-@@ -3420,6 +3539,9 @@ msgstr "关联替代"
- msgid "Continue"
- msgstr "继续"
- 
-+msgid "Contours (from closed):"
-+msgstr "轮廓线(从闭合的):"
-+
- msgid "Control Pictures"
- msgstr "控制图片"
- 
-@@ -3432,6 +3554,9 @@ msgstr "控制点临近水平/垂直/倾斜"
- msgid "ControlPoint|Default"
- msgstr "默认"
- 
-+msgid "Conve_x (Polygonal)"
-+msgstr "凸形(多边形)(_X)"
-+
- msgid "Convert By C_Map"
- msgstr "由CMap转换(_M)"
- 
-@@ -3469,7 +3594,7 @@ msgid "Copy Loo_kup Data"
- msgstr "复制查找数据(_K)"
- 
- msgid "Copy RBearin_g"
--msgstr "复制右边位(_g)"
-+msgstr "复制右边位(_G)"
- 
- msgid "Copy _Fg To Bg"
- msgstr "复制前景到背景(_F)"
-@@ -3512,7 +3637,7 @@ msgid "Corporate Use"
- msgstr "企业应用"
- 
- msgid "Correct Direction"
--msgstr "正确方向"
-+msgstr "修正方向"
- 
- msgid "Correct References"
- msgstr "修正参考"
-@@ -3589,7 +3714,7 @@ msgstr "未能打开头文件(%s)于行 %d (%s中)"
- 
- #, c-format
- msgid "Could not open output file: %s"
--msgstr "未能打开输出文件: %s"
-+msgstr "未能打开输出文件:%s"
- 
- msgid "Could not open temporary file."
- msgstr "无法打开临时文件。"
-@@ -3603,7 +3728,7 @@ msgid "Could not read %s"
- msgstr "不能读 %s"
- 
- msgid "Could not read (or perhaps find) mf output file"
--msgstr "未能读(或未找到)mf输出文件"
-+msgstr "无法读取(或找到)mf输出文件"
- 
- msgid "Could not write"
- msgstr "未能写入"
-@@ -3703,7 +3828,7 @@ msgid "Cr_eate"
- msgstr "新建(_E)"
- 
- msgid "Cr_eate VHint..."
--msgstr "创建垂直渲调提示(_T)…"
-+msgstr "创建垂直渲调提示(_E)…"
- 
- msgid "Cre_ate Named Glyphs..."
- msgstr "创建命名字形(_A)…"
-@@ -3718,10 +3843,10 @@ msgid "Create Horizontal Stem Hint"
- msgstr "创建水平字干渲调"
- 
- msgid "Create MM"
--msgstr "创建字体集"
-+msgstr "创建多母版"
- 
- msgid "Create Small Caps"
--msgstr "创建小大写"
-+msgstr "创建小型大写"
- 
- msgid "Create Subscript/Superscript"
- msgstr "创建上下标"
-@@ -3872,6 +3997,9 @@ msgstr "西里尔文扩展 B"
- msgid "Cyrillic Extended-C"
- msgstr "西里尔文扩展 C"
- 
-+msgid "Cyrillic Extended-D"
-+msgstr "西里尔文扩展 D"
-+
- msgid "Cyrillic Supplement"
- msgstr "西里尔文补充"
- 
-@@ -4063,13 +4191,13 @@ msgid "Designer URL"
- msgstr "设计师网址"
- 
- msgid "Design|_New..."
--msgstr "新建(_N)…"
-+msgstr "设计|新建(_N)…"
- 
- msgid "Desired X-Height"
- msgstr "预期X高度"
- 
- msgid "Desired x-height:"
--msgstr "期望X高度:"
-+msgstr "所需的 x 高度:"
- 
- msgid "Detach & Remo_ve Glyphs..."
- msgstr "分离及移除字形(_V)…"
-@@ -4092,6 +4220,9 @@ msgstr "天城文(梵文)"
- msgid "Devanagari Extended"
- msgstr "天城体扩展"
- 
-+msgid "Devanagari Extended-A"
-+msgstr "梵文扩展 A"
-+
- msgid "Device Table Adjustments"
- msgstr "设备表调整"
- 
-@@ -4130,8 +4261,47 @@ msgstr "差异..."
- msgid "Different Fonts"
- msgstr "不同字体"
- 
-+#, c-format
-+msgid "Different fill patterns in layer %d of %s\n"
-+msgstr "%2$s 的 %1$d 层中的不同填充图案\n"
-+
-+#, c-format
-+msgid "Different number of contours in glyph “%s”\n"
-+msgstr "字形“%s”中有不同数量的轮廓线\n"
-+
-+#, c-format
-+msgid "Different settings on whether to fill in layer %d of %s\n"
-+msgstr "是否在 %2$s 的 %1$d 层中填充的不同设置\n"
-+
-+#, c-format
-+msgid "Different settings on whether to inherit fill color in layer %d of %s\n"
-+msgstr "是否在 %2$s 的 %1$d 层中继承填充颜色的不同设置\n"
-+
-+#, c-format
-+msgid ""
-+"Different settings on whether to inherit fill opacity in layer %d of %s\n"
-+msgstr "是否在 %2$s 的 %1$d 层中继承填充不透明度的不同设置\n"
-+
-+#, c-format
-+msgid ""
-+"Different settings on whether to inherit stroke opacity in layer %d of %s\n"
-+msgstr "是否在 %2$s 的 %1$d 层中继承笔划不透明度的不同设置\n"
-+
-+#, c-format
-+msgid ""
-+"Different settings on whether to inherit stroke width in layer %d of %s\n"
-+msgstr "是否在 %2$s 的 %1$d 层中继承笔划宽度的不同设置\n"
-+
-+#, c-format
-+msgid "Different settings on whether to stroke in layer %d of %s\n"
-+msgstr "是否在 %2$s 的 %1$d 层中描边的不同设置\n"
-+
-+#, c-format
-+msgid "Different stroke patterns in layer %d of %s\n"
-+msgstr "%2$s 的 %1$d 层中的不同笔划图案\n"
-+
- msgid "Dingbats"
--msgstr "Dingbats 英文字符"
-+msgstr "装饰符号"
- 
- msgid "Diphthongs (Obsolete)"
- msgstr "双元音(已停用)"
-@@ -4507,6 +4677,10 @@ msgstr "字形顺序"
- msgid "End of file found in JSTF table.\n"
- msgstr "JSTF表中找到文件结束符号。\n"
- 
-+#, c-format
-+msgid "End of file found in string on line %d of %s"
-+msgstr "在 %2$s 的第 %1$d 行的字符串中找到文件结尾"
-+
- #, c-format
- msgid "End of file in %s table"
- msgstr " %s 表中文件结束符号"
-@@ -4607,7 +4781,7 @@ msgid "Estonian"
- msgstr "爱沙尼亚语"
- 
- msgid "Ethiopic"
--msgstr "埃塞尔比亚文"
-+msgstr "埃塞俄比亚文"
- 
- msgid "Ethiopic Extended"
- msgstr "埃塞额比亚文扩展"
-@@ -4619,7 +4793,7 @@ msgid "Ethiopic Extended-B"
- msgstr "吉兹文扩展 B"
- 
- msgid "Ethiopic Supplement"
--msgstr "Ethiopic增补"
-+msgstr "埃塞俄比亚文补充"
- 
- msgid "European Number"
- msgstr "欧洲数字"
-@@ -4674,6 +4848,14 @@ msgstr "加宽"
- msgid "Expanded (125%)"
- msgstr "加宽至125%"
- 
-+#, c-format
-+msgid "Expected %s in lookup definition on line %d of %s"
-+msgstr "在 %3$s 的第 %2$d 行的查找定义中需要 %1$s"
-+
-+#, c-format
-+msgid "Expected '%c%c%c%c' in lookup definition on line %d of %s"
-+msgstr "在 %6$s 的第 %5$d 行的查找定义中需要“%1$c%2$c%3$c%4$c”"
-+
- #, c-format
- msgid "Expected '%c' on line %d of %s"
- msgstr "需要'%c' 于行 %d (%s中)"
-@@ -4684,15 +4866,15 @@ msgstr "需要'%s' 于行 %d (%s中)"
- 
- #, c-format
- msgid "Expected ';' at statement end on line %d of %s"
--msgstr "期望有';'在句末于行%d (%s)"
-+msgstr "预期的 ';' 在 %2$s 的第 %1$d 行语句结束"
- 
- #, c-format
- msgid "Expected ';' in lookupflags on line %d of %s"
--msgstr "期望有';'  查找标记于行%d (%s)"
-+msgstr "预期的 ';' 在 %2$s 的第 %1$d 行的 lookupflags 中"
- 
- #, c-format
- msgid "Expected ';' on line %d of %s"
--msgstr "期望';'于行%d (%s)"
-+msgstr "预期的 ';' 在第 %d 行,共 %s"
- 
- #, c-format
- msgid "Expected '=' in glyph class definition on line %d of %s"
-@@ -4700,11 +4882,11 @@ msgstr "在第 %d 行( %s )的字图类定义需要有'['"
- 
- #, c-format
- msgid "Expected '>' in anchor on line %d of %s"
--msgstr "期望有'>'  于行%d (%s)"
-+msgstr "在 %2$s 的第 %1$d 行的锚点中需要“>”"
- 
- #, c-format
- msgid "Expected '>' in caret on line %d of %s"
--msgstr "期望有'>'  于行%d (%s)"
-+msgstr "在 %2$s 的第 %1$d 行的插入符号中应为“>”"
- 
- #, c-format
- msgid "Expected '>' in value record on line %d of %s"
-@@ -4732,7 +4914,11 @@ msgstr "%2$s 的第 %1$d 行的特征定义中应为“{”"
- 
- #, c-format
- msgid "Expected '}' on line %d of %s"
--msgstr "期望'}'于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行应为“}”"
-+
-+#, c-format
-+msgid "Expected Attach or LigatureCaret or GlyphClassDef on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行需要 Attach 或 LigatureCaret 或 GlyphClassDef"
- 
- #, c-format
- msgid "Expected a single glyph name in reverse substitution on line %d of %s"
-@@ -4750,10 +4936,20 @@ msgstr "预期在 %2$s 的第 %1$d 行有一个锚点(在基础/标记之后
- msgid "Expected an anchor (after ligature) on line %d of %s"
- msgstr "预期在 %2$s 的第 %1$d 行有一个锚点(连字后)"
- 
-+#, c-format
-+msgid ""
-+"Expected an integer specifying baseline positions in BASE table on line %d "
-+"of %s"
-+msgstr "需要一个整数,用于指定 BASE 表中第 %d 行(共 %s)的基线位置"
-+
- #, c-format
- msgid "Expected anchor in mark class definition on line %d of %s"
- msgstr "%2$s 的第 %1$d 行上的标记类定义中的预期锚点"
- 
-+#, c-format
-+msgid "Expected baseline tag in BASE table on line %d of %s"
-+msgstr "%2$s 行 %1$d 上的 BASE 表中的预期基线标记"
-+
- msgid ""
- "Expected boolean value.\n"
- "(\"true\" or \"false\")"
-@@ -4763,15 +4959,32 @@ msgstr ""
- 
- #, c-format
- msgid "Expected class name in mark class definition on line %d of %s"
--msgstr "期望类属名称于标记类属定义的行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行标记类定义中的预期类名"
- 
- #, c-format
- msgid "Expected class on line %d of %s"
--msgstr "期望类属于行%d (%s)"
-+msgstr "%2$s 行 %1$d 上应为类"
-+
-+#, c-format
-+msgid "Expected closing curly brace on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行需要右大括号"
- 
- #, c-format
- msgid "Expected comma in device table on line %d of %s"
--msgstr "期望有设备表中有逗号, 于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行设备表中应有逗号"
-+
-+#, c-format
-+msgid "Expected comma or semicolon in BASE table on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行的 BASE 表中需要逗号或分号"
-+
-+#, c-format
-+msgid "Expected comma or semicolon on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行需要逗号或分号"
-+
-+#, c-format
-+msgid ""
-+"Expected either \"HorizAxis\" or \"VertAxis\" in BASE table on line %d of %s"
-+msgstr "在 %2$s 的第 %1$d 行的 BASE 表中应为“HorizAxis”或“VertAxis”"
- 
- #, c-format
- msgid ""
-@@ -4792,7 +5005,7 @@ msgstr "在第 %d 行( %s)中的锚点需要有整数"
- 
- #, c-format
- msgid "Expected integer in caret on line %d of %s"
--msgstr "期望光标为整数于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行插入符号中的预期整数"
- 
- #, c-format
- msgid "Expected integer in device table on line %d of %s"
-@@ -4800,23 +5013,31 @@ msgstr "在第行%d (%s) 上的设备表中应该有整数"
- 
- #, c-format
- msgid "Expected integer on line %d of %s"
--msgstr "期望整数于行%d (%s)"
-+msgstr "%2$s 行 %1$d 上的预期整数"
-+
-+#, c-format
-+msgid "Expected integer or list of integers after %s on line %d of %s"
-+msgstr "在 %s 的第 %d 行的 %s 之后需要整数或整数列表"
-+
-+#, c-format
-+msgid "Expected matching tag in table on line %d of %s"
-+msgstr "表中第 %d 行(共 %s)的预期匹配标记"
- 
- #, c-format
- msgid "Expected name in anchor definition on line %d of %s"
--msgstr "期望锚点定义名称, 于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行锚点定义中的预期名称"
- 
- #, c-format
- msgid "Expected name in lookup on line %d of %s"
--msgstr "期望名称于行%d (%s)"
-+msgstr "在 %2$s 的第 %1$d 行查找中需要名称"
- 
- #, c-format
- msgid "Expected name in value record definition on line %d of %s"
--msgstr "期望在记录中的第%d行第%s列定义了名称"
-+msgstr "%2$s 的第 %1$d 行值记录定义中的预期名称"
- 
- #, c-format
- msgid "Expected name or class on line %d of %s"
--msgstr "期望名称或类属于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行需要名称或类"
- 
- msgid "Expected number."
- msgstr "需要数字。"
-@@ -4824,21 +5045,33 @@ msgstr "需要数字。"
- msgid "Expected property list file"
- msgstr "需要属性列表文件"
- 
-+#, c-format
-+msgid "Expected semicolon in BASE table on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行的 BASE 表中需要分号"
-+
- #, c-format
- msgid "Expected semicolon on line %d of %s"
--msgstr "期望分号于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行需要分号"
- 
- #, c-format
- msgid "Expected string on line %d of %s"
--msgstr "期望字符串于行%d (%s)"
-+msgstr "%2$s 的第 %1$d 行需要字符串"
-+
-+#, c-format
-+msgid "Expected tag in feature on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行功能中的预期标记"
- 
- #, c-format
- msgid "Expected tag in languagesystem on line %d of %s"
- msgstr "在第%d行(%s) 的语言系统应有标签"
- 
-+#, c-format
-+msgid "Expected tag in table on line %d of %s"
-+msgstr "表中第 %d 行(共 %s)的预期标记"
-+
- #, c-format
- msgid "Expected tag on line %d of %s"
--msgstr "期望标签于行%d (%s)"
-+msgstr "%2$s 行 %1$d 上的预期标记"
- 
- #, c-format
- msgid "Expected two anchors (after cursive) on line %d of %s"
-@@ -4863,6 +5096,9 @@ msgstr "导出"
- msgid "Exten Shapes"
- msgstr "扩展形状"
- 
-+msgid "Extend Cap:"
-+msgstr "延伸端头:"
-+
- msgid "Extend Lookups Off"
- msgstr "扩展查找关"
- 
-@@ -4896,10 +5132,13 @@ msgstr "扩展"
- msgid "Extent"
- msgstr "扩展"
- 
-+msgid "External Only"
-+msgstr "仅外部"
-+
- #. GT: Extra Space, see below for a full comment
- #. GT: Extra Space
- msgid "Extra Sp:"
--msgstr "空位:"
-+msgstr "额外空位:"
- 
- msgid "Extra-Condensed (62.5%)"
- msgstr "压缩至62.5%"
-@@ -4929,7 +5168,7 @@ msgid "FS Modern"
- msgstr "FS现代"
- 
- msgid "F_ind / Replace..."
--msgstr "查找(_I) / 替换…"
-+msgstr "查找/替换(_I)…"
- 
- #. GT: Foreground, make it short
- msgid "F_ore"
-@@ -4954,7 +5193,7 @@ msgstr "从%s载入压缩数据失败"
- 
- #, c-format
- msgid "Failed to open %s for output"
--msgstr "未能打开 %s 作输出"
-+msgstr "未能打开用于输出的%s"
- 
- #, c-format
- msgid "Failed to open file %s for output"
-@@ -4991,7 +5230,7 @@ msgid "FamilyBl_ues"
- msgstr "字族蓝值(_U)"
- 
- msgid "Faroese (Icelandic)"
--msgstr "Faroese(冰岛语)"
-+msgstr "法罗语(冰岛语)"
- 
- msgid "Feature"
- msgstr "特性"
-@@ -5023,6 +5262,12 @@ msgstr "特性标签将被删除"
- msgid "Features"
- msgstr "特征"
- 
-+#, c-format
-+msgid ""
-+"Features inside of other features are only permitted for 'aalt' features on "
-+"line %d of %s"
-+msgstr "其他功能中的功能仅允许用于 %2$s 的第 %1$d 行的“aalt”功能"
-+
- msgid "Fi_ll"
- msgstr "填充(_L)"
- 
-@@ -5126,7 +5371,7 @@ msgid "First Glyph Name"
- msgstr "首字形名称"
- 
- msgid "First P_oint, Next Contour"
--msgstr "第一点,下一曲线(_O)"
-+msgstr "第一点,下一轮廓线(_O)"
- 
- msgid "First Point Color"
- msgstr "第一点颜色"
-@@ -5149,9 +5394,15 @@ msgstr "闪光的"
- msgid "Flat"
- msgstr "平整"
- 
-+msgid "Flat Nib"
-+msgstr "扁平笔尖"
-+
- msgid "Flate decompression failed.\n"
- msgstr "解压缩失败。\n"
- 
-+msgid "Flemish"
-+msgstr "弗拉芒荷兰语"
-+
- msgid "Flemish (Belgian Dutch)"
- msgstr "弗拉芒语(比利时荷兰)"
- 
-@@ -5197,7 +5448,7 @@ msgid ""
- "Do you want to save it?"
- msgstr ""
- "字体 %1$.40s (文件 %2$.40s) 已改变。\n"
--"要保存么?"
-+"要保存吗?"
- 
- #, c-format
- msgid ""
-@@ -5248,6 +5499,14 @@ msgstr "字体:"
- msgid "FontForge"
- msgstr "FontForge"
- 
-+#, c-format
-+msgid "FontForge does not support anonymous tables on line %d of %s"
-+msgstr "FontForge 不支持第 %d 行的匿名表,共 %s"
-+
-+#, c-format
-+msgid "FontForge does not support this bit depth %d (must be 1,2,4,8,16,32)\n"
-+msgstr "FontForge不支持%d位深度(必须为1,2,4,8,16,32)\n"
-+
- msgid "FontForge font debugging table"
- msgstr "FontForge 字体调试表"
- 
-@@ -5334,7 +5593,7 @@ msgstr "格式:"
- 
- #, c-format
- msgid "Found %1$.4g, expected %2$.4g"
--msgstr "发现 %1$.4g, 期望 %2$.4g"
-+msgstr "已找到 %1$.4g,预期为 %2$.4g"
- 
- msgid "FoundryName"
- msgstr "制作工具"
-@@ -5530,7 +5789,7 @@ msgid "Generate Mac Family"
- msgstr "生成Mac字族"
- 
- msgid "Generate Mac _Family..."
--msgstr "生成Mac族(_F)…"
-+msgstr "生成Mac字体家族(_F)…"
- 
- msgid "Generate TTC..."
- msgstr "生成TTC…"
-@@ -5757,6 +6016,23 @@ msgstr "字形 “%s” 不同\n"
- msgid "Glyph “%s” differs at %d@%d\n"
- msgstr "字形 “%s” 不同于 %d@%d\n"
- 
-+#, c-format
-+msgid ""
-+"Glyph “%s” does not have splines which match exactly, but they are close\n"
-+msgstr "字形“%s”没有完全匹配的样条线,但已经接近了\n"
-+
-+#, c-format
-+msgid "Glyph “%s” has a different fill in layer %d\n"
-+msgstr "字形 “%s” 在%d图层中有不同的填充\n"
-+
-+#, c-format
-+msgid "Glyph “%s” has a different number of layers\n"
-+msgstr "字形 “%s” 有不同的图层数量。\n"
-+
-+#, c-format
-+msgid "Glyph “%s” has a different stroke in layer %d\n"
-+msgstr "字形 “%s”在%d图层中有不同的笔划\n"
-+
- #, c-format
- msgid "Glyph “%s” missing from %s\n"
- msgstr "字形“%s” 不在 %s 中\n"
-@@ -5811,6 +6087,15 @@ msgstr ""
- "字形将由线组成而非可填充的轮廓。\n"
- "所有字形的线宽为"
- 
-+msgid "Glyphs with both"
-+msgstr "两者皆含的字形"
-+
-+msgid "Glyphs with only S_plines"
-+msgstr "仅含样条的字形(_P)"
-+
-+msgid "Glyphs with only _References"
-+msgstr "仅含参照的字形(_R)"
-+
- msgid "Glyphs:"
- msgstr "字形:"
- 
-@@ -5869,7 +6154,7 @@ msgid "Greek and Coptic"
- msgstr "希腊文及科普特文"
- 
- msgid "Greek small caps"
--msgstr "希腊小大写"
-+msgstr "希腊小型大写"
- 
- msgid "Green:"
- msgstr "绿:"
-@@ -5880,6 +6165,9 @@ msgstr "格陵兰语"
- msgid "Grid"
- msgstr "网格"
- 
-+msgid "Grid Color"
-+msgstr "网格颜色"
-+
- msgid "Grid Fi_t"
- msgstr "网格填充(_T)"
- 
-@@ -5972,6 +6260,9 @@ msgstr "HV分组框"
- msgid "H_ints"
- msgstr "渲染调整(_I)"
- 
-+msgid "Halant Forms"
-+msgstr "Halant 形"
-+
- msgid "Half Forms"
- msgstr "半形"
- 
-@@ -6017,9 +6308,18 @@ msgstr "谚文音节"
- msgid "Hanifi Rohingya"
- msgstr "哈尼菲罗兴亚文"
- 
-+msgid "Hanja to Hangul (Deprecated)"
-+msgstr "由朝鲜汉字到朝鲜谚文(已弃用)"
-+
- msgid "Hanunoo"
- msgstr "哈努努奥文"
- 
-+msgid "Harmoni_ze"
-+msgstr "协调(_Z)"
-+
-+msgid "Harmonizing..."
-+msgstr "正在协调..."
-+
- msgid "Has _Vertical Metrics"
- msgstr "有垂直尺寸(_V)"
- 
-@@ -6142,8 +6442,11 @@ msgstr "点击观察点"
- msgid "Hojo (JIS X 0212-1990) Kanji Forms"
- msgstr "JIS X 0212-1990 补助汉字表字形"
- 
-+msgid "Hold [Control] key to restrict"
-+msgstr "按住 [Control] (Ctrl) 键来限制选择"
-+
- msgid "Hold [Shift] key to merge"
--msgstr "按住 [Shift] 键合并"
-+msgstr "按住 [Shift] 键合并选择"
- 
- msgid "Home Folder"
- msgstr "主文件夹"
-@@ -6218,12 +6521,25 @@ msgstr "你想增加多少CID位?"
- msgid "How many unencoded glyph slots do you wish to add?"
- msgstr "你想增加多少未编码的字形位?"
- 
-+msgid "How to align these points?"
-+msgstr "如何对齐这些点?"
-+
- msgid "Hue:"
- msgstr "色调:"
- 
- msgid "Hungarian"
- msgstr "匈牙利语"
- 
-+#, c-format
-+msgid ""
-+"I can't even imagine how to attempt to interpolate gradients in layer %d of "
-+"%s\n"
-+msgstr "我甚至无法想象如何尝试在 %2$s 的 %1$d 层中插入渐变\n"
-+
-+#, c-format
-+msgid "I can't figure out how to compare the subtable, %s, in %s to %s in %s\n"
-+msgstr "无法将在%2$s中的替代表%1$s与%4$s中的替代表%3$s进行比较\n"
-+
- msgid ""
- "I'm sorry this file is too complex for me to understand (or is erroneous)"
- msgstr "抱歉,此文件太复杂,我不能理解。 (它可能有点问题)"
-@@ -6242,7 +6558,7 @@ msgid "I.C."
- msgstr "倾斜修正"
- 
- msgid "IPA Extensions"
--msgstr "国际音标扩展"
-+msgstr "IPA 国际音标扩展"
- 
- msgid "IPA usage"
- msgstr "IPA 用法"
-@@ -6271,6 +6587,11 @@ msgstr "表意文字描述字符"
- msgid "Ideographic Symbols and Punctuation"
- msgstr "表意符号及标点"
- 
-+msgid ""
-+"If the start point of a contour is not an extremum, find a new start point "
-+"(on the contour) which is."
-+msgstr "如果轮廓线的起点不是极值,(在轮廓线上)寻找极值为新的起点。"
-+
- msgid "Ignore"
- msgstr "忽略"
- 
-@@ -6329,6 +6650,24 @@ msgstr "导入查找"
- msgid "In TTF/OTF"
- msgstr "TTF/OTF"
- 
-+#, c-format
-+msgid "In character %s, could not find reference to %s\n"
-+msgstr "在字符 %s 中,找不到对 %s 的引用\n"
-+
-+#, c-format
-+msgid "In character %s, there are too few points on a path in the base\n"
-+msgstr "字符 %s 中,基础路径上的点数太少\n"
-+
-+#, c-format
-+msgid "In character %s, there are too many points on a path in the base\n"
-+msgstr "字符 %s 中,基础路径上的点数太多\n"
-+
-+#, c-format
-+msgid ""
-+"In lookup subtable %.30s you replace a glyph with itself. Was this "
-+"intentional?"
-+msgstr "在查找子表 %.30s 中,有个字形自身替换。特地要如此吗?"
-+
- #. GT: Spoof on the bible
- msgid "In the beginning was the letter..."
- msgstr "开头是字母..."
-@@ -6488,6 +6827,9 @@ msgstr "指令已改变"
- msgid "Intermediate Points:"
- msgstr "中间点:"
- 
-+msgid "Internal Only"
-+msgstr "仅内部"
-+
- msgid "Internal error in creating FNT. File offset wrong\n"
- msgstr "创建FNT时发生内部错误。 文件偏移错误\n"
- 
-@@ -6592,7 +6934,7 @@ msgid "Irish"
- msgstr "爱尔兰语"
- 
- msgid "Irish Gaelic"
--msgstr "盖尔语(爱尔兰)"
-+msgstr "爱尔兰盖尔语"
- 
- msgid "Irish Gaelic (with dot)"
- msgstr "爱尔兰盖尔语 (有修饰点)"
-@@ -6704,6 +7046,9 @@ msgstr "Javanese (罗马字母)"
- msgid "Johab (Korean)"
- msgstr "组合式(韩文Johab)"
- 
-+msgid "Join Limit:"
-+msgstr "连接范围限制:"
-+
- msgid "JoinSnap"
- msgstr "联合捕捉"
- 
-@@ -6719,6 +7064,9 @@ msgstr "对齐的文字"
- msgid "Kaithi"
- msgstr "卡罗须提文"
- 
-+msgid "Kaktovik Numerals"
-+msgstr "卡克托维克数字"
-+
- msgid "Kana Extended-A"
- msgstr "假名扩展 A"
- 
-@@ -6744,11 +7092,14 @@ msgid "Katakana"
- msgstr "日文片假名"
- 
- msgid "Katakana (& Phonetic Extensions)"
--msgstr "片假名(& 语音扩展)"
-+msgstr "片假名(和音标扩展)"
- 
- msgid "Katakana Phonetic Extensions"
- msgstr "片假名音标扩展"
- 
-+msgid "Kawi"
-+msgstr "卡维"
-+
- msgid "Kayah Li"
- msgstr "克耶利文"
- 
-@@ -6809,6 +7160,10 @@ msgstr "字偶距类"
- msgid "Kerning State Machine"
- msgstr "压缩状态机"
- 
-+#, c-format
-+msgid "Kerning between “%s” and %s is %d in %s and %d in %s\n"
-+msgstr "“%1$s”和“%2$s”的字偶距在%4$s为%3$d,在%6$s为%5$d\n"
-+
- #. GT: The %s is the name of the lookup subtable containing this kerning class
- #, c-format
- msgid "Kerning by Classes: %s"
-@@ -6872,7 +7227,7 @@ msgid "LSB Compression Percent"
- msgstr "左边位压缩比例"
- 
- msgid "L_ater"
--msgstr "后来(_A)"
-+msgstr "推后(_A)"
- 
- msgid "L_oad Namelist..."
- msgstr "载入列表(_O)…"
-@@ -6909,7 +7264,7 @@ msgstr "新建语言"
- #. GT: See the long comment at "Property|New"
- #. GT: The msgstr should contain a translation of "Amharic", ignore "Lang|"
- msgid "Lang|Amharic"
--msgstr "Amharic"
-+msgstr "语言|阿姆哈拉语"
- 
- msgid "Lang|Arabic"
- msgstr "阿拉伯语"
-@@ -6943,7 +7298,7 @@ msgstr "波斯语"
- #. GT: See the long comment at "Property|New"
- #. GT: The msgstr should contain a translation of "Farsi/Persian", ignore "Lang|"
- msgid "Lang|Farsi/Persian"
--msgstr "波斯文"
-+msgstr "语言|波斯语"
- 
- msgid "Lang|Ge'ez"
- msgstr "Ge'ez"
-@@ -7061,7 +7416,7 @@ msgid "Latin Ligatures"
- msgstr "拉丁组合字"
- 
- msgid "Latin-1 Supplement"
--msgstr "拉丁一补充"
-+msgstr "拉丁-1增补"
- 
- msgid "Latin: Decorative"
- msgstr "拉丁文:修饰"
-@@ -7090,6 +7445,9 @@ msgstr "背景"
- msgid "Layer|Foreground"
- msgstr "前景"
- 
-+msgid "Leading Jamo Forms"
-+msgstr "朝鲜谚文前导形式"
-+
- msgid ""
- "Learning to use FontForge is easy, and there are various tutorials available "
- "beginning with the basics up to more advanced features such as making and "
-@@ -7202,11 +7560,17 @@ msgid "Line"
- msgstr "线"
- 
- msgid "Line Cap"
--msgstr "线宽"
-+msgstr "线端头"
-+
-+msgid "Line Cap:"
-+msgstr "线端头:"
- 
- msgid "Line Join"
- msgstr "线连接"
- 
-+msgid "Line Join:"
-+msgstr "线连接:"
-+
- msgid "Line length max"
- msgstr "最大线长"
- 
-@@ -7424,10 +7788,10 @@ msgid "Lower Case"
- msgstr "小写"
- 
- msgid "Lowercase to Petite Capitals"
--msgstr "小写到袖珍大写"
-+msgstr "小写到微型大写"
- 
- msgid "Lowercase to Small Capitals"
--msgstr "小写到小大写"
-+msgstr "小写到小型大写"
- 
- msgid "Luxembourgish"
- msgstr "法语(卢森堡公国)"
-@@ -7443,23 +7807,23 @@ msgstr "数学表"
- 
- #. GT: Here (and following) MM means "MultiMaster"
- msgid "MM"
--msgstr "字体集"
-+msgstr "多母版"
- 
- msgid "MM Change Def Weights"
--msgstr "字体集更改默认粗细"
-+msgstr "多母版更改默认字重"
- 
- msgid "MM Change Default _Weights..."
--msgstr "字体集默认粗细(_W)…"
-+msgstr "多母版更改默认字重(_W)..."
- 
- msgid "MM _Info"
--msgstr "字体集信息(_I)"
-+msgstr "多母版信息(_I)"
- 
- msgid "MM _Info..."
- msgstr "字体集信息(_I)…"
- 
- #. GT: Here (and following) MM means "MultiMaster"
- msgid "MM _Reblend"
--msgstr "字体集再混合(_R)"
-+msgstr "多母版再混合(_R)"
- 
- msgid "MM _Validity Check"
- msgstr "字体集校核(_V)"
-@@ -7574,6 +7938,9 @@ msgstr "麻将牌面"
- msgid "Maithili"
- msgstr "米德勒语"
- 
-+msgid "Major Axis (_Width):"
-+msgstr "主轴(宽度)(_W):"
-+
- msgid "Makasar"
- msgstr "望加锡文"
- 
-@@ -7966,7 +8333,10 @@ msgid "Min Kern"
- msgstr "最小压缩(_M)"
- 
- msgid "Minor A_xis:"
--msgstr "次轴线(_X):"
-+msgstr "次轴(_X):"
-+
-+msgid "Minor Axis (_Height):"
-+msgstr "次轴(高度)(_H):"
- 
- msgid "Minor:"
- msgstr "次:"
-@@ -8025,7 +8395,7 @@ msgid "Missing POST resource %u\n"
- msgstr "缺少 POST 资源 %u\n"
- 
- msgid "Missing Points at Extrema"
--msgstr "在极值处缺少点"
-+msgstr "在极值处缺点"
- 
- msgid "Missing Script"
- msgstr "缺位图"
-@@ -8098,6 +8468,9 @@ msgstr "缺规则"
- msgid "Missing suffix"
- msgstr "遗失后缀"
- 
-+msgid "Miter Cli_p"
-+msgstr "尖角裁剪(_P)"
-+
- msgid "Mixed contours and references"
- msgstr "混合的轮廓及参照"
- 
-@@ -8206,10 +8579,10 @@ msgid ""
- msgstr "多个字形映射了同一个码位 U+%04X,只有一个字形会显示\n"
- 
- msgid "Multiple master font with more than 16 instances\n"
--msgstr "多主字体超过16实例\n"
-+msgstr "超16实例多重母版字体\n"
- 
- msgid "Multiple master font with more than 4 axes\n"
--msgstr "多主字体超过4轴\n"
-+msgstr "超4轴多重母版字体\n"
- 
- msgid "Multiple names for language"
- msgstr "语言的多个名称"
-@@ -8256,12 +8629,18 @@ msgstr "NUL,默认字符"
- msgid "N_ever Interpolate"
- msgstr "从不插值(_E)"
- 
-+msgid "N_one (Debug)"
-+msgstr "无(调试)(_O)"
-+
- msgid "N_umber Points"
- msgstr "数值点"
- 
- msgid "Nabataean"
- msgstr "那巴泰文"
- 
-+msgid "Nag Mundari"
-+msgstr "纳格·蒙达里"
-+
- msgid "Name"
- msgstr "名称"
- 
-@@ -8275,7 +8654,7 @@ msgid "Name in use"
- msgstr "正使用"
- 
- msgid "Name this contour"
--msgstr "命名此轮廓"
-+msgstr "命名此轮廓线"
- 
- msgid "Name this guideline or cancel to create it without a name"
- msgstr "你可以给这条引导线附加一个文本标签"
-@@ -8491,7 +8870,7 @@ msgid "Next Hint."
- msgstr "下一个渲染调整。"
- 
- msgid "Next On Contour"
--msgstr "轮廓上下一个"
-+msgstr "轮廓线上下一个"
- 
- msgid "Next State:"
- msgstr "下一状态:"
-@@ -8499,6 +8878,15 @@ msgstr "下一状态:"
- msgid "Next _Defined Glyph"
- msgstr "下一定义的字形(_D)"
- 
-+msgid "Ni_b"
-+msgstr "笔尖(_B)"
-+
-+msgid "Ni_b Angle:"
-+msgstr "笔尖角度(_B):"
-+
-+msgid "Nib Type:"
-+msgstr "笔尖类型:"
-+
- msgid "Niuean"
- msgstr "纽埃语"
- 
-@@ -8603,10 +8991,10 @@ msgid "No References"
- msgstr "无参照"
- 
- msgid "No Rename"
--msgstr "无重命名"
-+msgstr "不改名"
- 
- msgid "No Script"
--msgstr "无脚本"
-+msgstr "无文字"
- 
- msgid "No Script Tag"
- msgstr "无文字标签"
-@@ -8615,7 +9003,7 @@ msgid "No Sequence/Lookups"
- msgstr "无排序/查找 "
- 
- msgid "No Slope"
--msgstr "没有范围"
-+msgstr "无斜率"
- 
- msgid "No Start Glyph"
- msgstr "无起始字形"
-@@ -8691,6 +9079,10 @@ msgstr "字体里未包含 Unicode 编码为 U+%05x 的字形\n"
- msgid "No glyphs matched"
- msgstr "无匹配字形"
- 
-+#, c-format
-+msgid "No kerning between “%s” and %s in %s whilst it is %d in %s\n"
-+msgstr "在%3$s中没有“%1$s”和“%2$s”之间的字偶距,但在%5$s中却存在%4$d。\n"
-+
- #, c-format
- msgid "No kerning pairs found in %.200s"
- msgstr "%.200s中未发现字偶距对"
-@@ -8722,6 +9114,10 @@ msgstr "无标记于 counttomark\n"
- msgid "No marked glyphs allowed in replacement on line %d of %s"
- msgstr "%2$s 的第 %1$d 行不允许替换标记的字形"
- 
-+#, c-format
-+msgid "No matching AnchorClass for %s"
-+msgstr "%s 没有匹配的 AnchorClass"
-+
- #, c-format
- msgid "No name for CharStrings dictionary \"%s"
- msgstr "字符字串字典无名称 \"%s"
-@@ -8827,6 +9223,9 @@ msgstr "正常无衬线体"
- msgid "Normal Text Color:"
- msgstr "普通文本颜色:"
- 
-+msgid "Normal font used in the Find/Replace window"
-+msgstr "查找/替换窗口中使用的普通字体"
-+
- msgid "Normal/Boxed"
- msgstr "外框"
- 
-@@ -8854,6 +9253,17 @@ msgstr "规格化设计矢量函数:"
- msgid "Normalized Settings:"
- msgstr "规范化设定:"
- 
-+msgid ""
-+"Normally simplify will not change the slope of the contour at the points."
-+msgstr "简化通常不会改变轮廓线在点处的斜率。"
-+
-+msgid ""
-+"Normally simplify will not remove points at the extrema of curves\n"
-+"(both PostScript and TrueType suggest you retain these points)"
-+msgstr ""
-+"简化通常不会删除曲线极值处的点\n"
-+"(PostScript 和 TrueType 皆建议您保留这些点)"
-+
- msgid "Northern Sami"
- msgstr "北萨莫斯语"
- 
-@@ -8934,7 +9344,7 @@ msgid "Not quadratic"
- msgstr "非二次曲线"
- 
- msgid "Not sure if this is an error..."
--msgstr "不确定这是一个错误..."
-+msgstr "不确定这是否为一个错误..."
- 
- msgid "Notdef name"
- msgstr "未定义名称"
-@@ -9039,7 +9449,7 @@ msgid "OEM Charset"
- msgstr "OEM 字符集"
- 
- msgid "OK"
--msgstr "确认"
-+msgstr "确定"
- 
- msgid "OS/2 -> Charsets"
- msgstr "OS/2 -> 字符集"
-@@ -9204,7 +9614,7 @@ msgid ""
- "One of the multiple master instances contains quadratic splines. It must be "
- "converted to cubic splines before it can be used in a multiple master"
- msgstr ""
--"多母版的实例里面有一个包含了二次曲线。它必须转化成三次曲线才能用于多母版"
-+"多重母版的实例里面有一个包含了二次曲线。它必须转化成三次曲线才能用于多重母版"
- 
- msgid "Only Embed Bitmaps"
- msgstr "仅嵌入位图"
-@@ -9241,7 +9651,7 @@ msgid "Open"
- msgstr "打开"
- 
- msgid "Open Contour"
--msgstr "轮廓开放"
-+msgstr "开放轮廓线"
- 
- msgid "Open Font"
- msgstr "打开字体"
-@@ -9255,6 +9665,10 @@ msgstr "打开参照"
- msgid "Open failed"
- msgstr "打开失败"
- 
-+#, c-format
-+msgid "Open/Closed contour mismatch in glyph “%s”\n"
-+msgstr "字形“%s”中开放/关闭的轮廓线不匹配\n"
-+
- msgid "OpenCharsInNewWindow"
- msgstr "于新窗口显示字符"
- 
-@@ -9354,6 +9768,9 @@ msgstr "外部阴影"
- msgid "Outline"
- msgstr "轮廓"
- 
-+msgid "Outline Color"
-+msgstr "轮廓颜色"
-+
- msgid "Outline Default Button"
- msgstr "轮廓默认按钮"
- 
-@@ -9387,17 +9804,20 @@ msgstr "空心字形"
- msgid "Output AFM"
- msgstr "生成AFM"
- 
-+msgid "Output FONTLOG.txt"
-+msgstr "输出FONTLOG.txt"
-+
- msgid "Output Glyph Map"
--msgstr "生成字形映射"
-+msgstr "输出字形映射"
- 
- msgid "Output OFM & CFG"
--msgstr "生成 OFM 及 CFG"
-+msgstr "输出 OFM 及 CFG"
- 
- msgid "Output PFM"
- msgstr "生成PFM"
- 
- msgid "Output TFM & ENC"
--msgstr "生成 TFM 及 ENC"
-+msgstr "输出 TFM 及 ENC"
- 
- msgid "Output error"
- msgstr "输出错误"
-@@ -9424,10 +9844,10 @@ msgid "PS Hints"
- msgstr "PS渲调提示"
- 
- msgid "PS Multiple Master(A)"
--msgstr "PS 多母版(A)"
-+msgstr "PS 多重母版(A)"
- 
- msgid "PS Multiple Master(B)"
--msgstr "PS 多母版(B)"
-+msgstr "PS 多重母版(B)"
- 
- msgid "PS Names"
- msgstr "PS字体名称"
-@@ -9839,7 +10259,7 @@ msgid "Perspecti_ve"
- msgstr "透视(_V)"
- 
- msgid "Petite Caps"
--msgstr "小大写"
-+msgstr "微型大写"
- 
- msgid "PfaEdit Table"
- msgstr "PfaEdit表"
-@@ -9923,7 +10343,7 @@ msgid "Please name encoding %d in this file"
- msgstr "请给此文件中的编码 %d命名"
- 
- msgid "Please name this contour"
--msgstr "请为此轮廓命名"
-+msgstr "请为此轮廓线命名"
- 
- msgid "Please name this encoding"
- msgstr "请为此编码命名"
-@@ -10003,10 +10423,10 @@ msgid "Points (TrueType)"
- msgstr "点(TrueType)"
- 
- msgid "Points of _Inflection"
--msgstr "标记映像点(_I)"
-+msgstr "拐点(_I)"
- 
- msgid "Points on Selected _Contours"
--msgstr "曲线上的全部点(_C)"
-+msgstr "所选轮廓线上的点(_C)"
- 
- msgid "Points:"
- msgstr "点:"
-@@ -10112,7 +10532,7 @@ msgid "Preferred Styles"
- msgstr "首选样式"
- 
- msgid "Prefs_App| "
--msgstr " "
-+msgstr "Prefs_App| "
- 
- msgid "Preserve cross-font kerning"
- msgstr "保留交叉字体压缩"
-@@ -10149,7 +10569,7 @@ msgid "Prev Defined Gl_yph"
- msgstr "上一定义的字形(_Y)"
- 
- msgid "Prev On Contour"
--msgstr "轮廓上上一个"
-+msgstr "轮廓线上上一个"
- 
- msgid "Previous Hint."
- msgstr "上一个渲染调整。"
-@@ -10369,6 +10789,9 @@ msgstr "光栅化尺寸:"
- msgid "Rasterizing..."
- msgstr "正在光栅化..."
- 
-+msgid "Ratio"
-+msgstr "比率"
-+
- msgid "Raw"
- msgstr "原始"
- 
-@@ -10394,7 +10817,7 @@ msgid "Recalculate Bitmaps"
- msgstr "再算位图"
- 
- msgid "Recen_t"
--msgstr "最近的(_T)"
-+msgstr "最近(_T)"
- 
- msgid "RecognizePUANames"
- msgstr "识别PUA名称"
-@@ -10510,6 +10933,9 @@ msgstr "雷姜文"
- msgid "Remo_ve Undoes"
- msgstr "清除修改历史"
- 
-+msgid "Remo_ve Undoes..."
-+msgstr "清除修改历史(_V)..."
-+
- msgid "Remove"
- msgstr "移除"
- 
-@@ -10558,6 +10984,9 @@ msgstr "移除查找"
- msgid "Remove Overlap"
- msgstr "移除重叠"
- 
-+msgid "Remove Overlap:"
-+msgstr "合并重叠:"
-+
- msgid "Remove This Glyph"
- msgstr "移除字形(_Y)"
- 
-@@ -10991,6 +11420,9 @@ msgstr "SIL Graphite 规则表"
- msgid "SJIS (Kanji)"
- msgstr "SJIS (汉字)"
- 
-+msgid "SVG 2"
-+msgstr "SVG 2"
-+
- msgid "SVG Template"
- msgstr "SVG模板"
- 
-@@ -11015,6 +11447,9 @@ msgstr "显示依赖(_H)"
- msgid "S_how H. Metrics..."
- msgstr "显示水平尺寸(_h)…"
- 
-+msgid "S_implify"
-+msgstr "简化(_I)"
-+
- msgid "S_nap to horizontal/vertical"
- msgstr "定位到水平线/垂直线"
- 
-@@ -11042,6 +11477,9 @@ msgstr "同匹配类属"
- msgid "Same as PostScript Names"
- msgstr "与 PostScript 名称相同"
- 
-+msgid "Sami (Lappish)"
-+msgstr "萨米语(拉普兰语)"
-+
- msgid "Samoan"
- msgstr "萨摩亚语"
- 
-@@ -11112,7 +11550,7 @@ msgid "Save as _Directory"
- msgstr "保存为文件夹(_D)"
- 
- msgid "Save as..."
--msgstr "保存为…"
-+msgstr "另存为…"
- 
- msgid "Save glyph colors in the PfEd table"
- msgstr "保存字形颜色到PfaEdit表"
-@@ -11288,7 +11726,7 @@ msgstr "文字标签为4个字符"
- #. GT: See the long comment at "Property|New"
- #. GT: The msgstr should contain a translation of "Arabic", ignore "Script|"
- msgid "Script|Arabic"
--msgstr "阿拉伯文"
-+msgstr "文字|阿拉伯文"
- 
- msgid "Script|Aramaic"
- msgstr "亚拉姆文字"
-@@ -11561,10 +11999,10 @@ msgid "Segment Separator"
- msgstr "段分隔符"
- 
- msgid "Selec_t By Lookup Subtable..."
--msgstr "按查找表选择(_T)…"
-+msgstr "按查找子表选择(_T)…"
- 
- msgid "Select All _Points & Refs"
--msgstr "选择全部描点及参照(_P)"
-+msgstr "选择全部点及参照(_P)"
- 
- msgid "Select Anc_hors"
- msgstr "选择锚点(_H)"
-@@ -11589,7 +12027,7 @@ msgid "Select In Font"
- msgstr "于字体中选择"
- 
- msgid "Select Open Contours"
--msgstr "选择已打开的轮廓"
-+msgstr "选择开放的轮廓线"
- 
- msgid "Select Point(s) at..."
- msgstr "选择点…"
-@@ -11955,7 +12393,7 @@ msgid "Simplify"
- msgstr "简化"
- 
- msgid "Simplify More..."
--msgstr "简化更多…"
-+msgstr "高级简化…"
- 
- msgid "Simplifying..."
- msgstr "简化…"
-@@ -12067,10 +12505,10 @@ msgid "Slovenian"
- msgstr "斯洛文尼亚语"
- 
- msgid "Small Capitals"
--msgstr "小大写"
-+msgstr "小型大写"
- 
- msgid "Small Caps"
--msgstr "小大写"
-+msgstr "小型大写"
- 
- msgid "Small Form Variants"
- msgstr "小型形式变体"
-@@ -12249,6 +12687,10 @@ msgstr "样条线长度=%.1f"
- msgid "Spline Length=%g"
- msgstr "样条线长度=%g"
- 
-+#, c-format
-+msgid "Spline mismatch in glyph “%s”\n"
-+msgstr "字形“%s”的样条线不匹配\n"
-+
- msgid "Square"
- msgstr "方形"
- 
-@@ -12287,7 +12729,7 @@ msgid "Star"
- msgstr "星形"
- 
- msgid "Start contours at e_xtrema"
--msgstr "在极值处开始轮廓"
-+msgstr "在极值处开始轮廓线(_X)"
- 
- #. GT: "Len" is an abbreviation for "Length"
- msgid "StartLen"
-@@ -12392,6 +12834,9 @@ msgstr "笔画变化(_V)"
- msgid "Stroke _Width:"
- msgstr "笔画宽度(_W):"
- 
-+msgid "Stroke width cannot be zero"
-+msgstr "笔划宽度不能为零"
-+
- msgid "Stroking..."
- msgstr "笔画..."
- 
-@@ -12971,8 +13416,11 @@ msgstr "激活层的轮廓线颜色"
- msgid "The color of the clip path"
- msgstr "剪切路径的颜色"
- 
-+msgid "The color of the outline"
-+msgstr "轮廓的颜色"
-+
- msgid "The color of the point which is the start of a contour"
--msgstr "曲线起点的颜色"
-+msgstr "轮廓线起点的颜色"
- 
- msgid "The color used to draw a hint which conflicts with another"
- msgstr "此颜色用于绘制与其他渲调提示冲突的渲调提示"
-@@ -12991,11 +13439,14 @@ msgid ""
- "horizontal or vertical at their end-points"
- msgstr "当样条线的端点几乎但又不完全水平或垂直时,用此颜色绘制其标记"
- 
-+msgid "The color used to draw points at extrema (if that mode is active)"
-+msgstr "用于绘制极值处点的颜色(若模式激活时)"
-+
- msgid "The color used to draw points of inflection (if that mode is active)"
--msgstr "绘制映像点的颜色(若激活模式时)"
-+msgstr "用于绘制拐弯点的颜色(若模式激活时)"
- 
- msgid "The color used to draw the \"next\" control point of an on-curve point"
--msgstr "此颜色用于绘制曲线上的点的下一个控制点"
-+msgstr "用于绘制曲线上的点的下一个控制点的颜色"
- 
- msgid ""
- "The color used to draw the \"previous\" control point of an on-curve point"
-@@ -13047,6 +13498,19 @@ msgstr ""
- "字体有错误。\n"
- "%s是否查看错误或继续保存?"
- 
-+#, c-format
-+msgid ""
-+"The font database already contains a bitmap\n"
-+"font with this pixelsize (%d)\n"
-+"Do you want to overwrite it?"
-+msgstr ""
-+"字体数据库已经包含了具有此像素尺寸(%d)\n"
-+"的位图字体。\n"
-+"您要覆盖它吗?"
-+
-+msgid "The generated font won't work with ATM"
-+msgstr "生成的字体与ATM不兼容"
-+
- #, c-format
- msgid ""
- "The glyph at CID %d is mapped to more than %d encodings. Only the first %d "
-@@ -13088,6 +13552,24 @@ msgstr "当前位图尺寸列表"
- msgid "The maximum number of Undoes/Redoes stored in a glyph"
- msgstr "保存在字形中的取消/重来的最多数量"
- 
-+msgid ""
-+"The maximum number of Undoes/Redoes stored in a glyph. Use -1 for infinite "
-+"Undoes\n"
-+"(but watch RAM consumption and use the Edit menu's Remove Undoes as needed)"
-+msgstr ""
-+"撤消/重做的最大值储存于字形内。用 -1 表示无限次撤消\n"
-+"(但请注意内存消耗,并在必要时用“编辑”菜单内的“清除修改历史”项)"
-+
-+#, c-format
-+msgid ""
-+"The name of glyph %.40s has changed. This is what I use to find the glyph in "
-+"the file, so I cannot revert this glyph.\n"
-+"(You will not be warned for subsequent glyphs.)"
-+msgstr ""
-+"字形 %.40s 的名称已更改。 这是我用来在文件中查找字形的方法,因此我无法还原此"
-+"字形。\n"
-+" (您不会收到后续字形的警告。)"
-+
- msgid "The number of em-units by which an arrow key will move a selected point"
- msgstr "方向键按此尺寸移动选定点"
- 
-@@ -13115,6 +13597,10 @@ msgstr "已选字形沒有任何渲调。FontForge 将无法生成许多指令
- msgid "The selected point does not have integral control points"
- msgstr "选择的点没有整数控制点"
- 
-+msgid ""
-+"The selected spline attains its extrema somewhere other than its endpoints"
-+msgstr "所选的样条在其端点外的某处达到其极值"
-+
- msgid "The size (in points) for which this face was designed"
- msgstr "此面以点为尺寸"
- 
-@@ -13122,12 +13608,32 @@ msgstr "此面以点为尺寸"
- msgid "The spline does not reach %g"
- msgstr "样条线不到 %g"
- 
-+msgid ""
-+"The stroke algorithm will attempt to be (at least)\n"
-+"this accurate, but there may be exceptions."
-+msgstr ""
-+"笔划算法尝试(至少)达到\n"
-+"该精度,但仍可能有例外情况。"
-+
-+#, c-format
-+msgid ""
-+"The width of %s is too big to fit in a tfm fix_word, it shall be truncated "
-+"to the largest size allowed."
-+msgstr "%s 的宽度过大,不匹配 tfm fix_word,该宽度将会被截断到所允许的最大值。"
-+
- msgid "The width of one em"
- msgstr "M全字宽度"
- 
- msgid "The width of the line used to draw selected points"
- msgstr "选中点的线宽"
- 
-+#, c-format
-+msgid "There are %d pages in this file, which do you want?"
-+msgstr "文件中有%d页,您想要哪些页面?"
-+
-+msgid "There are multiple fonts in this file, pick one"
-+msgstr "此文件中有多个字体,请选择一个"
-+
- #, c-format
- msgid "There are two entries for the same glyph (%.80s)"
- msgstr "同一字形 (%.80s)有两个入口"
-@@ -13187,6 +13693,10 @@ msgstr "已有同名子表,请选择另一个。"
- msgid "There is already an anchor point named %1$.40s in %2$.40s."
- msgstr "已存在名为 %1$.40s 的 %2$.40s 的锚点。"
- 
-+#, c-format
-+msgid "There is no glyph named \"%s\" in the font."
-+msgstr "字体中无字形 %s."
-+
- #, c-format
- msgid "There is no glyph named %s (used in %s)"
- msgstr "字体中无字形 %s(用于%s)"
-@@ -13198,6 +13708,11 @@ msgstr "字体中无字形 %s"
- msgid "There must be at least 2 gradient stops"
- msgstr "至少要二项斜度"
- 
-+msgid ""
-+"These results are those of the freetype autohinter. They do not reflect the "
-+"truetype instructions."
-+msgstr "这些结果是 freetype autohinter 的结果。 它们不反映 truetype 指令。"
-+
- msgid "These two lines share a common endpoint, I can't make them parallel"
- msgstr "两线共点,不能平行"
- 
-@@ -13222,6 +13737,15 @@ msgstr "三分之一宽"
- msgid "Third argument of imagemask must be a boolean.\n"
- msgstr "蒙板的第三个参数必须为布尔类型.\n"
- 
-+#, c-format
-+msgid ""
-+"This character (gid=%d) has a following part (%d). I'm not sure what that "
-+"means, please send me (gww@silcom.com) a copy of this font so I can test "
-+"with it.\n"
-+msgstr ""
-+"此字符(gid=%d)包含以下部分(%d)。我尚未清楚此为何意,但您是否能将此字体的"
-+"副本发给我(gww@silcom.com)用以测试研究呢?\n"
-+
- msgid ""
- "This does not seem to be a plate file\n"
- "Expected left paren"
-@@ -13251,7 +13775,7 @@ msgstr ""
- "第一行有误"
- 
- msgid "This doesn't look like an ofm file, I don't know how to read it."
--msgstr "这个看来不像ofm文件,不知道怎么打开。"
-+msgstr "这个看来不像ofm文件,不知如何读取。"
- 
- msgid "This feature code is already used"
- msgstr "此特征代码已使用"
-@@ -13324,11 +13848,20 @@ msgid "This glyph is wider than desired"
- msgstr "字形比预期的宽"
- 
- msgid "This hint does not control any points"
--msgstr "此渲调提示不控制任何描点"
-+msgstr "此渲染调整不控制任何点"
- 
- msgid "This index is much larger than the closest neighbor"
- msgstr "此索引相比邻近值过大"
- 
-+#, c-format
-+msgid ""
-+"This is probably a valid URW font, but it is in a format (%c%c) which "
-+"FontForge\n"
-+"does not support. FontForge only supports 'IK' format fonts.\n"
-+msgstr ""
-+"也许此URW字体有效,但FontForge不支持此格式(%c%c)罢了。FontForge仅支持‘IK’格"
-+"式的字体。\n"
-+
- msgid ""
- "This is the difference of the curvature between\n"
- "the next and previous splines. Contours often\n"
-@@ -13340,9 +13873,21 @@ msgstr ""
- msgid "This ligature index is already in use"
- msgstr "此连字索引正被使用"
- 
-+msgid ""
-+"This looks like an ikarus format which I have seen examples of, but for "
-+"which\n"
-+"I have no documentation. FontForge does not support it yet.\n"
-+msgstr ""
-+"我似乎曾经见到过像这样的一些样例,这看上去是 ikarus 格式……但我手头上没有关于"
-+"它的文档。而FontForge也还不支持。\n"
-+
- msgid "This lookup contains no data"
- msgstr "此查找不含数据"
- 
-+#, c-format
-+msgid "This lookup has no effect, I can't figure out its type on line %d of %s"
-+msgstr "此查找无效,我无法在 %2$s 的第 %1$d 行找出它的类型"
-+
- msgid "This may take a while. Please be patient..."
- msgstr "这需要一点时间。请稍候..."
- 
-@@ -13352,6 +13897,11 @@ msgstr "这必须是truetype层."
- msgid "This operation cannot be undone, do it anyway?"
- msgstr "此操作不能取消,是否继续?"
- 
-+msgid ""
-+"This option prepends a timestamp in the format YYMMDDHHMM to the filename "
-+"and font-family name metadata."
-+msgstr "此选项向文件名和字体名称元数据以YYMMDDHHM格式预设一个时间戳。"
-+
- msgid "This outline glyph is missing a bitmap version"
- msgstr "此轮廓字形缺少相应位图字形"
- 
-@@ -13364,6 +13914,9 @@ msgstr "此pdf文件不含页面"
- msgid "This setting is already used"
- msgstr "设置已被采用"
- 
-+msgid "This version of FontForge expects freetype 2.3.7 or more."
-+msgstr "此版本的 FontForge 需要 freetype 2.3.7 或更高版本。"
-+
- msgid ""
- "This version of fontforge was not linked with the spiro library, so you may "
- "not use them."
-@@ -13466,7 +14019,7 @@ msgid "To _Hundredths"
- msgstr "到百分点(_H)"
- 
- msgid "To _Int"
--msgstr "到整点(_I)"
-+msgstr "到整数(_I)"
- 
- msgid ""
- "To generate a Mac family file, the current font must have plain (Normal, "
-@@ -13611,6 +14164,16 @@ msgstr "传统形式"
- msgid "Traditional Name Forms"
- msgstr "传统名称形式"
- 
-+msgid ""
-+"Traditionally the x-height of an italic face is slightly less\n"
-+"than the x-height of the companion roman"
-+msgstr ""
-+"传统上,斜体的x高度稍小于\n"
-+"相应罗马体的x高度"
-+
-+msgid "Trailing Jamo Forms"
-+msgstr "朝鲜谚文后缀形式"
-+
- msgid "Transform"
- msgstr "变换"
- 
-@@ -13823,6 +14386,10 @@ msgstr "未料到的密度数值"
- msgid "Unexpected encoding format in cff: %d\n"
- msgstr "未预期的编码格式于cff: %d\n"
- 
-+#, c-format
-+msgid "Unexpected end of file in feature definition on line %d of %s"
-+msgstr "%2$s 的第 %1$d 行的功能定义中出现意外的文件结尾"
-+
- #, c-format
- msgid "Unexpected end of file in lookup definition on line %d of %s"
- msgstr "%2$s 的第 %1$d 行的查找定义中的文件意外结束"
-@@ -13833,6 +14400,19 @@ msgstr "意外错误"
- msgid "Unexpected number"
- msgstr "不良数字"
- 
-+#, c-format
-+msgid ""
-+"Unexpected size for font info section of URW font (expected 12, got %d)\n"
-+msgstr "错误的 URW 字体名称大小(应为 12,实际为 %d)\n"
-+
-+#, c-format
-+msgid "Unexpected size for name section of URW font (expected 55, got %d)\n"
-+msgstr "错误的 URW 字体名称大小(应为 55,实际为 %d)\n"
-+
-+#, c-format
-+msgid "Unexpected token in GDEF on line %d of %s"
-+msgstr "GDEF 中第 %d 行(共 %s)的意外标记"
-+
- #, c-format
- msgid "Unexpected token in glyph class range on line %d of %s"
- msgstr "在 第%d行(%s)上的字形类范围内有不该存在的字符"
-@@ -13845,6 +14425,14 @@ msgstr "第%d行(%s) 上的查找标记有未预期的字符"
- msgid "Unexpected token in value record on line %d of %s"
- msgstr "%2$s 的第 %1$d 行的值记录中出现意外标记"
- 
-+#, c-format
-+msgid "Unexpected token, %s, in BASE table on line %d of %s"
-+msgstr "BASE 表中的意外标记 %1$s,位于 %3$s 的第 %2$d 行"
-+
-+#, c-format
-+msgid "Unexpected token, %s, in feature definition on line %d of %s"
-+msgstr "%s 行 %d 上的功能定义中的意外标记 %s"
-+
- #, c-format
- msgid "Unexpected token, %s, in lookup definition on line %d of %s"
- msgstr "在 %3$s 的第 %2$d 行的查找定义中出现意外标记 %1$s"
-@@ -14022,6 +14610,12 @@ msgstr "无法解析的字形序列在 %2$s 的第 %1$d 行替换"
- msgid "Unparseable include on line %d of %s"
- msgstr "有不能解析的头文件处于行 %d (%s中)"
- 
-+#, c-format
-+msgid ""
-+"Unparsed characters found after end of groups file (last line parsed was "
-+"%d).\n"
-+msgstr "组文件末尾存在未解析的字符(被解析的最后一列为 %d)。\n"
-+
- msgid "Unreasonable DPI"
- msgstr "不合理的DPI"
- 
-@@ -14109,6 +14703,9 @@ msgstr ""
- msgid "UseNewIndicScripts"
- msgstr "使用新印地语文字"
- 
-+msgid "UsePlugins"
-+msgstr "使用插件"
-+
- msgid "Using the OFL for your open fonts"
- msgstr "在你的开源字体中使用 OFL"
- 
-@@ -14373,6 +14970,9 @@ msgstr "警告未连接的参照"
- msgid "Warning"
- msgstr "警告"
- 
-+msgid "Warning: Contour start did not close\n"
-+msgstr "警告:轮廓线开头未闭合\n"
-+
- #, c-format
- msgid ""
- "Warning: Encoding %d (0x%x) is mapped to at least two locations (%s@0x%02x "
-@@ -14416,7 +15016,7 @@ msgid "We don't understand this font\n"
- msgstr "不识别此字体\n"
- 
- msgid "Weight, Width, Slope Only"
--msgstr "仅粗细,宽度,斜度"
-+msgstr "仅字重,宽度,斜率"
- 
- msgid "Welsh"
- msgstr "威尔士语"
-@@ -14452,6 +15052,16 @@ msgstr ""
- "若加载的 TrueType/OpenType 字体同时具有 Unicode 码表\n"
- "和 CJK 码表,使用此标志来指明使用哪个码表来加载该字体。"
- 
-+msgid ""
-+"When merging two CID keyed fonts, they must have the same Registry and "
-+"Ordering, and the font being merged into (the mergee) must have a supplement "
-+"which is at least as recent as the other's. Furthermore the mergee must have "
-+"at least as many subfonts as the merger."
-+msgstr ""
-+"合并两个 CID 键控字体时,它们必须具有相同的注册表和排序,并且被合并到"
-+"(mergee)中的字体必须有一个至少与另一个字体一样新的补充。 此外,合并后的子字"
-+"体数量必须至少与合并后的子字体一样多。"
-+
- msgid ""
- "When the mouse pointer is within this many pixels\n"
- "of one of the various interesting features (baseline,\n"
-@@ -14555,6 +15165,9 @@ msgstr "回卷位置:"
- msgid "Write failed"
- msgstr "不能写入"
- 
-+msgid "WritePNGInSFD"
-+msgstr "SFD中写入PNG"
-+
- msgid "Wrong Direction"
- msgstr "错误方向"
- 
-@@ -14599,6 +15212,11 @@ msgstr "X高度:"
- msgid "Xhosa"
- msgstr "科萨语"
- 
-+#. GT: Y is a coordinate
-+#. GT: Y is a coordinate, the leading spaces help to align it
-+msgid "Y"
-+msgstr "Y"
-+
- #. GT: an expression describing the transformation applied to the Y coordinate
- msgid "Y Expr:"
- msgstr "Y 表达式:"
-@@ -14619,11 +15237,14 @@ msgid "Yakut"
- msgstr "雅库特语"
- 
- msgid "Yes"
--msgstr "确定"
-+msgstr "是"
- 
- msgid "Yes to _All"
- msgstr "全是(_A)"
- 
-+msgid "Yes, and don't _remind me again"
-+msgstr "是,并且不再提醒(_R)"
-+
- msgid "Yezidi"
- msgstr "耶西迪文"
- 
-@@ -14648,6 +15269,14 @@ msgstr "易经卦符"
- msgid "Yoruba"
- msgstr "约鲁巴语"
- 
-+#, c-format
-+msgid ""
-+"You are attempting to clear %.30s which is referred to by\n"
-+"another character. Are you sure you want to clear it?"
-+msgstr ""
-+"您正尝试删除被其他字符引用的 %.30s 。\n"
-+"确定要删除它吗?"
-+
- #, c-format
- msgid ""
- "You are attempting to paste a reference to %1$s into %2$s.\n"
-@@ -14774,6 +15403,11 @@ msgstr "需要指定模板"
- msgid "You must specify a replacement glyph for %s"
- msgstr "应为 %s 指定替换字形"
- 
-+msgid ""
-+"You will get better instructions if you fill in the Private dictionary, "
-+"Element->Font Info->Private, for the font"
-+msgstr "如果您为字体填写私有字典,元素->字体信息->私有,您将获得更好的说明"
-+
- msgid ""
- "Your font has exactly 65535 glyphs. Encoding 65535 is the limit and is often "
- "used as a magic             value, so it may cause quirks.\n"
-@@ -14781,6 +15415,30 @@ msgstr ""
- "您的字体塞满了 65535 个字形,达到了上限。这个值常会作为魔法数字,可能会引起程"
- "序崩溃。\n"
- 
-+msgid ""
-+"Your font is missing the dotlessi glyph,\n"
-+"please add it and remake your accented glyphs"
-+msgstr ""
-+"您的字体缺少 无上句点i 字形,\n"
-+"请添加它并重新制作你的重音字形"
-+
-+#. GT: Adobe decided that a dotless j glyph was needed, assigned a code
-+#. GT: point to it in the private use area, and named it "dotlessj". Then
-+#. GT: years later the Unicode people decided one was needed and assigned
-+#. GT: it U+0237, so that's now the official code point and it is named
-+#. GT: "uni0237". The name "dotlessj" is deprecated but still present in
-+#. GT: many fonts. Neither "dotlessj" nor "uni0237" should be translated
-+#. GT: because they are standard PostScript glyph names.
-+#. GT: Again you may wish to explain that these refer to a "j" without a dot
-+msgid ""
-+"Your font is missing the uni0237 glyph,\n"
-+"and the deprecated dotlessj glyph,\n"
-+"please add the former and remake your accented glyphs"
-+msgstr ""
-+"您的字体缺少 uni0237 字形,\n"
-+"和弃用的 无上句点j 字形,\n"
-+"请添加前者并重新制作您的重音字形"
-+
- msgid "Z_oom out"
- msgstr "缩小(_O)"
- 
-@@ -14805,29 +15463,32 @@ msgstr "放大(_I)"
- msgid "Zulu"
- msgstr "祖鲁语"
- 
-+msgid "_128 pixel outline"
-+msgstr "_128 像素轮廓"
-+
- msgid "_16x4 cell window"
- msgstr "_16x4单元窗口"
- 
- msgid "_24 pixel outline"
--msgstr "_24点轮廓"
-+msgstr "_24 像素轮廓"
- 
- msgid "_36 pixel outline"
--msgstr "_36点轮廓"
-+msgstr "_36 像素轮廓"
- 
- msgid "_3D Rotate"
- msgstr "3D旋转"
- 
- msgid "_48 pixel outline"
--msgstr "_48点轮廓"
-+msgstr "_48 像素轮廓"
- 
- msgid "_72 pixel outline"
--msgstr "_72点轮廓"
-+msgstr "_72 像素轮廓"
- 
- msgid "_8x2  cell window"
- msgstr "_8x2单元窗口"
- 
- msgid "_96 pixel outline"
--msgstr "_96点轮廓"
-+msgstr "_96 像素轮廓"
- 
- msgid "_AA"
- msgstr "抗锯齿(_A)"
-@@ -14865,6 +15526,10 @@ msgstr "添加选中项(_A)"
- msgid "_Advance Width only"
- msgstr "仅前导宽度(_A)"
- 
-+#. GT: Align these points to their average position
-+msgid "_Align Points"
-+msgstr "对齐点(_A)"
-+
- msgid "_All Fonts"
- msgstr "所有字体(_A)"
- 
-@@ -14929,6 +15594,9 @@ msgstr "BDF信息(_B)…"
- msgid "_Back"
- msgstr "背景(_B)"
- 
-+msgid "_Balance"
-+msgstr "平衡(_B)"
-+
- msgid "_Base Filename:"
- msgstr "文件名(_B):"
- 
-@@ -14964,7 +15632,7 @@ msgid "_Browse"
- msgstr "浏览(_B)"
- 
- msgid "_Build Accented Glyph"
--msgstr "生成首饰字形(_B)"
-+msgstr "生成带标字形(_B)"
- 
- msgid "_Build Syllables"
- msgstr "生成音节(_B)"
-@@ -14993,6 +15661,9 @@ msgstr "改变附件(_C)…"
- msgid "_Changed Glyphs"
- msgstr "已改变字形(_C)"
- 
-+msgid "_Circular (Elliptical)"
-+msgstr "圆(椭圆)(_C)"
-+
- msgid "_Class"
- msgstr "类属(_C)"
- 
-@@ -15006,7 +15677,7 @@ msgid "_Close"
- msgstr "关闭(_C)"
- 
- msgid "_Cluster"
--msgstr "簇(_C)"
-+msgstr "簇集(_C)"
- 
- msgid "_Compact"
- msgstr "压缩(_C)"
-@@ -15036,11 +15707,11 @@ msgid "_Copy"
- msgstr "复制(_C)"
- 
- msgid "_Correct Direction"
--msgstr "正确方向(_C)"
-+msgstr "修正方向(_C)"
- 
- #. GT: Here (and following) MM means "MultiMaster"
- msgid "_Create MM..."
--msgstr "创建字体集(_C)…"
-+msgstr "创建多母版(_C)…"
- 
- msgid "_Create Pair"
- msgstr "创建配对(_C)"
-@@ -15103,7 +15774,7 @@ msgid "_Down"
- msgstr "下(_D)"
- 
- msgid "_Earlier"
--msgstr "早先(_E)"
-+msgstr "提前(_E)"
- 
- msgid "_Edges near horizontal/vertical"
- msgstr "边线临近水平线/垂直线(_E)"
-@@ -15142,7 +15813,10 @@ msgid "_Exclude"
- msgstr "去除(_E)"
- 
- msgid "_Expand Stroke..."
--msgstr "扩展重音符(_E)…"
-+msgstr "扩展笔画(_E)…"
-+
-+msgid "_Extend Cap:"
-+msgstr "延伸端头(_E):"
- 
- msgid "_Extrema"
- msgstr "标记极值(_M)"
-@@ -15160,13 +15834,13 @@ msgid "_Fill"
- msgstr "填充(_F)"
- 
- msgid "_Filter"
--msgstr "过滤"
-+msgstr "过滤(_F)"
- 
- msgid "_Find Intersections"
- msgstr "寻找交叠(_F)"
- 
- msgid "_First"
--msgstr "首先(_F)"
-+msgstr "最前(_F)"
- 
- msgid "_First Point"
- msgstr "第一点(_F)"
-@@ -15241,6 +15915,9 @@ msgstr "水平字干(_H)"
- msgid "_HVCurve"
- msgstr "水平垂直曲线(_H)"
- 
-+msgid "_Hangul"
-+msgstr "谚文(_H)"
-+
- msgid "_Height:"
- msgstr "高度(_H):"
- 
-@@ -15257,7 +15934,7 @@ msgid "_Hinting Needed"
- msgstr "所需的渲调(_H)"
- 
- msgid "_Hints controlling no points"
--msgstr "渲调提示没有控制描点(_H)"
-+msgstr "渲调调整未控制点(_H)"
- 
- msgid "_Histogram"
- msgstr "直方图(_H)"
-@@ -15310,6 +15987,9 @@ msgstr "斜体(_I)..."
- msgid "_Join"
- msgstr "连接(_J)"
- 
-+msgid "_Join Limit:"
-+msgstr "连接范围限制(_J):"
-+
- msgid "_Justification..."
- msgstr "对齐(_J)..."
- 
-@@ -15414,7 +16094,7 @@ msgid "_More points than:"
- msgstr "点数超过(_M):"
- 
- msgid "_Move Points"
--msgstr "移动描点(_M)"
-+msgstr "移动点(_M)"
- 
- msgid "_Multi Size Glyph"
- msgstr "多尺寸字形(_M)"
-@@ -15426,7 +16106,7 @@ msgid "_Name"
- msgstr "名称(_N)"
- 
- msgid "_Name Contour"
--msgstr "命名轮廓(_N)"
-+msgstr "命名轮廓线(_N)"
- 
- msgid "_Name:"
- msgstr "名称(_N):"
-@@ -15446,6 +16126,9 @@ msgstr "下一字形(_N)"
- msgid "_Next Point"
- msgstr "下一点(_N)"
- 
-+msgid "_Nib"
-+msgstr "笔尖(_N)"
-+
- msgid "_No"
- msgstr "否(_N)"
- 
-@@ -15513,7 +16196,7 @@ msgid "_Paste"
- msgstr "粘贴(_P)"
- 
- msgid "_Point"
--msgstr "描点(_P)"
-+msgstr "点(_P)"
- 
- msgid "_Point of View Projection..."
- msgstr "投影视点(_P)…"
-@@ -15522,16 +16205,16 @@ msgid "_Pointer"
- msgstr "指针(_P)"
- 
- msgid "_Points"
--msgstr "描点(_P)"
-+msgstr "点(_P)"
- 
- msgid "_Points near¹ hint edges"
--msgstr "描点靠近¹渲调提示边缘(_P)"
-+msgstr "靠近¹渲染调整边缘的点(_P)"
- 
- msgid "_Points too far"
- msgstr "点太远"
- 
- msgid "_Pointsize Y:"
--msgstr "网格大小(_P) Y轴:"
-+msgstr "点号 Y(_P):"
- 
- msgid "_Pointsize:"
- msgstr "字号(_P):"
-@@ -15840,7 +16523,7 @@ msgid "_Weight"
- msgstr "字重(_W):"
- 
- msgid "_Weight Class"
--msgstr "粗细类属(_W)"
-+msgstr "字重类别(_W)"
- 
- msgid "_Width"
- msgstr "宽度(_W)"
-@@ -15860,6 +16543,9 @@ msgstr "线框(_W)"
- msgid "_Wireframe..."
- msgstr "线框(_W)..."
- 
-+msgid "_X"
-+msgstr "_X"
-+
- msgid "_X Resource Editor..."
- msgstr "_X 资源编辑器..."
- 
-@@ -15873,7 +16559,10 @@ msgid "_X-Height"
- msgstr "_X高度"
- 
- msgid "_X:"
--msgstr "_X轴:"
-+msgstr "_X:"
-+
-+msgid "_Y"
-+msgstr "_Y"
- 
- msgid "_Y near¹"
- msgstr "_Y 临近¹"
-@@ -15893,6 +16582,12 @@ msgstr "上高属性表"
- msgid "alternate subs"
- msgstr "交换替代"
- 
-+msgid "as Len_gth"
-+msgstr "作为长度(_G)"
-+
-+msgid "as _Length"
-+msgstr "作为长度(_L)"
-+
- msgid "at position"
- msgstr "在位置"
- 
-@@ -16143,25 +16838,25 @@ msgid "positioning"
- msgstr "定位"
- 
- msgid "problfixup|Bad Directions"
--msgstr "不良方向"
-+msgstr "problfixup|不良方向"
- 
- msgid "problfixup|Mark for Overlap fix before Save"
--msgstr "保存前标记未连接的"
-+msgstr "problfixup|标记重叠,保存前修复"
- 
- msgid "problfixup|Missing Extrema"
--msgstr "缺少极点"
-+msgstr "problfixup|缺少极点"
- 
- msgid "problfixup|Missing Extrema (cautiously)"
--msgstr "缺极值"
-+msgstr "problfixup|缺极值(谨慎)"
- 
- msgid "problfixup|Open Contours"
--msgstr "轮廓开放"
-+msgstr "problfixup|开放轮廓线"
- 
- msgid "problfixup|Self Intersections"
--msgstr "自身相交"
-+msgstr "problfixup|自相交"
- 
- msgid "problfixup|Too Many Points"
--msgstr "过多点"
-+msgstr "problfixup|点过多"
- 
- msgid "problselect|Bad Direction"
- msgstr "方向错误"
-@@ -16170,10 +16865,10 @@ msgid "problselect|Errors"
- msgstr "错误"
- 
- msgid "problselect|Missing Extrema"
--msgstr "缺少极点"
-+msgstr "problselect|缺极值"
- 
- msgid "problselect|Open Contours"
--msgstr "轮廓开放"
-+msgstr "problselect|开放轮廓线"
- 
- msgid "problselect|Self Intersections"
- msgstr "自身相交"
-@@ -16235,7 +16930,7 @@ msgid "vertical origin table"
- msgstr "垂直原点表"
- 
- msgid "weight"
--msgstr "粗细"
-+msgstr "字重"
- 
- #. GT: English uses "script" to mean a general writing system (latin, greek, kanji)
- #. GT: and the cursive handwriting style. Here we mean the general writing system.
-@@ -16248,7 +16943,7 @@ msgstr "粗细"
- #. GT: English uses "script" to me a general writing style (latin, greek, kanji)
- #. GT: and the cursive handwriting style. Here we mean the general writing system.
- msgid "writing system|Script"
--msgstr "文字"
-+msgstr "书写系统|文字"
- 
- #. GT: Short form of {Everything Else}, might use universal? U+2200
- msgid "{All}"
-diff --git a/po/zh_TW.po b/po/zh_TW.po
-index 83139bb833..035bd61b79 100644
---- a/po/zh_TW.po
-+++ b/po/zh_TW.po
-@@ -13,8 +13,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: fontforge\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2022-12-31 02:48+0000\n"
--"PO-Revision-Date: 2022-12-31 03:27\n"
-+"POT-Creation-Date: 2023-12-30 03:08-0800\n"
-+"PO-Revision-Date: 2023-12-30 08:15\n"
- "Last-Translator: \n"
- "Language-Team: Chinese Traditional\n"
- "Language: zh_TW\n"
-@@ -2271,15 +2271,15 @@ msgstr "不當的連體字字圖。GID %d 未少於 %d\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr ""
- "不當的查找表格:格式=2 (%d/%d), 第一筆=%d 最末筆=%d 總計在字型=%d 中的字圖\n"
- 
- #, c-format
- msgid ""
--"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font="
--"%d\n"
-+"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-+"font=%d\n"
- msgstr "不當的查找表:格式=4 (%d/%d),首筆=%d 末筆=%d 字型中字圖總計=%d\n"
- 
- #, c-format
-@@ -19269,16 +19269,16 @@ msgstr "ΤεΧ 名稱"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv="
--"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-+"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- msgstr ""
--"“%s” 於 %s 中並未包含成對定位查找 ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d to %s ∆x="
--"%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-+"“%s” 於 %s 中並未包含成對定位查找 ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d to %s "
-+"∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
- msgid ""
--"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv="
--"%d\n"
-+"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-+"∆y_adv=%d\n"
- msgstr "“%s” 於 %s 中並未包含定位查找 ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
- 
- #, c-format
diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 931b9ea60b2569..c61bc52cd7d4cc 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,7 +1,7 @@
 # Template file for 'fontforge'
 pkgname=fontforge
 version=20230101
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3 python3-setuptools"
diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index 6499bb749cf24b..6ed84a15b2efcf 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,7 +1,7 @@
 # Template file for 'fonttools'
 pkgname=fonttools
 version=4.54.1
-revision=2
+revision=1
 build_style=python3-module
 make_check_args="--deselect Tests/otlLib/optimize_test.py::test_main
  --deselect Tests/ttx/ttx_test.py::test_ttcompile_timestamp_calcs
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..d467d968338d85 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=1.0.0
-revision=2
+revision=1
 _pycxx_ver=7.1.8
 _ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
 build_style=cmake
@@ -14,8 +14,8 @@ configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_GUI=ON
  -DCMAKE_INSTALL_DATAROOTDIR=/usr/share -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname}
  -DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3"
 hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools
- python3-matplotlib python3-pivy"
-makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel vtk-devel
+ python3-matplotlib"
+makedepends="boost-devel libxerces-c-devel zlib-devel occt-devel vtk-devel
  hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
  coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
  glew-devel python3-devel yaml-cpp-devel guidelines-support-library
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index fa66f3fe1efd25..a65190bc8c40d1 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,10 +1,10 @@
 # Template file for 'freeorion'
 pkgname=freeorion
 version=0.5.0.1
-revision=3
+revision=2
 build_style=cmake
 hostmakedepends="cppcheck doxygen python3-pycodestyle"
-makedepends="boost-devel boost-python3 libvorbis-devel
+makedepends="boost-devel libvorbis-devel
  freetype-devel glew-devel libopenal-devel python3-devel SDL2-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Turn-based space empire and galactic conquest (4X) computer game"
diff --git a/srcpkgs/frr/patches/python-3.13.patch b/srcpkgs/frr/patches/python-3.13.patch
deleted file mode 100644
index 519c75786fd043..00000000000000
--- a/srcpkgs/frr/patches/python-3.13.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 9fcc2ae596a1eabfb0b7e663b5d47fa58a124bc2 Mon Sep 17 00:00:00 2001
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Wed, 15 Mar 2023 12:24:36 +0100
-Subject: [PATCH] lib: adapt clippy to Python 3.8+ init API
-
-The old initialization/config API is deprecated in Python 3.11.  Make
-clippy use the new one added in 3.8 if it's that version or newer.
-
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
----
- lib/clippy.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
-
-diff --git a/lib/clippy.c b/lib/clippy.c
-index c3c9f5c4016d..d414053c5538 100644
---- a/lib/clippy.c
-+++ b/lib/clippy.c
-@@ -14,6 +14,53 @@
- #include "command_graph.h"
- #include "clippy.h"
- 
-+#if PY_VERSION_HEX >= 0x03080000
-+/* new python init/config API added in Python 3.8 */
-+int main(int argc, char **argv)
-+{
-+	PyStatus status;
-+	PyPreConfig preconfig[1];
-+	PyConfig config[1];
-+
-+	PyPreConfig_InitPythonConfig(preconfig);
-+	preconfig->configure_locale = 0;
-+	preconfig->coerce_c_locale = 1;
-+	preconfig->coerce_c_locale_warn = 0;
-+	preconfig->isolated = 0;
-+	preconfig->utf8_mode = 1;
-+	preconfig->parse_argv = 0;
-+
-+	status = Py_PreInitializeFromBytesArgs(preconfig, argc, argv);
-+	if (PyStatus_Exception(status))
-+		Py_ExitStatusException(status);
-+
-+	PyConfig_InitPythonConfig(config);
-+#if PY_VERSION_HEX >= 0x030b0000	/* 3.11 */
-+	config->safe_path = 0;
-+#endif
-+
-+	status = PyConfig_SetBytesArgv(config, argc, argv);
-+	if (PyStatus_Exception(status))
-+		Py_ExitStatusException(status);
-+
-+	PyConfig_SetBytesString(config, &config->program_name,
-+				argc > 0 ? argv[0] : "clippy");
-+	if (argc > 1)
-+		PyConfig_SetBytesString(config, &config->run_filename, argv[1]);
-+
-+	PyImport_AppendInittab("_clippy", command_py_init);
-+
-+	status = Py_InitializeFromConfig(config);
-+	if (PyStatus_Exception(status))
-+		Py_ExitStatusException(status);
-+
-+	PyConfig_Clear(config);
-+
-+	return Py_RunMain();
-+}
-+
-+#else /* Python < 3.8 */
-+/* old python init/config API, deprecated in Python 3.11 */
- #if PY_MAJOR_VERSION >= 3
- #define pychar wchar_t
- static wchar_t *wconv(const char *s)
-@@ -89,6 +136,7 @@ int main(int argc, char **argv)
- 	free(wargv);
- 	return 0;
- }
-+#endif /* Python < 3.8 */
- 
- /* and now for the ugly part... provide simplified logging functions so we
-  * don't need to link libzebra (which would be a circular build dep) */
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index caedf801c89611..d5520d0a6c2a63 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
 version=7.5
-revision=7
+revision=6
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
 configure_args="--disable-doc
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 11c4a2e1de970e..c4036e3d2051df 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=2.0.2
+version=2.0.1
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -25,7 +25,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=4fa96142531e8ce61fb77cc7893a78ccf0ade0d9f8236defdb4613e4e53f1dc2
+checksum=2266ed0f655e3268221a0f8bd34ab41e1e80b9092978b86fc080e59268b01486
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index f7d6be51b58353..9c64fa60710c18 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,7 +1,7 @@
 # Template file for 'gajim'
 pkgname=gajim
 version=1.9.5
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="gettext python3-wheel"
 depends="farstream gsound gst-libav gst-plugins-base1 gst-plugins-ugly1
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 1f99f662d972d2..d441a02cf0eb07 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
 version=1.27.5
-revision=2
+revision=1
 build_style=python3-module
 make_check_args="--ignore test/test_results.py"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index f537dd6088d5e9..42546a2db4d376 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,7 +1,7 @@
 # Template file for 'gammastep'
 pkgname=gammastep
 version=2.0.9
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr
  --enable-wayland --enable-apparmor --with-systemduserunitdir=no
diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
index 25277e914c37ad..07567d1694c657 100644
--- a/srcpkgs/gbinder-python/template
+++ b/srcpkgs/gbinder-python/template
@@ -1,7 +1,7 @@
 # Template file for 'gbinder-python'
 pkgname=gbinder-python
 version=1.1.2
-revision=3
+revision=2
 build_style=python3-module
 make_build_args="--cython"
 hostmakedepends="python3-Cython pkg-config"
diff --git a/srcpkgs/gcalcli/template b/srcpkgs/gcalcli/template
index 30345411faff89..fc19e60f13fa34 100644
--- a/srcpkgs/gcalcli/template
+++ b/srcpkgs/gcalcli/template
@@ -1,7 +1,7 @@
 # Template file for 'gcalcli'
 pkgname=gcalcli
 version=4.3.0
-revision=3
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-dateutil python3-google-api-python-client
diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template
index cf0245e231cb94..378643f400c4e3 100644
--- a/srcpkgs/gcovr/template
+++ b/srcpkgs/gcovr/template
@@ -1,7 +1,7 @@
 # Template file for 'gcovr'
 pkgname=gcovr
 version=7.2
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-Jinja2 python3-lxml python3-Pygments python3-colorlog"
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 99b9b77ca7863e..70a0d0aea0baa0 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=15.2
-revision=2
+revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
diff --git a/srcpkgs/gdm-settings/template b/srcpkgs/gdm-settings/template
index e94397d4ea3ce9..13a192fa015e64 100644
--- a/srcpkgs/gdm-settings/template
+++ b/srcpkgs/gdm-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm-settings'
 pkgname=gdm-settings
 version=4.1
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils gtk-update-icon-cache gtk4 libadwaita glib-devel"
diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template
index 2164246a622574..1620c3f29ac247 100644
--- a/srcpkgs/gdown/template
+++ b/srcpkgs/gdown/template
@@ -1,7 +1,7 @@
 # Template file for 'gdown'
 pkgname=gdown
 version=5.2.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme"
 depends="python3-filelock python3-requests python3-six python3-tqdm
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index bce9e3cdd467a1..443e0f647803a0 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -2,7 +2,7 @@
 # keep major version in sync with gedit
 pkgname=gedit-plugins
 version=48.0
-revision=2
+revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
 hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 7bae0fb4074abf..63020ed5217117 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -2,7 +2,7 @@
 # keep major version in sync with gedit-plugins
 pkgname=gedit
 version=48.0
-revision=2
+revision=1
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index b356aa14c34601..ca8a6fa81c443e 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,7 +1,7 @@
 # Template file for 'gef'
 pkgname=gef
 version=2024.06
-revision=2
+revision=1
 pycompile_dirs="usr/lib/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper
  gdb binutils"
diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index 39d4402e1cb0db..abfa953943423f 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,7 +1,7 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=13
+revision=12
 build_style="gnu-configure"
 configure_args="--disable-static"
 hostmakedepends="pkg-config python3-devel"
diff --git a/srcpkgs/gfeeds/template b/srcpkgs/gfeeds/template
index 8bf1bac3135752..6a83e149d5f2f0 100644
--- a/srcpkgs/gfeeds/template
+++ b/srcpkgs/gfeeds/template
@@ -1,7 +1,7 @@
 # Template file for 'gfeeds'
 pkgname=gfeeds
 version=2.2.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="blueprint-compiler gettext glib-devel gtk-update-icon-cache
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
index 9cf76819e8d789..e292c5641c9833 100644
--- a/srcpkgs/gi-docgen/template
+++ b/srcpkgs/gi-docgen/template
@@ -1,7 +1,7 @@
 # Template file for 'gi-docgen'
 pkgname=gi-docgen
 version=2023.1
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml
diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 12a7d780bb408d..38f4cbf51b7724 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,6 +1,6 @@
 # Template file for 'git-cola'
 pkgname=git-cola
-version=4.10.1
+version=4.9.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3 python3-build python3-packaging python3-setuptools python3-setuptools_scm python3-wheel"
@@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://git-cola.github.io/"
 distfiles="${PYPI_SITE}/g/git-cola/git_cola-${version}.tar.gz"
-checksum=c3c7e63099d60347528fbbc6f565aef02d62ebf1df8c372666faec9bf8aa19eb
+checksum=c237a3d7586973e4adbd3fcf3469a3c301fe052b450f908b487de334d1b566d4
diff --git a/srcpkgs/git-delete-merged-branches/template b/srcpkgs/git-delete-merged-branches/template
index 255127a1e02eb5..b8f9fb3df78fb8 100644
--- a/srcpkgs/git-delete-merged-branches/template
+++ b/srcpkgs/git-delete-merged-branches/template
@@ -1,7 +1,7 @@
 # Template file for 'git-delete-merged-branches'
 pkgname=git-delete-merged-branches
 version=7.4.1
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
 depends="python3-colorama python3-prompt_toolkit"
diff --git a/srcpkgs/git-filter-repo/template b/srcpkgs/git-filter-repo/template
index 110ab5f8cd498d..c70df8f7359fa5 100644
--- a/srcpkgs/git-filter-repo/template
+++ b/srcpkgs/git-filter-repo/template
@@ -1,7 +1,7 @@
 # Template file for 'git-filter-repo'
 pkgname=git-filter-repo
 version=2.34.0
-revision=4
+revision=3
 depends="git python3"
 checkdepends="git python3 perl rsync dos2unix"
 short_desc="Versatile tool for rewriting git history"
diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index f4214de7b45785..7629a48d82a583 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -1,7 +1,7 @@
 # Template file for 'git-review'
 pkgname=git-review
 version=1.28.0
-revision=9
+revision=8
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-requests"
diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template
index 7bd9dfd3e0661b..1569faac0010ba 100644
--- a/srcpkgs/git-revise/template
+++ b/srcpkgs/git-revise/template
@@ -1,7 +1,7 @@
 # Template file for 'git-revise'
 pkgname=git-revise
 version=0.7.0
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="git python3-setuptools"
diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index 131d3b4bdfb78b..01c21c65309157 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -1,7 +1,7 @@
 # Template file for 'gitg'
 pkgname=gitg
 version=44
-revision=2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 hostmakedepends="desktop-file-utils gettext glib-devel gtk-update-icon-cache
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 65106907a60669..ff8d859648ad2a 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,7 +1,7 @@
 # Template file for 'glade3'
 pkgname=glade3
 version=3.40.0
-revision=2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dgtk_doc=true -Dman=true -Dintrospection=true
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index f3612aba697a2e..9a7e80a0e882aa 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,7 +1,7 @@
 # Template file for 'glances'
 pkgname=glances
 version=4.1.2.1
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-psutil python3-defusedxml python3-packaging python3-orjson
diff --git a/srcpkgs/gleam/template b/srcpkgs/gleam/template
index bd9d51e0525110..164b912d5c7959 100644
--- a/srcpkgs/gleam/template
+++ b/srcpkgs/gleam/template
@@ -1,6 +1,6 @@
 # Template file for 'gleam'
 pkgname=gleam
-version=1.6.3
+version=1.6.2
 revision=1
 build_style=cargo
 make_install_args="--path=compiler-cli"
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://gleam.run/"
 changelog="https://raw.githubusercontent.com/gleam-lang/gleam/main/CHANGELOG.md"
 distfiles="https://github.com/gleam-lang/gleam/archive/refs/tags/v${version}.tar.gz"
-checksum=533498a9915439b2ca61570f453b2079874378e0ae0a890a43fc1f9b3c587197
+checksum=12db37408b69ef224d7d77fa6e7422124f6e8956419c48202de41ce182fb075d
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 5c03f91d581efa..26071b0ef66164 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -2,7 +2,7 @@
 # keep in sync with glib-bootstrap
 pkgname=glib
 version=2.82.1
-revision=2
+revision=1
 build_style=meson
 build_helper="qemu"
 # static version is necessary for qemu-user
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index c6baa514edc36b..eabb5e07397099 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=9.6
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-mountutildir=/usr/bin
diff --git a/srcpkgs/gnome-browser-connector/template b/srcpkgs/gnome-browser-connector/template
index c58589d5338e69..c98694b7fd3a1c 100644
--- a/srcpkgs/gnome-browser-connector/template
+++ b/srcpkgs/gnome-browser-connector/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-browser-connector'
 pkgname=gnome-browser-connector
 version=42.1
-revision=4
+revision=3
 build_style=meson
 hostmakedepends="python3-gobject"
 depends="python3-gobject dbus gnome-shell"
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index cbf018efdc56ea..6bad4887fe40ab 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=46.2
-revision=3
+revision=2
 _llvmver=19
 build_style=meson
 build_helper=qemu
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index b6fd8676e3932d..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
 version=46.0
-revision=3
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config
diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 2f1cbf20611332..57617f25a7df07 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-passbook'
 pkgname=gnome-passbook
 version=0.8
-revision=7
+revision=6
 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 build_style=meson
 hostmakedepends="glib-devel pkg-config gettext"
diff --git a/srcpkgs/gnome-secrets/template b/srcpkgs/gnome-secrets/template
index 0c434c0e9ab484..7bf63e0ae79295 100644
--- a/srcpkgs/gnome-secrets/template
+++ b/srcpkgs/gnome-secrets/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-secrets'
 pkgname=gnome-secrets
 version=8.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext gobject-introspection python3-pykeepass
  python3-pyotp glib-devel desktop-file-utils gtk-update-icon-cache
diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index e5a371c00d504a..0f26d2e5693c87 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
 version=46.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext desktop-file-utils gtk4-update-icon-cache"
 makedepends="gsettings-desktop-schemas-devel libadwaita-devel
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 700277e1d14cfc..e6e62422a726ca 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.52
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
diff --git a/srcpkgs/gns3-net-converter/template b/srcpkgs/gns3-net-converter/template
index fe21c181675c31..b3ea811af6eb5e 100644
--- a/srcpkgs/gns3-net-converter/template
+++ b/srcpkgs/gns3-net-converter/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-net-converter'
 pkgname=gns3-net-converter
 version=1.3.0
-revision=9
+revision=8
 build_style=python3-module
 pycompile_module="gns3converter"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 9b6b1fffbb65aa..f1e2c61def3211 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.52
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors
diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template
index 4250d7596ab774..cdd2b7dac47c93 100644
--- a/srcpkgs/gnubg/template
+++ b/srcpkgs/gnubg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnubg'
 pkgname=gnubg
 version=1.08.003
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--disable-cputest ax_cv_gcc_x86_cpuid_0x00000001=6000000
  --with-gtk3"
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 3e58db0ee21e12..7def2db6e1ad93 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=5.9
-revision=2
+revision=1
 build_style=cmake
 make_check_target=check
 configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=OFF"
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..ca910e524cabee 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-nrsc5'
 pkgname=gnuradio-nrsc5
 version=2.0.0
-revision=9
+revision=8
 build_style=cmake
 make_cmd=make
 configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..fac23dc315cfd6 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-osmosdr'
 pkgname=gnuradio-osmosdr
 version=0.2.4
-revision=8
+revision=7
 build_style=cmake
 configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
 hostmakedepends="pkg-config gnuradio python3"
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..d827e26f446ece 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-rds'
 pkgname=gnuradio-rds
 version=3.10
-revision=13
+revision=12
 build_style=cmake
 configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
 hostmakedepends="pkg-config gnuradio python3"
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index d06dacc2c28523..96618ae919df63 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
 version=3.10.11.0
-revision=2
+revision=1
 build_style=cmake
 build_helper="python3"
 conf_files="/etc/gnuradio/conf.d/*"
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 669e43474c816e..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -5,7 +5,7 @@
 #   libgirepository-1.0 to libgirepository-2.0 migration.
 pkgname=gobject-introspection-bootstrap
 version=1.82.0
-revision=2
+revision=1
 build_style=meson
 build_helper="qemu"
 configure_args="-Dbuild_introspection_data=false"
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 5cbfae9f6d707b..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -2,7 +2,7 @@
 # keep in sync with gobject-introspection-bootstrap
 pkgname=gobject-introspection
 version=1.82.0
-revision=2
+revision=1
 build_style=meson
 build_helper="qemu"
 pycompile_dirs="usr/lib/gobject-introspection/giscanner"
diff --git a/srcpkgs/gom/template b/srcpkgs/gom/template
index 38f3a81a417711..6d8ad20defb02e 100644
--- a/srcpkgs/gom/template
+++ b/srcpkgs/gom/template
@@ -1,7 +1,7 @@
 # Template file for 'gom'
 pkgname=gom
 version=0.4
-revision=6
+revision=5
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-introspection=$(vopt_if gir true false)
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index a79d7b21051860..1323fece74ecd5 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -3,7 +3,7 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/gpgme-qt6"
 pkgname=gpgme
 version=1.23.2
-revision=5
+revision=4
 build_style=gnu-configure
 build_helper="python3"
 configure_args="--enable-fd-passing
@@ -32,12 +32,6 @@ fi
 
 post_build() {
 	cd lang/python
-
-	mkdir build
-	ln -sf ../../../src/data.h build/data.h
-	ln -sf ../../../conf/config.h build/config.h
-	ln -sf src gpg
-
 	top_builddir=../.. python3 -m build --wheel --no-isolation
 }
 
@@ -88,7 +82,8 @@ gpgme-python3_package() {
 	short_desc+=" - Python binding"
 	depends="gpgme"
 	pkg_install() {
-		vmove "${py3_sitelib}"
+		vmove $py3_sitelib
+		rm -r ${PKGDESTDIR}/$py3_sitelib/gpg*.egg
 	}
 }
 
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 0ca6b1d271665d..9cc3b23caa47c9 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,7 +1,7 @@
 # Template file for 'gpodder'
 pkgname=gpodder
 version=3.11.4
-revision=2
+revision=1
 hostmakedepends="python3-setuptools intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
  python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 62ad6fa8a15d12..77c28ac1978000 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -1,7 +1,7 @@
 # Template file for 'gpsd'
 pkgname=gpsd
 version=3.24
-revision=4
+revision=3
 build_style=scons
 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd
  sbindir=/usr/bin CC=${CC} qt_versioned=5"
diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template
index 6cc82d6f601f7c..25d28d1d7a2f4d 100644
--- a/srcpkgs/gramps/template
+++ b/srcpkgs/gramps/template
@@ -1,7 +1,7 @@
 # Template file for 'gramps'
 pkgname=gramps
 version=5.1.6
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config intltool python3-setuptools"
 depends="gtk+3 python3-gobject python3-bsddb3 python3-PyICU python3-jsonschema python3-lxml"
diff --git a/srcpkgs/greg/template b/srcpkgs/greg/template
index fc324b54d22143..c139814b92a976 100644
--- a/srcpkgs/greg/template
+++ b/srcpkgs/greg/template
@@ -1,7 +1,7 @@
 # Template file for 'greg'
 pkgname=greg
 version=0.4.7
-revision=11
+revision=10
 build_style=python3-module
 pycompile_module="greg"
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/grip/template b/srcpkgs/grip/template
index a1fa43ccea43ec..0cab8751fe84a4 100644
--- a/srcpkgs/grip/template
+++ b/srcpkgs/grip/template
@@ -1,7 +1,7 @@
 # Template file for 'grip'
 pkgname=grip
 version=4.6.1
-revision=5
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-docopt python3-Flask python3-Markdown python3-path-and-address
diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index 5e9fe2975147d3..71b6af109752d7 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'gscreenshot'
 pkgname=gscreenshot
 version=3.6.3
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext go-md2man"
 # refer to https://github.com/thenaterhood/gscreenshot#installation
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index d8668a6df3ab52..2f2f8ed71d8410 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,7 +1,7 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
 version=1.24.9
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddoc=disabled $(vopt_feature gir introspection)"
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index f78354195f484b..81a83de1d4603f 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
 version=1.24.9
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config python3"
 makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel"
diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template
index 2cb3769cd17153..93fb16d08ff0e7 100644
--- a/srcpkgs/gtk-doc/template
+++ b/srcpkgs/gtk-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk-doc'
 pkgname=gtk-doc
 version=1.33.2
-revision=4
+revision=3
 build_style=meson
 # disable tests to avoid cyclic dependency on glib
 configure_args="-Dtests=false"
diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index ae62cd602a5950..30501ae9d79baf 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -1,7 +1,7 @@
 # Template file for 'guake'
 pkgname=guake
 version=3.10
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools_scm python3-pbr python3-wheel"
 makedepends="python3-devel python3-pbr"
diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template
index b1d0e62cf6809c..5d6c9d3bb3e610 100644
--- a/srcpkgs/gufw/template
+++ b/srcpkgs/gufw/template
@@ -1,7 +1,7 @@
 # Template file for 'gufw'
 pkgname=gufw
 version=24.04
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-distutils-extra intltool"
 depends="python3-gobject net-tools ufw gtk+3 libwebkit2gtk41"
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index 862acee322be22..d8f971032c6fcc 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,7 +1,7 @@
 # Template file for 'gwe'
 pkgname=gwe
 version=0.15.5
-revision=3
+revision=2
 build_style=meson
 hostmakedepends="gobject-introspection pkg-config ninja appstream-glib glib-devel"
 makedepends="gtk+3-devel python3-devel"
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 87c452d42aaf9f..da5d8ef719496c 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=24.12.0
+version=24.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -21,4 +21,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=74971003952d966252e5b84d4f8e592fec4784e32fad2fb998aaa37338564adc
+checksum=99a51e572adac269bf932fc90b2897376cc05e6d22f539a33c3e10c287ab7746
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index f70ea498af0262..bae0ca46737858 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
 # Template file for 'hamlib'
 pkgname=hamlib
 version=4.5.5
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-perl-binding --with-python-binding
  --with-tcl-binding --with-xml-support"
@@ -19,10 +19,6 @@ checksum=601c89f32ed225e9527ade3d64d0d05d23202c05ae21ffa77e59d70ee4597fcd
 
 CFLAGS="-DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
 
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
-	makedepends+=" libxcrypt-devel"
-fi
-
 pre_configure() {
 	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 	export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}"
diff --git a/srcpkgs/hatch-fancy-pypi-readme/template b/srcpkgs/hatch-fancy-pypi-readme/template
index a87bfbac2a2f1c..1fcd9bd5f13154 100644
--- a/srcpkgs/hatch-fancy-pypi-readme/template
+++ b/srcpkgs/hatch-fancy-pypi-readme/template
@@ -1,7 +1,7 @@
 # Template file for 'hatch-fancy-pypi-readme'
 pkgname=hatch-fancy-pypi-readme
 version=24.1.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling"
 depends="hatchling"
diff --git a/srcpkgs/hatch-jupyter-builder/template b/srcpkgs/hatch-jupyter-builder/template
index 0d6d15ac01c671..af3ea922f75e53 100644
--- a/srcpkgs/hatch-jupyter-builder/template
+++ b/srcpkgs/hatch-jupyter-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'hatch-jupyter-builder'
 pkgname=hatch-jupyter-builder
 version=0.9.1
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling"
 depends="hatchling"
diff --git a/srcpkgs/hatch-nodejs-version/template b/srcpkgs/hatch-nodejs-version/template
index eff3bdb4f779e4..7285e4796266c2 100644
--- a/srcpkgs/hatch-nodejs-version/template
+++ b/srcpkgs/hatch-nodejs-version/template
@@ -1,7 +1,7 @@
 # Template file for 'hatch-nodejs-version'
 pkgname=hatch-nodejs-version
 version=0.3.2
-revision=3
+revision=2
 build_style=python3-pep517
 hostmakedepends="hatchling"
 depends="hatchling"
diff --git a/srcpkgs/hatch-vcs/template b/srcpkgs/hatch-vcs/template
index 3b30053ca23a2d..2339aea763422f 100644
--- a/srcpkgs/hatch-vcs/template
+++ b/srcpkgs/hatch-vcs/template
@@ -1,7 +1,7 @@
 # Template file for 'hatch-vcs'
 pkgname=hatch-vcs
 version=0.4.0
-revision=2
+revision=1
 build_style=python3-pep517
 make_check_args="--deselect tests/test_build.py::test_basic
  --deselect tests/test_build.py::test_write
diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template
index 46e9e4d1259f73..f8f9e156ab3a06 100644
--- a/srcpkgs/hatch/template
+++ b/srcpkgs/hatch/template
@@ -1,7 +1,7 @@
 # Template file for 'hatch'
 pkgname=hatch
 version=1.6.3
-revision=4
+revision=3
 build_style=python3-pep517
 # ignore backend tests, because updating hatchling when there is no new hatch
 # version yet breaks these in hatch.
diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
index 81a777c33bd1f1..d87caab4422f15 100644
--- a/srcpkgs/hatchling/template
+++ b/srcpkgs/hatchling/template
@@ -1,7 +1,7 @@
 # Template file for 'hatchling'
 pkgname=hatchling
 version=1.25.0
-revision=2
+revision=1
 build_style=python3-pep517
 _deps="python3-editables python3-packaging python3-pathspec python3-pluggy
  python3-trove-classifiers"
diff --git a/srcpkgs/heisenbridge/template b/srcpkgs/heisenbridge/template
index e3020a360da506..32129bc0639472 100644
--- a/srcpkgs/heisenbridge/template
+++ b/srcpkgs/heisenbridge/template
@@ -1,7 +1,7 @@
 # Template file for 'heisenbridge'
 pkgname=heisenbridge
 version=1.15.0
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-irc python3-ruamel.yaml python3-mautrix python3-socks python3-aiohttp python3-async-timeout"
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index d0f84a71e77d5c..cc1b03700ec611 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.16.2
-revision=6
+revision=5
 build_style=meson
 configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
diff --git a/srcpkgs/hg-evolve/template b/srcpkgs/hg-evolve/template
index 19b6c6b3927859..45ded6d575a2e7 100644
--- a/srcpkgs/hg-evolve/template
+++ b/srcpkgs/hg-evolve/template
@@ -1,7 +1,7 @@
 # Template file for 'hg-evolve'
 pkgname=hg-evolve
 version=11.1.4
-revision=2
+revision=1
 _hg_version=6.7.4 # sync with mercurial version in void repos
 build_style=python3-module
 build_wrksrc="hg-evolve-${version}"
diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 5e8116d90b61c9..02b0cb87833f4f 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,7 +1,7 @@
 # Template file for 'hg-git'
 pkgname=hg-git
 version=1.1.0
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-dulwich mercurial"
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index fc7b8a4ed8fb6d..8ef21bf66f31c3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.24
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index 76ccc5b198489a..f0edbaa31862ba 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,7 +1,7 @@
 # Template file for 'hobbits'
 pkgname=hobbits
 version=0.54.1
-revision=2
+revision=1
 _pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
 build_style=cmake
 configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index aea65d01b05362..6e27e4d46590d2 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -2,7 +2,7 @@
 # When possible, keep this package in sync with hplip-plugin
 pkgname=hplip
 version=3.24.4
-revision=2
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template
index b3e8c176919dd9..6ab938f01525ba 100644
--- a/srcpkgs/httpie/template
+++ b/srcpkgs/httpie/template
@@ -1,7 +1,7 @@
 # Template file for 'httpie'
 pkgname=httpie
 version=3.2.4
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-requests-toolbelt
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index d39b84f5c2078b..31f5be4f0d323c 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2023.0.0
-revision=2
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DBUILD_WITH_EPOXY=on"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d58540b635a231..ab3c9d4d92dca9 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.139.5
+version=0.139.3
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=ed3e3e8887285c71b5d8ae9f9be956c5313c16f31c8501602d52eae7a002f53d
+checksum=8d83115df9a540b87817bab7615d836ff7ed1b3a80a3e8299ee7c2d3d4cae197
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hydrus/template b/srcpkgs/hydrus/template
index 2060c3df942717..1833a26d737db9 100644
--- a/srcpkgs/hydrus/template
+++ b/srcpkgs/hydrus/template
@@ -1,7 +1,7 @@
 # Template file for 'hydrus'
 pkgname=hydrus
 version=573
-revision=3
+revision=2
 pycompile_dirs="usr/lib/hydrus"
 hostmakedepends="python3"
 depends="python3 libopencv-python3 python3-BeautifulSoup4 python3-yaml
diff --git a/srcpkgs/i2c-tools/template b/srcpkgs/i2c-tools/template
index 95fe6f3dac3ab3..a31e6ee801d8f3 100644
--- a/srcpkgs/i2c-tools/template
+++ b/srcpkgs/i2c-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'i2c-tools'
 pkgname=i2c-tools
 version=4.4
-revision=2
+revision=1
 build_style=gnu-makefile
 build_helper=python3
 make_install_args="sbindir=/usr/bin"
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 7a1ae6ec8de7da..e4e922ee9f9630 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.30
-revision=2
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --enable-gtk4
@@ -35,20 +35,7 @@ post_configure() {
 }
 
 pre_build() {
-	[ -n "${CROSS_BUILD}" ] || return 0
-
-	# TODO: fix this hack!
-	#
-	# GIR_EXTRA_LIBS_PATH in g-ir-scanner-qemuwrapper is not being honored,
-	# and the linker cannot find libibus-1.0.so.5 when scanning. Linking
-	# the missing library alongside the scanner targets is sufficient.
-	local s d
-
-	s="${wrksrc}/src/.libs/libibus-1.0.so.5"
-	for d in tools bindings/vala client/wayland; do
-		mkdir -p "${d}/.libs"
-		ln -Tsf "${s}" "${d}/.libs/libibus-1.0.so.5"
-	done
+	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs"
 }
 
 post_install() {
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 6c5be7c56dcb35..69a2e6107adad0 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
 version=2.0.7
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index a4aa594a9578d0..54423bd7cb6243 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,7 +1,7 @@
 # Template file for 'idjc'
 pkgname=idjc
 version=0.9.8
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config git python3 automake gettext-devel libtool"
 makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
index bf8fd6727c7613..b4a47b59073b8c 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,11 +1,11 @@
 # Template file for 'imath'
 pkgname=imath
 version=3.1.9
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DPYTHON=ON"
 hostmakedepends="python3-numpy"
-makedepends="boost-devel boost-python3 python3-devel python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
 short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 48b7eba811892a..ec1d99f8bf90aa 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,7 +1,7 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
 version=0.4.4
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
diff --git a/srcpkgs/impacket/template b/srcpkgs/impacket/template
index a09c9849bd5af2..83c9d8deadfd8a 100644
--- a/srcpkgs/impacket/template
+++ b/srcpkgs/impacket/template
@@ -1,7 +1,7 @@
 # Template file for 'impacket'
 pkgname=impacket
 version=0.10.0
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-six python3-chardet python3-pyasn1
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 60b495e6d4145a..4a7c6d5a5a3450 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,7 +1,7 @@
 # Template file for 'instaloader'
 pkgname=instaloader
 version=4.14
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 6ee18376927f43..8e9a15fc66f2e2 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -1,7 +1,7 @@
 # Template file for 'iotop'
 pkgname=iotop
 version=0.6
-revision=12
+revision=11
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends}"
diff --git a/srcpkgs/ite8291r3-ctl/template b/srcpkgs/ite8291r3-ctl/template
index e5d9602ba34379..889f87d3cd5efd 100644
--- a/srcpkgs/ite8291r3-ctl/template
+++ b/srcpkgs/ite8291r3-ctl/template
@@ -1,7 +1,7 @@
 # Template file for 'ite8291r3-ctl'
 pkgname=ite8291r3-ctl
 version=0.3
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-usb python3-xlib python3-Pillow"
diff --git a/srcpkgs/jack_mixer/template b/srcpkgs/jack_mixer/template
index 563a580bc16705..1255d5a6633338 100644
--- a/srcpkgs/jack_mixer/template
+++ b/srcpkgs/jack_mixer/template
@@ -1,10 +1,10 @@
 # Template file for 'jack_mixer'
 pkgname=jack_mixer
-version=18
-revision=1
+version=17
+revision=3
 build_style=meson
 configure_args="-Dcheck-py-modules=false"
-hostmakedepends="gettext pkg-config python3-Cython"
+hostmakedepends="gettext pkg-config python3-Cython0.29"
 makedepends="glib-devel jack-devel python3-devel"
 depends="python3-cairo python3-gobject python3-xdg"
 short_desc="GTK JACK audio mixer with a look similar to its hardware counterpart"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rdio.space/jackmixer/"
 distfiles="https://github.com/jack-mixer/jack_mixer/releases/download/release-${version}/jack_mixer-${version}.tar.xz"
-checksum=991d3c1442beb40a368da2097c2ddbab56b2108c9c5b2236c0eaa2a6d3981852
+checksum=6c8c5735bed05b0a0f8ed7d3d582bc1dd346c2530331e226c86faec7d355e086
 
 post_extract() {
 	rm -f src/_jack_mixer.c
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index a93cd50e58b165..79966aa9338909 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.37.1
+version=1.36.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false --libdir=/usr/lib"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=85a87115fb7b59a3fb4dab7d291627ce109eecdcf84b403ec8787ef54082519f
+checksum=104aa500d4a43c2c147851823fd8b7cd06a90d01efcdff71529ff1fa68953bb4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/jaq/template b/srcpkgs/jaq/template
index ea2d0e4613957a..a89410d04a8943 100644
--- a/srcpkgs/jaq/template
+++ b/srcpkgs/jaq/template
@@ -1,9 +1,8 @@
 # Template file for 'jaq'
 pkgname=jaq
-version=2.0.1
+version=2.0.0
 revision=1
 build_style=cargo
-configure_args="--no-default-features"
 make_install_args="--path jaq"
 short_desc="Clone of jq, focussed on correctness, speed, and simplicity"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
@@ -11,7 +10,7 @@ license="MIT"
 homepage="https://github.com/01mf02/jaq"
 changelog="https://github.com/01mf02/jaq/releases"
 distfiles="https://github.com/01mf02/jaq/archive/refs/tags/v${version}.tar.gz"
-checksum=e554f375500d09813c9a2f4454217b8d12ae3be5dba56bc545b199ae0d4ab72e
+checksum=7535387562c0e5519811bfd1f405eb8cb7683533781e0790981221e8e5b723c2
 
 # uses machine-sized integers but tests run on 64 bit values
 if [ "${XBPS_WORDSIZE}" = 32 ]; then
diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 4b668977ec03e0..ccd4c56eb7e8ef 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,7 +1,7 @@
 # Template file for 'jc'
 pkgname=jc
 version=1.25.4
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Pygments python3-ruamel.yaml python3-xmltodict"
diff --git a/srcpkgs/jep/template b/srcpkgs/jep/template
index 6f6350fdd001ea..5a66cbe991486f 100644
--- a/srcpkgs/jep/template
+++ b/srcpkgs/jep/template
@@ -1,7 +1,7 @@
 # Template file for 'jep'
 pkgname=jep
 version=4.2.0
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools openjdk17"
 makedepends="python3-devel openjdk17"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 4e388f1642b052..e5aef8d76c2e9c 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,7 +1,7 @@
 # Template file for 'jrnl'
 pkgname=jrnl
 version=4.1
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
 depends="python3-colorama python3-cryptography
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 50bdf12ce424d1..de8bd72c63b952 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
 # Template file for 'jujutsu'
 pkgname=jujutsu
 version=0.24.0
-revision=3
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -23,8 +23,7 @@ do_install() {
 	done
 
 	for _shell in bash fish zsh; do
-		COMPLETE=${_shell} vtargetrun ${DESTDIR}/usr/bin/jj > jj.${_shell}
-		sed -i -e "s:$DESTDIR::g" jj.${_shell}
+		vtargetrun ${DESTDIR}/usr/bin/jj util completion ${_shell} > jj.${_shell}
 		vcompletion jj.${_shell} ${_shell} jj
 	done
 }
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 4782370a75598d..3b46476ec61ea1 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,7 +1,7 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
 version=4.2.4
-revision=2
+revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-jupyter-builder"
 depends="nodejs python3-async-lru python3-httpx python3-ipython_ipykernel
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 9f274195e76cb6..e77b15f981512e 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,6 +1,6 @@
 # Template file for 'justbuild'
 pkgname=justbuild
-version=1.4.1
+version=1.4.0
 revision=1
 create_wrksrc=yes
 hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/just-buildsystem/justbuild/"
 changelog="https://github.com/just-buildsystem/justbuild/blob/master/CHANGELOG.md"
 distfiles="https://github.com/just-buildsystem/justbuild/archive/v${version}.tar.gz"
-checksum=a8261fe2256d84eedd7b5e19ef3e8d70a249b160f6d86dc4e06f9818c4a7b721
+checksum=62e8f12c9da5d2eb30f81b3c19ba060af3d045e1a6aeafd0ef2661dd7f5280e7
 conflicts="just>=0"
 nocross="not supported by bootstrapping"
 
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 21c7869dcb4239..dcd35e3adc8fab 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,7 +1,7 @@
 # Template file for 'kapidox'
 pkgname=kapidox
 version=6.7.0
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"
diff --git a/srcpkgs/kdevelop-python/patches/python-3.13.patch b/srcpkgs/kdevelop-python/patches/python-3.13.patch
deleted file mode 100644
index cb28d72befaece..00000000000000
--- a/srcpkgs/kdevelop-python/patches/python-3.13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2024-08-15 18:29:03.000000000 -0400
-+++ b/CMakeLists.txt	2024-11-23 10:07:32.447444759 -0500
-@@ -42,7 +42,7 @@
- 
- set(Python3_USE_STATIC_LIBS FALSE)
- set(Python3_FIND_STRATEGY VERSION)
--find_package(Python3 3.4.3...<3.13 COMPONENTS Interpreter Development REQUIRED)
-+find_package(Python3 3.4.3...<3.14 COMPONENTS Interpreter Development REQUIRED)
- 
- configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY)
- 
-diff -ur a/parser/python_header.h b/parser/python_header.h
---- a/parser/python_header.h	2024-11-23 10:06:59.481365933 -0500
-+++ b/parser/python_header.h	2024-11-23 10:07:26.155429709 -0500
-@@ -14,10 +14,6 @@
- #include <language/duchain/duchainlock.h>
- 
- #include <sys/types.h> /* define ssize_t with musl libc */
--#include "pyport.h"
--#ifndef _WIN32
--#include "pyconfig.h"
--#endif
- 
- #include "Python.h"
- 
diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index 5fafb3ada55ba6..a613ce1d407c92 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,17 +1,15 @@
 # Template file for 'kdevelop-python'
 pkgname=kdevelop-python
 version=24.08.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
 pycompile_dirs="usr/share/kdevpythonsupport"
-# FIXME: libimobiledevice added only to resolve ordering for Python rebuilds
 hostmakedepends="extra-cmake-modules tar gettext qt6-base qt6-tools
- kf6-kconfig kf6-kcmutils python3 libimobiledevice"
-# FIXME: libimobiledevice added only to resolve ordering for Python rebuilds
+ kf6-kconfig kf6-kcmutils python3"
 makedepends="python3-devel kf6-knewstuff-devel kf6-kitemmodels-devel
- kf6-threadweaver-devel kf6-ktexteditor-devel kf6-kcmutils-devel
- kf6-knotifyconfig-devel kdevelop-devel libimobiledevice"
+ kf6-threadweaver-devel kf6-ktexteditor-devel kf6-kcmutils-devel kf6-knotifyconfig-devel
+ kdevelop-devel"
 short_desc="Python 3 language and Django project support for KDevelop"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
diff --git a/srcpkgs/keystone/template b/srcpkgs/keystone/template
index 06d55e251c1293..84bee2c91be4ff 100644
--- a/srcpkgs/keystone/template
+++ b/srcpkgs/keystone/template
@@ -1,7 +1,7 @@
 # Template file for 'keystone'
 pkgname=keystone
 version=0.9.2
-revision=6
+revision=5
 build_style=cmake
 configure_args='-DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD=all'
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/kf6-solid/template b/srcpkgs/kf6-solid/template
index e3982ce884e278..93e8afd1540311 100644
--- a/srcpkgs/kf6-solid/template
+++ b/srcpkgs/kf6-solid/template
@@ -1,7 +1,7 @@
 # Template file for 'kf6-solid'
 pkgname=kf6-solid
 version=6.8.0
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base flex pkg-config"
 makedepends="qt6-base-devel libmount-devel libplist-devel
@@ -16,7 +16,7 @@ distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.x
 checksum=ace5145f59db548bcf423cb6b70fd870fefba37f07a649164394a802b3ca7941
 
 kf6-solid-devel_package() {
-	depends="qt6-base-devel ${sourcepkg}>=${version}_${revision}"
+	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 5526edd35ffea0..92569004d9e37b 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
 # Template file for 'khal'
 pkgname=khal
 version=0.11.3
-revision=2
+revision=1
 build_style=python3-module
 # Tests get the path to the configuration file wrong in an xbps-src chroot
 make_check_args="
diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index 2418e1e30a6a8d..59f614d4b8c383 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,7 +1,7 @@
 # Template file for 'khard'
 pkgname=khard
 version=0.18.0
-revision=3
+revision=2
 build_style=python3-module
 # fails in CI
 make_check_args="--deselect test/test_command_line_interface.py::MiscCommands"
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 9621ae00b52f91..c0d90acaf430ba 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -2,7 +2,7 @@
 # XXX: keep in sync with kicad-doc
 pkgname=kicad
 version=8.0.6
-revision=2
+revision=1
 build_style=cmake
 build_helper="cmake-wxWidgets-gtk3"
 configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_USE_EGL=ON -DKICAD_BUILD_QA_TESTS=OFF
diff --git a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
new file mode 100644
index 00000000000000..c7019f985e1bb5
--- /dev/null
+++ b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
@@ -0,0 +1,95 @@
+From 1e8c1476d55d6d3d5651b4ac060960c68f53899e Mon Sep 17 00:00:00 2001
+From: John Zimmermann <johnz@posteo.net>
+Date: Wed, 29 Dec 2021 12:54:31 +0100
+Subject: [PATCH] fix boost python bindung with boost 1.67+
+
+---
+ CMakeLists.txt | 35 ++++++++++++++++++++++++-----------
+ 1 file changed, 24 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index beed7bbb..ed94d104 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,18 @@ endif()
+ 
+ include(KigConfigureChecks.cmake)
+ 
+-find_package(BoostPython)
++find_package(Boost)
++find_package(PythonLibs 3.12)
++
++if(Boost_FOUND AND PYTHONLIBS_FOUND)
++  if(${Boost_VERSION} GREATER 106699 OR ${Boost_VERSION} VERSION_GREATER_EQUAL 1.67)
++    message("Searching for python boost")
++    find_package(Boost COMPONENTS python312 REQUIRED)
++    set(Boost_PYTHON_LIBRARY ${Boost_PYTHON312_LIBRARY})
++  else()
++    find_package(Boost COMPONENTS python)
++  endif()
++endif(Boost_FOUND AND PYTHONLIBS_FOUND)
+ 
+ add_subdirectory( doc )
+ add_subdirectory( icons )
+@@ -61,10 +72,10 @@ add_subdirectory( macros )
+ add_subdirectory( data )
+ add_subdirectory( pykig )
+ 
+-if(BoostPython_FOUND)
++if(Boost_PYTHON312_FOUND AND PYTHONLIBS_FOUND)
+   add_subdirectory( scripting )
+   add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING)
+-endif(BoostPython_FOUND)
++endif(Boost_PYTHON312_FOUND AND PYTHONLIBS_FOUND)
+ 
+ set_package_properties(
+    BoostPython PROPERTIES
+@@ -85,9 +96,10 @@ set_package_properties(
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ 
+ include_directories( ${CMAKE_SOURCE_DIR}/modes )
+-if(BoostPython_FOUND)
+-  include_directories(${BoostPython_INCLUDE_DIRS})
+-endif(BoostPython_FOUND)
++if(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND)
++  include_directories(${Boost_INCLUDE_DIRS})
++  include_directories(${PYTHON_INCLUDE_PATH})
++endif(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND)
+ 
+ # kigpart
+ 
+@@ -225,7 +237,7 @@ ki18n_wrap_ui(kigpart_PART_SRCS
+    misc/kigcoordinateprecisiondialog.ui
+ )
+ 
+-if(BoostPython_FOUND)
++if(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND)
+   set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
+      modes/popup/scriptactionsprovider.cc
+      scripting/newscriptwizard.cc
+@@ -236,7 +248,7 @@ if(BoostPython_FOUND)
+   )
+ 
+   kde_source_files_enable_exceptions(scripting/python_scripter.cc)
+-endif(BoostPython_FOUND)
++endif(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND)
+ 
+ 
+ add_library(kigpart MODULE ${kigpart_PART_SRCS})
+@@ -258,9 +270,10 @@ target_link_libraries(kigpart
+   ${KDE5_KUTILS_LIBS}
+ )
+ 
+-if(BoostPython_FOUND)
+-  target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS})
+-endif(BoostPython_FOUND)
++if(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND)
++  message("testing")
++  target_link_libraries(kigpart ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${KDE5_KTEXTEDITOR_LIBS})
++endif(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND)
+ 
+ if (Qt5XmlPatterns_FOUND)
+   target_link_libraries(kigpart Qt5::XmlPatterns)
+-- 
+2.34.1
+
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 06cae0b5bcc828..5eccc67e6d50b5 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
 # Template file for 'kig'
 pkgname=kig
 version=24.08.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
@@ -9,9 +9,7 @@ configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
  -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs/modules"
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
  pkg-config qt5-host-tools qt5-qmake"
-# FIXME: libimobiledevice added only to resolve ordering for Python rebuilds
-makedepends="boost-devel boost-python3 python3-devel libimobiledevice
- kparts-devel ktexteditor-devel qt5-devel qt5-svg-devel"
+makedepends="boost-devel kparts-devel ktexteditor-devel python3-devel qt5-devel qt5-svg-devel"
 short_desc="KDE education tool for interactive geometry"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 57f0e8bb1255ec..0879165dcf2ab6 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
 # Template file for 'kitty'
 pkgname=kitty
 version=0.37.0
-revision=2
+revision=1
 build_helper="python3"
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="go pkg-config python3 wayland-devel wayland-protocols nerd-fonts-symbols-ttf"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 6a58333277a44d..884548d43523a1 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.4.3
+version=3.4.2
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -21,7 +21,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 changelog="https://gitlab.nic.cz/knot/knot-dns/-/raw/${version%*.*}/NEWS"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=fb153f07805f4679e836f143a74f5cd204ae71c3acbea7ab05ef8e012c6e905c
+checksum=d835285c1057d45effa1479cfe1f107a50e83d11c1c6d36f270deda88799883e
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/kodi/patches/no-werror.patch b/srcpkgs/kodi/patches/no-werror.patch
deleted file mode 100644
index 2ebc40ede53909..00000000000000
--- a/srcpkgs/kodi/patches/no-werror.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake
---- a/cmake/scripts/common/ArchSetup.cmake	2024-08-17 03:06:48.000000000 -0400
-+++ b/cmake/scripts/common/ArchSetup.cmake	2024-11-23 18:01:32.568554400 -0500
-@@ -175,15 +175,6 @@
-     -g
-     -D_DEBUG
-   )
--
--  # these options affect only core code
--  if(NOT CORE_COMPILE_OPTIONS)
--    set(CORE_COMPILE_OPTIONS
--      -Werror=double-promotion
--      -Werror=missing-field-initializers
--      -Werror=sign-compare
--    )
--  endif()
- endif()
- 
- # set for compile info to help detect binary addons
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..6e94577ff2cfeb 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=21.1
+version=21.0
 revision=1
 _codename="Omega"
 _crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
  https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
  https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
  https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="7f54c1fd8456ac46221fbc85e447362bdc209163c6cb19fca98d106560071b7c
  6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
  f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
  719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
 	fi
 }
 
-post_install() {
-	mkdir -p "${DESTDIR}/${py3_sitelib}"
-	mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
 do_check() {
 	./build/kodi-test --gtest_filter="${_gtest_filter}"
 }
diff --git a/srcpkgs/kore/patches/python-3.13.patch b/srcpkgs/kore/patches/python-3.13.patch
deleted file mode 100644
index dc401eedefdb40..00000000000000
--- a/srcpkgs/kore/patches/python-3.13.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 4bd456a334bcf9679fe0f4e762d9c3a86915727d Mon Sep 17 00:00:00 2001
-From: Joris Vink <joris@sanctorum.se>
-Date: Fri, 8 Nov 2024 20:08:19 +0100
-Subject: [PATCH] Support Python 3.13.
-
-Since we're using some cpython internals that change from time to time
-we have to adjust for the 3.13 release accordingly.
----
- src/python.c | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/python.c b/src/python.c
-index 48506620..01c094e7 100644
---- a/src/python.c
-+++ b/src/python.c
-@@ -55,10 +55,33 @@
- 
- #include <frameobject.h>
- 
-+/*
-+ * Python 3.13.x requires that Py_BUILD_CORE is defined before we pull
-+ * in the pycore_frame header file, and it loves using unnamed unions
-+ * so we have to turn off pendatic mode before including it.
-+ *
-+ * The f_code member was removed from _PyInterpreterFrame and is replaced
-+ * with a PyObject called f_executable. There is an _PyFrame_GetCode()
-+ * helper function now.
-+ */
-+#if PY_VERSION_HEX >= 0x030d0000
-+#define Py_BUILD_CORE			1
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored		"-Wpedantic"
-+#endif
-+
-+#if PY_VERSION_HEX < 0x030d0000
-+#define _PyFrame_GetCode(frame)		(frame->f_code)
-+#endif
-+
- #if PY_VERSION_HEX >= 0x030b0000
- #include <internal/pycore_frame.h>
- #endif
- 
-+#if PY_VERSION_HEX >= 0x030d0000
-+#pragma GCC diagnostic pop
-+#endif
-+
- #if PY_VERSION_HEX < 0x030A0000
- typedef enum {
- 	PYGEN_RETURN = 0,
-@@ -1201,7 +1224,7 @@ python_resolve_frame_line(void *ptr)
- 
- 	frame = ptr;
- 	addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT);
--	line = PyCode_Addr2Line(frame->f_code, addr);
-+	line = PyCode_Addr2Line(_PyFrame_GetCode(frame), addr);
- #else
- 	line = PyFrame_GetLineNumber(ptr);
- #endif
-@@ -1232,8 +1255,8 @@ python_coro_trace(const char *label, struct python_coro *coro)
- #else
- 	frame = obj->cr_frame;
- #endif
--	if (frame != NULL && frame->f_code != NULL) {
--		code = frame->f_code;
-+	if (frame != NULL && _PyFrame_GetCode(frame) != NULL) {
-+		code = _PyFrame_GetCode(frame);
- 		func = PyUnicode_AsUTF8AndSize(code->co_name, NULL);
- 		file = PyUnicode_AsUTF8AndSize(code->co_filename, NULL);
- 
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 502690a8c8e6a3..e5c244fe7f97f6 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,7 +1,7 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.2.3
-revision=6
+revision=5
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
diff --git a/srcpkgs/krita/patches/python-3.13.patch b/srcpkgs/krita/patches/python-3.13.patch
deleted file mode 100644
index 6714059895d0ff..00000000000000
--- a/srcpkgs/krita/patches/python-3.13.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 0f43ec3158225092f6a02422eb90c56421326570 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
-Date: Tue, 18 Jun 2024 22:05:34 +0200
-Subject: [PATCH] Changes to build pykrita with Python 3.13
-
-Python 3.11 deprecated Py_SetPath() in 2022 and Python 3.13 removed it.
-Instead one needs to use the new PyConfig API (PEP 587) added to Python
-3.8.
-
-Fix: #488680
----
- .../extensions/pykrita/plugin/utilities.cpp   | 61 +++++++++++++++++--
- plugins/extensions/pykrita/plugin/utilities.h |  4 +-
- 2 files changed, 57 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/utilities.cpp b/plugins/extensions/pykrita/plugin/utilities.cpp
-index 4f58183238..1e497b2681 100644
---- a/plugins/extensions/pykrita/plugin/utilities.cpp
-+++ b/plugins/extensions/pykrita/plugin/utilities.cpp
-@@ -19,8 +19,10 @@
- #include <cmath>
- #include <Python.h>
- 
-+#include <QDebug>
- #include <QDir>
- #include <QLibrary>
-+#include <QProcessEnvironment>
- #include <QString>
- #include <QStringList>
- #include <QVector>
-@@ -412,18 +414,65 @@ bool Python::setPath(const QStringList& scriptPaths)
-         joinedPaths = joinedPaths + pathSeparator + originalPath;
-     }
-     dbgScript << "Setting python paths:" << joinedPaths;
-+
- #ifdef Q_OS_WIN
--    QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
--    joinedPaths.toWCharArray(joinedPathsWChars.data());
--    Py_SetPath(joinedPathsWChars.data());
-+    PyStatus status;
-+    PyConfig config;
-+    PyConfig_InitPythonConfig(&config);
-+
-+    for (const QString& path : joinedPaths.split(pathSeparator)) {
-+        status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str());
-+        if (PyStatus_Exception(status)) {
-+            qDebug() << "Error appending to PyWideStringList:" << status.err_msg;
-+            dbgScript << "Error appending to PyWideStringList";
-+            return false;
-+        }
-+    }
-+
-+    config.module_search_paths_set = true;
-+    qDebug() << "Set module_search_paths";
-+
-+    status = Py_InitializeFromConfig(&config);
-+    if (PyStatus_Exception(status)) {
-+        qDebug() << "Cannot initialize Py_InitializeFromConfig:" << status.err_msg;
-+        Py_ExitStatusException(status);
-+        PyConfig_Clear(&config);
-+        dbgScript << "Cannot initialize Py_InitializeFromConfig config";
-+        return false;
-+    }
-+
-+    PyConfig_Clear(&config);
- #else
-     if (runningInBundle) {
--        QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
--        joinedPaths.toWCharArray(joinedPathsWChars.data());
--        Py_SetPath(joinedPathsWChars.data());
-+        PyStatus status;
-+        PyConfig config;
-+        PyConfig_InitPythonConfig(&config);
-+
-+        for (const QString& path : joinedPaths.split(pathSeparator)) {
-+            status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str());
-+            if (PyStatus_Exception(status)) {
-+                qDebug() << "Error appending to PyWideStringList:" << status.err_msg;
-+                dbgScript << "Error appending to PyWideStringList";
-+                return false;
-+            }
-+        }
-+
-+        config.module_search_paths_set = true;
-+
-+        status = Py_InitializeFromConfig(&config);
-+        if (PyStatus_Exception(status)) {
-+            Py_ExitStatusException(status);
-+            qDebug() << "Cannot initialize Py_InitializeFromConfig 2:" << status.err_msg;
-+            PyConfig_Clear(&config);
-+            dbgScript << "Cannot initialize Py_InitializeFromConfig config";
-+            return false;
-+        }
-+
-+        PyConfig_Clear(&config);
-     }
-     else {
-         qputenv("PYTHONPATH", joinedPaths.toLocal8Bit());
-+        qDebug() << "Set PYTHONPATH environment variable";
-     }
- #endif
-     isPythonPathSet = true;
-diff --git a/plugins/extensions/pykrita/plugin/utilities.h b/plugins/extensions/pykrita/plugin/utilities.h
-index fb309bd0b8..aec47da239 100644
---- a/plugins/extensions/pykrita/plugin/utilities.h
-+++ b/plugins/extensions/pykrita/plugin/utilities.h
-@@ -81,8 +81,8 @@ public:
-     static bool libraryLoad();
- 
-     /**
--     * Set the Python paths by calling Py_SetPath. This should be called before
--     * initialization to ensure the proper libraries get loaded.
-+     * Set the Python paths by calling Py_InitializeFromConfig. This should be
-+     * called before initialization to ensure the proper libraries get loaded.
-      */
-     static bool setPath(const QStringList& scriptPaths);
- 
--- 
-2.45.2
-
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b69726d67dcaf..bc465fadf1d933 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.2.6
-revision=2
+revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF -DENABLE_UPDATERS=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template
index cb204f106c6ab7..9724e86fe2a78d 100644
--- a/srcpkgs/ktoblzcheck/template
+++ b/srcpkgs/ktoblzcheck/template
@@ -1,7 +1,7 @@
 # Template file for 'ktoblzcheck'
 pkgname=ktoblzcheck
 version=1.53
-revision=6
+revision=5
 build_style=cmake
 configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO"
 hostmakedepends="pkg-config python3"
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 4766f97a01740c..eba15b62a4c410 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.32.0
+version=1.31.3
 revision=1
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=3793859c53f09ebc92e013ea858b8916cc19d7fe288ec95882dada4e5a075d08
+checksum=a58bf0797989acc9530a23164d529d5df5e4068e2fce9738cbe6f11f823ccf20
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 3b1eb69f5fc12a..22bf163847e7a1 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,7 +1,7 @@
 # Template file for 'kupfer'
 pkgname=kupfer
 version=321
-revision=5
+revision=4
 build_style=waf3
 pycompile_dirs="usr/share/kupfer/kupfer"
 configure_args="--no-update-mime --no-update-icon-cache"
diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 2908dc86a305ba..b400e28511638e 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,7 +1,7 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=15
+revision=14
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template
index e9aad41c5cffa1..b17ebab0cca63b 100644
--- a/srcpkgs/labwc/template
+++ b/srcpkgs/labwc/template
@@ -1,6 +1,6 @@
 # Template file for 'labwc'
 pkgname=labwc
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://labwc.github.io/"
 changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md"
 distfiles="https://github.com/labwc/labwc/archive/refs/tags/${version}.tar.gz"
-checksum=1adba1c87ec26f2f00409b47a0b79ccfd68bd160e1abc41822fb01f0a76ee947
+checksum=8e510655cf0c84875c541f4afeb636e707d365210993ad22d64d8bc3108a3433
diff --git a/srcpkgs/ldapdomaindump/template b/srcpkgs/ldapdomaindump/template
index 72d609edc9eef2..82314c72341119 100644
--- a/srcpkgs/ldapdomaindump/template
+++ b/srcpkgs/ldapdomaindump/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapdomaindump'
 pkgname=ldapdomaindump
 version=0.9.4
-revision=3
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-ldap3 python3-dnspython"
diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template
index 6a697c7822f22c..f3dcb95611ceb4 100644
--- a/srcpkgs/ldb/template
+++ b/srcpkgs/ldb/template
@@ -1,7 +1,7 @@
 # Template file for 'ldb'
 pkgname=ldb
 version=2.9.0
-revision=2
+revision=1
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"
diff --git a/srcpkgs/legendary/template b/srcpkgs/legendary/template
index a707006dca5f80..83988d537663dd 100644
--- a/srcpkgs/legendary/template
+++ b/srcpkgs/legendary/template
@@ -1,7 +1,7 @@
 # Template file for 'legendary'
 pkgname=legendary
 version=0.20.34
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-filelock"
diff --git a/srcpkgs/lensfun/template b/srcpkgs/lensfun/template
index 60995f17e26ce8..fb81b5909694b8 100644
--- a/srcpkgs/lensfun/template
+++ b/srcpkgs/lensfun/template
@@ -1,7 +1,7 @@
 # Template file for 'lensfun'
 pkgname=lensfun
 version=0.3.4
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DINSTALL_HELPER_SCRIPTS=0"
 hostmakedepends="pkg-config python3-setuptools"
diff --git a/srcpkgs/lesspass/template b/srcpkgs/lesspass/template
index 831dc30d2888b0..a37595ee00407d 100644
--- a/srcpkgs/lesspass/template
+++ b/srcpkgs/lesspass/template
@@ -1,7 +1,7 @@
 # Template file for 'lesspass'
 pkgname=lesspass
 version=10.2.1
-revision=4
+revision=3
 build_wrksrc="cli"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/lfm/template b/srcpkgs/lfm/template
index 622315331528be..3acfc3624b84cd 100644
--- a/srcpkgs/lfm/template
+++ b/srcpkgs/lfm/template
@@ -1,7 +1,7 @@
 # Template file for 'lfm'
 pkgname=lfm
 version=3.1
-revision=8
+revision=7
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index 0ceb9e3b4c04bc..a5d7c58dec6b27 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libaccounts-glib'
 pkgname=libaccounts-glib
 version=1.26
-revision=2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpy-overrides-dir=/${py3_sitelib}/gi/overrides"
diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 76ff9d95c422ab..29f9c555bd0779 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -1,7 +1,7 @@
 # Template file for 'libblockdev'
 pkgname=libblockdev
 version=3.1.1
-revision=3
+revision=2
 build_style=gnu-configure
 make_check_target="test"
 hostmakedepends="pkg-config python3-setuptools"
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 1641d4babbf643..173485a41ccc7a 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
 version=2.10
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gettext python3"
 makedepends="mpfr-devel pcre2-devel"
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index 186866489e8496..62666752e06950 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
 version=0.8.5
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--without-python --without-python3"
 short_desc="Alternate POSIX capabilities library"
diff --git a/srcpkgs/libcec/patches/python-3.13.patch b/srcpkgs/libcec/patches/python-3.13.patch
deleted file mode 100644
index e7c351d0ec4e3f..00000000000000
--- a/srcpkgs/libcec/patches/python-3.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/src/libcec/SwigHelper.h b/src/libcec/SwigHelper.h
---- a/src/libcec/SwigHelper.h	2020-07-13 06:18:33.000000000 -0400
-+++ b/src/libcec/SwigHelper.h	2024-11-23 15:00:04.684002606 -0500
-@@ -119,7 +119,7 @@
-       if (!!m_callbacks[callback])
-       {
-         /** call the callback */
--        result = PyEval_CallObject(m_callbacks[callback], arglist);
-+        result = PyObject_CallObject(m_callbacks[callback], arglist);
- 
-         /** unref the argument and result */
-         if (!!arglist)
diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index 877a04a15179de..b31bc3c3b2cf6a 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -1,7 +1,7 @@
 # Template file for 'libcec'
 pkgname=libcec
 version=6.0.2
-revision=5
+revision=4
 build_style=cmake
 configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}"
 hostmakedepends="pkg-config libtool swig"
diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template
index e4bc9e1e80163d..9574c1d53f0693 100644
--- a/srcpkgs/libffado/template
+++ b/srcpkgs/libffado/template
@@ -1,7 +1,7 @@
 # Template file for 'libffado'
 pkgname=libffado
 version=2.4.9
-revision=2
+revision=1
 build_style=scons
 scons_use_destdir=yes
 make_build_args="PREFIX=/usr MANDIR=/usr/share/man
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 9a0628e3d9b26a..89106c53024a3d 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.8.4
-revision=3
+revision=2
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON
diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template
index 6fd51561cd2a7c..f6739772aa3c77 100644
--- a/srcpkgs/libgexiv2/template
+++ b/srcpkgs/libgexiv2/template
@@ -1,7 +1,7 @@
 # Template file for 'libgexiv2'
 pkgname=libgexiv2
 version=0.14.3
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir introspection) $(vopt_bool vala vapi)"
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 4203bf1ad73969..37a02337da3736 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
 version=1.2.0
-revision=3
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)
diff --git a/srcpkgs/libgpiod/template b/srcpkgs/libgpiod/template
index 47423396da0984..13bf62ca546c6a 100644
--- a/srcpkgs/libgpiod/template
+++ b/srcpkgs/libgpiod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpiod'
 pkgname=libgpiod
 version=2.2
-revision=3
+revision=2
 build_style="gnu-configure"
 build_helper="python3"
 configure_args="--prefix=/usr --enable-tools=yes --enable-bindings-cxx
diff --git a/srcpkgs/libiio/template b/srcpkgs/libiio/template
index acd6a929e42c2e..a572eabda899f7 100644
--- a/srcpkgs/libiio/template
+++ b/srcpkgs/libiio/template
@@ -1,7 +1,7 @@
 # Template file for 'libiio'
 pkgname=libiio
 version=0.25
-revision=3
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d -DWITH_DOC=YES
  -DWITH_SERIAL_BACKEND=YES -DHAVE_DNS_SD=YES -DPYTHON_BINDINGS=YES"
diff --git a/srcpkgs/libimobiledevice/patches/00.cython3.patch b/srcpkgs/libimobiledevice/patches/00.cython3.patch
deleted file mode 100644
index ce76f5d8465f42..00000000000000
--- a/srcpkgs/libimobiledevice/patches/00.cython3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fb1dec7e2cbb2eae14536d8d68db25d3f9384ac1 Mon Sep 17 00:00:00 2001
-From: aymenim <aymen_ibrahim@hotmail.com>
-Date: Tue, 15 Mar 2016 23:56:08 +0300
-Subject: [PATCH] cython: fixed notification_proxy callback gil lock
-
-cython notification proxy bug segmentation fault when callback called
-without gil
----
- cython/notification_proxy.pxi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi
-index 4ffbf0742..203c7835d 100644
---- a/cython/notification_proxy.pxi
-+++ b/cython/notification_proxy.pxi
-@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END
- NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED
- NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED
- 
--cdef void np_notify_cb(const_char_ptr notification, void *py_callback):
-+cdef void np_notify_cb(const_char_ptr notification, void *py_callback) with gil:
-     (<object>py_callback)(notification)
- 
- cdef class NotificationProxyError(BaseError):
diff --git a/srcpkgs/libimobiledevice/patches/01.cython3.patch b/srcpkgs/libimobiledevice/patches/01.cython3.patch
deleted file mode 100644
index 865e5c02901504..00000000000000
--- a/srcpkgs/libimobiledevice/patches/01.cython3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 59ec38cb6465f794cf8e2ab204711b9a10dd9eda Mon Sep 17 00:00:00 2001
-From: Andrea Oliveri <oliveriandrea@gmail.com>
-Date: Thu, 11 Jan 2024 22:05:00 +0100
-Subject: [PATCH] cython: Fix cython3 noexcept compilation error
-
----
- cython/imobiledevice.pyx      | 2 +-
- cython/installation_proxy.pxi | 2 +-
- cython/notification_proxy.pxi | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cython/imobiledevice.pyx b/cython/imobiledevice.pyx
-index 2a125aa18..8da229626 100644
---- a/cython/imobiledevice.pyx
-+++ b/cython/imobiledevice.pyx
-@@ -94,7 +94,7 @@ cdef class iDeviceEvent:
-         def __get__(self):
-             return self._c_event.conn_type
- 
--cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) with gil:
-+cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) noexcept:
-     cdef iDeviceEvent event = iDeviceEvent.__new__(iDeviceEvent)
-     event._c_event = c_event
-     (<object>user_data)(event)
-diff --git a/cython/installation_proxy.pxi b/cython/installation_proxy.pxi
-index bf2c1da4c..1d3e3234d 100644
---- a/cython/installation_proxy.pxi
-+++ b/cython/installation_proxy.pxi
-@@ -27,7 +27,7 @@ cdef extern from "libimobiledevice/installation_proxy.h":
-     instproxy_error_t instproxy_restore(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data)
-     instproxy_error_t instproxy_remove_archive(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data)
- 
--cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) with gil:
-+cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) noexcept:
-     (<object>py_callback)(plist.plist_t_to_node(command, False), plist.plist_t_to_node(status, False))
- 
- cdef class InstallationProxyError(BaseError):
-diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi
-index 203c7835d..261200ef0 100644
---- a/cython/notification_proxy.pxi
-+++ b/cython/notification_proxy.pxi
-@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END
- NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED
- NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED
- 
--cdef void np_notify_cb(const_char_ptr notification, void *py_callback) with gil:
-+cdef void np_notify_cb(const_char_ptr notification, void *py_callback) noexcept:
-     (<object>py_callback)(notification)
- 
- cdef class NotificationProxyError(BaseError):
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 0c0262cb2f2a1d..d7021ccaaf8e99 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,9 +1,9 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=7
+revision=6
 build_style=gnu-configure
-hostmakedepends="automake libtool pkgconf python3-Cython"
+hostmakedepends="automake libtool pkgconf python3-Cython0.29"
 makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index f9ca527f3b6e40..74bfc536355bad 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
 # Template file for 'libixion'
 pkgname=libixion
 version=0.19.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index eda20fb1dc30c7..c871455dc8386b 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,7 @@
 # Template file for 'libkdcraw5'
+# XXX: sync version with libkdcraw
 pkgname=libkdcraw5
-version=24.12.0
+version=24.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=0b4b6067fd362d218f6ee088c661c42b2f55cd9e3a8bdfb82efed96bd682625c
+checksum=f106c081a36dc1395c36ce950411b760ebd9156b002bc78e1271ee1e622d0055
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdumpfile/template b/srcpkgs/libkdumpfile/template
index e3de4e047fb54c..573f30622ed295 100644
--- a/srcpkgs/libkdumpfile/template
+++ b/srcpkgs/libkdumpfile/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdumpfile'
 pkgname=libkdumpfile
 version=0.5.4
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="PYTHON=python3"
 hostmakedepends="automake pkg-config libtool python3-setuptools"
diff --git a/srcpkgs/liblouis/template b/srcpkgs/liblouis/template
index 69299629eb8527..fbade9be434c9e 100644
--- a/srcpkgs/liblouis/template
+++ b/srcpkgs/liblouis/template
@@ -1,7 +1,7 @@
 # Template file for 'liblouis'
 pkgname=liblouis
 version=3.15.0
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ucs4"
 hostmakedepends="pkg-config help2man python3-devel python3-setuptools"
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index 7b3a1f6a8a1471..c447667fed4b04 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,7 +1,7 @@
 # Template file for 'libnvme'
 pkgname=libnvme
 version=1.10
-revision=2
+revision=1
 build_style=meson
 configure_args="-Ddocs=man"
 hostmakedepends="pkg-config swig tar xz"
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 44c013d00863bf..2da22764f66e9b 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.3.2
-revision=3
+revision=2
 build_style=cmake
 # Builds fail with Ruby-2.4.1
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON"
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index bcc151612a1112..8615c7ce97a312 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
 # Template file for 'liborcus'
 pkgname=liborcus
 version=0.19.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index 808d788c7cefa0..e5cc677ca1cfef 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
 version=1.36.0
-revision=3
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
diff --git a/srcpkgs/libpeas2/template b/srcpkgs/libpeas2/template
index 27c1a5c02cbb32..84d8b99454c0cd 100644
--- a/srcpkgs/libpeas2/template
+++ b/srcpkgs/libpeas2/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas2'
 pkgname=libpeas2
 version=2.0.1
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgtk_doc=true -Dvapi=true"
diff --git a/srcpkgs/libpfm4/template b/srcpkgs/libpfm4/template
index 1d9694a16dea17..800b57d06712e6 100644
--- a/srcpkgs/libpfm4/template
+++ b/srcpkgs/libpfm4/template
@@ -1,7 +1,7 @@
 # Template file for 'libpfm4'
 pkgname=libpfm4
 version=4.13.0
-revision=3
+revision=2
 build_style=gnu-makefile
 build_helper=python3
 make_use_env=yes
diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index cc04ce12370e0a..e9ea27c2981262 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -1,7 +1,7 @@
 # Template file for 'libplist'
 pkgname=libplist
 version=2.2.0
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool pkgconf python3 python3-Cython"
diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template
index 4786711f548baa..cbd736031b0ea1 100644
--- a/srcpkgs/libproxy/template
+++ b/srcpkgs/libproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'libproxy'
 pkgname=libproxy
 version=0.4.18
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0
  -DWITH_PERL=0 -DWITH_PYTHON3=1 -DWITH_WEBKIT=0"
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 7c5ecc58faaeb8..c7eff1fbe2a537 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,7 +1,7 @@
 # Template file for 'libpwquality'
 pkgname=libpwquality
 version=1.4.5
-revision=3
+revision=2
 build_style=gnu-configure
 build_helper=python3
 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 650b0caa31d62b..3e74df50125d0f 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=24.8.3.2
-revision=2
+revision=1
 build_style=meta
 build_helper="gir"
 make_build_target="build"
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index cd65a955a389c7..9078c4ed974005 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -3,7 +3,7 @@
 pkgname=libsearpc
 # floating tag 3.3-latest
 version=3.3.0.20220902
-revision=3
+revision=2
 _gitrev=15f6f0b9f451b9ecf99dedab72e9242e54e124eb
 build_style=gnu-configure
 configure_args="--with-python3 --disable-static --disable-compile-demo"
diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template
index 86600095dc311a..2376bca73b9a45 100644
--- a/srcpkgs/libsigrokdecode/template
+++ b/srcpkgs/libsigrokdecode/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrokdecode'
 pkgname=libsigrokdecode
 version=0.5.3
-revision=11
+revision=10
 build_style=gnu-configure
 hostmakedepends="pkg-config python3 autoconf automake"
 makedepends="glib-devel python3-devel"
diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index 43b645988c186a..821dedb78d98d7 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -1,7 +1,7 @@
 # Template file for 'libsmbios'
 pkgname=libsmbios
 version=2.4.3
-revision=6
+revision=5
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static"
 hostmakedepends="automake doxygen gettext gettext-devel help2man libtool pkg-config"
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index bf3167a5c31c32..194d2b9022da2d 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=2.0.10
-revision=2
+revision=1
 build_style=cmake
 configure_args="-Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON -Dbuild_tests=ON"
 hostmakedepends="pkg-config gettext python3-devel python3-setuptools"
-makedepends="openssl-devel boost-devel boost-python3 geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 44af179927829b..220e7a7d85f542 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,19 +1,19 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
 version=10.5.0
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel
  libapparmor-devel"
 makedepends="libvirt-devel python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-lxml python3-nose"
 short_desc="Libvirt virtualization API Python3 binding"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
 checksum=785023500f58d3e8e829af98647d43eee97e517aacc9d9e7ded43594ea52d032
-make_check=no # Tests require removed python3-nose
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest
diff --git a/srcpkgs/libvoikko/template b/srcpkgs/libvoikko/template
index 9d07ae81bc04df..52581d7a90c080 100644
--- a/srcpkgs/libvoikko/template
+++ b/srcpkgs/libvoikko/template
@@ -1,7 +1,7 @@
 # Template file for 'libvoikko'
 pkgname=libvoikko
 version=4.3.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-hfst=false --with-dictionary-path=/usr/share/voikko"
 hostmakedepends="python3"
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 336f0e0b1b7ba6..154beba21d50e3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2'
 pkgname=libxml2
 version=2.12.6
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu
  --with-legacy --with-ftp --with-xptr-locs --enable-static"
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index df5320911dee6b..b4ebb999340d41 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,7 +1,7 @@
 # Template file for 'libxslt'
 pkgname=libxslt
 version=1.1.39
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-static --disable-dependency-tracking"
 hostmakedepends="docbook-xml docbook-xsl libtool pkg-config python3"
diff --git a/srcpkgs/lightdm-gtk-greeter-settings/template b/srcpkgs/lightdm-gtk-greeter-settings/template
index 39f2a3c23e1eb6..62b42236752d7f 100644
--- a/srcpkgs/lightdm-gtk-greeter-settings/template
+++ b/srcpkgs/lightdm-gtk-greeter-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter-settings'
 pkgname=lightdm-gtk-greeter-settings
 version=1.2.2
-revision=7
+revision=6
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"
 depends="lightdm-gtk3-greeter python3-gobject"
diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index 32bda55f387b56..4785b7be6c7eb4 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,7 +1,7 @@
 # Template file for 'limine'
 pkgname=limine
-version=8.6.0
-revision=2
+version=8.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-all TOOLCHAIN_FOR_TARGET=llvm"
 hostmakedepends="mtools nasm llvm clang lld"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://limine-bootloader.org/"
 changelog="https://raw.githubusercontent.com/limine-bootloader/limine/trunk/ChangeLog"
 distfiles="https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"
-checksum=e1b159ea7c4d72b253421909e52d4a5343c9378caef4b8be4339c5e48c691821
+checksum=3122945dfc272f0fed5407e152829834651e3186fb29ae14580b71f51d5e491f
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 72bfddd261ce6e..86f79b5946e9d1 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=6.5
-revision=4
+revision=3
 build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl
  python3-setuptools python3-docutils xmlto pkg-config"
diff --git a/srcpkgs/linux4.19/files/DocBook/Makefile b/srcpkgs/linux4.19/files/DocBook/Makefile
new file mode 100644
index 00000000000000..85916f13d330b7
--- /dev/null
+++ b/srcpkgs/linux4.19/files/DocBook/Makefile
@@ -0,0 +1,282 @@
+###
+# This makefile is used to generate the kernel documentation,
+# primarily based on in-line comments in various source files.
+# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how
+# to document the SRC - and how to read it.
+# To add a new book the only step required is to add the book to the
+# list of DOCBOOKS.
+
+DOCBOOKS := z8530book.xml  \
+	    kernel-hacking.xml kernel-locking.xml \
+	    networking.xml \
+	    filesystems.xml lsm.xml kgdb.xml \
+	    libata.xml mtdnand.xml librs.xml rapidio.xml \
+	    s390-drivers.xml scsi.xml \
+	    sh.xml w1.xml
+
+ifeq ($(DOCBOOKS),)
+
+# Skip DocBook build if the user explicitly requested no DOCBOOKS.
+.DEFAULT:
+	@echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."
+else
+ifneq ($(SPHINXDIRS),)
+
+# Skip DocBook build if the user explicitly requested a sphinx dir
+.DEFAULT:
+	@echo "  SKIP    DocBook $@ target (SPHINXDIRS specified)."
+else
+
+
+###
+# The build process is as follows (targets):
+#              (xmldocs) [by docproc]
+# file.tmpl --> file.xml +--> file.ps   (psdocs)   [by db2ps or xmlto]
+#                        +--> file.pdf  (pdfdocs)  [by db2pdf or xmlto]
+#                        +--> DIR=file  (htmldocs) [by xmlto]
+#                        +--> man/      (mandocs)  [by xmlto]
+
+
+# for PDF and PS output you can choose between xmlto and docbook-utils tools
+PDF_METHOD	= $(prefer-db2x)
+PS_METHOD	= $(prefer-db2x)
+
+
+targets += $(DOCBOOKS)
+BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
+xmldocs: $(BOOKS)
+sgmldocs: xmldocs
+
+PS := $(patsubst %.xml, %.ps, $(BOOKS))
+psdocs: $(PS)
+
+PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
+pdfdocs: $(PDF)
+
+HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
+htmldocs: $(HTML)
+	$(call cmd,build_main_index)
+
+MAN := $(patsubst %.xml, %.9, $(BOOKS))
+mandocs: $(MAN)
+	find $(obj)/man -name '*.9' | xargs gzip -nf
+
+# Default location for installed man pages
+export INSTALL_MAN_PATH = $(objtree)/usr
+
+installmandocs: mandocs
+	mkdir -p $(INSTALL_MAN_PATH)/man/man9/
+	find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
+		sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
+		xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
+
+# no-op for the DocBook toolchain
+epubdocs:
+latexdocs:
+linkcheckdocs:
+
+###
+#External programs used
+KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
+KERNELDOC       = $(srctree)/scripts/kernel-doc
+DOCPROC         = $(objtree)/scripts/docproc
+CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
+
+# Use a fixed encoding - UTF-8 if the C library has support built-in
+# or ASCII if not
+LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
+export LC_CTYPE
+
+XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
+XMLTOFLAGS += --skip-validation
+
+###
+# DOCPROC is used for two purposes:
+# 1) To generate a dependency list for a .tmpl file
+# 2) To preprocess a .tmpl file and call kernel-doc with
+#     appropriate parameters.
+# The following rules are used to generate the .xml documentation
+# required to generate the final targets. (ps, pdf, html).
+quiet_cmd_docproc = DOCPROC $@
+      cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
+define rule_docproc
+	set -e;								\
+        $(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) 	\
+        $(cmd_$(1)); 							\
+        ( 								\
+          echo 'cmd_$@ := $(cmd_$(1))'; 				\
+          echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; 		\
+        ) > $(dir $@).$(notdir $@).cmd
+endef
+
+%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE
+	$(call if_changed_rule,docproc)
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
+		   exit 1
+db2xtemplate = db2TYPE -o $(dir $@) $<
+xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
+
+# determine which methods are available
+ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
+	use-db2x = db2x
+	prefer-db2x = db2x
+else
+	use-db2x = notfound
+	prefer-db2x = $(use-xmlto)
+endif
+ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
+	use-xmlto = xmlto
+	prefer-xmlto = xmlto
+else
+	use-xmlto = notfound
+	prefer-xmlto = $(use-db2x)
+endif
+
+# the commands, generated from the chosen template
+quiet_cmd_db2ps = PS      $@
+      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
+%.ps : %.xml
+	$(call cmd,db2ps)
+
+quiet_cmd_db2pdf = PDF     $@
+      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
+%.pdf : %.xml
+	$(call cmd,db2pdf)
+
+
+index = index.html
+main_idx = $(obj)/$(index)
+quiet_cmd_build_main_index = HTML    $(main_idx)
+      cmd_build_main_index = rm -rf $(main_idx); \
+		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
+		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
+		   cat $(HTML) >> $(main_idx)
+
+quiet_cmd_db2html = HTML    $@
+      cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
+		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
+		$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
+
+###
+# Rules to create an aux XML and .db, and use them to re-process the DocBook XML
+# to fill internal hyperlinks
+       gen_aux_xml = :
+ quiet_gen_aux_xml = echo '  XMLREF  $@'
+silent_gen_aux_xml = :
+%.aux.xml: %.xml
+	@$($(quiet)gen_aux_xml)
+	@rm -rf $@
+	@(cat $< | egrep "^<refentry id" | egrep -o "\".*\"" | cut -f 2 -d \" > $<.db)
+	@$(KERNELDOCXMLREF) -db $<.db $< > $@
+.PRECIOUS: %.aux.xml
+
+%.html:	%.aux.xml
+	@(which xmlto > /dev/null 2>&1) || \
+	 (echo "*** You need to install xmlto ***"; \
+	  exit 1)
+	@rm -rf $@ $(patsubst %.html,%,$@)
+	$(call cmd,db2html)
+	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
+            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
+
+quiet_cmd_db2man = MAN     $@
+      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi
+%.9 : %.xml
+	@(which xmlto > /dev/null 2>&1) || \
+	 (echo "*** You need to install xmlto ***"; \
+	  exit 1)
+	$(Q)mkdir -p $(obj)/man/$(*F)
+	$(call cmd,db2man)
+	@touch $@
+
+###
+# Rules to generate postscripts and PNG images from .fig format files
+quiet_cmd_fig2eps = FIG2EPS $@
+      cmd_fig2eps = fig2dev -Leps $< $@
+
+%.eps: %.fig
+	@(which fig2dev > /dev/null 2>&1) || \
+	 (echo "*** You need to install transfig ***"; \
+	  exit 1)
+	$(call cmd,fig2eps)
+
+quiet_cmd_fig2png = FIG2PNG $@
+      cmd_fig2png = fig2dev -Lpng $< $@
+
+%.png: %.fig
+	@(which fig2dev > /dev/null 2>&1) || \
+	 (echo "*** You need to install transfig ***"; \
+	  exit 1)
+	$(call cmd,fig2png)
+
+###
+# Rule to convert a .c file to inline XML documentation
+       gen_xml = :
+ quiet_gen_xml = echo '  GEN     $@'
+silent_gen_xml = :
+%.xml: %.c
+	@$($(quiet)gen_xml)
+	@(                            \
+	   echo "<programlisting>";   \
+	   expand --tabs=8 < $< |     \
+	   sed -e "s/&/\\&amp;/g"     \
+	       -e "s/</\\&lt;/g"      \
+	       -e "s/>/\\&gt;/g";     \
+	   echo "</programlisting>")  > $@
+
+endif # DOCBOOKS=""
+endif # SPHINDIR=...
+
+###
+# Help targets as used by the top-level makefile
+dochelp:
+	@echo  ' Linux kernel internal documentation in different formats (DocBook):'
+	@echo  '  htmldocs        - HTML'
+	@echo  '  pdfdocs         - PDF'
+	@echo  '  psdocs          - Postscript'
+	@echo  '  xmldocs         - XML DocBook'
+	@echo  '  mandocs         - man pages'
+	@echo  '  installmandocs  - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
+	 echo  '                    (default: $(INSTALL_MAN_PATH))'; \
+	 echo  ''
+	@echo  '  cleandocs       - clean all generated DocBook files'
+	@echo
+	@echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
+	@echo  '  valid values for DOCBOOKS are: $(DOCBOOKS)'
+	@echo
+	@echo  "  make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
+	@echo  '     This is useful to generate only the ReST docs (Sphinx)'
+
+
+###
+# Temporary files left by various tools
+clean-files := $(DOCBOOKS) \
+	$(patsubst %.xml, %.dvi,     $(DOCBOOKS)) \
+	$(patsubst %.xml, %.aux,     $(DOCBOOKS)) \
+	$(patsubst %.xml, %.tex,     $(DOCBOOKS)) \
+	$(patsubst %.xml, %.log,     $(DOCBOOKS)) \
+	$(patsubst %.xml, %.out,     $(DOCBOOKS)) \
+	$(patsubst %.xml, %.ps,      $(DOCBOOKS)) \
+	$(patsubst %.xml, %.pdf,     $(DOCBOOKS)) \
+	$(patsubst %.xml, %.html,    $(DOCBOOKS)) \
+	$(patsubst %.xml, %.9,       $(DOCBOOKS)) \
+	$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \
+	$(patsubst %.xml, %.xml.db,  $(DOCBOOKS)) \
+	$(patsubst %.xml, %.xml,     $(DOCBOOKS)) \
+	$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \
+	$(index)
+
+clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
+
+cleandocs:
+	$(Q)rm -f $(call objectify, $(clean-files))
+	$(Q)rm -rf $(call objectify, $(clean-dirs))
+
+# Declare the contents of the .PHONY variable as phony.  We keep that
+# information in a variable so we can use it in if_changed and friends.
+
+.PHONY: $(PHONY)
diff --git a/srcpkgs/linux4.19/files/arm-dotconfig b/srcpkgs/linux4.19/files/arm-dotconfig
new file mode 100644
index 00000000000000..76157f822fb316
--- /dev/null
+++ b/srcpkgs/linux4.19/files/arm-dotconfig
@@ -0,0 +1,6552 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 4.19.287 Kernel Configuration
+#
+
+#
+# Compiler: arm-linux-gnueabihf-gcc (GCC) 12.2.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=120200
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+CONFIG_BUILD_BIN2C=y
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_MEMCG is not set
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_CFS_BANDWIDTH is not set
+# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_CGROUP_PIDS is not set
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+# CONFIG_CGROUP_PERF is not set
+# CONFIG_CGROUP_BPF is not set
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not