diff --git a/src/app/components/ClientCard/LastSeen.vue b/src/app/components/ClientCard/LastSeen.vue
index 94d699e7..c6828793 100644
--- a/src/app/components/ClientCard/LastSeen.vue
+++ b/src/app/components/ClientCard/LastSeen.vue
@@ -1,7 +1,11 @@
 <template>
   <span
     v-if="client.latestHandshakeAt"
-    :title="$t('client.lastSeen') + $d(new Date(client.latestHandshakeAt))"
+    :title="
+      $t('client.lastSeen', {
+        date: $d(new Date(client.latestHandshakeAt)),
+      })
+    "
   >
     {{ lastSeen }}
   </span>
diff --git a/src/app/components/ClientCard/Name.vue b/src/app/components/ClientCard/Name.vue
index 54c92a33..467fe737 100644
--- a/src/app/components/ClientCard/Name.vue
+++ b/src/app/components/ClientCard/Name.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="break-all text-sm text-gray-700 md:text-base dark:text-neutral-200"
-    :title="$t('client.createdOn') + $d(new Date(client.createdAt))"
+    :title="$t('client.createdOn', { date: $d(new Date(client.createdAt)) })"
   >
     {{ client.name }}
   </div>
diff --git a/src/app/components/ClientCard/Transfer.vue b/src/app/components/ClientCard/Transfer.vue
index 53574c78..fdb3804e 100644
--- a/src/app/components/ClientCard/Transfer.vue
+++ b/src/app/components/ClientCard/Transfer.vue
@@ -3,7 +3,7 @@
   <div v-if="client.transferTx" class="min-w-20 md:min-w-24">
     <span
       class="flex gap-1"
-      :title="$t('client.totalDownload') + bytes(client.transferTx)"
+      :title="$t('client.totalDownload', { total: bytes(client.transferTx) })"
     >
       <IconsArrowDown class="mt-0.5 inline h-3 align-middle" />
       <div>
@@ -22,7 +22,7 @@
   <div v-if="client.transferRx" class="min-w-20 md:min-w-24">
     <span
       class="flex gap-1"
-      :title="$t('client.totalUpload') + bytes(client.transferRx)"
+      :title="$t('client.totalUpload', { total: bytes(client.transferRx) })"
     >
       <IconsArrowUp class="mt-0.5 inline h-3 align-middle" />
       <div>
diff --git a/src/app/components/Clients/DeleteDialog.vue b/src/app/components/Clients/DeleteDialog.vue
index 651b17ce..b11ea026 100644
--- a/src/app/components/Clients/DeleteDialog.vue
+++ b/src/app/components/Clients/DeleteDialog.vue
@@ -3,9 +3,11 @@
     <template #trigger><slot /></template>
     <template #title>{{ $t('client.deleteClient') }}</template>
     <template #description>
-      {{ $t('client.deleteDialog1') }}
-      <strong>{{ clientName }}</strong
-      >? {{ $t('client.deleteDialog2') }}
+      <i18n-t keypath="client.deleteDialog">
+        <template #name>
+          <strong>{{ clientName }}</strong>
+        </template>
+      </i18n-t>
     </template>
     <template #actions>
       <DialogClose as-child>
diff --git a/src/app/components/Ui/LoginOauthButton.vue b/src/app/components/Ui/LoginOauthButton.vue
index 9a46075b..8346b471 100644
--- a/src/app/components/Ui/LoginOauthButton.vue
+++ b/src/app/components/Ui/LoginOauthButton.vue
@@ -5,7 +5,7 @@
   >
     <IconsBrandsProvider :provider="provider" class="h-4 w-4" />
     <span>
-      {{ $t('login.signInWith', [info.friendlyName]) }}
+      {{ $t('login.signInWith', { provider: info.friendlyName }) }}
     </span>
   </a>
 </template>
diff --git a/src/app/pages/me.vue b/src/app/pages/me.vue
index 52a666e6..dea6c800 100644
--- a/src/app/pages/me.vue
+++ b/src/app/pages/me.vue
@@ -125,7 +125,11 @@
                   class="h-4 w-4"
                 />
                 <span>
-                  {{ $t('me.linkedWith', [oauthProviderInfo.friendlyName]) }}
+                  {{
+                    $t('me.linkedWith', {
+                      provider: oauthProviderInfo.friendlyName,
+                    })
+                  }}
                 </span>
               </div>
               <div>
diff --git a/src/i18n/locales/bg.json b/src/i18n/locales/bg.json
index a79b2bef..63cd4270 100644
--- a/src/i18n/locales/bg.json
+++ b/src/i18n/locales/bg.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Дата, след която клиентът ще бъде деактивиран. Празно = постоянен",
     "delete": "Изтрий",
     "deleteClient": "Изтрий клиент",
-    "deleteDialog1": "Сигурен ли си, че искаш да изтриеш",
-    "deleteDialog2": "Това действие е необратимо.",
+    "deleteDialog": "Сигурен ли си, че искаш да изтриеш {name}? Това действие е необратимо.",
     "enabled": "Активен",
     "address": "Адрес",
     "serverAllowedIps": "Разрешени IP-та от сървъра",
     "otlDesc": "Генерирай кратък еднократен линк",
     "permanent": "Постоянно",
-    "createdOn": "Създаден на ",
-    "lastSeen": "Последно видян на ",
-    "totalDownload": "Общо изтеглени: ",
-    "totalUpload": "Общо качени: ",
+    "createdOn": "Създаден на {date}",
+    "lastSeen": "Последно видян на {date}",
+    "totalDownload": "Общо изтеглени: {total}",
+    "totalUpload": "Общо качени: {total}",
     "newClient": "Нов клиент",
     "disableClient": "Деактивирай клиент",
     "enableClient": "Активирай клиент",
@@ -181,13 +180,13 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} е задължително",
-      "validNumber": "{0} трябва да е валидно число",
-      "validString": "{0} трябва да е валиден текст",
-      "validBoolean": "{0} трябва да е валидна булева стойност",
-      "validArray": "{0} трябва да е валиден масив",
-      "stringMin": "{0} трябва да съдържа поне {1} символа",
-      "numberMin": "{0} трябва да е поне {1}"
+      "required": "{field} е задължително",
+      "validNumber": "{field} трябва да е валидно число",
+      "validString": "{field} трябва да е валиден текст",
+      "validBoolean": "{field} трябва да е валидна булева стойност",
+      "validArray": "{field} трябва да е валиден масив",
+      "stringMin": "{field} трябва да съдържа поне {min} символа",
+      "numberMin": "{field} трябва да е поне {min}"
     },
     "client": {
       "id": "ID на клиента",
diff --git a/src/i18n/locales/bn.json b/src/i18n/locales/bn.json
index e8868342..e2b26eb5 100644
--- a/src/i18n/locales/bn.json
+++ b/src/i18n/locales/bn.json
@@ -89,17 +89,16 @@
     "expireDate": "মেয়াদ শেষের তারিখ",
     "expireDateDesc": "যেদিন ক্লায়েন্ট নিষ্ক্রিয় হবে। স্থায়ী করতে ফাঁকা রাখুন",
     "deleteClient": "ক্লায়েন্ট মুছে ফেলুন",
-    "deleteDialog1": "আপনি কি নিশ্চিতভাবে মুছে ফেলতে চান",
-    "deleteDialog2": "এই কাজটি পূর্বাবস্থায় ফেরানো যাবে না।",
+    "deleteDialog": "আপনি কি নিশ্চিতভাবে {name} মুছে ফেলতে চান? এই কাজটি পূর্বাবস্থায় ফেরানো যাবে না।",
     "enabled": "সক্রিয়",
     "address": "ঠিকানা",
     "serverAllowedIps": "সার্ভার অনুমোদিত IPs",
     "otlDesc": "সংক্ষিপ্ত একবারের লিঙ্ক তৈরি করুন",
     "permanent": "স্থায়ী",
-    "createdOn": "তৈরি হয়েছে",
-    "lastSeen": "শেষ দেখা হয়েছে",
-    "totalDownload": "মোট ডাউনলোড: ",
-    "totalUpload": "মোট আপলোড: ",
+    "createdOn": "তৈরি হয়েছে: {date}",
+    "lastSeen": "শেষ দেখা হয়েছে: {date}",
+    "totalDownload": "মোট ডাউনলোড: {total}",
+    "totalUpload": "মোট আপলোড: {total}",
     "newClient": "নতুন ক্লায়েন্ট",
     "disableClient": "ক্লায়েন্ট নিষ্ক্রিয় করুন",
     "enableClient": "ক্লায়েন্ট সক্রিয় করুন",
@@ -177,13 +176,13 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} আবশ্যক",
-      "validNumber": "{0} একটি বৈধ সংখ্যা হতে হবে",
-      "validString": "{0} একটি বৈধ স্ট্রিং হতে হবে",
-      "validBoolean": "{0} একটি বৈধ বুলিয়ান হতে হবে",
-      "validArray": "{0} একটি বৈধ অ্যারে হতে হবে",
-      "stringMin": "{0} কমপক্ষে {1} অক্ষর হতে হবে",
-      "numberMin": "{0} কমপক্ষে {1} হতে হবে"
+      "required": "{field} আবশ্যক",
+      "validNumber": "{field} একটি বৈধ সংখ্যা হতে হবে",
+      "validString": "{field} একটি বৈধ স্ট্রিং হতে হবে",
+      "validBoolean": "{field} একটি বৈধ বুলিয়ান হতে হবে",
+      "validArray": "{field} একটি বৈধ অ্যারে হতে হবে",
+      "stringMin": "{field} কমপক্ষে {min} অক্ষর হতে হবে",
+      "numberMin": "{field} কমপক্ষে {min} হতে হবে"
     },
     "client": {
       "id": "ক্লায়েন্ট আইডি",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 68fdcd14..5aa6f610 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Datum, kdy bude klient deaktivován. Ponechte prázdné pro trvalý přístup.",
     "delete": "Smazat",
     "deleteClient": "Smazat klienta",
-    "deleteDialog1": "Opravdu chcete smazat uživatele",
-    "deleteDialog2": "Tuto akci nelze vzít zpět.",
+    "deleteDialog": "Opravdu chcete smazat klienta {name}? Tuto akci nelze vzít zpět.",
     "enabled": "Aktivní",
     "address": "Adresa",
     "serverAllowedIps": "Povolené IP adresy serveru",
     "otlDesc": "Generovat krátký jednorázový odkaz",
     "permanent": "Trvalý",
-    "createdOn": "Vytvořeno dne ",
-    "lastSeen": "Naposledy viděn ",
-    "totalDownload": "Celkem staženo: ",
-    "totalUpload": "Celkem nahráno: ",
+    "createdOn": "Vytvořeno dne {date}",
+    "lastSeen": "Naposledy viděn {date}",
+    "totalDownload": "Celkem staženo: {total}",
+    "totalUpload": "Celkem nahráno: {total}",
     "newClient": "Nový klient",
     "disableClient": "Deaktivovat klienta",
     "enableClient": "Aktivovat klienta",
@@ -181,14 +180,14 @@
   },
   "zod": {
     "generic": {
-      "required": "Pole {0} je povinné",
-      "validNumber": "{0} musí být platné číslo",
-      "validNumberRange": "{0} musí být platné číslo nebo rozsah čísel",
-      "validString": "{0} musí být platný řetězec",
-      "validBoolean": "{0} musí být platná logická hodnota",
-      "validArray": "{0} musí být platné pole",
-      "stringMin": "{0} musí mít alespoň {1} znak(ů)",
-      "numberMin": "{0} musí být alespoň {1}"
+      "required": "Pole {field} je povinné",
+      "validNumber": "{field} musí být platné číslo",
+      "validNumberRange": "{field} musí být platné číslo nebo rozsah čísel",
+      "validString": "{field} musí být platný řetězec",
+      "validBoolean": "{field} musí být platná logická hodnota",
+      "validArray": "{field} musí být platné pole",
+      "stringMin": "{field} musí mít alespoň {min} znak(ů)",
+      "numberMin": "{field} musí být alespoň {min}"
     },
     "client": {
       "id": "ID klienta",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 4ab9a0cf..fc809566 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "Geben Sie Ihr Passwort ein, um die Zwei-Faktor-Authentifizierung zu deaktivieren.",
     "linkOauth": "Konto mit einem externen Anbieter verknüpfen",
     "unlinkOauth": "Verknüpfung aufheben",
-    "linkedWith": "Mit {0} verknüpft",
+    "linkedWith": "Mit {provider} verknüpft",
     "providerDisabled": "Der derzeit verknüpfte Anbieter ist nicht aktiviert"
   },
   "general": {
@@ -78,7 +78,7 @@
   },
   "login": {
     "signIn": "Anmelden",
-    "signInWith": "Mit {0} anmelden",
+    "signInWith": "Mit {provider} anmelden",
     "or": "oder",
     "rememberMe": "Angemeldet bleiben",
     "rememberMeDesc": "Bleiben Sie auch nach dem Schließen des Browsers angemeldet",
@@ -99,17 +99,16 @@
     "expireDateDesc": "Datum, an dem der Client deaktiviert wird. Leer lassen für dauerhaft aktiv.",
     "delete": "Löschen",
     "deleteClient": "Client löschen",
-    "deleteDialog1": "Sind Sie sicher, dass Sie diesen Client löschen möchten",
-    "deleteDialog2": "Diese Aktion kann nicht rückgängig gemacht werden.",
+    "deleteDialog": "Möchten Sie {name} wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.",
     "enabled": "Aktiviert",
     "address": "Adresse",
     "serverAllowedIps": "Serverseitig erlaubte IP-Adressen",
     "otlDesc": "Einen kurzen Einmal-Link erzeugen",
     "permanent": "Dauerhaft",
-    "createdOn": "Erstellt am ",
-    "lastSeen": "Zuletzt verbunden am ",
-    "totalDownload": "Gesamt-Download: ",
-    "totalUpload": "Gesamt-Upload: ",
+    "createdOn": "Erstellt am {date}",
+    "lastSeen": "Zuletzt verbunden am {date}",
+    "totalDownload": "Gesamt-Download: {total}",
+    "totalUpload": "Gesamt-Upload: {total}",
     "newClient": "Neuer Client",
     "disableClient": "Client deaktivieren",
     "enableClient": "Client aktivieren",
@@ -200,16 +199,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} ist erforderlich",
-      "validNumber": "{0} muss eine Zahl sein",
-      "validNumberRange": "{0} muss eine gültige Zahl oder ein gültiger Zahlenbereich sein",
-      "validString": "{0} muss eine Zeichenkette sein",
-      "validBoolean": "{0} muss ein Wahrheitswert sein",
-      "validArray": "{0} muss eine Liste sein",
-      "stringMin": "{0} muss mindestens {1} Zeichen lang sein",
-      "stringMax": "{0} darf höchstens {1} Zeichen lang sein",
-      "numberMin": "{0} muss mindestens {1} sein",
-      "numberMax": "{0} darf höchstens {1} sein"
+      "required": "{field} ist erforderlich",
+      "validNumber": "{field} muss eine Zahl sein",
+      "validNumberRange": "{field} muss eine gültige Zahl oder ein gültiger Zahlenbereich sein",
+      "validString": "{field} muss eine Zeichenkette sein",
+      "validBoolean": "{field} muss ein Wahrheitswert sein",
+      "validArray": "{field} muss eine Liste sein",
+      "stringMin": "{field} muss mindestens {min} Zeichen lang sein",
+      "stringMax": "{field} darf höchstens {max} Zeichen lang sein",
+      "numberMin": "{field} muss mindestens {min} sein",
+      "numberMax": "{field} darf höchstens {max} sein"
     },
     "client": {
       "id": "Client-ID",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index b5c55446..ffc60cff 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "Enter your password to disable Two Factor Authentication.",
     "linkOauth": "Link your account with an external provider",
     "unlinkOauth": "Unlink",
-    "linkedWith": "Linked with {0}",
+    "linkedWith": "Linked with {provider}",
     "providerDisabled": "Your currently linked provider is not enabled"
   },
   "general": {
@@ -78,7 +78,7 @@
   },
   "login": {
     "signIn": "Sign In",
-    "signInWith": "Sign in with {0}",
+    "signInWith": "Sign in with {provider}",
     "or": "or",
     "rememberMe": "Remember me",
     "rememberMeDesc": "Stay logged after closing the browser",
@@ -99,17 +99,16 @@
     "expireDateDesc": "Date the client will be disabled. Blank for permanent",
     "delete": "Delete",
     "deleteClient": "Delete Client",
-    "deleteDialog1": "Are you sure you want to delete",
-    "deleteDialog2": "This action cannot be undone.",
+    "deleteDialog": "Are you sure you want to delete {name}? This action cannot be undone.",
     "enabled": "Enabled",
     "address": "Address",
     "serverAllowedIps": "Server Allowed IPs",
     "otlDesc": "Generate short one time link",
     "permanent": "Permanent",
-    "createdOn": "Created on ",
-    "lastSeen": "Last seen on ",
-    "totalDownload": "Total Download: ",
-    "totalUpload": "Total Upload: ",
+    "createdOn": "Created on {date}",
+    "lastSeen": "Last seen on {date}",
+    "totalDownload": "Total Download: {total}",
+    "totalUpload": "Total Upload: {total}",
     "newClient": "New Client",
     "disableClient": "Disable Client",
     "enableClient": "Enable Client",
@@ -200,16 +199,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} is required",
-      "validNumber": "{0} must be a valid number",
-      "validNumberRange": "{0} must be a valid number or number range",
-      "validString": "{0} must be a valid string",
-      "validBoolean": "{0} must be a valid boolean",
-      "validArray": "{0} must be a valid array",
-      "stringMin": "{0} must be at least {1} Character",
-      "stringMax": "{0} must be at most {1} Character",
-      "numberMin": "{0} must be at least {1}",
-      "numberMax": "{0} must be at most {1}"
+      "required": "{field} is required",
+      "validNumber": "{field} must be a valid number",
+      "validNumberRange": "{field} must be a valid number or number range",
+      "validString": "{field} must be a valid string",
+      "validBoolean": "{field} must be a valid boolean",
+      "validArray": "{field} must be a valid array",
+      "stringMin": "{field} must be at least {min} Character",
+      "stringMax": "{field} must be at most {max} Character",
+      "numberMin": "{field} must be at least {min}",
+      "numberMax": "{field} must be at most {max}"
     },
     "client": {
       "id": "Client ID",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index e492f236..9e91c540 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -89,17 +89,16 @@
     "expireDate": "Fecha de expiración",
     "expireDateDesc": "Fecha en que el cliente será desactivado. En blanco = permanente",
     "deleteClient": "Eliminar cliente",
-    "deleteDialog1": "¿Estás seguro de que deseas eliminar a",
-    "deleteDialog2": "Esta acción no se puede deshacer.",
+    "deleteDialog": "¿Estás seguro de que deseas eliminar a {name}? Esta acción no se puede deshacer.",
     "enabled": "Habilitado",
     "address": "Dirección",
     "serverAllowedIps": "IPs permitidas del servidor",
     "otlDesc": "Generar enlace único de un solo uso",
     "permanent": "Permanente",
-    "createdOn": "Creado el ",
-    "lastSeen": "Última conexión el ",
-    "totalDownload": "Descarga total: ",
-    "totalUpload": "Subida total: ",
+    "createdOn": "Creado el {date}",
+    "lastSeen": "Última conexión el {date}",
+    "totalDownload": "Descarga total: {total}",
+    "totalUpload": "Subida total: {total}",
     "newClient": "Nuevo cliente",
     "disableClient": "Desactivar cliente",
     "enableClient": "Activar cliente",
@@ -188,14 +187,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} es obligatorio",
-      "validNumber": "{0} debe ser un número válido",
-      "validNumberRange": "{0} debe ser un número válido o un rango de números",
-      "validString": "{0} debe ser una cadena válida",
-      "validBoolean": "{0} debe ser un booleano válido",
-      "validArray": "{0} debe ser una lista válida",
-      "stringMin": "{0} debe tener al menos {1} caracteres",
-      "numberMin": "{0} debe ser al menos {1}"
+      "required": "{field} es obligatorio",
+      "validNumber": "{field} debe ser un número válido",
+      "validNumberRange": "{field} debe ser un número válido o un rango de números",
+      "validString": "{field} debe ser una cadena válida",
+      "validBoolean": "{field} debe ser un booleano válido",
+      "validArray": "{field} debe ser una lista válida",
+      "stringMin": "{field} debe tener al menos {min} caracteres",
+      "numberMin": "{field} debe ser al menos {min}"
     },
     "client": {
       "id": "ID del cliente",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index ef46ac55..c15d45c2 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Date à laquelle le client sera désactivé. Vide pour permanent",
     "delete": "Supprimer",
     "deleteClient": "Supprimer le client",
-    "deleteDialog1": "Êtes-vous sûr de vouloir supprimer",
-    "deleteDialog2": "Cette action ne peut être annulée.",
+    "deleteDialog": "Êtes-vous sûr de vouloir supprimer {name} ? Cette action ne peut être annulée.",
     "enabled": "Activé",
     "address": "Adresse",
     "serverAllowedIps": "IPs autorisées par le serveur",
     "otlDesc": "Générer un lien court et unique",
     "permanent": "Permanent",
-    "createdOn": "Créé le ",
-    "lastSeen": "Dernière visite le ",
-    "totalDownload": "Téléchargement total : ",
-    "totalUpload": "Téléversement total : ",
+    "createdOn": "Créé le {date}",
+    "lastSeen": "Dernière visite le {date}",
+    "totalDownload": "Téléchargement total : {total}",
+    "totalUpload": "Téléversement total : {total}",
     "newClient": "Nouveau client",
     "disableClient": "Désactiver le client",
     "enableClient": "Activer le client",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} est requis",
-      "validNumber": "{0} doit être un nombre valide",
-      "validNumberRange": "{0} doit être un nombre ou une plage de nombres valide",
-      "validString": "{0} doit être une chaîne de caractères valide",
-      "validBoolean": "{0} doit être un booléen valide",
-      "validArray": "{0} doit être un tableau valide",
-      "stringMin": "{0} doit comporter au moins {1} caractère(s)",
-      "numberMin": "{0} doit être d'au moins {1}"
+      "required": "{field} est requis",
+      "validNumber": "{field} doit être un nombre valide",
+      "validNumberRange": "{field} doit être un nombre ou une plage de nombres valide",
+      "validString": "{field} doit être une chaîne de caractères valide",
+      "validBoolean": "{field} doit être un booléen valide",
+      "validArray": "{field} doit être un tableau valide",
+      "stringMin": "{field} doit comporter au moins {min} caractère(s)",
+      "numberMin": "{field} doit être d'au moins {min}"
     },
     "client": {
       "id": "ID du client",
diff --git a/src/i18n/locales/gl.json b/src/i18n/locales/gl.json
index ed811e8f..8ec588ca 100644
--- a/src/i18n/locales/gl.json
+++ b/src/i18n/locales/gl.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Data na que o cliente será desactivado. Déixao en branco para permanente",
     "delete": "Eliminar",
     "deleteClient": "Eliminar cliente",
-    "deleteDialog1": "Seguro que queres eliminar",
-    "deleteDialog2": "Esta acción non se pode desfacer.",
+    "deleteDialog": "Seguro que queres eliminar {name}? Esta acción non se pode desfacer.",
     "enabled": "Activado",
     "address": "Enderezo",
     "serverAllowedIps": "IP permitidas polo servidor",
     "otlDesc": "Xerar ligazón curta dun só uso",
     "permanent": "Permanente",
-    "createdOn": "Creado o ",
-    "lastSeen": "Visto por última vez o ",
-    "totalDownload": "Descarga total: ",
-    "totalUpload": "Subida total: ",
+    "createdOn": "Creado o {date}",
+    "lastSeen": "Visto por última vez o {date}",
+    "totalDownload": "Descarga total: {total}",
+    "totalUpload": "Subida total: {total}",
     "newClient": "Novo cliente",
     "disableClient": "Desactivar cliente",
     "enableClient": "Activar cliente",
@@ -188,14 +187,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} é obrigatorio",
-      "validNumber": "{0} debe ser un número válido",
-      "validNumberRange": "{0} debe ser un número válido ou un rango de números",
-      "validString": "{0} debe ser unha cadea válida",
-      "validBoolean": "{0} debe ser un booleano válido",
-      "validArray": "{0} debe ser un array válido",
-      "stringMin": "{0} debe ter polo menos {1} carácter",
-      "numberMin": "{0} debe ser polo menos {1}"
+      "required": "{field} é obrigatorio",
+      "validNumber": "{field} debe ser un número válido",
+      "validNumberRange": "{field} debe ser un número válido ou un rango de números",
+      "validString": "{field} debe ser unha cadea válida",
+      "validBoolean": "{field} debe ser un booleano válido",
+      "validArray": "{field} debe ser un array válido",
+      "stringMin": "{field} debe ter polo menos {min} carácter",
+      "numberMin": "{field} debe ser polo menos {min}"
     },
     "client": {
       "id": "ID do cliente",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index 2d9efdaf..517f2bfd 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "वह तिथि जिसके बाद क्लाइंट अक्षम हो जाएगा। स्थायी के लिए खाली छोड़ें",
     "delete": "हटाएं",
     "deleteClient": "क्लाइंट हटाएं",
-    "deleteDialog1": "क्या आप वाकई हटाना चाहते हैं",
-    "deleteDialog2": "यह क्रिया पूर्ववत नहीं की जा सकती।",
+    "deleteDialog": "क्या आप वाकई {name} को हटाना चाहते हैं? यह क्रिया पूर्ववत नहीं की जा सकती।",
     "enabled": "सक्षम",
     "address": "पता",
     "serverAllowedIps": "सर्वर द्वारा अनुमत IPs",
     "otlDesc": "छोटा एकबारगी लिंक उत्पन्न करें",
     "permanent": "स्थायी",
-    "createdOn": "बनाया गया ",
-    "lastSeen": "अंतिम बार देखा गया ",
-    "totalDownload": "कुल डाउनलोड: ",
-    "totalUpload": "कुल अपलोड: ",
+    "createdOn": "बनाया गया: {date}",
+    "lastSeen": "अंतिम बार देखा गया: {date}",
+    "totalDownload": "कुल डाउनलोड: {total}",
+    "totalUpload": "कुल अपलोड: {total}",
     "newClient": "नया क्लाइंट",
     "disableClient": "क्लाइंट अक्षम करें",
     "enableClient": "क्लाइंट सक्षम करें",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} आवश्यक है",
-      "validNumber": "{0} एक वैध संख्या होनी चाहिए",
-      "validNumberRange": "{0} एक वैध संख्या या संख्या श्रेणी होनी चाहिए",
-      "validString": "{0} एक वैध स्ट्रिंग होनी चाहिए",
-      "validBoolean": "{0} एक वैध बूलियन होना चाहिए",
-      "validArray": "{0} एक वैध ऐरे होना चाहिए",
-      "stringMin": "{0} कम से कम {1} अक्षर का होना चाहिए",
-      "numberMin": "{0} कम से कम {1} होना चाहिए"
+      "required": "{field} आवश्यक है",
+      "validNumber": "{field} एक वैध संख्या होनी चाहिए",
+      "validNumberRange": "{field} एक वैध संख्या या संख्या श्रेणी होनी चाहिए",
+      "validString": "{field} एक वैध स्ट्रिंग होनी चाहिए",
+      "validBoolean": "{field} एक वैध बूलियन होना चाहिए",
+      "validArray": "{field} एक वैध ऐरे होना चाहिए",
+      "stringMin": "{field} कम से कम {min} अक्षर का होना चाहिए",
+      "numberMin": "{field} कम से कम {min} होना चाहिए"
     },
     "client": {
       "id": "क्लाइंट ID",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index bda9ad64..f6ff4e9b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -89,17 +89,16 @@
     "expireDate": "Tanggal Kedaluwarsa",
     "expireDateDesc": "Tanggal klien akan dinonaktifkan. Kosongkan untuk opsi permanen.",
     "deleteClient": "Hapus Klien",
-    "deleteDialog1": "Apakah anda yakin ingin menghapus",
-    "deleteDialog2": "Tindakan ini tidak dapat dibatalkan.",
+    "deleteDialog": "Apakah Anda yakin ingin menghapus {name}? Tindakan ini tidak dapat dibatalkan.",
     "enabled": "Aktifkan",
     "address": "Alamat",
     "serverAllowedIps": "IP yang Diizinkan pada Server",
     "otlDesc": "Buat tautan sekali pakai singkat",
     "permanent": "Permanen",
-    "createdOn": "Dibuat pada ",
-    "lastSeen": "Terakhir terlihat pada ",
-    "totalDownload": "Total Unduhan: ",
-    "totalUpload": "Total Unggahan: ",
+    "createdOn": "Dibuat pada {date}",
+    "lastSeen": "Terakhir terlihat pada {date}",
+    "totalDownload": "Total Unduhan: {total}",
+    "totalUpload": "Total Unggahan: {total}",
     "newClient": "Klien Baru",
     "disableClient": "Nonaktifkan Klien",
     "enableClient": "Aktifkan Klien",
@@ -177,13 +176,13 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} diperlukan",
-      "validNumber": "{0} harus berupa angka yang valid",
-      "validString": "{0} harus berupa string yang valid",
-      "validBoolean": "{0} harus berupa boolean yang valid",
-      "validArray": "{0} harus berupa array yang valid",
-      "stringMin": "{0} harus memiliki setidaknya {1} karakter",
-      "numberMin": "{0} harus minimal {1}"
+      "required": "{field} diperlukan",
+      "validNumber": "{field} harus berupa angka yang valid",
+      "validString": "{field} harus berupa string yang valid",
+      "validBoolean": "{field} harus berupa boolean yang valid",
+      "validArray": "{field} harus berupa array yang valid",
+      "stringMin": "{field} harus memiliki setidaknya {min} karakter",
+      "numberMin": "{field} harus minimal {min}"
     },
     "client": {
       "id": "ID Klien",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index bf70a590..c94f8a0e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -89,17 +89,16 @@
     "expireDate": "Data di Scadenza",
     "expireDateDesc": "Data in cui il client verrà disabilitato. Lascia vuoto per permanente",
     "deleteClient": "Elimina Client",
-    "deleteDialog1": "Sei sicuro di voler eliminare",
-    "deleteDialog2": "Questa azione non può essere annullata.",
+    "deleteDialog": "Sei sicuro di voler eliminare {name}? Questa azione non può essere annullata.",
     "enabled": "Abilitato",
     "address": "Indirizzo",
     "serverAllowedIps": "IP consentiti dal Server",
     "otlDesc": "Genera link temporaneo monouso",
     "permanent": "Permanente",
-    "createdOn": "Creato il ",
-    "lastSeen": "Ultima connessione il ",
-    "totalDownload": "Download Totale: ",
-    "totalUpload": "Upload Totale: ",
+    "createdOn": "Creato il {date}",
+    "lastSeen": "Ultima connessione il {date}",
+    "totalDownload": "Download Totale: {total}",
+    "totalUpload": "Upload Totale: {total}",
     "newClient": "Nuovo Client",
     "disableClient": "Disabilita Client",
     "enableClient": "Abilita Client",
@@ -177,13 +176,13 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} è obbligatorio",
-      "validNumber": "{0} deve essere un numero valido",
-      "validString": "{0} deve essere una stringa valida",
-      "validBoolean": "{0} deve essere un valore booleano valido",
-      "validArray": "{0} deve essere un array valido",
-      "stringMin": "{0} deve contenere almeno {1} carattere",
-      "numberMin": "{0} deve essere almeno {1}"
+      "required": "{field} è obbligatorio",
+      "validNumber": "{field} deve essere un numero valido",
+      "validString": "{field} deve essere una stringa valida",
+      "validBoolean": "{field} deve essere un valore booleano valido",
+      "validArray": "{field} deve essere un array valido",
+      "stringMin": "{field} deve contenere almeno {min} carattere",
+      "numberMin": "{field} deve essere almeno {min}"
     },
     "client": {
       "id": "ID Client",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 1c457137..7bd4c94a 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "この日にクライアントが無効化されます。空欄の場合は無期限です",
     "delete": "削除",
     "deleteClient": "クライアントを削除",
-    "deleteDialog1": "削除してもよろしいですか",
-    "deleteDialog2": "この操作は元に戻せません。",
+    "deleteDialog": "{name}を削除してもよろしいですか？この操作は元に戻せません。",
     "enabled": "有効",
     "address": "アドレス",
     "serverAllowedIps": "サーバー許可 IP",
     "otlDesc": "短いワンタイムリンクを生成",
     "permanent": "無期限",
-    "createdOn": "作成日: ",
-    "lastSeen": "最終接続: ",
-    "totalDownload": "総ダウンロード: ",
-    "totalUpload": "総アップロード: ",
+    "createdOn": "作成日: {date}",
+    "lastSeen": "最終接続: {date}",
+    "totalDownload": "総ダウンロード: {total}",
+    "totalUpload": "総アップロード: {total}",
     "newClient": "新しいクライアント",
     "disableClient": "クライアントを無効化",
     "enableClient": "クライアントを有効化",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} は必須です",
-      "validNumber": "{0} は有効な数値である必要があります",
-      "validNumberRange": "{0} は有効な数値または数値範囲である必要があります",
-      "validString": "{0} は有効な文字列である必要があります",
-      "validBoolean": "{0} は有効な真偽値である必要があります",
-      "validArray": "{0} は有効な配列である必要があります",
-      "stringMin": "{0} は {1} 文字以上である必要があります",
-      "numberMin": "{0} は {1} 以上である必要があります"
+      "required": "{field} は必須です",
+      "validNumber": "{field} は有効な数値である必要があります",
+      "validNumberRange": "{field} は有効な数値または数値範囲である必要があります",
+      "validString": "{field} は有効な文字列である必要があります",
+      "validBoolean": "{field} は有効な真偽値である必要があります",
+      "validArray": "{field} は有効な配列である必要があります",
+      "stringMin": "{field} は {min} 文字以上である必要があります",
+      "numberMin": "{field} は {min} 以上である必要があります"
     },
     "client": {
       "id": "クライアント ID",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 0eff81f4..77df42c5 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "2단계 인증을 비활성화하려면 비밀번호를 입력하세요.",
     "linkOauth": "외부 공급자와 계정 연결",
     "unlinkOauth": "연결 해제",
-    "linkedWith": "{0}와(과) 연결됨",
+    "linkedWith": "{provider}와(과) 연결됨",
     "providerDisabled": "현재 연결된 공급자가 활성화되어 있지 않습니다"
   },
   "general": {
@@ -78,7 +78,7 @@
   },
   "login": {
     "signIn": "로그인",
-    "signInWith": "{0}(으)로 로그인",
+    "signInWith": "{provider}(으)로 로그인",
     "or": "또는",
     "rememberMe": "로그인 상태 유지",
     "rememberMeDesc": "브라우저를 닫은 후에도 로그인 유지",
@@ -99,17 +99,16 @@
     "expireDateDesc": "클라이언트가 비활성화되는 날짜. 영구적으로 사용하려면 비워 두세요",
     "delete": "삭제",
     "deleteClient": "클라이언트 삭제",
-    "deleteDialog1": "정말로 삭제하시겠습니까",
-    "deleteDialog2": "이 작업은 실행 취소할 수 없습니다.",
+    "deleteDialog": "{name} 클라이언트를 정말로 삭제하시겠습니까? 이 작업은 실행 취소할 수 없습니다.",
     "enabled": "활성화",
     "address": "주소",
     "serverAllowedIps": "서버 허용 IP",
     "otlDesc": "짧은 일회성 링크 생성",
     "permanent": "영구적",
-    "createdOn": "생성일: ",
-    "lastSeen": "마지막 접속: ",
-    "totalDownload": "총 다운로드: ",
-    "totalUpload": "총 업로드: ",
+    "createdOn": "생성일: {date}",
+    "lastSeen": "마지막 접속: {date}",
+    "totalDownload": "총 다운로드: {total}",
+    "totalUpload": "총 업로드: {total}",
     "newClient": "새 클라이언트",
     "disableClient": "클라이언트 비활성화",
     "enableClient": "클라이언트 활성화",
@@ -200,16 +199,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0}은(는) 필수입니다",
-      "validNumber": "{0}은(는) 유효한 숫자여야 합니다",
-      "validNumberRange": "{0}은(는) 유효한 숫자 또는 숫자 범위여야 합니다",
-      "validString": "{0}은(는) 유효한 문자열이어야 합니다",
-      "validBoolean": "{0}은(는) 유효한 불리언이어야 합니다",
-      "validArray": "{0}은(는) 유효한 배열이어야 합니다",
-      "stringMin": "{0}은(는) {1}자 이상이어야 합니다",
-      "stringMax": "{0}은(는) {1}자 이하여야 합니다",
-      "numberMin": "{0}은(는) {1} 이상이어야 합니다",
-      "numberMax": "{0}은(는) {1} 이하여야 합니다"
+      "required": "{field}은(는) 필수입니다",
+      "validNumber": "{field}은(는) 유효한 숫자여야 합니다",
+      "validNumberRange": "{field}은(는) 유효한 숫자 또는 숫자 범위여야 합니다",
+      "validString": "{field}은(는) 유효한 문자열이어야 합니다",
+      "validBoolean": "{field}은(는) 유효한 불리언이어야 합니다",
+      "validArray": "{field}은(는) 유효한 배열이어야 합니다",
+      "stringMin": "{field}은(는) {min}자 이상이어야 합니다",
+      "stringMax": "{field}은(는) {max}자 이하여야 합니다",
+      "numberMin": "{field}은(는) {min} 이상이어야 합니다",
+      "numberMax": "{field}은(는) {max} 이하여야 합니다"
     },
     "client": {
       "id": "클라이언트 ID",
diff --git a/src/i18n/locales/nb.json b/src/i18n/locales/nb.json
index 001ef65f..4b93dd9d 100644
--- a/src/i18n/locales/nb.json
+++ b/src/i18n/locales/nb.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Datoen klienten blir deaktivert. Tomt for permanent",
     "delete": "Slett",
     "deleteClient": "Slett klient",
-    "deleteDialog1": "Er du sikker på at du vil slette",
-    "deleteDialog2": "Denne handlingen kan ikke angres.",
+    "deleteDialog": "Er du sikker på at du vil slette {name}? Denne handlingen kan ikke angres.",
     "enabled": "Aktivert",
     "address": "Adresse",
     "serverAllowedIps": "Server tillatte IP-er",
     "otlDesc": "Generer kort engangslenke",
     "permanent": "Permanent",
-    "createdOn": "Opprettet ",
-    "lastSeen": "Sist sett ",
-    "totalDownload": "Totalt nedlastet: ",
-    "totalUpload": "Totalt opplastet: ",
+    "createdOn": "Opprettet {date}",
+    "lastSeen": "Sist sett {date}",
+    "totalDownload": "Totalt nedlastet: {total}",
+    "totalUpload": "Totalt opplastet: {total}",
     "newClient": "Ny klient",
     "disableClient": "Deaktiver klient",
     "enableClient": "Aktiver klient",
@@ -181,13 +180,13 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} er påkrevd",
-      "validNumber": "{0} må være et gyldig tall",
-      "validString": "{0} må være en gyldig streng",
-      "validBoolean": "{0} må være en gyldig boolsk verdi",
-      "validArray": "{0} må være en gyldig liste",
-      "stringMin": "{0} må være minst {1} tegn",
-      "numberMin": "{0} må være minst {1}"
+      "required": "{field} er påkrevd",
+      "validNumber": "{field} må være et gyldig tall",
+      "validString": "{field} må være en gyldig streng",
+      "validBoolean": "{field} må være en gyldig boolsk verdi",
+      "validArray": "{field} må være en gyldig liste",
+      "stringMin": "{field} må være minst {min} tegn",
+      "numberMin": "{field} må være minst {min}"
     },
     "client": {
       "id": "Klient-ID",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 9e4e9f7d..ba89171f 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "Voer uw wachtwoord in om de twee-factor-authenticatie uit te schakelen.",
     "linkOauth": "Koppel uw account met een externe provider",
     "unlinkOauth": "Ontkoppelen",
-    "linkedWith": "Gekoppeld met {0}",
+    "linkedWith": "Gekoppeld met {provider}",
     "providerDisabled": "Uw huidige gekoppelde provider is niet ingeschakeld"
   },
   "general": {
@@ -78,7 +78,7 @@
   },
   "login": {
     "signIn": "Inloggen",
-    "signInWith": "Sign in with {0}",
+    "signInWith": "Sign in with {provider}",
     "or": "or",
     "rememberMe": "Onthoud mij",
     "rememberMeDesc": "Ingelogd blijven na het sluiten van de browser",
@@ -99,17 +99,16 @@
     "expireDateDesc": "Datum waarop de cliënt wordt uitgeschakeld. Laat leeg voor permanent.",
     "delete": "Verwijderen",
     "deleteClient": "Cliënt verwijderen",
-    "deleteDialog1": "Weet u zeker dat u wilt verwijderen",
-    "deleteDialog2": "Deze actie kan niet ongedaan worden gemaakt.",
+    "deleteDialog": "Weet u zeker dat u {name} wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
     "enabled": "Ingeschakeld",
     "address": "Adres",
     "serverAllowedIps": "Toegestane IP's van de server",
     "otlDesc": "Korte eenmalige link genereren",
     "permanent": "Permanent",
-    "createdOn": "Aangemaakt op ",
-    "lastSeen": "Laatst gezien op ",
-    "totalDownload": "Totaal gedownload: ",
-    "totalUpload": "Totaal geüpload: ",
+    "createdOn": "Aangemaakt op {date}",
+    "lastSeen": "Laatst gezien op {date}",
+    "totalDownload": "Totaal gedownload: {total}",
+    "totalUpload": "Totaal geüpload: {total}",
     "newClient": "Nieuwe cliënt",
     "disableClient": "Cliënt uitschakelen",
     "enableClient": "Cliënt inschakelen",
@@ -198,16 +197,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} is vereist",
-      "validNumber": "{0} moet een geldig getal zijn",
-      "validNumberRange": "{0} moet een geldig getal of bereik zijn",
-      "validString": "{0} moet een geldige tekenreeks zijn",
-      "validBoolean": "{0} moet een geldige boolean zijn",
-      "validArray": "{0} moet een geldige array zijn",
-      "stringMin": "{0} moet minstens {1} teken bevatten",
-      "stringMax": "{0} mag maximaal {1} tekens bevatten",
-      "numberMin": "{0} moet minstens {1} zijn",
-      "numberMax": "{0} mag maximaal {1} zijn"
+      "required": "{field} is vereist",
+      "validNumber": "{field} moet een geldig getal zijn",
+      "validNumberRange": "{field} moet een geldig getal of bereik zijn",
+      "validString": "{field} moet een geldige tekenreeks zijn",
+      "validBoolean": "{field} moet een geldige boolean zijn",
+      "validArray": "{field} moet een geldige array zijn",
+      "stringMin": "{field} moet minstens {min} teken bevatten",
+      "stringMax": "{field} mag maximaal {max} tekens bevatten",
+      "numberMin": "{field} moet minstens {min} zijn",
+      "numberMax": "{field} mag maximaal {max} zijn"
     },
     "client": {
       "id": "Cliënt-ID",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index be500131..c2015e37 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -91,17 +91,16 @@
     "expireDateDesc": "Data, w której klient zostanie wyłączony. Pozostaw puste dla bezterminowego dostępu",
     "delete": "Usuń",
     "deleteClient": "Usuń klienta",
-    "deleteDialog1": "Czy na pewno chcesz usunąć klienta",
-    "deleteDialog2": "Tej operacji nie można cofnąć.",
+    "deleteDialog": "Czy na pewno chcesz usunąć klienta {name}? Tej operacji nie można cofnąć.",
     "enabled": "Włączony",
     "address": "Adres",
     "serverAllowedIps": "Dozwolone adresy IP serwera",
     "otlDesc": "Generuj krótki link jednorazowy",
     "permanent": "Stały",
-    "createdOn": "Utworzono: ",
-    "lastSeen": "Ostatnio widziany: ",
-    "totalDownload": "Pobieranie łącznie: ",
-    "totalUpload": "Wysyłanie łącznie: ",
+    "createdOn": "Utworzono: {date}",
+    "lastSeen": "Ostatnio widziany: {date}",
+    "totalDownload": "Pobieranie łącznie: {total}",
+    "totalUpload": "Wysyłanie łącznie: {total}",
     "newClient": "Nowy klient",
     "disableClient": "Wyłącz klienta",
     "enableClient": "Włącz klienta",
@@ -190,14 +189,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} jest wymagane",
-      "validNumber": "{0} musi być prawidłową liczbą",
-      "validNumberRange": "{0} musi być prawidłową liczbą lub zakresem liczb",
-      "validString": "{0} musi być prawidłowym ciągiem znaków",
-      "validBoolean": "{0} musi być prawidłową wartością logiczną",
-      "validArray": "{0} musi być prawidłową tablicą",
-      "stringMin": "{0} musi mieć co najmniej {1} znaków",
-      "numberMin": "{0} musi wynosić co najmniej {1}"
+      "required": "{field} jest wymagane",
+      "validNumber": "{field} musi być prawidłową liczbą",
+      "validNumberRange": "{field} musi być prawidłową liczbą lub zakresem liczb",
+      "validString": "{field} musi być prawidłowym ciągiem znaków",
+      "validBoolean": "{field} musi być prawidłową wartością logiczną",
+      "validArray": "{field} musi być prawidłową tablicą",
+      "stringMin": "{field} musi mieć co najmniej {min} znaków",
+      "numberMin": "{field} musi wynosić co najmniej {min}"
     },
     "client": {
       "id": "ID klienta",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index d99a4e29..242340ed 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -89,17 +89,16 @@
     "expireDate": "Data de expiração",
     "expireDateDesc": "Data em que o cliente será desativado. Em branco para permanente",
     "deleteClient": "Deletar cliente",
-    "deleteDialog1": "Tem certeza de que deseja excluir?",
-    "deleteDialog2": "Esta ação não pode ser desfeita.",
+    "deleteDialog": "Tem certeza de que deseja excluir {name}? Esta ação não pode ser desfeita.",
     "enabled": "Ativado",
     "address": "Endereço",
     "serverAllowedIps": "IPs permitidos do servidor",
     "otlDesc": "Gerar link curto e único",
     "permanent": "Permanente",
-    "createdOn": "Criado em ",
-    "lastSeen": "Visto pela última vez em",
-    "totalDownload": "Download total: ",
-    "totalUpload": "Upload total: ",
+    "createdOn": "Criado em {date}",
+    "lastSeen": "Visto pela última vez em {date}",
+    "totalDownload": "Download total: {total}",
+    "totalUpload": "Upload total: {total}",
     "newClient": "Novo cliente",
     "disableClient": "Desativar cliente",
     "enableClient": "Ativar cliente",
@@ -177,13 +176,13 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} é obrigatório",
-      "validNumber": "{0} deve ser um número válido",
-      "validString": "{0} deve ser uma string válida",
-      "validBoolean": "{0} deve ser um booleano válido",
-      "validArray": "{0} deve ser uma matriz válida",
-      "stringMin": "{0} deve ter pelo menos {1} caracteres",
-      "numberMin": "{0} deve ter pelo menos {1}"
+      "required": "{field} é obrigatório",
+      "validNumber": "{field} deve ser um número válido",
+      "validString": "{field} deve ser uma string válida",
+      "validBoolean": "{field} deve ser um booleano válido",
+      "validArray": "{field} deve ser uma matriz válida",
+      "stringMin": "{field} deve ter pelo menos {min} caracteres",
+      "numberMin": "{field} deve ter pelo menos {min}"
     },
     "client": {
       "id": "ID do cliente",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 5f94ae77..a4aa0291 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "Введите пароль, чтобы отключить двухфакторную аутентификацию.",
     "linkOauth": "Привязать аккаунт",
     "unlinkOauth": "Отвязать аккаунт",
-    "linkedWith": "Привязан к {0}",
+    "linkedWith": "Привязан к {provider}",
     "providerDisabled": "Этот способ входа сейчас недоступен"
   },
   "general": {
@@ -83,7 +83,7 @@
     "insecure": "Вы не можете войти по незащищённому соединению. Используйте HTTPS.",
     "2faRequired": "Требуется двухфакторная аутентификация",
     "2faWrong": "Неверный код двухфакторной аутентификации",
-    "signInWith": "Войти через {0}",
+    "signInWith": "Войти через {provider}",
     "or": "или",
     "loginExpired": "Срок действия сеанса истёк. Войдите снова."
   },
@@ -99,17 +99,16 @@
     "expireDateDesc": "Дата, когда клиент будет отключён. Оставьте пустым для бессрочного доступа",
     "delete": "Удалить",
     "deleteClient": "Удалить клиента",
-    "deleteDialog1": "Вы уверены, что хотите удалить",
-    "deleteDialog2": "Это действие нельзя отменить.",
+    "deleteDialog": "Вы уверены, что хотите удалить {name}? Это действие нельзя отменить.",
     "enabled": "Включён",
     "address": "Адрес",
     "serverAllowedIps": "Разрешённые IP‑адреса сервера",
     "otlDesc": "Сгенерировать короткую одноразовую ссылку",
     "permanent": "Бессрочный",
-    "createdOn": "Создан ",
-    "lastSeen": "Последнее подключение ",
-    "totalDownload": "Всего скачано: ",
-    "totalUpload": "Всего отправлено: ",
+    "createdOn": "Создан {date}",
+    "lastSeen": "Последнее подключение {date}",
+    "totalDownload": "Всего скачано: {total}",
+    "totalUpload": "Всего отправлено: {total}",
     "newClient": "Новый клиент",
     "disableClient": "Отключить клиента",
     "enableClient": "Включить клиента",
@@ -198,16 +197,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} обязательно для заполнения",
-      "validNumber": "{0} должно быть числом",
-      "validNumberRange": "{0} должно быть числом или диапазоном чисел",
-      "validString": "{0} должно быть строкой",
-      "validBoolean": "{0} должно быть логическим значением",
-      "validArray": "{0} должно быть массивом",
-      "stringMin": "{0} должно содержать не менее {1} символа",
-      "numberMin": "{0} должно быть не менее {1}",
-      "stringMax": "{0} должно содержать не более {1} символов",
-      "numberMax": "{0} должно быть не более {1}"
+      "required": "{field} обязательно для заполнения",
+      "validNumber": "{field} должно быть числом",
+      "validNumberRange": "{field} должно быть числом или диапазоном чисел",
+      "validString": "{field} должно быть строкой",
+      "validBoolean": "{field} должно быть логическим значением",
+      "validArray": "{field} должно быть массивом",
+      "stringMin": "{field} должно содержать не менее {min} символа",
+      "numberMin": "{field} должно быть не менее {min}",
+      "stringMax": "{field} должно содержать не более {max} символов",
+      "numberMax": "{field} должно быть не более {max}"
     },
     "client": {
       "id": "ID клиента",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index d9f6aa95..2860bb1f 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "2FA'yı kapatmak için şifrenizi girin.",
     "linkOauth": "Hesabınızı harici bir sağlayıcı ile bağlayın",
     "unlinkOauth": "Bağlantıyı Kaldır",
-    "linkedWith": "{0} ile bağlandı",
+    "linkedWith": "{provider} ile bağlandı",
     "providerDisabled": "Şu anda bağlı olan sağlayıcı etkin değil"
   },
   "general": {
@@ -78,7 +78,7 @@
   },
   "login": {
     "signIn": "Giriş Yap",
-    "signInWith": "{0} ile giriş yap",
+    "signInWith": "{provider} ile giriş yap",
     "or": "veya",
     "rememberMe": "Beni hatırla",
     "rememberMeDesc": "Oturumu açık tut",
@@ -99,17 +99,16 @@
     "expireDateDesc": "Boş bırakılırsa süresiz olur.",
     "delete": "Sil",
     "deleteClient": "İstemciyi Sil",
-    "deleteDialog1": "Silmek istediğinize emin misiniz",
-    "deleteDialog2": "Bu işlem geri alınamaz.",
+    "deleteDialog": "{name} istemcisini silmek istediğinize emin misiniz? Bu işlem geri alınamaz.",
     "enabled": "Aktif",
     "address": "Adres",
     "serverAllowedIps": "Sunucu İzin Verilen IP'leri",
     "otlDesc": "Tek seferlik kısa link oluştur",
     "permanent": "Süresiz",
-    "createdOn": "Oluşturulma: ",
-    "lastSeen": "Son Görülme: ",
-    "totalDownload": "Toplam İndirme: ",
-    "totalUpload": "Toplam Yükleme: ",
+    "createdOn": "Oluşturulma: {date}",
+    "lastSeen": "Son Görülme: {date}",
+    "totalDownload": "Toplam İndirme: {total}",
+    "totalUpload": "Toplam Yükleme: {total}",
     "newClient": "Yeni İstemci",
     "disableClient": "İstemciyi Devre Dışı Bırak",
     "enableClient": "İstemciyi Etkinleştir",
@@ -200,16 +199,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} alanı zorunludur",
-      "validNumber": "{0} geçerli bir sayı olmalıdır",
-      "validNumberRange": "{0} geçerli bir sayı veya aralık olmalıdır",
-      "validString": "{0} geçerli bir metin olmalıdır",
-      "validBoolean": "{0} geçerli bir boolean olmalıdır",
-      "validArray": "{0} geçerli bir dizi olmalıdır",
-      "stringMin": "{0} en az {1} karakter olmalıdır",
-      "stringMax": "{0} en fazla {1} karakter olmalıdır",
-      "numberMin": "{0} en az {1} olmalıdır",
-      "numberMax": "{0} en fazla {1} olmalıdır"
+      "required": "{field} alanı zorunludur",
+      "validNumber": "{field} geçerli bir sayı olmalıdır",
+      "validNumberRange": "{field} geçerli bir sayı veya aralık olmalıdır",
+      "validString": "{field} geçerli bir metin olmalıdır",
+      "validBoolean": "{field} geçerli bir boolean olmalıdır",
+      "validArray": "{field} geçerli bir dizi olmalıdır",
+      "stringMin": "{field} en az {min} karakter olmalıdır",
+      "stringMax": "{field} en fazla {max} karakter olmalıdır",
+      "numberMin": "{field} en az {min} olmalıdır",
+      "numberMax": "{field} en fazla {max} olmalıdır"
     },
     "client": {
       "id": "Client ID",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 5799179c..4020716c 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Дата, коли клієнт буде відключений. Порожнє для постійного користування",
     "delete": "Видалити",
     "deleteClient": "Видалити клієнта",
-    "deleteDialog1": "Ви впевнені, що бажаєте видалити",
-    "deleteDialog2": "Цю дію неможливо скасувати.",
+    "deleteDialog": "Ви впевнені, що бажаєте видалити {name}? Цю дію неможливо скасувати.",
     "enabled": "Увімкнено",
     "address": "Адреса",
     "serverAllowedIps": "Дозволені IP-адреси сервера",
     "otlDesc": "Створити коротке одноразове посилання",
     "permanent": "Постійний",
-    "createdOn": "Створено ",
-    "lastSeen": "Останнє підключення в ",
-    "totalDownload": "Всього завантажено: ",
-    "totalUpload": "Всього відправлено: ",
+    "createdOn": "Створено {date}",
+    "lastSeen": "Останнє підключення в {date}",
+    "totalDownload": "Всього завантажено: {total}",
+    "totalUpload": "Всього відправлено: {total}",
     "newClient": "Новий клієнт",
     "disableClient": "Вимкнути клієнта",
     "enableClient": "Увімкнути клієнта",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} обов'язковий",
-      "validNumber": "{0} має бути дійсним числом",
-      "validNumberRange": "{0} має бути коректним числом або діапазоном чисел",
-      "validString": "{0} має бути дійсним рядком",
-      "validBoolean": "{0} має бути дійсним логічним значенням",
-      "validArray": "{0} має бути дійсним масивом",
-      "stringMin": "{0} має містити щонайменше {1} символів",
-      "numberMin": "{0} має бути щонайменше {1}"
+      "required": "{field} обов'язковий",
+      "validNumber": "{field} має бути дійсним числом",
+      "validNumberRange": "{field} має бути коректним числом або діапазоном чисел",
+      "validString": "{field} має бути дійсним рядком",
+      "validBoolean": "{field} має бути дійсним логічним значенням",
+      "validArray": "{field} має бути дійсним масивом",
+      "stringMin": "{field} має містити щонайменше {min} символів",
+      "numberMin": "{field} має бути щонайменше {min}"
     },
     "client": {
       "id": "Ідентифікатор клієнта",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index d1dc2c45..4075b2e6 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "Ngày người dùng sẽ bị vô hiệu hóa. Để trống nếu dùng vĩnh viễn",
     "delete": "Xóa",
     "deleteClient": "Xóa người dùng",
-    "deleteDialog1": "Bạn có chắc rằng muốn xóa",
-    "deleteDialog2": "Hành động này không thể hoàn tác.",
+    "deleteDialog": "Bạn có chắc muốn xóa {name} không? Hành động này không thể hoàn tác.",
     "enabled": "Đã bật",
     "address": "Địa chỉ",
     "serverAllowedIps": "IP được phép phía máy chủ",
     "otlDesc": "Tạo liên kết dùng một lần",
     "permanent": "Vĩnh viễn",
-    "createdOn": "Được tạo vào ",
-    "lastSeen": "Lần cuối trực tuyến ",
-    "totalDownload": "Tổng tải về: ",
-    "totalUpload": "Tổng tải lên: ",
+    "createdOn": "Được tạo vào {date}",
+    "lastSeen": "Lần cuối trực tuyến {date}",
+    "totalDownload": "Tổng tải về: {total}",
+    "totalUpload": "Tổng tải lên: {total}",
     "newClient": "Người dùng mới",
     "disableClient": "Vô hiệu hóa người dùng",
     "enableClient": "Kích hoạt người dùng",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} không được để trống",
-      "validNumber": "{0} phải là số hợp lệ",
-      "validNumberRange": "{0} phải là số hoặc khoảng số hợp lệ",
-      "validString": "{0} phải là chuỗi hợp lệ",
-      "validBoolean": "{0} phải là giá trị boolean hợp lệ",
-      "validArray": "{0} phải là mảng hợp lệ",
-      "stringMin": "{0} phải có ít nhất {1} ký tự",
-      "numberMin": "{0} phải có giá trị ít nhất là {1}"
+      "required": "{field} không được để trống",
+      "validNumber": "{field} phải là số hợp lệ",
+      "validNumberRange": "{field} phải là số hoặc khoảng số hợp lệ",
+      "validString": "{field} phải là chuỗi hợp lệ",
+      "validBoolean": "{field} phải là giá trị boolean hợp lệ",
+      "validArray": "{field} phải là mảng hợp lệ",
+      "stringMin": "{field} phải có ít nhất {min} ký tự",
+      "numberMin": "{field} phải có giá trị ít nhất là {min}"
     },
     "client": {
       "id": "ID thiết bị",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 894d9efa..24fa8f9f 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "客户端将被自动禁用的日期。留空表示永久有效",
     "delete": "删除客户端",
     "deleteClient": "删除客户端",
-    "deleteDialog1": "您确定要删除客户端",
-    "deleteDialog2": "此操作无法撤销。",
+    "deleteDialog": "您确定要删除客户端 {name} 吗？此操作无法撤销。",
     "enabled": "已启用",
     "address": "IP地址",
     "serverAllowedIps": "服务端允许的IP",
     "otlDesc": "生成一次性使用的短链接配置",
     "permanent": "永久有效",
-    "createdOn": "创建于 ",
-    "lastSeen": "最后在线时间 ",
-    "totalDownload": "总下载流量： ",
-    "totalUpload": "总上传流量： ",
+    "createdOn": "创建于 {date}",
+    "lastSeen": "最后在线时间 {date}",
+    "totalDownload": "总下载流量：{total}",
+    "totalUpload": "总上传流量：{total}",
     "newClient": "新建客户端",
     "disableClient": "禁用客户端",
     "enableClient": "启用客户端",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0}是必填项",
-      "validNumber": "{0}必须是有效数字",
-      "validNumberRange": "{0}必须是有效的数字或数字范围",
-      "validString": "{0}必须是有效文本",
-      "validBoolean": "{0}必须是是/否选项",
-      "validArray": "{0}必须是有效数组",
-      "stringMin": "{0}至少需要{1}个字符",
-      "numberMin": "{0}不能小于{1}"
+      "required": "{field}是必填项",
+      "validNumber": "{field}必须是有效数字",
+      "validNumberRange": "{field}必须是有效的数字或数字范围",
+      "validString": "{field}必须是有效文本",
+      "validBoolean": "{field}必须是是/否选项",
+      "validArray": "{field}必须是有效数组",
+      "stringMin": "{field}至少需要{min}个字符",
+      "numberMin": "{field}不能小于{min}"
     },
     "client": {
       "id": "客户端ID",
diff --git a/src/i18n/locales/zh-HK.json b/src/i18n/locales/zh-HK.json
index b4263452..f4f2d4fc 100644
--- a/src/i18n/locales/zh-HK.json
+++ b/src/i18n/locales/zh-HK.json
@@ -90,17 +90,16 @@
     "expireDateDesc": "客戶端將於此日期停用。留空則為永久有效",
     "delete": "刪除",
     "deleteClient": "刪除客戶端",
-    "deleteDialog1": "你確定要刪除",
-    "deleteDialog2": "此操作無法還原。",
+    "deleteDialog": "你確定要刪除用戶端 {name} 嗎？此操作無法還原。",
     "enabled": "已啟用",
     "address": "IP地址",
     "serverAllowedIps": "伺服器IP白名單",
     "otlDesc": "生成短暫單次超連結",
     "permanent": "永久",
-    "createdOn": "建立於",
-    "lastSeen": "上次活動於",
-    "totalDownload": "總下載量：",
-    "totalUpload": "總上傳量：",
+    "createdOn": "建立於{date}",
+    "lastSeen": "上次活動於{date}",
+    "totalDownload": "總下載量：{total}",
+    "totalUpload": "總上傳量：{total}",
     "newClient": "新客戶端",
     "disableClient": "停用客戶端",
     "enableClient": "啟用客戶端",
@@ -189,14 +188,14 @@
   },
   "zod": {
     "generic": {
-      "required": "{0}為必填項",
-      "validNumber": "{0}必須是有效的數字",
-      "validNumberRange": "{0}必須是有效的數字或數字範圍",
-      "validString": "{0}必須是有效的字串",
-      "validBoolean": "{0}必須是有效的布林值",
-      "validArray": "{0}必須是有效的陣列",
-      "stringMin": "{0}至少需要{1}個字元",
-      "numberMin": "{0}至少為{1}"
+      "required": "{field}為必填項",
+      "validNumber": "{field}必須是有效的數字",
+      "validNumberRange": "{field}必須是有效的數字或數字範圍",
+      "validString": "{field}必須是有效的字串",
+      "validBoolean": "{field}必須是有效的布林值",
+      "validArray": "{field}必須是有效的陣列",
+      "stringMin": "{field}至少需要{min}個字元",
+      "numberMin": "{field}至少為{min}"
     },
     "client": {
       "id": "客戶端ID",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 6b655aa3..40a225ce 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -23,7 +23,7 @@
     "disable2faDesc": "請輸入您的密碼以停用兩步驟驗證。",
     "linkOauth": "將您的帳戶連結至外部服務",
     "unlinkOauth": "取消連結",
-    "linkedWith": "已連結至 {0}",
+    "linkedWith": "已連結至 {provider}",
     "providerDisabled": "您目前已連結的服務尚未啟用"
   },
   "general": {
@@ -78,7 +78,7 @@
   },
   "login": {
     "signIn": "登入",
-    "signInWith": "使用 {0} 登入",
+    "signInWith": "使用 {provider} 登入",
     "or": "或",
     "rememberMe": "記住我",
     "rememberMeDesc": "關閉瀏覽器後仍保持登入狀態",
@@ -99,17 +99,16 @@
     "expireDateDesc": "用戶端將被停用的日期。留白表示永久有效",
     "delete": "刪除",
     "deleteClient": "刪除用戶端",
-    "deleteDialog1": "您確定要刪除",
-    "deleteDialog2": "此動作無法復原。",
+    "deleteDialog": "您確定要刪除用戶端 {name} 嗎？此動作無法復原。",
     "enabled": "啟用",
     "address": "位址",
     "serverAllowedIps": "伺服器允許的 IP",
     "otlDesc": "產生暫時性單次連結",
     "permanent": "永久",
-    "createdOn": "建立於 ",
-    "lastSeen": "上次連線於 ",
-    "totalDownload": "總下載量: ",
-    "totalUpload": "總上傳量: ",
+    "createdOn": "建立於 {date}",
+    "lastSeen": "上次連線於 {date}",
+    "totalDownload": "總下載量: {total}",
+    "totalUpload": "總上傳量: {total}",
     "newClient": "新增用戶端",
     "disableClient": "停用用戶端",
     "enableClient": "啟用用戶端",
@@ -200,16 +199,16 @@
   },
   "zod": {
     "generic": {
-      "required": "{0} 為必填項目",
-      "validNumber": "{0} 必須為有效的數字",
-      "validNumberRange": "{0} 必須為有效的數字或範圍",
-      "validString": "{0} 必須為有效的字串",
-      "validBoolean": "{0} 必須為有效的布林值",
-      "validArray": "{0} 必須為有效的陣列",
-      "stringMin": "{0} 至少需要 {1} 個字元",
-      "stringMax": "{0} 最多只能有 {1} 個字元",
-      "numberMin": "{0} 不能小於 {1}",
-      "numberMax": "{0} 不能大於 {1}"
+      "required": "{field} 為必填項目",
+      "validNumber": "{field} 必須為有效的數字",
+      "validNumberRange": "{field} 必須為有效的數字或範圍",
+      "validString": "{field} 必須為有效的字串",
+      "validBoolean": "{field} 必須為有效的布林值",
+      "validArray": "{field} 必須為有效的陣列",
+      "stringMin": "{field} 至少需要 {min} 個字元",
+      "stringMax": "{field} 最多只能有 {max} 個字元",
+      "numberMin": "{field} 不能小於 {min}",
+      "numberMax": "{field} 不能大於 {max}"
     },
     "client": {
       "id": "用戶端 ID",
diff --git a/src/server/utils/types.ts b/src/server/utils/types.ts
index 6aaa72bd..5c6bf55b 100644
--- a/src/server/utils/types.ts
+++ b/src/server/utils/types.ts
@@ -213,61 +213,61 @@ export function validateZod<T>(
                   case 'too_small':
                     switch (v.origin) {
                       case 'string':
-                        newMessage = t('zod.generic.stringMin', [
-                          t(v.message),
-                          v.minimum,
-                        ]);
+                        newMessage = t('zod.generic.stringMin', {
+                          field: t(v.message),
+                          min: v.minimum,
+                        });
                         break;
                       case 'number':
-                        newMessage = t('zod.generic.numberMin', [
-                          t(v.message),
-                          v.minimum,
-                        ]);
+                        newMessage = t('zod.generic.numberMin', {
+                          field: t(v.message),
+                          min: v.minimum,
+                        });
                         break;
                     }
                     break;
                   case 'too_big':
                     switch (v.origin) {
                       case 'string':
-                        newMessage = t('zod.generic.stringMax', [
-                          t(v.message),
-                          v.maximum,
-                        ]);
+                        newMessage = t('zod.generic.stringMax', {
+                          field: t(v.message),
+                          max: v.maximum,
+                        });
                         break;
                       case 'number':
-                        newMessage = t('zod.generic.numberMax', [
-                          t(v.message),
-                          v.maximum,
-                        ]);
+                        newMessage = t('zod.generic.numberMax', {
+                          field: t(v.message),
+                          max: v.maximum,
+                        });
                         break;
                     }
                     break;
                   case 'invalid_type': {
                     if (v.input === null || v.input === undefined) {
-                      newMessage = t('zod.generic.required', [
-                        v.path.join('.'),
-                      ]);
+                      newMessage = t('zod.generic.required', {
+                        field: v.path.join('.'),
+                      });
                     } else {
                       switch (v.expected) {
                         case 'string':
-                          newMessage = t('zod.generic.validString', [
-                            t(v.message),
-                          ]);
+                          newMessage = t('zod.generic.validString', {
+                            field: t(v.message),
+                          });
                           break;
                         case 'boolean':
-                          newMessage = t('zod.generic.validBoolean', [
-                            t(v.message),
-                          ]);
+                          newMessage = t('zod.generic.validBoolean', {
+                            field: t(v.message),
+                          });
                           break;
                         case 'number':
-                          newMessage = t('zod.generic.validNumber', [
-                            t(v.message),
-                          ]);
+                          newMessage = t('zod.generic.validNumber', {
+                            field: t(v.message),
+                          });
                           break;
                         case 'array':
-                          newMessage = t('zod.generic.validArray', [
-                            t(v.message),
-                          ]);
+                          newMessage = t('zod.generic.validArray', {
+                            field: t(v.message),
+                          });
                           break;
                       }
                     }
@@ -275,6 +275,9 @@ export function validateZod<T>(
                   }
                 }
               }
+              if (!newMessage && v.message === 'zod.generic.validNumberRange') {
+                newMessage = t(v.message, { field: v.path.join('.') });
+              }
               if (newMessage) {
                 m = newMessage;
               } else {