From dc960c3b0302d38f1b04f86dcdc25fc66bd2f415 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Tue, 25 Mar 2025 21:01:58 +0100
Subject: [PATCH 01/45] (bug) fix links queue broken by segfault

not recognising some favicons as SVG files (because they're either data URLs or contain query string) results in it being passed to canvas.loadImage, which blows up for some reason

that's what's been spamming us with "links queue getting too long" emails
---
 server/imageCopy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/imageCopy.ts b/server/imageCopy.ts
index 6c44c1ce1..4f002efb3 100644
--- a/server/imageCopy.ts
+++ b/server/imageCopy.ts
@@ -21,7 +21,7 @@ export default async (prefix: string, url: string, ttlDays: number | null = null
         return null;
     }
 
-    const isSvg = url.toLowerCase().endsWith('.svg');
+    const isSvg = url.toLowerCase().replace(/\?.*$/, '').endsWith('.svg') || url.startsWith('data:image/svg+xml');
 
     const key = `${prefix}/${md5(url)}.${isSvg ? 'svg' : 'png'}`;
 

From 5019fd38b8fdc6d88d127884980122780057c4d0 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 28 Mar 2025 00:18:40 +0100
Subject: [PATCH 02/45] (lint) disable @stylistic/newline-per-chained-call
 because it sometimes gives weird formatting

---
 eslint.config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eslint.config.js b/eslint.config.js
index 8bc3fc7f2..34ebb7fe5 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -160,7 +160,6 @@ export default withNuxt(
             '@stylistic/implicit-arrow-linebreak': 'warn',
             '@stylistic/linebreak-style': 'warn',
             '@stylistic/max-len': ['warn', { code: 120 }],
-            '@stylistic/newline-per-chained-call': 'warn',
             '@stylistic/no-extra-semi': 'warn',
             '@stylistic/no-mixed-operators': ['warn', {
                 groups: [['&&', '||']],

From c118b4da8a2916148855a91a9d2eb554f98bfcfa Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 28 Mar 2025 00:59:51 +0100
Subject: [PATCH 03/45] (style) use headings font of the locale on home and
 admin see #378

---
 app.vue                   |  5 +++--
 components/LocaleList.vue |  3 +++
 nuxt.config.ts            | 20 +++++++++++++++++---
 pages/admin/index.vue     |  3 ++-
 src/fonts.ts              |  3 +++
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 src/fonts.ts

diff --git a/app.vue b/app.vue
index 2c14e8d61..c4659aa86 100644
--- a/app.vue
+++ b/app.vue
@@ -5,6 +5,7 @@ import { useHead, useSeoMeta } from '#imports';
 import useConfig from '~/composables/useConfig.ts';
 import { getDefaultSeo } from '~/composables/useSimpleHead.ts';
 import { getUrlForLocale } from '~/src/domain.ts';
+import { formatFonts } from '~/src/fonts.ts';
 
 const { $translator: translator } = useNuxtApp();
 const config = useConfig();
@@ -20,8 +21,8 @@ useHead({
     style: [{
         innerHTML:
             `:root {
-              --font-headings: ${config.style.fontHeadings.map((font) => `'${font}'`).join(',')};
-              --font-text: ${config.style.fontText.map((font) => `'${font}'`).join(',')};
+              --font-headings: ${formatFonts(config.style.fontHeadings)};
+              --font-text: ${formatFonts(config.style.fontText)};
             }`,
     }],
     link: [
diff --git a/components/LocaleList.vue b/components/LocaleList.vue
index b0f93c51c..e3e0c5115 100644
--- a/components/LocaleList.vue
+++ b/components/LocaleList.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import { fontHeadingsByLocale } from '#build/locale/fonts.ts';
 import type { LocaleDescription } from '~/locale/locales.ts';
 import { getUrlForLocale } from '~/src/domain.ts';
+import { formatFonts } from '~/src/fonts.ts';
 
 withDefaults(defineProps<{
     locales: Record<string, LocaleDescription>;
@@ -19,6 +21,7 @@ withDefaults(defineProps<{
                     :key="locale"
                     :href="getUrlForLocale(locale)"
                     class="list-group-item list-group-item-action list-group-item-hoverable w-md-50 border-start"
+                    :style="`--font-headings: ${formatFonts(fontHeadingsByLocale[locale])}`"
                 >
                     <div class="h3">
                         <LocaleIcon :locale="options" class="mx-2" />
diff --git a/nuxt.config.ts b/nuxt.config.ts
index fbadb2cbf..185b33d18 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,7 +2,7 @@ import childProcess from 'node:child_process';
 import { promisify } from 'node:util';
 import path from 'path';
 
-import { resolvePath } from '@nuxt/kit';
+import { addTemplate, resolvePath } from '@nuxt/kit';
 import yamlPlugin from '@rollup/plugin-yaml';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
 import { defineNuxtConfig } from 'nuxt/config';
@@ -40,6 +40,10 @@ const colour = '#C71585';
 
 const codes = ['_', ...localeDescriptions.map((localeDescription) => localeDescription.code)];
 
+const configByLocale: Record<string, Config> = Object.fromEntries(await Promise.all(codes.map(async (localeCode) => {
+    return [localeCode, await loadSuml<Config>(`locale/${localeCode}/config.suml`)];
+})));
+
 let __dirname = new URL('.', import.meta.url).pathname;
 if (process.platform === 'win32') {
     // A small hack, for Windows can't have nice things.
@@ -219,10 +223,20 @@ export default defineNuxtConfig({
         },
     },
     hooks: {
+        async 'app:templates'() {
+            const fontHeadingsByLocale = Object.fromEntries(Object.entries(configByLocale)
+                .filter(([localeCode, _]) => localeCode !== '_')
+                .map(([localeCode, config]) => [localeCode, config.style.fontHeadings]));
+            addTemplate({
+                filename: 'locale/fonts.ts',
+                getContents: () => `export const fontHeadingsByLocale: Record<string, string[]>
+                    = ${JSON.stringify(fontHeadingsByLocale)}`,
+                write: true,
+            });
+        },
         async 'pages:extend'(routes) {
             for (const code of codes) {
-                const config = await loadSuml<Config>(`locale/${code}/config.suml`);
-                for (const subroute of config.nouns.subroutes || []) {
+                for (const subroute of configByLocale[code].nouns.subroutes || []) {
                     routes.push({
                         path: `/${encodeURIComponent(subroute)}`,
                         name: `nouns-${code}-${subroute}`,
diff --git a/pages/admin/index.vue b/pages/admin/index.vue
index 53ef75841..d1d7340d0 100644
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@@ -6,6 +6,7 @@ import type { LocalDescriptionWithConfig } from '~/server/admin.ts';
 import buildLocaleList from '~/src/buildLocaleList.ts';
 import { longtimeCookieSetting } from '~/src/cookieSettings.ts';
 import { loadConfig } from '~/src/data.ts';
+import { formatFonts } from '~/src/fonts.ts';
 import { newDate } from '~/src/helpers.ts';
 import { useMainStore } from '~/store/index.ts';
 
@@ -200,7 +201,7 @@ const impersonate = async (email: string) => {
             </div>
 
             <template v-for="({ name, extra, config, published }, locale) in visibleLocales" :key="locale">
-                <h3>
+                <h3 :style="`--font-headings: ${formatFonts(config.style.fontHeadings)}`">
                     {{ name }} {{ extra ? `(${extra})` : '' }}
                     <small v-if="!published" class="text-muted">(not published yet)</small>
                 </h3>
diff --git a/src/fonts.ts b/src/fonts.ts
new file mode 100644
index 000000000..778872269
--- /dev/null
+++ b/src/fonts.ts
@@ -0,0 +1,3 @@
+export const formatFonts = (fonts: string[]): string => {
+    return fonts.map((font) => `'${font}'`).join(',');
+};

From 5c29b258a77fd13f3ff87f66a9f2ad8d56f94bd8 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 28 Mar 2025 18:32:29 +0100
Subject: [PATCH 04/45] (dependencies) remove avris-daemonise

---
 Makefile       |   6 -
 package.json   |   1 -
 pnpm-lock.yaml | 361 +------------------------------------------------
 3 files changed, 2 insertions(+), 366 deletions(-)

diff --git a/Makefile b/Makefile
index 053161a6b..dc7fbd23f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,6 @@ test:
 run:
 	pnpm dev
 
-start:
-	node_modules/.bin/avris-daemonise start webserver pnpm dev
-
-stop:
-	node_modules/.bin/avris-daemonise stop webserver
-
 build: install
 	pnpm build
 	pnpm run-file server/sentry.ts release
diff --git a/package.json b/package.json
index 11685415a..7088d8d22 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
         "@vuepic/vue-datepicker": "^8.8.1",
         "@vueuse/core": "^13.0.0",
         "avris-columnist": "^0.3.4",
-        "avris-daemonise": "^0.0.2",
         "avris-futurus": "^1.0.2",
         "avris-generator": "^0.8.2",
         "avris-sorter": "^0.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 866bc1254..b72100d5c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -222,9 +222,6 @@ importers:
       avris-columnist:
         specifier: ^0.3.4
         version: 0.3.4
-      avris-daemonise:
-        specifier: ^0.0.2
-        version: 0.0.2
       avris-futurus:
         specifier: ^1.0.2
         version: 1.0.2
@@ -2949,14 +2946,6 @@ packages:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
 
-  ansi-regex@2.1.1:
-    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
-    engines: {node: '>=0.10.0'}
-
-  ansi-regex@3.0.1:
-    resolution: {integrity: sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==}
-    engines: {node: '>=4'}
-
   ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -3087,10 +3076,6 @@ packages:
   avris-columnist@0.3.4:
     resolution: {integrity: sha512-0lnVm0GD6iccUguiTMmFZrf47oECOgQ0u1Y1ukLimbUx4gTxA1TmuUqIqMhpOWGrRCpO1Xgw7DhmVjNxXjosBg==}
 
-  avris-daemonise@0.0.2:
-    resolution: {integrity: sha512-YWEbmAqL99yUZ13/6xNDO/L9HMk0cKa/fRvYHMsN6qcDEOQ2zyTNAMO1tnP2tyE3bR92oY21R6Q4hEueeYzknA==}
-    hasBin: true
-
   avris-futurus@1.0.2:
     resolution: {integrity: sha512-qWLpSJRXwgBYyBaJmUOd/OOKdanb5EmfhFD1cMqTcu9256RR//9rvlr7rFYoWoQMoyEDqZa7WFvKFgmUq9vaAw==}
 
@@ -3293,10 +3278,6 @@ packages:
     resolution: {integrity: sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==}
     engines: {node: '>=0.10.0'}
 
-  camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-
   caniuse-api@3.0.0:
     resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
 
@@ -3347,9 +3328,6 @@ packages:
     resolution: {integrity: sha512-Fwcm3zkR37STnPC8FepSHeSYJM5Rd596TZOcfDUdojR4Q735aK1Xn+M+ISagNneuCwMjK28w4kX+ETILGNT/UQ==}
     engines: {node: '>= 0.6'}
 
-  child_process@1.0.2:
-    resolution: {integrity: sha512-Wmza/JzL0SiWz7kl6MhIKT5ceIlnFPJX+lwUGj7Clhy5MMldsSoJR0+uvRzOS5Kv45Mq7t1PoE8TsOA9bzvb6g==}
-
   chokidar@3.6.0:
     resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
@@ -3396,9 +3374,6 @@ packages:
     resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==}
     engines: {node: '>=18'}
 
-  cliui@4.1.0:
-    resolution: {integrity: sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==}
-
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -3407,10 +3382,6 @@ packages:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
     engines: {node: '>=0.10.0'}
 
-  code-point-at@1.1.0:
-    resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
-    engines: {node: '>=0.10.0'}
-
   color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
@@ -3571,10 +3542,6 @@ packages:
   cross-fetch@4.0.0:
     resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==}
 
-  cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
-    engines: {node: '>=4.8'}
-
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
@@ -4225,10 +4192,6 @@ packages:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
 
-  execa@1.0.0:
-    resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
-    engines: {node: '>=6'}
-
   execa@8.0.1:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
     engines: {node: '>=16.17'}
@@ -4369,10 +4332,6 @@ packages:
     resolution: {integrity: sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==}
     engines: {node: '>=0.10.0'}
 
-  find-up@3.0.0:
-    resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
-    engines: {node: '>=6'}
-
   find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
@@ -4436,9 +4395,6 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  fs@0.0.1-security:
-    resolution: {integrity: sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==}
-
   fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -4475,9 +4431,6 @@ packages:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
 
-  get-caller-file@1.0.3:
-    resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
-
   get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
@@ -4509,10 +4462,6 @@ packages:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
 
-  get-stream@4.1.0:
-    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
-    engines: {node: '>=6'}
-
   get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -4872,10 +4821,6 @@ packages:
     resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
 
-  invert-kv@2.0.0:
-    resolution: {integrity: sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==}
-    engines: {node: '>=4'}
-
   ioredis@5.6.0:
     resolution: {integrity: sha512-tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==}
     engines: {node: '>=12.22.0'}
@@ -4963,14 +4908,6 @@ packages:
     resolution: {integrity: sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==}
     engines: {node: '>=0.10.0'}
 
-  is-fullwidth-code-point@1.0.0:
-    resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
-    engines: {node: '>=0.10.0'}
-
-  is-fullwidth-code-point@2.0.0:
-    resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
-    engines: {node: '>=4'}
-
   is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
@@ -5321,10 +5258,6 @@ packages:
     resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
     engines: {node: '>= 0.6.3'}
 
-  lcid@2.0.0:
-    resolution: {integrity: sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==}
-    engines: {node: '>=6'}
-
   leven@3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
     engines: {node: '>=6'}
@@ -5365,10 +5298,6 @@ packages:
   localforage@1.10.0:
     resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
 
-  locate-path@3.0.0:
-    resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
-    engines: {node: '>=6'}
-
   locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
@@ -5478,10 +5407,6 @@ packages:
     resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==}
     engines: {node: '>= 10'}
 
-  map-age-cleaner@0.1.3:
-    resolution: {integrity: sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==}
-    engines: {node: '>=6'}
-
   map-obj@1.0.1:
     resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
     engines: {node: '>=0.10.0'}
@@ -5525,10 +5450,6 @@ packages:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
 
-  mem@4.3.0:
-    resolution: {integrity: sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==}
-    engines: {node: '>=6'}
-
   meow@3.7.0:
     resolution: {integrity: sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==}
     engines: {node: '>=0.10.0'}
@@ -5574,10 +5495,6 @@ packages:
     engines: {node: '>=16'}
     hasBin: true
 
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-
   mimic-fn@4.0.0:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
@@ -5737,9 +5654,6 @@ packages:
     resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
     engines: {node: '>= 0.4.0'}
 
-  nice-try@1.0.5:
-    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
-
   nitropack@2.11.6:
     resolution: {integrity: sha512-iaLzOKYxsNL8G6h9cMFTC/hAN4RfhZsrFzFFzemr6Vfn57MooYEz6KLeUoRyTposlAeEWTVejz8naYOORIrnDg==}
     engines: {node: ^16.11.0 || >=17.0.0}
@@ -5830,10 +5744,6 @@ packages:
     resolution: {integrity: sha512-uhXOdZry0L6M2UIo9BTt7FdpBDiAGN/7oItedQwPKh8jh31ZlvC8U9Xl/EJ3aijDHaywXTW3QbZ6LuCocur1YA==}
     engines: {node: '>=12.20'}
 
-  npm-run-path@2.0.2:
-    resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
-    engines: {node: '>=4'}
-
   npm-run-path@5.3.0:
     resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -5853,10 +5763,6 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  number-is-nan@1.0.1:
-    resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
-    engines: {node: '>=0.10.0'}
-
   nuxt@3.16.0:
     resolution: {integrity: sha512-4j2tuHo+kcComQ1WrCD+i1w3UFOHrcnNH30cwiEY/WZZlBZOlC6DtUm6aBjhfpBFaMYsF4PbyKsNW+7FHwckHA==}
     engines: {node: ^18.12.0 || ^20.9.0 || >=22.0.0}
@@ -5952,10 +5858,6 @@ packages:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
-  os-locale@3.1.0:
-    resolution: {integrity: sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==}
-    engines: {node: '>=6'}
-
   own-keys@1.0.1:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
@@ -5964,22 +5866,6 @@ packages:
     resolution: {integrity: sha512-MNT32sqiTFeSbQZP2WZIRQ/mlIpNNq4sua+/4hBG4qT5aef2iQe+1/BjezZURPlvucZeSfN1Y6b60l7OgBdyUA==}
     engines: {node: '>=14.0.0'}
 
-  p-defer@1.0.0:
-    resolution: {integrity: sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==}
-    engines: {node: '>=4'}
-
-  p-finally@1.0.0:
-    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
-    engines: {node: '>=4'}
-
-  p-is-promise@2.1.0:
-    resolution: {integrity: sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==}
-    engines: {node: '>=6'}
-
-  p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
-
   p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
@@ -5988,10 +5874,6 @@ packages:
     resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  p-locate@3.0.0:
-    resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
-    engines: {node: '>=6'}
-
   p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
@@ -6012,10 +5894,6 @@ packages:
     resolution: {integrity: sha512-DZ/bONJILHkQ721hSr/E9wMz5Am/OTJ9P6LhLFo2Tu+jL8044tgc9LwHO8g4PiaYePnlVVRAJcKmgy8J9MVFrA==}
     engines: {node: '>=14.16'}
 
-  p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
-
   pac-proxy-agent@7.0.2:
     resolution: {integrity: sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==}
     engines: {node: '>= 14'}
@@ -6086,10 +5964,6 @@ packages:
     resolution: {integrity: sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==}
     engines: {node: '>=0.10.0'}
 
-  path-exists@3.0.0:
-    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
-    engines: {node: '>=4'}
-
   path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
@@ -6102,10 +5976,6 @@ packages:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
-  path-key@2.0.1:
-    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
-    engines: {node: '>=4'}
-
   path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
@@ -6670,9 +6540,6 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
-  require-main-filename@1.0.1:
-    resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
-
   requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
@@ -6852,18 +6719,10 @@ packages:
     resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
-  shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
-
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
 
-  shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
-
   shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
@@ -7033,14 +6892,6 @@ packages:
   streamx@2.20.1:
     resolution: {integrity: sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==}
 
-  string-width@1.0.2:
-    resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
-    engines: {node: '>=0.10.0'}
-
-  string-width@2.1.1:
-    resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==}
-    engines: {node: '>=4'}
-
   string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
@@ -7078,14 +6929,6 @@ packages:
     resolution: {integrity: sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==}
     engines: {node: '>=4'}
 
-  strip-ansi@3.0.1:
-    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
-    engines: {node: '>=0.10.0'}
-
-  strip-ansi@4.0.0:
-    resolution: {integrity: sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==}
-    engines: {node: '>=4'}
-
   strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
@@ -7106,10 +6949,6 @@ packages:
     resolution: {integrity: sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==}
     engines: {node: '>=10'}
 
-  strip-eof@1.0.0:
-    resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
-    engines: {node: '>=0.10.0'}
-
   strip-final-newline@3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
@@ -7982,17 +7821,10 @@ packages:
     resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
     engines: {node: '>= 0.4'}
 
-  which-module@2.0.1:
-    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
-
   which-typed-array@1.1.19:
     resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==}
     engines: {node: '>= 0.4'}
 
-  which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-
   which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
@@ -8064,10 +7896,6 @@ packages:
   workbox-window@7.3.0:
     resolution: {integrity: sha512-qW8PDy16OV1UBaUNGlTVcepzrlzyzNW/ZJvFQQs2j2TzGsg6IKjcpZC1RSquqQnTOafl5pCj5bGfAHlCjOOjdA==}
 
-  wrap-ansi@2.1.0:
-    resolution: {integrity: sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==}
-    engines: {node: '>=0.10.0'}
-
   wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -8118,9 +7946,6 @@ packages:
   xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
 
-  y18n@4.0.3:
-    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
-
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -8147,16 +7972,10 @@ packages:
     engines: {node: '>= 14'}
     hasBin: true
 
-  yargs-parser@11.1.1:
-    resolution: {integrity: sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==}
-
   yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
-  yargs@12.0.5:
-    resolution: {integrity: sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==}
-
   yargs@17.7.2:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
@@ -11791,10 +11610,6 @@ snapshots:
 
   ansi-colors@4.1.3: {}
 
-  ansi-regex@2.1.1: {}
-
-  ansi-regex@3.0.1: {}
-
   ansi-regex@5.0.1: {}
 
   ansi-regex@6.1.0: {}
@@ -11926,12 +11741,6 @@ snapshots:
 
   avris-columnist@0.3.4: {}
 
-  avris-daemonise@0.0.2:
-    dependencies:
-      child_process: 1.0.2
-      fs: 0.0.1-security
-      yargs: 12.0.5
-
   avris-futurus@1.0.2: {}
 
   avris-generator@0.8.2: {}
@@ -12181,8 +11990,6 @@ snapshots:
 
   camelcase@2.1.1: {}
 
-  camelcase@5.3.1: {}
-
   caniuse-api@3.0.0:
     dependencies:
       browserslist: 4.24.4
@@ -12245,8 +12052,6 @@ snapshots:
       htmlparser2: 3.8.3
       lodash: 3.10.1
 
-  child_process@1.0.2: {}
-
   chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
@@ -12300,12 +12105,6 @@ snapshots:
       is-wsl: 3.1.0
       is64bit: 2.0.0
 
-  cliui@4.1.0:
-    dependencies:
-      string-width: 2.1.1
-      strip-ansi: 4.0.0
-      wrap-ansi: 2.1.0
-
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -12314,8 +12113,6 @@ snapshots:
 
   cluster-key-slot@1.1.2: {}
 
-  code-point-at@1.1.0: {}
-
   color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
@@ -12448,14 +12245,6 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  cross-spawn@6.0.5:
-    dependencies:
-      nice-try: 1.0.5
-      path-key: 2.0.1
-      semver: 5.7.2
-      shebang-command: 1.2.0
-      which: 1.3.1
-
   cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
@@ -13234,16 +13023,6 @@ snapshots:
 
   events@3.3.0: {}
 
-  execa@1.0.0:
-    dependencies:
-      cross-spawn: 6.0.5
-      get-stream: 4.1.0
-      is-stream: 1.1.0
-      npm-run-path: 2.0.2
-      p-finally: 1.0.0
-      signal-exit: 3.0.7
-      strip-eof: 1.0.0
-
   execa@8.0.1:
     dependencies:
       cross-spawn: 7.0.6
@@ -13445,10 +13224,6 @@ snapshots:
       path-exists: 2.1.0
       pinkie-promise: 2.0.1
 
-  find-up@3.0.0:
-    dependencies:
-      locate-path: 3.0.0
-
   find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
@@ -13518,8 +13293,6 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
-  fs@0.0.1-security: {}
-
   fsevents@2.3.2:
     optional: true
 
@@ -13559,8 +13332,6 @@ snapshots:
 
   gensync@1.0.0-beta.2: {}
 
-  get-caller-file@1.0.3: {}
-
   get-caller-file@2.0.5: {}
 
   get-intrinsic@1.3.0:
@@ -13594,10 +13365,6 @@ snapshots:
 
   get-stream@3.0.0: {}
 
-  get-stream@4.1.0:
-    dependencies:
-      pump: 3.0.2
-
   get-stream@5.2.0:
     dependencies:
       pump: 3.0.2
@@ -14023,8 +13790,6 @@ snapshots:
       hasown: 2.0.2
       side-channel: 1.1.0
 
-  invert-kv@2.0.0: {}
-
   ioredis@5.6.0:
     dependencies:
       '@ioredis/commands': 1.2.0
@@ -14114,12 +13879,6 @@ snapshots:
 
   is-finite@1.1.0: {}
 
-  is-fullwidth-code-point@1.0.0:
-    dependencies:
-      number-is-nan: 1.0.1
-
-  is-fullwidth-code-point@2.0.0: {}
-
   is-fullwidth-code-point@3.0.0: {}
 
   is-generator-function@1.1.0:
@@ -14455,10 +14214,6 @@ snapshots:
     dependencies:
       readable-stream: 2.3.8
 
-  lcid@2.0.0:
-    dependencies:
-      invert-kv: 2.0.0
-
   leven@3.1.0: {}
 
   levn@0.4.1:
@@ -14519,11 +14274,6 @@ snapshots:
     dependencies:
       lie: 3.1.1
 
-  locate-path@3.0.0:
-    dependencies:
-      p-locate: 3.0.0
-      path-exists: 3.0.0
-
   locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
@@ -14643,10 +14393,6 @@ snapshots:
       - supports-color
     optional: true
 
-  map-age-cleaner@0.1.3:
-    dependencies:
-      p-defer: 1.0.0
-
   map-obj@1.0.1: {}
 
   markdown-it-mark@4.0.0: {}
@@ -14682,12 +14428,6 @@ snapshots:
 
   media-typer@0.3.0: {}
 
-  mem@4.3.0:
-    dependencies:
-      map-age-cleaner: 0.1.3
-      mimic-fn: 2.1.0
-      p-is-promise: 2.1.0
-
   meow@3.7.0:
     dependencies:
       camelcase-keys: 2.1.0
@@ -14726,8 +14466,6 @@ snapshots:
 
   mime@4.0.6: {}
 
-  mimic-fn@2.1.0: {}
-
   mimic-fn@4.0.0: {}
 
   mimic-response@3.1.0: {}
@@ -14858,8 +14596,6 @@ snapshots:
 
   netmask@2.0.2: {}
 
-  nice-try@1.0.5: {}
-
   nitropack@2.11.6(encoding@0.1.13)(sqlite3@5.1.7)(typescript@5.7.2):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.3.4
@@ -15039,10 +14775,6 @@ snapshots:
 
   normalize-url@7.2.0: {}
 
-  npm-run-path@2.0.2:
-    dependencies:
-      path-key: 2.0.1
-
   npm-run-path@5.3.0:
     dependencies:
       path-key: 4.0.0
@@ -15068,8 +14800,6 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  number-is-nan@1.0.1: {}
-
   nuxt@3.16.0(@parcel/watcher@2.5.1)(@types/node@20.16.5)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0):
     dependencies:
       '@nuxt/cli': 3.23.0(magicast@0.3.5)
@@ -15287,12 +15017,6 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
-  os-locale@3.1.0:
-    dependencies:
-      execa: 1.0.0
-      lcid: 2.0.0
-      mem: 4.3.0
-
   own-keys@1.0.1:
     dependencies:
       get-intrinsic: 1.3.0
@@ -15314,16 +15038,6 @@ snapshots:
       '@oxc-parser/binding-win32-arm64-msvc': 0.56.5
       '@oxc-parser/binding-win32-x64-msvc': 0.56.5
 
-  p-defer@1.0.0: {}
-
-  p-finally@1.0.0: {}
-
-  p-is-promise@2.1.0: {}
-
-  p-limit@2.3.0:
-    dependencies:
-      p-try: 2.2.0
-
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
@@ -15332,10 +15046,6 @@ snapshots:
     dependencies:
       yocto-queue: 1.2.0
 
-  p-locate@3.0.0:
-    dependencies:
-      p-limit: 2.3.0
-
   p-locate@5.0.0:
     dependencies:
       p-limit: 3.1.0
@@ -15356,8 +15066,6 @@ snapshots:
       mimic-fn: 4.0.0
       type-fest: 3.13.1
 
-  p-try@2.2.0: {}
-
   pac-proxy-agent@7.0.2:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
@@ -15463,16 +15171,12 @@ snapshots:
     dependencies:
       pinkie-promise: 2.0.1
 
-  path-exists@3.0.0: {}
-
   path-exists@4.0.0: {}
 
   path-exists@5.0.0: {}
 
   path-is-absolute@1.0.1: {}
 
-  path-key@2.0.1: {}
-
   path-key@3.1.1: {}
 
   path-key@4.0.0: {}
@@ -16069,8 +15773,6 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
-  require-main-filename@1.0.1: {}
-
   requires-port@1.0.0: {}
 
   resolve-from@4.0.0: {}
@@ -16244,7 +15946,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  set-blocking@2.0.0: {}
+  set-blocking@2.0.0:
+    optional: true
 
   set-function-length@1.2.2:
     dependencies:
@@ -16301,16 +16004,10 @@ snapshots:
       '@img/sharp-win32-ia32': 0.33.5
       '@img/sharp-win32-x64': 0.33.5
 
-  shebang-command@1.2.0:
-    dependencies:
-      shebang-regex: 1.0.0
-
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
 
-  shebang-regex@1.0.0: {}
-
   shebang-regex@3.0.0: {}
 
   shell-quote@1.8.2: {}
@@ -16504,17 +16201,6 @@ snapshots:
     optionalDependencies:
       bare-events: 2.4.2
 
-  string-width@1.0.2:
-    dependencies:
-      code-point-at: 1.1.0
-      is-fullwidth-code-point: 1.0.0
-      strip-ansi: 3.0.1
-
-  string-width@2.1.1:
-    dependencies:
-      is-fullwidth-code-point: 2.0.0
-      strip-ansi: 4.0.0
-
   string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
@@ -16582,14 +16268,6 @@ snapshots:
       is-obj: 1.0.1
       is-regexp: 1.0.0
 
-  strip-ansi@3.0.1:
-    dependencies:
-      ansi-regex: 2.1.1
-
-  strip-ansi@4.0.0:
-    dependencies:
-      ansi-regex: 3.0.1
-
   strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
@@ -16606,8 +16284,6 @@ snapshots:
 
   strip-comments@2.0.1: {}
 
-  strip-eof@1.0.0: {}
-
   strip-final-newline@3.0.0: {}
 
   strip-final-newline@4.0.0: {}
@@ -17508,8 +17184,6 @@ snapshots:
       is-weakmap: 2.0.2
       is-weakset: 2.0.4
 
-  which-module@2.0.1: {}
-
   which-typed-array@1.1.19:
     dependencies:
       available-typed-arrays: 1.0.7
@@ -17520,10 +17194,6 @@ snapshots:
       gopd: 1.2.0
       has-tostringtag: 1.0.2
 
-  which@1.3.1:
-    dependencies:
-      isexe: 2.0.0
-
   which@2.0.2:
     dependencies:
       isexe: 2.0.0
@@ -17657,11 +17327,6 @@ snapshots:
       '@types/trusted-types': 2.0.7
       workbox-core: 7.3.0
 
-  wrap-ansi@2.1.0:
-    dependencies:
-      string-width: 1.0.2
-      strip-ansi: 3.0.1
-
   wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -17690,8 +17355,6 @@ snapshots:
 
   xmlchars@2.2.0: {}
 
-  y18n@4.0.3: {}
-
   y18n@5.0.8: {}
 
   yallist@3.1.1: {}
@@ -17710,28 +17373,8 @@ snapshots:
 
   yaml@2.7.0: {}
 
-  yargs-parser@11.1.1:
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-
   yargs-parser@21.1.1: {}
 
-  yargs@12.0.5:
-    dependencies:
-      cliui: 4.1.0
-      decamelize: 1.2.0
-      find-up: 3.0.0
-      get-caller-file: 1.0.3
-      os-locale: 3.1.0
-      require-directory: 2.1.1
-      require-main-filename: 1.0.1
-      set-blocking: 2.0.0
-      string-width: 2.1.1
-      which-module: 2.0.1
-      y18n: 4.0.3
-      yargs-parser: 11.1.1
-
   yargs@17.7.2:
     dependencies:
       cliui: 8.0.1

From 740195d15ee9c90de1747d879e096e7baff2cfd8 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 28 Mar 2025 18:52:39 +0100
Subject: [PATCH 05/45] (fix) generate locale fonts file instead of using
 addTemplate looks like it has issues with type checking and building

---
 .gitignore                |  1 +
 README.md                 |  2 +-
 components/LocaleList.vue |  2 +-
 locale/generate.ts        | 37 +++++++++++++++++++++++++++++++++++++
 locale/generateSchemas.ts | 15 ---------------
 nuxt.config.ts            | 11 -----------
 package.json              |  2 +-
 7 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 locale/generate.ts
 delete mode 100644 locale/generateSchemas.ts

diff --git a/.gitignore b/.gitignore
index 4f83c39b4..817ec200c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /keys
 
 /locale/*.schema.json
+/locale/fonts.ts
 
 /cache
 /calendar
diff --git a/README.md b/README.md
index 728a7fbaf..06f9af3f4 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ To work effectively with this project, it is recommended to configure these poin
 - Integrating Vitest to easily view test results
 - Use `yaml` syntax highlighting for `.suml` files
 - Link `locale/config.schema.json` to `locale/*/config.suml` for schema validation and type hints
-  (the schema file is automatically generated by `locale/generateSchemas.ts` in `make install`)
+  (the schema file is automatically generated by `locale/generate.ts` in `make install`)
 
 ### Git
 
diff --git a/components/LocaleList.vue b/components/LocaleList.vue
index e3e0c5115..1a7637e74 100644
--- a/components/LocaleList.vue
+++ b/components/LocaleList.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { fontHeadingsByLocale } from '#build/locale/fonts.ts';
+import { fontHeadingsByLocale } from '~/locale/fonts.ts';
 import type { LocaleDescription } from '~/locale/locales.ts';
 import { getUrlForLocale } from '~/src/domain.ts';
 import { formatFonts } from '~/src/fonts.ts';
diff --git a/locale/generate.ts b/locale/generate.ts
new file mode 100644
index 000000000..36ae42ea3
--- /dev/null
+++ b/locale/generate.ts
@@ -0,0 +1,37 @@
+import fs from 'fs/promises';
+
+import { createGenerator } from 'ts-json-schema-generator';
+
+import type { Config } from '~/locale/config.ts';
+import localeDescriptions from '~/locale/locales.ts';
+import { loadSuml } from '~/server/loader.ts';
+
+const __dirname = new URL('.', import.meta.url).pathname;
+
+const generateConfigJsonSchema = async () => {
+    const schema = createGenerator({
+        path: `${__dirname}/config.ts`,
+        strictTuples: true,
+        markdownDescription: true,
+        // speed up schema generation; type checking happens separately
+        skipTypeCheck: true,
+    }).createSchema('Config');
+
+    await fs.writeFile(`${__dirname}/config.schema.json`, `${JSON.stringify(schema, null, 4)}\n`);
+};
+
+const generateFontsModule = async () => {
+    const configByLocale = Object.fromEntries(await Promise.all(localeDescriptions.map(async (locale) => {
+        return [locale.code, await loadSuml<Config>(`locale/${locale.code}/config.suml`)] as const;
+    })));
+
+    const fontHeadingsByLocale = Object.fromEntries(Object.entries(configByLocale)
+        .map(([localeCode, config]) => [localeCode, config.style.fontHeadings]));
+
+    await fs.writeFile(
+        `${__dirname}/fonts.ts`,
+        `export const fontHeadingsByLocale: Record<string, string[]> = ${JSON.stringify(fontHeadingsByLocale)}`,
+    );
+};
+
+await Promise.all([generateConfigJsonSchema(), generateFontsModule()]);
diff --git a/locale/generateSchemas.ts b/locale/generateSchemas.ts
deleted file mode 100644
index 4350318e8..000000000
--- a/locale/generateSchemas.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import fs from 'fs';
-
-import { createGenerator } from 'ts-json-schema-generator';
-
-const __dirname = new URL('.', import.meta.url).pathname;
-
-const schema = createGenerator({
-    path: `${__dirname}/config.ts`,
-    strictTuples: true,
-    markdownDescription: true,
-    // speed up schema generation; type checking happens separately
-    skipTypeCheck: true,
-}).createSchema('Config');
-
-fs.writeFileSync(`${__dirname}/config.schema.json`, `${JSON.stringify(schema, null, 4)}\n`);
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 185b33d18..4b766de28 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -223,17 +223,6 @@ export default defineNuxtConfig({
         },
     },
     hooks: {
-        async 'app:templates'() {
-            const fontHeadingsByLocale = Object.fromEntries(Object.entries(configByLocale)
-                .filter(([localeCode, _]) => localeCode !== '_')
-                .map(([localeCode, config]) => [localeCode, config.style.fontHeadings]));
-            addTemplate({
-                filename: 'locale/fonts.ts',
-                getContents: () => `export const fontHeadingsByLocale: Record<string, string[]>
-                    = ${JSON.stringify(fontHeadingsByLocale)}`,
-                write: true,
-            });
-        },
         async 'pages:extend'(routes) {
             for (const code of codes) {
                 for (const subroute of configByLocale[code].nouns.subroutes || []) {
diff --git a/package.json b/package.json
index 7088d8d22..0fe71f348 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
         "./server/dotenv.ts"
     ],
     "scripts": {
-        "prepare-dev": "nuxi prepare && pnpm run-file locale/generateSchemas.ts",
+        "prepare-dev": "nuxi prepare && pnpm run-file locale/generate.ts",
         "dev": "nuxi dev",
         "build": "NODE_OPTIONS=\"--max-old-space-size=5120\" nuxi build",
         "run-file": "node --import=./server/ts-node-esm.js --env-file=.env",

From 83a9a601c5446e11ac8ec1ee0089755beeea59c6 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 28 Mar 2025 23:37:07 +0100
Subject: [PATCH 06/45] (lint)

---
 nuxt.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 4b766de28..97ac3263c 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,7 +2,7 @@ import childProcess from 'node:child_process';
 import { promisify } from 'node:util';
 import path from 'path';
 
-import { addTemplate, resolvePath } from '@nuxt/kit';
+import { resolvePath } from '@nuxt/kit';
 import yamlPlugin from '@rollup/plugin-yaml';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
 import { defineNuxtConfig } from 'nuxt/config';

From ef04cc0586c7489fe3651073f4d8d25e6d4f1e4b Mon Sep 17 00:00:00 2001
From: eo contributors <localisation@pronouns.page>
Date: Fri, 28 Mar 2025 23:39:03 +0100
Subject: [PATCH 07/45] (eo)(trans)

---
 locale/eo/translations.suml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/locale/eo/translations.suml b/locale/eo/translations.suml
index 13ea3e466..28450ff61 100644
--- a/locale/eo/translations.suml
+++ b/locale/eo/translations.suml
@@ -608,6 +608,10 @@ user:
             Unukonte vi povas havi nur unu karton po lingvo kaj tiuj kartoj estas ligitaj per la komuna @uzantnomo. Tamen
             eble vi volus krei ankaŭ multajn sendependajn kontojn, ekzemple unu por laboro kaj alian apartan por via
             amikaro. Se vi aldonos la kontojn ĉi tien, vi povos rapide ŝanĝadi inter ili.
+    emailMissing: >
+        Via konto estis kreita per metodo, kiu ne kunhavigis kun ni konfirmitan retpoŝtan adreson. Bonvolu ŝanĝi la
+        ĉi-suban lokokupan tekston al via adreso. Tiel vi havos retropaŝan ensalutmetodon, se vi perdos aliron al tiu,
+        kiun vi uzis.
     tooFewAuthMethods: 'Ni rekomendas konekti almenaŭ du metodojn de aŭtentigo, por ke vi havu iun rezervan.'
 
 profile:
@@ -660,6 +664,10 @@ profile:
     linksRecommended: 'Ni rekomendas ligi al'
     verifiedLinks:
         header: 'Aprobitaj ligiloj'
+        info: >
+            Ligiloj metitaj ĉe profiloj estos markitaj per ŝildeto, se ili estas konfirmitaj per ensalutado per taŭga
+            aŭtentiga metodo, aŭ per la etikego <code>rel="me"</code> direktiganta al la karto. Ankaŭ niaj ligiloj
+            inkluzivas la tagon <code>rel="me"</code>, do ankaŭ aliaj retejoj povas konfirmi vian karton ĉe sia flanko.
     column: 'Kolumno'
     opinions:
         header: 'Klarigo/opinisignoj'

From 35850ab137740555c709394982ce1f5d977f1910 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 28 Mar 2025 23:47:57 +0100
Subject: [PATCH 08/45] (fix)(calendar) add locale to links of calendar images

---
 components/CalendarExtra.vue                     | 7 ++++++-
 locale/pl/blog/niebinarne-rodzicielstwo-jezyk.md | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/CalendarExtra.vue b/components/CalendarExtra.vue
index 1928f2bc8..cf3c77d55 100644
--- a/components/CalendarExtra.vue
+++ b/components/CalendarExtra.vue
@@ -60,7 +60,12 @@ const icsLink = computed(() => {
                     <T>calendar.image.header</T><T>quotation.colon</T>
                 </p>
                 <p v-if="day" class="mb-0">
-                    <a :href="`/calendar/${day}.png`" target="_blank" rel="noopener" class="btn btn-outline-primary m-1">
+                    <a
+                        :href="`/calendar/${config.locale}/${day}.png`"
+                        target="_blank"
+                        rel="noopener"
+                        class="btn btn-outline-primary m-1"
+                    >
                         <Icon v="image" />
                         <T>calendar.image.header</T>
                     </a>
diff --git a/locale/pl/blog/niebinarne-rodzicielstwo-jezyk.md b/locale/pl/blog/niebinarne-rodzicielstwo-jezyk.md
index a2f2e96d4..35b32275e 100644
--- a/locale/pl/blog/niebinarne-rodzicielstwo-jezyk.md
+++ b/locale/pl/blog/niebinarne-rodzicielstwo-jezyk.md
@@ -117,7 +117,7 @@ Jeśli będzie chciało mi złożyć życzenia w Dzień Kobiet – przyjmę je,
 Nie zmienia to faktu, że moje święta przypadają 18 kwietnia – to Dzień Niebinarnego Rodzica – oraz 9 marca, 
 kiedy obchodzimy Polski Dzień Osób Niebinarnych.
 
-<a href="/kalendarz/2023-03-09"><img src="/calendar/2023-03-09.png" alt="Kalendarz na marzec z zaznaczonymi queerowymi świętami i wylistowanymi tymi z 9-go marca"></a>
+<a href="/kalendarz/2023-03-09"><img src="/calendar/pl/2023-03-09.png" alt="Kalendarz na marzec z zaznaczonymi queerowymi świętami i wylistowanymi tymi z 9-go marca"></a>
 
 Jestem rodzicem, jestem osobą rodzicielską, jestem mamuś. Jestem sobą. 
 

From 2c513eb76a796c1b69eb4dffba7357a72a4a61be Mon Sep 17 00:00:00 2001
From: Pronouns Page Technical <technical@pronouns.page>
Date: Sat, 29 Mar 2025 15:06:34 +0000
Subject: [PATCH 09/45] Update Node.js to v22

---
 .gitlab-ci.yml              |   6 +-
 .nvmrc                      |   2 +-
 docker/smoketest.Dockerfile |   2 +-
 package.json                |   2 +-
 pnpm-lock.yaml              | 194 ++++++++++++++++++------------------
 5 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01a617e3c..56b2e25a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ check:
     needs: []
     rules:
         - if: $CI_COMMIT_BRANCH
-    image: node:20.12.2
+    image: node:22.14.0
     before_script:
         - set -o pipefail
         - export NODE_ENV=development
@@ -100,7 +100,7 @@ build:
     tags: ['build']
     rules:
         - if: $CI_COMMIT_REF_PROTECTED == 'true'
-    image: node:20.12.2
+    image: node:22.14.0
     script:
         # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor
         - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
@@ -145,7 +145,7 @@ build:
         -
             job: 'build'
             artifacts: false
-    image: node:20.12.2
+    image: node:22.14.0
     before_script:
         # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor
         - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
diff --git a/.nvmrc b/.nvmrc
index a81debaee..7d41c735d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v20.12.2
+22.14.0
diff --git a/docker/smoketest.Dockerfile b/docker/smoketest.Dockerfile
index dfa204a54..c971dcbf7 100644
--- a/docker/smoketest.Dockerfile
+++ b/docker/smoketest.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM node:20 as base
+FROM node:22.14.0 as base
 
 RUN apt-get update && apt-get install -y openssh-client tini sudo
 
diff --git a/package.json b/package.json
index 0fe71f348..2e30ad2aa 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
         "@types/jsdom": "^21.1.7",
         "@types/luxon": "^1.27.1",
         "@types/markdown-it": "^14.0.1",
-        "@types/node": "^20.16.5",
+        "@types/node": "^22.13.13",
         "@types/nodemailer": "^6.4.14",
         "@types/papaparse": "^5.3.14",
         "@types/speakeasy": "^2.0.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b72100d5c..54835afd0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -115,7 +115,7 @@ importers:
         version: 0.2.3
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@20.16.5)(typescript@5.7.2)
+        version: 10.9.2(@types/node@22.13.14)(typescript@5.7.2)
       tsconfig-paths:
         specifier: 3.14.2
         version: 3.14.2
@@ -140,10 +140,10 @@ importers:
         version: 7.26.0(@babel/core@7.26.8)
       '@nuxt/eslint':
         specifier: ^1.2.0
-        version: 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+        version: 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@nuxt/test-utils':
         specifier: ^3.15.4
-        version: 3.15.4(@playwright/test@1.50.0)(@types/node@20.16.5)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
+        version: 3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
       '@nuxtjs/plausible':
         specifier: ^1.2.0
         version: 1.2.0(magicast@0.3.5)
@@ -190,8 +190,8 @@ importers:
         specifier: ^14.0.1
         version: 14.1.2
       '@types/node':
-        specifier: ^20.16.5
-        version: 20.16.5
+        specifier: ^22.13.13
+        version: 22.13.14
       '@types/nodemailer':
         specifier: ^6.4.14
         version: 6.4.16
@@ -206,10 +206,10 @@ importers:
         version: 8.3.2
       '@vite-pwa/nuxt':
         specifier: ^0.10.6
-        version: 0.10.6(magicast@0.3.5)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+        version: 0.10.6(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
       '@vitest/coverage-v8':
         specifier: ^3.0.8
-        version: 3.0.8(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+        version: 3.0.8(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@vue/test-utils':
         specifier: ^2.4.6
         version: 2.4.6
@@ -275,7 +275,7 @@ importers:
         version: https://codeload.github.com/pixunil/h3-express/tar.gz/0dd96342062c6190cc50101e7b48480587ca9582
       html-validate:
         specifier: ^9.2.2
-        version: 9.3.0(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+        version: 9.3.0(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       ioredis:
         specifier: ^5.6.0
         version: 5.6.0
@@ -296,7 +296,7 @@ importers:
         version: 0.7.0
       nuxt:
         specifier: ^3.16.0
-        version: 3.16.0(@parcel/watcher@2.5.1)(@types/node@20.16.5)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0)
+        version: 3.16.0(@parcel/watcher@2.5.1)(@types/node@22.13.14)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0)
       path-to-regexp:
         specifier: 0.1.12
         version: 0.1.12
@@ -320,7 +320,7 @@ importers:
         version: 5.7.2
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+        version: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vue-component-type-helpers:
         specifier: ^2.1.6
         version: 2.1.6
@@ -2602,8 +2602,8 @@ packages:
   '@types/mime@1.3.5':
     resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
 
-  '@types/node@20.16.5':
-    resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==}
+  '@types/node@22.13.14':
+    resolution: {integrity: sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==}
 
   '@types/nodemailer@6.4.16':
     resolution: {integrity: sha512-uz6hN6Pp0upXMcilM61CoKyjT7sskBoOWpptkjjJp8jIMlTdc3xG01U7proKkXzruMS4hS0zqtHNkNPFB20rKQ==}
@@ -7320,8 +7320,8 @@ packages:
   unctx@2.4.1:
     resolution: {integrity: sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg==}
 
-  undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+  undici-types@6.20.0:
+    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
   unenv@1.10.0:
     resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==}
@@ -9803,12 +9803,12 @@ snapshots:
 
   '@nuxt/devalue@2.0.2': {}
 
-  '@nuxt/devtools-kit@2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
+  '@nuxt/devtools-kit@2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@nuxt/schema': 3.16.0
       execa: 9.5.2
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
     transitivePeerDependencies:
       - magicast
 
@@ -9823,12 +9823,12 @@ snapshots:
       prompts: 2.4.2
       semver: 7.7.1
 
-  '@nuxt/devtools@2.3.0(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@nuxt/devtools@2.3.0(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@nuxt/devtools-kit': 2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      '@nuxt/devtools-kit': 2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@nuxt/devtools-wizard': 2.3.0
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
-      '@vue/devtools-core': 7.7.2(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@vue/devtools-core': 7.7.2(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
       '@vue/devtools-kit': 7.7.2
       birpc: 2.2.0
       consola: 3.4.0
@@ -9853,9 +9853,9 @@ snapshots:
       sirv: 3.0.1
       structured-clone-es: 1.0.0
       tinyglobby: 0.2.12
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-plugin-inspect: 11.0.0(@nuxt/kit@3.16.0(magicast@0.3.5))(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
-      vite-plugin-vue-tracer: 0.1.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite-plugin-inspect: 11.0.0(@nuxt/kit@3.16.0(magicast@0.3.5))(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      vite-plugin-vue-tracer: 0.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
       which: 5.0.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -9901,10 +9901,10 @@ snapshots:
       - supports-color
       - typescript
 
-  '@nuxt/eslint@1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
+  '@nuxt/eslint@1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
     dependencies:
       '@eslint/config-inspector': 1.0.2(eslint@9.22.0(jiti@2.4.2))
-      '@nuxt/devtools-kit': 2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      '@nuxt/devtools-kit': 2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@nuxt/eslint-config': 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
       '@nuxt/eslint-plugin': 1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
@@ -9979,7 +9979,7 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@nuxt/test-utils@3.15.4(@playwright/test@1.50.0)(@types/node@20.16.5)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)':
+  '@nuxt/test-utils@3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@nuxt/schema': 3.16.0
@@ -10004,15 +10004,15 @@ snapshots:
       ufo: 1.5.4
       unenv: 1.10.0
       unplugin: 2.2.0
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vitest-environment-nuxt: 1.0.1(@playwright/test@1.50.0)(@types/node@20.16.5)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vitest-environment-nuxt: 1.0.1(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
       vue: 3.5.13(typescript@5.7.2)
     optionalDependencies:
       '@playwright/test': 1.50.0
       '@vue/test-utils': 2.4.6
       jsdom: 26.0.0(canvas@3.1.0)
       playwright-core: 1.50.0
-      vitest: 3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vitest: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -10028,12 +10028,12 @@ snapshots:
       - typescript
       - yaml
 
-  '@nuxt/vite-builder@3.16.0(@types/node@20.16.5)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vue-tsc@2.2.8(typescript@5.7.2))(vue@3.5.13(typescript@5.7.2))(yaml@2.7.0)':
+  '@nuxt/vite-builder@3.16.0(@types/node@22.13.14)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vue-tsc@2.2.8(typescript@5.7.2))(vue@3.5.13(typescript@5.7.2))(yaml@2.7.0)':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@rollup/plugin-replace': 6.0.2(rollup@4.35.0)
-      '@vitejs/plugin-vue': 5.2.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
-      '@vitejs/plugin-vue-jsx': 4.1.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@vitejs/plugin-vue': 5.2.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@vitejs/plugin-vue-jsx': 4.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
       autoprefixer: 10.4.21(postcss@8.5.3)
       consola: 3.4.0
       cssnano: 7.0.6(postcss@8.5.3)
@@ -10058,9 +10058,9 @@ snapshots:
       ufo: 1.5.4
       unenv: 2.0.0-rc.14
       unplugin: 2.2.0
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-node: 3.0.8(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-plugin-checker: 0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite-node: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite-plugin-checker: 0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))
       vue: 3.5.13(typescript@5.7.2)
       vue-bundle-renderer: 2.1.1
     transitivePeerDependencies:
@@ -11044,7 +11044,7 @@ snapshots:
   '@types/body-parser@1.19.5':
     dependencies:
       '@types/connect': 3.4.38
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/chrome@0.0.278':
     dependencies:
@@ -11053,7 +11053,7 @@ snapshots:
 
   '@types/connect@3.4.38':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/doctrine@0.0.9': {}
 
@@ -11063,7 +11063,7 @@ snapshots:
 
   '@types/express-serve-static-core@4.19.5':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
       '@types/qs': 6.9.16
       '@types/range-parser': 1.2.7
       '@types/send': 0.17.4
@@ -11095,13 +11095,13 @@ snapshots:
 
   '@types/http-proxy@1.17.16':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/js-md5@0.7.2': {}
 
   '@types/jsdom@21.1.7':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
       '@types/tough-cookie': 4.0.5
       parse5: 7.2.1
 
@@ -11111,7 +11111,7 @@ snapshots:
 
   '@types/keyv@3.1.4':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/linkify-it@5.0.0': {}
 
@@ -11126,19 +11126,19 @@ snapshots:
 
   '@types/mime@1.3.5': {}
 
-  '@types/node@20.16.5':
+  '@types/node@22.13.14':
     dependencies:
-      undici-types: 6.19.8
+      undici-types: 6.20.0
 
   '@types/nodemailer@6.4.16':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/normalize-package-data@2.4.4': {}
 
   '@types/papaparse@5.3.14':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/parse-path@7.0.3': {}
 
@@ -11150,22 +11150,22 @@ snapshots:
 
   '@types/responselike@1.0.3':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/send@0.17.4':
     dependencies:
       '@types/mime': 1.3.5
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/serve-static@1.15.7':
     dependencies:
       '@types/http-errors': 2.0.4
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
       '@types/send': 0.17.4
 
   '@types/speakeasy@2.0.10':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
 
   '@types/tough-cookie@4.0.5': {}
 
@@ -11177,7 +11177,7 @@ snapshots:
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
     optional: true
 
   '@typescript-eslint/eslint-plugin@8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2))(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
@@ -11282,12 +11282,12 @@ snapshots:
       - rollup
       - supports-color
 
-  '@vite-pwa/nuxt@0.10.6(magicast@0.3.5)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)':
+  '@vite-pwa/nuxt@0.10.6(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       pathe: 1.1.2
       ufo: 1.5.4
-      vite-plugin-pwa: 0.21.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+      vite-plugin-pwa: 0.21.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
     transitivePeerDependencies:
       - magicast
       - supports-color
@@ -11295,22 +11295,22 @@ snapshots:
       - workbox-build
       - workbox-window
 
-  '@vitejs/plugin-vue-jsx@4.1.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@vitejs/plugin-vue-jsx@4.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@babel/core': 7.26.8
       '@babel/plugin-transform-typescript': 7.26.8(@babel/core@7.26.8)
       '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.26.8)
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vue: 3.5.13(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@vitejs/plugin-vue@5.2.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vitest/coverage-v8@3.0.8(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
+  '@vitest/coverage-v8@3.0.8(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
@@ -11324,7 +11324,7 @@ snapshots:
       std-env: 3.8.1
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vitest: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -11335,13 +11335,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.0.8(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
+  '@vitest/mocker@3.0.8(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
     dependencies:
       '@vitest/spy': 3.0.8
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
 
   '@vitest/pretty-format@3.0.8':
     dependencies:
@@ -11457,14 +11457,14 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
-  '@vue/devtools-core@7.7.2(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@vue/devtools-core@7.7.2(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@vue/devtools-kit': 7.7.2
       '@vue/devtools-shared': 7.7.2
       mitt: 3.0.1
       nanoid: 5.1.3
       pathe: 2.0.3
-      vite-hot-client: 0.2.4(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      vite-hot-client: 0.2.4(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       vue: 3.5.13(typescript@5.7.2)
     transitivePeerDependencies:
       - vite
@@ -13626,7 +13626,7 @@ snapshots:
 
   html-escaper@2.0.2: {}
 
-  html-validate@9.3.0(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
+  html-validate@9.3.0(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
     dependencies:
       '@html-validate/stylish': 4.2.0
       '@sidvind/better-ajv-errors': 3.0.1(ajv@8.17.1)
@@ -13637,7 +13637,7 @@ snapshots:
       prompts: 2.4.2
       semver: 7.7.1
     optionalDependencies:
-      vitest: 3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vitest: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
 
   html2canvas@1.4.1:
     dependencies:
@@ -14800,15 +14800,15 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuxt@3.16.0(@parcel/watcher@2.5.1)(@types/node@20.16.5)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0):
+  nuxt@3.16.0(@parcel/watcher@2.5.1)(@types/node@22.13.14)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0):
     dependencies:
       '@nuxt/cli': 3.23.0(magicast@0.3.5)
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 2.3.0(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@nuxt/devtools': 2.3.0(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@nuxt/schema': 3.16.0
       '@nuxt/telemetry': 2.6.5(magicast@0.3.5)
-      '@nuxt/vite-builder': 3.16.0(@types/node@20.16.5)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vue-tsc@2.2.8(typescript@5.7.2))(vue@3.5.13(typescript@5.7.2))(yaml@2.7.0)
+      '@nuxt/vite-builder': 3.16.0(@types/node@22.13.14)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vue-tsc@2.2.8(typescript@5.7.2))(vue@3.5.13(typescript@5.7.2))(yaml@2.7.0)
       '@oxc-parser/wasm': 0.56.5
       '@unhead/vue': 2.0.0-rc.13(vue@3.5.13(typescript@5.7.2))
       '@vue/shared': 3.5.13
@@ -14867,7 +14867,7 @@ snapshots:
       vue-router: 4.5.0(vue@3.5.13(typescript@5.7.2))
     optionalDependencies:
       '@parcel/watcher': 2.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -16533,14 +16533,14 @@ snapshots:
       safe-stable-stringify: 2.5.0
       typescript: 5.4.5
 
-  ts-node@10.9.2(@types/node@20.16.5)(typescript@5.7.2):
+  ts-node@10.9.2(@types/node@22.13.14)(typescript@5.7.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
       acorn: 8.14.0
       acorn-walk: 8.3.4
       arg: 4.1.3
@@ -16664,7 +16664,7 @@ snapshots:
       magic-string: 0.30.17
       unplugin: 2.2.0
 
-  undici-types@6.19.8: {}
+  undici-types@6.20.0: {}
 
   unenv@1.10.0:
     dependencies:
@@ -16886,27 +16886,27 @@ snapshots:
 
   viewport-list@5.1.1: {}
 
-  vite-dev-rpc@1.0.7(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
+  vite-dev-rpc@1.0.7(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
     dependencies:
       birpc: 2.2.0
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-hot-client: 2.0.4(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite-hot-client: 2.0.4(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
 
-  vite-hot-client@0.2.4(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
+  vite-hot-client@0.2.4(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
     dependencies:
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
 
-  vite-hot-client@2.0.4(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
+  vite-hot-client@2.0.4(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
     dependencies:
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
 
-  vite-node@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
+  vite-node@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.0(supports-color@9.4.0)
       es-module-lexer: 1.6.0
       pathe: 2.0.3
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -16921,7 +16921,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-checker@0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.7.2)(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2)):
+  vite-plugin-checker@0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2)):
     dependencies:
       '@babel/code-frame': 7.26.2
       chokidar: 4.0.3
@@ -16931,7 +16931,7 @@ snapshots:
       strip-ansi: 7.1.0
       tiny-invariant: 1.3.3
       tinyglobby: 0.2.12
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vscode-uri: 3.1.0
     optionalDependencies:
       eslint: 9.22.0(jiti@2.4.2)
@@ -16939,7 +16939,7 @@ snapshots:
       typescript: 5.7.2
       vue-tsc: 2.2.8(typescript@5.7.2)
 
-  vite-plugin-inspect@11.0.0(@nuxt/kit@3.16.0(magicast@0.3.5))(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
+  vite-plugin-inspect@11.0.0(@nuxt/kit@3.16.0(magicast@0.3.5))(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
     dependencies:
       ansis: 3.17.0
       debug: 4.4.0(supports-color@9.4.0)
@@ -16949,49 +16949,49 @@ snapshots:
       perfect-debounce: 1.0.0
       sirv: 3.0.1
       unplugin-utils: 0.2.4
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-dev-rpc: 1.0.7(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite-dev-rpc: 1.0.7(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
     optionalDependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-pwa@0.21.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+  vite-plugin-pwa@0.21.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
     dependencies:
       debug: 4.4.0(supports-color@9.4.0)
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.12
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       workbox-build: 7.3.0
       workbox-window: 7.3.0
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-tracer@0.1.1(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2)):
+  vite-plugin-vue-tracer@0.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       estree-walker: 3.0.3
       magic-string: 0.30.17
       pathe: 2.0.3
       source-map-js: 1.2.1
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vue: 3.5.13(typescript@5.7.2)
 
-  vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
+  vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
     dependencies:
       esbuild: 0.25.1
       postcss: 8.5.3
       rollup: 4.35.0
     optionalDependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
       fsevents: 2.3.3
       jiti: 2.4.2
       sass: 1.32.12
       terser: 5.33.0
       yaml: 2.7.0
 
-  vitest-environment-nuxt@1.0.1(@playwright/test@1.50.0)(@types/node@20.16.5)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0):
+  vitest-environment-nuxt@1.0.1(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0):
     dependencies:
-      '@nuxt/test-utils': 3.15.4(@playwright/test@1.50.0)(@types/node@20.16.5)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
+      '@nuxt/test-utils': 3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
     transitivePeerDependencies:
       - '@cucumber/cucumber'
       - '@jest/globals'
@@ -17017,10 +17017,10 @@ snapshots:
       - vitest
       - yaml
 
-  vitest@3.0.8(@types/node@20.16.5)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
+  vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
     dependencies:
       '@vitest/expect': 3.0.8
-      '@vitest/mocker': 3.0.8(vite@6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+      '@vitest/mocker': 3.0.8(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@vitest/pretty-format': 3.0.8
       '@vitest/runner': 3.0.8
       '@vitest/snapshot': 3.0.8
@@ -17036,11 +17036,11 @@ snapshots:
       tinyexec: 0.3.2
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 6.2.2(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-node: 3.0.8(@types/node@20.16.5)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
+      vite-node: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.13.14
       jsdom: 26.0.0(canvas@3.1.0)
     transitivePeerDependencies:
       - jiti

From c1497aa58efb3d0f3af4bf2cdd1d01a494191d86 Mon Sep 17 00:00:00 2001
From: Pronouns Page Technical <technical@pronouns.page>
Date: Sat, 29 Mar 2025 15:07:59 +0000
Subject: [PATCH 10/45] Update dependency @vuepic/vue-datepicker to v11

---
 package.json   |  2 +-
 pnpm-lock.yaml | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 0fe71f348..78785513c 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
         "@vite-pwa/nuxt": "^0.10.6",
         "@vitest/coverage-v8": "^3.0.8",
         "@vue/test-utils": "^2.4.6",
-        "@vuepic/vue-datepicker": "^8.8.1",
+        "@vuepic/vue-datepicker": "^11.0.2",
         "@vueuse/core": "^13.0.0",
         "avris-columnist": "^0.3.4",
         "avris-futurus": "^1.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b72100d5c..d107f5456 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -214,8 +214,8 @@ importers:
         specifier: ^2.4.6
         version: 2.4.6
       '@vuepic/vue-datepicker':
-        specifier: ^8.8.1
-        version: 8.8.1(vue@3.5.13(typescript@5.7.2))
+        specifier: ^11.0.2
+        version: 11.0.2(vue@3.5.13(typescript@5.7.2))
       '@vueuse/core':
         specifier: ^13.0.0
         version: 13.0.0(vue@3.5.13(typescript@5.7.2))
@@ -2861,10 +2861,11 @@ packages:
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
 
-  '@vuepic/vue-datepicker@8.8.1':
-    resolution: {integrity: sha512-8ehfUz1m69Vuc16Pm4ukgb3Mg1VT14x4EsG1ag4O/qbSNRWztTo+pUV4JnFt0FGLl5gGb6NXlxIvR7EjLgD7Gg==}
+  '@vuepic/vue-datepicker@11.0.2':
+    resolution: {integrity: sha512-uHh78mVBXCEjam1uVfTzZ/HkyDwut/H6b2djSN9YTF+l/EA+XONfdCnOVSi1g+qVGSy65DcQAwyBNidAssnudQ==}
+    engines: {node: '>=18.12.0'}
     peerDependencies:
-      vue: '>=3.2.0'
+      vue: '>=3.3.0'
 
   '@vueuse/core@13.0.0':
     resolution: {integrity: sha512-rkgb4a8/0b234lMGCT29WkCjPfsX0oxrIRR7FDndRoW3FsaC9NBzefXg/9TLhAgwM11f49XnutshM4LzJBrQ5g==}
@@ -3651,6 +3652,9 @@ packages:
   date-fns@3.6.0:
     resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==}
 
+  date-fns@4.1.0:
+    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+
   db0@0.3.1:
     resolution: {integrity: sha512-3RogPLE2LLq6t4YiFCREyl572aBjkfMvfwPyN51df00TbPbryL3XqBYuJ/j6mgPssPK8AKfYdLxizaO5UG10sA==}
     peerDependencies:
@@ -11525,9 +11529,9 @@ snapshots:
       js-beautify: 1.15.1
       vue-component-type-helpers: 2.1.6
 
-  '@vuepic/vue-datepicker@8.8.1(vue@3.5.13(typescript@5.7.2))':
+  '@vuepic/vue-datepicker@11.0.2(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      date-fns: 3.6.0
+      date-fns: 4.1.0
       vue: 3.5.13(typescript@5.7.2)
 
   '@vueuse/core@13.0.0(vue@3.5.13(typescript@5.7.2))':
@@ -12388,6 +12392,8 @@ snapshots:
 
   date-fns@3.6.0: {}
 
+  date-fns@4.1.0: {}
+
   db0@0.3.1(sqlite3@5.1.7):
     optionalDependencies:
       sqlite3: 5.1.7

From 8690f1ca14f259970698c4b4a5c85d21f1247692 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sat, 29 Mar 2025 18:13:03 +0100
Subject: [PATCH 11/45] (fix) padding on datepickers (not related to
 @vuepic/vue-datepicker upgrade, but to rtlcss)

---
 pages/profile/editor.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/profile/editor.vue b/pages/profile/editor.vue
index 1baeebcdf..b21da49a4 100644
--- a/pages/profile/editor.vue
+++ b/pages/profile/editor.vue
@@ -760,6 +760,10 @@ const propagateChanged = (field: string, checked: boolean): void => {
     z-index: 5;
 }
 
+.dp__input_icon_pad {
+    padding-left: var(--dp-input-icon-padding);
+}
+
 .dp__input_focus {
     box-shadow: $input-focus-box-shadow;
 }

From f63aed01e6912157bebc4ae0e7b958c0db7334b6 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sat, 29 Mar 2025 18:57:22 +0100
Subject: [PATCH 12/45] (fix) correctly reference node version (renovate drops
 the v in .nvmrc)

---
 run-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run-wrapper.sh b/run-wrapper.sh
index 7c291c4f1..de9b4f35c 100755
--- a/run-wrapper.sh
+++ b/run-wrapper.sh
@@ -4,7 +4,7 @@
 
 cd "$(dirname "$0")" || exit
 
-nvm_bin=~/.nvm/versions/node/"$(<.nvmrc)"/bin
+nvm_bin=~/.nvm/versions/node/v"$(<.nvmrc)"/bin
 export PATH=$nvm_bin:$PATH
 if [ "$1" = "start" ]; then
     exec node --env-file=.env .output/server/index.mjs -- "$(dirname "$0")" "$PORT"

From bd7a4ec7834a276282d6a21a711184a2343a62ed Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sat, 29 Mar 2025 20:35:00 +0100
Subject: [PATCH 13/45] (node) downgrade node to 22.13.1, because there are
 issues when installing dependencies via node-gyp

---
 .gitlab-ci.yml              | 6 +++---
 .nvmrc                      | 2 +-
 docker/smoketest.Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56b2e25a7..42f7e9b12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ check:
     needs: []
     rules:
         - if: $CI_COMMIT_BRANCH
-    image: node:22.14.0
+    image: node:22.13.1
     before_script:
         - set -o pipefail
         - export NODE_ENV=development
@@ -100,7 +100,7 @@ build:
     tags: ['build']
     rules:
         - if: $CI_COMMIT_REF_PROTECTED == 'true'
-    image: node:22.14.0
+    image: node:22.13.1
     script:
         # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor
         - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
@@ -145,7 +145,7 @@ build:
         -
             job: 'build'
             artifacts: false
-    image: node:22.14.0
+    image: node:22.13.1
     before_script:
         # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor
         - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
diff --git a/.nvmrc b/.nvmrc
index 7d41c735d..d5b283a3a 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.14.0
+22.13.1
diff --git a/docker/smoketest.Dockerfile b/docker/smoketest.Dockerfile
index c971dcbf7..651648aa4 100644
--- a/docker/smoketest.Dockerfile
+++ b/docker/smoketest.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM node:22.14.0 as base
+FROM node:22.13.1 as base
 
 RUN apt-get update && apt-get install -y openssh-client tini sudo
 

From 04d179c8e6b93986e036bb5817e7316e11b2ecdf Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sun, 30 Mar 2025 15:13:04 +0200
Subject: [PATCH 14/45] (node) reupgrade node to 22.14.0, appears to be working
 now

reverts commit bd7a4ec7834a276282d6a21a711184a2343a62ed
---
 .gitlab-ci.yml              | 6 +++---
 .nvmrc                      | 2 +-
 docker/smoketest.Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42f7e9b12..56b2e25a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ check:
     needs: []
     rules:
         - if: $CI_COMMIT_BRANCH
-    image: node:22.13.1
+    image: node:22.14.0
     before_script:
         - set -o pipefail
         - export NODE_ENV=development
@@ -100,7 +100,7 @@ build:
     tags: ['build']
     rules:
         - if: $CI_COMMIT_REF_PROTECTED == 'true'
-    image: node:22.13.1
+    image: node:22.14.0
     script:
         # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor
         - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
@@ -145,7 +145,7 @@ build:
         -
             job: 'build'
             artifacts: false
-    image: node:22.13.1
+    image: node:22.14.0
     before_script:
         # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor
         - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
diff --git a/.nvmrc b/.nvmrc
index d5b283a3a..7d41c735d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.13.1
+22.14.0
diff --git a/docker/smoketest.Dockerfile b/docker/smoketest.Dockerfile
index 651648aa4..c971dcbf7 100644
--- a/docker/smoketest.Dockerfile
+++ b/docker/smoketest.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM node:22.13.1 as base
+FROM node:22.14.0 as base
 
 RUN apt-get update && apt-get install -y openssh-client tini sudo
 

From 9e5af93b8f108ba0995173c795356595b4b18059 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 30 Mar 2025 15:51:11 +0200
Subject: [PATCH 15/45] try fixing issues with GTM

---
 layouts/default.vue | 22 ----------------------
 plugins/gtag.ts     | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 plugins/gtag.ts

diff --git a/layouts/default.vue b/layouts/default.vue
index be1f04cb8..d203dbca5 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -48,7 +48,6 @@ onMounted(executeUnlessPrerendering(() => {
     confirmAge();
 
     loadAds();
-    loadGTM();
 
     let needsRefresh = false;
     const bc = new BroadcastChannel('account_switch');
@@ -113,27 +112,6 @@ const loadAds = async (): Promise<void> => {
         throw error;
     }
 };
-const loadGTM = async (): Promise<void> => {
-    if (!adsEnabled.value) {
-        return;
-    }
-
-    try {
-        await loadScript('gtm', 'https://www.googletagmanager.com/gtag/js?id=G-TDJEP12Q3M');
-    } catch (error) {
-        if (error instanceof LoadScriptError) {
-            return;
-        }
-        throw error;
-    }
-
-    window.dataLayer = window.dataLayer || [];
-    function gtag(...args: unknown[]): void {
-        window.dataLayer.push(args);
-    }
-    gtag('js', newDate());
-    gtag('config', 'G-TDJEP12Q3M');
-};
 </script>
 
 <template>
diff --git a/plugins/gtag.ts b/plugins/gtag.ts
new file mode 100644
index 000000000..7f8f9073e
--- /dev/null
+++ b/plugins/gtag.ts
@@ -0,0 +1,24 @@
+export default defineNuxtPlugin((nuxtApp) => {
+    const config = useConfig();
+    if (!config.ads?.enabled || import.meta.env?.APP_ENV !== 'production') {
+        return;
+    }
+
+    useHead({
+        script: [
+            {
+                src: 'https://www.googletagmanager.com/gtag/js?id=G-TDJEP12Q3M',
+                async: true,
+            },
+            {
+                children: `
+          window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+          gtag('config', 'G-TDJEP12Q3M');
+        `,
+                type: 'text/javascript',
+            },
+        ],
+    });
+});

From 0a7ed699e887dc8cc959e25be4b067081e285dcd Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 30 Mar 2025 16:07:44 +0200
Subject: [PATCH 16/45] lint

---
 layouts/default.vue |  2 +-
 plugins/gtag.ts     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index d203dbca5..645651082 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -8,7 +8,7 @@ import useDark from '~/composables/useDark.ts';
 import useDialogue from '~/composables/useDialogue.ts';
 import { longtimeCookieSetting } from '~/src/cookieSettings.ts';
 import { LoadScriptError } from '~/src/errors.ts';
-import { executeUnlessPrerendering, newDate } from '~/src/helpers.ts';
+import { executeUnlessPrerendering } from '~/src/helpers.ts';
 import { useMainStore } from '~/store/index.ts';
 
 // no need to be super secure, just a sign that the page is not public
diff --git a/plugins/gtag.ts b/plugins/gtag.ts
index 7f8f9073e..0c9154453 100644
--- a/plugins/gtag.ts
+++ b/plugins/gtag.ts
@@ -1,4 +1,4 @@
-export default defineNuxtPlugin((nuxtApp) => {
+export default defineNuxtPlugin(() => {
     const config = useConfig();
     if (!config.ads?.enabled || import.meta.env?.APP_ENV !== 'production') {
         return;
@@ -11,12 +11,12 @@ export default defineNuxtPlugin((nuxtApp) => {
                 async: true,
             },
             {
-                children: `
-          window.dataLayer = window.dataLayer || [];
-          function gtag(){dataLayer.push(arguments);}
-          gtag('js', new Date());
-          gtag('config', 'G-TDJEP12Q3M');
-        `,
+                textContent: `
+                    window.dataLayer = window.dataLayer || [];
+                    function gtag(){dataLayer.push(arguments);}
+                    gtag('js', new Date());
+                    gtag('config', 'G-TDJEP12Q3M');
+                `,
                 type: 'text/javascript',
             },
         ],

From 5b8a37949c2bf51c19566e5003e3ede43f179aa2 Mon Sep 17 00:00:00 2001
From: Pronouns Page Technical <technical@pronouns.page>
Date: Sun, 30 Mar 2025 15:07:10 +0000
Subject: [PATCH 17/45] Update dependency chart.js to v4

---
 package.json   |  2 +-
 pnpm-lock.yaml | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index adaefdb49..e9edcc5b3 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
         "avris-sorter": "^0.0.3",
         "avris-vue-share": "^1.0.1",
         "bootstrap": "^5.3.1",
-        "chart.js": "3.7.0",
+        "chart.js": "4.4.8",
         "clipboard": "^2.0.6",
         "eslint": "^9.22.0",
         "eslint-formatter-gitlab": "^5.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ae053d4a5..c3274b95f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -238,8 +238,8 @@ importers:
         specifier: ^5.3.1
         version: 5.3.3(@popperjs/core@2.11.8)
       chart.js:
-        specifier: 3.7.0
-        version: 3.7.0
+        specifier: 4.4.8
+        version: 4.4.8
       clipboard:
         specifier: ^2.0.6
         version: 2.0.11
@@ -1519,6 +1519,9 @@ packages:
   '@jsdevtools/ono@7.1.3':
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
 
+  '@kurkle/color@0.3.4':
+    resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==}
+
   '@kwsites/file-exists@1.1.1':
     resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}
 
@@ -3318,8 +3321,9 @@ packages:
   charenc@0.0.2:
     resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
 
-  chart.js@3.7.0:
-    resolution: {integrity: sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg==}
+  chart.js@4.4.8:
+    resolution: {integrity: sha512-IkGZlVpXP+83QpMm4uxEiGqSI7jFizwVtF3+n5Pc3k7sMO+tkd0qxh2OzLhenM0K80xtmAONWGBn082EiBQSDA==}
+    engines: {pnpm: '>=8'}
 
   check-error@2.1.1:
     resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
@@ -9698,6 +9702,8 @@ snapshots:
 
   '@jsdevtools/ono@7.1.3': {}
 
+  '@kurkle/color@0.3.4': {}
+
   '@kwsites/file-exists@1.1.1':
     dependencies:
       debug: 4.4.0(supports-color@9.4.0)
@@ -12044,7 +12050,9 @@ snapshots:
 
   charenc@0.0.2: {}
 
-  chart.js@3.7.0: {}
+  chart.js@4.4.8:
+    dependencies:
+      '@kurkle/color': 0.3.4
 
   check-error@2.1.1: {}
 

From fcb5e35342d4c6cdf35eb9fe918ab66945099a83 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Mon, 31 Mar 2025 17:45:42 +0200
Subject: [PATCH 18/45] (admin) fix timesheets disabling fields (types issue)

---
 pages/admin/timesheets/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/admin/timesheets/index.vue b/pages/admin/timesheets/index.vue
index 2b5586d8d..70024dad3 100644
--- a/pages/admin/timesheets/index.vue
+++ b/pages/admin/timesheets/index.vue
@@ -210,7 +210,7 @@ const sumCells = (area: typeof areas[number] | undefined, month: keyof typeof mo
                                     step="0.5"
                                     class="form-control form-control-sm"
                                     style="min-width: 3rem"
-                                    :disabled="dt(year, m) < closed || dt(year, m) > max"
+                                    :disabled="dt(year, +m) < closed || dt(year, +m) > max"
                                     @focus="focusMonth = m;focusArea = areas.indexOf(area)"
                                     @keydown="cellKeydown"
                                 >

From 91f598d42bfb4cbe63fd98f3600c84a52b992d47 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Mon, 31 Mar 2025 17:57:42 +0200
Subject: [PATCH 19/45] (admin) rename "merch" to more generic "monetisation"

---
 migrations/088-timesheets-monetisation.sql | 7 +++++++
 src/timesheets.ts                          | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 migrations/088-timesheets-monetisation.sql

diff --git a/migrations/088-timesheets-monetisation.sql b/migrations/088-timesheets-monetisation.sql
new file mode 100644
index 000000000..0b7b8e7f9
--- /dev/null
+++ b/migrations/088-timesheets-monetisation.sql
@@ -0,0 +1,7 @@
+-- Up
+
+UPDATE users
+SET timesheets = REPLACE(timesheets, 'merch', 'monetisation')
+WHERE timesheets is not null;
+
+-- Down
diff --git a/src/timesheets.ts b/src/timesheets.ts
index 16e4693de..9b5f75957 100644
--- a/src/timesheets.ts
+++ b/src/timesheets.ts
@@ -37,7 +37,7 @@ export const AREAS = [
     'blog',
     'census',
     'workshops',
-    'merch',
+    'monetisation',
     'documentation',
     'community',
     'other',

From 0fcf4b39c1588b13b9ef3b734a3d3df290ea7482 Mon Sep 17 00:00:00 2001
From: ar contributors <localisation@pronouns.page>
Date: Tue, 1 Apr 2025 14:00:43 +0200
Subject: [PATCH 20/45] (ar)(blog) add translated posts by @auxiliaryfrfr

---
 .../blog/التجربة-المثلية-الريفية-البولندية.md | 84 +++++++++++++++++
 locale/ar/blog/المسيحيين-المثليين.md          | 91 +++++++++++++++++++
 locale/ar/blog/تلك-الضمائر-المخيفة.md         | 78 ++++++++++++++++
 3 files changed, 253 insertions(+)
 create mode 100644 locale/ar/blog/التجربة-المثلية-الريفية-البولندية.md
 create mode 100644 locale/ar/blog/المسيحيين-المثليين.md
 create mode 100644 locale/ar/blog/تلك-الضمائر-المخيفة.md

diff --git a/locale/ar/blog/التجربة-المثلية-الريفية-البولندية.md b/locale/ar/blog/التجربة-المثلية-الريفية-البولندية.md
new file mode 100644
index 000000000..a84eaf394
--- /dev/null
+++ b/locale/ar/blog/التجربة-المثلية-الريفية-البولندية.md
@@ -0,0 +1,84 @@
+# البقاء على قيد الحياة في العالم الحديث يبدأ بالتعاون مع بعضنا البعض. وجهة نظر شخصية بولندية من المثليين الذين ينظمون حياتهم بأنفسهم من أجل حياة أفضل.
+
+<small>2025-02-09 | [@T_Vos](/@T_Vos)، مُترجَمة من قِبَل الفريق العربي.</small>
+
+![صورة بتدرج رمادي لشخص جالس على الأرض، وظهره للكاميرا. اللون الوحيد الذي يبرز هو قوس قزح خلف ظهره.](/img/en/blog/rainbow-gray.jpeg)
+
+<div class="alert alert-warning">
+    <span class="fal fa-exclamation-triangle"></span>
+    <strong>تحذيرات المحتوى:</strong>
+    ذكر خفيف للكراهية ضد المثليين والإساءة
+</div>
+
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/rural-polish-queer-experience" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
+الأوقات صعبة بالنسبة لمجتمعنا. نحن نصبح مثال لأنواع عديدة من الكائنات الشريرة في هذا العالم.
+
+لماذا نحن؟
+
+نحن هدف مثالي لدعاية اليمين المتطرف. مجموعة كبيرة بما يكفي لكي يصادفنا ضحايا الدعاية في الشوارع، لكنها ليست كبيرة بما يكفي لإحداث فوضى أو الإطاحة بروايتهم – ومع ذلك نحن كبيرون بما يكفي للقتال بحيث يمكنهم انتقاد كلماتنا ورميها ضدنا.
+
+كل هذا صحيح وكان صحيحًا في الماضي. حتى قبل "الذعر المتعلق بالمتحوليين"، لم تكن الحقيقة جيدة بالنسبة لمجتمعنا. كنا منبوذين، واحتياجاتنا  غير مرئية، ونقص الحقوق كان يُستهزأ به. في ذلك الوقت، أراد بعضنا "أن نبقى في الظل ولا نأخذ مكانًا" على أمل أن يجعل هذا مضطهدينا كسالى وغير راغبين في متابعة التمييز النشط.
+
+كان هؤلاء الأشخاص مخطئين. _نحن_ نرى ذلك بوضوح الآن.
+
+الجلوس بهدوء لا يجعل متنمرك يذهب بعيدًا، الوقوف في وجههم، والدفاع عن نفسك والفخر _رغم_ الألم هو ما جعل الثورة الجنسية ناجحة في العقود الأخيرة. هو ما جعلني _أكون_ ناجحًا وقادرًا على الازدهار، لكي أكون هنا معكم اليوم لتقرأوا هذا.
+
+وُلدت في ريف بولندا. على بعد ساعة بالسيارة من الساحل، في مدينة تعداد سكانها 30,000 محاطة بالفراغ، حيث قضيت طفولتي ومراهقتي. كنت أول مولود في عائلة محافظة جدًا، كاثوليكية، وأسرية. لم يكن هناك أي مجتمع رسمي في دائرة نصف قطرها 100 كم على الأقل. لا مجموعة دعم، لا مجموعات على الإنترنت، لا منظمات أو فعاليات، لا فخر، لا شيء لموازنة الدعاية الرومانية الكاثوليكية التي كانت تأتي إليّ من الكنيسة والمدرسة والعائلة والتلفزيون ومجلس المدينة. عندما تم الكشف عن ميولي الجنسية في المدرسة الإعدادية، سمعت من المعلمين أن "لو كنت تؤمن بالله، كنت سأُخلَّص في الحياة الآخرة" كعلاج للمتنمرين الحقيقيين الذين كانوا يقفون خارج غرفة الاستشارة. لم يتم حتى توبيخهم على سلوكهم. لم يكن من الممتع أن تكبر وأنت مثلي في تلك المدينة.
+
+ومع ذلك، عندما حان الوقت لاستكشاف ما تعنيه ميولي الجنسية بالنسبة لي، اكتشفت أنني لست وحدي في ما أنا عليه، وأن هناك الكثير منا حتى في مدينتي الصغيرة.
+
+فكيف يجد المرء مجتمعًا في مكان يائس؟
+
+بما أنه لم تكن هناك منظمات ولا سياسيين فكروا في تقديم أي شيء لنا، اتجهنا إلى بعضنا البعض. لم يكن هناك مساحة آمنة للمثليين، لذا أنشأنا واحدة بشكل عضوي. تشكلت العديد من المجموعات الصغيرة غير الرسمية مثل مجموعات الأصدقاء، وبدأ الناس في التجمع في المجموعات الصغيرة. قضينا الوقت مثلما يفعل الأصدقاء، لكن لم نكن جميعًا نحب بعضنا البعض. كنتم تعلمون أنكم موجودون لبعض الأشخاص الذين كانوا أصدقائكم، وكان هؤلاء الأشخاص دائمًا يظلون قريبين منكم، ولكنكم قضيتم أيضًا الكثير من الوقت مع مثليين آخرين، كانوا فقط في محيطكم ولكن لم يكن هناك التزام بأن تكونوا صديقًا قريبًا لهم.
+
+مشاعر حقيقية للـ"عائلة المختارة". ولكن حيث يتم تمديد العائلة المختارة إلى المجتمع بأسره. كمثليـ/ـة كان لديكم دائمًا مكان في هذه المجموعات، بعضها كان أكثر تحفظًا من البعض الآخر، وبعضها كان فنيًا جدًا، وبعضها كان علميًا، … ولكن تلك المساحة المفتوحة كانت دائمًا موجودة.
+
+قبل أن أجد مجموعتي، تنقلت عدة مرات بين الأشخاص بحثًا عن قبيلتي. كان ذلك جزءًا طبيعيًا من العملية، وكان الناس يتوقعون أن تتنقل عندما يصبح من الواضح أن طاقتك لا تتناسب مع باقي المجموعة. ولكن حتى في ذلك الحين، كان هناك تضامن، ولم يكن يتم دفعك للخارج ما لم تكن فعلاً مميزًا لوقت طويل. كان هناك شعور بمجتمع أوسع بيننا. كنا نعلم أننا فقط نحب بطريقة مختلفة وأننا أشخاص طبيعيون بخلاف ذلك. ولكن تلك الفروق الصغيرة أحدثت _كل_ الفرق.
+
+عندما كبرت أخيرًا وكنت قادرًا على مغادرة مكان ولادتي، فعلت ذلك. تركنا جميعًا تقريبًا. كان من المفترض أن ننتقل معًا ولكنها انهارت سريعًا كما يحدث عادةً عندما تنتقلون جميعًا. خاصة عندما ترميك الحياة في مدن مختلفة. وبدأت على الفور في القيام بنفس الشيء في مكاني الجديد. كنت أشتاق لذلك الفضاء الآمن المألوف للمثليين. انجذبت نحو الأشخاص الذين بدا أنهم قادة في المجتمع، الآن المجتمع الحقيقي، المفتوح والوجودي. لقد أظهروا لي قواعد الحياة في المدينة الكبيرة وما هو موجود داخل المجتمع. كنت لا أزال أعيش في بولندا المحافظة والمعادية للمثليين، لكنني كنت راضيًا لأنني كنت أعلم أنني لست وحدي.
+
+علمتنا هذه المجموعات غير الرسمية التضامن والدعم المتبادل، والاحترام، والكرامة، وعدم الاستقرار.
+
+وقد يكون هذا ما نحتاجه أكثر هذه الأيام.
+
+بالطبع، نحتاج إلى محاربة الاضطهاد ولكن ليس بإمكان الجميع أن يكونوا جنودًا في الخط الأمامي. ولكن تمامًا كما يحتاج الجيش الحقيقي إلى شخص يطعمهم، ويلبسهم، ويكتب لهم البرمجيات، ويعتني بمنزلهم أثناء غيابهم، يحتاج متمردونا نفس الشيء!
+
+لا تستهينوا بقوة الجماعة! لقد رأيت ذلك يعمل بشكل جيد على مدار السنوات الأربع الماضية على موقعنا، وجعلني أفكر في ماضيّ. وأدركت أن الطريقة التي نشأ بها هذا المشروع كانت تمامًا مثل تلك المجموعات الداعمة غير الرسمية في مكان ولادتي. كان لدى شخص ما حاجة لم يتم تلبيتها من قبل العالم الموجود حولنا. لذلك، جلسوا لصنعها واقعًا. ثم رأى الآخرون في المجتمع ذلك وأرادوا البناء عليه. شخصًا تلو الآخر بدأنا في النمو، وظهرت لغات جديدة تدريجيًا، وسحب البطاقات الشخصية جلب المزيد من الأشخاص، ونتيجة لذلك، بدأ المزيد من الأشخاص في المساهمة وكنّا مثل كرة الثلج في النمو، ثم بدأنا في مساعدة الترجمة، وتعليم الشمول والتنوع والمساواة، ثم توسعنا وبدأنا في مساعدة الأكاديميا مع تحدياتهم. الأشخاص يأتون ويذهبون كما فعلوا في مكان ولادتي. نساعد بعضنا البعض ونحاول رفع البعض بقدر ما نستطيع وبقدر ما هو معقول. لا توجد مشاعر قاسية عندما تدفعك الحياة بعيدًا. هناك فهم. نحن نعلم أننا جميعًا مجرد بشر، نحن جميعًا مرتبكون وأحيانًا خائفون. ونحن نعلم أنه في بعض الأحيان تجعل الحياة بعض الالتزامات غير قابلة للاستمرار، حتى لو كنت تستمتع بها. أنا أشارك كل هذا كمثال على التفكير الجماعي. نعمل جميعًا كواحد ولكن كما لا يتساءل ساقيك أين يوجههم دماغك، نحن لا نتساءل عن حياة الآخرين. الثقة في بعضنا البعض هي المفتاح.
+
+فقط لأن هذه جماعة مفتوحة، لا يعني أنه لا توجد متطلبات للانضمام إليها. وكما في مكان ولادتي، هذا الموقع يستمر فقط لأننا جميعًا نضع العمل نحو مجتمعنا، عائلتنا. جزء مهم من هذا المزيج هو عدم تقبل هراء الآخرين ولكن التصدي له.
+
+الآن، من المهم أن نكون واقعيين. هل ستعالج جماعة مثليين قوية جميع مشاكلنا؟ لا.
+
+قد تقصر حتى عن إصلاح معظمها. ولكن لكي نتمكن من مواجهة جميع التحديات التي تلقيها الحياة علينا؛ نحتاج إلى شاطئ مستقر يمكننا أن نرسو فيه. نحتاج إلى مكان نسميه منزلًا، سببًا للقتال من أجله.
+
+في أيامنا تلك، كان منتدى الإنترنت التقليدي في أواخر التسعينيات هو كل ما كنت أتمناه. وقد نجحنا. قبل أيام طفولتي، كانت الأجيال السابقة من المثليين والمثليات لديهم موارد أقل بكثير. ومع ذلك، نجحوا. الآن مع كل الأدوات في العالم، أصبح بناء المجتمعات أسهل من أي وقت مضى. وهي تجني الفوائد! العديد من أقراني من مجموعاتي الآن يعيشون حياة مهنية رائعة، حياتهم الخاصة، عائلاتهم المثليّة السعيدة ومستقبلاتهم. بما فيهم أنا. هذا الأساس الذي منحني إياه المجتمع سمح لي بالهروب من الإساءة والفوبيات إلى حياة حرة ومزدهرة. _يمكنك أيضًا أن تحصلوا على كل شيء_. ولكن ليس عندما لا تنجو أنتم والأشخاص الذين يعانون معكم في هذه العاصفة الفاشية.
+
+---
+
+الآن أنا أدعوكم!
+
+أدعوكم لقصتكم! أدعوكم لصوتكم!
+
+تحدثوا وامكنوا بعضكم البعض!
+
+يمكننا الاستسلام أو يمكننا الازدهار. عمدًا في نهاية هذه المقالة أضع دعوة للعمل.
+
+مؤخرًا نشرنا قصصًا لبعض أعضاء فريقنا، كيف تمكنوا من التنقل في حياتهم كمثليين
+[مسيحيين](/المدونة/المثليين-المسيحيين) و[كأشخاص غير ثنائيين في العالم العربي](/المدونة/خارج-الثتائية).
+حدثونا عن كيفية رفعكم لبعضكم البعض في مجتمعكم المحلي، وكيف تقدرون البقاء على قيد الحياة والازدهار في وجه خصومكم! أخبرونا عن نضال المثليين وحياتهم في منطقتكم من العالم!
+
+صندوق بريدنا [contact@pronouns.page](mailto:contact@pronouns.page) مفتوح لتقديم قصص من تجربتكم الحياتية.
+نود قراءتها وربما نشر قصتكم. يمكنكم إبقاءها مجهولة أو نشرها باسمكم، الخيار لكم!
+لكننا نريد سماع قصتكم ونقلها إلى الملايين الذين يزورون هذه الصفحة سنويًا.
+
+شكرًا لقراءتكم هذا! أقدّر لكم إعطائي الوقت، لأن هذا جزء من قصتي وحياتي.
+
+نحبكم! استمروا في كونكم مثليين!
diff --git a/locale/ar/blog/المسيحيين-المثليين.md b/locale/ar/blog/المسيحيين-المثليين.md
new file mode 100644
index 000000000..ab3eb4c1f
--- /dev/null
+++ b/locale/ar/blog/المسيحيين-المثليين.md
@@ -0,0 +1,91 @@
+# العيش كشخص مسيحي مثلي
+
+<small>2025-01-02 | [@Its_LilFroggo](/@Its_LilFroggo)، مُترجَمة من قِبَل الفريق العربي.</small>
+
+<div class="alert alert-info">
+    <span class="fal fa-info-circle"></span>
+    <strong>هذه مقالة رأي كتبها أحد أعضاء جماعة موقعنا</strong>
+</div>
+
+<div class="alert alert-warning">
+    <span class="fal fa-exclamation-triangle"></span>
+    <strong>تحذير من المحتوى:</strong>
+    تتناول هذه التدوينة التعصب الديني ضد مجتمع المثلية
+</div>
+
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/lgbtq-christians" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
+العيش كمسيحي ضمن مجتمع المثلية هو بالتأكيد أمر صعب، ولكنه ليس مستحيلاً.
+لم يكن الأمر دائمًا كذلك، وبصراحة، لم يكن من السهل رؤية مشاعري على حقيقتها حتى حصلت على حرية التفكير.
+النشأة كمسيحي تعني أنك تمر بتعاليم الكتاب المقدس أو الأسرار المقدسة وفقًا للتقليد الذي نشأت عليه...
+كاثوليكي، أرثوذكسي، أنجليكاني، لوثري. في النهاية، تكمل تعليمك الديني ويتم إرسالك إلى طريقك.
+بالنسبة لي، لم تكن دراستي الدينية جيدة جدًا، لذا توقفت عن الممارسة بشكل طبيعي.
+سمح لي هذا باستكشاف نفسي خارج هذه الحدود والقواعد التي كنت أعتقد أنها كل ما تعنيه الإيمان.
+والآن قبل أن تظن أن هذه القصة ستكون مثل الأفلام حيث تدرك أنك مثلي منذ البداية، فأنت مخطئ.
+في الواقع، عندما شعرت لأول مرة بإعجاب تجاه نفس الجنس، شعرت بالخوف.
+بالتأكيد، كنت ملحدًا، لكن المبادئ الأخلاقية التي نشأت عليها كانت لا تزال قائمة. شعرت بالوحدة.
+لم أكن متأكدًا مما كنت أشعر به بالضبط، وسأقول فقط: **ملستم لوحدك**.
+
+المشاعر؟ الهوية؟ لكل شخص قصة مختلفة عن كيفية اكتشافه لحقيقته.
+ربما تفضل التواجد مع الجنس الآخر وتتجنب التفاعل مع نفس الجنس لأنك تدرك بشكل غير واعٍ أنك ستطور مشاعر تجاههم...
+أو ربما شعرت بالغيرة أو الغضب عندما رأيت امرأة، أو رجلًا، أو شخصًا غير ثنائي يقبل شخصًا كنت معجبًا به...
+أو ربما تستمتع بارتداء ملابس أكثر أنوثة أو ذكورة...
+لكل شخص قصة مختلفة. البعض يندمج ويبقى في الخزانة، والبعض الآخر أكثر انفتاحًا.
+من الصحيح أن المسيحيين قد يكونون أكثر تحفظًا بسبب الخوف من الاضطهاد من مجتمعهم الديني أو أولياء أمورهم أو حتى أصدقائهم وزملائهم.
+**لكن هذا ليس ما ينبغي أن يكون عليه الأمر.**
+
+## لماذا لا يقبلني المتدينون؟
+
+**يجب أن يقبلوكم.** إذا قرأتم الأناجيل، ستدركوا أنه عندما قال يسوع أن تحب قريبك،
+كان يقصد الجميع، وهذا يشمل مجتمع المثلية وأولئك الذين يعانون من أمراض عقلية أو جسدية وإعاقات، وأشخاص من أعراق مختلفة، وما إلى ذلك.
+لا تصدقوني؟ لننظر إلى قصة المرأة التي أُمسكت في الزنا في يوحنا 8:1-11.
+في هذه القصة، يُحضر القادة الدينيون امرأة أُمسكت في الزنا إلى يسوع لمحاولة الإيقاع به.
+وفقًا لشريعة موسى، كان يجب رجمها، لكنهم أرادوا رؤية ما إذا كان يسوع سيتحدى القانون.
+بدلًا من إدانتها أو الدخول في نقاشهم، قال يسوع بهدوء: "من كان منكم بلا خطيئة، فليرمها بأول حجر."
+واحدًا تلو الآخر، غادر المتهمون، حتى بقي يسوع والمرأة وحدهما. فقال لها يسوع:
+"ولا أنا أدينك. اذهبي ولا تخطئي بعد الآن."
+في هذه القصة، من المهم التركيز على كلمات يسوع **"ولا أنا أدينك"**.
+بالتأكيد، الزنا مكروه وفقًا للتقاليد المسيحية، ولكن لا يحق لأي مسيحي أن يحكم عليك أو يدينك.
+**فقط الله هو القاضي.**
+
+و **مالله لا يدينكم. إنه يحبك.** لا تصدقوني؟ متى 9:10-13.
+"وبينما كان يسوع يتناول الطعام في بيت متى، جاء كثير من جباة الضرائب والخطاة وأكلوا معه ومع تلاميذه.
+وعندما رأى الفريسيون ذلك، قالوا لتلاميذه: ‘لماذا يأكل معلمكم مع جباة الضرائب والخطاة؟’
+فلما سمع يسوع ذلك، قال: ‘ليس الأصحاء بحاجة إلى طبيب، بل المرضى.
+لكن اذهبوا وتعلموا ما معنى: ‘إني أريد رحمة لا ذبيحة.’ فإني لم آت لأدعو الأبرار، بل الخطاة.’"
+كان يسوع يتعامل مع الخطاة عمدًا، مما يظهر أن مهمته كانت الرحمة والشفاء والفداء بدلاً من الحكم.
+يجب على المسيحيين أن يعاملوا أفراد مجتمعنا بنفس الطريقة.
+
+## كيف أعيش كمسيحي مثلي؟
+
+أولاً وقبل كل شيء، اعلموا أنكم محبوبون من الله كما أنتم.
+هويتكم كمثليون ليست عائقًا أمام محبته، بل جزء من الشخص الفريد الذي خلقه.
+تؤكد الكتابات المقدسة ذلك مرارًا وتكرارًا. روما 8:38-39:
+"لأني مقتنع بأنه لا الموت ولا الحياة، ولا الملائكة ولا الشياطين... ولا أي شيء آخر في كل الخليقة،
+سيكون قادرًا على أن يفصلنا عن محبة الله التي في المسيح يسوع ربنا."
+لا شيء، أكرر لا شيء، يمكن أن يفصلكم عن محبته. **الله يحبكم رغم أي قواعد أو أحكام يصدرها الناس ضدكم.** أنتم لستم لوحدكم.
+
+هناك العديد من المسيحيين الذين يشاركونكم رحلتكم ويمكنهم تقديم الدعم، سواء عبر الإنترنت أو في مساحات مرحبة محليًا.
+تشمل بعض الأمثلة: The Reformation Project، Q Christian Fellowship، Believe Out Loud، The Gay Christian Network،
+Inclusive Church، Reconciling Ministries Network (RMN)، وغيرهم.
+
+ومع ذلك، قد تكون هناك مجتمعات أكثر تعصبًا. لا تجعلوا منها معيارًا لكيفية تصرف جميع المسيحيين تجاه المجتمع، لأن هذا ببساطة غير صحيح.
+**ليس عليكم البقاء في أماكن تضر بصحتكم العقلية أو الروحية.**
+لا بأس في الابتعاد عن العلاقات أو المجتمعات التي تجعلكم تشعروا بعدم الترحيب أو بعدم الحب.
+لكن من الجيد أيضًا الاستمرار في حضور الخدمات إذا كانت تمنحكم السلام والراحة، فقط تذكروا أن تصلوا من أجل أولئك الذين يحكمون عليك.
+وتذكروا أيضًا أن الله سيحاسبهم على أعمالهم! يحبنا الله جميعًا، ونحن مدعوون لأن نحب بعضنا بعضًا، بغض النظر عن اختلافاتنا.
+
+## الخاتمة
+
+رحلتكم كمسيحيين مثليين هي شهادة على محبة الله اللامحدودة وإبداعه.
+احتضنوا هويتكم وإيمانكم كنعمتين تجعلانكم مميزين، ولا تكرهواأنفسكم فقط لأن المجتمع لا يريد قبولكم.
+أنتم محبوبون من الله، تذكروا ذلك. من الطبيعي أن تواجهوا صعوبات في رحلتكم الإيمانية، لكن هذا لا بأس به.
+الإيمان هو رحلة، ومع كل خطوة إلى الأمام، تُظهر أن المحبة – محبة الله – يمكن أن تتغلب على الخوف والأحكام.
+أخيرًا، اعلم أنكم تستحقون القبول، وإذا لم تجدونه، **فتذكروا أنكم لستم لوحدكم، وأنكم محبوبون ومقبولون كما أنتم.**
diff --git a/locale/ar/blog/تلك-الضمائر-المخيفة.md b/locale/ar/blog/تلك-الضمائر-المخيفة.md
new file mode 100644
index 000000000..480fc9df8
--- /dev/null
+++ b/locale/ar/blog/تلك-الضمائر-المخيفة.md
@@ -0,0 +1,78 @@
+# تلك الضمائر المخيفة
+
+<small>2021-08-22 | [@andrea](/@andrea)، مُترجَمة من قِبَل الفريق العربي.</small>
+
+![سلفيا ديزيوبا على ميديوم: المطالبة بالضمائر. لا، لا أريد أن أخبرك بضمائري، ولا أريد أن أعرف ضمائرك.](/img/en/blog/demanding-pronouns.png)
+
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/those-scary-pronouns" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
+لقد صادفت مقالًا على ميديوم بعنوان [المطالبة بالضمائر](https://medium.com/the-venting-machine/demanding-pronouns-b819ab23f5df).
+وبينما عادةً ما لن أزعج نفسي للرد على مثل هذه التفاهات الصريحة ضد غير الثنائيين،
+إلا أن هذا المقال كان سخيفًا لدرجة أنني يجب أن أختار أجزاءه "المفضلة" وأشاركها مع تعليق، حتى وإن كان تعليقًا مختصرًا.
+
+وأول جزء مروع هو الفقرة الأولى حرفيًا:
+
+> يبدو أنه في كل مكان ألتفت فيه، يُطلب مني الحديث عن ضمائري. جوابي؟  
+> فقط خاطبني بأي طريقة تجعلك تشعر بالراحة،  
+> ولكن لا تجعلني أمر بتعذيب إخبارك بـ "هي/لها" في كل تفاعل.  
+> أنا فتاة؛ أبدو كفتاة — أنا أنثى بيولوجية. ماذا تريد مني أكثر من ذلك؟
+
+يمكنني أن أتحدث لفترة طويلة عن أهمية جعل مشاركة الضمائر شيء عادي  
+وكيف أن الاستماع لاحتياجات المتحولين هو تعبير عن التعاطف الأساسي، وكيف أن ليس كل من "يبدو كفتاة"  
+هو بالضرورة "أنثى بيولوجية"، أو كيف أن الضمائر تتعلق بالقواعد اللغوية، وليس البيولوجيا،  
+لذلك، لا يهمني أعضاؤها التناسلية عندما أتساءل ببساطة عن كيفية الإشارة إليها.  
+ولكن هذا سيشتت الانتباه عن الكلمة الأكثر أهمية في هذه الفقرة:
+
+> تعذيب
+
+نعم، هي تسميه "تعذيب" عندما يسألها شخص... سؤالًا. وليس سؤالًا شخصيًا جدًا أو معقدًا.  
+إنها لا تُسأل عن أعضائها التناسلية. إنها لا تُسأل عن هويتها الجنسية.  
+شخص ما ببساطة يحاول أن يحدد الأساس للحديث بمعرفة كيفية التحدث إليها / عنها.  
+والجواب هو حرفيًا مقطعان صوتيان!  
+نعم، قد يكون هذا السؤال _صعبًا_ في بعض الأحيان،  
+ولكنها ليست شخصًا متحولًا في الخزانة الذي قد يشعر بالقلق في محاولة تحديد ما إذا كانت الظروف آمنة بما يكفي  
+لتقديم ضمائرها الحقيقية لشخص ما. لا. إنها مجرد شخص أناني.
+
+وهي ليست حتى تحاول أن تُبقي تطرفها معتدلًا. هي تبدأ مقالتها باستخدام  
+أقوى كلمة ممكنة يمكن استخدامها لوصف الوضع: "تعذيب".  
+أنتم تعرفون، ذلك الشيء المحظور بموجب العديد من الاتفاقيات الدولية والذي يُعتبر انتهاكًا لحقوق الإنسان.
+
+أما بالنسبة لجزئي "المفضل" الآخر، فهو هذا:
+
+> الآن بعد أن قمت بشكواي، أريد التحدث عن الصورة الأكبر هنا. أنا لست غاضبًا فقط.  
+> أكتب هذا لأقاتل من أجل البساطة. هذا العالم معقد بما فيه الكفاية.  
+> لماذا تحاول أن تضيف المزيد من الفوضى؟ شخص يريد أن يكون  
+> هم/له، آخر يريد هم/لهم، آخر هو/لهم، آخر هن/لهم — هل يجب أن أستمر؟  
+>  
+> لا يوجد احتمال في الجحيم أن أتذكر كل ذلك لكل شخص ألتقيه.  
+> يمكنك أن تنسى ذلك. نادني بالقديمة، قل لي أنني عالقة في طريقي. لا يهمني!  
+> فقط توقف عن المطالبة بشيء لا أريد القيام به، أو إلا أواجه غضبك.  
+> حسنًا، كن غاضبًا مني، لكن دعني في حالي!
+
+أوه لا! تلك الصورة عن العالم تبدو مروعة بالفعل! كيف سننجو من أي تفاعل اجتماعي،  
+إذا كنا مجبرين على تذكر معلومات صغيرة عن الأشخاص الذين نتحدث إليهم؟!
+
+حسنًا، بخلاف الأسماء، بالطبع. سؤال شخص عن اسمه (ومحاولة عدم نسيانه) هو مجرد أدب أساسي.  
+وهو مفيد جدًا، لأنه يتيح لك معرفة كيفية مناداة الشخص.  
+لكن الأسماء تختلف تمامًا عن الضمائر!  
+على سبيل المثال، تحتاج إلى معرفة _اسم_ شخص لتكوين جملة مثل "كتبت _سلفيا_ مقالًا معاديًا للمتحولين..."،  
+لكن تحتاج إلى معرفة _ضمائر_ شخص لتكوين جملة مثل "...وأنا أكره تمامًا _مقالها_ المعادي للمتحولين".  
+أفهم؟ شيء مختلف تمامًا.
+
+هل يمكنك أن تتخيل مثل هذا العالم الرهيب، عالم حيث تلتقي بأشخاص، وهم _يعذبونك_ بأسئلة مثل  
+"ما اسمك؟"، وحتى يخبرونك بأسمائهم، وحتى يتوقعون منك أن تتذكره؟  
+أعرف! لا يطاق تمامًا!
+
+حسنًا، سلفيا تعيش في عالم كهذا. عالم حيث لدى الناس الجرأة في أن يسألوا ماذا تريد أن يُطلق عليها.
+
+وعندما أرى _معاناتها الرهيبة_ لا يسعني إلا أن أقول شيئًا واحدًا:
+
+<iframe src="https://giphy.com/embed/J8FZIm9VoBU6Q" width="480" height="332" frameBorder="0" class="giphy-embed" allowFullScreen style="max-width: 100%"></iframe>  
+<p><a href="https://giphy.com/gifs/reaction-community-good-J8FZIm9VoBU6Q">بواسطة GIPHY</a></p>

From f7df24b3278dec6bb196510ddeee6f03842b8df1 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 1 Apr 2025 14:19:22 +0200
Subject: [PATCH 21/45] (ar)(blog) add language version links to all arabic
 posts

---
 locale/ar/blog/أتعرّف-كـ.md           |  9 +++++++++
 locale/ar/blog/أيمكنني-أن-أكون.md    | 12 ++++++++++++
 locale/ar/blog/التخلي-عن-الفيسبوك.md |  9 +++++++++
 locale/ar/blog/اللغات-الجرافيكية.md  |  9 +++++++++
 locale/ar/blog/النماذج-الثلاث.md     | 12 ++++++++++++
 locale/ar/blog/حظر-ميتا.md           |  9 +++++++++
 locale/ar/blog/خادم-المجتمع.md       |  9 +++++++++
 locale/ar/blog/شعار-جديد.md          | 11 ++++++++++-
 locale/ar/blog/كوير-المثلية.md       |  9 +++++++++
 locale/ar/blog/لماذا-الإعلانات.md    |  9 +++++++++
 locale/ar/blog/لماذا-الاسم.md        | 12 ++++++++++++
 locale/ar/blog/ليست-الضمائر-فقط.md   |  9 +++++++++
 locale/ar/blog/هل-الجنس-موجود.md     |  9 +++++++++
 locale/es/blog/puedo-ser.md          | 12 ++++++++++++
 14 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/locale/ar/blog/أتعرّف-كـ.md b/locale/ar/blog/أتعرّف-كـ.md
index aa5b55b81..86c09730b 100644
--- a/locale/ar/blog/أتعرّف-كـ.md
+++ b/locale/ar/blog/أتعرّف-كـ.md
@@ -4,6 +4,15 @@
 
 ![@JuliaRidsBikes على تويتر: "لماذا للناس المولودين بجنسهم الصحيح جنس وأنا لدي هوية جنس؟"؛ @we_are_biscuit على تويتر: "نفس السبب أنهم "يكونون" محبين للجنس الآخر لكني "أعرّف نفسي" كمزدوج التوجه. يحبون جدًا أن يقللوا من شأننا."](/img/ar/blog/cis-gender-identity.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/identify-as" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 إحدى الأمور التي تزعجني عندما يتعلق الأمر بمناقشة الهويات المثلية هي عبارة "أُعَرِّف نفسي كـ...".
 لأنها على الرغم من أنها صحيحة تقنيًا وغالبًا ما تُستخدم بنوايا حسنة للغاية،
 إلا أنها في الغالب تُعطي الناس انطباعات خاطئة عن ماهية الهوية.
diff --git a/locale/ar/blog/أيمكنني-أن-أكون.md b/locale/ar/blog/أيمكنني-أن-أكون.md
index eebe7c7b6..a4328212f 100644
--- a/locale/ar/blog/أيمكنني-أن-أكون.md
+++ b/locale/ar/blog/أيمكنني-أن-أكون.md
@@ -4,6 +4,18 @@
 
 ![لقطة شاشة لعناوين منشورات "رديت"، كلها مقتبسة أدناه](/img/ar/blog/can-i-be.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/can-i-be" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://pronombr.es/blog/puedo-ser" target="_blank" rel="noopener" class="badge text-bg-info">Español</a>
+    </li>
+</ul>
+
 لقد لاحظت مؤخرًا أن عدد المشاركات في بعض المنتديات الفرعية التي أتابعها هي في الأساس طلبات للتحقق من هوية الشخص.
 فيما يلي بعض الأمثلة من واحد منها فقط ([r/Nonbinary](https://reddit.com/r/Nonbinary)):
 
diff --git a/locale/ar/blog/التخلي-عن-الفيسبوك.md b/locale/ar/blog/التخلي-عن-الفيسبوك.md
index 121111807..0d9a61531 100644
--- a/locale/ar/blog/التخلي-عن-الفيسبوك.md
+++ b/locale/ar/blog/التخلي-عن-الفيسبوك.md
@@ -2,6 +2,15 @@
 
 <small>2022-04-23 | [@andrea](/@andrea)، مُترجَمة من قِبَل الفريق العربي.</small>
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/facebook-login-deprecated" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 نعلم جميعًا أن الفيسبوك لا يهتم بالأخلاق أو خصوصية المستخدمين.
 ولكن ما لا يعلمه البعض هو أنهم أيضًا غير ودودين تجاه المطورين ويحاولون فرض وجهات نظرهم المحافظة والحكيمة على مواقع الويب المستقلة؟
 
diff --git a/locale/ar/blog/اللغات-الجرافيكية.md b/locale/ar/blog/اللغات-الجرافيكية.md
index 0f791881f..6f39b5887 100644
--- a/locale/ar/blog/اللغات-الجرافيكية.md
+++ b/locale/ar/blog/اللغات-الجرافيكية.md
@@ -4,6 +4,15 @@
 
 ![تجميع لمجموعة من الطرق المذكورة لاحقًا في المقالة (قائمة باللغات مع حروف الهجاء، خريطة، أعلام دولينجو، أعلام مجمعة...))](/img/ar/blog/graphical-languages/graphical-languages.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/graphical-languages" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 يعد وضع العناصر الجرافيكية بجانب التسميات النصية خدعة تصميمية رائعة - فهي تساعد عقلك على تخطي بعض الخطوات عند
 التنقل في واجهة المستخدم: فبدلًا من قراءة التسمية يتمكن معرفة ما يفعله الزر على الفور بمجرد إلقاء نظرة على الأيقونة.
 
diff --git a/locale/ar/blog/النماذج-الثلاث.md b/locale/ar/blog/النماذج-الثلاث.md
index 96b1410d8..96b433819 100644
--- a/locale/ar/blog/النماذج-الثلاث.md
+++ b/locale/ar/blog/النماذج-الثلاث.md
@@ -10,6 +10,18 @@
     الإشارة إلى الأعضاء التناسلية والقمع البطريركي والشتائم والعنف ضد المثليين
 </div>
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/three-models" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+<li class="list-inline-item">
+        <a href="https://zaimki.pl/blog/trzy-modele" target="_blank" rel="noopener" class="badge text-bg-info">Polski</a>
+    </li>
+</ul>
+
 لقد أرسل لنا شخص ما بريدًا إلكترونيًا، يطلب فيه توضيحًا لبعض التعريفات من [قاموس المصطلحات المثلية](/المصطلحات). وأدركت أنه من الصعب الإجابة على سؤالهم دون التطرق إلى حقيقة مفادها أن الناس لا يمكنهم حتى الاتفاق
 على _ما هو الجنس_ في المقام الأول.
 
diff --git a/locale/ar/blog/حظر-ميتا.md b/locale/ar/blog/حظر-ميتا.md
index 5172864a8..fabc4e254 100644
--- a/locale/ar/blog/حظر-ميتا.md
+++ b/locale/ar/blog/حظر-ميتا.md
@@ -4,6 +4,15 @@
 
 ![لقطة شاشة لرسالة الحظر مع النص: الروابط المراد إزالتها: pronouns.page. نقوم بإزالة الروابط التي تحتوي على: - البريد العشوائي؛ – دعم أو الإشادة بالإرهاب أو الجريمة المنظمة أو جماعات الكراهية. - التماس الخدمات الجنسية؛ - بيع الأسلحة النارية والمخدرات](/img/ar/blog/instagram-ban.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/meta-ban" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 في يوم الأحد 26 مارس، علمنا أن إنستجرام وفيسبوك بدأتا بحظر روابط صفحتنا ومطالبة المستخدمين بحذفها من ملفاتهم الشخصية.
 
 نحن حزينون ومنزعجون من هذا الوضع. لا علاقة لبوابتنا بالرسائل غير المرغوب فيها، الإرهاب، الجرائم، جماعات الكراهية، الخدمات الجنسية، الأسلحة النارية، أو المخدرات.
diff --git a/locale/ar/blog/خادم-المجتمع.md b/locale/ar/blog/خادم-المجتمع.md
index 92ac086f3..9ec23d757 100644
--- a/locale/ar/blog/خادم-المجتمع.md
+++ b/locale/ar/blog/خادم-المجتمع.md
@@ -4,6 +4,15 @@
 
 ![شعار الخادم (شعارنا على خلفية قوس قزح باستيل) بجوار شعار Discord. النص أدناه: discord.pronons.page](/img/ar/blog/community-discord.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/community-discord" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 نحن متحمسون للإعلان عن خادم الـDiscord المجتمعي  الخاص بنا!
 نريده أن يكون ملاذًا آمنًا لأعضاء مجتمع المثليين حيث يمكن للجميع التعبير عن أنفسهم بحرية،
 والشعور بالتفهم والقبول.
diff --git a/locale/ar/blog/شعار-جديد.md b/locale/ar/blog/شعار-جديد.md
index b2aa2aa76..9d92e0c19 100644
--- a/locale/ar/blog/شعار-جديد.md
+++ b/locale/ar/blog/شعار-جديد.md
@@ -1,6 +1,15 @@
 # شعارنا الجديد
 
-<small>2022-11-19 | الجماعية، مُترجَمة من قِبَل [@WoofWoofer](/@WoofWoofer). </small>
+<small>2022-01-28 | الجماعية، مُترجَمة من قِبَل [@WoofWoofer](/@WoofWoofer). </small>
+
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/new-logo" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
 
 بدأ موقعنا كمشروع بسيط وصغير – وكان شعاره يعكس هذه الحقيقة: فقد كان مجرد أيقونة عامة للعلامات (تمثل الضمائر والتصنيفات). لكن مع المزيد من الميزات، و الحركة، والمستخدمين. وبسبب زيادة أعضاء الفريق، جاءت احتياجات جديدة، وأفكار جديدة، والمهارات والمواهب اللازمة لتحقيقها.
 
diff --git a/locale/ar/blog/كوير-المثلية.md b/locale/ar/blog/كوير-المثلية.md
index ea2a475b6..77fa61854 100644
--- a/locale/ar/blog/كوير-المثلية.md
+++ b/locale/ar/blog/كوير-المثلية.md
@@ -5,6 +5,15 @@
 ![علمان يلوحان في مهب الريح على خلفية سماء زرقاء: فخر التقدم والفوضى المثلية](/img/ar/blog/queer-lgbtq.png)
 <p style="margin-top: -.75rem"><small class="text-muted">تأثير التلويح بالعلم مصنوع من خلال <a href="https://krikienoid.github.io/flagwaver/" target="_blank" rel="noopener">Flagwaver</a>. صورة الخلفية بواسطة <a href="https://unsplash.com/@sklepacki">Stephanie Klepacki</a> على <a href="https://unsplash.com/photos/white-clouds-and-blue-sky-gXG_2TpSBOch" target="_blank" rel="noopener">Unsplash</a></small></p>
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/queer-lgbtq" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 لقد أدركت أنه قد مر وقت طويل منذ أن وصفت نفسي "عضوًا في مجتمع المثلية" (LGBTQIA+) – وبدلاً من ذلك، أصبحت أطلق على نفسي "شاذ (كوير)" فقط.
 وبالطبع، جزء من السبب هو سهولة نطق الكلمة بالمقارنة؛
 وجزء آخر من السبب هو المعارك المستمرة حول أي الحروف يجب تضمينها في الاختصار وأيها لا.
diff --git a/locale/ar/blog/لماذا-الإعلانات.md b/locale/ar/blog/لماذا-الإعلانات.md
index fa8feb0c2..15515954a 100644
--- a/locale/ar/blog/لماذا-الإعلانات.md
+++ b/locale/ar/blog/لماذا-الإعلانات.md
@@ -2,6 +2,15 @@
 
 <small>2022-09-04 | [@andrea](/@andrea)، مُترجَمة من قِبَل الفريق العربي.</small>
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/why-ads" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 لا أحب الإعلانات، ولا أعتقد أن أحداً يحبها... لذا لم تكن قرارات سهلة حقاً بالنسبة لنا...
 لكن في الآونة الأخيرة، قررنا أن نبدأ تجربة حيث نمول المشروع باستخدام الإعلانات بدلاً من التبرعات.
 في روح الشفافية التي حاولت دائماً الحفاظ عليها هنا، أود أن أخبركم أكثر عن تلك القرارات.
diff --git a/locale/ar/blog/لماذا-الاسم.md b/locale/ar/blog/لماذا-الاسم.md
index 99d692d71..d9a97da29 100644
--- a/locale/ar/blog/لماذا-الاسم.md
+++ b/locale/ar/blog/لماذا-الاسم.md
@@ -4,6 +4,18 @@
 
 <img src="/img/ar/logo/logo-full.png" class="hero invertible my-4" alt="شِعار الجماعية">
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://zaimki.pl/blog/sk%C4%85d-nazwa-kolektywu" target="_blank" rel="noopener" class="badge text-bg-info">Polski</a>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/why-the-name" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 بالنسبة للناطقين باللغة البولندية، يُعد اسم مجموعتنا إشارة واضحة – ولكن ليس بالضرورة للجميع. لذا إليكم تفسيرًا قصيرًا إذا كنتم مهتمين:
 
 _(النسخة البولندية، الأكثر تفصيلاً، متاحة [هنا](https://zaimki.pl/blog/sk%C4%85d-nazwa-kolektywu))_
diff --git a/locale/ar/blog/ليست-الضمائر-فقط.md b/locale/ar/blog/ليست-الضمائر-فقط.md
index eba44ecac..ee45d970a 100644
--- a/locale/ar/blog/ليست-الضمائر-فقط.md
+++ b/locale/ar/blog/ليست-الضمائر-فقط.md
@@ -4,6 +4,15 @@
 
 ![لقطة مقربة لعين مغلقة مع ظلال عيون بألوان علم المتحولين جنسيًا (https://unsplash.com/photos/a0KL1Um0wBA)](/img/ar/blog/trans-eyeshadow.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/not-just-pronouns" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 هل رأيت كل تلك التغريدات الغبية التي يمكن فضحها بسهولة حول الضمائر مؤخرًا؟
 يبدو الأمر مثل "لم يستخدم يسوع الضمائر أبدًا!" أو "لا ضمائر في إعلان الاستقلال!"...
 إنهم <i>مخطئون من الناحية الفنية</i>، مع الأخذ في الاعتبار أن الضمائر ليست سوى جزء من الكلام الذي يستخدمه الجميع في كل جملة تقريبًا
diff --git a/locale/ar/blog/هل-الجنس-موجود.md b/locale/ar/blog/هل-الجنس-موجود.md
index 0c7ff0509..8930374f1 100644
--- a/locale/ar/blog/هل-الجنس-موجود.md
+++ b/locale/ar/blog/هل-الجنس-موجود.md
@@ -6,6 +6,15 @@
 <p style="margin-top: -.75rem"><small class="text-muted">تصوير <a href="https://unsplash.com/fr/@gmalhotra?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">غياتري مالهوترا</a> على
 <a href="https://unsplash.com/photos/ft3ndjrS2TI?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Unsplash</a></small></p>
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/does-gender-exist" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+</ul>
+
 أثناء تصفح الردود في [تعداد غير الثنائيين البولندي لعام 2023](https://zaimki.pl/spis)، صادفت ردًا حيث رفض المستجيب الإجابة على معظم الأسئلة، مضيفًا ملاحظات مثل "الجنس لا يوجد"، "الجنس لا يهم"، "لا نحتاج إلى ضمائر"، "لا يمكنك الهروب من التصنيفات بإضافة المزيد من التصنيفات"، "كن نفسك"، "تخلى عن مفهوم الجنس"، "لا تدع نفسك تتقيد"، إلخ. هذه ليست صوتًا وحيدًا (مع أنه نادر جدًا) – لقد ناقشت قضايا مشابهة مع شخص لا يحمل جنسًا يعمل حاليًا على إحدى نسخ اللغات القادمة من صفتحتنا؛ وأنا نفسي لا أحمل جنسًا وقد خضت في تأملات مشابهة عدة مرات.
 
 لـ[مجلة "Poczytałosie"](https://zaimki.pl/zin)، كتبت قطعة ([“Analogies”](https://avris.it/texts/analogie))، حيث أتناول هذا الموضوع – كيف من منظور شخص لا يشعر بالاتصال بأي جنس ويفهمه أكثر من الناحية الفكرية بدلاً من التجربة الشخصية، يبدو تقسيم الناس إلى فئات مرتبطة إلى حد ما بأعضائهم التناسلية أمرًا سخيفًا كما لو كنا نتعامل مع بعضنا البعض بشكل مختلف بناءً على فصيلة دمنا أو لون شعرنا. من الصعب بالنسبة لي رؤية الجنس كأي شيء آخر غير تقسيم تعسفي وضار.
diff --git a/locale/es/blog/puedo-ser.md b/locale/es/blog/puedo-ser.md
index 7f7cd0c51..2c6a84f17 100644
--- a/locale/es/blog/puedo-ser.md
+++ b/locale/es/blog/puedo-ser.md
@@ -4,6 +4,18 @@
 
 ![Capturas de pantalla de títulos de las publicaciones en reddit (en inglés), todas citadas abajo](/img/es/blog/can-i-be.png)
 
+<ul class="list-inline">
+    <li class="list-inline-item">
+        <span class="fal fa-language"></span>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://en.pronouns.page/blog/can-i-be" target="_blank" rel="noopener" class="badge text-bg-info">English</a>
+    </li>
+    <li class="list-inline-item">
+        <a href="https://ar.pronouns.page/المدونة/أيمكنني-أن-أكون" target="_blank" rel="noopener" class="badge text-bg-info">العربية (الفصحى)</a>
+    </li>
+</ul>
+
 Recientemente he notado que muchas publicaciones en algunos subreddits que sigo son básicamente peticiones de validación a la identidad propia.
 Aquí unos pocos ejemplos (traducidos) de sólo uno de ellos ([r/Nonbinary](https://reddit.com/r/Nonbinary)):
 

From 80b5f5613cb34018ab20b7d19fe985a2b24b464e Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Wed, 2 Apr 2025 13:41:12 +0200
Subject: [PATCH 22/45] (style) use <pre> for printing stack trace in error.vue

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

diff --git a/error.vue b/error.vue
index 8c3900e79..771c8efbd 100644
--- a/error.vue
+++ b/error.vue
@@ -34,7 +34,7 @@ useHead({
             <summary class="bg-light p-3">
                 Additional Information
             </summary>
-            <div class="p-2" v-html="error.stack"></div>
+            <pre class="p-2" v-html="error.stack"></pre>
             {{ error.cause }}
         </details>
 

From 75a5a8ffffaae4faf1dd72eb8c352fe4d2a7c9be Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Thu, 3 Apr 2025 15:37:50 +0200
Subject: [PATCH 23/45] (make) clear redis cache upon deploy

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index dc7fbd23f..52c50b72c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ build: install
 deploy:
 	pnpm install -P
 	pnpm run-file server/migrate.ts
+	-redis-cli KEYS \"${NUXT_PUBLIC_ENV}:cache:*\" | xargs -n 100 redis-cli DEL
 	-pnpm run-file server/sentry.ts deploy
 
 migrate:

From 7592e7ce13045464f3dc82903524012b818cb1a3 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 3 Apr 2025 21:29:36 +0200
Subject: [PATCH 24/45] (pl)(census) optionsLast were not included in the CSV
 export

---
 server/express/census.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/express/census.ts b/server/express/census.ts
index 3997d29be..50b203fd1 100644
--- a/server/express/census.ts
+++ b/server/express/census.ts
@@ -247,7 +247,7 @@ router.get('/census/export', handleErrorAsync(async (req, res) => {
         for (const question of config.census.questions!) {
             if (question.type === 'checkbox') {
                 const answerForAggregate: Set<string> = new Set();
-                for (const [option, _comment] of question.options) {
+                for (const [option, _comment] of [...question.options, ...(question.optionsLast ||[])]) {
                     const checked = (answers[i.toString()] || [] as string[]).includes(option);
                     answer[`${i}_${option}`] = checked ? 1 : '';
                     if (checked) {

From c8b790ba620c7b3c44386e059eb2734218bdc533 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 3 Apr 2025 21:41:28 +0200
Subject: [PATCH 25/45] (lint)

---
 server/express/census.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/express/census.ts b/server/express/census.ts
index 50b203fd1..cc0848c58 100644
--- a/server/express/census.ts
+++ b/server/express/census.ts
@@ -247,7 +247,7 @@ router.get('/census/export', handleErrorAsync(async (req, res) => {
         for (const question of config.census.questions!) {
             if (question.type === 'checkbox') {
                 const answerForAggregate: Set<string> = new Set();
-                for (const [option, _comment] of [...question.options, ...(question.optionsLast ||[])]) {
+                for (const [option, _comment] of [...question.options, ...(question.optionsLast || [])]) {
                     const checked = (answers[i.toString()] || [] as string[]).includes(option);
                     answer[`${i}_${option}`] = checked ? 1 : '';
                     if (checked) {

From 5486b71d2cea081dc1a9b37ac9a236a9bce04fe3 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Fri, 4 Apr 2025 08:18:22 +0200
Subject: [PATCH 26/45] (blog) redirect a broken lint to webarchive

---
 locale/ar/blog/تلك-الضمائر-المخيفة.md  | 2 +-
 locale/en/blog/those-scary-pronouns.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/ar/blog/تلك-الضمائر-المخيفة.md b/locale/ar/blog/تلك-الضمائر-المخيفة.md
index 480fc9df8..43bdeb9a3 100644
--- a/locale/ar/blog/تلك-الضمائر-المخيفة.md
+++ b/locale/ar/blog/تلك-الضمائر-المخيفة.md
@@ -13,7 +13,7 @@
     </li>
 </ul>
 
-لقد صادفت مقالًا على ميديوم بعنوان [المطالبة بالضمائر](https://medium.com/the-venting-machine/demanding-pronouns-b819ab23f5df).
+لقد صادفت مقالًا على ميديوم بعنوان [المطالبة بالضمائر](https://web.archive.org/web/20220520175246/https://medium.com/the-venting-machine/demanding-pronouns-b819ab23f5df).
 وبينما عادةً ما لن أزعج نفسي للرد على مثل هذه التفاهات الصريحة ضد غير الثنائيين،
 إلا أن هذا المقال كان سخيفًا لدرجة أنني يجب أن أختار أجزاءه "المفضلة" وأشاركها مع تعليق، حتى وإن كان تعليقًا مختصرًا.
 
diff --git a/locale/en/blog/those-scary-pronouns.md b/locale/en/blog/those-scary-pronouns.md
index e1da94d7d..74dacd599 100644
--- a/locale/en/blog/those-scary-pronouns.md
+++ b/locale/en/blog/those-scary-pronouns.md
@@ -4,7 +4,7 @@
 
 ![Sylvia Dziuba on Medium: Demanding Pronouns. No, I don’t want to give you mine, and I don’t want to know yours.](/img/en/blog/demanding-pronouns.png)
 
-So I stumbled upon an article on Medium titled [“Demanding Pronouns”](https://medium.com/the-venting-machine/demanding-pronouns-b819ab23f5df).
+So I stumbled upon an article on Medium titled [“Demanding Pronouns”](https://web.archive.org/web/20220520175246/https://medium.com/the-venting-machine/demanding-pronouns-b819ab23f5df).
 And while I normally wouldn't even bother to dignify such blatantly enbyphobic bullshit with a reply,
 this one is just so over the top asinine that I just have to pick my “favourite” parts and share them with a comment, even a brief one.
 

From e6f38c936689899173d1683bc5bb1b9463a6e458 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 6 Apr 2025 14:51:35 +0200
Subject: [PATCH 27/45] (pt)(trans)

---
 locale/pt/translations.suml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/pt/translations.suml b/locale/pt/translations.suml
index eedbff3ad..8a1a990af 100644
--- a/locale/pt/translations.suml
+++ b/locale/pt/translations.suml
@@ -654,7 +654,7 @@ profile:
         defaults: 'Restaurar valores padrão'
         propagate: 'Salvar alterações em seus cartões em todas as línguas'
     timezone:
-        time: 'São %time% e é %weekday% dentro do meu fuso horário'
+        time: 'São %time% de um(a) %weekday% em meu fuso horário'
         areas:
             America: 'América'
             Africa: 'África'
@@ -868,7 +868,7 @@ footer:
             visitDuration: 'Média da duração de visitas'
             responseTime: 'Média do tempo de resposta'
             cards: 'Cartões '
-            visitors: 'Visitantes de ocasião única'
+            visitors: 'Visitantes úniques'
             pageviews: 'Visualizações de página'
             realTimeVisitors: 'Atualmente online'
             users: 'Usuáries registrades'

From 1cc78500ee5629387fb0c2332d633e37b036c8f9 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 6 Apr 2025 15:11:17 +0200
Subject: [PATCH 28/45] (calendar) update HIV-related links that trump removed
 from the CIC website

---
 locale/en/calendar/events.ts |  8 ++++----
 locale/en/translations.suml  | 12 ++++++------
 locale/nb/translations.suml  | 12 ++++++------
 locale/nn/translations.suml  | 12 ++++++------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/locale/en/calendar/events.ts b/locale/en/calendar/events.ts
index 5a4762f63..61505c2d3 100644
--- a/locale/en/calendar/events.ts
+++ b/locale/en/calendar/events.ts
@@ -92,10 +92,10 @@ export default [
     new Event('{/terminology#two%20spirit=Two Spirit} Awareness Day (US)', 'Two Spirit_', 7, day(11), EventLevel.Day, ['two spirit']),
     new Event('LGBT Center Awareness Day (US)', null, 10, day(19), EventLevel.Day),
     new Event('{https://twitter.com/_EQUALGROUND_/status/1440232964286124050=Lesbian Visibility Day} (Sri Lanka)', 'Lesbian', 9, day(21), EventLevel.Day),
-    new Event('{https://www.cdc.gov/hiv/library/awareness/nlaad.html=Latinx AIDS Awareness Day} (US)', '_red-ribbon', 10, day(15), EventLevel.Day, ['aids']),
-    new Event('{https://www.cdc.gov/hiv/library/awareness/shaad.html=Southern HIV/AIDS Awareness Day} (US)', '_red-ribbon', 8, day(20), EventLevel.Day, ['aids']),
-    new Event('{https://www.cdc.gov/hiv/library/awareness/napihaad.html=Asian and Pacific Islander HIV/AIDS Awareness Day} (US)', '_red-ribbon', 5, day(19), EventLevel.Day, ['aids']),
-    new Event('{https://www.cdc.gov/hiv/library/awareness/nnhaad.html=Native HIV/AIDS Awareness Day} (US)', '_red-ribbon', 3, day(20), EventLevel.Day, ['aids']),
+    new Event('{https://www.hiv.gov/events/awareness-days/latino=Latinx AIDS Awareness Day} (US)', '_red-ribbon', 10, day(15), EventLevel.Day, ['aids']),
+    new Event('{https://www.hiv.gov/events/awareness-days/southern-hiv-aids-awareness-day=Southern HIV/AIDS Awareness Day} (US)', '_red-ribbon', 8, day(20), EventLevel.Day, ['aids']),
+    new Event('{https://www.hiv.gov/events/awareness-days/asian-pacific-islander=Asian and Pacific Islander HIV/AIDS Awareness Day} (US)', '_red-ribbon', 5, day(19), EventLevel.Day, ['aids']),
+    new Event('{https://www.hiv.gov/events/awareness-days/native=Native HIV/AIDS Awareness Day} (US)', '_red-ribbon', 3, day(20), EventLevel.Day, ['aids']),
     new Event('{/terminology#transgender=Trans} Visibility Day (Brazil)', 'Transgender', 1, day(29), EventLevel.Day, ['transgender']),
     new Event('National {/terminology#pride=Gay Pride} Day (Brazil)', 'LGBTQ', 3, day(25), EventLevel.Day),
     new Event('{/terminology#lesbian=Lesbian} Visibility Day (Brazil)', 'Lesbian', 8, day(29), EventLevel.Day, ['lesbian']),
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index 935a14dff..f53eb5011 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -1997,12 +1997,12 @@ calendar:
         unlabeled_day: '{https://unlabeledidentity.carrd.co/=Unlabeled Visibility Day}'
         trans_youth_day: '{https://elmarplatense.com/2021/05/14/se-conmemoro-el-primer-dia-de-la-visibilidad-de-las-nineces-y-adolescencias-trans-en-general-pueyrredon/=Trans Children and Youth Visibility Day}'
         hiv_long_term_survivors_day: '{https://www.hiv.gov/events/awareness-days/hiv-long-term-survivors-day=HIV Long-Term Survivors Awareness Day}'
-        women_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nwghaad.html=Women and Girls HIV/AIDS Awareness Day}'
-        youth_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nyhaad.html=Youth HIV/AIDS Awareness Day}'
-        gay_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/ngmhaad.html=Gay Men''s HIV/AIDS Awareness Day}'
-        black_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nbhaad.html=Black HIV/AIDS Awareness Day}'
-        hiv_aging_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nhaad.html=HIV/AIDS and Aging Awareness Day}'
-        trans_hiv_testing_day: '{https://www.cdc.gov/hiv/library/awareness/nthtd.html=Transgender HIV Testing Day}'
+        women_hiv_awareness_day: '{https://www.hiv.gov/events/awareness-days/women-and-girls=Women and Girls HIV/AIDS Awareness Day}'
+        youth_hiv_awareness_day: '{https://www.hiv.gov/events/awareness-days/youth=Youth HIV/AIDS Awareness Day}'
+        gay_hiv_awareness_day: '{https://www.hiv.gov/events/awareness-days/gay-mens=Gay Men''s HIV/AIDS Awareness Day}'
+        black_hiv_awareness_day: '{https://www.hiv.gov/events/awareness-days/black=Black HIV/AIDS Awareness Day}'
+        hiv_aging_awareness_day: '{https://www.hiv.gov/events/awareness-days/aging=HIV/AIDS and Aging Awareness Day}'
+        trans_hiv_testing_day: '{https://clinicalinfo.hiv.gov/en/news/national-transgender-hiv-testing-day-resources=Transgender HIV Testing Day}'
         mspec_lesbian_day: '{https://twitter.com/MspecLesbianss=Mspec Lesbian Visibility & Awareness Day}'
         mspec_lesbian_week: '{https://twitter.com/MspecLesbianss=Mspec Lesbian Visibility & Awareness Week}'
         mspec_gay_day: 'Mspec Gay Visibility & Awareness Day'
diff --git a/locale/nb/translations.suml b/locale/nb/translations.suml
index 35f868858..eefec857c 100644
--- a/locale/nb/translations.suml
+++ b/locale/nb/translations.suml
@@ -2051,12 +2051,12 @@ calendar:
         unlabeled_day: '{https://unlabeledidentity.carrd.co/=Umerkas}-synlighetsdagen'
         trans_youth_day: '{https://elmarplatense.com/2021/05/14/se-conmemoro-el-primer-dia-de-la-visibilidad-de-las-nineces-y-adolescencias-trans-en-general-pueyrredon/=Trans-barns og -ungdommers synlighetsdag}'
         hiv_long_term_survivors_day: '{https://www.hiv.gov/events/awareness-days/hiv-long-term-survivors-day=Bevissthetsdagen for langtidsoverlevere av HIV}'
-        women_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nwghaad.html=Bevissthetsdagen om HIV/AIDS for kvinner og jenter}'
-        youth_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nyhaad.html=Bevissthetsdagen om HIV/AIDS for ungdom}'
-        gay_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/ngmhaad.html=Bevissthetsdagen om HIV/AIDS for homofile menn}'
-        black_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nbhaad.html=Bevissthetsdagen om HIV/AIDS for svarte}'
-        hiv_aging_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nhaad.html=Bevissthetsdagen om HIV/AIDS og aldring}'
-        trans_hiv_testing_day: '{https://www.cdc.gov/hiv/library/awareness/nthtd.html=Transpersoners HIV-testdag}'
+        women_hiv_awareness_day: 'Bevissthetsdagen om HIV/AIDS for kvinner og jenter'
+        youth_hiv_awareness_day: 'Bevissthetsdagen om HIV/AIDS for ungdom'
+        gay_hiv_awareness_day: 'Bevissthetsdagen om HIV/AIDS for homofile menn'
+        black_hiv_awareness_day: 'Bevissthetsdagen om HIV/AIDS for svarte'
+        hiv_aging_awareness_day: 'Bevissthetsdagen om HIV/AIDS og aldring'
+        trans_hiv_testing_day: 'Transpersoners HIV-testdag'
         mspec_lesbian_day: '{https://twitter.com/MspecLesbianss=Den mspec-lesbiske synlighets- og bevissthetsdagen}'
         mspec_lesbian_week: '{https://twitter.com/MspecLesbianss=Den mspec-lesbiske synlighets- og bevissthetsuke}'
         mspec_gay_day: 'Den mspec-homofile synlighets- og bevissthetsdagen'
diff --git a/locale/nn/translations.suml b/locale/nn/translations.suml
index 4154dadb6..0405680ef 100644
--- a/locale/nn/translations.suml
+++ b/locale/nn/translations.suml
@@ -2053,12 +2053,12 @@ calendar:
         unlabeled_day: '{https://unlabeledidentity.carrd.co/=Umerka}-synlegheitsdagen'
         trans_youth_day: '{https://elmarplatense.com/2021/05/14/se-conmemoro-el-primer-dia-de-la-visibilidad-de-las-nineces-y-adolescencias-trans-en-general-pueyrredon/=Trans-barn og -ungdom sin synlegheitsdag}'
         hiv_long_term_survivors_day: '{https://www.hiv.gov/events/awareness-days/hiv-long-term-survivors-day=Dagen for merksemd rundt HIV-langtidsoverlevarar}'
-        women_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nwghaad.html=Merksemdsdagen om HIV/AIDS for kvinner og jenter}'
-        youth_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nyhaad.html=Merksemdsdagen om HIV/AIDS for ungdom}'
-        gay_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/ngmhaad.html=Merksemdsdagen om HIV/AIDS for homofile menn}'
-        black_hiv_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nbhaad.html=Merksemdsdagen om HIV/AIDS for svarte}'
-        hiv_aging_awareness_day: '{https://www.cdc.gov/hiv/library/awareness/nhaad.html=Merksemdsdagen om HIV/AIDS og aldring}'
-        trans_hiv_testing_day: '{https://www.cdc.gov/hiv/library/awareness/nthtd.html=Transpersonar sin HIV-testdag}'
+        women_hiv_awareness_day: 'Merksemdsdagen om HIV/AIDS for kvinner og jenter'
+        youth_hiv_awareness_day: 'Merksemdsdagen om HIV/AIDS for ungdom'
+        gay_hiv_awareness_day: 'Merksemdsdagen om HIV/AIDS for homofile menn'
+        black_hiv_awareness_day: 'Merksemdsdagen om HIV/AIDS for svarte'
+        hiv_aging_awareness_day: 'Merksemdsdagen om HIV/AIDS og aldring'
+        trans_hiv_testing_day: 'Transpersonar sin HIV-testdag}'
         mspec_lesbian_day: '{https://twitter.com/MspecLesbianss=Den mspec-lesbiske synlegheits- og merksemdsdagen}'
         mspec_lesbian_week: '{https://twitter.com/MspecLesbianss=Den mspec-lesbiske synlegheits- og merksemdsveka}'
         mspec_gay_day: 'Den mspec-homofile synlegheits- og merksemdsdagen'

From a2d0baf8d1e63faa4bfc75bb47a7f97436b88e0f Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Tue, 8 Apr 2025 08:55:16 +0200
Subject: [PATCH 29/45] (ads) disable primis

---
 layouts/default.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 645651082..b232e3ea5 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -99,12 +99,6 @@ const loadAds = async (): Promise<void> => {
             'publift',
             'https://cdn.fuseplatform.net/publift/tags/2/3329/fuse.js',
         );
-        await loadScript(
-            'publift-video',
-            'https://live.primis.tech/live/liveView.php?s=118558&schain=1.0,1!publift.com,[01H9H7XDCTSKKX1ECPR1VWQXQ9],1',
-            undefined,
-            '[data-phkey=content-0]',
-        );
     } catch (error) {
         if (error instanceof LoadScriptError) {
             return;

From 4767d99fe524d7b7d8022cbcc756df2e523a6ec1 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 8 Apr 2025 21:40:09 +0200
Subject: [PATCH 30/45] (fix) urls to user in <AbuseReports> and <Ban>

---
 components/AbuseReports.vue | 8 ++++----
 components/Ban.vue          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/AbuseReports.vue b/components/AbuseReports.vue
index b636cba0d..6da4ff456 100644
--- a/components/AbuseReports.vue
+++ b/components/AbuseReports.vue
@@ -21,7 +21,7 @@
         <template #row="s">
             <template v-if="s && s.el.susUsername">
                 <div>
-                    <a :href="`${getLocaleForUrl('_')}/@${s.el.susUsername}`" target="_blank" rel="noopener">
+                    <a :href="`${getUrlForLocale('_')}/@${s.el.susUsername}`" target="_blank" rel="noopener">
                         @{{ s.el.susUsername }}
                     </a>
                     <ul v-if="s.el.profiles" class="small list-inline">
@@ -36,7 +36,7 @@
                     <span v-if="s.el.isAutomatic" class="badge bg-info">
                         Keyword found
                     </span>
-                    <a v-else :href="`${getLocaleForUrl('_')}/@${s.el.reporterUsername}`" target="_blank" rel="noopener">
+                    <a v-else :href="`${getUrlForLocale('_')}/@${s.el.reporterUsername}`" target="_blank" rel="noopener">
                         @{{ s.el.reporterUsername }}
                     </a>
                     <small>({{ $datetime($ulidTime(s.el.id)) }})</small>
@@ -86,7 +86,7 @@
 import useConfig from '../composables/useConfig.ts';
 import useDialogue from '../composables/useDialogue.ts';
 
-import { getLocaleForUrl } from '~/src/domain.ts';
+import { getUrlForLocale } from '~/src/domain.ts';
 
 export default {
     props: {
@@ -101,7 +101,7 @@ export default {
         };
     },
     methods: {
-        getLocaleForUrl,
+        getUrlForLocale,
         formatComment(comment) {
             return comment
                 .split(', ')
diff --git a/components/Ban.vue b/components/Ban.vue
index 916a9cd14..0847ee0df 100644
--- a/components/Ban.vue
+++ b/components/Ban.vue
@@ -77,7 +77,7 @@
                                 <tr v-for="proposal in banProposals">
                                     <td>{{ $datetime($ulidTime(proposal.id)) }}</td>
                                     <td>
-                                        <a :href="`${getLocaleForUrl('_')}/@${proposal.bannedByUsername}`" target="_blank" rel="noopener">
+                                        <a :href="`${getUrlForLocale('_')}/@${proposal.bannedByUsername}`" target="_blank" rel="noopener">
                                             @{{ proposal.bannedByUsername }}
                                         </a>
                                     </td>
@@ -156,7 +156,7 @@
                         <tr v-for="message in messages">
                             <td>{{ $datetime($ulidTime(message.id)) }}</td>
                             <td>
-                                <a :href="`${getLocaleForUrl('_')}/@${message.adminUsername}`" target="_blank" rel="noopener">
+                                <a :href="`${getUrlForLocale('_')}/@${message.adminUsername}`" target="_blank" rel="noopener">
                                     @{{ message.adminUsername }}
                                 </a>
                             </td>
@@ -223,7 +223,7 @@ import useDialogue from '../composables/useDialogue.ts';
 import forbidden from '../src/forbidden.ts';
 import { sleep } from '../src/helpers.ts';
 
-import { getLocaleForUrl } from '~/src/domain.ts';
+import { getUrlForLocale } from '~/src/domain.ts';
 
 export default {
     props: {
@@ -341,7 +341,7 @@ Unfortunately, I need to remove your account.
         }
     },
     methods: {
-        getLocaleForUrl,
+        getUrlForLocale,
         async ban() {
             await this.dialogue.confirm(this.$t('ban.confirm', { username: this.user.username }), 'danger');
             this.saving = true;

From 01b4c709585654d0ab30d52c6ff7a19a4a7115b2 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Wed, 9 Apr 2025 23:54:03 +0200
Subject: [PATCH 31/45] return HTTP 404 when <NotFound> is included

---
 components/NotFound.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/NotFound.vue b/components/NotFound.vue
index 3a7986558..e8913a6e2 100644
--- a/components/NotFound.vue
+++ b/components/NotFound.vue
@@ -1,3 +1,11 @@
+<script setup lang="ts">
+const event = useRequestEvent()
+
+if (event) {
+    event.node.res.statusCode = 404;
+}
+</script>
+
 <template>
     <div>
         <h2>

From 577732912ad2b1d12ca4c2435b2db8096d4acc05 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 11 Apr 2025 11:36:10 +0200
Subject: [PATCH 32/45] (fix) ignore wrong flag names on profile/[username].vue

---
 pages/profile/[username].vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/profile/[username].vue b/pages/profile/[username].vue
index 83f7ace34..89838bb78 100644
--- a/pages/profile/[username].vue
+++ b/pages/profile/[username].vue
@@ -78,9 +78,9 @@ useSimpleHead({
     description: computed(() => profile.value ? profile.value.description ?? null : null),
     banner: `api/banner/@${username.value}.png`,
     noindex: true,
-    keywords: computed(() => profile.value && profile.value.flags
-        ? profile.value.flags.map((flag) => translateForPronoun(flags[flag].display, mainPronoun.value))
-        : undefined),
+    keywords: computed(() => profile.value?.flags?.map((flagName) => flags[flagName])
+        .filter((flag) => flag !== undefined)
+        .map((flag) => translateForPronoun(flag.display, mainPronoun.value))),
 }, translator);
 
 await userAsyncData;

From 819aac3db4b3f9d087636acd35dbaeab68a8f18b Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 11 Apr 2025 11:45:42 +0200
Subject: [PATCH 33/45] (lint)

---
 components/NotFound.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/NotFound.vue b/components/NotFound.vue
index e8913a6e2..1ff0dbfe1 100644
--- a/components/NotFound.vue
+++ b/components/NotFound.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const event = useRequestEvent()
+const event = useRequestEvent();
 
 if (event) {
     event.node.res.statusCode = 404;

From 366d2deaa8f1a870cc586db801159b297464be1a Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 11 Apr 2025 12:30:19 +0200
Subject: [PATCH 34/45] (style) fix some glitches around
 .list-group-item-active

---
 assets/dark.scss                     |  2 +-
 assets/style.scss                    |  8 ++++----
 components/search/SearchDialogue.vue | 12 +-----------
 components/search/SearchItem.vue     |  8 +++++++-
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/assets/dark.scss b/assets/dark.scss
index 55eab1ed8..e71bc1560 100644
--- a/assets/dark.scss
+++ b/assets/dark.scss
@@ -180,7 +180,7 @@ body[data-theme="dark"] {
     .bg-light, .text-bg-light { background-color: #111 !important; }
     .bg-dark, .text-bg-dark { background-color: #f8f9fa !important; }
     .text-bg-light { color: #fff !important; }
-    .text-bg-dark { color: #000 !important; } 
+    .text-bg-dark { color: #000 !important; }
     .bg-white { background-color: #000 !important; }
     .bg-white.text-white,
     .bg-dark.text-white,
diff --git a/assets/style.scss b/assets/style.scss
index b78438206..fe2a602b0 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -313,9 +313,9 @@ form[inert] {
     }
 }
 .list-group-item-active {
-    color: $primary;
-    border-inline-start: 3px solid $primary;
-    padding-inline-start: calc(#{$list-group-item-padding-x} - 2px);
+    background-color: $list-group-hover-bg !important;
+    border-inline-start: 3px solid $primary !important;
+    padding-inline-start: calc(#{$list-group-item-padding-x} - 2px) !important;
 }
 
 .list-group-item-bg {
@@ -409,4 +409,4 @@ textarea.form-control,
 textarea.form-control-sm {
     field-sizing: content;
     min-height: 5rem;
-}
\ No newline at end of file
+}
diff --git a/components/search/SearchDialogue.vue b/components/search/SearchDialogue.vue
index 44e2578d9..16ced0b56 100644
--- a/components/search/SearchDialogue.vue
+++ b/components/search/SearchDialogue.vue
@@ -125,7 +125,7 @@ defineExpose({ open, close });
             <li
                 v-for="(document, index) of searchAsyncData.data.value"
                 :key="`${document.kind}-${document.id}`"
-                :class="['list-group-item list-group-item-action p-0', selected === index ? 'list-group-item-active' : '']"
+                :class="['list-group-item list-group-item-action py-0 pe-0', selected === index ? 'list-group-item-active' : '']"
             >
                 <SearchItem :document="document" @click="close()" />
             </li>
@@ -135,13 +135,3 @@ defineExpose({ open, close });
         </div>
     </dialog>
 </template>
-
-<style lang="scss">
-@import "assets/variables";
-
-.list-group-item-active {
-    background-color: $list-group-hover-bg !important;
-    border-left: 3px solid $primary !important;
-    margin-inline-start: -2px; /** compensate for the border mark, minus 1px (regular border) */
-}
-</style>
diff --git a/components/search/SearchItem.vue b/components/search/SearchItem.vue
index 05149c1d7..a6c2ac0ef 100644
--- a/components/search/SearchItem.vue
+++ b/components/search/SearchItem.vue
@@ -31,7 +31,7 @@ const searchKindHasImage = computed(() => {
 </script>
 
 <template>
-    <nuxt-link :to="document.url" class="d-block p-3 text-dark text-decoration-none">
+    <nuxt-link :to="document.url" class="search-item d-block p-3 text-dark text-decoration-none">
         <div class="h3 mb-3">
             <Icon :v="icon" />
             <Spelling :text="document.title" />
@@ -69,3 +69,9 @@ const searchKindHasImage = computed(() => {
         <Spelling v-else :text="document.content" />
     </nuxt-link>
 </template>
+
+<style scoped lang="scss">
+.search-item {
+    margin-inline-start: -1rem;
+}
+</style>

From d676f1996d57fc238fed91554b1a50a326fc4ef3 Mon Sep 17 00:00:00 2001
From: Pronouns Page Technical <technical@pronouns.page>
Date: Sat, 12 Apr 2025 15:07:09 +0000
Subject: [PATCH 35/45] Update dependency typescript to ^5.8.3

---
 package.json   |   2 +-
 pnpm-lock.yaml | 292 ++++++++++++++++++++++++-------------------------
 2 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/package.json b/package.json
index e9edcc5b3..03fa4cc37 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
         "sass": "1.32.12",
         "tree-kill": "^1.2.2",
         "ts-json-schema-generator": "^1.5.0",
-        "typescript": "^5.7.2",
+        "typescript": "^5.8.3",
         "vitest": "^3.0.8",
         "vue-component-type-helpers": "^2.1.6",
         "vue-tsc": "^2.2.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c3274b95f..2c62bd195 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,7 +19,7 @@ importers:
         version: 3.654.0
       '@floating-ui/vue':
         specifier: ^1.1.5
-        version: 1.1.5(vue@3.5.13(typescript@5.7.2))
+        version: 1.1.5(vue@3.5.13(typescript@5.8.3))
       '@fortawesome/fontawesome-pro':
         specifier: git+ssh://git@gitlab.com:Avris/FontAwesomePro.git
         version: git+https://git@gitlab.com:Avris/FontAwesomePro.git#f00db606f659dca78b143b7bcab5671b2cb459a8
@@ -85,7 +85,7 @@ importers:
         version: 6.9.15
       pageres:
         specifier: ^8.1.0
-        version: 8.1.0(encoding@0.1.13)(typescript@5.7.2)
+        version: 8.1.0(encoding@0.1.13)(typescript@5.8.3)
       papaparse:
         specifier: ^5.4.1
         version: 5.4.1
@@ -115,7 +115,7 @@ importers:
         version: 0.2.3
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@22.13.14)(typescript@5.7.2)
+        version: 10.9.2(@types/node@22.13.14)(typescript@5.8.3)
       tsconfig-paths:
         specifier: 3.14.2
         version: 3.14.2
@@ -140,16 +140,16 @@ importers:
         version: 7.26.0(@babel/core@7.26.8)
       '@nuxt/eslint':
         specifier: ^1.2.0
-        version: 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
+        version: 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.8.3)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@nuxt/test-utils':
         specifier: ^3.15.4
-        version: 3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
+        version: 3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
       '@nuxtjs/plausible':
         specifier: ^1.2.0
         version: 1.2.0(magicast@0.3.5)
       '@pinia/nuxt':
         specifier: ^0.9.0
-        version: 0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))
+        version: 0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3)))
       '@playwright/test':
         specifier: ^1.50.0
         version: 1.50.0
@@ -164,7 +164,7 @@ importers:
         version: 2.22.4(encoding@0.1.13)
       '@sentry/vue':
         specifier: ^7.109.0
-        version: 7.119.0(vue@3.5.13(typescript@5.7.2))
+        version: 7.119.0(vue@3.5.13(typescript@5.8.3))
       '@smithy/types':
         specifier: ^2.12.0
         version: 2.12.0
@@ -215,10 +215,10 @@ importers:
         version: 2.4.6
       '@vuepic/vue-datepicker':
         specifier: ^11.0.2
-        version: 11.0.2(vue@3.5.13(typescript@5.7.2))
+        version: 11.0.2(vue@3.5.13(typescript@5.8.3))
       '@vueuse/core':
         specifier: ^13.0.0
-        version: 13.0.0(vue@3.5.13(typescript@5.7.2))
+        version: 13.0.0(vue@3.5.13(typescript@5.8.3))
       avris-columnist:
         specifier: ^0.3.4
         version: 0.3.4
@@ -233,7 +233,7 @@ importers:
         version: 0.0.3
       avris-vue-share:
         specifier: ^1.0.1
-        version: 1.0.1(typescript@5.7.2)
+        version: 1.0.1(typescript@5.8.3)
       bootstrap:
         specifier: ^5.3.1
         version: 5.3.3(@popperjs/core@2.11.8)
@@ -296,7 +296,7 @@ importers:
         version: 0.7.0
       nuxt:
         specifier: ^3.16.0
-        version: 3.16.0(@parcel/watcher@2.5.1)(@types/node@22.13.14)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0)
+        version: 3.16.0(@parcel/watcher@2.5.1)(@types/node@22.13.14)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.8.3)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.8.3))(yaml@2.7.0)
       path-to-regexp:
         specifier: 0.1.12
         version: 0.1.12
@@ -316,8 +316,8 @@ importers:
         specifier: ^1.5.0
         version: 1.5.1
       typescript:
-        specifier: ^5.7.2
-        version: 5.7.2
+        specifier: ^5.8.3
+        version: 5.8.3
       vitest:
         specifier: ^3.0.8
         version: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
@@ -326,10 +326,10 @@ importers:
         version: 2.1.6
       vue-tsc:
         specifier: ^2.2.8
-        version: 2.2.8(typescript@5.7.2)
+        version: 2.2.8(typescript@5.8.3)
       vuedraggable:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.13(typescript@5.7.2))
+        version: 4.1.0(vue@3.5.13(typescript@5.8.3))
 
 packages:
 
@@ -7290,8 +7290,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.7.2:
-    resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
+  typescript@5.8.3:
+    resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -9325,11 +9325,11 @@ snapshots:
 
   '@cliqz/adblocker-extended-selectors@1.34.0': {}
 
-  '@cliqz/adblocker-puppeteer@1.34.0(puppeteer@21.11.0(encoding@0.1.13)(typescript@5.7.2))':
+  '@cliqz/adblocker-puppeteer@1.34.0(puppeteer@21.11.0(encoding@0.1.13)(typescript@5.8.3))':
     dependencies:
       '@cliqz/adblocker': 1.34.0
       '@cliqz/adblocker-content': 1.34.0
-      puppeteer: 21.11.0(encoding@0.1.13)(typescript@5.7.2)
+      puppeteer: 21.11.0(encoding@0.1.13)(typescript@5.8.3)
       tldts-experimental: 6.1.61
 
   '@cliqz/adblocker@1.34.0':
@@ -9550,11 +9550,11 @@ snapshots:
 
   '@floating-ui/utils@0.2.8': {}
 
-  '@floating-ui/vue@1.1.5(vue@3.5.13(typescript@5.7.2))':
+  '@floating-ui/vue@1.1.5(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@floating-ui/dom': 1.6.11
       '@floating-ui/utils': 0.2.8
-      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.8.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -9833,12 +9833,12 @@ snapshots:
       prompts: 2.4.2
       semver: 7.7.1
 
-  '@nuxt/devtools@2.3.0(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@nuxt/devtools@2.3.0(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@nuxt/devtools-kit': 2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
       '@nuxt/devtools-wizard': 2.3.0
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
-      '@vue/devtools-core': 7.7.2(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@vue/devtools-core': 7.7.2(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))
       '@vue/devtools-kit': 7.7.2
       birpc: 2.2.0
       consola: 3.4.0
@@ -9865,7 +9865,7 @@ snapshots:
       tinyglobby: 0.2.12
       vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vite-plugin-inspect: 11.0.0(@nuxt/kit@3.16.0(magicast@0.3.5))(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
-      vite-plugin-vue-tracer: 0.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      vite-plugin-vue-tracer: 0.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))
       which: 5.0.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -9874,20 +9874,20 @@ snapshots:
       - utf-8-validate
       - vue
 
-  '@nuxt/eslint-config@1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@nuxt/eslint-config@1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
       '@antfu/install-pkg': 1.0.0
       '@clack/prompts': 0.10.0
       '@eslint/js': 9.22.0
-      '@nuxt/eslint-plugin': 1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
-      '@stylistic/eslint-plugin': 4.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
-      '@typescript-eslint/eslint-plugin': 8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2))(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
-      '@typescript-eslint/parser': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@nuxt/eslint-plugin': 1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
+      '@stylistic/eslint-plugin': 4.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
+      '@typescript-eslint/eslint-plugin': 8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
+      '@typescript-eslint/parser': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       eslint: 9.22.0(jiti@2.4.2)
       eslint-config-flat-gitignore: 2.1.0(eslint@9.22.0(jiti@2.4.2))
       eslint-flat-config-utils: 2.0.1
       eslint-merge-processors: 2.0.0(eslint@9.22.0(jiti@2.4.2))
-      eslint-plugin-import-x: 4.6.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      eslint-plugin-import-x: 4.6.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       eslint-plugin-jsdoc: 50.6.6(eslint@9.22.0(jiti@2.4.2))
       eslint-plugin-regexp: 2.7.0(eslint@9.22.0(jiti@2.4.2))
       eslint-plugin-unicorn: 57.0.0(eslint@9.22.0(jiti@2.4.2))
@@ -9902,21 +9902,21 @@ snapshots:
       - supports-color
       - typescript
 
-  '@nuxt/eslint-plugin@1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@nuxt/eslint-plugin@1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/types': 8.26.1
-      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       eslint: 9.22.0(jiti@2.4.2)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@nuxt/eslint@1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
+  '@nuxt/eslint@1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(typescript@5.8.3)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
     dependencies:
       '@eslint/config-inspector': 1.0.2(eslint@9.22.0(jiti@2.4.2))
       '@nuxt/devtools-kit': 2.3.0(magicast@0.3.5)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
-      '@nuxt/eslint-config': 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
-      '@nuxt/eslint-plugin': 1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@nuxt/eslint-config': 1.2.0(@vue/compiler-sfc@3.5.13)(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
+      '@nuxt/eslint-plugin': 1.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       chokidar: 4.0.3
       eslint: 9.22.0(jiti@2.4.2)
@@ -9989,7 +9989,7 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@nuxt/test-utils@3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)':
+  '@nuxt/test-utils@3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@nuxt/schema': 3.16.0
@@ -10015,8 +10015,8 @@ snapshots:
       unenv: 1.10.0
       unplugin: 2.2.0
       vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vitest-environment-nuxt: 1.0.1(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
-      vue: 3.5.13(typescript@5.7.2)
+      vitest-environment-nuxt: 1.0.1(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
+      vue: 3.5.13(typescript@5.8.3)
     optionalDependencies:
       '@playwright/test': 1.50.0
       '@vue/test-utils': 2.4.6
@@ -10038,12 +10038,12 @@ snapshots:
       - typescript
       - yaml
 
-  '@nuxt/vite-builder@3.16.0(@types/node@22.13.14)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vue-tsc@2.2.8(typescript@5.7.2))(vue@3.5.13(typescript@5.7.2))(yaml@2.7.0)':
+  '@nuxt/vite-builder@3.16.0(@types/node@22.13.14)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vue-tsc@2.2.8(typescript@5.8.3))(vue@3.5.13(typescript@5.8.3))(yaml@2.7.0)':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@rollup/plugin-replace': 6.0.2(rollup@4.35.0)
-      '@vitejs/plugin-vue': 5.2.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
-      '@vitejs/plugin-vue-jsx': 4.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@vitejs/plugin-vue': 5.2.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))
+      '@vitejs/plugin-vue-jsx': 4.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))
       autoprefixer: 10.4.21(postcss@8.5.3)
       consola: 3.4.0
       cssnano: 7.0.6(postcss@8.5.3)
@@ -10070,8 +10070,8 @@ snapshots:
       unplugin: 2.2.0
       vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
       vite-node: 3.0.8(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vite-plugin-checker: 0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))
-      vue: 3.5.13(typescript@5.7.2)
+      vite-plugin-checker: 0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.8.3)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.8.3))
+      vue: 3.5.13(typescript@5.8.3)
       vue-bundle-renderer: 2.1.1
     transitivePeerDependencies:
       - '@biomejs/biome'
@@ -10212,10 +10212,10 @@ snapshots:
       '@parcel/watcher-win32-ia32': 2.5.1
       '@parcel/watcher-win32-x64': 2.5.1
 
-  '@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))':
+  '@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3)))':
     dependencies:
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
-      pinia: 2.3.1(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
+      pinia: 2.3.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3))
     transitivePeerDependencies:
       - magicast
 
@@ -10656,13 +10656,13 @@ snapshots:
       - encoding
       - supports-color
 
-  '@sentry/vue@7.119.0(vue@3.5.13(typescript@5.7.2))':
+  '@sentry/vue@7.119.0(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@sentry/browser': 7.119.0
       '@sentry/core': 7.119.0
       '@sentry/types': 7.119.0
       '@sentry/utils': 7.119.0
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   '@sidvind/better-ajv-errors@3.0.1(ajv@8.17.1)':
     dependencies:
@@ -11012,9 +11012,9 @@ snapshots:
 
   '@speed-highlight/core@1.2.7': {}
 
-  '@stylistic/eslint-plugin@4.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@stylistic/eslint-plugin@4.2.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
-      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       eslint: 9.22.0(jiti@2.4.2)
       eslint-visitor-keys: 4.2.0
       espree: 10.3.0
@@ -11190,32 +11190,32 @@ snapshots:
       '@types/node': 22.13.14
     optional: true
 
-  '@typescript-eslint/eslint-plugin@8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2))(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@typescript-eslint/eslint-plugin@8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@typescript-eslint/parser': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       '@typescript-eslint/scope-manager': 8.26.1
-      '@typescript-eslint/type-utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
-      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@typescript-eslint/type-utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
+      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       '@typescript-eslint/visitor-keys': 8.26.1
       eslint: 9.22.0(jiti@2.4.2)
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
-      ts-api-utils: 2.0.1(typescript@5.7.2)
-      typescript: 5.7.2
+      ts-api-utils: 2.0.1(typescript@5.8.3)
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@typescript-eslint/parser@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.26.1
       '@typescript-eslint/types': 8.26.1
-      '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.7.2)
+      '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.8.3)
       '@typescript-eslint/visitor-keys': 8.26.1
       debug: 4.4.0(supports-color@9.4.0)
       eslint: 9.22.0(jiti@2.4.2)
-      typescript: 5.7.2
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
@@ -11224,20 +11224,20 @@ snapshots:
       '@typescript-eslint/types': 8.26.1
       '@typescript-eslint/visitor-keys': 8.26.1
 
-  '@typescript-eslint/type-utils@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@typescript-eslint/type-utils@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.7.2)
-      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.8.3)
+      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       debug: 4.4.0(supports-color@9.4.0)
       eslint: 9.22.0(jiti@2.4.2)
-      ts-api-utils: 2.0.1(typescript@5.7.2)
-      typescript: 5.7.2
+      ts-api-utils: 2.0.1(typescript@5.8.3)
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@8.26.1': {}
 
-  '@typescript-eslint/typescript-estree@8.26.1(typescript@5.7.2)':
+  '@typescript-eslint/typescript-estree@8.26.1(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/types': 8.26.1
       '@typescript-eslint/visitor-keys': 8.26.1
@@ -11246,19 +11246,19 @@ snapshots:
       is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.7.1
-      ts-api-utils: 2.0.1(typescript@5.7.2)
-      typescript: 5.7.2
+      ts-api-utils: 2.0.1(typescript@5.8.3)
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)':
+  '@typescript-eslint/utils@8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.5.1(eslint@9.22.0(jiti@2.4.2))
       '@typescript-eslint/scope-manager': 8.26.1
       '@typescript-eslint/types': 8.26.1
-      '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.7.2)
+      '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.8.3)
       eslint: 9.22.0(jiti@2.4.2)
-      typescript: 5.7.2
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
@@ -11267,11 +11267,11 @@ snapshots:
       '@typescript-eslint/types': 8.26.1
       eslint-visitor-keys: 4.2.0
 
-  '@unhead/vue@2.0.0-rc.13(vue@3.5.13(typescript@5.7.2))':
+  '@unhead/vue@2.0.0-rc.13(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       hookable: 5.5.3
       unhead: 2.0.0-rc.13
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   '@vercel/nft@0.29.2(encoding@0.1.13)(rollup@4.35.0)':
     dependencies:
@@ -11305,20 +11305,20 @@ snapshots:
       - workbox-build
       - workbox-window
 
-  '@vitejs/plugin-vue-jsx@4.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@vitejs/plugin-vue-jsx@4.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@babel/core': 7.26.8
       '@babel/plugin-transform-typescript': 7.26.8(@babel/core@7.26.8)
       '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.26.8)
       vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@vitejs/plugin-vue@5.2.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   '@vitest/coverage-v8@3.0.8(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))':
     dependencies:
@@ -11390,7 +11390,7 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.1.0
 
-  '@vue-macros/common@1.16.1(vue@3.5.13(typescript@5.7.2))':
+  '@vue-macros/common@1.16.1(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@vue/compiler-sfc': 3.5.13
       ast-kit: 1.4.2
@@ -11399,7 +11399,7 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.2
     optionalDependencies:
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   '@vue/babel-helper-vue-transform-on@1.4.0': {}
 
@@ -11467,7 +11467,7 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
-  '@vue/devtools-core@7.7.2(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))':
+  '@vue/devtools-core@7.7.2(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@vue/devtools-kit': 7.7.2
       '@vue/devtools-shared': 7.7.2
@@ -11475,7 +11475,7 @@ snapshots:
       nanoid: 5.1.3
       pathe: 2.0.3
       vite-hot-client: 0.2.4(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
     transitivePeerDependencies:
       - vite
 
@@ -11493,7 +11493,7 @@ snapshots:
     dependencies:
       rfdc: 1.4.1
 
-  '@vue/language-core@2.2.8(typescript@5.7.2)':
+  '@vue/language-core@2.2.8(typescript@5.8.3)':
     dependencies:
       '@volar/language-core': 2.4.11
       '@vue/compiler-dom': 3.5.13
@@ -11504,7 +11504,7 @@ snapshots:
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
-      typescript: 5.7.2
+      typescript: 5.8.3
 
   '@vue/reactivity@3.5.13':
     dependencies:
@@ -11522,11 +11522,11 @@ snapshots:
       '@vue/shared': 3.5.13
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.7.2))':
+  '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@vue/compiler-ssr': 3.5.13
       '@vue/shared': 3.5.13
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   '@vue/shared@3.5.13': {}
 
@@ -11535,23 +11535,23 @@ snapshots:
       js-beautify: 1.15.1
       vue-component-type-helpers: 2.1.6
 
-  '@vuepic/vue-datepicker@11.0.2(vue@3.5.13(typescript@5.7.2))':
+  '@vuepic/vue-datepicker@11.0.2(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       date-fns: 4.1.0
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
-  '@vueuse/core@13.0.0(vue@3.5.13(typescript@5.7.2))':
+  '@vueuse/core@13.0.0(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.21
       '@vueuse/metadata': 13.0.0
-      '@vueuse/shared': 13.0.0(vue@3.5.13(typescript@5.7.2))
-      vue: 3.5.13(typescript@5.7.2)
+      '@vueuse/shared': 13.0.0(vue@3.5.13(typescript@5.8.3))
+      vue: 3.5.13(typescript@5.8.3)
 
   '@vueuse/metadata@13.0.0': {}
 
-  '@vueuse/shared@13.0.0(vue@3.5.13(typescript@5.7.2))':
+  '@vueuse/shared@13.0.0(vue@3.5.13(typescript@5.8.3))':
     dependencies:
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   abbrev@1.1.1:
     optional: true
@@ -11757,10 +11757,10 @@ snapshots:
 
   avris-sorter@0.0.3: {}
 
-  avris-vue-share@1.0.1(typescript@5.7.2):
+  avris-vue-share@1.0.1(typescript@5.8.3):
     dependencies:
       clipboard: 2.0.11
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
     transitivePeerDependencies:
       - typescript
 
@@ -12016,11 +12016,11 @@ snapshots:
 
   capture-stack-trace@1.0.2: {}
 
-  capture-website@4.1.0(encoding@0.1.13)(typescript@5.7.2):
+  capture-website@4.1.0(encoding@0.1.13)(typescript@5.8.3):
     dependencies:
-      '@cliqz/adblocker-puppeteer': 1.34.0(puppeteer@21.11.0(encoding@0.1.13)(typescript@5.7.2))
+      '@cliqz/adblocker-puppeteer': 1.34.0(puppeteer@21.11.0(encoding@0.1.13)(typescript@5.8.3))
       file-url: 4.0.0
-      puppeteer: 21.11.0(encoding@0.1.13)(typescript@5.7.2)
+      puppeteer: 21.11.0(encoding@0.1.13)(typescript@5.8.3)
       tough-cookie: 4.1.4
     transitivePeerDependencies:
       - bufferutil
@@ -12227,14 +12227,14 @@ snapshots:
 
   core-util-is@1.0.3: {}
 
-  cosmiconfig@9.0.0(typescript@5.7.2):
+  cosmiconfig@9.0.0(typescript@5.8.3):
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.1
       js-yaml: 4.1.0
       parse-json: 5.2.0
     optionalDependencies:
-      typescript: 5.7.2
+      typescript: 5.8.3
 
   crc-32@1.2.2: {}
 
@@ -12805,11 +12805,11 @@ snapshots:
     dependencies:
       eslint: 9.22.0(jiti@2.4.2)
 
-  eslint-plugin-import-x@4.6.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2):
+  eslint-plugin-import-x@4.6.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3):
     dependencies:
       '@types/doctrine': 0.0.9
       '@typescript-eslint/scope-manager': 8.26.1
-      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.7.2)
+      '@typescript-eslint/utils': 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.3)
       debug: 4.4.0(supports-color@9.4.0)
       doctrine: 3.0.0
       enhanced-resolve: 5.18.1
@@ -14610,7 +14610,7 @@ snapshots:
 
   netmask@2.0.2: {}
 
-  nitropack@2.11.6(encoding@0.1.13)(sqlite3@5.1.7)(typescript@5.7.2):
+  nitropack@2.11.6(encoding@0.1.13)(sqlite3@5.1.7)(typescript@5.8.3):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.3.4
       '@netlify/functions': 3.0.0
@@ -14660,7 +14660,7 @@ snapshots:
       node-mock-http: 1.0.0
       ofetch: 1.4.1
       ohash: 2.0.11
-      openapi-typescript: 7.6.1(typescript@5.7.2)
+      openapi-typescript: 7.6.1(typescript@5.8.3)
       pathe: 2.0.3
       perfect-debounce: 1.0.0
       pkg-types: 2.1.0
@@ -14814,17 +14814,17 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuxt@3.16.0(@parcel/watcher@2.5.1)(@types/node@22.13.14)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2))(yaml@2.7.0):
+  nuxt@3.16.0(@parcel/watcher@2.5.1)(@types/node@22.13.14)(db0@0.3.1(sqlite3@5.1.7))(encoding@0.1.13)(eslint@9.22.0(jiti@2.4.2))(ioredis@5.6.0)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(sqlite3@5.1.7)(terser@5.33.0)(typescript@5.8.3)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.8.3))(yaml@2.7.0):
     dependencies:
       '@nuxt/cli': 3.23.0(magicast@0.3.5)
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 2.3.0(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2))
+      '@nuxt/devtools': 2.3.0(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3))
       '@nuxt/kit': 3.16.0(magicast@0.3.5)
       '@nuxt/schema': 3.16.0
       '@nuxt/telemetry': 2.6.5(magicast@0.3.5)
-      '@nuxt/vite-builder': 3.16.0(@types/node@22.13.14)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vue-tsc@2.2.8(typescript@5.7.2))(vue@3.5.13(typescript@5.7.2))(yaml@2.7.0)
+      '@nuxt/vite-builder': 3.16.0(@types/node@22.13.14)(eslint@9.22.0(jiti@2.4.2))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.35.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vue-tsc@2.2.8(typescript@5.8.3))(vue@3.5.13(typescript@5.8.3))(yaml@2.7.0)
       '@oxc-parser/wasm': 0.56.5
-      '@unhead/vue': 2.0.0-rc.13(vue@3.5.13(typescript@5.7.2))
+      '@unhead/vue': 2.0.0-rc.13(vue@3.5.13(typescript@5.8.3))
       '@vue/shared': 3.5.13
       c12: 3.0.2(magicast@0.3.5)
       chokidar: 4.0.3
@@ -14850,7 +14850,7 @@ snapshots:
       magic-string: 0.30.17
       mlly: 1.7.4
       nanotar: 0.2.0
-      nitropack: 2.11.6(encoding@0.1.13)(sqlite3@5.1.7)(typescript@5.7.2)
+      nitropack: 2.11.6(encoding@0.1.13)(sqlite3@5.1.7)(typescript@5.8.3)
       nypm: 0.6.0
       ofetch: 1.4.1
       ohash: 2.0.11
@@ -14872,13 +14872,13 @@ snapshots:
       unenv: 2.0.0-rc.14
       unimport: 4.1.2
       unplugin: 2.2.0
-      unplugin-vue-router: 0.12.0(vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+      unplugin-vue-router: 0.12.0(vue-router@4.5.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))
       unstorage: 1.15.0(db0@0.3.1(sqlite3@5.1.7))(ioredis@5.6.0)
       untyped: 2.0.0
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
       vue-bundle-renderer: 2.1.1
       vue-devtools-stub: 0.1.0
-      vue-router: 4.5.0(vue@3.5.13(typescript@5.7.2))
+      vue-router: 4.5.0(vue@3.5.13(typescript@5.8.3))
     optionalDependencies:
       '@parcel/watcher': 2.5.1
       '@types/node': 22.13.14
@@ -15012,14 +15012,14 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openapi-typescript@7.6.1(typescript@5.7.2):
+  openapi-typescript@7.6.1(typescript@5.8.3):
     dependencies:
       '@redocly/openapi-core': 1.33.1(supports-color@9.4.0)
       ansi-colors: 4.1.3
       change-case: 5.4.4
       parse-json: 8.1.0
       supports-color: 9.4.0
-      typescript: 5.7.2
+      typescript: 5.8.3
       yargs-parser: 21.1.1
 
   optionator@0.9.4:
@@ -15104,11 +15104,11 @@ snapshots:
     dependencies:
       quansync: 0.2.8
 
-  pageres@8.1.0(encoding@0.1.13)(typescript@5.7.2):
+  pageres@8.1.0(encoding@0.1.13)(typescript@5.8.3):
     dependencies:
       array-differ: 4.0.0
       array-uniq: 3.0.0
-      capture-website: 4.1.0(encoding@0.1.13)(typescript@5.7.2)
+      capture-website: 4.1.0(encoding@0.1.13)(typescript@5.8.3)
       date-fns: 3.6.0
       filenamify: 6.0.0
       filenamify-url: 3.1.0
@@ -15234,13 +15234,13 @@ snapshots:
 
   pify@2.3.0: {}
 
-  pinia@2.3.1(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)):
+  pinia@2.3.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.13(typescript@5.7.2)
-      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
+      vue: 3.5.13(typescript@5.8.3)
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.8.3))
     optionalDependencies:
-      typescript: 5.7.2
+      typescript: 5.8.3
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -15552,10 +15552,10 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  puppeteer@21.11.0(encoding@0.1.13)(typescript@5.7.2):
+  puppeteer@21.11.0(encoding@0.1.13)(typescript@5.8.3):
     dependencies:
       '@puppeteer/browsers': 1.9.1
-      cosmiconfig: 9.0.0(typescript@5.7.2)
+      cosmiconfig: 9.0.0(typescript@5.8.3)
       puppeteer-core: 21.11.0(encoding@0.1.13)
     transitivePeerDependencies:
       - bufferutil
@@ -16533,9 +16533,9 @@ snapshots:
     dependencies:
       escape-string-regexp: 5.0.0
 
-  ts-api-utils@2.0.1(typescript@5.7.2):
+  ts-api-utils@2.0.1(typescript@5.8.3):
     dependencies:
-      typescript: 5.7.2
+      typescript: 5.8.3
 
   ts-json-schema-generator@1.5.1:
     dependencies:
@@ -16547,7 +16547,7 @@ snapshots:
       safe-stable-stringify: 2.5.0
       typescript: 5.4.5
 
-  ts-node@10.9.2(@types/node@22.13.14)(typescript@5.7.2):
+  ts-node@10.9.2(@types/node@22.13.14)(typescript@5.8.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
@@ -16561,7 +16561,7 @@ snapshots:
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 5.7.2
+      typescript: 5.8.3
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
@@ -16639,7 +16639,7 @@ snapshots:
 
   typescript@5.4.5: {}
 
-  typescript@5.7.2: {}
+  typescript@5.8.3: {}
 
   uc.micro@2.1.0: {}
 
@@ -16757,10 +16757,10 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.2
 
-  unplugin-vue-router@0.12.0(vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2)):
+  unplugin-vue-router@0.12.0(vue-router@4.5.0(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3)):
     dependencies:
       '@babel/types': 7.26.10
-      '@vue-macros/common': 1.16.1(vue@3.5.13(typescript@5.7.2))
+      '@vue-macros/common': 1.16.1(vue@3.5.13(typescript@5.8.3))
       ast-walker-scope: 0.6.2
       chokidar: 4.0.3
       fast-glob: 3.3.3
@@ -16775,7 +16775,7 @@ snapshots:
       unplugin-utils: 0.2.4
       yaml: 2.7.0
     optionalDependencies:
-      vue-router: 4.5.0(vue@3.5.13(typescript@5.7.2))
+      vue-router: 4.5.0(vue@3.5.13(typescript@5.8.3))
     transitivePeerDependencies:
       - vue
 
@@ -16935,7 +16935,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-checker@0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.7.2)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.7.2)):
+  vite-plugin-checker@0.9.0(eslint@9.22.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.8.3)(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue-tsc@2.2.8(typescript@5.8.3)):
     dependencies:
       '@babel/code-frame': 7.26.2
       chokidar: 4.0.3
@@ -16950,8 +16950,8 @@ snapshots:
     optionalDependencies:
       eslint: 9.22.0(jiti@2.4.2)
       optionator: 0.9.4
-      typescript: 5.7.2
-      vue-tsc: 2.2.8(typescript@5.7.2)
+      typescript: 5.8.3
+      vue-tsc: 2.2.8(typescript@5.8.3)
 
   vite-plugin-inspect@11.0.0(@nuxt/kit@3.16.0(magicast@0.3.5))(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)):
     dependencies:
@@ -16981,14 +16981,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-tracer@0.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.2)):
+  vite-plugin-vue-tracer@0.1.1(vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(vue@3.5.13(typescript@5.8.3)):
     dependencies:
       estree-walker: 3.0.3
       magic-string: 0.30.17
       pathe: 2.0.3
       source-map-js: 1.2.1
       vite: 6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0)
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   vite@6.2.2(@types/node@22.13.14)(jiti@2.4.2)(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0):
     dependencies:
@@ -17003,9 +17003,9 @@ snapshots:
       terser: 5.33.0
       yaml: 2.7.0
 
-  vitest-environment-nuxt@1.0.1(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0):
+  vitest-environment-nuxt@1.0.1(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0):
     dependencies:
-      '@nuxt/test-utils': 3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.7.2)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
+      '@nuxt/test-utils': 3.15.4(@playwright/test@1.50.0)(@types/node@22.13.14)(@vue/test-utils@2.4.6)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(magicast@0.3.5)(playwright-core@1.50.0)(sass@1.32.12)(terser@5.33.0)(typescript@5.8.3)(vitest@3.0.8(@types/node@22.13.14)(jiti@2.4.2)(jsdom@26.0.0(canvas@3.1.0))(sass@1.32.12)(terser@5.33.0)(yaml@2.7.0))(yaml@2.7.0)
     transitivePeerDependencies:
       - '@cucumber/cucumber'
       - '@jest/globals'
@@ -17078,9 +17078,9 @@ snapshots:
 
   vue-component-type-helpers@2.1.6: {}
 
-  vue-demi@0.14.10(vue@3.5.13(typescript@5.7.2)):
+  vue-demi@0.14.10(vue@3.5.13(typescript@5.8.3)):
     dependencies:
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   vue-devtools-stub@0.1.0: {}
 
@@ -17097,31 +17097,31 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)):
+  vue-router@4.5.0(vue@3.5.13(typescript@5.8.3)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
-  vue-tsc@2.2.8(typescript@5.7.2):
+  vue-tsc@2.2.8(typescript@5.8.3):
     dependencies:
       '@volar/typescript': 2.4.11
-      '@vue/language-core': 2.2.8(typescript@5.7.2)
-      typescript: 5.7.2
+      '@vue/language-core': 2.2.8(typescript@5.8.3)
+      typescript: 5.8.3
 
-  vue@3.5.13(typescript@5.7.2):
+  vue@3.5.13(typescript@5.8.3):
     dependencies:
       '@vue/compiler-dom': 3.5.13
       '@vue/compiler-sfc': 3.5.13
       '@vue/runtime-dom': 3.5.13
-      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.7.2))
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.8.3))
       '@vue/shared': 3.5.13
     optionalDependencies:
-      typescript: 5.7.2
+      typescript: 5.8.3
 
-  vuedraggable@4.1.0(vue@3.5.13(typescript@5.7.2)):
+  vuedraggable@4.1.0(vue@3.5.13(typescript@5.8.3)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.5.13(typescript@5.7.2)
+      vue: 3.5.13(typescript@5.8.3)
 
   w3c-xmlserializer@5.0.0:
     dependencies:

From 32f86cec86743622fc29ab2c49da92d1c38ad159 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sat, 12 Apr 2025 17:08:34 +0200
Subject: [PATCH 36/45] (user) allow blocking accounts

---
 components/Account.vue               | 10 +++++-
 components/Ban.vue                   | 13 ++++++-
 components/BlocksList.vue            | 37 +++++++++++++++++++
 locale/_base/translations.suml       | 12 +++++++
 locale/en/translations.suml          | 12 +++++++
 locale/pl/translations.suml          | 14 +++++++-
 migrations/089-block-connections.sql | 12 +++++++
 pages/profile/[username].vue         |  6 ++--
 server/express/profile.ts            | 25 +++++++++++--
 server/express/user.ts               | 53 ++++++++++++++++++++++++++++
 10 files changed, 186 insertions(+), 8 deletions(-)
 create mode 100644 components/BlocksList.vue
 create mode 100644 migrations/089-block-connections.sql

diff --git a/components/Account.vue b/components/Account.vue
index a745b114a..5128ddd2f 100644
--- a/components/Account.vue
+++ b/components/Account.vue
@@ -283,7 +283,7 @@ const addBrackets = (str: string): string => {
         </div>
 
         <TabsNav
-            :tabs="['general', 'cards', 'socials', 'circles', 'backup']"
+            :tabs="['general', 'cards', 'socials', 'circles', 'blocks', 'backup']"
             pills
             showheaders
             navclass="mb-3 border-bottom-0"
@@ -562,6 +562,14 @@ const addBrackets = (str: string): string => {
                 </nuxt-link>
             </template>
 
+            <template #blocks-header>
+                <Icon v="ban" />
+                <T>profile.blocks.header</T>
+            </template>
+            <template #blocks>
+                <BlocksList />
+            </template>
+
             <template #backup-header>
                 <Icon v="copy" />
                 <T>profile.backup.headerShort</T>
diff --git a/components/Ban.vue b/components/Ban.vue
index 0847ee0df..8939b6ae6 100644
--- a/components/Ban.vue
+++ b/components/Ban.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="$user() && $user().username !== user.username">
-        <section v-if="$user()">
+        <section>
             <a v-if="!showReportForm" href="#" class="small" @click.prevent="showReportForm = true">
                 <Icon v="spider" />
                 <T>report.action</T>
@@ -37,6 +37,12 @@
                 <T>report.sent</T>
             </div>
         </section>
+        <section>
+            <a href="#" class="small" @click.prevent="block">
+                <Icon v="ban" />
+                <T>profile.blocks.action</T>
+            </a>
+        </section>
         <section v-if="$isGranted('users') || $isGranted('community')">
             <div v-if="banSnapshot" class="my-3">
                 <a
@@ -380,6 +386,11 @@ Unfortunately, I need to remove your account.
                 this.saving = false;
             }
         },
+        async block() {
+            await this.dialogue.confirm(this.$t('profile.blocks.confirm', { username: this.user.username }), 'danger');
+            await this.dialogue.postWithAlertOnError(`/api/user/block/${this.user.id}`);
+            window.location.reload();
+        },
         copyProposal(proposal) {
             this.user.bannedReason = proposal.bannedReason;
             this.user.bannedTerms = proposal.bannedTerms.split(',');
diff --git a/components/BlocksList.vue b/components/BlocksList.vue
new file mode 100644
index 000000000..499b6c89c
--- /dev/null
+++ b/components/BlocksList.vue
@@ -0,0 +1,37 @@
+<script lang="ts" setup>
+import { useFetch } from 'nuxt/app';
+
+import useDialogue from '~/composables/useDialogue.ts';
+
+const { $translator: translator } = useNuxtApp();
+const dialogue = useDialogue();
+
+type Block = {
+    id: string;
+    to_userId: string;
+    to_username: string;
+};
+
+const blocks = useFetch<Block[]>(`/api/user/blocks`);
+
+const unblock = async (block: Block) => {
+    await dialogue.confirm(translator.translate('profile.blocks.unblock.confirm', { username: block.to_username }), 'danger');
+    await dialogue.postWithAlertOnError(`/api/user/unblock/${block.to_userId}`);
+    await blocks.refresh();
+};
+</script>
+
+<template>
+    <ul v-if="blocks.data">
+        <li v-if="blocks.data!.value!.length === 0">
+            <T>table.empty</T>
+        </li>
+        <li v-for="block in blocks.data.value" :key="block.id">
+            @{{ block.to_username }}
+            <small class="text-muted">({{ $datetime($ulidTime(block.id)) }})</small>
+            <a href="#" :aria-label="$t('profile.blocks.unblock.action')" class="btn btn-link btn-sm" @click.prevent="unblock(block)">
+                <Icon v="trash" />
+            </a>
+        </li>
+    </ul>
+</template>
diff --git a/locale/_base/translations.suml b/locale/_base/translations.suml
index 31ae1e9a6..e4997b854 100644
--- a/locale/_base/translations.suml
+++ b/locale/_base/translations.suml
@@ -850,6 +850,18 @@ profile:
             action: 'Remove yourself'
             confirm: 'Are you sure you want to remove your profile from @%username%''s circle?'
         add: 'Add people to your circle'
+    blocks:
+        header: 'Blocked accounts'
+        action: 'Block this person'
+        confirm: >
+            Are you sure you want to block @%username%?
+            You will not be able to see each other's cards or add each other to your circles.
+            This can be reversed in your Account page.
+        unblock:
+            action: 'Unblock this person'
+            confirm: >
+                Are you sure you want to unblock @%username%?
+                You will be able to see each other's cards or add each other to your circles.
     sensitive:
         header: 'Content warning'
         info: >
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index f53eb5011..ae46aeb15 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -1067,6 +1067,18 @@ profile:
             action: 'Remove yourself'
             confirm: 'Are you sure you want to remove your profile from @%username%''s circle?'
         add: 'Add people to your circle'
+    blocks:
+        header: 'Blocked accounts'
+        action: 'Block this person'
+        confirm: >
+            Are you sure you want to block @%username%?
+            You will not be able to see each other's cards or add each other to your circles.
+            This can be reversed in your Account page.
+        unblock:
+            action: 'Unblock this person'
+            confirm: >
+                Are you sure you want to unblock @%username%?
+                You will be able to see each other's cards or add each other to your circles.
     sensitive:
         header: 'Content warning'
         info: >
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index c103e1223..17013c248 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -1690,6 +1690,18 @@ profile:
             action: 'Usuń się'
             confirm: 'Czy na pewno chcesz usunąć link do swojej wizytówki z kręgów osoby @%username%?'
         add: 'Dodaj osoby do swojego kręgu'
+    blocks:
+        header: 'Zablokowane konta'
+        action: 'Zablokuj tę osobę'
+        confirm: >
+            Czy na pewno chcesz zablokować @%username%?
+            Nie będziecie mogły widzieć swoich wizytówek ani dodawać się nawzajem do kręgów.
+            Możesz cofnąć blokadę na stronie „Twoje konto”.
+        unblock:
+            action: 'Unblock this person'
+            confirm: >
+                Czy na pewno chcesz odblokować @%username%?
+                Będziecie mogły znowu widzieć swoje wizytówki oraz dodawać się nawzajem do kręgów.
     sensitive:
         header: 'Ostrzeżenie o zawartości'
         info: >
@@ -2119,7 +2131,7 @@ ban:
     reason: 'Powód blokady'
     visible: '(to będzie widoczne dla osoby zbanowanej)'
     terms: 'Złamane punkty regulaminu (wymagane)'
-    action: 'Zablokuj tę osobę'
+    action: 'Zbanuj tę osobę'
     confirm: 'Czy na pewno chcesz zbanować @%username%?'
     header: 'Twoje konto jest zablokowane. Twoje profile nie są widoczne publicznie.'
     banned: 'Konto nieaktywne'
diff --git a/migrations/089-block-connections.sql b/migrations/089-block-connections.sql
new file mode 100644
index 000000000..da008fa10
--- /dev/null
+++ b/migrations/089-block-connections.sql
@@ -0,0 +1,12 @@
+-- Up
+
+CREATE TABLE block_connections (
+    id TEXT NOT NULL PRIMARY KEY,
+    from_userId TEXT NOT NULL REFERENCES users ON DELETE CASCADE,
+    to_userId TEXT NOT NULL REFERENCES users ON DELETE CASCADE
+);
+
+CREATE INDEX "block_connections_from_userId" ON "block_connections" ("from_userId");
+CREATE INDEX "block_connections_to_userId" ON "block_connections" ("to_userId");
+
+-- Down
diff --git a/pages/profile/[username].vue b/pages/profile/[username].vue
index 89838bb78..acac72058 100644
--- a/pages/profile/[username].vue
+++ b/pages/profile/[username].vue
@@ -60,7 +60,7 @@ const username = computed(() => {
         return usernameFromRoute;
     }
 
-    if (userAsyncData.data.value.username !== usernameFromRoute && import.meta.client) {
+    if (userAsyncData.data.value.username && userAsyncData.data.value.username !== usernameFromRoute && import.meta.client) {
         history.pushState(
             '',
             document.title,
@@ -74,9 +74,9 @@ const username = computed(() => {
 const { mainPronoun } = useMainPronoun(pronounLibrary, profile, translator);
 const flags = buildFlags(config.locale);
 useSimpleHead({
-    title: `@${username.value}`,
+    title: username.value ? `@${username.value}` : undefined,
     description: computed(() => profile.value ? profile.value.description ?? null : null),
-    banner: `api/banner/@${username.value}.png`,
+    banner: username.value ? `api/banner/@${username.value}.png` : undefined,
     noindex: true,
     keywords: computed(() => profile.value?.flags?.map((flagName) => flags[flagName])
         .filter((flag) => flag !== undefined)
diff --git a/server/express/profile.ts b/server/express/profile.ts
index 4d393db7f..0280eb12e 100644
--- a/server/express/profile.ts
+++ b/server/express/profile.ts
@@ -495,14 +495,30 @@ const fetchCircles = async (
     }));
 };
 
+const isUserBlocked = async (db: Database, user: any, otherUser: any): Promise<boolean> => {
+    if (!user || !otherUser || user.id === otherUser.id) {
+        return false;
+    }
+
+    const row = await db.get<{ c: number }>(SQL`
+        SELECT count(*) as c
+        FROM block_connections
+        WHERE (from_userId = ${user.id} AND to_userId = ${otherUser.id})
+          OR (from_userId = ${otherUser.id} AND to_userId = ${user.id})
+    `);
+
+    return row!.c > 0;
+};
+
 const router = Router();
 
 const fetchProfilesRoute = async (req: Request, res: Response, locale: string, user: any): Promise<Response> => {
     const isSelf = !!req.user && req.user.username === req.params.username;
     const isAdmin = req.isGranted('users') || req.isGranted('community');
     const opts = new ProfileOptions(req.query, req.locales);
+    const isBlocked = await isUserBlocked(req.db, req.user, user);
 
-    if (!user || user.bannedReason !== null && !isAdmin && !isSelf) {
+    if (!user || isBlocked || user.bannedReason !== null && !isAdmin && !isSelf) {
         return res.json({
             profiles: {},
         });
@@ -573,6 +589,11 @@ router.get('/profile/get-id/:id', handleErrorAsync(async (req, res) => {
 }));
 
 router.get('/profile/versions/:username', handleErrorAsync(async (req, res) => {
+    const user = await req.db.get<Pick<UserRow, 'id'>>(SQL`SELECT * FROM users WHERE usernameNorm = ${normalise(req.params.username)}`);
+    if (await isUserBlocked(req.db, req.user, user)) {
+        return res.json([]);
+    }
+
     return res.json((await req.db.all<Pick<ProfileRow, 'locale'>>(SQL`
         SELECT
             profiles.locale
@@ -832,7 +853,7 @@ router.post('/profile/save', handleErrorAsync(async (req, res) => {
     for (const connection of profile.circle) {
         const toUserId = usernameIdMap[normaliseWithLink(connection.username)];
         const relationship = connection.relationship.substring(0, 64).trim();
-        if (toUserId === undefined || !relationship) {
+        if (toUserId === undefined || !relationship || await isUserBlocked(req.db, req.user, { id: toUserId })) {
             continue;
         }
         await req.db.get(SQL`INSERT INTO user_connections (id, from_profileId, to_userId, relationship) VALUES (
diff --git a/server/express/user.ts b/server/express/user.ts
index 7f8190e26..bbb60b270 100644
--- a/server/express/user.ts
+++ b/server/express/user.ts
@@ -1006,4 +1006,57 @@ router.get('/user/social-lookup/:provider/:identifier', handleErrorAsync(async (
     return res.json(row ? row.username : null);
 }));
 
+router.get('/user/blocks', handleErrorAsync(async (req, res) => {
+    if (!req.user) {
+        return res.status(401).json({ error: 'Unauthorised' });
+    }
+
+    const rows = await req.db.all<{ id: string; to_userId: string; to_username: string }[]>(SQL`
+        SELECT b.id, b.to_userId, u.username AS to_username
+        FROM block_connections b
+        LEFT JOIN users u ON b.to_userId = u.id
+        WHERE from_userId = ${req.user.id}
+        ORDER BY b.id DESC
+    `);
+
+    return res.json(rows);
+}));
+
+router.post('/user/block/:id', handleErrorAsync(async (req, res) => {
+    const id = req.params.id;
+    const blockedUser = await req.db.get<UserRow>(SQL`SELECT * FROM users WHERE id = ${id}`);
+    if (!req.user || !blockedUser || req.user.id === blockedUser.id) {
+        return res.status(401).json({ error: 'Unauthorised' });
+    }
+
+    await req.db.get(SQL`
+        INSERT INTO block_connections (id, from_userId, to_userId)
+        VALUES (${ulid()}, ${req.user.id}, ${blockedUser.id})
+    `);
+
+    await req.db.get(SQL`
+        DELETE FROM user_connections
+        WHERE (from_profileId IN (SELECT id FROM profiles WHERE userId = ${req.user.id}) AND to_userId = ${blockedUser.id})
+          OR (from_profileId IN (SELECT id FROM profiles WHERE userId = ${blockedUser.id}) AND to_userId = ${req.user.id})
+    `);
+
+    return res.json(null);
+}));
+
+router.post('/user/unblock/:id', handleErrorAsync(async (req, res) => {
+    const id = req.params.id;
+    const blockedUser = await req.db.get<UserRow>(SQL`SELECT * FROM users WHERE id = ${id}`);
+    if (!req.user || !blockedUser || req.user.id === blockedUser.id) {
+        return res.status(401).json({ error: 'Unauthorised' });
+    }
+
+    await req.db.get(SQL`
+        DELETE FROM block_connections
+        WHERE from_userId = ${req.user.id}
+          AND to_userId = ${blockedUser.id}
+    `);
+
+    return res.json(null);
+}));
+
 export default router;

From 87a05ea8183c50892dbd6b08b53393ebe3b80dc7 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sat, 12 Apr 2025 17:23:20 +0200
Subject: [PATCH 37/45] =?UTF-8?q?(pl)=20disable=20workshops=20route=20in?=
 =?UTF-8?q?=20Polish,=20za=20ma=C5=82o=20mocy=20przerobowych=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/pl/config.suml |  2 +-
 src/adsInternal.ts    | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/locale/pl/config.suml b/locale/pl/config.suml
index d77b7374e..d8b592bd4 100644
--- a/locale/pl/config.suml
+++ b/locale/pl/config.suml
@@ -3290,7 +3290,7 @@ contact:
         route: 'kolektyw-rjn'
 
 workshops:
-    enabled: true
+    enabled: false
     route: 'szkolenia'
     email: 'szkolenia@zaimki.pl'
 
diff --git a/src/adsInternal.ts b/src/adsInternal.ts
index f89fdc87b..d9b0d478d 100644
--- a/src/adsInternal.ts
+++ b/src/adsInternal.ts
@@ -37,24 +37,24 @@ export const adsInternal: Ad[] = [
         display: 'd-block d-lg-none',
         alt: SHOP_DESC,
     },
-    {
-        enabled: true,
-        locale: 'pl',
-        image: 'workshops-pl.png',
-        placeholders: ['content-0'],
-        link: WORKSHOPS_PL_LINK,
-        display: 'd-none d-md-block',
-        alt: WORKSHOPS_PL_DESC,
-    },
-    {
-        enabled: true,
-        locale: 'pl',
-        image: 'workshops-pl-mobile.png',
-        placeholders: ['content-mobile-0'],
-        link: WORKSHOPS_PL_LINK,
-        display: 'd-block d-md-none',
-        alt: WORKSHOPS_PL_DESC,
-    },
+    // {
+    //     enabled: true,
+    //     locale: 'pl',
+    //     image: 'workshops-pl.png',
+    //     placeholders: ['content-0'],
+    //     link: WORKSHOPS_PL_LINK,
+    //     display: 'd-none d-md-block',
+    //     alt: WORKSHOPS_PL_DESC,
+    // },
+    // {
+    //     enabled: true,
+    //     locale: 'pl',
+    //     image: 'workshops-pl-mobile.png',
+    //     placeholders: ['content-mobile-0'],
+    //     link: WORKSHOPS_PL_LINK,
+    //     display: 'd-block d-md-none',
+    //     alt: WORKSHOPS_PL_DESC,
+    // },
     {
         enabled: false,
         locale: 'en',

From c1871a002e6199cf572ce8d81b8072d215d5e540 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sat, 12 Apr 2025 17:53:05 +0200
Subject: [PATCH 38/45] (fix) lazily load block list and fix client-side
 navigation

---
 components/BlocksList.vue | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/components/BlocksList.vue b/components/BlocksList.vue
index 499b6c89c..6e4c341d3 100644
--- a/components/BlocksList.vue
+++ b/components/BlocksList.vue
@@ -12,7 +12,7 @@ type Block = {
     to_username: string;
 };
 
-const blocks = useFetch<Block[]>(`/api/user/blocks`);
+const blocks = useFetch<Block[]>(`/api/user/blocks`, { lazy: true });
 
 const unblock = async (block: Block) => {
     await dialogue.confirm(translator.translate('profile.blocks.unblock.confirm', { username: block.to_username }), 'danger');
@@ -22,16 +22,18 @@ const unblock = async (block: Block) => {
 </script>
 
 <template>
-    <ul v-if="blocks.data">
-        <li v-if="blocks.data!.value!.length === 0">
-            <T>table.empty</T>
-        </li>
-        <li v-for="block in blocks.data.value" :key="block.id">
-            @{{ block.to_username }}
-            <small class="text-muted">({{ $datetime($ulidTime(block.id)) }})</small>
-            <a href="#" :aria-label="$t('profile.blocks.unblock.action')" class="btn btn-link btn-sm" @click.prevent="unblock(block)">
-                <Icon v="trash" />
-            </a>
-        </li>
-    </ul>
+    <Loading :value="blocks.data.value">
+        <ul v-if="blocks.data.value">
+            <li v-if="blocks.data.value.length === 0">
+                <T>table.empty</T>
+            </li>
+            <li v-for="block in blocks.data.value" :key="block.id">
+                @{{ block.to_username }}
+                <small class="text-muted">({{ $datetime($ulidTime(block.id)) }})</small>
+                <a href="#" :aria-label="$t('profile.blocks.unblock.action')" class="btn btn-link btn-sm" @click.prevent="unblock(block)">
+                    <Icon v="trash" />
+                </a>
+            </li>
+        </ul>
+    </Loading>
 </template>

From 66e5a31b42f686cb1d5ed83e03d95de8b59bcf9f Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 13 Apr 2025 13:37:12 +0200
Subject: [PATCH 39/45] (block) better wording

---
 components/BlocksList.vue      | 5 ++++-
 locale/_base/translations.suml | 2 ++
 locale/en/translations.suml    | 2 ++
 locale/pl/translations.suml    | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/BlocksList.vue b/components/BlocksList.vue
index 6e4c341d3..321ac348b 100644
--- a/components/BlocksList.vue
+++ b/components/BlocksList.vue
@@ -25,7 +25,7 @@ const unblock = async (block: Block) => {
     <Loading :value="blocks.data.value">
         <ul v-if="blocks.data.value">
             <li v-if="blocks.data.value.length === 0">
-                <T>table.empty</T>
+                <T>profile.blocks.empty</T>
             </li>
             <li v-for="block in blocks.data.value" :key="block.id">
                 @{{ block.to_username }}
@@ -35,5 +35,8 @@ const unblock = async (block: Block) => {
                 </a>
             </li>
         </ul>
+        <p class="small mb-0">
+            <Icon v="info-circle" /> <T>profile.blocks.instruction</T>
+        </p>
     </Loading>
 </template>
diff --git a/locale/_base/translations.suml b/locale/_base/translations.suml
index e4997b854..e20ff1161 100644
--- a/locale/_base/translations.suml
+++ b/locale/_base/translations.suml
@@ -862,6 +862,8 @@ profile:
             confirm: >
                 Are you sure you want to unblock @%username%?
                 You will be able to see each other's cards or add each other to your circles.
+        empty: 'You currently do not have any accounts blocked.'
+        instruction: 'You can block a person by visiting their profile.'
     sensitive:
         header: 'Content warning'
         info: >
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index ae46aeb15..bb1182e8e 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -1079,6 +1079,8 @@ profile:
             confirm: >
                 Are you sure you want to unblock @%username%?
                 You will be able to see each other's cards or add each other to your circles.
+        empty: 'You currently do not have any accounts blocked.'
+        instruction: 'You can block a person by visiting their profile.'
     sensitive:
         header: 'Content warning'
         info: >
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 17013c248..052e34bec 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -1702,6 +1702,8 @@ profile:
             confirm: >
                 Czy na pewno chcesz odblokować @%username%?
                 Będziecie mogły znowu widzieć swoje wizytówki oraz dodawać się nawzajem do kręgów.
+        empty: 'You currently do not have any accounts blocked.'
+        instruction: 'You can block a person by visiting their profile.'
     sensitive:
         header: 'Ostrzeżenie o zawartości'
         info: >

From c349dd662f4bb14d601bc443bc11c92902a44279 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 13 Apr 2025 13:50:42 +0200
Subject: [PATCH 40/45] (lint)

---
 src/adsInternal.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adsInternal.ts b/src/adsInternal.ts
index d9b0d478d..f9831956e 100644
--- a/src/adsInternal.ts
+++ b/src/adsInternal.ts
@@ -11,8 +11,8 @@ interface Ad {
 
 const SHOP_LINK = 'https://shop.pronouns.page';
 const SHOP_DESC = 'Pronouns Page merch is here! Get yours at shop.pronouns.page or Etsy!';
-const WORKSHOPS_PL_LINK = 'https://zaimki.pl/szkolenia';
-const WORKSHOPS_PL_DESC = 'Oferujemy szkolenia i warsztaty dla firm i organizacji';
+// const WORKSHOPS_PL_LINK = 'https://zaimki.pl/szkolenia';
+// const WORKSHOPS_PL_DESC = 'Oferujemy szkolenia i warsztaty dla firm i organizacji';
 const WORKSHOPS_EN_LINK = 'https://en.pronouns.page/workshops';
 const WORKSHOPS_EN_DESC = 'We offer training and workshops for companies and organisations.';
 const PHS_LINK = 'https://polishheritage.shop/?utm_source=pp&utm_medium=banner&utm_campaign=launch';

From 1407dbcb7827f6cfb603d46a40e412b88924d7e4 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 15 Apr 2025 11:04:03 +0200
Subject: [PATCH 41/45] (search) add search to <NotFound> for easier navigation

---
 components/NotFound.vue              |   4 +
 components/search/SearchDialogue.vue | 112 +-----------------------
 components/search/SearchForm.vue     | 123 +++++++++++++++++++++++++++
 3 files changed, 130 insertions(+), 109 deletions(-)
 create mode 100644 components/search/SearchForm.vue

diff --git a/components/NotFound.vue b/components/NotFound.vue
index 1ff0dbfe1..8e7e74df9 100644
--- a/components/NotFound.vue
+++ b/components/NotFound.vue
@@ -13,6 +13,10 @@ if (event) {
             <T>notFound.message</T>
         </h2>
 
+        <section>
+            <SearchForm />
+        </section>
+
         <p class="h4 mt-4">
             <nuxt-link to="/">
                 <Icon v="chevron-circle-left" />
diff --git a/components/search/SearchDialogue.vue b/components/search/SearchDialogue.vue
index 16ced0b56..271c054cb 100644
--- a/components/search/SearchDialogue.vue
+++ b/components/search/SearchDialogue.vue
@@ -1,62 +1,16 @@
 <script setup lang="ts">
-import { onKeyStroke, useDebounce } from '@vueuse/core';
-
-import { normaliseQuery, validateQuery } from '~/src/search.ts';
-
-const query = ref('');
-const normalisedQuery = computed(() => {
-    return normaliseQuery(query.value);
-});
-const debouncedQuery = useDebounce(normalisedQuery);
-
-const queryValidation = computed(() => {
-    return validateQuery(normalisedQuery.value);
-});
-
-const searchAsyncData = useAsyncData('search', async () => {
-    selected.value = null;
-    if (queryValidation.value !== undefined) {
-        return [];
-    }
-    return await $fetch('/api/search', {
-        query: {
-            query: debouncedQuery.value,
-        },
-    });
-}, {
-    watch: [debouncedQuery],
-});
-
-const isLoading = computed(() => {
-    return queryValidation.value === undefined &&
-        (normalisedQuery.value !== debouncedQuery.value || searchAsyncData.status.value === 'pending');
-});
-
-const hasNoResults = computed(() => {
-    return !isLoading.value && searchAsyncData.data.value?.length === 0;
-});
-
 const dialogue = useTemplateRef('dialogue');
+const searchForm = useTemplateRef('searchForm');
 
 const open = () => {
-    query.value = '';
-    searchAsyncData.clear();
+    searchForm.value?.reset();
     dialogue.value?.showModal();
-    selected.value = null;
 };
 
 const close = () => {
     dialogue.value?.close();
 };
 
-onKeyStroke('k', (event) => {
-    const isCtrlKeyPressed = isMac.value ? event.metaKey : event.ctrlKey;
-    if (isCtrlKeyPressed) {
-        event.preventDefault();
-        open();
-    }
-});
-
 const onMousedown = (event: MouseEvent) => {
     const rect = dialogue.value?.getBoundingClientRect();
     if (rect && (
@@ -67,71 +21,11 @@ const onMousedown = (event: MouseEvent) => {
     }
 };
 
-const selected = ref<number | null>(null);
-const router = useRouter();
-onKeyStroke('ArrowDown', () => {
-    selected.value = Math.min(
-        (selected.value ?? -1) + 1,
-        (searchAsyncData.data?.value?.length ?? 0) - 1,
-    );
-});
-onKeyStroke('ArrowUp', () => {
-    selected.value = Math.max(
-        (selected.value ?? -1) - 1,
-        0,
-    );
-});
-onKeyStroke('Enter', () => {
-    if (selected.value === null) {
-        return;
-    }
-
-    const document = searchAsyncData.data.value?.[selected.value];
-    if (!document) {
-        return;
-    }
-
-    router.push(document.url);
-    close();
-});
-
 defineExpose({ open, close });
 </script>
 
 <template>
     <dialog ref="dialogue" class="container m-auto h-100 rounded border" @mousedown="onMousedown">
-        <div class="input-group mb-4">
-            <span class="input-group-text">
-                <Spinner v-if="isLoading" size="1.25em" />
-                <Icon v-else v="search" />
-            </span>
-            <input
-                v-model="query"
-                type="search"
-                class="form-control border-primary"
-                :placeholder="$t('crud.search')"
-            >
-            <button class="btn btn-outline-danger" @click="close()">
-                <Icon v="times" />
-            </button>
-        </div>
-        <div v-if="queryValidation !== undefined" class="alert alert-info">
-            <T>search.{{ queryValidation }}</T>
-        </div>
-        <ul
-            v-else-if="searchAsyncData.data.value?.length ?? 0 > 0"
-            class="list-group"
-        >
-            <li
-                v-for="(document, index) of searchAsyncData.data.value"
-                :key="`${document.kind}-${document.id}`"
-                :class="['list-group-item list-group-item-action py-0 pe-0', selected === index ? 'list-group-item-active' : '']"
-            >
-                <SearchItem :document="document" @click="close()" />
-            </li>
-        </ul>
-        <div v-else-if="hasNoResults" class="alert alert-info">
-            <T :params="{ query }">search.noResults</T>
-        </div>
+        <SearchForm ref="searchForm" @selected="close()" />
     </dialog>
 </template>
diff --git a/components/search/SearchForm.vue b/components/search/SearchForm.vue
new file mode 100644
index 000000000..8c63366bb
--- /dev/null
+++ b/components/search/SearchForm.vue
@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import { onKeyStroke, useDebounce } from '@vueuse/core';
+
+import { normaliseQuery, validateQuery } from '~/src/search.ts';
+
+const emit = defineEmits<{
+    selected: [];
+}>();
+
+const query = ref('');
+const normalisedQuery = computed(() => {
+    return normaliseQuery(query.value);
+});
+const debouncedQuery = useDebounce(normalisedQuery);
+
+const queryValidation = computed(() => {
+    return validateQuery(normalisedQuery.value);
+});
+
+const searchAsyncData = useAsyncData('search', async () => {
+    selected.value = null;
+    if (queryValidation.value !== undefined) {
+        return [];
+    }
+    return await $fetch('/api/search', {
+        query: {
+            query: debouncedQuery.value,
+        },
+    });
+}, {
+    watch: [debouncedQuery],
+});
+
+const isLoading = computed(() => {
+    return queryValidation.value === undefined &&
+        (normalisedQuery.value !== debouncedQuery.value || searchAsyncData.status.value === 'pending');
+});
+
+const hasNoResults = computed(() => {
+    return !isLoading.value && searchAsyncData.data.value?.length === 0;
+});
+
+onKeyStroke('k', (event) => {
+    const isCtrlKeyPressed = isMac.value ? event.metaKey : event.ctrlKey;
+    if (isCtrlKeyPressed) {
+        event.preventDefault();
+        open();
+    }
+});
+
+const selected = ref<number | null>(null);
+const router = useRouter();
+onKeyStroke('ArrowDown', () => {
+    selected.value = Math.min(
+        (selected.value ?? -1) + 1,
+        (searchAsyncData.data?.value?.length ?? 0) - 1,
+    );
+});
+onKeyStroke('ArrowUp', () => {
+    selected.value = Math.max(
+        (selected.value ?? -1) - 1,
+        0,
+    );
+});
+onKeyStroke('Enter', () => {
+    if (selected.value === null) {
+        return;
+    }
+
+    const document = searchAsyncData.data.value?.[selected.value];
+    if (!document) {
+        return;
+    }
+
+    router.push(document.url);
+    emit('selected');
+});
+
+const reset = () => {
+    query.value = '';
+    searchAsyncData.clear();
+    selected.value = null;
+};
+
+defineExpose({ reset });
+</script>
+
+<template>
+    <div class="input-group mb-4">
+        <span class="input-group-text">
+            <Spinner v-if="isLoading" size="1.25em" />
+            <Icon v-else v="search" />
+        </span>
+        <input
+            v-model="query"
+            type="search"
+            autofocus
+            class="form-control border-primary"
+            :placeholder="$t('crud.search')"
+        >
+        <button class="btn btn-outline-danger" @click="emit('selected')">
+            <Icon v="times" />
+        </button>
+    </div>
+    <div v-if="queryValidation !== undefined" class="alert alert-info">
+        <T>search.{{ queryValidation }}</T>
+    </div>
+    <ul
+        v-else-if="searchAsyncData.data.value?.length ?? 0 > 0"
+        class="list-group"
+    >
+        <li
+            v-for="(document, index) of searchAsyncData.data.value"
+            :key="`${document.kind}-${document.id}`"
+            :class="['list-group-item list-group-item-action py-0 pe-0', selected === index ? 'list-group-item-active' : '']"
+        >
+            <SearchItem :document="document" @click="emit('selected')" />
+        </li>
+    </ul>
+    <div v-else-if="hasNoResults" class="alert alert-info">
+        <T :params="{ query }">search.noResults</T>
+    </div>
+</template>

From 31d57ef7afc2e0120f0a7f69d8d34b3f94bef7e5 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 15 Apr 2025 11:19:16 +0200
Subject: [PATCH 42/45] (search) open external links in a new tab, fix keyboard
 navigation for external links

---
 components/search/SearchForm.vue | 7 ++++---
 components/search/SearchItem.vue | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/search/SearchForm.vue b/components/search/SearchForm.vue
index 8c63366bb..a60d233e5 100644
--- a/components/search/SearchForm.vue
+++ b/components/search/SearchForm.vue
@@ -49,7 +49,7 @@ onKeyStroke('k', (event) => {
 });
 
 const selected = ref<number | null>(null);
-const router = useRouter();
+const searchItems = useTemplateRef('searchItems');
 onKeyStroke('ArrowDown', () => {
     selected.value = Math.min(
         (selected.value ?? -1) + 1,
@@ -72,8 +72,8 @@ onKeyStroke('Enter', () => {
         return;
     }
 
-    router.push(document.url);
-    emit('selected');
+    const link = searchItems.value?.[selected.value]?.firstElementChild as HTMLElement | undefined;
+    link?.click();
 });
 
 const reset = () => {
@@ -112,6 +112,7 @@ defineExpose({ reset });
         <li
             v-for="(document, index) of searchAsyncData.data.value"
             :key="`${document.kind}-${document.id}`"
+            ref="searchItems"
             :class="['list-group-item list-group-item-action py-0 pe-0', selected === index ? 'list-group-item-active' : '']"
         >
             <SearchItem :document="document" @click="emit('selected')" />
diff --git a/components/search/SearchItem.vue b/components/search/SearchItem.vue
index a6c2ac0ef..273abfdc4 100644
--- a/components/search/SearchItem.vue
+++ b/components/search/SearchItem.vue
@@ -31,7 +31,7 @@ const searchKindHasImage = computed(() => {
 </script>
 
 <template>
-    <nuxt-link :to="document.url" class="search-item d-block p-3 text-dark text-decoration-none">
+    <PotentiallyExternalLink :to="document.url" class="search-item d-block p-3 text-dark text-decoration-none">
         <div class="h3 mb-3">
             <Icon :v="icon" />
             <Spelling :text="document.title" />
@@ -67,7 +67,7 @@ const searchKindHasImage = computed(() => {
             </div>
         </div>
         <Spelling v-else :text="document.content" />
-    </nuxt-link>
+    </PotentiallyExternalLink>
 </template>
 
 <style scoped lang="scss">

From 0638a7e0f0e6f203376927c751d863431aabdaa8 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 15 Apr 2025 11:26:24 +0200
Subject: [PATCH 43/45] (de)(trans)

---
 locale/de/translations.suml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/locale/de/translations.suml b/locale/de/translations.suml
index 1b657ee69..6cf85106e 100644
--- a/locale/de/translations.suml
+++ b/locale/de/translations.suml
@@ -936,6 +936,22 @@ profile:
             action: 'Entferne dich selber'
             confirm: 'Bist du sicher, dass du dein Profil von dem Umfeld von @%username% entfernen möchtest?'
         add: 'Personen zu deinem Umfeld hinzufügen'
+    blocks:
+        header: 'Blockierte Accounts'
+        action: 'Blockiere diese Person'
+        confirm: >
+            Bist du sicher, dass du @%username% blockieren möchtest?
+            Ihr werdet nicht mehr gegenseitig eure Profile sehen
+            oder euch gegenseitig zu eurem Umfeld hinzufügen können.
+            Die Blockierung kann später in deiner Accountseite aufgehoben werden.
+        unblock:
+            action: 'Blockierung aufheben'
+            confirm: >
+                Bist du sicher, dass du @%username% nicht mehr blockieren möchtest?
+                Ihr werdet wieder gegenseitig eure Profile ansehen
+                und euch gegenseitig zu eurem Umfeld hinzufügen können.
+        empty: 'Du hast derzeit keine Personen blockiert.'
+        instruction: 'Du kannst Personen blockieren, wenn du deren Profil besuchst.'
     timezone:
         header: 'Zeitzone'
         placeholder: 'Wähle deine Zeitzone'

From 6ef00ba113bda5a41604cbb57de55627dcbd4c77 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 15 Apr 2025 15:43:12 +0200
Subject: [PATCH 44/45] (fix) do not error on empty contents for popovers

---
 components/Popover.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/Popover.vue b/components/Popover.vue
index 1f216b628..4d8d3313d 100644
--- a/components/Popover.vue
+++ b/components/Popover.vue
@@ -45,11 +45,11 @@ const { floatingStyles, placement: calculatedPlacement, middlewareData } = useFl
 const visible = ref(false);
 
 const slots = defineSlots<{
-    default(): VNode;
-    content(): VNode[];
+    default: () => VNode;
+    content?: () => VNode[];
 }>();
 const hasContent = computed((): boolean => {
-    return !!slots.content()[0];
+    return !!slots.content?.()[0];
 });
 
 const arrowStyles = computed((): CSSProperties | undefined => {

From a5c8702b4f521e63dc12c772e39550a3776194ce Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Tue, 15 Apr 2025 16:18:49 +0200
Subject: [PATCH 45/45] (a11y) make search button focusable

---
 components/Header.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/Header.vue b/components/Header.vue
index f1bf49188..e16422ab4 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -306,7 +306,7 @@ const dismissCensus = (): void => {
                         </template>
                     </PotentiallyExternalLink>
                 </template>
-                <span class="nav-item btn btn-sm position-relative" @click="searchDialogue?.open()">
+                <button type="button" class="nav-item nav-header btn btn-sm position-relative" @click="searchDialogue?.open()">
                     <span style="position: absolute; right: 0.1em; top: 0.1em; opacity: 0.7; z-index: -1">
                         <ClientOnly>
                             <kbd class="bg-light text-dark border">{{ isMac ? '⌘K' : 'Ctrl+K' }}</kbd>
@@ -315,7 +315,7 @@ const dismissCensus = (): void => {
                     <Icon v="search" :size="1.6" />
                     <br>
                     <T>search.header</T>
-                </span>
+                </button>
                 <div class="nav-item flex-grow-0" @mouseenter="hoverItem = null">
                     <VersionDropdown end />
                 </div>
@@ -370,10 +370,10 @@ const dismissCensus = (): void => {
                                 <Spelling :text="link.textLong || link.text" />
                             </PotentiallyExternalLink>
                         </template>
-                        <span class="btn btn-sm" @click="searchDialogue?.open()">
+                        <button type="button" class="btn btn-sm" @click="searchDialogue?.open()">
                             <Icon v="search" />
                             <T>search.header</T>
-                        </span>
+                        </button>
                     </div>
                 </div>
             </div>