diff --git a/css/main.scss b/css/main.scss
index 7b4b45f1c54a070bad766a853723e3aa369b241d..ad8cb354816b621c43c10851dba7b95a49cc6a4b 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -25,7 +25,7 @@
   #recoveryEmail,
   #recoveryButton {
     flex-shrink: 1;
-    width: fit-content;
+    width: 200px;
     min-width: 150px;
   }
 }
diff --git a/l10n/ca.js b/l10n/ca.js
new file mode 100644
index 0000000000000000000000000000000000000000..74591fbb5c27c176e61b86f963cd78c348cc439c
--- /dev/null
+++ b/l10n/ca.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "email-recovery",
+    {
+    "Email Recovery" : "Recuperació de correu electrònic",
+    "Email Recovery App" : "Aplicació de recuperació de correu electrònic",
+    "Recovery Email" : "Correu electrònic de recuperació",
+    "Recovery Email " : "Correu electrònic de recuperació ",
+    "Changes saved" : "S'han guardat els canvis"
+},
+"nplurals=2; plural=n != 1;");
diff --git a/l10n/ca.json b/l10n/ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..6a8a27edf08087fdab2b18a35064f23cda76d6dd
--- /dev/null
+++ b/l10n/ca.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Email Recovery" : "Recuperació de correu electrònic",
+    "Email Recovery App" : "Aplicació de recuperació de correu electrònic",
+    "Recovery Email" : "Correu electrònic de recuperació",
+    "Recovery Email " : "Correu electrònic de recuperació ",
+    "Changes saved" : "S'han guardat els canvis"
+},"pluralForm" :"nplurals=2; plural=n != 1;"
+}
\ No newline at end of file
diff --git a/l10n/de.js b/l10n/de.js
index a7cfdd0b7e595c91071c009a2f6d19944d8f940c..f1195cc646ad493fb7ced35963c765159f808938 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
-	"email-recovery",
-	{
-		"Recovery Email": "Wiederherstellung E-Mail",
-		"Changes saved": "Gespeicherte Änderungen",
-		"Error! User email address cannot be saved as recovery email address!": "Fehler! Die Benutzer-E-Mail-Adresse kann nicht als Wiederherstellungs-E-Mail-Adresse gespeichert werden!",
-		"Change Recovery Email": "Wiederherstellungs-E-Mail ändern",
-		"Invalid Recovery Email!": "Ungültige Wiederherstellungs-E-Mail!"
-	},
-	"nplurals=2; plural=(n != 1);");
+    "email-recovery",
+    {
+    "Email Recovery" : "E-Mail-Wiederherstellung",
+    "Email Recovery App" : "E-Mail-Wiederherstellungsapp",
+    "Recovery Email" : "Wiederherstellungs-E-Mail",
+    "Recovery Email " : "Wiederherstellungs-E-Mail ",
+    "Changes saved" : "Änderungen gespeichert"
+},
+"nplurals=2; plural=n != 1;");
diff --git a/l10n/de.json b/l10n/de.json
index f3feb382e707c34918bc981fe151f0bb23be43bc..867c7cbb12138d71c28e10599420cfede435285d 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,10 +1,8 @@
-{
-	"translations": {
-		"Recovery Email": "Wiederherstellung E-Mail",
-		"Changes saved": "Gespeicherte Änderungen",
-		"Error! User email address cannot be saved as recovery email address!": "Fehler! Die Benutzer-E-Mail-Adresse kann nicht als Wiederherstellungs-E-Mail-Adresse gespeichert werden!",
-		"Change Recovery Email": "Wiederherstellungs-E-Mail ändern",
-		"Invalid Recovery Email!": "Ungültige Wiederherstellungs-E-Mail!"
-	},
-	"pluralForm": "nplurals=2; plural=n != 1;"
+{ "translations": {
+    "Email Recovery" : "E-Mail-Wiederherstellung",
+    "Email Recovery App" : "E-Mail-Wiederherstellungsapp",
+    "Recovery Email" : "Wiederherstellungs-E-Mail",
+    "Recovery Email " : "Wiederherstellungs-E-Mail ",
+    "Changes saved" : "Änderungen gespeichert"
+},"pluralForm" :"nplurals=2; plural=n != 1;"
 }
\ No newline at end of file
diff --git a/l10n/en.js b/l10n/en.js
index 221150a20d39ed82a70acecd0b5b40221b5c773a..837fc251dc1c178f6e49e55fe7e7b875747cc800 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
-	"email-recovery",
-	{
-		"Recovery Email": "Recovery Email",
-		"Changes saved": "Changes saved",
-		"Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!",
-		"Change Recovery Email": "Change Recovery Email",
-		"Invalid Recovery Email!": "Invalid Recovery Email!"
-	},
-	"nplurals=2; plural=(n != 1);");
+    "email-recovery",
+    {
+    "Recovery Email" : "Recovery Email",
+    "Changes saved": "Changes saved",
+    "ErrorRecoveryEmailSameAsUserEmail": "Error! User email address cannot be saved as recovery email address!",
+    "Change Recovery Email": "Change Recovery Email",
+    "Invalid Recovery Email!": "Invalid Recovery Email!"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index eb9d64890f79ec0721a25a58a4b8a760f9ec03fb..6109661f5f007f7f4769c8a2ab2e6b8e8290da7b 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -2,10 +2,10 @@
 	"translations": {
 		"Recovery Email": "Recovery Email",
 		"Changes saved": "Changes saved",
-		"Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!",
-		"Change Recovery Email": "Change Recovery Email",
+		"ErrorRecoveryEmailSameAsUserEmail": "Error! User email address cannot be saved as recovery email address!",
+        "Change Recovery Email": "Change Recovery Email",
 		"Invalid Recovery Email!": "Invalid Recovery Email!",
 		"Error setting recovery email": "Error setting recovery mail"
-	},
+    },
 	"pluralForm": "nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
+}
diff --git a/l10n/es.js b/l10n/es.js
deleted file mode 100644
index da1c64ba24c449fe497b3e0e4a6fc44569fab094..0000000000000000000000000000000000000000
--- a/l10n/es.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-	"email-recovery",
-	{
-		"Recovery Email": "Correo electrónico de recuperación",
-		"Changes saved": "Cambios guardados",
-		"Error! User email address cannot be saved as recovery email address!": "¡Error! La dirección de correo electrónico del usuario no se puede guardar como dirección de correo electrónico de recuperación.",
-		"Change Recovery Email": "Cambiar el correo electrónico de recuperación",
-		"Invalid Recovery Email!": "¡Email de recuperación inválido!"
-	},
-	"nplurals=2; plural=n != 1;");
diff --git a/l10n/es.json b/l10n/es.json
deleted file mode 100644
index 48da649a34cc7199530cd32fbeb5de9e466a1d65..0000000000000000000000000000000000000000
--- a/l10n/es.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"translations": {
-		"Recovery Email": "Correo electrónico de recuperación",
-		"Changes saved": "Cambios guardados",
-		"Error! User email address cannot be saved as recovery email address!": "¡Error! La dirección de correo electrónico del usuario no se puede guardar como dirección de correo electrónico de recuperación.",
-		"Change Recovery Email": "Cambiar el correo electrónico de recuperación",
-		"Invalid Recovery Email!": "¡Email de recuperación inválido!"
-	},
-	"pluralForm": "nplurals=2; plural=n != 1;"
-}
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
deleted file mode 100644
index fb16e066f2d31d5c65f1e6c76713d741d8ff7752..0000000000000000000000000000000000000000
--- a/l10n/fr.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-	"email-recovery",
-	{
-		"Recovery Email": "Courriel de récupération",
-		"Changes saved": "Changements enregistrés",
-		"Error! User email address cannot be saved as recovery email address!": "Erreur ! L'adresse e-mail de l'utilisateur ne peut pas être enregistrée comme adresse e-mail de récupération !",
-		"Change Recovery Email": "Courriel de récupération des changements",
-		"Invalid Recovery Email!": "Courriel de récupération invalide !"
-	},
-	"nplurals=2; plural=n != 1;");
diff --git a/l10n/fr.json b/l10n/fr.json
deleted file mode 100644
index ff495b9ffb9e5c3b43a28cb8ccd8d9de0eb49c58..0000000000000000000000000000000000000000
--- a/l10n/fr.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"translations": {
-		"Recovery Email": "Courriel de récupération",
-		"Changes saved": "Changements enregistrés",
-		"Error! User email address cannot be saved as recovery email address!": "Erreur ! L'adresse e-mail de l'utilisateur ne peut pas être enregistrée comme adresse e-mail de récupération !",
-		"Change Recovery Email": "Courriel de récupération des changements",
-		"Invalid Recovery Email!": "Courriel de récupération invalide !"
-	},
-	"pluralForm": "nplurals=2; plural=n != 1;"
-}
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
deleted file mode 100644
index fb4701ef62c004544fb1224cfb7b6972b43c76fe..0000000000000000000000000000000000000000
--- a/l10n/it.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-	"email-recovery",
-	{
-		"Recovery Email": "Recupero e-mail",
-		"Changes saved": "Modifiche salvate",
-		"Error! User email address cannot be saved as recovery email address!": "Errore! L'indirizzo e-mail dell'utente non può essere salvato come indirizzo e-mail di recupero!",
-		"Change Recovery Email": "Modifica dell'e-mail di recupero",
-		"Invalid Recovery Email!": "Email di recupero non valida!"
-	},
-	"nplurals=2; plural=n != 1;");
diff --git a/l10n/it.json b/l10n/it.json
deleted file mode 100644
index ef9600a70f14971ffb10578a4063f9d7c135f5f8..0000000000000000000000000000000000000000
--- a/l10n/it.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"translations": {
-		"Recovery Email": "Recupero e-mail",
-		"Changes saved": "Modifiche salvate",
-		"Error! User email address cannot be saved as recovery email address!": "Errore! L'indirizzo e-mail dell'utente non può essere salvato come indirizzo e-mail di recupero!",
-		"Change Recovery Email": "Modifica dell'e-mail di recupero",
-		"Invalid Recovery Email!": "Email di recupero non valida!"
-	},
-	"pluralForm": "nplurals=2; plural=n != 1;"
-}
\ No newline at end of file
diff --git a/lib/Controller/EmailRecoveryController.php b/lib/Controller/EmailRecoveryController.php
index 4aafec3d579faf1a3df817582f2a367c4752549c..f79b3470e658c1db658cb51e783d90056dd150bd 100644
--- a/lib/Controller/EmailRecoveryController.php
+++ b/lib/Controller/EmailRecoveryController.php
@@ -96,7 +96,7 @@ class EmailRecoveryController extends Controller
             }
             if ($e instanceof SameRecoveryEmailAsEmailException) {
                 $response->setStatus(400);
-                $response->setData(['message' => 'Error! User email address cannot be saved as recovery email address!']);
+                $response->setData(['message' => 'ErrorRecoveryEmailSameAsUserEmail']);
             }
 
             $this->logger->error("Error setting recovery email for user $userId" . $e->getMessage());
diff --git a/translationfiles/ca/email-recovery.po b/translationfiles/ca/email-recovery.po
new file mode 100644
index 0000000000000000000000000000000000000000..3422461ab85384f9efdb2a5f7be1a179747d8e7b
--- /dev/null
+++ b/translationfiles/ca/email-recovery.po
@@ -0,0 +1,44 @@
+# BASE TRANSLATION FILE.
+# Copyright (C) 2022 MURENA
+# This file is distributed under the same license as the Nextcloud package.
+# dev@murena.io
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Nextcloud 3.14159\n"
+"Report-Msgid-Bugs-To: translations\\@example.com\n"
+"POT-Creation-Date: 2022-05-06 19:52+0530\n"
+"PO-Revision-Date: 2022-05-06 14:30+0000\n"
+"Last-Translator: Nivesh Krishna <nivesh@e.email>\n"
+"Language-Team: Catalan <https://i18n.e.foundation/projects/ecloud/"
+"email-recovery/ca/>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.11.2\n"
+
+#: /home/nivesh/Desktop/repos/email-recovery/specialAppInfoFakeDummyForL10nScript.php:2
+msgid "Email Recovery"
+msgstr "Recuperació de correu electrònic"
+
+#: /home/nivesh/Desktop/repos/email-recovery/specialAppInfoFakeDummyForL10nScript.php:3
+msgid "Email Recovery App"
+msgstr "Aplicació de recuperació de correu electrònic"
+
+#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:3
+msgid "Recovery Email"
+msgstr "Correu electrònic de recuperació"
+
+#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:7
+msgid "Recovery Email "
+msgstr "Correu electrònic de recuperació "
+
+#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:22
+msgid "Changes saved"
+msgstr "S'han guardat els canvis"
+
+#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26
+msgid "ErrorRecoveryEmailSameAsUserEmail"
+msgstr ""
diff --git a/translationfiles/de/email-recovery.po b/translationfiles/de/email-recovery.po
index 9f8b4c1105ff8f2cc87303a30f167b421b9f5155..d875a59fefa01b686c31f8fd7b3573944d246634 100644
--- a/translationfiles/de/email-recovery.po
+++ b/translationfiles/de/email-recovery.po
@@ -40,5 +40,5 @@ msgid "Changes saved"
 msgstr "Änderungen gespeichert"
 
 #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26
-msgid "Error! User email address cannot be saved as recovery email address!"
+msgid "ErrorRecoveryEmailSameAsUserEmail"
 msgstr ""
diff --git a/translationfiles/templates/email-recovery.pot b/translationfiles/templates/email-recovery.pot
index c452f1a4e5cb917df79a34cbaca064dcd2b81dd1..760164b25520652a0dad7cb889da86ed50e48343 100644
--- a/translationfiles/templates/email-recovery.pot
+++ b/translationfiles/templates/email-recovery.pot
@@ -38,5 +38,5 @@ msgid "Changes saved"
 msgstr ""
 
 #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26
-msgid "Error! User email address cannot be saved as recovery email address!"
+msgid "ErrorRecoveryEmailSameAsUserEmail"
 msgstr ""