From 8b5de8dd779dfc2dfa45c930d143060ac7321acf Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Tue, 7 Sep 2021 08:05:34 +0530
Subject: refactor: externalize english text

---
 src/components/auth/ChangeServer.js                |   8 +-
 src/components/auth/Password.js                    |   9 +-
 src/components/auth/SetupAssistant.js              |   8 +-
 src/components/services/tabs/TabItem.js            |   3 +-
 src/features/basicAuth/Component.js                |  21 +-
 src/features/nightlyBuilds/Component.js            |   7 +-
 src/i18n/globalMessages.js                         |  24 ++
 src/i18n/locales/af.json                           |   5 +-
 src/i18n/locales/ar.json                           |   5 +-
 src/i18n/locales/be.json                           |   5 +-
 src/i18n/locales/bg.json                           |   2 +-
 src/i18n/locales/bs.json                           |   5 +-
 src/i18n/locales/ca.json                           |   5 +-
 src/i18n/locales/cs.json                           |   5 +-
 src/i18n/locales/da.json                           |   5 +-
 src/i18n/locales/de.json                           |   5 +-
 src/i18n/locales/defaultMessages.json              | 263 +++++++++++++--------
 src/i18n/locales/el.json                           |   5 +-
 src/i18n/locales/en-US.json                        |  10 +-
 src/i18n/locales/es.json                           |   5 +-
 src/i18n/locales/et.json                           |   2 +-
 src/i18n/locales/fa.json                           |   2 +-
 src/i18n/locales/fi.json                           |   5 +-
 src/i18n/locales/fil.json                          |   2 +-
 src/i18n/locales/fr.json                           |   5 +-
 src/i18n/locales/ga.json                           |   5 +-
 src/i18n/locales/he.json                           |   5 +-
 src/i18n/locales/hi.json                           |   5 +-
 src/i18n/locales/hr.json                           |   5 +-
 src/i18n/locales/hu.json                           |   5 +-
 src/i18n/locales/id.json                           |   5 +-
 src/i18n/locales/it.json                           |   5 +-
 src/i18n/locales/ja.json                           |   5 +-
 src/i18n/locales/ka.json                           |   5 +-
 src/i18n/locales/kk.json                           |   2 +-
 src/i18n/locales/ko.json                           |   5 +-
 src/i18n/locales/ms.json                           |   2 +-
 src/i18n/locales/nb.json                           |   2 +-
 src/i18n/locales/nl-BE.json                        |   5 +-
 src/i18n/locales/nl.json                           |   5 +-
 src/i18n/locales/no.json                           |   5 +-
 src/i18n/locales/pl.json                           |   5 +-
 src/i18n/locales/pt-BR.json                        |   5 +-
 src/i18n/locales/pt.json                           |   5 +-
 src/i18n/locales/ro.json                           |   5 +-
 src/i18n/locales/ru.json                           |   5 +-
 src/i18n/locales/si.json                           |   2 +-
 src/i18n/locales/sk.json                           |   5 +-
 src/i18n/locales/sl.json                           |   5 +-
 src/i18n/locales/sq.json                           |   2 +-
 src/i18n/locales/sr.json                           |   5 +-
 src/i18n/locales/sv.json                           |   5 +-
 src/i18n/locales/te.json                           |   5 +-
 src/i18n/locales/tr.json                           |   5 +-
 src/i18n/locales/uk.json                           |   5 +-
 src/i18n/locales/vi.json                           |   5 +-
 src/i18n/locales/zh-CN.json                        |   2 +-
 src/i18n/locales/zh-HANS.json                      |   2 +-
 src/i18n/locales/zh-HANT.json                      |   5 +-
 src/i18n/locales/zh-TW.json                        |   2 +-
 src/i18n/locales/zh.json                           |   5 +-
 .../messages/src/components/auth/ChangeServer.json |  31 +--
 .../messages/src/components/auth/Password.json     |  35 +--
 .../src/components/auth/SetupAssistant.json        |  16 +-
 .../src/components/services/tabs/TabItem.json      |  56 ++---
 .../messages/src/features/basicAuth/Component.json |  15 ++
 .../src/features/nightlyBuilds/Component.json      |  23 +-
 src/i18n/messages/src/i18n/globalMessages.json     |  78 ++++++
 src/webview/recipe.js                              |   2 +-
 69 files changed, 471 insertions(+), 362 deletions(-)
 create mode 100644 src/i18n/messages/src/features/basicAuth/Component.json

diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 7bab80280..8e8a7af32 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -9,6 +9,7 @@ import Button from '../ui/Button';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
 import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   headline: {
@@ -31,11 +32,6 @@ const messages = defineMessages({
     id: 'changeserver.urlError',
     defaultMessage: '!!!Enter a valid URL',
   },
-  submit: {
-    id: 'changeserver.submit',
-    defaultMessage: '!!!Submit',
-  },
-
 });
 
 export default @observer class ChangeServer extends Component {
@@ -120,7 +116,7 @@ export default @observer class ChangeServer extends Component {
           <Button
             type="submit"
             className="auth__button"
-            label={intl.formatMessage(messages.submit)}
+            label={intl.formatMessage(globalMessages.submit)}
           />
         </form>
       </div>
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index eafc48502..1be2097bd 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -9,6 +9,7 @@ import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   headline: {
@@ -19,10 +20,6 @@ const messages = defineMessages({
     id: 'password.email.label',
     defaultMessage: '!!!Email address',
   },
-  submitButtonLabel: {
-    id: 'password.submit.label',
-    defaultMessage: '!!!Submit',
-  },
   successInfo: {
     id: 'password.successInfo',
     defaultMessage: '!!!Your new password was sent to your email address',
@@ -112,7 +109,7 @@ export default @observer class Password extends Component {
             <Button
               className="auth__button is-loading"
               buttonType="secondary"
-              label={`${intl.formatMessage(messages.submitButtonLabel)} ...`}
+              label={`${intl.formatMessage(globalMessages.submit)} ...`}
               loaded={false}
               disabled
             />
@@ -120,7 +117,7 @@ export default @observer class Password extends Component {
             <Button
               type="submit"
               className="auth__button"
-              label={intl.formatMessage(messages.submitButtonLabel)}
+              label={intl.formatMessage(globalMessages.submit)}
             />
           )}
         </form>
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index 0f821d4fc..ded36bbe7 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -10,6 +10,7 @@ import { Badge } from '@meetfranz/ui';
 import Modal from '../ui/Modal';
 import Infobox from '../ui/Infobox';
 import Appear from '../ui/effects/Appear';
+import globalMessages from '../../i18n/globalMessages';
 
 import { CDN_URL } from '../../config';
 
@@ -300,11 +301,14 @@ class SetupAssistant extends Component {
                 value={slackWorkspace}
               />
               <div className={classes.modalActionContainer}>
-                <Button type="submit" label="Save" />
+                <Button
+                  type="submit"
+                  label={intl.formatMessage(globalMessages.save)}
+                />
                 <Button
                   type="link"
                   buttonType="secondary"
-                  label="Cancel"
+                  label={intl.formatMessage(globalMessages.cancel)}
                   className={classes.ctaCancel}
                   onClick={() => this.setState({ slackWorkspace: '' })}
                 />
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index b24055828..d59cbe228 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -11,6 +11,7 @@ import ms from 'ms';
 import { observable, autorun } from 'mobx';
 import ServiceModel from '../../../models/Service';
 import { cmdOrCtrlShortcutKey } from '../../../environment';
+import globalMessages from '../../../i18n/globalMessages';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
@@ -259,7 +260,7 @@ class TabItem extends Component {
             detail: intl.formatMessage(messages.confirmDeleteService, {
               serviceName: service.name || service.recipe.name,
             }),
-            buttons: ['Yes', 'No'],
+            buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
           });
           if (selection === 0) {
             deleteService();
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index 14184f80b..a9601836b 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import injectSheet from 'react-jss';
 import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
 import classnames from 'classnames';
 
 import Modal from '../../components/ui/Modal';
@@ -17,12 +18,24 @@ import {
 import Form from './Form';
 
 import styles from './styles';
+import globalMessages from '../../i18n/globalMessages';
+
+const messages = defineMessages({
+  signIn: {
+    id: 'feature.basicAuth.signIn',
+    defaultMessage: '!!!Sign In',
+  },
+});
 
 export default @injectSheet(styles) @observer class BasicAuthModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
   }
 
+  static contextTypes = {
+    intl: intlShape,
+  };
+
   submit(e) {
     e.preventDefault();
 
@@ -56,6 +69,8 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
       return null;
     }
 
+    const { intl } = this.context;
+
     return (
       <Modal
         isOpen={isModalVisible}
@@ -63,7 +78,7 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
         close={this.cancel.bind(this)}
         showClose={false}
       >
-        <h1>Sign in</h1>
+        <h1>{intl.formatMessage(messages.signIn)}</h1>
         <p>
           http
           {authInfo.port === 443 && 's'}
@@ -86,13 +101,13 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
           <div className={classes.buttons}>
             <Button
               type="button"
-              label="Cancel"
+              label={intl.formatMessage(globalMessages.cancel)}
               buttonType="secondary"
               onClick={this.cancel.bind(this)}
             />
             <Button
               type="submit"
-              label="Sign In"
+              label={intl.formatMessage(messages.signIn)}
             />
           </div>
         </form>
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 6e5941948..e43287db5 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -11,6 +11,7 @@ import { state as ModalState } from './store';
 import SettingsStore from '../../stores/SettingsStore';
 import UIStore from '../../stores/UIStore';
 import UserStore from '../../stores/UserStore';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   title: {
@@ -25,10 +26,6 @@ const messages = defineMessages({
     id: 'feature.nightlyBuilds.activate',
     defaultMessage: '!!!Activate',
   },
-  cancel: {
-    id: 'feature.nightlyBuilds.cancel',
-    defaultMessage: '!!!Cancel',
-  },
 });
 
 const styles = () => ({
@@ -114,7 +111,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
           />
           <Button
             type="button"
-            label={intl.formatMessage(messages.cancel)}
+            label={intl.formatMessage(globalMessages.cancel)}
             className={classes.button}
             onClick={() => this.close()}
           />
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index cc219957a..f4d764577 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -33,4 +33,28 @@ export default defineMessages({
     id: 'global.userAgentHelp',
     defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   },
+  yes: {
+    id: 'global.yes',
+    defaultMessage: '!!!Yes',
+  },
+  no: {
+    id: 'global.no',
+    defaultMessage: '!!!No',
+  },
+  ok: {
+    id: 'global.ok',
+    defaultMessage: '!!!Ok',
+  },
+  cancel: {
+    id: 'global.cancel',
+    defaultMessage: '!!!Cancel',
+  },
+  save: {
+    id: 'global.save',
+    defaultMessage: '!!!Save',
+  },
+  submit: {
+    id: 'global.submit',
+    defaultMessage: '!!!Submit',
+  },
 });
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 391309b1f..b72cc8fe3 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 93d27fb75..4138209ad 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "خادم مخصص",
   "changeserver.headline": "تغيير الخادم",
   "changeserver.label": "خادم",
-  "changeserver.submit": "إرسال",
   "changeserver.urlError": "الرجاء إدخال URL صحيح",
   "changeserver.warning": "لن يتم حفظ الإعدادات الإضافية التي يوفرها فردي",
   "connectionLostBanner.cta": "إعادة تحميل الخدمة",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.",
   "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
   "feature.nightlyBuilds.activate": "تفعيل",
-  "feature.nightlyBuilds.cancel": "إلغاء",
   "feature.nightlyBuilds.info": "الإصدارات الليلية هي إصدارات تجريبية للغاية من فردي والتي قد تحتوي على ميزات غير مصقولة أو غير كاملة. يتم استخدام هذه الإنشاءات الليلية بشكل أساسي من قبل المطورين لاختبار ميزاتهم المطورة حديثًا وكيفية أدائهم في التصميم النهائي. إذا كنت لا تعرف ما تفعله ، فنقترح عدم تنشيط الإنشاءات الليلية.",
   "feature.nightlyBuilds.title": "المباني الليلية",
   "feature.publishDebugInfo.error": "حدث خطأ أثناء محاولة نشر معلومات التصحيح. الرجاء المحاولة مرة أخرى لاحقاً أو عرض وحدة التحكم لمزيد من المعلومات.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "بحث...",
   "feature.quickSwitch.title": "تبديل سريع",
   "global.api.unhealthy": "لا يمكن الإتصال بخدمات فردي عبر الإنترنت",
+  "global.cancel": "إلغاء",
   "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
   "global.spellchecker.useDefault": "إستخدم الإعدادت الافتراضية ({default})",
   "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً",
   "global.spellchecking.autodetect.short": "تلقائي",
   "global.spellchecking.language": "لغة التدقيق الإملائي",
+  "global.submit": "إرسال",
   "global.userAgentHelp": "استخدم 'https://whatmyuseragent.com/' (لاكتشاف) أو 'https://developers.whatismybrowser.com/useragents/explore/' (لاختار) وكيل المستخدم المنشود و نسخه لصقه هنا.",
   "global.userAgentPref": "وكيل المستخدم",
   "import.headline": "استيراد خدمات فردي الأربع",
@@ -145,7 +145,6 @@
   "password.link.login": "سجل الدخول لحسابك",
   "password.link.signup": "إنشاء حساب مجاني",
   "password.noUser": "لم يُعثر على مُستخدمٍ بعنوانِ البريدِ هذا",
-  "password.submit.label": "إرسال",
   "password.successInfo": "رجاءً تحقق من عنوان بريدك الإلكتروني",
   "pricing.features.accountSync": "مزامنةُ الحساب",
   "pricing.features.customWebsites": "إضافة مواقع مخصصة",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 06a6f3aec..23669b75a 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Паслужнік",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Напішыце дзейсны URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/bg.json b/src/i18n/locales/bg.json
index 87d1083a8..138595221 100644
--- a/src/i18n/locales/bg.json
+++ b/src/i18n/locales/bg.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Изпращане",
   "import.headline": "Вмъкнете вашите услуги на Франц 4",
   "import.notSupportedHeadline": "Тези услуги не се подържат все още във Франц 5. ",
   "import.skip.label": "Искам да прибавя ръчно услуги",
@@ -109,7 +110,6 @@
   "password.link.login": "Влизте в профила си",
   "password.link.signup": "Създаване на безплатен профил",
   "password.noUser": "Абонат с такава е-поща не бе намерен",
-  "password.submit.label": "Изпращане",
   "password.successInfo": "Моля отбележете вашата е-поща",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 391309b1f..b72cc8fe3 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 635b39f05..83b1b1da3 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Servidor personalitzat",
   "changeserver.headline": "Canvía de Servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Enviar",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Torna a carregar el servei",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
   "feature.debugger.title": "Registra la informació de depuració",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel·la",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "S'ha produït un error en intentar publicar la informació de depuració. Torneu-ho a provar més tard o visualitzeu la consola per obtenir més informació.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "No es pot connectar amb els serveis en línia de Ferdi",
+  "global.cancel": "Cancel·la",
   "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
   "global.spellchecker.useDefault": "Utilitzar el predeterminat del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar l'idioma automàticament",
   "global.spellchecking.autodetect.short": "Automàtic",
   "global.spellchecking.language": "Corrector ortogràfic",
+  "global.submit": "Enviar",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importa els teus serveis Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Inicia la sessió al teu compte",
   "password.link.signup": "Crea un compte gratuït",
   "password.noUser": "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
-  "password.submit.label": "Enviar",
   "password.successInfo": "Comproveu el vostre correu electrònic",
   "pricing.features.accountSync": "Sincronització de Conte",
   "pricing.features.customWebsites": "Afegir llocs web personalitzats",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 88f9f1209..c72a842b7 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Vlastní server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Odeslat",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Obnovit službu",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Zrušit",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nemůžeme připojit Ferdi k online službám",
+  "global.cancel": "Zrušit",
   "global.notConnectedToTheInternet": "Připojení k internetu není k dispozici.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznat jazyk",
   "global.spellchecking.autodetect.short": "Automaticky",
   "global.spellchecking.language": "Oprava překlepů jazyka",
+  "global.submit": "Odeslat",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importovat služby z Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Přihlásit se k účtu",
   "password.link.signup": "Vytvořit uživatelský účet zdarma",
   "password.noUser": "Pro emailovou adresu nebyl nalezený žádný uživatel",
-  "password.submit.label": "Odeslat",
   "password.successInfo": "Prosím, zkontrolujte svůj e-mail",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index c2697f41e..0a4ef6e52 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Brugerdefineret server",
   "changeserver.headline": "Skift server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Send",
   "changeserver.urlError": "Indtast en gyldig URL",
   "changeserver.warning": "Ekstra indstillinger, der tilbydes af Ferdi, vil ikke blive gemt",
   "connectionLostBanner.cta": "Genindlæs tjeneste",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Åh nej! Ferdi mistede forbindelsen til {name}.",
   "feature.debugger.title": "Udgiv fejlfindingsoplysninger",
   "feature.nightlyBuilds.activate": "Aktiver",
-  "feature.nightlyBuilds.cancel": "Annuller",
   "feature.nightlyBuilds.info": "Natlige byg af Ferdi er meget eksperimentelle versioner, der kan indeholde ikke polerede eller ufærdige funktioner. Disse natlige byg bruges hovedsageligt af udviklere til at teste deres nyudviklede funktioner, og hvordan de vil opføre sig i den endelige version. Hvis du er usikker, foreslår vi ikke at aktivere natlige byg.",
   "feature.nightlyBuilds.title": "Natlige byg",
   "feature.publishDebugInfo.error": "Der opstod en fejl under forsøg på at udgive fejlfindingsoplysningerne. Prøv igen senere, eller se konsollen for mere information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Søg...",
   "feature.quickSwitch.title": "Hurtigskift",
   "global.api.unhealthy": "Kan ikke oprette forbindelse til Ferdi onlinetjenester",
+  "global.cancel": "Annuller",
   "global.notConnectedToTheInternet": "Du har ikke forbindelse til internettet.",
   "global.spellchecker.useDefault": "Benyt systemstandard ({default})",
   "global.spellchecking.autodetect": "Vælg sprog automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Stavekontrolsprog",
+  "global.submit": "Send",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importer dine Ferdi 4-tjenester",
@@ -145,7 +145,6 @@
   "password.link.login": "Log ind på din konto",
   "password.link.signup": "Opret en gratis konto",
   "password.noUser": "Der blev ikke fundet nogen bruger med den mailadresse",
-  "password.submit.label": "Send",
   "password.successInfo": "Tjek venligst din mail",
   "pricing.features.accountSync": "Kontosynkronisering",
   "pricing.features.customWebsites": "Tilføj brugerdefinerede hjemmesider",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 2ae94ca43..f1ff9002d 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Eigener Server",
   "changeserver.headline": "Server wechseln",
   "changeserver.label": "Server",
-  "changeserver.submit": "Absenden",
   "changeserver.urlError": "Bitte gib eine gültige URL ein",
   "changeserver.warning": "Zusätzliche Einstellungen von Ferdi werden nicht gespeichert",
   "connectionLostBanner.cta": "Dienst neu laden",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh nein! Ferdi hat die Verbindung zu {name} verloren.",
   "feature.debugger.title": "Debug-Informationen veröffentlichen",
   "feature.nightlyBuilds.activate": "Aktivieren",
-  "feature.nightlyBuilds.cancel": "Abbrechen",
   "feature.nightlyBuilds.info": "Nightly builds sind experimentelle Versionen von Ferdi die unfertige Funktionen enthalten kann. Nightly builds werden hauptsächlich von Entwicklern genutzt um neu entwickelte Features zu testen und zu sehen wie sie sich in der finalen Version verhalten. Wenn du nicht genau weisst was du tust, empfehlen wir dir Nightly Builds nicht zu aktivieren.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Beim Veröffentlichen der Debug-Informationen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal oder sehe dir die Konsole für weitere Informationen an.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Suchen...",
   "feature.quickSwitch.title": "Schnellauswahl",
   "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
+  "global.cancel": "Abbrechen",
   "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
   "global.spellchecker.useDefault": "Standard benutzen ({default})",
   "global.spellchecking.autodetect": "Sprache automatisch erkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Sprache für Rechtschreibprüfung",
+  "global.submit": "Absenden",
   "global.userAgentHelp": "Benutze 'https://whatmyuseragent.com/' (für das Entdecken) oder 'https://developers.whatismybrowser.com/useragents/explore/' (für die Wahl) deines gewünschten User Agenten und kopiere ihn hier hinein.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Deine Ferdi-4-Dienste importieren",
@@ -145,7 +145,6 @@
   "password.link.login": "Mit deinem Konto anmelden",
   "password.link.signup": "Kostenloses Konto erstellen",
   "password.noUser": "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden",
-  "password.submit.label": "Absenden",
   "password.successInfo": "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt",
   "pricing.features.accountSync": "Konto-Synchronisierung",
   "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 537aa7236..94d5fb480 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -49,78 +49,65 @@
         "defaultMessage": "!!!Change server",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Server",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.label",
         "start": {
           "column": 9,
-          "line": 18
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 26
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.warning",
         "start": {
           "column": 11,
-          "line": 22
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Custom server",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 30
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.customServerLabel",
         "start": {
           "column": 21,
-          "line": 26
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Enter a valid URL",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 34
         },
         "file": "src/components/auth/ChangeServer.js",
         "id": "changeserver.urlError",
         "start": {
           "column": 12,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Submit",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.submit",
-        "start": {
-          "column": 10,
-          "line": 34
+          "line": 31
         }
       }
     ],
@@ -568,91 +555,78 @@
         "defaultMessage": "!!!Forgot password",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/auth/Password.js",
         "id": "password.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/components/auth/Password.js",
         "id": "password.email.label",
         "start": {
           "column": 14,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Submit",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.submit.label",
-        "start": {
-          "column": 21,
-          "line": 22
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Your new password was sent to your email address",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 26
         },
         "file": "src/components/auth/Password.js",
         "id": "password.successInfo",
         "start": {
           "column": 15,
-          "line": 26
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!No user affiliated with that email address",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 30
         },
         "file": "src/components/auth/Password.js",
         "id": "password.noUser",
         "start": {
           "column": 10,
-          "line": 30
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Create a free account",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 34
         },
         "file": "src/components/auth/Password.js",
         "id": "password.link.signup",
         "start": {
           "column": 14,
-          "line": 34
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Sign in to your account",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 38
         },
         "file": "src/components/auth/Password.js",
         "id": "password.link.login",
         "start": {
           "column": 13,
-          "line": 38
+          "line": 35
         }
       }
     ],
@@ -760,52 +734,52 @@
         "defaultMessage": "!!!Let's get started",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.headline",
         "start": {
           "column": 12,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.subheadline",
         "start": {
           "column": 15,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Let's go",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.submit.label",
         "start": {
           "column": 21,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Invitations sent successfully",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "invite.successInfo",
         "start": {
           "column": 21,
-          "line": 32
+          "line": 33
         }
       }
     ],
@@ -1696,182 +1670,182 @@
         "defaultMessage": "!!!Reload",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.reload",
         "start": {
           "column": 10,
-          "line": 20
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.edit",
         "start": {
           "column": 8,
-          "line": 24
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Disable notifications",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableNotifications",
         "start": {
           "column": 24,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Enable notifications",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableNotification",
         "start": {
           "column": 23,
-          "line": 32
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Disable audio",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 40
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableAudio",
         "start": {
           "column": 16,
-          "line": 36
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 44
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableAudio",
         "start": {
           "column": 15,
-          "line": 40
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Enable Dark mode",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 48
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Disable Dark mode",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 52
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableDarkMode",
         "start": {
           "column": 19,
-          "line": 48
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Disable Service",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 56
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableService",
         "start": {
           "column": 18,
-          "line": 52
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Enable Service",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 60
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableService",
         "start": {
           "column": 17,
-          "line": 56
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Hibernate Service",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 64
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.hibernateService",
         "start": {
           "column": 20,
-          "line": 60
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Wake Up Service",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 68
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.wakeUpService",
         "start": {
           "column": 17,
-          "line": 64
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 72
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.deleteService",
         "start": {
           "column": 17,
-          "line": 68
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 77
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.confirmDeleteService",
         "start": {
           "column": 24,
-          "line": 72
+          "line": 73
         }
       }
     ],
@@ -4959,6 +4933,24 @@
     ],
     "path": "src/containers/settings/EditUserScreen.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Sign In",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/basicAuth/Component.js",
+        "id": "feature.basicAuth.signIn",
+        "start": {
+          "column": 10,
+          "line": 24
+        }
+      }
+    ],
+    "path": "src/features/basicAuth/Component.json"
+  },
   {
     "descriptors": [
       {
@@ -4983,52 +4975,39 @@
         "defaultMessage": "!!!Nightly Builds",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 20
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.title",
         "start": {
           "column": 9,
-          "line": 16
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.info",
         "start": {
           "column": 8,
-          "line": 20
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Activate",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "src/features/nightlyBuilds/Component.js",
         "id": "feature.nightlyBuilds.activate",
         "start": {
           "column": 12,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Cancel",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.cancel",
-        "start": {
-          "column": 10,
-          "line": 28
+          "line": 25
         }
       }
     ],
@@ -5870,6 +5849,84 @@
           "column": 17,
           "line": 32
         }
+      },
+      {
+        "defaultMessage": "!!!Yes",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.yes",
+        "start": {
+          "column": 7,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!No",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.no",
+        "start": {
+          "column": 6,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Ok",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.ok",
+        "start": {
+          "column": 6,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Cancel",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.cancel",
+        "start": {
+          "column": 10,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Save",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.save",
+        "start": {
+          "column": 8,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Submit",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.submit",
+        "start": {
+          "column": 10,
+          "line": 56
+        }
       }
     ],
     "path": "src/i18n/globalMessages.json"
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 0181593cb..3bd348466 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Προσαρμοσμένος διακομιστής",
   "changeserver.headline": "Change server",
   "changeserver.label": "Διακομιστής",
-  "changeserver.submit": "Υποβολή",
   "changeserver.urlError": "Εισάγετε μια έγκυρη διεύθυνση URL",
   "changeserver.warning": "Οι επιπλέον ρυθμίσεις από το Ferdi δεν θα αποθηκευτούν",
   "connectionLostBanner.cta": "Ανανέωση Υπηρεσίας",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
   "feature.debugger.title": "Εγγραφή πληροφοριών εντοπισμού σφαλμάτων",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Ακύρωση",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Ferdi",
+  "global.cancel": "Ακύρωση",
   "global.notConnectedToTheInternet": "Έχετε αποσυνδεθεί από το Διαδίκτυο",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Υποβολή",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Εισαγάγετε τις υπηρεσίες σας Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Σύνδεση στο λογαριασμό σας",
   "password.link.signup": "Δημιουργία δωρεάν λογαριασμού",
   "password.noUser": "Δεν βρέθηκε χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "password.submit.label": "Υποβολή",
   "password.successInfo": "Ελέγξτε το email σας",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d39baac38..8006f8c58 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -4,15 +4,14 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
+  "feature.basicAuth.signIn": "Sign In",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,13 +25,19 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
+  "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.ok": "Ok",
+  "global.save": "Save",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
+  "global.yes": "Yes",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -145,7 +150,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 07894a062..223c40c4a 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Cambiar servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Enviar",
   "changeserver.urlError": "Ingrese una URL válida",
   "changeserver.warning": "Los ajustes extra ofrecidos por Ferdi no serán guardados",
   "connectionLostBanner.cta": "Recargar Servicio",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
   "feature.debugger.title": "Publica la información de depuración",
   "feature.nightlyBuilds.activate": "Activar",
-  "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Las \"Nightly builds\" son versiones altamente experimentales de Ferdi que pueden contener características sin pulir o sin completar. Estas versiones son utilizadas principalmente por los desarrolladores para probar sus nuevas características desarrolladas y cómo se comportarán en la versión final. Si no sabe lo que está haciendo, le sugerimos que no active las estas versiones.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Hubo un error al intentar publicar la información de depuración. Por favor, inténtalo de nuevo más tarde o revisa la consola para más información.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Buscar...",
   "feature.quickSwitch.title": "Cambiar rápidamente",
   "global.api.unhealthy": "No es posible conectarse a los servicios en línea de Ferdi.",
+  "global.cancel": "Cancelar",
   "global.notConnectedToTheInternet": "No estás conectado a Internet",
   "global.spellchecker.useDefault": "Utilizar estándar del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar el idioma automáticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Corrector de ortografía",
+  "global.submit": "Enviar",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "Navegador",
   "import.headline": "Importa tus servicios de Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Inicia sesión en tu cuenta",
   "password.link.signup": "Crear una cuenta gratuita",
   "password.noUser": "No se encontró un usuario con esa dirección de correo electrónico",
-  "password.submit.label": "Enviar",
   "password.successInfo": "Por favor revisa tu correo electrónico",
   "pricing.features.accountSync": "Sincronización de cuenta",
   "pricing.features.customWebsites": "Agregue sitios personalizados",
diff --git a/src/i18n/locales/et.json b/src/i18n/locales/et.json
index 62efbc5aa..6d3512186 100644
--- a/src/i18n/locales/et.json
+++ b/src/i18n/locales/et.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Tuvastage keel automaatselt",
   "global.spellchecking.autodetect.short": "Automaatne",
   "global.spellchecking.language": "Õigekirja kontrollimise keel",
+  "global.submit": "Saada",
   "import.headline": "Importige oma Ferdi 4 teenused",
   "import.notSupportedHeadline": "Teenused, mida Ferdi 5 veel ei toeta",
   "import.skip.label": "Soovin teenuseid käsitsi lisada",
@@ -109,7 +110,6 @@
   "password.link.login": "Logige sisse oma kontole",
   "password.link.signup": "Loo tasuta konto",
   "password.noUser": "Ühtegi selle e-posti aadressiga kasutajat ei leitud",
-  "password.submit.label": "Saada",
   "password.successInfo": "Palun kontrollige oma e-posti aadressi",
   "pricing.features.accountSync": "Konto sünkroonimine",
   "pricing.features.adFree": "Igavesti reklaamivaba",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index bfc275e58..7a3035b6f 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "تشخیص خودکار زبان",
   "global.spellchecking.autodetect.short": "خودکار",
   "global.spellchecking.language": "زبان غلط یاب املایی",
+  "global.submit": "ارسال ",
   "import.headline": "جانشانی سرویس های فرانز 4",
   "import.notSupportedHeadline": "این سرویس ها در Ferdi ۵ پشتیبانی نمیشوند.",
   "import.skip.label": "میخواهم سرویس ها را به صورت دستی اضافه کنم.",
@@ -109,7 +110,6 @@
   "password.link.login": "وارد شدن به اکانت خود",
   "password.link.signup": "ساخت یک حساب کاربری",
   "password.noUser": "هیچ کاربری با این نشانی ایمیل یافت نشد ",
-  "password.submit.label": "ارسال ",
   "password.successInfo": "لطفا ایمیل خود را چک کنید",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 2dc140fbc..f3fa87f4f 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Mukautettu palvelin",
   "changeserver.headline": "Vaihda palvelinta",
   "changeserver.label": "Palvelin",
-  "changeserver.submit": "Jatka",
   "changeserver.urlError": "Anna kelvollinen URL-osoite",
   "changeserver.warning": "Ferdin tarjoamia lisäasetuksia ei tallenneta",
   "connectionLostBanner.cta": "Lataa Palvelu uudelleen",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Voi ei! Ferdi menetti yhteyden {name}.",
   "feature.debugger.title": "Julkaise virheraportti",
   "feature.nightlyBuilds.activate": "Aktivoi",
-  "feature.nightlyBuilds.cancel": "Peruuta",
   "feature.nightlyBuilds.info": "Uusimmat versiot ovat Ferdin kokeellisia versioita, jotka voivat sisältää viimeistelemättömiä tai keskeneräisiä ominaisuuksia. Näitä uusimpia versioita käyttävät pääasiassa kehittäjät testaamaan uusia ominaisuuksia ja miten ne toimivat lopullisessa versiossa. Jos et tiedä mitä olet tekemässä, suosittelemme ettet aktivoi uusimpia versioita.",
   "feature.nightlyBuilds.title": "Uusimmat versiot",
   "feature.publishDebugInfo.error": "Virheraportin julkaisussa tapahtui virhe. Yritä myöhemmin uudelleen tai katso konsolista saadaksesi lisätietoja.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Etsi...",
   "feature.quickSwitch.title": "Pikavalitsin",
   "global.api.unhealthy": "Ferdin verkkopalveluihin ei saada yhteyttä",
+  "global.cancel": "Peruuta",
   "global.notConnectedToTheInternet": "Et ole yhteydessä internetiin.",
   "global.spellchecker.useDefault": "Käytä järjestelmän oletusasetusta ({default})",
   "global.spellchecking.autodetect": "Tunnista kieli automaattisesti",
   "global.spellchecking.autodetect.short": "Automaattinen",
   "global.spellchecking.language": "Oikeinkirjoituksen tarkistuskieli",
+  "global.submit": "Jatka",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Tuo Ferdin 4 palveluasi",
@@ -145,7 +145,6 @@
   "password.link.login": "Kirjaudu tilillesi",
   "password.link.signup": "Luo ilmainen tili",
   "password.noUser": "Tälle sähköpostiosoiteelle ei löytynyt käyttäjää",
-  "password.submit.label": "Jatka",
   "password.successInfo": "Ole hyvä ja tarkista sähköpostisi",
   "pricing.features.accountSync": "Tilin Synkronointi",
   "pricing.features.customWebsites": "Lisää mukautettuja sivustoja",
diff --git a/src/i18n/locales/fil.json b/src/i18n/locales/fil.json
index 0bcaad1ee..069f2fbd3 100644
--- a/src/i18n/locales/fil.json
+++ b/src/i18n/locales/fil.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Ilagay ang iyonhg Ferdi 4 services",
   "import.notSupportedHeadline": "Ang mga services ay hindi pa supported ni Ferdi 5",
   "import.skip.label": "Gusto kong magdagdag",
@@ -109,7 +110,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 0b5617c39..3a31b3a56 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Serveur personnalisé",
   "changeserver.headline": "Changer de serveur",
   "changeserver.label": "Serveur",
-  "changeserver.submit": "Soumettre",
   "changeserver.urlError": "Entrez une URL valide",
   "changeserver.warning": "Les paramètres supplémentaires proposés par Ferdi ne seront pas sauvegardés",
   "connectionLostBanner.cta": "Redémarrer le service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
   "feature.debugger.title": "Publier les informations de débogage",
   "feature.nightlyBuilds.activate": "Activer",
-  "feature.nightlyBuilds.cancel": "Annuler",
   "feature.nightlyBuilds.info": "Les versions de développement sont des versions expérimentales de Ferdi qui peuvent contenir des fonctionnalités non optimisées ou incomplètes. Ces versions de développement sont principalement utilisés par les développeurs pour tester leurs nouvelles fonctionnalités et leurs performances. Si vous ne savez pas ce que vous faites, nous vous suggérons de ne pas activer les versions de développement.",
   "feature.nightlyBuilds.title": "Versions de développement",
   "feature.publishDebugInfo.error": "Il y a eu une erreur en essayant de publier les informations de débogage. Veuillez réessayer plus tard ou consulter la console pour plus d'informations.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Rechercher...",
   "feature.quickSwitch.title": "Changement rapide",
   "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
+  "global.cancel": "Annuler",
   "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
   "global.spellchecker.useDefault": "Par défaut ({default})",
   "global.spellchecking.autodetect": "Détecter automatiquement la langue",
   "global.spellchecking.autodetect.short": "Automatiquement",
   "global.spellchecking.language": "Langue de la vérification orthographique",
+  "global.submit": "Soumettre",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importez vos services depuis la version 4 de Ferdi",
@@ -145,7 +145,6 @@
   "password.link.login": "Connectez-vous à votre compte",
   "password.link.signup": "Créer un compte gratuit",
   "password.noUser": "Aucun utilisateur n'a été trouvé avec cette adresse email",
-  "password.submit.label": "Soumettre",
   "password.successInfo": "Merci de consulter vos emails",
   "pricing.features.accountSync": "Synchronisation de compte",
   "pricing.features.customWebsites": "Ajouter des sites web modifiés",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 66273540e..7a4591383 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Freastalaí saincheaptha",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Cuir isteach",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Athlódáil seirbhís",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cealaigh",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
+  "global.cancel": "Cealaigh",
   "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Cuir isteach",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Iompórtáil do sheirbhísí Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Logáil isteach i do chuntas",
   "password.link.signup": "Cruthaigh cuntas saor in aisce",
   "password.noUser": "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
-  "password.submit.label": "Cuir isteach",
   "password.successInfo": "Seiceáil do chuid ríomhphoist le do thoil",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 3c41ee549..9d1e2b63d 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "שרת מותאם אישית",
   "changeserver.headline": "החלף שרת",
   "changeserver.label": "שרת",
-  "changeserver.submit": "שלח",
   "changeserver.urlError": "אנא הזן כתובת URL תקינה",
   "changeserver.warning": "הגדרות נוספות המוצעות על ידי פרדי לא ישמרו",
   "connectionLostBanner.cta": "טען מחדש את השירות",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "הו לא! פרדי איבד את החיבור ל {name}.",
   "feature.debugger.title": "פרסם את פרטי ניפוי השגיאות",
   "feature.nightlyBuilds.activate": "הפעל",
-  "feature.nightlyBuilds.cancel": "בטל",
   "feature.nightlyBuilds.info": "גרסאות נייטלי הם גרסאות נסיוניות ביותר של פרדי, העשויות להכיל פיצ'רים בלתי גמורים. גרסאות אלה מיועדות בעיקר לשימוש מפתחים על מנת לנסות את הפיצ'רים החדשים הנמצאים בפיתוח - לפני הכנסתם לגרסה הסופית. אם אתה לא יודע מה אתה עושה, אנו ממליצים שלא תפעיל את האופציה הזאת.",
   "feature.nightlyBuilds.title": "גרסאות נייטלי",
   "feature.publishDebugInfo.error": "קיימת שגיאה בפרסום מידע ניפוי השגיאות, אנא נסה שנית מאוחר יותר או הסתכל בקובץ הלוג למידע נוסף.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "חיפוש...",
   "feature.quickSwitch.title": "החלפה מהירה",
   "global.api.unhealthy": "לא ניתן להתחבר לשרותי האינטרנת של Ferdi",
+  "global.cancel": "בטל",
   "global.notConnectedToTheInternet": "נראה שאתה לא מחובר לאינטרנט.",
   "global.spellchecker.useDefault": "השתמש בברירת המחדל של המערכת ({default})",
   "global.spellchecking.autodetect": "זהה שפה באופן אוטומטי",
   "global.spellchecking.autodetect.short": "אוטומטי",
   "global.spellchecking.language": "שפה לבדיקת איות",
+  "global.submit": "שלח",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "סוכן משתמש",
   "import.headline": "ייבא את השירותים שלך מפרדי גרסה 4",
@@ -145,7 +145,6 @@
   "password.link.login": "היכנס לחשבונך",
   "password.link.signup": "צור חשבון חדש בחינם",
   "password.noUser": "לא נמצא משתמש עם כתובת הדוא\"ל הזאת",
-  "password.submit.label": "שלח",
   "password.successInfo": "אנא בדוק את הדוא\"ל שלך",
   "pricing.features.accountSync": "סנכון החשבון",
   "pricing.features.customWebsites": "הוסף אתרים מותאמים אישית",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index d39baac38..807ae00ec 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index a1d354e35..f900df534 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Pošalji",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Odustani",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nije se moguće povezati na Francove on-line servise. ",
+  "global.cancel": "Odustani",
   "global.notConnectedToTheInternet": "Sada ste povezani s internetom. ",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Pošalji",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Uvezite svoje Franc 4 servise. ",
@@ -145,7 +145,6 @@
   "password.link.login": "Prijavite se na Vaš račun",
   "password.link.signup": "Stvorite besplatan račun",
   "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
-  "password.submit.label": "Pošalji",
   "password.successInfo": "Molimo Vas da provjerite svoju e-mail adresu",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 62811a903..d16101a6c 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Egyéni szerver",
   "changeserver.headline": "Szerver megváltoztatása",
   "changeserver.label": "Szerver",
-  "changeserver.submit": "Küldés",
   "changeserver.urlError": "Adjon meg egy érvényes URL-t",
   "changeserver.warning": "A Ferdi által kínált extra beállítások nem kerülnek mentésre",
   "connectionLostBanner.cta": "Szolgáltatás újraindítása",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Ja ne! Ferdi nem tud kapcsolodni {name}-hez.",
   "feature.debugger.title": "Hibakeresési napló publikálása",
   "feature.nightlyBuilds.activate": "Aktiválás",
-  "feature.nightlyBuilds.cancel": "Mégsem",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly verziók",
   "feature.publishDebugInfo.error": "Hiba történt a hibakeresési napló publikálása közben. Kérem próbálja meg később.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Keresés...",
   "feature.quickSwitch.title": "Gyorsváltó",
   "global.api.unhealthy": "Nem lehet csatlakozni a Ferdi online szolgáltatáshoz",
+  "global.cancel": "Mégsem",
   "global.notConnectedToTheInternet": "Nincs hálózati kapcsolat.",
   "global.spellchecker.useDefault": "Rendszer alapbeállítás használata ({default})",
   "global.spellchecking.autodetect": "Automatikus nyelvdetektálás",
   "global.spellchecking.autodetect.short": "Automatikus",
   "global.spellchecking.language": "Helyesírás-ellenőrző nyelve",
+  "global.submit": "Küldés",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importáld szolgáltatásaidat a Ferdi 4-ből",
@@ -145,7 +145,6 @@
   "password.link.login": "Jelentkezz be a fiókodba",
   "password.link.signup": "Új fiók létrehozása",
   "password.noUser": "Nem található felhasználó a megadott email címmel",
-  "password.submit.label": "Küldés",
   "password.successInfo": "Ellenőrizd az email fiókodat",
   "pricing.features.accountSync": "Fiók szinkronizálás",
   "pricing.features.customWebsites": "Egyéni weboldalak megadása",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 525989e73..fa71d154e 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Server khusus",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Kirim",
   "changeserver.urlError": "Isi URL yang valid",
   "changeserver.warning": "Pengaturan tambahan dari Ferdi tidak akan tersimpan",
   "connectionLostBanner.cta": "Muat ulang Layanan",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Yah! Ferdi terputus dari {name}.",
   "feature.debugger.title": "Terbitkan informasi debug",
   "feature.nightlyBuilds.activate": "Mengaktifkan",
-  "feature.nightlyBuilds.cancel": "Batalkan",
   "feature.nightlyBuilds.info": "Nightly builds adalah versi eksperimen dari Ferdi yang mungkin berisi fitur-fitur yang masih kasar dan tidak lengkap. Nightly builds ini biasa digunakan untuk para developer untuk mengetes fitur-fitur terbaru mereka dan bagaimana fitur-fitur itu berjalan di versi terakhir. Jika anda tidak tahu apa yang anda lakukan, kami sarankan untuk tidak mengaktivasi nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Tidak dapat tersambung ke layanan Ferdi",
+  "global.cancel": "Batalkan",
   "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
   "global.spellchecker.useDefault": "Gunakan Bawaan Sistem ({default})",
   "global.spellchecking.autodetect": "Deteksi bahasa secara otomatis",
   "global.spellchecking.autodetect.short": "Otomatis",
   "global.spellchecking.language": "Periksa ejaan",
+  "global.submit": "Kirim",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Impor layanan Ferdi 4 Anda",
@@ -145,7 +145,6 @@
   "password.link.login": "Masuk ke akun Anda",
   "password.link.signup": "Buat akun gratis",
   "password.noUser": "Tidak ditemukan pengguna dengan email tersebut",
-  "password.submit.label": "Kirim",
   "password.successInfo": "Periksa email Anda",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 9fda9cf44..e00f7fb3e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Server personalizzato",
   "changeserver.headline": "Cambia Server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Invia",
   "changeserver.urlError": "Inserisci un URL valido",
   "changeserver.warning": "Le impostazioni extra offerte da Ferdi non verranno salvate",
   "connectionLostBanner.cta": "Ricarica Servizio",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
   "feature.debugger.title": "Pubblica informazioni di debug",
   "feature.nightlyBuilds.activate": "Attivato",
-  "feature.nightlyBuilds.cancel": "Annulla",
   "feature.nightlyBuilds.info": "Le 'Nightly Builds' sono versioni sperimentali di Ferdi che possono contenere funzionalità incomplete o non perfettamente funzionanti. Queste versioni sono principalmente usate dagli sviluppatori per effettuare dei test sulle nuove caratteristiche e verificare come si integrano nella versione finale di Ferdi. Se non sei sicuro di quello che stai facendo, ti consigliamo di non attivare le 'Nightly Builds'.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Si è verificato un errore durante il tentativo di pubblicare le informazioni di debug. Riprova più tardi o vedi la console per maggiori informazioni.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "Cambio Veloce",
   "global.api.unhealthy": "Impossibile connettersi ai servizi online di Ferdi",
+  "global.cancel": "Annulla",
   "global.notConnectedToTheInternet": "Non sei connesso a Internet.",
   "global.spellchecker.useDefault": "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect": "Rileva automaticamente la lingua",
   "global.spellchecking.autodetect.short": "Automatico",
   "global.spellchecking.language": "Lingua per controllo ortografico",
+  "global.submit": "Invia",
   "global.userAgentHelp": "Usa 'https://whatmyuseragent.com/' (per scoprire) o 'https://developers.whatismybrowser.com/useragents/explore/' (per scegliere) il tuo user agent desiderato e copialo qui.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importa i servizi di Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Accedi al tuo account",
   "password.link.signup": "Crea un account gratuito",
   "password.noUser": "Non è stato trovato nessun utente con questo indirizzo email",
-  "password.submit.label": "Invia",
   "password.successInfo": "Per favore controlla la tua email",
   "pricing.features.accountSync": "Sincronizzazione account",
   "pricing.features.customWebsites": "Aggiungi siti web personalizzati",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index aa40f89df..95fcacfa8 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "独自サーバー",
   "changeserver.headline": "サーバーの変更",
   "changeserver.label": "サーバー",
-  "changeserver.submit": "送信",
   "changeserver.urlError": "有効なURLを入力してください。",
   "changeserver.warning": "Ferdiの追加設定は保存されません",
   "connectionLostBanner.cta": "サービスをリロードする",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "{name}への接続が切断されました。",
   "feature.debugger.title": "デバッグ情報の記録",
   "feature.nightlyBuilds.activate": "有効化",
-  "feature.nightlyBuilds.cancel": "キャンセル",
   "feature.nightlyBuilds.info": "Nightlyビルドは未検証や未完成の機能が含まれる非常に実験的なバージョンです。このバージョンは、主に新機能のテストや最新ビルドでの検証を行う開発者が使用するものです。これを理解していない方は、Nightlyビルドを有効化しないことをおすすめします。",
   "feature.nightlyBuilds.title": "Nightlyビルド",
   "feature.publishDebugInfo.error": "デバッグ情報の公開中にエラーが発生しました。後でもう一度試すか、コンソールを表示して詳細な情報を確認します。",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "検索...",
   "feature.quickSwitch.title": "クイックスイッチ",
   "global.api.unhealthy": "Ferdiのオンラインサービスに接続できません。",
+  "global.cancel": "キャンセル",
   "global.notConnectedToTheInternet": "インターネットに接続されていません。",
   "global.spellchecker.useDefault": "システムデフォルトを使用する({default})",
   "global.spellchecking.autodetect": "言語を自動的に検出する",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "スペルチェックする言語",
+  "global.submit": "送信",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "ユーザーエージェント",
   "import.headline": "Ferdi 4のサービスをインポートして下さい",
@@ -145,7 +145,6 @@
   "password.link.login": "サインイン",
   "password.link.signup": "無料アカウントを作成",
   "password.noUser": "このメールアドレスはまだ登録されていません",
-  "password.submit.label": "送信",
   "password.successInfo": "メールを確認して下さい",
   "pricing.features.accountSync": "アカウントの同期",
   "pricing.features.customWebsites": "カスタムサイトを追加",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 58063587e..3b98357be 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "კერძო სერვერი",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "დადასტურება",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "გაუქმება",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ferdi-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
+  "global.cancel": "გაუქმება",
   "global.notConnectedToTheInternet": "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "დადასტურება",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "შემოიტანე Ferdi 4-ის სერვისები",
@@ -145,7 +145,6 @@
   "password.link.login": "შედით თქვენს ანგარიშში",
   "password.link.signup": "ანგარიშის შექმნა",
   "password.noUser": "მომხმარებელი მითითებული მეილით ვერ მოიძებნა",
-  "password.submit.label": "დადასტურება",
   "password.successInfo": "გთხოვთ შეამოწმეთ მეილი",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/kk.json b/src/i18n/locales/kk.json
index 462ca8543..63c4b3b3e 100644
--- a/src/i18n/locales/kk.json
+++ b/src/i18n/locales/kk.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -109,7 +110,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index e1c100f6c..30fe90654 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "사용자 정의 서버",
   "changeserver.headline": "서버 번경",
   "changeserver.label": "서버",
-  "changeserver.submit": "제출",
   "changeserver.urlError": "유효한 URL을 입력하세요",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "서비스 재시작",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결이 끊겼습니다.",
   "feature.debugger.title": "디버깅 정보 공개",
   "feature.nightlyBuilds.activate": "활성화",
-  "feature.nightlyBuilds.cancel": "취소",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "나이틀리 빌드",
   "feature.publishDebugInfo.error": "디버그 정보를 공개하는데 오류가 발생했습니다. 조금 뒤에 다시 시도하거나 콘솔을 통해 정보를 확인하십시오.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "검색...",
   "feature.quickSwitch.title": "빠른 검색",
   "global.api.unhealthy": "Ferdi 온라인 서비스에 연결할 수 없습니다.",
+  "global.cancel": "취소",
   "global.notConnectedToTheInternet": "인터넷에 연결할 수 없습니다.",
   "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
   "global.spellchecking.autodetect": "언어 자동 탐색",
   "global.spellchecking.autodetect.short": "자동",
   "global.spellchecking.language": "철자 검사",
+  "global.submit": "제출",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "계정에 로그인하세요.",
   "password.link.signup": "무료 계정 생성",
   "password.noUser": "해당 이메일을 사용하는 유저를 찾을 수 없습니다.",
-  "password.submit.label": "제출",
   "password.successInfo": "이메일을 확인해 주세요.",
   "pricing.features.accountSync": "계정 동기화",
   "pricing.features.customWebsites": "사용자 지정 웹사이트 추가",
diff --git a/src/i18n/locales/ms.json b/src/i18n/locales/ms.json
index 6f92bf4de..67f62375f 100644
--- a/src/i18n/locales/ms.json
+++ b/src/i18n/locales/ms.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Kesan bahasa secara automatik",
   "global.spellchecking.autodetect.short": "Automatik",
   "global.spellchecking.language": "Bahasa untuk semakan ejaan",
+  "global.submit": "Hantar",
   "import.headline": "Import perkhidmatan Ferdi 4 anda",
   "import.notSupportedHeadline": "Perkhidmatan belum disokong dalam Ferdi 5",
   "import.skip.label": "Saya mahu menambah perkhidmatan secara manual",
@@ -109,7 +110,6 @@
   "password.link.login": "Log masuk akaun kamu",
   "password.link.signup": "Buka akaun baru percuma",
   "password.noUser": "Tiada pengguna dengan alamat e-mel tersebut dijumpai",
-  "password.submit.label": "Hantar",
   "password.successInfo": "Sila semak e-mel anda",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
diff --git a/src/i18n/locales/nb.json b/src/i18n/locales/nb.json
index c2f9f0e53..25d4c19d6 100644
--- a/src/i18n/locales/nb.json
+++ b/src/i18n/locales/nb.json
@@ -1,6 +1,7 @@
 {
   "global.api.unhealthy": "Kan ikke koble til Ferdi' tjenester",
   "global.notConnectedToTheInternet": "Du er ikke koblet til internett.",
+  "global.submit": "Send inn",
   "welcome.signupButton": "Opprett en gratis konto",
   "welcome.loginButton": "Logg inn til din konto",
   "welcome.slogan": "Teksting som funker for deg",
@@ -15,7 +16,6 @@
   "login.link.password": "Reset passord",
   "password.headline": "Reset passord",
   "password.email.label": "Email adresse",
-  "password.submit.label": "Send inn",
   "password.noUser": "Ingen bruker med den emailen finnes",
   "password.successInfo": "Vennligst sjekk din email",
   "password.link.signup": "Opprett en gratis konto",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 1e6060164..4b974e741 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Verzenden",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Service Herladen",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Annuleren",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi services",
+  "global.cancel": "Annuleren",
   "global.notConnectedToTheInternet": "Je hebt geen internet verbinding.",
   "global.spellchecker.useDefault": "Gebruik Systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal spellingscontrole",
+  "global.submit": "Verzenden",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importeer je Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Log in op je account",
   "password.link.signup": "Maak een gratis account aan",
   "password.noUser": "Geen gebruiker gevonden met dat e-mailadres",
-  "password.submit.label": "Verzenden",
   "password.successInfo": "Controleer alsjeblieft je e-mail",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 2d9459691..fb705ff44 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Aangepaste server",
   "changeserver.headline": "Server wijzigen",
   "changeserver.label": "Server",
-  "changeserver.submit": "Verzenden",
   "changeserver.urlError": "Vul een geldige URL in",
   "changeserver.warning": "Extra instellingen van Ferdi worden niet opgeslagen",
   "connectionLostBanner.cta": "Een service opnieuw laden",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh nee! Ferdi heeft de verbinding met {name} verloren.",
   "feature.debugger.title": "Foutopsporingsinformatie publiceren",
   "feature.nightlyBuilds.activate": "Activeren",
-  "feature.nightlyBuilds.cancel": "Annuleer",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nachtelijke builds",
   "feature.publishDebugInfo.error": "Er is een fout opgetreden tijdens het publiceren van de debug informatie. Probeer het later opnieuw of bekijk de console voor meer informatie.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Zoeken...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services.",
+  "global.cancel": "Annuleer",
   "global.notConnectedToTheInternet": "U bent niet verbonden met het internet.",
   "global.spellchecker.useDefault": "Gebruik systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal voor spellingcontrole",
+  "global.submit": "Verzenden",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importeer uw Ferdi 4-services",
@@ -145,7 +145,6 @@
   "password.link.login": "Log in op je account",
   "password.link.signup": "Maak een gratis account aan",
   "password.noUser": "Geen gebruiker bekend met dat e-mailadres",
-  "password.submit.label": "Verzenden",
   "password.successInfo": "Controleer je e-mail",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index b9b180545..d2c13686e 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Egendefinert tjener",
   "changeserver.headline": "Bytt tjener",
   "changeserver.label": "Tjener",
-  "changeserver.submit": "Send",
   "changeserver.urlError": "Angi en gyldig nettadresse",
   "changeserver.warning": "Ekstra innstillinger som tilbys av Ferdi vil ikke bli lagret",
   "connectionLostBanner.cta": "Last inn tjenesten på nytt",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Å nei! Ferdi mistet forbindelsen til {name}.",
   "feature.debugger.title": "Publiser feilsøkingsinformasjon",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Avbryt",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Det oppstod en feil under forsøket på å publisere feilsøkingsinformasjonen. Prøv igjen senere eller se i konsollet for ytterligere informasjon.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Søk...",
   "feature.quickSwitch.title": "Hurtigbytte",
   "global.api.unhealthy": "Kan ikke koble til Ferdi online-tjenester",
+  "global.cancel": "Avbryt",
   "global.notConnectedToTheInternet": "Du er ikke koblet til Internett.",
   "global.spellchecker.useDefault": "Bruk systemstandarden ({default})",
   "global.spellchecking.autodetect": "Oppdag språk automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Språk for stavekontroll",
+  "global.submit": "Send",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importer Ferdi 4-tjenestene dine",
@@ -145,7 +145,6 @@
   "password.link.login": "Logg inn på kontoen din",
   "password.link.signup": "Opprett en gratis konto",
   "password.noUser": "Ingen bruker med den e-postadressen ble funnet",
-  "password.submit.label": "Send",
   "password.successInfo": "Vennligst sjekk e-posten din",
   "pricing.features.accountSync": "Konto synkronisering",
   "pricing.features.customWebsites": "Legg til egendefinerte nettsteder",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 4ef0ee895..0faad775e 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Spersonalizowany serwer",
   "changeserver.headline": "Zmień serwer",
   "changeserver.label": "Serwer",
-  "changeserver.submit": "Wyślij",
   "changeserver.urlError": "Wprowadź prawidłowy adres URL",
   "changeserver.warning": "Dodatkowe ustawienia oferowane przez Ferdi nie zostaną zapisane",
   "connectionLostBanner.cta": "Przeładuj usługę",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
   "feature.debugger.title": "Opublikuj dane diagnostyczne",
   "feature.nightlyBuilds.activate": "Aktywuj",
-  "feature.nightlyBuilds.cancel": "Anuluj",
   "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.",
   "feature.nightlyBuilds.title": "Kompilacje testowe",
   "feature.publishDebugInfo.error": "Wystąpił błąd podczas publikowania informacji o debugowaniu. Spróbuj ponownie później lub sprawdź konsolę po więcej informacji.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Szukaj...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
+  "global.cancel": "Anuluj",
   "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
   "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect": "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short": "Automatycznie",
   "global.spellchecking.language": "Język sprawdzania pisowni",
+  "global.submit": "Wyślij",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importuj usługi Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Zaloguj się na swoje konto",
   "password.link.signup": "Załóż darmowe konto",
   "password.noUser": "Nie znaleziono użytkownika z takim adresem email",
-  "password.submit.label": "Wyślij",
   "password.successInfo": "Proszę sprawdzić swój email",
   "pricing.features.accountSync": "Synchronizacja konta",
   "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 610882591..7e0705a8d 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Confirmar",
   "changeserver.urlError": "Informe uma URL válida",
   "changeserver.warning": "As configurações extras oferecidas pelo Ferdi não serão salvas",
   "connectionLostBanner.cta": "Recarregar serviço",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
   "feature.debugger.title": "Publicar informações de depuração",
   "feature.nightlyBuilds.activate": "Ativar",
-  "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Versões noturnas são versões do Ferdi altamente experimentais que podem conter funcionalidades não finalizadas ou não concluídas. Essas compilações noturnas são usadas principalmente por desenvolvedores para testar seus recursos recém-desenvolvidos e como eles irão se comportar na versão final. Se você não sabe o que está fazendo, sugerimos não ativar versões noturnas.",
   "feature.nightlyBuilds.title": "Versões noturnas",
   "feature.publishDebugInfo.error": "Ocorreu um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou verifique o console para mais informações.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Localizar...",
   "feature.quickSwitch.title": "Troca Rápida",
   "global.api.unhealthy": "Não foi possível estabelecer ligação aos serviços do Ferdi",
+  "global.cancel": "Cancelar",
   "global.notConnectedToTheInternet": "Você não está conectado à internet.",
   "global.spellchecker.useDefault": "Utilizar o Padrão do Sistema ({default})",
   "global.spellchecking.autodetect": "Detectar a idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Idioma para correção ortográfica",
+  "global.submit": "Confirmar",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (para descobrir) ou 'https://developers.whatismybrowser.com/useragents/explore/' (para escolher) o agente de usuário desejado e copie e cole aqui.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importar os seus serviços do Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Iniciar sessão",
   "password.link.signup": "Criar uma conta gratuita",
   "password.noUser": "Não existe nenhuma conta associada a esse endereço de e-mail",
-  "password.submit.label": "Confirmar",
   "password.successInfo": "Por favor, verifique seu e-mail",
   "pricing.features.accountSync": "Sincronização da conta",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 5344bb9c0..c5fa7c21b 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Servidor personalizado",
   "changeserver.headline": "Alterar servidor",
   "changeserver.label": "Servidor",
-  "changeserver.submit": "Enviar",
   "changeserver.urlError": "Introduza um URL válido",
   "changeserver.warning": "As configurações extras oferecidas pelo Ferdi não serão gravadas",
   "connectionLostBanner.cta": "Reiniciar serviço",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh não! O Ferdi perdeu a ligação com {name}.",
   "feature.debugger.title": "Publicar informações de depuração",
   "feature.nightlyBuilds.activate": "Activar",
-  "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "Houve um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou visualize a consola para mais informações.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "A procurar...",
   "feature.quickSwitch.title": "Troca Rápida",
   "global.api.unhealthy": "Não é possível ligar aos serviços online de Ferdi",
+  "global.cancel": "Cancelar",
   "global.notConnectedToTheInternet": "Não está ligado à internet.",
   "global.spellchecker.useDefault": "Use o padrão de sistema ({default})",
   "global.spellchecking.autodetect": "Detectar idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Idioma para corrector ortográfico",
+  "global.submit": "Enviar",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importe os seus serviços do Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Entrar na sua conta",
   "password.link.signup": "Criar uma conta gratuita",
   "password.noUser": "Não foi encontrado nenhum utilizador com este e-mail",
-  "password.submit.label": "Enviar",
   "password.successInfo": "Por favor, verifique o seu e-mail",
   "pricing.features.accountSync": "Sincronização de conta",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 91090ae5f..6e8f8f724 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Introduceți un URL valid",
   "changeserver.warning": "Setările suplimentare oferite de Ferdi nu vor fi salvate",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh nu! Ferdi a pierdut conexiunea cu {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activare",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Căutare...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nu se pot conecta la Ferdi servicii online",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "Nu ești conectat la internet.",
   "global.spellchecker.useDefault": "Folosește sistemul implicit ({default})",
   "global.spellchecking.autodetect": "Detectează limba automat",
   "global.spellchecking.autodetect.short": "Automat",
   "global.spellchecking.language": "Limba de verificare a ortografiei",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importă serviciile tale Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 5ff32e6b8..ff8f2e84b 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Пользовательский сервер",
   "changeserver.headline": "Изменить сервер",
   "changeserver.label": "Сервер",
-  "changeserver.submit": "Принять",
   "changeserver.urlError": "Введите допустимый URL-адрес",
   "changeserver.warning": "Дополнительные настройки, предлагаемые Ферди, не будут сохранены",
   "connectionLostBanner.cta": "Перезапустить сервис",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "О нет! Ферди потерял связь с {name}.",
   "feature.debugger.title": "Опубликовать отладочную информацию",
   "feature.nightlyBuilds.activate": "Активировать",
-  "feature.nightlyBuilds.cancel": "Отмена",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Поиск...",
   "feature.quickSwitch.title": "Быстрое переключение",
   "global.api.unhealthy": "Невозможно подключиться к онлайн-сервисам Ferdi",
+  "global.cancel": "Отмена",
   "global.notConnectedToTheInternet": "Вы не подключены к сети Интернет",
   "global.spellchecker.useDefault": "Использовать системные параметры по умолчанию ({default})",
   "global.spellchecking.autodetect": "Найти язык автоматически",
   "global.spellchecking.autodetect.short": "Авто",
   "global.spellchecking.language": "Проверка правописания",
+  "global.submit": "Принять",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Импортировать ваши сервисы из Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Вход",
   "password.link.signup": "Создать бесплатный аккаунт",
   "password.noUser": "Не найдено пользователя с таким адресом электронной почты",
-  "password.submit.label": "Принять",
   "password.successInfo": "Проверьте вашу электронную почту",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Добавить пользовательские веб-сайты",
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 940864fa0..4291a575f 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "යවන්න",
   "import.headline": "ඔබගේ ෆ්රාන්ස් සේවාවන් නැවත ඇතුලත් කරගන්න.",
   "import.notSupportedHeadline": "සේවාවන් සඳහා ෆ්රාන්ස් 5 හි තවමත් පහසුකම් සලසා නැත.",
   "import.skip.label": "සේවාවන් මවිසින් ඇතුලත් කල යුතුය. ",
@@ -109,7 +110,6 @@
   "password.link.login": "ඔබේ ගිණුමට ඇතුල් වන්න ",
   "password.link.signup": "නව නොමිල ගිණුමක් අරඹන්න ",
   "password.noUser": "එම විද්‍යුත් තැපැල් ලිපිනය යටතේ කිසිදු පරිශීලකයෙක් නොමැත ",
-  "password.submit.label": "යවන්න",
   "password.successInfo": "කරුණාකර ඔබේ විද්‍යුත් තැපෑල පිරික්සන්න",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index f0839a7e9..976835f60 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Vlastný server",
   "changeserver.headline": "Zmeniť server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Odoslať",
   "changeserver.urlError": "Zadajte platnú adresu URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Obnoviť službu",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh nie! Ferdi stratil pripojenie k {name}.",
   "feature.debugger.title": "Zverejniť informácie ladenia",
   "feature.nightlyBuilds.activate": "Aktivovať",
-  "feature.nightlyBuilds.cancel": "Zrušiť",
   "feature.nightlyBuilds.info": "Tzv. \"nočné verzie\" sú vysoko experimentálne verzie Ferdi, ktoré môžu obsahovať nedoladená alebo nedokončené funkcie. Tieto verzie sú používané predovšetkým vývojármi, aby otestovali novo-vyvíjané funkcie a spôsob, akým sa budú správať vo finálnej verzii. Ak neviete čo robíte, navrhujeme neaktivovať tieto experimentálne verzie.",
   "feature.nightlyBuilds.title": "Vývojárske verzie",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Hľadať...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nedá sa pripojiť k online službám Ferdi",
+  "global.cancel": "Zrušiť",
   "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
   "global.spellchecker.useDefault": "Použiť predvolené nastavenie systému ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznať jazyk",
   "global.spellchecking.autodetect.short": "Automatický",
   "global.spellchecking.language": "Jazyk kontroly pravopisu",
+  "global.submit": "Odoslať",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importovať vaše služby z Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Prihlásiť sa do vášho účtu",
   "password.link.signup": "Vytvoriť používateľský účet zdarma",
   "password.noUser": "Používateľ s touto e-mailovou adresou nebol nájdený",
-  "password.submit.label": "Odoslať",
   "password.successInfo": "Skontrolujte prosím váš e-mail",
   "pricing.features.accountSync": "Synchronizácia účtu",
   "pricing.features.customWebsites": "Pridať vlastnú webstránku",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 391309b1f..b72cc8fe3 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/sq.json b/src/i18n/locales/sq.json
index fd1cbf1fd..db74679c0 100644
--- a/src/i18n/locales/sq.json
+++ b/src/i18n/locales/sq.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -109,7 +110,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 2f71d924b..e26c88b4b 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Prilagođen server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Сервер",
-  "changeserver.submit": "Pošalji",
   "changeserver.urlError": "Унесите исправан URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Поново учирај услугу",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Активирај",
-  "feature.nightlyBuilds.cancel": "Odustani",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nije moguće pristupiti Ferdi-ovim on-line servisima. ",
+  "global.cancel": "Odustani",
   "global.notConnectedToTheInternet": "Niste povezani sa serverom.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Аутоматски",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Pošalji",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Uvezite svoje Ferdi 4 servise",
@@ -145,7 +145,6 @@
   "password.link.login": "Prijavite se na Vaš račun",
   "password.link.signup": "Stvorite besplatan račun",
   "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
-  "password.submit.label": "Pošalji",
   "password.successInfo": "Molimo Vas da provjerite vašu e-mail adresu",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 7897fbc45..da9a77846 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Anpassad server",
   "changeserver.headline": "Byt server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Skicka",
   "changeserver.urlError": "Ange en giltig URL",
   "changeserver.warning": "Extra inställningar från Ferdi kommer inte sparas",
   "connectionLostBanner.cta": "Ladda om tjänst",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Åh nej! Ferdi förlorade anslutningen till {name}.",
   "feature.debugger.title": "Skicka felsökningsinformation",
   "feature.nightlyBuilds.activate": "Aktivera",
-  "feature.nightlyBuilds.cancel": "Avbryt",
   "feature.nightlyBuilds.info": "Nattliga kompileringar är väldigt experimentella versioner av Ferdi som kan innehålla ofärdiga och ännu ej testade funktioner. Nattliga kompilering är i första hand tänkt för utvecklare för att kunna testa hur nya funktioner fungerar och presterar. Är du osäker på vad detta innebär rekommenderas du att inte aktivera nattliga kompileringar.",
   "feature.nightlyBuilds.title": "Nattlig kompilering",
   "feature.publishDebugInfo.error": "Ett fel uppstod när felsökningsinformationen skulle skickas. Försök igen senare eller se konsolen för mer information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Sök...",
   "feature.quickSwitch.title": "Snabbväxling",
   "global.api.unhealthy": "Kan inte ansluta till Ferdis onlinetjänster",
+  "global.cancel": "Avbryt",
   "global.notConnectedToTheInternet": "Du är inte ansluten till Internet.",
   "global.spellchecker.useDefault": "Använd systemstandard ({default})",
   "global.spellchecking.autodetect": "Identifiera språk automatiskt",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Rättstavningsspråk",
+  "global.submit": "Skicka",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importera dina Ferdi 4-tjänster",
@@ -145,7 +145,6 @@
   "password.link.login": "Logga in på ditt konto",
   "password.link.signup": "Skapa ett gratis konto",
   "password.noUser": "Ingen användare med den e-postadressen hittades",
-  "password.submit.label": "Skicka",
   "password.successInfo": "Vänligen kontrollera din e-post",
   "pricing.features.accountSync": "Synkronisering av konto",
   "pricing.features.customWebsites": "Lägg till egna webbplatser",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index d39baac38..807ae00ec 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "Reload Service",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.cancel": "Cancel",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 2e7422d6a..f2ee005ca 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Özel sunucu",
   "changeserver.headline": "Sunucuyu değiştir",
   "changeserver.label": "Sunucu",
-  "changeserver.submit": "Gönder",
   "changeserver.urlError": "Geçerli bir URL girin",
   "changeserver.warning": "Ferdi'nin sunduğu ekstra ayarlar kaydedilmeyecektir",
   "connectionLostBanner.cta": "Servisi Tekrar Yükle",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Nayır, nolamaz! Ferdi {name} ile bağlantısını yitirdi.",
   "feature.debugger.title": "Hata ayıklama bilgisini yayımla",
   "feature.nightlyBuilds.activate": "Etkinleştir",
-  "feature.nightlyBuilds.cancel": "İptal",
   "feature.nightlyBuilds.info": "Nightly yapılar Ferdi'nin deneysel sürümleri olup tamamlanmamış özellikler içerebilir. Bu nightly yapılar genellikle geliştiriciler tarafından yeni özellikleri deneyip geliştirmek için kullanılır. Ne yaptığınızı bilmiyorsanız nightly yapıları etkinleştirmeyin.",
   "feature.nightlyBuilds.title": "Nightly Yapılar",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Ara...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ferdi hizmetlerine şu anda erişilemiyor",
+  "global.cancel": "İptal",
   "global.notConnectedToTheInternet": "İnternete bağlı değilsiniz.",
   "global.spellchecker.useDefault": "Sistem Dilini Kullan ({default})",
   "global.spellchecking.autodetect": "Dili otomatik tespit et",
   "global.spellchecking.autodetect.short": "Otomatik",
   "global.spellchecking.language": "İmla kontrol dili",
+  "global.submit": "Gönder",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Ferdi 4 servislerinizi içeri aktarın",
@@ -145,7 +145,6 @@
   "password.link.login": "Hesabına giriş yap",
   "password.link.signup": "Ücretsiz hesap oluştur",
   "password.noUser": "Bu e-posta adresinde bir kullanıcı bulunamadı",
-  "password.submit.label": "Gönder",
   "password.successInfo": "E-postanızı kontrol ediniz",
   "pricing.features.accountSync": "Hesap Eşitleme",
   "pricing.features.customWebsites": "Özel Siteler Ekle",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 22cb9c495..bb214597e 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Користувацький сервер",
   "changeserver.headline": "Змінити сервер",
   "changeserver.label": "Сервер",
-  "changeserver.submit": "Подати",
   "changeserver.urlError": "Введіть дійсний URL",
   "changeserver.warning": "Додаткові налаштування, запропоновані Ферді не будуть збережені",
   "connectionLostBanner.cta": "Перезавантажити сервіс",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "О ні! Ферді втратив з'єднання з {name}.",
   "feature.debugger.title": "Опублікувати інформацію для налагодження",
   "feature.nightlyBuilds.activate": "Активувати",
-  "feature.nightlyBuilds.cancel": "Відмінити",
   "feature.nightlyBuilds.info": "Нічні збірки - це високоекспериментальні версії Ferdi, що можуть містити \"неполіровані\" або незавершені функції. Нічні збірки в основному використовуються розробниками, щоб перевірити свої нові функції та те, як вони будуть працювати в фінальній версії. Якщо ви не знаєте, що ви робите, то радимо не активувати нічні збірки.",
   "feature.nightlyBuilds.title": "Нічні збірки",
   "feature.publishDebugInfo.error": "Сталася помилка під час спроби опублікувати інформацію для налагодження. Будь ласка, спробуйте ще раз пізніше або перегляньте консоль для отримання додаткової інформації.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Пошук...",
   "feature.quickSwitch.title": "Швидке перемикання",
   "global.api.unhealthy": "Не можливо підключитись до онлайн сервісів Ferdi",
+  "global.cancel": "Відмінити",
   "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
   "global.spellchecker.useDefault": "Використовувати системні параметри за змовчуванням ({default})",
   "global.spellchecking.autodetect": "Автоматично визначати мову",
   "global.spellchecking.autodetect.short": "Автоматично",
   "global.spellchecking.language": "Мова перевірки правопису",
+  "global.submit": "Подати",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "Ідентифікатор браузера",
   "import.headline": "Імпортувати ваші сервіси з Ferdi 4",
@@ -145,7 +145,6 @@
   "password.link.login": "Увійти до вашого акаунту",
   "password.link.signup": "Створити безплатний акаунт",
   "password.noUser": "Не знайдено жодного користувача з цією email адресою",
-  "password.submit.label": "Подати",
   "password.successInfo": "Будь ласка, перевірте ваш email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 2d099ac6d..2f93c2770 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Máy chủ tùy chỉnh",
   "changeserver.headline": "Thay đổi máy chủ",
   "changeserver.label": "Máy chủ",
-  "changeserver.submit": "Gửi",
   "changeserver.urlError": "Nhập địa chỉ web",
   "changeserver.warning": "Cài đặt mở rộng sẽ không được lưu lại",
   "connectionLostBanner.cta": "Tải lại dịch vụ",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Mất kết nối tới {name}.",
   "feature.debugger.title": "Gửi thông tin gỡ lỗi",
   "feature.nightlyBuilds.activate": "Kích hoạt",
-  "feature.nightlyBuilds.cancel": "Hủy",
   "feature.nightlyBuilds.info": "Các bản Nightly là các phiên bản Ferdi mang tính thử nghiệm có thể chứa các tính năng chưa được hoàn thiện. Các bản Nightly chủ yếu được các nhà phát triển sử dụng để kiểm tra các tính năng mới được phát triển của họ và cách chúng sẽ hoạt động trong bản dựng cuối cùng. Nếu bạn không biết mình đang làm gì, chúng tôi khuyên bạn không nên kích hoạt các bản dựng hàng đêm.",
   "feature.nightlyBuilds.title": "Phiên bản Nightly",
   "feature.publishDebugInfo.error": "Đã xảy ra lỗi khi cố gắng xuất bản thông tin gỡ lỗi. Vui lòng thử lại sau hoặc xem bảng điều khiển để biết thêm thông tin.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "Tìm kiếm...",
   "feature.quickSwitch.title": "Chuyển đổi nhanh",
   "global.api.unhealthy": "Không thể kết nối đến máy chủ trực tuyến của Ferdi",
+  "global.cancel": "Hủy",
   "global.notConnectedToTheInternet": "Bạn không kết nối với Internet.",
   "global.spellchecker.useDefault": "Dùng mặc định hệ thống ({default})",
   "global.spellchecking.autodetect": "Tự động phát hiện ngôn ngữ",
   "global.spellchecking.autodetect.short": "Tự động",
   "global.spellchecking.language": "Ngôn ngữ kiểm tra chính tả",
+  "global.submit": "Gửi",
   "global.userAgentHelp": "Sử dụng 'https://whatmyuseragent.com/' (để khám phá) hoặc 'https://developers.whatismybrowser.com/useragents/explore/' (để chọn) tác nhân người dùng mong muốn của bạn và sao chép-dán nó vào đây.",
   "global.userAgentPref": "Tác nhân Người dùng",
   "import.headline": "Nhập các dịch vụ Ferdi 4 của bạn",
@@ -145,7 +145,6 @@
   "password.link.login": "Đăng nhập Tài khoản",
   "password.link.signup": "Tạo tài khoản miễn phí",
   "password.noUser": "Không tìm thấy người dùng được đăng ký với địa chỉ e-mail này",
-  "password.submit.label": "Gửi",
   "password.successInfo": "Vui lòng kiểm tra hộp thư của bạn",
   "pricing.features.accountSync": "Đồng bộ hóa Tài khoản",
   "pricing.features.customWebsites": "Thêm Trang web tùy chỉnh",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 057d86253..253016919 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -27,6 +27,7 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
+  "global.submit": "Submit",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -131,7 +132,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
diff --git a/src/i18n/locales/zh-HANS.json b/src/i18n/locales/zh-HANS.json
index b7de29eb5..fd26258fc 100644
--- a/src/i18n/locales/zh-HANS.json
+++ b/src/i18n/locales/zh-HANS.json
@@ -19,6 +19,7 @@
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
   "global.spellchecking.language": "语言拼写检查",
+  "global.submit": "提交",
   "import.headline": "导入自定义Ferdi 4服务",
   "import.notSupportedHeadline": "Ferdi 5 目前不支持此项服务",
   "import.skip.label": "手动添加服务",
@@ -109,7 +110,6 @@
   "password.link.login": "登录到您的帐户",
   "password.link.signup": "创建一个免费账户",
   "password.noUser": "该邮箱尚未注册",
-  "password.submit.label": "提交",
   "password.successInfo": "请检查您的 email 邮箱",
   "premiumFeature.button.upgradeAccount": "升级账户",
   "pricing.features.accountSync": "帐户同步",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 7ffe6aa86..30a874c5e 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "切換服務器",
   "changeserver.label": "伺服器",
-  "changeserver.submit": "送出",
   "changeserver.urlError": "Enter a valid URL",
   "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
   "connectionLostBanner.cta": "重新載入",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.debugger.title": "發布除錯訊息",
   "feature.nightlyBuilds.activate": "Activate",
-  "feature.nightlyBuilds.cancel": "取消",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "搜尋...",
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "無法連接到Ferdi網路服務",
+  "global.cancel": "取消",
   "global.notConnectedToTheInternet": "您未連上網際網路",
   "global.spellchecker.useDefault": "使用系統預設值({default})",
   "global.spellchecking.autodetect": "自動檢測語言",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "拼字檢查語言",
+  "global.submit": "送出",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "匯入您的 Ferdi 4 服務",
@@ -145,7 +145,6 @@
   "password.link.login": "登入您的帳戶",
   "password.link.signup": "建立一個免費帳戶",
   "password.noUser": "此電子郵件帳戶不存在",
-  "password.submit.label": "送出",
   "password.successInfo": "請重新確認您的電子郵件信箱",
   "pricing.features.accountSync": "帳號同步",
   "pricing.features.customWebsites": "添加自訂網站",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index d2b86d5ef..29a72fe54 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -16,6 +16,7 @@
   "global.spellchecking.autodetect": "自動偵測語言",
   "global.spellchecking.autodetect.short": "自動的",
   "global.spellchecking.language": "拼字檢查語言",
+  "global.submit": "送出",
   "import.headline": "匯入 Ferdi 4 的服務",
   "import.notSupportedHeadline": "Ferdi 5 尚未支援此服務",
   "import.skip.label": "手動添加服務",
@@ -104,7 +105,6 @@
   "password.link.login": "登入您的帳號",
   "password.link.signup": "建立免費帳號",
   "password.noUser": "找不到該電子郵件地址的用戶",
-  "password.submit.label": "送出",
   "password.successInfo": "請檢查您的電子郵件",
   "premiumFeature.button.upgradeAccount": "升級帳號",
   "pricing.features.adFree": "Forever ad-free",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index dda788c1f..4e8bef02a 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -4,7 +4,6 @@
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "服务器：",
-  "changeserver.submit": "Submit",
   "changeserver.urlError": "输入有效的URL",
   "changeserver.warning": "Ferdi提供的额外设置将不会被保存",
   "connectionLostBanner.cta": "重新加载服务",
@@ -12,7 +11,6 @@
   "connectionLostBanner.message": "哦不！Ferdi失去了与 {name} 的连接。",
   "feature.debugger.title": "发布调试信息",
   "feature.nightlyBuilds.activate": "激活",
-  "feature.nightlyBuilds.cancel": "取消",
   "feature.nightlyBuilds.info": "每夜版(Nightly builds) 是Ferdi的实验性版本，可能包含未完善或未完成的功能。这些每夜版主要由开发人员来测试他们新开发的功能及它们在最终版本的的表现。如果您不知道自己在做什么，我们建议您不要激活每夜版。",
   "feature.nightlyBuilds.title": "每夜版",
   "feature.publishDebugInfo.error": "发布调试信息时出错。请稍后再试或查看控制台以获取更多信息。",
@@ -26,11 +24,13 @@
   "feature.quickSwitch.search": "搜索...",
   "feature.quickSwitch.title": "快速切换",
   "global.api.unhealthy": "无法链接到 Ferdi 在线服务",
+  "global.cancel": "取消",
   "global.notConnectedToTheInternet": "您没有连接到互联网。",
   "global.spellchecker.useDefault": "使用系统默认值 ({default})",
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
   "global.spellchecking.language": "拼写检查语言",
+  "global.submit": "Submit",
   "global.userAgentHelp": "使用 'https://whatmyuseragent.com/' (以发现)或 'https://developers.whatismybrowser.com/useragents/explore/' (以选择) 你所需要的用户代理并复制粘贴到这里。",
   "global.userAgentPref": "浏览器标识（用户代理）",
   "import.headline": "导入你的 Ferdi 4 服务",
@@ -145,7 +145,6 @@
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
-  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
index c8f74a3c0..87e0b5857 100644
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ b/src/i18n/messages/src/components/auth/ChangeServer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Change server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 9
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 22,
+      "line": 23,
       "column": 11
     },
     "end": {
-      "line": 25,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Custom server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 26,
+      "line": 27,
       "column": 21
     },
     "end": {
-      "line": 29,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Enter a valid URL",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 30,
+      "line": 31,
       "column": 12
     },
     "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.submit",
-    "defaultMessage": "!!!Submit",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
       "line": 34,
-      "column": 10
-    },
-    "end": {
-      "line": 37,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
index f335b3acb..336ba42ef 100644
--- a/src/i18n/messages/src/components/auth/Password.json
+++ b/src/i18n/messages/src/components/auth/Password.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,24 +17,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 14
     },
     "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.submit.label",
-    "defaultMessage": "!!!Submit",
-    "file": "src/components/auth/Password.js",
-    "start": {
       "line": 22,
-      "column": 21
-    },
-    "end": {
-      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Your new password was sent to your email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 26,
+      "line": 23,
       "column": 15
     },
     "end": {
-      "line": 29,
+      "line": 26,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!No user affiliated with that email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 30,
+      "line": 27,
       "column": 10
     },
     "end": {
-      "line": 33,
+      "line": 30,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 34,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 37,
+      "line": 34,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Sign in to your account",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 38,
+      "line": 35,
       "column": 13
     },
     "end": {
-      "line": 41,
+      "line": 38,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
index f950228b7..108adab26 100644
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ b/src/i18n/messages/src/components/auth/SetupAssistant.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Let's get started",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 15
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Let's go",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 21
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Invitations sent successfully",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 21
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
index 92ff6fb14..377808db3 100644
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Reload",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 10
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 8
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 24
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 23
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Disable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 36,
+      "line": 37,
       "column": 16
     },
     "end": {
-      "line": 39,
+      "line": 40,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 40,
+      "line": 41,
       "column": 15
     },
     "end": {
-      "line": 43,
+      "line": 44,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Enable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 44,
+      "line": 45,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 48,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Disable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 48,
+      "line": 49,
       "column": 19
     },
     "end": {
-      "line": 51,
+      "line": 52,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Disable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 52,
+      "line": 53,
       "column": 18
     },
     "end": {
-      "line": 55,
+      "line": 56,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Enable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 56,
+      "line": 57,
       "column": 17
     },
     "end": {
-      "line": 59,
+      "line": 60,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Hibernate Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 60,
+      "line": 61,
       "column": 20
     },
     "end": {
-      "line": 63,
+      "line": 64,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Wake Up Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 64,
+      "line": 65,
       "column": 17
     },
     "end": {
-      "line": 67,
+      "line": 68,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 68,
+      "line": 69,
       "column": 17
     },
     "end": {
-      "line": 71,
+      "line": 72,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 72,
+      "line": 73,
       "column": 24
     },
     "end": {
-      "line": 76,
+      "line": 77,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/basicAuth/Component.json b/src/i18n/messages/src/features/basicAuth/Component.json
new file mode 100644
index 000000000..fea1b0838
--- /dev/null
+++ b/src/i18n/messages/src/features/basicAuth/Component.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "feature.basicAuth.signIn",
+    "defaultMessage": "!!!Sign In",
+    "file": "src/features/basicAuth/Component.js",
+    "start": {
+      "line": 24,
+      "column": 10
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/nightlyBuilds/Component.json b/src/i18n/messages/src/features/nightlyBuilds/Component.json
index 084079635..0b2eab354 100644
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ b/src/i18n/messages/src/features/nightlyBuilds/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Nightly Builds",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 9
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,24 +30,11 @@
     "defaultMessage": "!!!Activate",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 12
     },
     "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.cancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
       "line": 28,
-      "column": 10
-    },
-    "end": {
-      "line": 31,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index ed2bfa092..39c1693d5 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -102,5 +102,83 @@
       "line": 35,
       "column": 3
     }
+  },
+  {
+    "id": "global.yes",
+    "defaultMessage": "!!!Yes",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 36,
+      "column": 7
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.no",
+    "defaultMessage": "!!!No",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 40,
+      "column": 6
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.ok",
+    "defaultMessage": "!!!Ok",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 44,
+      "column": 6
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.cancel",
+    "defaultMessage": "!!!Cancel",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 48,
+      "column": 10
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.save",
+    "defaultMessage": "!!!Save",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 52,
+      "column": 8
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.submit",
+    "defaultMessage": "!!!Submit",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 56,
+      "column": 10
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 10fdbe606..b2cc55ad3 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -322,7 +322,7 @@ class RecipeController {
       );
       const darkModeExists = pathExistsSync(darkModeStyle);
 
-      debug('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
+      debug('darkmode.css exists? ', darkModeExists);
 
       // Check if recipe has a custom dark mode handler
       if (this.recipe && this.recipe.darkModeHandler) {
-- 
cgit v1.2.3-54-g00ecf