From 4604bc75673b68c804dc1afe1ebb83ac1497f85e Mon Sep 17 00:00:00 2001
From: jcznk <60730312+jcznk@users.noreply.github.com>
Date: Sun, 13 Jul 2025 21:21:31 +0200
Subject: [PATCH 01/15] Add margin to QPushButton to prevent clipping (#4201)

* Update CONTRIBUTORS

* Add margin to QPushButton to prevent clipping
---
 CONTRIBUTORS          | 1 +
 qt/aqt/stylesheets.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c22bc764a..9645c698f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -234,6 +234,7 @@ Emmanuel Ferdman <https://github.com/emmanuel-ferdman>
 Sunong2008 <https://github.com/Sunrongguo2008>
 Marvin Kopf <marvinkopf@outlook.com>
 Kevin Nakamura <grinkers@grinkers.net>
+jcznk <https://github.com/jcznk>
 
 ********************
 
diff --git a/qt/aqt/stylesheets.py b/qt/aqt/stylesheets.py
index a262e18b9..6b4eff1f5 100644
--- a/qt/aqt/stylesheets.py
+++ b/qt/aqt/stylesheets.py
@@ -177,9 +177,13 @@ class CustomStyles:
     QPushButton:default {{
         border: 1px solid {tm.var(colors.BORDER_FOCUS)};
     }}
+    QPushButton {{
+        margin: 1px;
+    }}
     QPushButton:focus {{
         border: 2px solid {tm.var(colors.BORDER_FOCUS)};
         outline: none;
+        margin: 0px;
     }}
     QPushButton:hover,
     QTabBar::tab:hover,

From 58a8aa7353982a9928d33b5000c536f4e005025b Mon Sep 17 00:00:00 2001
From: Bradley Szoke <bradleyszoke@gmail.com>
Date: Sun, 13 Jul 2025 14:29:23 -0500
Subject: [PATCH 02/15] fix: set cursor to pointer when on range (#4197)

* set cursor to pointer when on range

* chore: white space removal

* chore: update contributors file
---
 CONTRIBUTORS                                | 1 +
 ts/routes/deck-options/EasyDaysInput.svelte | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9645c698f..b5dfe1d53 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -234,6 +234,7 @@ Emmanuel Ferdman <https://github.com/emmanuel-ferdman>
 Sunong2008 <https://github.com/Sunrongguo2008>
 Marvin Kopf <marvinkopf@outlook.com>
 Kevin Nakamura <grinkers@grinkers.net>
+Bradley Szoke <bradleyszoke@gmail.com>
 jcznk <https://github.com/jcznk>
 
 ********************
diff --git a/ts/routes/deck-options/EasyDaysInput.svelte b/ts/routes/deck-options/EasyDaysInput.svelte
index fb5d9cd2d..c5fb4909a 100644
--- a/ts/routes/deck-options/EasyDaysInput.svelte
+++ b/ts/routes/deck-options/EasyDaysInput.svelte
@@ -85,6 +85,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
     .easy-days-settings input[type="range"] {
         width: 100%;
+        cursor: pointer;
     }
 
     .day {

From a1934ae9e44ef6916a10647468e61ac2e47fb4fe Mon Sep 17 00:00:00 2001
From: sorata <136738526+brishtibheja@users.noreply.github.com>
Date: Mon, 14 Jul 2025 01:05:21 +0530
Subject: [PATCH 03/15] update preferences.ftl (#4196)

---
 ftl/core/preferences.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftl/core/preferences.ftl b/ftl/core/preferences.ftl
index ce24df434..23b72f267 100644
--- a/ftl/core/preferences.ftl
+++ b/ftl/core/preferences.ftl
@@ -34,7 +34,7 @@ preferences-when-adding-default-to-current-deck = When adding, default to curren
 preferences-you-can-restore-backups-via-fileswitch = You can restore backups via File > Switch Profile.
 preferences-legacy-timezone-handling = Legacy timezone handling (buggy, but required for AnkiDroid <= 2.14)
 preferences-default-search-text = Default search text
-preferences-default-search-text-example = eg. 'deck:current '
+preferences-default-search-text-example = e.g. "deck:current"
 preferences-theme = Theme
 preferences-theme-follow-system = Follow System
 preferences-theme-light = Light

From 0375b4aac050c76f971ad071ad1bd3f632b69283 Mon Sep 17 00:00:00 2001
From: llama <gh@siid.sh>
Date: Mon, 14 Jul 2025 06:22:14 +0800
Subject: [PATCH 04/15] fix default-coloured io masks not following css var
 (#4202)

---
 ts/routes/image-occlusion/review.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/routes/image-occlusion/review.ts b/ts/routes/image-occlusion/review.ts
index ae225449e..4425a8141 100644
--- a/ts/routes/image-occlusion/review.ts
+++ b/ts/routes/image-occlusion/review.ts
@@ -7,7 +7,7 @@ import { ModuleName, setupI18n } from "@tslib/i18n";
 import { optimumPixelSizeForCanvas } from "./canvas-scale";
 import { Shape } from "./shapes";
 import { Ellipse, extractShapesFromRenderedClozes, Polygon, Rectangle, Text } from "./shapes";
-import { TEXT_BACKGROUND_COLOR, TEXT_FONT_FAMILY, TEXT_PADDING } from "./tools/lib";
+import { SHAPE_MASK_COLOR, TEXT_BACKGROUND_COLOR, TEXT_FONT_FAMILY, TEXT_PADDING } from "./tools/lib";
 import type { Size } from "./types";
 
 export type DrawShapesData = {
@@ -217,7 +217,7 @@ function drawShapes(
             context,
             size,
             shape,
-            fill: shape.fill ?? properties.inActiveShapeColor,
+            fill: shape.fill !== SHAPE_MASK_COLOR ? shape.fill : properties.inActiveShapeColor,
             stroke: properties.inActiveBorder.color,
             strokeWidth: properties.inActiveBorder.width,
         });
@@ -437,7 +437,7 @@ function getShapeProperties(): ShapeProperties {
             activeShapeColor: activeShapeColor ? activeShapeColor : "#ff8e8e",
             inActiveShapeColor: inActiveShapeColor
                 ? inActiveShapeColor
-                : "#ffeba2",
+                : SHAPE_MASK_COLOR,
             highlightShapeColor: highlightShapeColor
                 ? highlightShapeColor
                 : "#ff8e8e00",

From 5a19027185e4a4d6ca072045545a55451ae1294d Mon Sep 17 00:00:00 2001
From: user1823 <92206575+user1823@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:29:06 +0530
Subject: [PATCH 05/15] Minor tweak in simulator string (#4204)

---
 ftl/core/statistics.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftl/core/statistics.ftl b/ftl/core/statistics.ftl
index cb1accc88..c5551ef67 100644
--- a/ftl/core/statistics.ftl
+++ b/ftl/core/statistics.ftl
@@ -80,7 +80,7 @@ statistics-reviews =
 # This fragment of the tooltip in the FSRS simulation
 # diagram (Deck options -> FSRS) shows the total number of
 # cards that can be recalled or retrieved on a specific date.
-statistics-memorized = {$memorized} memorized
+statistics-memorized = {$memorized} cards memorized
 statistics-today-title = Today
 statistics-today-again-count = Again count:
 statistics-today-type-counts = Learn: { $learnCount }, Review: { $reviewCount }, Relearn: { $relearnCount }, Filtered: { $filteredCount }

From 834fb41015cc7cb60518f81df0977bf4ee094f84 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 15 Jul 2025 16:27:21 +0700
Subject: [PATCH 06/15] Exclude VIRTUAL_ENV from environ as well

https://forums.ankiweb.net/t/anki-25-08-beta/63645/51
---
 build/runner/src/pyenv.rs | 2 +-
 qt/launcher/src/main.rs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/runner/src/pyenv.rs b/build/runner/src/pyenv.rs
index 9d65626ca..efd58fd91 100644
--- a/build/runner/src/pyenv.rs
+++ b/build/runner/src/pyenv.rs
@@ -36,7 +36,7 @@ pub fn setup_pyenv(args: PyenvArgs) {
 
     // remove UV_* environment variables to avoid interference
     for (key, _) in std::env::vars() {
-        if key.starts_with("UV_") {
+        if key.starts_with("UV_") || key == "VIRTUAL_ENV" {
             command.env_remove(key);
         }
     }
diff --git a/qt/launcher/src/main.rs b/qt/launcher/src/main.rs
index d48adaf49..e1529f794 100644
--- a/qt/launcher/src/main.rs
+++ b/qt/launcher/src/main.rs
@@ -269,7 +269,7 @@ fn handle_version_install_or_update(state: &State, choice: MainMenuChoice) -> Re
 
     // remove UV_* environment variables to avoid interference
     for (key, _) in std::env::vars() {
-        if key.starts_with("UV_") {
+        if key.starts_with("UV_") || key == "VIRTUAL_ENV" {
             command.env_remove(key);
         }
     }

From 12635f4cd29434dedb1240fba111eee54c87bb3c Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 15 Jul 2025 18:25:11 +0700
Subject: [PATCH 07/15] Show Chromium version in About instead of PyQt version

---
 qt/aqt/about.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt/aqt/about.py b/qt/aqt/about.py
index 228d3cfeb..828506fa6 100644
--- a/qt/aqt/about.py
+++ b/qt/aqt/about.py
@@ -70,10 +70,10 @@ def show(mw: aqt.AnkiQt) -> QDialog:
     abouttext += f"<p>{lede}"
     abouttext += f"<p>{tr.about_anki_is_licensed_under_the_agpl3()}"
     abouttext += f"<p>{tr.about_version(val=version_with_build())}<br>"
-    abouttext += ("Python %s Qt %s PyQt %s<br>") % (
+    abouttext += ("Python %s Qt %s Chromium %s<br>") % (
         platform.python_version(),
         qVersion(),
-        PYQT_VERSION_STR,
+        qWebEngineChromiumVersion().split(".")[0],
     )
     abouttext += (
         without_unicode_isolation(tr.about_visit_website(val=aqt.appWebsite))

From 15bbcdd568b08b849656e84f68898b3b1b8a7c85 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 15 Jul 2025 18:26:02 +0700
Subject: [PATCH 08/15] Downgrade Chromium as potential rendering fix

https://forums.ankiweb.net/t/anki-25-08-beta/63645/57
---
 qt/pyproject.toml |  4 ++--
 uv.lock           | 46 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/qt/pyproject.toml b/qt/pyproject.toml
index 6a686dde8..1ff34f59d 100644
--- a/qt/pyproject.toml
+++ b/qt/pyproject.toml
@@ -40,8 +40,8 @@ qt67 = [
 qt = [
   "pyqt6==6.9.1",
   "pyqt6-qt6==6.9.1",
-  "pyqt6-webengine==6.9.0",
-  "pyqt6-webengine-qt6==6.9.1",
+  "pyqt6-webengine==6.8.0",
+  "pyqt6-webengine-qt6==6.8.2",
   "pyqt6_sip==13.10.2",
 ]
 qt68 = [
diff --git a/uv.lock b/uv.lock
index 3f68b25dc..5a1a7ded9 100644
--- a/uv.lock
+++ b/uv.lock
@@ -170,8 +170,8 @@ dependencies = [
     { name = "pyqt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
     { name = "pyqt6-webengine", version = "6.6.0", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt66' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68')" },
     { name = "pyqt6-webengine", version = "6.7.0", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt67' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68')" },
-    { name = "pyqt6-webengine", version = "6.8.0", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra != 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68')" },
-    { name = "pyqt6-webengine", version = "6.9.0", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
+    { name = "pyqt6-webengine", version = "6.8.0", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or extra == 'extra-3-aqt-qt68' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67')" },
+    { name = "pyqt6-webengine", version = "6.9.0", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
     { name = "pywin32", marker = "sys_platform == 'win32' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68')" },
     { name = "requests" },
     { name = "send2trash" },
@@ -186,8 +186,8 @@ qt = [
     { name = "pyqt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" } },
     { name = "pyqt6-qt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" } },
     { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" } },
-    { name = "pyqt6-webengine", version = "6.9.0", source = { registry = "https://pypi.org/simple" } },
-    { name = "pyqt6-webengine-qt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" } },
+    { name = "pyqt6-webengine", version = "6.8.0", source = { registry = "https://pypi.org/simple" } },
+    { name = "pyqt6-webengine-qt6", version = "6.8.2", source = { registry = "https://pypi.org/simple" } },
 ]
 qt66 = [
     { name = "pyqt6", version = "6.6.1", source = { registry = "https://pypi.org/simple" } },
@@ -234,11 +234,11 @@ requires-dist = [
     { name = "pyqt6-sip", marker = "extra == 'qt67'", specifier = "==13.10.2" },
     { name = "pyqt6-sip", marker = "extra == 'qt68'", specifier = "==13.10.2" },
     { name = "pyqt6-webengine", specifier = ">=6.2" },
-    { name = "pyqt6-webengine", marker = "extra == 'qt'", specifier = "==6.9.0" },
+    { name = "pyqt6-webengine", marker = "extra == 'qt'", specifier = "==6.8.0" },
     { name = "pyqt6-webengine", marker = "extra == 'qt66'", specifier = "==6.6.0" },
     { name = "pyqt6-webengine", marker = "extra == 'qt67'", specifier = "==6.7.0" },
     { name = "pyqt6-webengine", marker = "extra == 'qt68'", specifier = "==6.8.0" },
-    { name = "pyqt6-webengine-qt6", marker = "extra == 'qt'", specifier = "==6.9.1" },
+    { name = "pyqt6-webengine-qt6", marker = "extra == 'qt'", specifier = "==6.8.2" },
     { name = "pyqt6-webengine-qt6", marker = "extra == 'qt66'", specifier = "==6.6.2" },
     { name = "pyqt6-webengine-qt6", marker = "extra == 'qt67'", specifier = "==6.7.3" },
     { name = "pyqt6-webengine-qt6", marker = "extra == 'qt68'", specifier = "==6.8.1" },
@@ -535,7 +535,7 @@ name = "importlib-metadata"
 version = "8.7.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "zipp" },
+    { name = "zipp", marker = "python_full_version < '3.10' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68')" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/76/66/650a33bd90f786193e4de4b3ad86ea60b53c89b669a5c7be931fac31cdb0/importlib_metadata-8.7.0.tar.gz", hash = "sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000", size = 56641, upload-time = "2025-04-27T15:29:01.736Z" }
 wheels = [
@@ -1017,8 +1017,8 @@ resolution-markers = [
     "python_full_version < '3.10'",
 ]
 dependencies = [
-    { name = "pyqt6-qt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" } },
-    { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" } },
+    { name = "pyqt6-qt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
+    { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/32/1b/567f46eb43ca961efd38d7a0b73efb70d7342854f075fd919179fdb2a571/pyqt6-6.9.1.tar.gz", hash = "sha256:50642be03fb40f1c2111a09a1f5a0f79813e039c15e78267e6faaf8a96c1c3a6", size = 1067230, upload-time = "2025-06-06T08:49:30.307Z" }
 wheels = [
@@ -1229,8 +1229,10 @@ resolution-markers = [
 ]
 dependencies = [
     { name = "pyqt6", version = "6.8.0", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra != 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68')" },
-    { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra != 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68')" },
+    { name = "pyqt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68')" },
+    { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or extra == 'extra-3-aqt-qt68' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67')" },
     { name = "pyqt6-webengine-qt6", version = "6.8.1", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra != 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68')" },
+    { name = "pyqt6-webengine-qt6", version = "6.8.2", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'extra-3-aqt-qt' or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68')" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/cd/c8/cadaa950eaf97f29e48c435e274ea5a81c051e745a3e2f5d9d994b7a6cda/PyQt6_WebEngine-6.8.0.tar.gz", hash = "sha256:64045ea622b6a41882c2b18f55ae9714b8660acff06a54e910eb72822c2f3ff2", size = 34203, upload-time = "2024-12-12T15:34:35.573Z" }
 wheels = [
@@ -1252,9 +1254,9 @@ resolution-markers = [
     "python_full_version < '3.10'",
 ]
 dependencies = [
-    { name = "pyqt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" } },
-    { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" } },
-    { name = "pyqt6-webengine-qt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" } },
+    { name = "pyqt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
+    { name = "pyqt6-sip", version = "13.10.2", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
+    { name = "pyqt6-webengine-qt6", version = "6.9.1", source = { registry = "https://pypi.org/simple" }, marker = "(extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt68') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt68') or (extra != 'extra-3-aqt-qt' and extra != 'extra-3-aqt-qt66' and extra != 'extra-3-aqt-qt67' and extra != 'extra-3-aqt-qt68')" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/8f/1a/9971af004a7e859347702f816fb71ecd67c3e32b2f0ae8daf1c1ded99f62/pyqt6_webengine-6.9.0.tar.gz", hash = "sha256:6ae537e3bbda06b8e06535e4852297e0bc3b00543c47929541fcc9b11981aa25", size = 34616, upload-time = "2025-04-08T08:57:35.402Z" }
 wheels = [
@@ -1321,6 +1323,24 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b0/b5/a641ebe3e5113bee23d911c58fdd2e65061a6e3786a26b068468b988e5d2/PyQt6_WebEngine_Qt6-6.8.1-py3-none-win_amd64.whl", hash = "sha256:0ced2a10433da2571cfa29ed882698e0e164184d54068d17ba73799c45af5f0f", size = 95657750, upload-time = "2024-12-06T13:47:43.048Z" },
 ]
 
+[[package]]
+name = "pyqt6-webengine-qt6"
+version = "6.8.2"
+source = { registry = "https://pypi.org/simple" }
+resolution-markers = [
+    "python_full_version >= '3.12'",
+    "python_full_version == '3.11.*'",
+    "python_full_version == '3.10.*'",
+    "python_full_version < '3.10'",
+]
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/da/639523b821d68a253f7fb2a8a4f2b277f5a03e9adba5a9cfcc2aa1aa9ed1/PyQt6_WebEngine_Qt6-6.8.2-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:84312705615b5fccedb386531bbd505eb110469444d778f09acd6a214836789e", size = 113127300, upload-time = "2025-02-06T12:05:55.965Z" },
+    { url = "https://files.pythonhosted.org/packages/df/bd/33b89cc7cdf54d172be3f98746273b4b6fba73b4802a2e5a6fa757951b47/PyQt6_WebEngine_Qt6-6.8.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:672363b3809973bbe3408048fc49e98f5c54db8629e855d813fd531e05929007", size = 101984083, upload-time = "2025-02-06T12:06:09.736Z" },
+    { url = "https://files.pythonhosted.org/packages/91/90/2693e9de1f064ac7cc10ba25548bbab6ce45a163eef07a22db3ff5ce8b81/PyQt6_WebEngine_Qt6-6.8.2-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:c3be75ef7563b965306de53cae0b357438672d3bf7d9b39edacc307fbeb9965e", size = 105210886, upload-time = "2025-02-06T12:06:23.944Z" },
+    { url = "https://files.pythonhosted.org/packages/42/8a/f30075726c8ac391b6fbbc7ab043795ec79f56e452e9d835b883576738b2/PyQt6_WebEngine_Qt6-6.8.2-py3-none-manylinux_2_39_aarch64.whl", hash = "sha256:72c1b4c45a3226f32f6c821ee474c4418727913536a62506d9787e24a46d6f27", size = 101194628, upload-time = "2025-02-06T12:06:37.196Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/2a/4fe2bfd3a1ed0e27d1b8f32a5259ebe966432365391c9a541f290f5438de/PyQt6_WebEngine_Qt6-6.8.2-py3-none-win_amd64.whl", hash = "sha256:4421159f3ac4a796499b7f73e98028797a4ae636b04f920b8165308ca0b8c629", size = 95573175, upload-time = "2025-02-06T12:06:49.642Z" },
+]
+
 [[package]]
 name = "pyqt6-webengine-qt6"
 version = "6.9.1"

From cc4b0a825eff08ae98b44230d157d0ba9f40281b Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 15 Jul 2025 20:45:38 +0700
Subject: [PATCH 09/15] Update translations

---
 ftl/core-repo | 2 +-
 ftl/qt-repo   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftl/core-repo b/ftl/core-repo
index 3d04bcbf7..1a0fe850d 160000
--- a/ftl/core-repo
+++ b/ftl/core-repo
@@ -1 +1 @@
-Subproject commit 3d04bcbf7fefca0007bc9db307409d88210995d8
+Subproject commit 1a0fe850d2e49d4e4a2c604c8a73d2f3b8042e04
diff --git a/ftl/qt-repo b/ftl/qt-repo
index c65a9587b..83ca9040e 160000
--- a/ftl/qt-repo
+++ b/ftl/qt-repo
@@ -1 +1 @@
-Subproject commit c65a9587b1f18931986bdf145872e8e4c44c5c82
+Subproject commit 83ca9040efa906bf383a2e00e31ef1e5760b2099

From 4e29440d6a08b32af15271a99cc2c1e515d09dae Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 15 Jul 2025 22:26:39 +0700
Subject: [PATCH 10/15] Version the launcher

---
 qt/aqt/about.py                   |  2 +-
 qt/launcher/lin/build.sh          |  7 ++++---
 qt/launcher/mac/Info.plist        |  2 +-
 qt/launcher/mac/build.sh          |  3 ++-
 qt/launcher/mac/dmg/build.sh      |  3 ++-
 qt/launcher/src/bin/build_win.rs  | 23 +++++++++++++++++------
 qt/launcher/win/anki.template.nsi |  4 ++--
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/qt/aqt/about.py b/qt/aqt/about.py
index 828506fa6..586225b73 100644
--- a/qt/aqt/about.py
+++ b/qt/aqt/about.py
@@ -73,7 +73,7 @@ def show(mw: aqt.AnkiQt) -> QDialog:
     abouttext += ("Python %s Qt %s Chromium %s<br>") % (
         platform.python_version(),
         qVersion(),
-        qWebEngineChromiumVersion().split(".")[0],
+        (qWebEngineChromiumVersion() or "").split(".")[0],
     )
     abouttext += (
         without_unicode_isolation(tr.about_visit_website(val=aqt.appWebsite))
diff --git a/qt/launcher/lin/build.sh b/qt/launcher/lin/build.sh
index 7bd78c27d..f38f6defe 100755
--- a/qt/launcher/lin/build.sh
+++ b/qt/launcher/lin/build.sh
@@ -13,7 +13,8 @@ HOST_ARCH=$(uname -m)
 
 # Define output paths
 OUTPUT_DIR="../../../out/launcher"
-LAUNCHER_DIR="$OUTPUT_DIR/anki-linux"
+ANKI_VERSION=$(cat ../../../.version | tr -d '\n')
+LAUNCHER_DIR="$OUTPUT_DIR/anki-launcher-$ANKI_VERSION-linux"
 
 # Clean existing output directory
 rm -rf "$LAUNCHER_DIR"
@@ -77,8 +78,8 @@ chmod +x \
 chmod -R a+r "$LAUNCHER_DIR"
 
 ZSTD="zstd -c --long -T0 -18"
-TRANSFORM="s%^.%anki-linux%S"
-TARBALL="$OUTPUT_DIR/anki-linux.tar.zst"
+TRANSFORM="s%^.%anki-launcher-$ANKI_VERSION-linux%S"
+TARBALL="$OUTPUT_DIR/anki-launcher-$ANKI_VERSION-linux.tar.zst"
 
 tar -I "$ZSTD" --transform "$TRANSFORM" -cf "$TARBALL" -C "$LAUNCHER_DIR" .
 
diff --git a/qt/launcher/mac/Info.plist b/qt/launcher/mac/Info.plist
index ac0ab2f09..a48960208 100644
--- a/qt/launcher/mac/Info.plist
+++ b/qt/launcher/mac/Info.plist
@@ -5,7 +5,7 @@
 		<key>CFBundleDisplayName</key>
 		<string>Anki</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
+		<string>ANKI_VERSION</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>12</string>
 		<key>LSApplicationCategoryType</key>
diff --git a/qt/launcher/mac/build.sh b/qt/launcher/mac/build.sh
index 470b5cd25..d521e155b 100755
--- a/qt/launcher/mac/build.sh
+++ b/qt/launcher/mac/build.sh
@@ -31,7 +31,8 @@ lipo -create \
 cp "$OUTPUT_DIR/uv" "$APP_LAUNCHER/Contents/MacOS/"
 
 # Copy support files
-cp Info.plist "$APP_LAUNCHER/Contents/"
+ANKI_VERSION=$(cat ../../../.version | tr -d '\n')
+sed "s/ANKI_VERSION/$ANKI_VERSION/g" Info.plist > "$APP_LAUNCHER/Contents/Info.plist"
 cp icon/Assets.car "$APP_LAUNCHER/Contents/Resources/"
 cp ../pyproject.toml "$APP_LAUNCHER/Contents/Resources/"
 cp ../../../.python-version "$APP_LAUNCHER/Contents/Resources/"
diff --git a/qt/launcher/mac/dmg/build.sh b/qt/launcher/mac/dmg/build.sh
index 16b48c06a..7eeba9948 100755
--- a/qt/launcher/mac/dmg/build.sh
+++ b/qt/launcher/mac/dmg/build.sh
@@ -6,7 +6,8 @@ set -e
 # base folder with Anki.app in it
 output="$1"
 dist="$1/tmp"
-dmg_path="$output/Anki.dmg"
+ANKI_VERSION=$(cat ../../../.version | tr -d '\n')
+dmg_path="$output/anki-launcher-$ANKI_VERSION-mac.dmg"
 
 if [ -d "/Volumes/Anki" ]
 then
diff --git a/qt/launcher/src/bin/build_win.rs b/qt/launcher/src/bin/build_win.rs
index 96688f190..4c2ca4413 100644
--- a/qt/launcher/src/bin/build_win.rs
+++ b/qt/launcher/src/bin/build_win.rs
@@ -22,6 +22,11 @@ const NSIS_PATH: &str = "C:\\Program Files (x86)\\NSIS\\makensis.exe";
 fn main() -> Result<()> {
     println!("Building Windows launcher...");
 
+    // Read version early so it can be used throughout the build process
+    let version = std::fs::read_to_string("../../../.version")?
+        .trim()
+        .to_string();
+
     let output_dir = PathBuf::from(OUTPUT_DIR);
     let launcher_exe_dir = PathBuf::from(LAUNCHER_EXE_DIR);
     let nsis_dir = PathBuf::from(NSIS_DIR);
@@ -31,16 +36,20 @@ fn main() -> Result<()> {
     extract_nsis_plugins()?;
     copy_files(&output_dir)?;
     sign_binaries(&output_dir)?;
-    copy_nsis_files(&nsis_dir)?;
+    copy_nsis_files(&nsis_dir, &version)?;
     build_uninstaller(&output_dir, &nsis_dir)?;
     sign_file(&output_dir.join("uninstall.exe"))?;
     generate_install_manifest(&output_dir)?;
     build_installer(&output_dir, &nsis_dir)?;
-    sign_file(&PathBuf::from("../../../out/launcher_exe/anki-install.exe"))?;
+
+    let installer_filename = format!("anki-launcher-{version}-windows.exe");
+    let installer_path = PathBuf::from("../../../out/launcher_exe").join(&installer_filename);
+
+    sign_file(&installer_path)?;
 
     println!("Build completed successfully!");
     println!("Output directory: {}", output_dir.display());
-    println!("Installer: ../../../out/launcher_exe/anki-install.exe");
+    println!("Installer: ../../../out/launcher_exe/{installer_filename}");
 
     Ok(())
 }
@@ -235,11 +244,13 @@ fn generate_install_manifest(output_dir: &Path) -> Result<()> {
     Ok(())
 }
 
-fn copy_nsis_files(nsis_dir: &Path) -> Result<()> {
+fn copy_nsis_files(nsis_dir: &Path, version: &str) -> Result<()> {
     println!("Copying NSIS support files...");
 
-    // Copy anki.template.nsi as anki.nsi
-    copy_file("anki.template.nsi", nsis_dir.join("anki.nsi"))?;
+    // Copy anki.template.nsi as anki.nsi and substitute version placeholders
+    let template_content = std::fs::read_to_string("anki.template.nsi")?;
+    let substituted_content = template_content.replace("ANKI_VERSION", version);
+    write_file(nsis_dir.join("anki.nsi"), substituted_content)?;
 
     // Copy fileassoc.nsh
     copy_file("fileassoc.nsh", nsis_dir.join("fileassoc.nsh"))?;
diff --git a/qt/launcher/win/anki.template.nsi b/qt/launcher/win/anki.template.nsi
index 84dedf9c8..36b32a893 100644
--- a/qt/launcher/win/anki.template.nsi
+++ b/qt/launcher/win/anki.template.nsi
@@ -24,7 +24,7 @@ Name "Anki"
 Unicode true
 
 ; The file to write (relative to nsis directory)
-OutFile "..\launcher_exe\anki-install.exe"
+OutFile "..\launcher_exe\anki-launcher-ANKI_VERSION-windows.exe"
 
 ; Non elevated
 RequestExecutionLevel user
@@ -214,7 +214,7 @@ Section ""
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Anki" "DisplayName" "Anki Launcher"
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Anki" "DisplayVersion" "1.0.0"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Anki" "DisplayVersion" "ANKI_VERSION"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Anki" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Anki" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
   WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Anki" "NoModify" 1

From e77cd791deb8d412d1ed9083f2697e389605823a Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 15 Jul 2025 20:47:12 +0700
Subject: [PATCH 11/15] Bump version

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index ce73bf7c0..469f7be32 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-25.08b1
+25.08b2

From 37fe704326d60c8609c8ea834415064689ea542b Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 16 Jul 2025 14:14:50 +0700
Subject: [PATCH 12/15] Tweak protobuf requirements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Motivated by https://forums.ankiweb.net/t/python-anki-sync-server-broken/64069

From https://protobuf.dev/support/cross-version-runtime-guarantee/:
"Python-specific Guarantees
Since the 3.20.0 release, the Protobuf Python generated code became a thin wrapper around an embedded FileDescriptorProto. Because these protos are supported on extremely long timeframes, our usual major version compatibility windows aren’t typically necessary.

Python may break generated code compatibility in specific future major version releases, but it will be coupled with poison pill warnings and errors in advance. As of 6.32.0, all generated code since 3.20.0 will be supported until at least 8.x.y."
---
 pylib/pyproject.toml | 2 +-
 uv.lock              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pylib/pyproject.toml b/pylib/pyproject.toml
index 23e10077f..fb7422694 100644
--- a/pylib/pyproject.toml
+++ b/pylib/pyproject.toml
@@ -7,7 +7,7 @@ dependencies = [
   "decorator",
   "markdown",
   "orjson",
-  "protobuf>=4.21",
+  "protobuf>=6.0,<8.0",
   "requests[socks]",
   # remove after we update to min python 3.11+
   "typing_extensions",
diff --git a/uv.lock b/uv.lock
index 5a1a7ded9..d4277425a 100644
--- a/uv.lock
+++ b/uv.lock
@@ -66,7 +66,7 @@ requires-dist = [
     { name = "distro", marker = "sys_platform != 'darwin' and sys_platform != 'win32'" },
     { name = "markdown" },
     { name = "orjson" },
-    { name = "protobuf", specifier = ">=4.21" },
+    { name = "protobuf", specifier = ">=6.0,<8.0" },
     { name = "requests", extras = ["socks"] },
     { name = "typing-extensions" },
 ]

From 0b30155c90fb6a8cd4af1abe6c2ea4a577f5d3ab Mon Sep 17 00:00:00 2001
From: Danika-Dakika <115673540+Danika-Dakika@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:05:01 -0700
Subject: [PATCH 13/15] Adding to about.py (#4211)

Adding a Hebrew translator.
---
 qt/aqt/about.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qt/aqt/about.py b/qt/aqt/about.py
index 586225b73..03e989f2c 100644
--- a/qt/aqt/about.py
+++ b/qt/aqt/about.py
@@ -225,6 +225,7 @@ def show(mw: aqt.AnkiQt) -> QDialog:
             "Adnane Taghi",
             "Anon_0000",
             "Bilolbek Normuminov",
+            "Sagiv Marzini",
         )
     )
 

From 278a84f8d2ec068fd6e2f398ebb9553f64e80f6c Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 18 Jul 2025 18:12:30 +0700
Subject: [PATCH 14/15] Fix 'same cloze' shortcut on macOS

https://forums.ankiweb.net/t/mac-shortcut-for-cloze-deletion-same-card/63785
---
 ts/editor/ClozeButtons.svelte | 12 ++++++++----
 ts/lib/tslib/platform.ts      | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ts/editor/ClozeButtons.svelte b/ts/editor/ClozeButtons.svelte
index e9faae540..dfe4fb7c3 100644
--- a/ts/editor/ClozeButtons.svelte
+++ b/ts/editor/ClozeButtons.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { isApplePlatform } from "@tslib/platform";
+    import { chromiumVersion, isApplePlatform } from "@tslib/platform";
     import { getPlatformString } from "@tslib/shortcuts";
     import { createEventDispatcher } from "svelte";
     import { get } from "svelte/store";
@@ -22,9 +22,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const { focusedInput, fields } = noteEditorContext.get();
 
-    // Workaround for Cmd+Option+Shift+C not working on macOS. The keyup approach works
-    // on Linux as well, but fails on Windows.
-    const event = isApplePlatform() ? "keyup" : "keydown";
+    // Workaround for Cmd+Option+Shift+C not working on macOS on older Chromium
+    // versions.
+    const chromiumVer = chromiumVersion();
+    const event =
+        isApplePlatform() && chromiumVer != null && chromiumVer <= 112
+            ? "keyup"
+            : "keydown";
 
     const clozePattern = /\{\{c(\d+)::/gu;
     function getCurrentHighestCloze(increment: boolean): number {
diff --git a/ts/lib/tslib/platform.ts b/ts/lib/tslib/platform.ts
index 7aa5e137d..d055bcb53 100644
--- a/ts/lib/tslib/platform.ts
+++ b/ts/lib/tslib/platform.ts
@@ -13,3 +13,20 @@ export function isApplePlatform(): boolean {
 export function isDesktop(): boolean {
     return !(/iphone|ipad|ipod|android/i.test(window.navigator.userAgent));
 }
+
+export function chromiumVersion(): number | null {
+    const userAgent = window.navigator.userAgent;
+
+    // Check if it's a Chromium-based browser (Chrome, Edge, Opera, etc.)
+    // but exclude Safari which also contains "Chrome" in its user agent
+    if (userAgent.includes("Safari") && !userAgent.includes("Chrome")) {
+        return null; // Safari
+    }
+
+    const chromeMatch = userAgent.match(/Chrome\/(\d+)/);
+    if (chromeMatch) {
+        return parseInt(chromeMatch[1], 10);
+    }
+
+    return null; // Not a Chromium-based browser
+}

From 63ddd0e1833a6fcc2847e2250f4a5000b62a91d8 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Fri, 18 Jul 2025 18:20:10 +0300
Subject: [PATCH 15/15] Fix wrong tab order in preferences (#4210)

---
 qt/aqt/forms/preferences.ui | 3 ++-
 qt/aqt/preferences.py       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/qt/aqt/forms/preferences.ui b/qt/aqt/forms/preferences.ui
index 807d4093c..0035e1f42 100644
--- a/qt/aqt/forms/preferences.ui
+++ b/qt/aqt/forms/preferences.ui
@@ -1292,9 +1292,10 @@
   <tabstop>daily_backups</tabstop>
   <tabstop>weekly_backups</tabstop>
   <tabstop>monthly_backups</tabstop>
-  <tabstop>tabWidget</tabstop>
   <tabstop>syncAnkiHubLogout</tabstop>
   <tabstop>syncAnkiHubLogin</tabstop>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/qt/aqt/preferences.py b/qt/aqt/preferences.py
index bd87ef830..afce6d489 100644
--- a/qt/aqt/preferences.py
+++ b/qt/aqt/preferences.py
@@ -82,11 +82,14 @@ class Preferences(QDialog):
         )
         group = self.form.preferences_answer_keys
         group.setLayout(layout := QFormLayout())
+        tab_widget: QWidget = self.form.url_schemes
         for ease, label in ease_labels:
             layout.addRow(
                 label,
                 line_edit := QLineEdit(self.mw.pm.get_answer_key(ease) or ""),
             )
+            QWidget.setTabOrder(tab_widget, line_edit)
+            tab_widget = line_edit
             qconnect(
                 line_edit.textChanged,
                 functools.partial(self.mw.pm.set_answer_key, ease),