diff --git a/apps/browser-extension/src/i18n/locales/fi.json b/apps/browser-extension/src/i18n/locales/fi.json
index 3d270e5b0..f1bbfaef2 100644
--- a/apps/browser-extension/src/i18n/locales/fi.json
+++ b/apps/browser-extension/src/i18n/locales/fi.json
@@ -57,7 +57,7 @@
     "next": "Seuraava",
     "use": "Käytä",
     "delete": "Poista",
-    "save": "Save",
+    "save": "Tallenna",
     "or": "Tai",
     "close": "Sulje",
     "copied": "Kopioitu!",
@@ -242,13 +242,13 @@
     "enterEmailPrefix": "Syötä sähköpostin etuliite"
   },
   "totp": {
-    "addCode": "Add 2FA Code",
-    "instructions": "Enter the secret key shown by the website where you want to add two-factor authentication.",
-    "nameOptional": "Name (optional)",
-    "secretKey": "Secret Key",
-    "saveToViewCode": "Save to view code",
+    "addCode": "Lisää 2FA TOTP -koodi",
+    "instructions": "Syötä salainen avain, joka näkyy sivustossa, jossa haluat lisätä kaksivaiheisen tunnistautumisen",
+    "nameOptional": "Nimi (valinnainen)",
+    "secretKey": "Salainen avain",
+    "saveToViewCode": "Tallenna nähdäksesi koodin",
     "errors": {
-      "invalidSecretKey": "Invalid secret key format."
+      "invalidSecretKey": "Virheellinen salatun avaimen muoto."
     }
   },
   "emails": {
diff --git a/apps/browser-extension/src/i18n/locales/pl.json b/apps/browser-extension/src/i18n/locales/pl.json
index ffebabdc6..b816d1c89 100644
--- a/apps/browser-extension/src/i18n/locales/pl.json
+++ b/apps/browser-extension/src/i18n/locales/pl.json
@@ -57,7 +57,7 @@
     "next": "Dalej",
     "use": "Użyj",
     "delete": "Usuń",
-    "save": "Save",
+    "save": "Zapisz",
     "or": "lub",
     "close": "Zamknąć",
     "copied": "Skopiowano",
@@ -238,22 +238,22 @@
     "publicEmailDescription": "Anonimowa, ale ograniczona prywatność. Treści e-mail są czytelne dla każdego, kto zna adres.",
     "useDomainChooser": "Użyj wybierania domen",
     "enterCustomDomain": "Wprowadź własną domenę",
-    "enterFullEmail": "Wprowadź pełny adres e-mail",
+    "enterFullEmail": "Wprowadź adres e-mail",
     "enterEmailPrefix": "Wprowadź prefiks e-mail"
   },
   "totp": {
-    "addCode": "Add 2FA Code",
-    "instructions": "Enter the secret key shown by the website where you want to add two-factor authentication.",
-    "nameOptional": "Name (optional)",
-    "secretKey": "Secret Key",
-    "saveToViewCode": "Save to view code",
+    "addCode": "Dodaj kod 2FA",
+    "instructions": "Wprowadź tajny klucz wyświetlony na stronie internetowej, na której chcesz dodać uwierzytelnianie dwuskładnikowe.",
+    "nameOptional": "Nazwa (opcjonalnie)",
+    "secretKey": "Tajny klucz",
+    "saveToViewCode": "Zapisz, aby wyświetlić kod",
     "errors": {
-      "invalidSecretKey": "Invalid secret key format."
+      "invalidSecretKey": "Nieprawidłowy format tajnego klucza."
     }
   },
   "emails": {
     "title": "Skrzynka odbiorcza",
-    "deleteEmailTitle": "Usuń adres e-mail",
+    "deleteEmailTitle": "Usuń e-mail",
     "deleteEmailConfirm": "Czy na pewno chcesz trwale usunąć ten e-mail?",
     "from": "Od",
     "to": "Do",
diff --git a/apps/browser-extension/src/i18n/locales/ru.json b/apps/browser-extension/src/i18n/locales/ru.json
index 41264d8e3..fb20a36b7 100644
--- a/apps/browser-extension/src/i18n/locales/ru.json
+++ b/apps/browser-extension/src/i18n/locales/ru.json
@@ -57,7 +57,7 @@
     "next": "Далее",
     "use": "Использовать",
     "delete": "Удалить",
-    "save": "Save",
+    "save": "Сохранить",
     "or": "Или",
     "close": "Закрыть",
     "copied": "Скопировано!",
@@ -242,13 +242,13 @@
     "enterEmailPrefix": "Введите префикс электронной почты"
   },
   "totp": {
-    "addCode": "Add 2FA Code",
-    "instructions": "Enter the secret key shown by the website where you want to add two-factor authentication.",
-    "nameOptional": "Name (optional)",
-    "secretKey": "Secret Key",
-    "saveToViewCode": "Save to view code",
+    "addCode": "Добавить код 2FA",
+    "instructions": "Введите секретный ключ, указанный на веб-сайте, где вы хотите добавить двухфакторную аутентификацию.",
+    "nameOptional": "Имя (необязательно)",
+    "secretKey": "Секретный ключ",
+    "saveToViewCode": "Сохранить для просмотра кода",
     "errors": {
-      "invalidSecretKey": "Invalid secret key format."
+      "invalidSecretKey": "Неверный формат секретного ключа."
     }
   },
   "emails": {
diff --git a/apps/mobile-app/i18n/locales/fi.json b/apps/mobile-app/i18n/locales/fi.json
index 6610d4310..d3cc61ff5 100644
--- a/apps/mobile-app/i18n/locales/fi.json
+++ b/apps/mobile-app/i18n/locales/fi.json
@@ -20,9 +20,9 @@
     "notice": "Huomautus",
     "enabled": "Otettu käyttöön",
     "disabled": "Pois käytöstä",
-    "twoFactorAuthentication": "Two-Factor Authentication",
-    "deleteItemConfirmTitle": "Delete Item",
-    "deleteItemConfirmDescription": "Are you sure you want to delete this item?",
+    "twoFactorAuthentication": "Kaksivaiheinen tunnistautuminen",
+    "deleteItemConfirmTitle": "Poista kohde",
+    "deleteItemConfirmDescription": "Haluatko varmasti poistaa tämän kohteen?",
     "errors": {
       "unknownError": "Tapahtui tuntematon virhe. Yritä uudelleen.",
       "unknownErrorTryAgain": "Tapahtui tuntematon virhe. Yritä uudelleen.",
@@ -207,13 +207,13 @@
     "passkeyWillBeDeleted": "Tämä todennusavain poistetaan, kun tallennat tämän käyttäjätiedon."
   },
   "totp": {
-    "addCode": "Add 2FA Code",
-    "nameOptional": "Name (optional)",
-    "secretKey": "Secret Key",
-    "instructions": "Enter the secret key shown by the website where you want to add two-factor authentication.",
-    "saveToViewCode": "Save to view code",
+    "addCode": "Lisää 2FA TOTP -koodi",
+    "nameOptional": "Nimi (valinnainen)",
+    "secretKey": "Salainen avain",
+    "instructions": "Syötä salainen avain, joka näkyy sivustossa, jossa haluat lisätä kaksivaiheisen tunnistautumisen",
+    "saveToViewCode": "Tallenna nähdäksesi koodin",
     "errors": {
-      "invalidSecretKey": "Invalid secret key format."
+      "invalidSecretKey": "Virheellinen salatun avaimen muoto."
     }
   },
   "settings": {
@@ -328,8 +328,8 @@
       "languageDescription": "Aseta kieli, jota käytetään luotaessa uusia henkilöllisyyksiä.",
       "genderSection": "Sukupuoli",
       "genderDescription": "Aseta oletussukupuoli uusien henkilöllisyyksien luomiseksi. ",
-      "ageRangeSection": "Age Range",
-      "ageRangeDescription": "Set the age range for generating new identities.",
+      "ageRangeSection": "Ikähaarukka",
+      "ageRangeDescription": "Aseta ikähaarukka uusia henkilöllisyyksien luomisessa",
       "genderOptions": {
         "random": "Satunnainen",
         "male": "Mies",
diff --git a/apps/mobile-app/i18n/locales/fr.json b/apps/mobile-app/i18n/locales/fr.json
index 8fb73bda7..0242ca581 100644
--- a/apps/mobile-app/i18n/locales/fr.json
+++ b/apps/mobile-app/i18n/locales/fr.json
@@ -7,22 +7,22 @@
     "yes": "Oui",
     "no": "Non",
     "ok": "OK",
-    "continue": "Continue",
-    "loading": "Loading",
-    "error": "Error",
-    "success": "Success",
-    "never": "Never",
-    "copied": "Copied to clipboard",
+    "continue": "Continuer",
+    "loading": "Chargement",
+    "error": "Erreur",
+    "success": "Succès",
+    "never": "Jamais",
+    "copied": "Copier dans le presse-papiers",
     "loadMore": "Voir plus",
-    "use": "Use",
-    "confirm": "Confirm",
-    "next": "Next",
-    "notice": "Notice",
-    "enabled": "Enabled",
-    "disabled": "Disabled",
-    "twoFactorAuthentication": "Two-Factor Authentication",
-    "deleteItemConfirmTitle": "Delete Item",
-    "deleteItemConfirmDescription": "Are you sure you want to delete this item?",
+    "use": "Utiliser",
+    "confirm": "Confirmer",
+    "next": "Suivant",
+    "notice": "Notification",
+    "enabled": "Activé",
+    "disabled": "Désactivé",
+    "twoFactorAuthentication": "Authentification à deux facteurs",
+    "deleteItemConfirmTitle": "Supprimer l'élement",
+    "deleteItemConfirmDescription": "Êtes-vous certain de vouloir supprimer cet élément?",
     "errors": {
       "unknownError": "An unknown error occurred. Please try again.",
       "unknownErrorTryAgain": "An unknown error occurred. Please try again.",
diff --git a/apps/mobile-app/i18n/locales/pl.json b/apps/mobile-app/i18n/locales/pl.json
index d465a88b2..6b7b89791 100644
--- a/apps/mobile-app/i18n/locales/pl.json
+++ b/apps/mobile-app/i18n/locales/pl.json
@@ -20,9 +20,9 @@
     "notice": "Uwaga",
     "enabled": "Włączone",
     "disabled": "Wyłączone",
-    "twoFactorAuthentication": "Two-Factor Authentication",
-    "deleteItemConfirmTitle": "Delete Item",
-    "deleteItemConfirmDescription": "Are you sure you want to delete this item?",
+    "twoFactorAuthentication": "Uwierzytelnianie dwuskładnikowe",
+    "deleteItemConfirmTitle": "Usuń element",
+    "deleteItemConfirmDescription": "Czy na pewno chcesz usunąć ten element?",
     "errors": {
       "unknownError": "Wystąpił nieznany błąd. Spróbuj ponownie.",
       "unknownErrorTryAgain": "Wystąpił nieznany błąd. Spróbuj ponownie.",
@@ -207,13 +207,13 @@
     "passkeyWillBeDeleted": "Ten klucz dostępu zostanie usunięty po zapisaniu tych danych."
   },
   "totp": {
-    "addCode": "Add 2FA Code",
-    "nameOptional": "Name (optional)",
-    "secretKey": "Secret Key",
-    "instructions": "Enter the secret key shown by the website where you want to add two-factor authentication.",
-    "saveToViewCode": "Save to view code",
+    "addCode": "Dodaj kod 2FA",
+    "nameOptional": "Nazwa (opcjonalnie)",
+    "secretKey": "Tajny klucz",
+    "instructions": "Wprowadź tajny klucz wyświetlony na stronie internetowej, na której chcesz dodać uwierzytelnianie dwuskładnikowe.",
+    "saveToViewCode": "Zapisz, aby wyświetlić kod",
     "errors": {
-      "invalidSecretKey": "Invalid secret key format."
+      "invalidSecretKey": "Nieprawidłowy format tajnego klucza."
     }
   },
   "settings": {
diff --git a/apps/mobile-app/i18n/locales/ru.json b/apps/mobile-app/i18n/locales/ru.json
index 0964e02e7..4cbc03678 100644
--- a/apps/mobile-app/i18n/locales/ru.json
+++ b/apps/mobile-app/i18n/locales/ru.json
@@ -20,9 +20,9 @@
     "notice": "Примечание",
     "enabled": "Включено",
     "disabled": "Отключено",
-    "twoFactorAuthentication": "Two-Factor Authentication",
-    "deleteItemConfirmTitle": "Delete Item",
-    "deleteItemConfirmDescription": "Are you sure you want to delete this item?",
+    "twoFactorAuthentication": "Двухфакторная аутентификация",
+    "deleteItemConfirmTitle": "Удалить элемент",
+    "deleteItemConfirmDescription": "Вы уверены, что хотите удалить этот элемент?",
     "errors": {
       "unknownError": "Произошла неизвестная ошибка. Пожалуйста, попробуйте снова.",
       "unknownErrorTryAgain": "Произошла неизвестная ошибка. Попробуйте снова.",
@@ -207,13 +207,13 @@
     "passkeyWillBeDeleted": "Этот ключ доступа будет удален при сохранении этой учетной записи."
   },
   "totp": {
-    "addCode": "Add 2FA Code",
-    "nameOptional": "Name (optional)",
-    "secretKey": "Secret Key",
-    "instructions": "Enter the secret key shown by the website where you want to add two-factor authentication.",
-    "saveToViewCode": "Save to view code",
+    "addCode": "Добавить код 2FA",
+    "nameOptional": "Имя (необязательно)",
+    "secretKey": "Секретный ключ",
+    "instructions": "Введите секретный ключ, указанный на веб-сайте, где вы хотите добавить двухфакторную аутентификацию.",
+    "saveToViewCode": "Сохранить для просмотра кода",
     "errors": {
-      "invalidSecretKey": "Invalid secret key format."
+      "invalidSecretKey": "Неверный формат секретного ключа."
     }
   },
   "settings": {
diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/General.fi.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/General.fi.resx
index 263745c2d..5e553e093 100644
--- a/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/General.fi.resx
+++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/General.fi.resx
@@ -71,11 +71,11 @@
   </data>
   <!-- Alias Settings Section -->
   <data name="AliasSettingsTitle">
-    <value>Identity Generator Settings</value>
+    <value>Henkilöllisyysgeneraattorin asetukset</value>
     <comment>Title for identity generator settings section</comment>
   </data>
   <data name="AliasGenerationLanguageLabel">
-    <value>Language</value>
+    <value>Kieli</value>
     <comment>Label for alias generation language setting</comment>
   </data>
   <data name="AliasGenerationLanguageDescription">
@@ -83,7 +83,7 @@
     <comment>Description for alias generation language setting</comment>
   </data>
   <data name="AliasGenerationGenderLabel">
-    <value>Gender</value>
+    <value>Sukupuoli</value>
     <comment>Label for alias generation gender setting</comment>
   </data>
   <data name="AliasGenerationGenderDescription">
@@ -103,7 +103,7 @@
     <comment>Female gender option</comment>
   </data>
   <data name="AliasGenerationAgeRangeLabel">
-    <value>Age range</value>
+    <value>Ikähaarukka</value>
     <comment>Label for alias generation age range setting</comment>
   </data>
   <data name="AliasGenerationAgeRangeDescription">
diff --git a/apps/server/AliasVault.Client/Resources/SharedResources.fr.resx b/apps/server/AliasVault.Client/Resources/SharedResources.fr.resx
index b69663136..5eef1a724 100644
--- a/apps/server/AliasVault.Client/Resources/SharedResources.fr.resx
+++ b/apps/server/AliasVault.Client/Resources/SharedResources.fr.resx
@@ -213,7 +213,7 @@
     <comment>Generic error message</comment>
   </data>
   <data name="ErrorUnknown" xml:space="preserve">
-    <value>An unknown error occurred. Please try again.</value>
+    <value>Une erreur inconnue s'est produite. Merci de réessayer.</value>
     <comment>Generic unknown error message</comment>
   </data>
   <data name="ErrorValidation" xml:space="preserve">
@@ -289,7 +289,7 @@
   </data>
   <!-- General UI text -->
   <data name="Or" xml:space="preserve">
-    <value>or</value>
+    <value>ou</value>
     <comment>Divider text between options</comment>
   </data>
   <data name="LockVault" xml:space="preserve">