Rename Ferdi Lock to Password Lock for consistencyv5.4.1-beta.2

42 files changed, 158 insertions, 158 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 3d0213f81..74f5924ea 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -50,7 +50,7 @@ const messages = defineMessages({
   },
   lockedPassword: {
     id: 'settings.app.lockedPassword',
-    defaultMessage: '!!!Ferdi Lock Password',
+    defaultMessage: '!!!Password',
   },
   lockedPasswordInfo: {
     id: 'settings.app.lockedPasswordInfo',
@@ -58,7 +58,7 @@ const messages = defineMessages({
   },
   lockInfo: {
     id: 'settings.app.lockInfo',
-    defaultMessage: '!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.',
+    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.',
   },
   scheduledDNDTimeInfo: {
     id: 'settings.app.scheduledDNDTimeInfo',
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index b64cd77be..aa4de78e9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -72,11 +72,11 @@ const messages = defineMessages({
   },
   enableLock: {
     id: 'settings.app.form.enableLock',
-    defaultMessage: '!!!Enable Ferdi password lock',
+    defaultMessage: '!!!Enable Password Lock',
   },
   lockPassword: {
     id: 'settings.app.form.lockPassword',
-    defaultMessage: '!!!Ferdi Lock password',
+    defaultMessage: '!!!Password',
   },
   scheduledDNDEnabled: {
     id: 'settings.app.form.scheduledDNDEnabled',
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index c2c4a3b3c..b9294123d 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index f7de90243..3ecf0caaf 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Inclou versions beta",
   "settings.app.form.darkMode": "Uneix-te al Cantó Fosc",
   "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica",
   "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimitza Ferdi a la safata del sistema",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Actualitzacions",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Els canvis requereixen reiniciar",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 7ec1ce369..0932ba6ae 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Zahrnout beta verze",
   "settings.app.form.darkMode": "Připoj se k Temné straně",
   "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu",
   "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Jazyk",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimalizovat Ferdi do systémové lišty",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Aktualizace",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Změny vyžadují restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index e68ec41af..cc60891c3 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2683,7 +2683,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Ferdi Lock Password",
+        "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
           "line": 54
@@ -2709,7 +2709,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+        "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
         "end": {
           "column": 3,
           "line": 62
@@ -4175,7 +4175,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Enable Ferdi password lock",
+        "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
           "line": 76
@@ -4188,7 +4188,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Ferdi Lock password",
+        "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
           "line": 80
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index c383a18fb..137bd93cb 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Ενεργοποιήση Ενίσχυσης GPU ",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Ενεργοποίηση ορθογραφικού ελέγχου",
   "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Γλώσσα",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Ενημερώσεις",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Οι αλλαγές απαιτούν επανεκκίνηση",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b7d81356e..e586cb852 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 1fdc74380..235e12146 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -222,14 +222,14 @@
   "settings.app.form.beta": "Cuir leagain béite san áireamh",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
   "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Teanga",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog",
@@ -247,8 +247,8 @@
   "settings.app.headlineLanguage": "Teanga",
   "settings.app.headlineUpdates": "Nuashonruithe",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 462d74d39..6df814503 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Incluir versiones beta",
   "settings.app.form.darkMode": "Únete al Lado Oscuro",
   "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Activar corrección ortográfica",
   "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
   "settings.app.form.enableTodos": "Activar Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas",
   "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Actualizaciones",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Los cambios requieren reiniciar",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index ebc7b1dbe..a580a03c2 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Cuir leagain béite san áireamh",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
   "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Teanga",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Nuashonruithe",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 5d6f353f0..b94733de5 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Obuhvati i beta verzije",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Jezik",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Nadogradnje",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni zagon",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 7695f5fc4..7dd0b4771 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Béta verziók keresése",
   "settings.app.form.darkMode": "Csatlakozz a Sötét Oldalhoz",
   "settings.app.form.enableGPUAcceleration": "Hardveres gyorsítás engedélyezése",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése",
   "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán",
   "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Nyelv",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdi kicsinyítése a tálcára",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Frissítések",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "A hivatalos fordítások angol és német nyelven elérhetőek. Minden más nyelv közösségi fordításon alapul.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Újraindítást igénylő módosítás",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index e48458d07..68b37ca5b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Sertakan versi beta",
   "settings.app.form.darkMode": "Sisi Kelam menunggu Anda (Mode Gelap)",
   "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan",
   "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Bahasa",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Perkecil Ferdi ke baki sistem",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Versi Baru",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Perubahan membutuhkan mulai ulang",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 07a4dc98d..89e3a903e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Includi versioni beta",
   "settings.app.form.darkMode": "Unisciti al Lato Oscuro",
   "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Attiva controllo ortografico",
   "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica",
   "settings.app.form.enableTodos": "Abilità le Attività Ferdi",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Mantieni tutti i workspace caricati",
   "settings.app.form.language": "Lingua",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimizza Ferdi nell'area di notifica",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Aggiornamenti",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Le modifiche richiedono un riavvio",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 0f5a14be1..3dcdb75eb 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Betaバージョンを含める",
   "settings.app.form.darkMode": "ダークモードを有効にする",
   "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "スペルチェックを有効にする",
   "settings.app.form.enableSystemTray": "Ferdiをシステムトレイに表示する",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "言語",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdiをシステムトレイに最小化する",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "更新",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "変更には再起動が必要です",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 302b513d2..18d5d2da4 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "აჩვენეთ Ferdi სისტემის უჯრაში",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "ენა",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "ჩაკეცეთ Ferdi სისტემის უჯრაში",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "განახლებები",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 80f33d583..f2a6895e6 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Inclusief beta versies",
   "settings.app.form.darkMode": "Word lid van de Dark Side",
   "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen",
   "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Taal",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar de systeembalk",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Officiële vertalingen zijn in het Engels en Duits. Alle andere tallen zijn op de gemeenschap gebaseerde vertalingen.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index c71954427..f9c00b899 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Inclusief bètaversies",
   "settings.app.form.darkMode": "Stap over naar de donkere kant",
   "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan",
   "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Taal",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e29e80e9f..e5496f0eb 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Uwzględnij wersje beta",
   "settings.app.form.darkMode": "Przejdź na Ciemną Stronę",
   "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Włącz sprawdzanie pisowni",
   "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Język",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Aktualizacje",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Zmiany wymagają ponownego uruchomienia",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 591b35610..af344f4cc 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Atualizações",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "As mudanças exigem reiniciar o sistema",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 3d14d5414..645bb2043 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Incluir versões instáveis (beta)",
   "settings.app.form.darkMode": "Junta-te ao Lado Negro",
   "settings.app.form.enableGPUAcceleration": "Activar Aceleração de GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica",
   "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Idioma",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Atualizações",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Alterações requerem reinício",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 5d3636d9e..efd966ff8 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Включая бета версии",
   "settings.app.form.darkMode": "Перейти на Тёмную сторону",
   "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Включить проверку правописания",
   "settings.app.form.enableSystemTray": "Показывать Ferdi в системном трее",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Язык",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Сворачивать Ferdi в системный трей",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Обновления",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Официальная поддержка только для английского и немецкого языков. Остальные языки переведены сообществом.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Изменения требуют перезагрузки приложения",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index b9805e2a6..0c47d3844 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Vrátane beta verzií",
   "settings.app.form.darkMode": "Spustiť Dark Side",
   "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu",
   "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Jazyk",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Aktualizácie",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Zmeny vyžadujú reštart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index f1257ac1e..39ce2e022 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Obuhvati i beta verzije",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Jezik",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Nadogradnje",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni pogon",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 34c406981..8edec5ce2 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Beta versiyonları dahil et",
   "settings.app.form.darkMode": "Karanlık tarafa katıl",
   "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir",
   "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Dil",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdi'ı sistem tepsisine küçült",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Güncellemeler",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Değişiklikler yeniden başlatmayı gerektiriyor",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index c1657b2c0..1e61b1ea7 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Включити бета-версії",
   "settings.app.form.darkMode": "Переходь на Темну Сторону",
   "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії",
   "settings.app.form.enableSystemTray": "Показувати Ferdi у системному лотку",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Мова",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Мінімізувати Ferdi до системного лотка",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Оновлення",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Зміни потребують перезапуску",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index fd1ea9977..5c7ab6c50 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "包含開發中版本",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "在系統匣上顯示",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "語言",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "更新",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 8eb2053bc..00bb7de2c 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -261,7 +261,7 @@
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Ferdi password lock",
+  "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
@@ -269,7 +269,7 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Ferdi Lock password",
+  "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
@@ -291,8 +291,8 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Ferdi Lock Password",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 5bf9f0b31..1fdff93b9 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -79,7 +79,7 @@
   },
   {
     "id": "settings.app.lockedPassword",
-    "defaultMessage": "!!!Ferdi Lock Password",
+    "defaultMessage": "!!!Password",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
       "line": 51,
@@ -105,7 +105,7 @@
   },
   {
     "id": "settings.app.lockInfo",
-    "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+    "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
       "line": 59,
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 411e35dab..d6cdb94c0 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -144,7 +144,7 @@
   },
   {
     "id": "settings.app.form.enableLock",
-    "defaultMessage": "!!!Enable Ferdi password lock",
+    "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 73,
@@ -157,7 +157,7 @@
   },
   {
     "id": "settings.app.form.lockPassword",
-    "defaultMessage": "!!!Ferdi Lock password",
+    "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 77,