New Crowdin translations (#495)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (French)

* New translations en-US.json (Spanish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Italian)

* New translations en-US.json (Japanese)

* New translations en-US.json (Korean)

* New translations en-US.json (Norwegian)

* New translations en-US.json (Polish)

* New translations en-US.json (Portuguese)

* New translations en-US.json (Romanian)

* New translations en-US.json (Indonesian)

* New translations en-US.json (Russian)

* New translations en-US.json (Serbian (Cyrillic))

* New translations en-US.json (Slovak)

* New translations en-US.json (Slovenian)

* New translations en-US.json (Swedish)

* New translations en-US.json (Turkish)

* New translations en-US.json (Ukrainian)

* New translations en-US.json (Irish)

* New translations en-US.json (Hungarian)

* New translations en-US.json (Afrikaans)

* New translations en-US.json (Czech)

* New translations en-US.json (Arabic)

* New translations en-US.json (Bosnian)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Spanish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Italian)

* New translations en-US.json (Japanese)

* New translations en-US.json (Korean)

* New translations en-US.json (Norwegian)

* New translations en-US.json (Polish)

* New translations en-US.json (Portuguese)

* New translations en-US.json (Romanian)

* New translations en-US.json (Indonesian)

* New translations en-US.json (Russian)

* New translations en-US.json (Serbian (Cyrillic))

* New translations en-US.json (Slovak)

* New translations en-US.json (Slovenian)

* New translations en-US.json (Swedish)

* New translations en-US.json (Turkish)

* New translations en-US.json (Ukrainian)

* New translations en-US.json (Irish)

* New translations en-US.json (Hungarian)

* New translations en-US.json (Afrikaans)

* New translations en-US.json (Czech)

* New translations en-US.json (Arabic)

* New translations en-US.json (Bosnian)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Spanish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Italian)

* New translations en-US.json (Japanese)

* New translations en-US.json (Korean)

* New translations en-US.json (Norwegian)

* New translations en-US.json (Polish)

* New translations en-US.json (Portuguese)

* New translations en-US.json (Romanian)

* New translations en-US.json (Indonesian)

* New translations en-US.json (Russian)

* New translations en-US.json (Serbian (Cyrillic))

* New translations en-US.json (Slovak)

* New translations en-US.json (Slovenian)

* New translations en-US.json (Swedish)

* New translations en-US.json (Turkish)

* New translations en-US.json (Ukrainian)

* New translations en-US.json (Irish)

* New translations en-US.json (Hungarian)

* New translations en-US.json (Afrikaans)

* New translations en-US.json (Czech)

* New translations en-US.json (Arabic)

* New translations en-US.json (Bosnian)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (Spanish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Italian)

* New translations en-US.json (Japanese)

* New translations en-US.json (Korean)

* New translations en-US.json (Norwegian)

* New translations en-US.json (Polish)

* New translations en-US.json (Portuguese)

* New translations en-US.json (Romanian)

* New translations en-US.json (Indonesian)

* New translations en-US.json (Russian)

* New translations en-US.json (Serbian (Cyrillic))

* New translations en-US.json (Slovak)

* New translations en-US.json (Slovenian)

* New translations en-US.json (Swedish)

* New translations en-US.json (Turkish)

* New translations en-US.json (Ukrainian)

* New translations en-US.json (Irish)

* New translations en-US.json (Hungarian)

* New translations en-US.json (Afrikaans)

* New translations en-US.json (Czech)

* New translations en-US.json (Arabic)

* New translations en-US.json (Bosnian)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (French)

* New translations en-US.json (Spanish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Italian)

* New translations en-US.json (Japanese)

* New translations en-US.json (Korean)

* New translations en-US.json (Norwegian)

* New translations en-US.json (Polish)

* New translations en-US.json (Portuguese)

* New translations en-US.json (Romanian)

* New translations en-US.json (Indonesian)

* New translations en-US.json (Russian)

* New translations en-US.json (Serbian (Cyrillic))

* New translations en-US.json (Slovak)

* New translations en-US.json (Slovenian)

* New translations en-US.json (Swedish)

* New translations en-US.json (Turkish)

* New translations en-US.json (Ukrainian)

* New translations en-US.json (Irish)

* New translations en-US.json (Hungarian)

* New translations en-US.json (Afrikaans)

* New translations en-US.json (Czech)

* New translations en-US.json (Arabic)

* New translations en-US.json (Bosnian)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (Spanish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Italian)

* New translations en-US.json (Japanese)

* New translations en-US.json (Korean)

* New translations en-US.json (Norwegian)

* New translations en-US.json (Polish)

* New translations en-US.json (Portuguese)

* New translations en-US.json (Romanian)

* New translations en-US.json (Indonesian)

* New translations en-US.json (Russian)

* New translations en-US.json (Serbian (Cyrillic))

* New translations en-US.json (Slovak)

* New translations en-US.json (Slovenian)

* New translations en-US.json (Swedish)

* New translations en-US.json (Turkish)

* New translations en-US.json (Ukrainian)

* New translations en-US.json (Irish)

* New translations en-US.json (Hungarian)

* New translations en-US.json (Afrikaans)

* New translations en-US.json (Czech)

* New translations en-US.json (Arabic)

* New translations en-US.json (Bosnian)

* New translations en-US.json (Catalan)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Traditional)

* New translations en-US.json (Croatian)

* New translations en-US.json (Danish)

* New translations en-US.json (Hebrew)

* New translations en-US.json (Dutch)

* New translations en-US.json (Finnish)

* New translations en-US.json (Flemish)

* New translations en-US.json (French)

* New translations en-US.json (Georgian)

* New translations en-US.json (German)

* New translations en-US.json (Greek)

* New translations en-US.json (Vietnamese)

* New translations en-US.json (Swedish)

* New translations en-US.json (Swedish)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Portuguese, Brazilian)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (Chinese Simplified)

* New translations en-US.json (French)

Co-authored-by: Amine <amine@mouafik.fr>

37 files changed, 750 insertions, 639 deletions

diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 0ea7071d7..015ada370 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "إعادة التحميل",
   "app.errorHandler.headline": "لقد حدث خطب ما",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "تغيرات في فريدي {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "رجاء قيم بشراء رخصة الدعم لبرنامج فريدي للتخلص من وقت الانتظار",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 9d5135d94..30ecf9766 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Recarrega",
   "app.errorHandler.headline": "Quelcom ha anat malament",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Enviar",
   "feature.announcements.changelog.headline": "Canvis en Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Si us plau, compra una llicència de suport per a Ferdi per saltar l'espera",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Torna a carregar Ferdi",
   "menu.view.reloadService": "Torna a carregar el servei",
   "menu.view.resetZoom": "Mida real",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Activa serveis per a desenvolupadors",
   "menu.view.toggleFullScreen": "Activa la pantalla completa",
   "menu.view.toggleServiceDevTools": "Habilita les eines de desenvolupador de serveis",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Obrir en segon plà",
   "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi a l'inici",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Inclou versions beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimitza Ferdi a la safata del sistema",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Mantén a Ferdi en segon pla en tancar la finestra",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Mostra les pestanyes dels serveis desactivats",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Configuració",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Memòria cau",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ajuda'ns a traduir Ferdi en la teva llengua.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Actualització disponible, descarregant ...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Equip",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 0071a3fd5..3761c76f0 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Obnovit",
   "app.errorHandler.headline": "Něco se pokazilo",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Odeslat",
   "feature.announcements.changelog.headline": "Změny ve Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Kup si Ferdi Supporter licenci a nebudeš už muset čekat",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Obnovit Ferdie",
   "menu.view.reloadService": "Obnovit službu",
   "menu.view.resetZoom": "Skutečná velikost",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Zobrazit Vývojářské nástroje",
   "menu.view.toggleFullScreen": "Přepnout na celou obrazovku",
   "menu.view.toggleServiceDevTools": "Zobrazit Vývojářské nástroje pro službu",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Spustit na pozadí",
   "settings.app.form.autoLaunchOnStart": "Spustit Ferdi při startu",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Zahrnout beta verze",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimalizovat Ferdi do systémové lišty",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Ponechat Ferdie v pozadí při zavírání okna",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Zobrazit záložky vypnutých služeb",
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Nastavení",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Mezipaměť",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Pomozte nám přeložit Ferdi do svého jazyka.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Aktualizace k dispozici, stahování...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tým",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 32cbd0cd8..ee78dfc67 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Neu laden",
   "app.errorHandler.headline": "Es ist ein Fehler aufgetreten",
+  "changeserver.headline": "Server wechseln",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Absenden",
   "feature.announcements.changelog.headline": "Was ist neu in Ferdi {version}",
   "feature.debugger.title": "Debug-Informationen veröffentlichen",
   "feature.delayApp.headline": "Bitte kaufe eine Ferdi Supporter Lizenz, um das Warten zu überspringen",
@@ -116,7 +119,7 @@
   "menu.edit.cut": "Ausschneiden",
   "menu.edit.delete": "Löschen",
   "menu.edit.emojiSymbols": "Emoji & Symbole",
-  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.findInPage": "In Seite suchen",
   "menu.edit.paste": "Einfügen",
   "menu.edit.pasteAndMatchStyle": "Einfügen und Stil anpassen",
   "menu.edit.redo": "Wiederholen",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Ferdi neu laden",
   "menu.view.reloadService": "Dienst neu laden",
   "menu.view.resetZoom": "Originalgröße",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Entwicklertools anzeigen",
   "menu.view.toggleFullScreen": "Vollbildmodus umschalten",
   "menu.view.toggleServiceDevTools": "Entwicklertools für Dienst anzeigen",
@@ -270,10 +274,12 @@
   "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.",
   "settings.app.currentVersion": "Aktuelle Version:",
   "settings.app.form.accentColor": "Akzentfarbe",
-  "settings.app.form.adaptableDarkMode": "Synchronisiere den Dunkelmodus mit dem Dunkelmodus meines Macs",
+  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen",
   "settings.app.form.autoLaunchOnStart": "Ferdi beim Systemstart ausführen",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Beta-Versionen einbeziehen",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Dunkles Design verwenden",
   "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
   "settings.app.form.enableLock": "Passwort-Sperre aktivieren",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Passwort",
   "settings.app.form.minimizeToSystemTray": "Ferdi in den Infobereich minimieren",
   "settings.app.form.navigationBarBehaviour": "Verhalten der Navigationsleiste",
-  "settings.app.form.noUpdates": "Updates deaktivieren",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Nachrichteninhalt nicht in Benachrichtigungen anzeigen",
   "settings.app.form.reloadAfterResume": "Ferdi nach dem aufwachen aus dem Standby neu laden",
   "settings.app.form.runInBackground": "Ferdi im Hintergrund behalten, wenn das Fenster geschlossen wird",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "Von",
   "settings.app.form.scheduledDNDStart": "Bis",
   "settings.app.form.sentry": "Telemetrie-Daten senden",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Größe der Sidebar",
   "settings.app.form.showDisabledServices": "Deaktivierte Services-Tabs anzeigen",
   "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
-  "settings.app.form.startMinimized": "Minimiert starten",
-  "settings.app.form.todoServer": "Todo-Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
   "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
   "settings.app.headline": "Einstellungen",
@@ -321,10 +326,8 @@
   "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.",
   "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.",
   "settings.app.sentryInfo": "Das Senden von Telemetrie-Daten ermöglicht es uns, Fehler in Ferdi zu finden - wir werden keine persönlichen Informationen wie deine Nachrichten versenden! Ändern dieser Option erfordert einen Neustart von Ferdi.",
-  "settings.app.serverInfo": "Wir empfehlen dir, dich nach dem Ändern des Servers abzumelden, da Ihre Einstellungen möglicherweise sonst nicht auf dem Server gespeichert werden können.",
-  "settings.app.serverMoneyInfo": "Du verwendest den Franz's offiziellen Server.\nWir wissen, dass Ferdi es dir erlaubt, alle Funktionen kostenlos zu nutzen, aber du verwendest immer noch Franz's Serverressourcen - für die Franz's Entwickler zahlen müssen.\nBitte überlege dir, [Link 1]für ein Franz Premium-Account zu zahlen[/Link] oder [Link 2]dir einen eigene Server einzurichten[/Link] (wenn du das Wissen und die Ressourcen dazu hast). \nDurch die Nutzung von Ferdi profitierst du noch immer stark von Franz's Diensten, Serverressourcen und seiner Entwicklung.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "Dieser Server wird für die Funktion \"Ferdi Todo\" verwendet. (Standard: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.",
   "settings.app.universalDarkModeInfo": "Universeller Dark Mode versucht dynamisch Dienste abzudunkeln, die vom normalen Dark Mode noch nicht unterstützt werden.",
   "settings.app.updateStatusAvailable": "Update verfügbar, lädt herunter ...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Unterstütze unsere Open Collective Kampagne",
   "settings.supportFerdi.share": "Sag es deinen Freunden",
   "settings.supportFerdi.title": "Magst du Ferdi? Teile die Liebe!",
-  "settings.team.contentHeadline": "Ferdi für Teams",
-  "settings.team.copy": "Mit Ferdi für Teams kannst du Kolleginnen und Kollegen per Email-Invite in dein Team einladen und ihre Abonnments in den Einstellungen deines Accounts verwalten. Verschwende keine Zeit mehr damit, Lizenzen für jedes Teammitglied einzeln einzurichten, vergiss mehrfache Rechnungen und unterschiedliche Abrechnungszeiträume - alles unter einem Dach.",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Mit Ferdi für Teams kannst du Premium Lizenzen für Kolleginnen und Kollegen oder Freunde und Familienmitglieder kaufen und verwalten - so viele du willst.",
-  "settings.team.manageAction": "Verwalte dein Team auf getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams sind nicht verfügbar",
   "settings.team.teamsUnavailableInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar.\nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.",
   "settings.team.upgradeAction": "Account Upgrade durchführen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 1c38f8afa..f51060d96 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Επαναφόρτωση",
   "app.errorHandler.headline": "Κάτι δεν λειτουργεί",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Υποβολή",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Ανανέωση Ferdi",
   "menu.view.reloadService": "Ανανέωση Υπηρεσίας",
   "menu.view.resetZoom": "Πραγματικό μέγεθος",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Άνοιγμα Εργαλειοθήκη Προγραμματιστών",
   "menu.view.toggleFullScreen": "Λειτουργία πλήρους οθόνης",
   "menu.view.toggleServiceDevTools": "Λειτουργεία Υπηρεσίασ Εργαλειοθήκης Προγραμματιστών",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Άνοιγμα στο παρασκήνιο",
   "settings.app.form.autoLaunchOnStart": "Εκκίνηση του Ferdi κατά την εκκίνηση του συστήματος",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Ενεργοποιήση Ενίσχυσης GPU ",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Κρατήστε το Ferdi στο παρασκήνιο κατά το κλείσιμο του παραθύρου",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών",
   "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Ρυθμίσεις",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Λανθάνουσα μνήμη",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Βοηθήστε μας να μεταφράσουμε το Ferdi στη δική σας γλώσσα.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Υπάρχει διαθέσιμη ενημέρωση, γίνεται λήψη...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Ομάδα",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index ae73ff7f9..2d0a0023f 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Volver a cargar",
   "app.errorHandler.headline": "Algo salió mal.",
+  "changeserver.headline": "Cambiar servidor",
+  "changeserver.label": "Servidor",
+  "changeserver.submit": "Enviar",
   "feature.announcements.changelog.headline": "Cambios en Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Por favor compra una Licencia de Soporte de Ferdi para omitir la espera",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Recargar Ferdi",
   "menu.view.reloadService": "Recargar Servicio",
   "menu.view.resetZoom": "Tamaño Actual",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Activar las Herramientas para Desarrolladores",
   "menu.view.toggleFullScreen": "Cambiar a Pantalla Completa",
   "menu.view.toggleServiceDevTools": "Mostrar Herramientas de Servicios para Desarrolladores",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano",
   "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Incluir versiones beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Activar tema oscuro",
   "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
   "settings.app.form.enableLock": "Activar bloqueo por contraseña",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Contraseña",
   "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Desactivar actualizaciones",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Mantener Ferdi en segundo plano al cerrar la ventana",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "A",
   "settings.app.form.scheduledDNDStart": "De",
   "settings.app.form.sentry": "Enviar datos de telemetría",
-  "settings.app.form.server": "Servidor",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Servidor de tareas",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Configuración",
@@ -321,10 +326,8 @@
   "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Caché",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Actualización disponible, descargando...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi para equipos",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Equipo",
-  "settings.team.intro": "¿Usted y su equipo usan a Ferdi? Ahora puede administrar las suscripciones Premium para tantos colegas, amigos o familiares como desee, todo desde una misma cuenta.",
-  "settings.team.manageAction": "Gestione su equipo en getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Actualiza tu cuenta",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 665295e5a..6c53e7f81 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Actualiser",
   "app.errorHandler.headline": "On dirait que quelque chose ne va pas",
+  "changeserver.headline": "Changer de serveur",
+  "changeserver.label": "Serveur",
+  "changeserver.submit": "Soumettre",
   "feature.announcements.changelog.headline": "Les nouveaux changements dans Ferdi {version}",
   "feature.debugger.title": "Publier les informations de débogage",
   "feature.delayApp.headline": "Achetez la licence Ferdi pour ne plus avoir de temps d'attente",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Recharger Ferdi",
   "menu.view.reloadService": "Redémarrer le service",
   "menu.view.resetZoom": "Taille actuelle",
+  "menu.view.toggleDarkMode": "Activer le mode sombre",
   "menu.view.toggleDevTools": "Activer les outils de développeur",
   "menu.view.toggleFullScreen": "Activer le mode plein écran",
   "menu.view.toggleServiceDevTools": "Activer les outils de développeur du service",
@@ -270,10 +274,12 @@
   "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
   "settings.app.currentVersion": "Version actuelle :",
   "settings.app.form.accentColor": "Couleur d'accentuation",
-  "settings.app.form.adaptableDarkMode": "Synchroniser le mode sombre avec les paramètres du mode sombre de mon Mac",
+  "settings.app.form.adaptableDarkMode": "Synchroniser le mode sombre avec l'option mode sombre du système",
   "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan",
   "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage",
+  "settings.app.form.automaticUpdates": "Activer les mises à jour",
   "settings.app.form.beta": "Accepter les versions bêta",
+  "settings.app.form.customTodoServer": "Serveur Todo personnalisé",
   "settings.app.form.darkMode": "Activer le mode sombre",
   "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
   "settings.app.form.enableLock": "Activer le verrouillage par mot de passe",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Mot de passe",
   "settings.app.form.minimizeToSystemTray": "Minimiser Ferdi dans la zone de notification",
   "settings.app.form.navigationBarBehaviour": "Comportement de la barre de navigation",
-  "settings.app.form.noUpdates": "Désactiver les mises à jours",
+  "settings.app.form.predefinedTodoServer": "Serveur Todo",
   "settings.app.form.privateNotifications": "Ne pas afficher le contenu des notifications",
   "settings.app.form.reloadAfterResume": "Recharger Ferdi après la reprise du système",
   "settings.app.form.runInBackground": "Garder Ferdi ouvert en arrière-plan à la fermeture de la fenêtre",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "À",
   "settings.app.form.scheduledDNDStart": "De",
   "settings.app.form.sentry": "Envoyer des données de télémétrie",
-  "settings.app.form.server": "Serveur",
   "settings.app.form.serviceRibbonWidth": "Largeur du menu",
   "settings.app.form.showDisabledServices": "Afficher les onglets des services désactivés",
   "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
-  "settings.app.form.startMinimized": "Démarrer en mode réduit",
-  "settings.app.form.todoServer": "Serveur Todo",
+  "settings.app.form.showDragArea": "Afficher les zones de glisser-déposer dans la fenêtre",
+  "settings.app.form.startMinimized": "Démarrage minimisé",
   "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
   "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
   "settings.app.headline": "Paramètres",
@@ -321,10 +326,8 @@
   "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Le temps est en format 24 heures. La fin du temps peut être avant le début du temps (ex: début 17:00, fin 09:00) pour activer le Ne-pas-Déranger durant la nuit.",
   "settings.app.sentryInfo": "L'envoi de données de télémétrie nous permet de trouver des erreurs dans Ferdi - nous n'enverrons aucune information personnelle comme vos données de message! La modification de cette option nécessite le redémarrage de Ferdi.",
-  "settings.app.serverInfo": "On vous recommande de vous déconnecter après d'avoir changer votre serveur dans vos paramètres au risque que les paramètres ne sois pas sauvegarder.",
-  "settings.app.serverMoneyInfo": "Vous êtes entrain d'utilisé le serveur officiel de Franz pour Ferdi.\nNous savons que Ferdi vous permet d'utilisé toutes les fonctionnalités gratuitement mais vous êtes toujours entrain d'utilisé les resources des serveurs de Franz - dont les créateurs paient pour.\nS'il vous plaît [Link 1]payé pour un compte Franz[/Link] ou [Link 2]utilisé un ferdi-serveur hébergé par soi-même[/Link] (si vous avez la connaissance et les resources pour).\nEn utilisant Ferdi, vous profité beaucoup des recettes de Franz, resources serveurs et son développement.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "Ce serveur va être utilisé pour la fonction \"Ferdi Todo\". (défaut: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "Ce serveur sera utilisé pour la fonctionnalité \"Ferdi Todo\".",
   "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.",
   "settings.app.universalDarkModeInfo": "Le mode sombre universel tente de générer dynamiquement des styles de mode sombre pour les services qui ne sont pas encore supportés.",
   "settings.app.updateStatusAvailable": "Mise à jour disponible, téléchargement en cours...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Supporter notre Open Collective",
   "settings.supportFerdi.share": "Parlez en à vos Amis",
   "settings.supportFerdi.title": "Vous aimez Ferdi? Répandez l'amour!",
-  "settings.team.contentHeadline": "Ferdi pour les équipes",
-  "settings.team.copy": "Ferdi pour Équipe t'offre la possibilité d'inviter des collègues dans ton équipe de travail en leur envoyant des invitations par courrier électronique et en gérant leurs abonnements dans les préférences de ton compte. Ne perds pas de temps à les gérer individuellement les factures multiples et les différents cycles de facturation - il suffit d'une seule équipe de travail pour gérer tout ça!",
+  "settings.team.contentHeadline": "Gestion d'équipe Franz",
+  "settings.team.copy": "La gestion d'équipe de Franz vous permet de gérer les abonnements Franz pour plusieurs utilisateurs. N’oubliez pas que le fait d’avoir un abonnement Franz Premium ne vous donnera aucun avantage dans l'utilisation de Ferdi : la seule raison pour laquelle vous avez encore accès à la gestion d’équipe est que vous pouvez gérer vos équipes Franz héritées et que vous ne perdez donc aucune fonctionnalité dans la gestion de votre compte.",
   "settings.team.headline": "Équipe",
-  "settings.team.intro": "Vous et votre équipes utilise Ferdi? Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.",
-  "settings.team.manageAction": "G��re ton équipe sur getferdi.com",
+  "settings.team.intro": "Vous utilisez actuellement les serveurs Franz, c'est pourquoi vous avez accès à la gestion d'équipe.",
+  "settings.team.manageAction": "G��rez votre équipe sur meetfranz.com",
   "settings.team.teamsUnavailable": "Les équipes sont indisponibles",
   "settings.team.teamsUnavailableInfo": "Les équipes sont actuellement disponibles uniquement lorsque vous utilisez le serveur de Franz et après avoir payé pour Franz Professionnel. Veuillez changer votre serveur à https://api.franzinfra.com pour utiliser des équipes.",
   "settings.team.upgradeAction": "Améliorez votre compte",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 3fc19437a..5a701ac86 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Athlódáil",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Cuir isteach",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Athlódáil Ferdi",
   "menu.view.reloadService": "Athlódáil seirbhís",
   "menu.view.resetZoom": "Fíormhéid",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Scoránaigh uirlis forbróra",
   "menu.view.toggleFullScreen": "Scoránaigh mód lánscáileáin",
   "menu.view.toggleServiceDevTools": "Scoránaigh uirlis forbróra seirbhíse",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra",
   "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Cuir leagain béite san áireamh",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
   "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Socruithe",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Taisce",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Cabhraigh linn Ferdi a aistriú i do theanga.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Nuashonrú le fáil, ag íoslódáil...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Foireann",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 4d726e197..a3243b405 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Ponovno učitavanje",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Pošalji",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Otvori u pozadini",
   "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Obuhvati i beta verzije",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Neka se Franc održava u pozadini i ako je prozor zatvoren",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Postavke",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Predmemorija",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Nadogradnja dostupna, preuzimanje...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tim",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index f396b995e..d39a569cd 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Újratöltés",
   "app.errorHandler.headline": "Valami nem jött össze",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Küldés",
   "feature.announcements.changelog.headline": "Ferdi {version} változásai",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Ferdi újrainditása",
   "menu.view.reloadService": "Szolgáltatás újraindítása",
   "menu.view.resetZoom": "Tényleges méret",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Fejlesztői eszközök ki/bekapcsolása",
   "menu.view.toggleFullScreen": "Teljes képernyős mód ki/bekapcsolása",
   "menu.view.toggleServiceDevTools": "Szolgáltatás Fejlesztői Eszközök ki/bekapcsolása",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Megnyitás háttérben",
   "settings.app.form.autoLaunchOnStart": "Ferdi betöltése indításkor",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Béta verziók keresése",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Hardveres gyorsítás engedélyezése",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdi kicsinyítése a tálcára",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Ferdi fusson a háttérben az ablak bezárásakor",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Letiltott szolgáltatások megjelenítése",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Beállítások",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Gyorsítótár",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Segíts nekünk a Ferdi-ot lefordítani a nyelvedre.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Frissítés elérhető, letöltés folyamatban...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "A Ferdi for Teams lehetőséget teremt arra, hogy meghívd munkatársaidat a csapatodba email-en keresztül, és kezelhesd a Ferdi előfizetéseiket és fiókbeállításaikat. Ne fecséreld az idődet minden egyes csapattag regisztrációjára, felejtsd el a sok-sok egyéni számlát és különböző lejárati időt - egy mindenek felett!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Csapat",
-  "settings.team.intro": "Te és a csapatod Ferdi-ot használtok? Egy fiókból kezelheted kollégáid, barátaid vagy családtagjaid Prémium előfizetéseit.",
-  "settings.team.manageAction": "Csapat kezelése a getferdi.com-on",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Előfizetés",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index d8244f4fe..6065e05ab 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Muat Ulang",
   "app.errorHandler.headline": "Terjadi kesalahan",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Kirim",
   "feature.announcements.changelog.headline": "Perubahan dalam Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Beli Lisensi Pendukung Ferdi agar tidak perlu menunggu",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Muat Ulang Ferdi",
   "menu.view.reloadService": "Muat ulang Layanan",
   "menu.view.resetZoom": "Ukuran Sebenarnya",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Aktif/Nonaktifkan alat pengembang",
   "menu.view.toggleFullScreen": "Aktif/Nonaktifkan Layar Penuh",
   "menu.view.toggleServiceDevTools": "Aktif/Nonaktifkan layanan alat pengembang",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Buka di latar belakang",
   "settings.app.form.autoLaunchOnStart": "Jalankan Ferdi saat komputer dimulai",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Sertakan versi beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Perkecil Ferdi ke baki sistem",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Tetap jalankan Ferdi di latar belakang saat menutup jendela",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Tampilkan tab layanan yang dinonaktifkan",
   "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Pengaturan",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Singgahan",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Bantu kami menerjemahkan Ferdi ke bahasa Anda.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Versi baru tersedia, mengunduh...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi untuk Tim",
-  "settings.team.copy": "Ferdi untuk Tim menyediakan opsi untuk mengundang rekan kerja ke tim Anda dengan mengirimkan undangan email dan mengelola langganan mereka pada preferensi akun Anda. Jangan habiskan waktu Anda menyiapkan langganan bagi masing-masing anggota tim, lupakan berbagai faktur dan periode penagihan - satu tim untuk semua!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tim",
-  "settings.team.intro": "Anda dan tim Anda menggunakan Ferdi? Kini Anda bisa mengelola langganan Premium untuk semua rekan kerja, teman, atau anggota keluar sebanyak yang Anda inginkan, semuanya cukup dari satu akun.",
-  "settings.team.manageAction": "Kelola Tim Anda di getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Tingkatkan Akun Anda",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 43aae2a94..68307be0c 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Ricarica",
   "app.errorHandler.headline": "Qualcosa è andato storto",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Invia",
   "feature.announcements.changelog.headline": "Modifiche in Ferdi {Version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Per favore, compra una Licenza Supporter di Ferdi per saltare l'attesa",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Ricarica Ferdi",
   "menu.view.reloadService": "Ricarica Servizio",
   "menu.view.resetZoom": "Dimensione Attuale",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Attiva/Disattiva Strumenti Sviluppo",
   "menu.view.toggleFullScreen": "Attiva/Disattiva Schermo Intero",
   "menu.view.toggleServiceDevTools": "Attiva/Disattiva Strumenti per Sviluppatori di Servizi",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Apri in background",
   "settings.app.form.autoLaunchOnStart": "Esegui Ferdi all'avvio",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Includi versioni beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Attiva modalità scura",
   "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimizza Ferdi nell'area di notifica",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Mantieni Ferdi in esecuzione quando chiudi la finestra",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Mostra schede servizi disattivati",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Impostazioni",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Aiutaci a tradurre Ferdi nella tua lingua.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Aggiornamento disponibile, download in corso...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi per i Team",
-  "settings.team.copy": "Ferdi per i Team ti dà la possibilità di invitare collaboratori al tuo team, invitandoli per email e gestendo la loro iscrizione all'interno delle preferenze del tuo account. Non perdere tempo impostando le iscrizioni di un singolo collaboratore individualmente, dimenticati di fatture multiple e cicli differenti di fatturazione - un team per comandarli tutti!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Gruppo",
-  "settings.team.intro": "Tu e il tuo team usate Ferdi? Ora puoi gestire le sottoscrizioni Premium per tutti i colleghi, amici e famigliari che vuoi, tutto da un singolo account.",
-  "settings.team.manageAction": "Gestisci il tuo Team su getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Aggiorna il tuo Account",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index dfd29afa2..78dde7913 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "再読み込み",
   "app.errorHandler.headline": "間違えている部分があります",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "送信",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Ferdiをすぐに起動するには、Ferdi サポーターライセンスを購入してください。",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "再起動",
   "menu.view.reloadService": "サービスをリロードする",
   "menu.view.resetZoom": "元のサイズ",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "開発者ツールを切り替え",
   "menu.view.toggleFullScreen": "全画面表示の切り替え",
   "menu.view.toggleServiceDevTools": "サービス開発者ツールを切り替え",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "バックグラウンドで開く",
   "settings.app.form.autoLaunchOnStart": "システム起動時にFerdiを開く",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Betaバージョンを含める",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdiをシステムトレイに最小化する",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "ウインドウを閉じた際にFerdiをバックグラウンドで実行させておく",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "無効化されたサービスのタブを表示する",
   "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "設定",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "キャッシュ",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ferdiの翻訳作業にご協力をお願いします。",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "更新が見つかりました。ダウンロードしています...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "チーム",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 2af804612..e17ec57fd 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "ჩატვირთვა",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "დადასტურება",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "გახსენით ფონზე",
   "settings.app.form.autoLaunchOnStart": "გაეშვას Ferdi სისტემის ჩატვირთვისას",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "ჩაკეცეთ Ferdi სისტემის უჯრაში",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "დატოვეთ Ferdi გაშვებული როდესაც ფანჯარა დაიხურება",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "პარამეტრები",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "განახლება ხელმისაწვდომია, იწყება გადმოწერა...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "გუნდი",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 65dea571c..5d2e0afed 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "새로고침",
   "app.errorHandler.headline": "문제가 발생했습니다.",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Ferdi {version} 변경점",
   "feature.debugger.title": "디버깅 정보 공개",
   "feature.delayApp.headline": "Ferdi Supporter License를 구매하여 대기시간을 스킵하세요.",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index f63a8dc84..86d622d3f 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Herladen",
   "app.errorHandler.headline": "Er ging iets mis",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Verzenden",
   "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {versie}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Neem een Ferdi Supporter Licentie om niet meer te hoeven wachten",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Ferdi Herladen",
   "menu.view.reloadService": "Service Herladen",
   "menu.view.resetZoom": "Werkelijke Grootte",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Ontwikkelaarstools Aan/Uit",
   "menu.view.toggleFullScreen": "Volledig Scherm Aan/Uit",
   "menu.view.toggleServiceDevTools": "Service Ontwikkelaarstools Aan/Uit",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart": "Lanceer Ferdi bij opstarten",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Inclusief beta versies",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar de systeembalk",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Houd Ferdi op de achtergrond wanneer het venster gesloten wordt",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Instellingen",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help ons om Ferdi te vertalen naar uw taal.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update beschikbaar, downloaden...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Frans voor Teams",
-  "settings.team.copy": "Ferdi voor Teams geeft je de mogelijkheid om collega's uit te nodigen voor je team door hen een e-mail te sturen en hun inschrijvingen te beheren in je accountvoorkeuren. Verspil geen tijd met het instellen van inschrijvingen voor elk teamlid apart, vergeet meerdere facturen en verschillende afrekeningsperiodes - één team regeert alles!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Gebruiken jij en je team Ferdi? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt, allemaal vanaf één account.",
-  "settings.team.manageAction": "Beheer je Team op getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade je Account",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 41b1d1d19..9e32f47b1 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Herladen",
   "app.errorHandler.headline": "Er is iets mis gegaan",
+  "changeserver.headline": "Server wijzigen",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Verzenden",
   "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Sponsor Ferdi om wachten over te slaan",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Herlaad Ferdi",
   "menu.view.reloadService": "Een service opnieuw laden",
   "menu.view.resetZoom": "Werkelijke grootte",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Ontwikkelaarstools aan/uit",
   "menu.view.toggleFullScreen": "Volledig scherm aan/uit",
   "menu.view.toggleServiceDevTools": "Service ontwikkelaarstools aan/uit",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Inclusief bètaversies",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Wachtwoord",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Toon geen bericht-inhoud in meldingen",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Houd Ferdi open op de achtergrond wanneer het venster gesloten wordt",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Instellingen",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help ons om Ferdi uw taal te laten spreken.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update beschikbaar, downloaden...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi voor Teams",
-  "settings.team.copy": "Ferdi voor Teams geeft je de mogelijkheid om collega's uit te nodigen voor je team door hen een e-mail te sturen en hun inschrijvingen te beheren in je accountvoorkeuren. Verspil geen tijd met het instellen van inschrijvingen voor elk individueel teamlid, vergeet meerdere facturen en verschillende afrekeningsperiodes - één team om alles te regelen!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Gebruiken jij en je team Ferdi? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt. En dat alles vanuit één account.",
-  "settings.team.manageAction": "Beheer je Team op getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Jouw Account opwaarderen",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 9eeff8408..ea01997ca 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Odśwież",
   "app.errorHandler.headline": "Coś poszło nie tak.",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Wyślij",
   "feature.announcements.changelog.headline": "Zmiany we Ferdiie {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Aby nie czekać, kup licencję Ferdi Supporter",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Przeładuj Ferdi",
   "menu.view.reloadService": "Przeładuj usługę",
   "menu.view.resetZoom": "Domyślny rozmiar",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Pokaż narzędzia developerskie",
   "menu.view.toggleFullScreen": "Przełącz tryb pełnoekranowy",
   "menu.view.toggleServiceDevTools": "Włącz narzędzia developerskie usługi",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Otwórz w tle",
   "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na początku",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Uwzględnij wersje beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Zachowaj aplikację Ferdi w tle po zamknięciu okna",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Wyłącz wyświetlanie zakładek z usługami",
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Ustawienia",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Pamięć podręczna",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Pomóż nam tłumaczyć Ferdi na Twój język.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Dostępna aktualizacja, pobieram...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Zespoły Ferdi",
-  "settings.team.copy": "Ferdi umożliwia zespołom opcję zapraszania pracowników do zespołu wysyłając im maila z zaproszeniem i pozwala zarządzać ich subskrypcją w ustawieniach konta. Nie trać czasu na ustawianie subskrypcji dla każdego zespołu osobno, zapomnij o wielu fakturach i różnych cyklicznych opłatach - jeden zespół do zarządzania wszystkim!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Zespół",
-  "settings.team.intro": "Czy Ty i zesół używacie programu Ferdi? Możesz teraz zarządzać subskrypcją Premium dla tylu kolegów, przyjaciół lub rodziny ilu chcesz, wszystko w obrębie jednego konta.",
-  "settings.team.manageAction": "Zarządzaj zespołem na getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Ulepsz swoje konto",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 7693baa1a..7f85c5996 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Recarregar",
-  "app.errorHandler.headline": "Alguma coisa correu mal",
+  "app.errorHandler.headline": "Algo deu errado",
+  "changeserver.headline": "Alterar servidor",
+  "changeserver.label": "Servidor",
+  "changeserver.submit": "Submeter",
   "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
   "feature.debugger.title": "Publicar informações de depuração",
   "feature.delayApp.headline": "Por favor compre uma licença Ferdi Supporter para saltar a fila de espera",
@@ -8,8 +11,8 @@
   "feature.delayApp.trial.action": "Sim, Quero a versão experimental do Ferdi Profissional de 14 dias",
   "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
   "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Faz parte do grupo de apoio do Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Atualiza a tua conta",
+  "feature.delayApp.upgrade.action": "Faça parte do grupo de apoiadores do Ferdi",
+  "feature.delayApp.upgrade.actionShort": "Atualize sua conta",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
@@ -34,7 +37,7 @@
   "feature.publishDebugInfo.terms": "Termos do Serviço",
   "feature.publishDebugInfo.title": "Publicar informações de depuração",
   "feature.quickSwitch.info": "Selecione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
-  "feature.quickSwitch.search": "Localizar...",
+  "feature.quickSwitch.search": "Buscar...",
   "feature.quickSwitch.title": "Troca Rápida",
   "feature.serviceLimit.limitReached": "Você adicionou {amount} serviços de um total de {limit} que estão inclusos no seu plano. Por favor, atualize sua conta para adicionar mais serviços.",
   "feature.shareFranz.action.email": "Enviar por e-mail",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Recarregar Ferdi",
   "menu.view.reloadService": "Recarregar serviço",
   "menu.view.resetZoom": "Tamanho Real",
+  "menu.view.toggleDarkMode": "Alternar Modo Escuro",
   "menu.view.toggleDevTools": "Ativar/Desativar Ferramentas de Desenvolvimento",
   "menu.view.toggleFullScreen": "Ativar/Desativar Tela Cheia",
   "menu.view.toggleServiceDevTools": "Ativar/Desativar Ferramentas de Desenvolvimento de Serviços",
@@ -175,7 +179,7 @@
   "password.noUser": "Não existe nenhuma conta associada a esse endereço de e-mail",
   "password.submit.label": "Submeter",
   "password.successInfo": "Por favor verifique o seu endereço de e-mail",
-  "premiumFeature.button.upgradeAccount": "Atualiza a tua conta",
+  "premiumFeature.button.upgradeAccount": "Atualize sua conta",
   "pricing.features.accountSync": "Sincronização Automática",
   "pricing.features.adFree": "Sem publicidade para sempre",
   "pricing.features.appDelays": "Sem Telas de Espera",
@@ -270,10 +274,12 @@
   "settings.app.cacheInfo": "A cache do Ferdi está a usar {size} de espaço em disco.",
   "settings.app.currentVersion": "Versão atual",
   "settings.app.form.accentColor": "Cor de destaque",
-  "settings.app.form.adaptableDarkMode": "Sincronizar modo noturno com as configura�es do Mac",
+  "settings.app.form.adaptableDarkMode": "Sincronizar o modo escuro com a configura�o de modo escuro do meu SO",
   "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano",
   "settings.app.form.autoLaunchOnStart": "Iniciar o Ferdi após iniciar o computador",
+  "settings.app.form.automaticUpdates": "Habilitar atualizações",
   "settings.app.form.beta": "Incluir versões instáveis (beta)",
+  "settings.app.form.customTodoServer": "Servidor de Todo personalizado",
   "settings.app.form.darkMode": "Habilitar modo noturno",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
   "settings.app.form.enableLock": "Habilitar bloqueio por senha",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Senha",
   "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema",
   "settings.app.form.navigationBarBehaviour": "Comportamento da barra de navegação",
-  "settings.app.form.noUpdates": "Desativar atualizações",
+  "settings.app.form.predefinedTodoServer": "Servidor Todo",
   "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
   "settings.app.form.reloadAfterResume": "Recarregar Ferdi após restabelecer o sistema",
   "settings.app.form.runInBackground": "Manter o Ferdi em segundo plano ao fechar a janela",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "Até",
   "settings.app.form.scheduledDNDStart": "Desde",
   "settings.app.form.sentry": "Enviar dados de telemetria",
-  "settings.app.form.server": "Servidor",
   "settings.app.form.serviceRibbonWidth": "Largura da barra lateral",
   "settings.app.form.showDisabledServices": "Apresentar separadores de serviços desativados",
   "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
-  "settings.app.form.startMinimized": "Iniciar minimizado na bandeja",
-  "settings.app.form.todoServer": "Servidor das Tarefas",
+  "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
+  "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.headline": "Configurações",
@@ -321,10 +326,8 @@
   "settings.app.scheduledDNDInfo": "O modo Não perturbe agendado permite definir um período de tempo em que você não deseja receber notificações do Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Horários no formato de 24 horas. O horário de término pode ser anterior ao horário de início (por exemplo, início às 17:00 e término às 09:00) para ativar a opção Não perturbe da noite para o dia.",
   "settings.app.sentryInfo": "O envio de dados de telemetria nos permite encontrar erros no Ferdi. Não enviaremos nenhuma informação pessoal como seus dados de mensagem! Alterar esta opção requer que você reinicie o Ferdi.",
-  "settings.app.serverInfo": "Aconselhamos que você efetue logout após alterar o servidor, pois suas configurações podem não serem salvas.",
-  "settings.app.serverMoneyInfo": "Você está usando o Franz Server oficial para Ferd.\nSabemos que o Ferdi permite que você use todos os seus recursos de graça, mas você ainda está usando os recursos de servidor de Franz, pelos quais o criador de Franz precisa ser pago.\nPor favor consider [Link 1]adquirir uma licença Franz[/Link] ou [Link 2]utilize hospede o seu próprio servidor ferdi-server[/Link] (se você tiver conhecimento e recursos).\nUsando o Ferdi, você continua podendo utilizar os serviços da loja Franz, além dos recursos de servidor e desenvolvimento.",
   "settings.app.subheadlineCache": "Memória Cache",
-  "settings.app.todoServerInfo": "Servidor utilizado para as Tarefas. (Padrão: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "Este servidor será usado para o recurso \"Ferdi Todo\".",
   "settings.app.translationHelp": "Ajude-nos a traduzir a Ferdi para a sua língua.",
   "settings.app.universalDarkModeInfo": "O Modo Noturno Universal tenta gerar dinamicamente estilos para serviços que, de outra forma, não são suportados no momento.",
   "settings.app.updateStatusAvailable": "Atualização disponivel, a transferir...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Apoie o desenvolvimento no Open Collective",
   "settings.supportFerdi.share": "Compartilhe com seus amigos",
   "settings.supportFerdi.title": "Gostou do Ferdi? Compartilhe!",
-  "settings.team.contentHeadline": "Ferdi para equipas",
-  "settings.team.copy": "\"Ferdi para Equipes\" possui a opção de convidar ajudantes para a sua equipe através de mensagens por e-mail e gerenciar as inscrições deles em suas preferências de conta. Não perca tempo configurando as inscrições para membro da equipe individualmente, esqueça as múltiplas faturas e tempos de pagamento. Uma regra universal para todos os membros da equipe.",
+  "settings.team.contentHeadline": "Gerenciamento de Equipe Franz",
+  "settings.team.copy": "O Gerenciamento de Equipes de Franz permite gerenciar assinaturas do Franz para múltiplos usuários. Por favor, entenda que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem em usar o Ferdi. A única razão em manter o acesso ao Gerenciamento de Equipes é permitir o gerenciamento de suas equipes legadas e não perder nenhuma funcionalidade no gerenciamento da sua conta.",
   "settings.team.headline": "Equipa",
-  "settings.team.intro": "Você e sua equipe usam Ferdi? Você pode agora administrar as inscrições pagas de todos os seus colegas, amigos e membros da família que você quiser, tudo isso em uma única conta.",
-  "settings.team.manageAction": "Gerenciar sua Equipe em getferdi.com",
+  "settings.team.intro": "Atualmente você está utilizando os Servidores do Franz, o que permite a você ter acesso ao Gerenciamento de Equipes.",
+  "settings.team.manageAction": "Gerencie sua Equipe em meetfranz.com",
   "settings.team.teamsUnavailable": "A funcionalidade de Equipes está indisponível",
   "settings.team.teamsUnavailableInfo": "Atualmente a funcionalidade de Equipes está disponível apenas utilizando o servidor Franz após adquirir um plano Franz Profissional. Por favor altere o seridor par https://api.franzinfra.com para utilizar esta funcionalidade.",
   "settings.team.upgradeAction": "Atualizar sua conta",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index e953c5778..aef7d6063 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Actualizar",
   "app.errorHandler.headline": "Uoops! Algo correu mal",
+  "changeserver.headline": "Alterar servidor",
+  "changeserver.label": "Servidor",
+  "changeserver.submit": "Enviar",
   "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Por favor, adquira uma licença Ferdi para não ter tempo de espera",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Recarregar Ferdi",
   "menu.view.reloadService": "Reiniciar o Serviço",
   "menu.view.resetZoom": "Tamanho real",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Ferramentas de Desenvolvedor",
   "menu.view.toggleFullScreen": "Modo Tela Cheia",
   "menu.view.toggleServiceDevTools": "Ferramentas de Serviços de Desenvolvedor",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano",
   "settings.app.form.autoLaunchOnStart": "Abrir o Ferdi ao iniciar o sistema",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Incluir versões beta",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Senha",
   "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a área de sistema",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Desactivar actualizações",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Manter o Ferdi no fundo quando fechar a janela",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "Até",
   "settings.app.form.scheduledDNDStart": "Desde",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Servidor",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Mostrar abas de serviços desativados",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Tarefa do Servidor",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Configurações",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "memória cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ajude-nos a traduzir o Ferdi para seu idioma.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Atualização disponível, baixando...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi para Equipes",
-  "settings.team.copy": "\"Ferdi para Equipes\" possui a opção de convidar ajudantes para a sua equipe através de mensagens por e-mail e gerenciar as inscrições deles em suas preferências de conta. Não perca tempo configurando as inscrições para membro da equipe individualmente, esqueça as múltiplas faturas e tempos de pagamento. Uma regra universal para todos os membros da equipe.",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Equipe",
-  "settings.team.intro": "Você e sua equipe usam Ferdi? Você pode agora administrar as inscrições pagas de todos os seus colegas, amigos e membros da família que você quiser, tudo isso em uma única conta.",
-  "settings.team.manageAction": "Gerencie sua Equipe no getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Atualize a sua conta para versão paga",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 6fbec36f4..f6d697834 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Перезагрузить",
   "app.errorHandler.headline": "Что-то пошло не так",
+  "changeserver.headline": "Изменить сервер",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Принять",
   "feature.announcements.changelog.headline": "Изменения в версии Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Пожалуйста приобретите лицензию Ferdi Supporter чтобы убрать ожидание",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Перезагрузить Ferdi",
   "menu.view.reloadService": "Перезапустить сервис",
   "menu.view.resetZoom": "Фактический размер",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Показать инструменты разработчика",
   "menu.view.toggleFullScreen": "Переключиться на полный экран",
   "menu.view.toggleServiceDevTools": "Показать инструменты разработчика сервиса",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Открывать в фоне",
   "settings.app.form.autoLaunchOnStart": "Запускать Ferdi при старте",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Включая бета версии",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Пароль",
   "settings.app.form.minimizeToSystemTray": "Сворачивать Ferdi в системный трей",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Оставлять Ferdi в фоне при закрытии окна",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Показывать вкладки отключённых служб",
   "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Настройки",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Кэш",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Помогите нам перевести Ferdi на ваш язык.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Доступно обновление, идёт загрузка...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi для Команд",
-  "settings.team.copy": "Ferdi для Команд позволяет пригласить коллег в вашу команду, отправив им емайл с приглашением, а также управлять их подписками в настройках вашего аккаунта. Не тратьте время на настройку подписок для каждого члена команды индивидуально, забудьте о многочисленных платежках и разных циклах оплаты - одна команда для управления всеми!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Команда",
-  "settings.team.intro": "Вы и ваша команда испльзуете Ferdi? Вы теперь можете управлять Премиум подписками любого количества коллег, друзей и членов семьи, из одного и того же аккаунта.",
-  "settings.team.manageAction": "Управляйте вашей Командой на getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Улучшить ваш аккаунт",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 06d10f1fd..e07d1a0f5 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Obnoviť",
   "app.errorHandler.headline": "Niečo sa pokazilo",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Odoslať",
   "feature.announcements.changelog.headline": "Zmeny vo Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Prosím, kúp si licenciu Ferdi Supporter a nebudeš musieť čakať",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Obnoviť Ferdi",
   "menu.view.reloadService": "Obnoviť službu",
   "menu.view.resetZoom": "Pôvodná veľkosť",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Prepnúť vývojárske nástroje",
   "menu.view.toggleFullScreen": "Prepnúť na celú obrazovku",
   "menu.view.toggleServiceDevTools": "Prepnúť vývojárske nástroje služby",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí",
   "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Vrátane beta verzií",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Po zatvorení okna ponechať Ferdi spustený na pozadí",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb",
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Nastavenia",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Vyrovnávacia pamäť",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Pomôžte nám preložiť Ferdi do svojho jazyka.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Je dostupná aktualizácia, sťahuje sa...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi pre tímy",
-  "settings.team.copy": "Ferdi for Teams vám dáva možnosť pozvať spolupracovníkov do vášho tímu odoslaním e-mailových pozvánok a spravovaním ich odberov v preferenciách vášho účtu. Nestrácajte čas vytváraním predplatného pre každého člena tímu jednotlivo, zabudnite na viac faktúr a rôzne fakturačné cykly - jeden tím bude pre všetkých!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tím",
-  "settings.team.intro": "Vy a váš tím používate Ferdi? Teraz môžete spravovať prémiové predplatné pre toľko kolegov, priateľov alebo rodinných príslušníkov, koľko chcete, všetko z jedného účtu.",
-  "settings.team.manageAction": "Spravujte svoj tím na adrese getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Vylepšite svoj účet",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index bd9c241df..4b6982628 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Ponovno učitavanje",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Pošalji",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Поново учитај Франз",
   "menu.view.reloadService": "Поново учирај услугу",
   "menu.view.resetZoom": "Стварна величина",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Промени алатке за развој",
   "menu.view.toggleFullScreen": "Преко целог екрана",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Otvori u pozadini",
   "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Obuhvati i beta verzije",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Neka se Franc održava u pozadini i ako je prozor zatvoren",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
   "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Postavke",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Кеш",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Nadogradnja dostupna, preuzimanje...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tim",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 36f3f7ed9..efb7cfd2c 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Ladda om",
   "app.errorHandler.headline": "Någonting gick snett",
+  "changeserver.headline": "Byt server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Skicka",
   "feature.announcements.changelog.headline": "Ändringar i Ferdi {version}",
   "feature.debugger.title": "Skicka felsökningsinformation",
   "feature.delayApp.headline": "Vänligen köp en Ferdi Supporter-licens för att slippa vänta",
@@ -77,17 +80,17 @@
   "invite.email.label": "E-postadress",
   "invite.headline.friends": "Bjud in 3 av dina vänner eller kollegor",
   "invite.name.label": "Namn",
-  "invite.skip.label": "I want to do this later",
+  "invite.skip.label": "Jag gör det senare",
   "invite.submit.label": "Skicka inbjudningar",
   "invite.successInfo": "Inbjudningar har skickats",
   "locked.headline": "Låst",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
+  "locked.info": "Ferdi är för närvarande låst. Lås upp Ferdi med ditt lösenord för att se dina meddelanden.",
   "locked.invalidCredentials": "Felaktigt lösenord",
   "locked.password.label": "Lösenord",
   "locked.submit.label": "Lås upp",
-  "locked.touchId": "Unlock with Touch ID",
-  "locked.touchIdPrompt": "unlock via Touch ID",
-  "locked.unlockWithPassword": "Unlock with Password",
+  "locked.touchId": "Lås upp med Touch ID",
+  "locked.touchIdPrompt": "lås upp med Touch ID",
+  "locked.unlockWithPassword": "Lås upp med lösenord",
   "login.changeServer": "Byt server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
@@ -95,11 +98,11 @@
   "login.headline": "Logga in",
   "login.invalidCredentials": "E-post eller lösenord är felaktigt",
   "login.link.password": "Återställ lösenord",
-  "login.link.signup": "Create a free account",
+  "login.link.signup": "Skapa ett gratis konto",
   "login.password.label": "Lösenord",
-  "login.serverLogout": "Your session expired, please login again.",
+  "login.serverLogout": "Din session har gått ut. Vänligen logga in på nytt.",
   "login.submit.label": "Logga in",
-  "login.tokenExpired": "Your session expired, please login again.",
+  "login.tokenExpired": "Din session har gått ut. Vänligen logga in på nytt.",
   "menu.Todoss.closeTodosDrawer": "Stäng Todos-lådan",
   "menu.Todoss.openTodosDrawer": "Öppna Todos-lådan",
   "menu.app.about": "Om Ferdi",
@@ -116,32 +119,32 @@
   "menu.edit.cut": "Klipp ut",
   "menu.edit.delete": "Radera",
   "menu.edit.emojiSymbols": "Emojis & symboler",
-  "menu.edit.findInPage": "Find in Page",
+  "menu.edit.findInPage": "Hitta på sidan",
   "menu.edit.paste": "Klistra in",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.pasteAndMatchStyle": "Klistra in och matcha stil",
   "menu.edit.redo": "Gör om",
   "menu.edit.selectAll": "Markera allt",
   "menu.edit.speech": "Tal",
   "menu.edit.startDictation": "Börja diktera",
   "menu.edit.startSpeaking": "Börja tala",
-  "menu.edit.stopSpeaking": "Stop Speaking",
+  "menu.edit.stopSpeaking": "Sluta prata",
   "menu.edit.undo": "Ångra",
   "menu.file": "Fil",
   "menu.help": "Hjälp",
   "menu.help.changelog": "Ändringslogg",
-  "menu.help.debugInfo": "Copy Debug Information",
-  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.debugInfo": "Kopiera felsökningsinformation",
+  "menu.help.debugInfoCopiedBody": "Din felsökningsinformation har kopierats till ditt urklipp.",
+  "menu.help.debugInfoCopiedHeadline": "Ferdi felsökningsinformation",
   "menu.help.learnMore": "Läs mer",
   "menu.help.privacy": "Integritetspolicy",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Skicka felsökningsinformation",
   "menu.help.support": "Support",
   "menu.help.tos": "Användarvillkor",
   "menu.services": "Tjänster",
   "menu.services.activatePreviousService": "Aktivera föregående tjänst",
   "menu.services.addNewService": "Lägg till ny tjänst...",
   "menu.services.goHome": "Hem",
-  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.services.setNextServiceActive": "Aktivera nästa tjänst",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Aktivera Todos",
   "menu.view": "Visa",
@@ -151,10 +154,11 @@
   "menu.view.forward": "Framåt",
   "menu.view.lockFerdi": "Lås Ferdi",
   "menu.view.openQuickSwitch": "Öppna snabbväxling",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFranz": "Ladda om Ferdi",
   "menu.view.reloadService": "Ladda om tjänst",
   "menu.view.resetZoom": "Originalstorlek",
-  "menu.view.toggleDevTools": "Toggle Developer Tools",
+  "menu.view.toggleDarkMode": "Växla mörkt läge",
+  "menu.view.toggleDevTools": "Växla utvecklarverktyg",
   "menu.view.toggleFullScreen": "Växla helskärmsläge",
   "menu.view.toggleServiceDevTools": "Växla tjänsteverktyg för utvecklare",
   "menu.view.toggleTodosDevTools": "Växla Todos utvecklarverktyg",
@@ -164,40 +168,40 @@
   "menu.window.close": "Stäng",
   "menu.window.minimize": "Minimera",
   "menu.workspaces": "Arbetsytor",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
-  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "All services",
-  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
+  "menu.workspaces.addNewWorkspace": "Skapa ny arbetsyta...",
+  "menu.workspaces.closeWorkspaceDrawer": "Stäng arbetsytan",
+  "menu.workspaces.defaultWorkspace": "Alla tjänster",
+  "menu.workspaces.openWorkspaceDrawer": "Öppna arbetsytan",
   "password.email.label": "E-postadress",
   "password.headline": "Återställ lösenord",
-  "password.link.login": "Sign in to your account",
-  "password.link.signup": "Create a free account",
-  "password.noUser": "No user with that email address was found",
+  "password.link.login": "Logga in på ditt konto",
+  "password.link.signup": "Skapa ett gratis konto",
+  "password.noUser": "Ingen användare med den e-postadressen hittades",
   "password.submit.label": "Skicka",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Vänligen kontrollera din e-post",
   "premiumFeature.button.upgradeAccount": "Uppgradera konto",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "pricing.features.accountSync": "Synkronisering av konto",
   "pricing.features.adFree": "Reklamfritt för alltid",
   "pricing.features.appDelays": "Inga vänteskärmar",
   "pricing.features.customWebsites": "Lägg till egna webbplatser",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "pricing.features.desktopNotifications": "Skrivbordsaviseringar",
+  "pricing.features.onPremise": "Lokala tjänster och andra värdtjänster",
+  "pricing.features.recipes": "Välj mellan fler än 70 tjänster",
   "pricing.features.serviceProxies": "Tjänstens proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team-hantering",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "pricing.features.spellchecker": "Stöd för stavningskontroll",
+  "pricing.features.teamManagement": "Hantera grupp",
+  "pricing.features.thirdPartyServices": "Installera tjänster från tredje part",
+  "pricing.features.unlimitedServices": "Lägg till obegränsat antal tjänster",
+  "pricing.features.upToSixServices": "Lägg till upp till 6 tjänster",
+  "pricing.features.upToThreeServices": "Lägg till upp till 3 tjänster",
   "pricing.features.workspaces": "Arbetsytor",
   "pricing.plan.free": "Ferdi Free",
   "pricing.plan.legacy": "Ferdi Premium",
   "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
+  "pricing.plan.personal-monthly": "Ferdi Personal månatlig",
+  "pricing.plan.personal-yearly": "Ferdi Professional årsvis",
   "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
+  "pricing.plan.pro-monthly": "Ferdi Professional månatlig",
   "pricing.plan.pro-yearly": "Ferdi Professional årsvis",
   "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
   "pricing.trial.cta.skip": "Continue to Ferdi",
@@ -212,37 +216,37 @@
   "pricing.trial.terms.headline": "No strings attached",
   "pricing.trial.terms.noCreditCard": "No credit card required",
   "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
-  "service.crashHandler.action": "Reload {name}",
-  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.crashHandler.action": "Ladda om {name}",
+  "service.crashHandler.autoReload": "Försöker automatiskt återställa {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Åh nej!",
   "service.crashHandler.text": "{name} har orsakat ett fel.",
-  "service.disabledHandler.action": "Enable {name}",
+  "service.disabledHandler.action": "Aktivera {name}",
   "service.disabledHandler.headline": "{name} är inaktiverad",
-  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.action": "Ladda om {name}",
   "service.errorHandler.editAction": "Redigera {name}",
   "service.errorHandler.headline": "Åh nej!",
   "service.errorHandler.message": "Fel",
-  "service.errorHandler.text": "{name} has failed to load.",
+  "service.errorHandler.text": "{name} kunde inte laddas.",
   "service.restrictedHandler.action": "Uppgradera konto",
   "service.restrictedHandler.customUrl.headline": "Ferdi Professional krävs",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
+  "service.restrictedHandler.customUrl.text": "Vänligen uppgradera till Ferdi Professional-abonnemanget för att använda anpassade webbadresser & själv-hostade tjänster.",
+  "service.restrictedHandler.serviceLimit.headline": "Du har nått gränsen för antalet tjänster.",
+  "service.restrictedHandler.serviceLimit.text": "Uppgradera ditt konto för att använda mer än {count} tjänster.",
   "service.webviewLoader.loading": "Laddar {service}",
   "services.getStarted": "Kom igång",
-  "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.login": "Logga in för att använda Ferdi.",
+  "services.serverInfo": "Om du vill kan du ändra din Ferdi-server genom att klicka på kugghjulet i det nedre vänstra hörnet.",
   "services.serverless": "Använd Ferdi utan ett konto",
   "services.welcome": "Välkommen till Ferdi",
-  "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
+  "settings.account.account.editButton": "Redigera konto",
+  "settings.account.accountType.basic": "Standardkonto",
   "settings.account.accountType.premium": "Premium Supporterkonto",
-  "settings.account.accountUnavailable": "Account is unavailable",
-  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
+  "settings.account.accountUnavailable": "Kontot är inte tillgängligt",
+  "settings.account.accountUnavailableInfo": "Du använder Ferdi utan ett konto. Om du vill använda Ferdi med ett konto och hålla dina tjänster synkroniserade mellan installationer, välj en server i fliken Inställningar och logga in.",
   "settings.account.buttonSave": "Uppdatera profil",
   "settings.account.deleteAccount": "Ta bort ditt användarkonto",
-  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+  "settings.account.deleteEmailSent": "Du har fått ett e-postmeddelande med en länk för att bekräfta raderingen av ditt konto. Ditt konto och data kan inte återställas!",
+  "settings.account.deleteInfo": "Om du inte behöver ditt Ferdi-konto längre, kan du ta bort ditt konto och all anknuten information här.",
   "settings.account.headline": "Konto",
   "settings.account.headlineAccount": "Kontoinformation",
   "settings.account.headlineDangerZone": "Högrisksområde",
@@ -251,9 +255,9 @@
   "settings.account.headlineProfile": "Uppdatera profil",
   "settings.account.headlineSubscription": "Ditt abonnemang",
   "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
+  "settings.account.headlineUpgradeAccount": "Uppgradera ditt konto för att få den hela Ferdi-upplevelsen",
   "settings.account.invoiceDownload": "Nerladdning",
-  "settings.account.manageSubscription.label": "Manage your subscription",
+  "settings.account.manageSubscription.label": "Hantera ditt abonnemang",
   "settings.account.successInfo": "Dina ändringar har sparats",
   "settings.account.trial": "Free Trial",
   "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
@@ -263,95 +267,94 @@
   "settings.account.upgradeToPro.label": "Uppgradera till Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Kunde inte ladda användarinformation",
   "settings.account.yourLicense": "Din Ferdi-licens",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
+  "settings.app.accentColorInfo": "Ange din accentfärg i ett CSS-kompatibelt format (standard: #7367f0).",
   "settings.app.buttonClearAllCache": "Rensa cache",
   "settings.app.buttonInstallUpdate": "Starta om & installera uppdatering",
   "settings.app.buttonSearchForUpdate": "Sök efter uppdateringar",
-  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheInfo": "Ferdis cache använder för närvarande {size} diskutrymme.",
   "settings.app.currentVersion": "Nuvarande version:",
-  "settings.app.form.accentColor": "Accent color",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.accentColor": "Accentfärg",
+  "settings.app.form.adaptableDarkMode": "Synkronisera det mörka läget med operativsystemets inställning för mörkt läge",
   "settings.app.form.autoLaunchInBackground": "Öppna i bakgrunden",
-  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
-  "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.autoLaunchOnStart": "Starta Ferdi vid uppstart",
+  "settings.app.form.automaticUpdates": "Aktivera uppdateringar",
+  "settings.app.form.beta": "Inkludera betaversioner",
+  "settings.app.form.customTodoServer": "Anpassad Todo-server",
   "settings.app.form.darkMode": "Aktivera mörkt läge",
-  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Password Lock",
-  "settings.app.form.enableSpellchecking": "Enable spell checking",
+  "settings.app.form.enableGPUAcceleration": "Aktivera GPU-hårdvaruacceleration",
+  "settings.app.form.enableLock": "Aktivera lösenordslås",
+  "settings.app.form.enableSpellchecking": "Aktivera stavningskontroll",
   "settings.app.form.enableSystemTray": "Visa Ferdi i systemfältet",
   "settings.app.form.enableTodos": "Aktivera Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.hibernate": "Sätt tjänst i vila",
+  "settings.app.form.hibernationStrategy": "Strategi för vila",
   "settings.app.form.iconSize": "Ikonstorlek för tjänster",
-  "settings.app.form.inactivityLock": "Lock after inactivity",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.inactivityLock": "Lås efter inaktivitet",
+  "settings.app.form.keepAllWorkspacesLoaded": "Håll alla arbetsytor laddade",
   "settings.app.form.language": "Språk",
   "settings.app.form.lockPassword": "Lösenord",
   "settings.app.form.minimizeToSystemTray": "Minimera Ferdi till systemfältet",
   "settings.app.form.navigationBarBehaviour": "Navigeringsfältets beteende",
-  "settings.app.form.noUpdates": "Inaktivera uppdateringar",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
-  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
+  "settings.app.form.predefinedTodoServer": "Todo-server",
+  "settings.app.form.privateNotifications": "Visa inte meddelandeinnehåll i aviseringar",
+  "settings.app.form.reloadAfterResume": "Ladda om Ferdi efter datorn väckts från vila",
+  "settings.app.form.runInBackground": "Kör Ferdi i bakgrunden när fönstret stängts",
   "settings.app.form.scheduledDNDEnabled": "Aktivera schemalagt Stör ej-läge",
   "settings.app.form.scheduledDNDEnd": "Till",
   "settings.app.form.scheduledDNDStart": "Från",
-  "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
+  "settings.app.form.sentry": "Skicka telemetridata",
   "settings.app.form.serviceRibbonWidth": "Sidofältets bredd",
   "settings.app.form.showDisabledServices": "Visa flikar för inaktiverade tjänster",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Visa antal olästa meddelanden när aviseringar är inaktiverade",
+  "settings.app.form.showDragArea": "Visa dragbart område i fönstret",
+  "settings.app.form.startMinimized": "Starta i minimerat läge",
   "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
   "settings.app.headline": "Inställningar",
   "settings.app.headlineAdvanced": "Avancerat",
   "settings.app.headlineAppearance": "Utseende",
   "settings.app.headlineGeneral": "Allmänt",
   "settings.app.headlineLanguage": "Språk",
   "settings.app.headlineUpdates": "Uppdateringar",
-  "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.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "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.hibernateInfo": "Som standard kommer Ferdi att hålla alla dina tjänster öppna och laddade i bakgrunden så att de är redo när du vill använda dem. Viloläget kommer att stänga dina tjänster efter ett angivet belopp. Detta är användbart för att spara på arbetsminne eller se till att tjänster inte saktar ner datorn.",
+  "settings.app.inactivityLockInfo": "Antal minuter av inaktivitet, varefter Ferdi låses automatiskt. Ange 0 för att inaktivera",
+  "settings.app.languageDisclaimer": "Engelska och tyska är officella översättningar. Övriga språk har översatts av gemenskapen.",
+  "settings.app.lockInfo": "Lösenordslås låter dig skydda dina meddelanden.\nMed lösenordslås kommer du bli ombedd att ange ditt lösenord varje gång du startar Ferdi. Du kan också låsa Ferdi själv med hjälp av låssymbolen i det nedre vänstra hörnet eller med kortkommandot CMD/CTRL+Shift+L.",
   "settings.app.lockedPassword": "Lösenord",
-  "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.",
-  "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
+  "settings.app.lockedPasswordInfo": "Se till att du anger ett lösenord du kommer att komma ihåg.\nOm du tappar bort detta lösenord måste du installera om Ferdi.",
+  "settings.app.restartRequired": "Ändringar kräver omstart",
+  "settings.app.scheduledDNDInfo": "Schemalagd \"Stör ej\" låter dig definiera en tidsperiod inom vilken du inte vill få meddelanden från Ferdi.",
+  "settings.app.scheduledDNDTimeInfo": "Tid i 24-timmarsformat. Sluttid kan vara före starttid (t.ex. start 17:00, slut 09:00) för att aktivera \"Stör ej\" över natten.",
+  "settings.app.sentryInfo": "Genom att skicka telemetridata kan vi hitta buggar i Ferdi - vi kommer inte att skicka någon personlig information (som dina meddelandedata)! Att ändra detta alternativ kräver en omstart av Ferdi.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
-  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
+  "settings.app.todoServerInfo": "Denna server kommer att användas för \"Ferdi Todo\"-funktionen.",
+  "settings.app.translationHelp": "Hjälp oss att översätta Ferdi till ditt språk.",
+  "settings.app.universalDarkModeInfo": "Globalt mörkt läge försöker att dynamiskt generera en mörk stil för tjänster som ännu inte stöds.",
   "settings.app.updateStatusAvailable": "Uppdatering tillgänglig, laddar ner...",
-  "settings.app.updateStatusSearching": "Is searching for update",
-  "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
+  "settings.app.updateStatusSearching": "Söker efter uppdatering",
+  "settings.app.updateStatusUpToDate": "Du använder den senaste versionen av Ferdi",
   "settings.invite.headline": "Bjud in vänner",
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tillgängliga tjänster",
   "settings.navigation.logout": "Logga ut",
   "settings.navigation.settings": "Inställningar",
   "settings.navigation.supportFerdi": "Stöd Ferdi",
-  "settings.navigation.team": "Manage Team",
+  "settings.navigation.team": "Hantera grupp",
   "settings.navigation.yourServices": "Dina tjänster",
   "settings.navigation.yourWorkspaces": "Dina arbetsytor",
-  "settings.recipes.all": "All services",
+  "settings.recipes.all": "Alla tjänster",
   "settings.recipes.custom": "Anpassade tjänster",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
+  "settings.recipes.customService.headline.communityRecipes": "Tredjepartsrecept från gemenskapen",
+  "settings.recipes.customService.headline.customRecipes": "Egna tredjepartsrecept",
   "settings.recipes.customService.headline.devRecipes": "Dina recept för utvecklingsservice",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
+  "settings.recipes.customService.intro": "För att lägga till en anpassad tjänst, kopiera receptet för tjänsten till:",
+  "settings.recipes.customService.openDevDocs": "Dokumentation för utvecklare",
   "settings.recipes.customService.openFolder": "Öppna mapp",
   "settings.recipes.headline": "Tillgängliga tjänster",
   "settings.recipes.missingService": "Saknar du en tjänst?",
-  "settings.recipes.mostPopular": "Most popular",
-  "settings.recipes.nothingFound": "Sorry, but no service matched your search term.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
+  "settings.recipes.mostPopular": "Mest populära",
+  "settings.recipes.nothingFound": "Tyvärr, men ingen tjänst matchade din sökterm.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Tjänsten har lagts till",
   "settings.searchService": "Sök efter tjänst",
   "settings.service.error.goBack": "Tillbaka till tjänster",
   "settings.service.error.headline": "Fel",
@@ -359,155 +362,155 @@
   "settings.service.form.addServiceHeadline": "Lägg till {name}",
   "settings.service.form.availableServices": "Tillgängliga tjänster",
   "settings.service.form.customUrl": "Anpassad server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.customUrlPremiumInfo": "För att lägga till egna tjänster behöver du ett Ferdi Premium supporter-konto.",
+  "settings.service.form.customUrlUpgradeAccount": "Uppgradera ditt konto",
+  "settings.service.form.customUrlValidationError": "Kunde inte validera anpassad {name} -server.",
   "settings.service.form.deleteButton": "Ta bort tjänst",
   "settings.service.form.editServiceHeadline": "Redigera {name}",
-  "settings.service.form.enableAudio": "Enable audio",
-  "settings.service.form.enableBadge": "Show unread message badges",
+  "settings.service.form.enableAudio": "Aktivera ljud",
+  "settings.service.form.enableBadge": "Visa olästa meddelandemärken",
   "settings.service.form.enableDarkMode": "Aktivera mörkt läge",
-  "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableNotification": "Aktivera aviseringar",
   "settings.service.form.enableService": "Aktivera tjänst",
-  "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineBadges": "Olästa meddelandemärken",
   "settings.service.form.headlineGeneral": "Allmänt",
   "settings.service.form.headlineNotifications": "Aviseringar",
   "settings.service.form.icon": "Anpassad ikon",
   "settings.service.form.iconDelete": "Radera",
   "settings.service.form.iconUpload": "Släpp din bild, eller klicka här",
-  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-  "settings.service.form.indirectMessages": "Show message badge for all new messages",
-  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.indirectMessageInfo": "Du kommer att aviseras om alla nya meddelanden i en kanal, inte bara @username, @channel, @here, ...",
+  "settings.service.form.indirectMessages": "Visa meddelandemärke för alla nya meddelanden",
+  "settings.service.form.isMutedInfo": "Om inaktiverad kommer alla aviseringsljud och ljuduppspelning att tystas",
   "settings.service.form.name": "Namn",
   "settings.service.form.openDarkmodeCss": "Öppna darkmode.css",
   "settings.service.form.openUserCss": "Öppna user.css",
-  "settings.service.form.openUserJs": "Open user.js",
+  "settings.service.form.openUserJs": "Öppna user.js",
   "settings.service.form.proxy.headline": "Inställningar för HTTP/HTTPS-proxy",
   "settings.service.form.proxy.host": "Proxy-värd/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxyinställningar kommer inte att synkroniseras med Ferdi-servrarna.",
   "settings.service.form.proxy.isEnabled": "Använd proxy",
   "settings.service.form.proxy.password": "Lösenord (frivilligt)",
   "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
+  "settings.service.form.proxy.restartInfo": "Vänligen starta om Ferdi efter att du ändrat proxyinställningar.",
   "settings.service.form.proxy.user": "Användare (valfritt)",
-  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-  "settings.service.form.saveButton": "Save service",
+  "settings.service.form.recipeFileInfo": "Dina användarfiler kommer att infogas i webbsidan så att du kan anpassa tjänsterna hur du vill. Användarfiler lagras endast lokalt och överförs inte till andra datorer som använer samma konto.",
+  "settings.service.form.saveButton": "Spara tjänst",
   "settings.service.form.tabHosted": "Värd",
   "settings.service.form.tabOnPremise": "Self-hosted ⭐",
-  "settings.service.form.team": "Team",
+  "settings.service.form.team": "Grupp",
   "settings.service.form.useHostedService": "Använd den värd-baserade tjänsten {name}.",
   "settings.service.form.yourServices": "Dina tjänster",
   "settings.services.deletedInfo": "Tjänsten har tagits bort",
   "settings.services.discoverServices": "Upptäck tjänster",
   "settings.services.headline": "Dina tjänster",
-  "settings.services.noServicesAdded": "You haven't added any services yet.",
+  "settings.services.noServicesAdded": "Du har inte lagt till några tjänster än.",
   "settings.services.servicesRequestFailed": "Kunde inte ladda dina tjänster",
-  "settings.services.tooltip.isDisabled": "Service is disabled",
-  "settings.services.tooltip.isMuted": "All sounds are muted",
-  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
+  "settings.services.tooltip.isDisabled": "Tjänsten är inaktiverad",
+  "settings.services.tooltip.isMuted": "Alla ljud är avstängda",
+  "settings.services.tooltip.notificationsDisabled": "Aviseringar är inaktiverade",
   "settings.services.updatedInfo": "Dina ändringar har sparats",
   "settings.supportFerdi.github": "Stjärnmarkera på GitHub",
   "settings.supportFerdi.headline": "Stöd Ferdi",
   "settings.supportFerdi.openCollective": "Stöd vårt öppna kollektiv",
   "settings.supportFerdi.share": "Tipsa dina vänner om oss",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
-  "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
+  "settings.supportFerdi.title": "Gillar du Ferdi? Sprid order!",
+  "settings.team.contentHeadline": "Hantera Franz-grupp",
+  "settings.team.copy": "Grupphanteringen i Franz låter dig hantera Franz-abonnemang för flera användare. Observera att ett Franz Premium-abonnemang inte ger dig några extra funktioner i Ferdi: Den enda anledningen till att du fortfarande har tillgång till grupphanteringen är att du kan hantera dina äldre Franz-grupper så att du inte förlorar någon funktionalitet i hanteringen av ditt konto.",
+  "settings.team.headline": "Grupp",
+  "settings.team.intro": "Du använder för närvarande Franz servrar, vilket är anledningen till att du har tillgång till grupphanteringen.",
+  "settings.team.manageAction": "Hantera din grupp på meetfranz.com",
+  "settings.team.teamsUnavailable": "Grupper är inte tillgängliga",
+  "settings.team.teamsUnavailableInfo": "Grupper är för närvarande endast tillgängliga när du använder Franz Server och har betalat för Franz Professional. Vänligen ändra din server till https://api.franzinfra.com för att använda gruppfunktionalitet.",
+  "settings.team.upgradeAction": "Uppgradera ditt konto",
   "settings.user.form.accountType.company": "Företag",
-  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.label": "Account type",
+  "settings.user.form.accountType.individual": "Privatperson",
+  "settings.user.form.accountType.label": "Kontotyp",
   "settings.user.form.accountType.non-profit": "Ideell organisation",
   "settings.user.form.currentPassword": "Nuvarande lösenord",
   "settings.user.form.email": "E-post",
   "settings.user.form.firstname": "Förnamn",
   "settings.user.form.lastname": "Efternamn",
-  "settings.user.form.newPassword": "New password",
+  "settings.user.form.newPassword": "Nytt lösenord",
   "settings.workspace.add.form.name": "Namn",
   "settings.workspace.add.form.submitButton": "Skapa arbetsyta",
   "settings.workspace.form.buttonDelete": "Ta bort arbetsyta",
   "settings.workspace.form.buttonSave": "Spara arbetsyta",
   "settings.workspace.form.keepLoaded": "Håll denna arbetsyta laddad*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+  "settings.workspace.form.keepLoadedInfo": "*Detta alternativ kommer att skrivas över av det globala alternativet \"Håll alla arbetsytor laddade\".",
   "settings.workspace.form.name": "Namn",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Tjänster i denna arbetsyta",
   "settings.workspace.form.yourWorkspaces": "Dina arbetsytor",
-  "settings.workspaces.deletedInfo": "Workspace has been deleted",
+  "settings.workspaces.deletedInfo": "Arbetsytan har tagits bort",
   "settings.workspaces.headline": "Dina arbetsytor",
-  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
+  "settings.workspaces.noWorkspacesAdded": "Du har inte lagt till några arbetsytor än.",
   "settings.workspaces.tryReloadWorkspaces": "Försök igen",
   "settings.workspaces.updatedInfo": "Dina ändringar har sparats",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+  "settings.workspaces.workspaceFeatureHeadline": "\"Less is more\": Vi presenterar Ferdi-arbetsytor",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst. Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.",
   "settings.workspaces.workspacesRequestFailed": "Kunde inte ladda dina arbetsytor",
   "sidebar.addNewService": "Lägg till ny tjänst",
   "sidebar.closeTodosDrawer": "Stäng Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
+  "sidebar.closeWorkspaceDrawer": "Stäng arbetsytan",
   "sidebar.lockFerdi": "Lås Ferdi",
   "sidebar.muteApp": "Inaktivera notifikationer och ljud",
   "sidebar.openTodosDrawer": "Öppna Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
+  "sidebar.openWorkspaceDrawer": "Öppna arbetsytan",
   "sidebar.settings": "Inställningar",
   "sidebar.unmuteApp": "Aktivera aviseringar och ljud",
   "signup.email.label": "E-postadress",
-  "signup.emailDuplicate": "A user with that email address already exists",
+  "signup.emailDuplicate": "En användare med den e-postadressen finns redan",
   "signup.firstname.label": "Förnamn",
   "signup.headline": "Registrera dig",
   "signup.lastname.label": "Efternamn",
-  "signup.legal.info": "By creating a Ferdi account you accept the",
+  "signup.legal.info": "Genom att skapa ett Ferdi konto accepterar du",
   "signup.legal.privacy": "Integritetspolicy",
   "signup.legal.terms": "Användarvillkor",
-  "signup.link.login": "Already have an account, sign in?",
+  "signup.link.login": "Har du redan ett konto? Logga in",
   "signup.password.label": "Lösenord",
   "signup.submit.label": "Skapa konto",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
   "subscription.cta.allOptions": "Se alla alternativ",
   "subscription.cta.choosePlan": "Välj abonnemang",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
+  "subscription.includedProFeatures": "I Ferdi Professional-abonnemanget ingår:",
   "subscription.interval.per": "per {interval}",
   "subscription.interval.perMonth": "per månad",
   "subscription.interval.perMonthPerUser": "per månad & användare",
   "subscription.planItem.upgradeAccount": "Uppgradera konto",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
+  "subscription.teaser.includedFeatures": "De avgiftsbelagda Ferdi-abonnemangen inkluderar:",
+  "subscription.teaser.intro": "Ferdi 5 kommer med ett brett utbud av nya funktioner för att förbättra din dagliga kommunikation. Kolla in våra nya abonnemang och ta reda på vilket av dem som passar dig bäst!",
   "subscriptionPopup.buttonCancel": "Avbryt",
   "subscriptionPopup.buttonDone": "Klar",
   "tabs.item.deleteService": "Ta bort tjänst",
   "tabs.item.disableAudio": "Inaktivera ljud",
-  "tabs.item.disableNotifications": "Disable notifications",
+  "tabs.item.disableNotifications": "Inaktivera aviseringar",
   "tabs.item.disableService": "Inaktivera tjänst",
   "tabs.item.edit": "Redigera",
-  "tabs.item.enableAudio": "Enable audio",
-  "tabs.item.enableNotification": "Enable notifications",
+  "tabs.item.enableAudio": "Aktivera ljud",
+  "tabs.item.enableNotification": "Aktivera aviseringar",
   "tabs.item.enableService": "Aktivera tjänst",
   "tabs.item.reload": "Ladda om",
-  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.email": "{field} är felaktig",
+  "validation.minLength": "{field} bör vara minst {length} tecken lång",
   "validation.oneRequired": "Minst en krävs",
-  "validation.required": "{field} is required",
-  "validation.url": "{field} is not a valid URL",
+  "validation.required": "{field} är obligatoriskt",
+  "validation.url": "{field} är inte en giltig URL",
   "webControls.back": "Tillbaka",
   "webControls.forward": "Framåt",
   "webControls.goHome": "Hem",
   "webControls.openInBrowser": "Öppna i webbläsare",
   "webControls.reload": "Ladda om",
-  "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "Create a free account",
+  "welcome.loginButton": "Logga in på ditt konto",
+  "welcome.signupButton": "Skapa ett gratis konto",
   "workspaceDrawer.addNewWorkspaceLabel": "Skapa ny arbetsyta",
-  "workspaceDrawer.allServices": "All services",
+  "workspaceDrawer.allServices": "Alla tjänster",
   "workspaceDrawer.headline": "Arbetsytor",
   "workspaceDrawer.item.contextMenuEdit": "redigera",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
+  "workspaceDrawer.item.noServicesAddedYet": "Inga tjänster har lagts till",
   "workspaceDrawer.premiumCtaButtonLabel": "Skapa din första arbetsyta",
   "workspaceDrawer.proFeatureBadge": "Premium-funktion",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
+  "workspaceDrawer.reactivatePremiumAccountLabel": "Återaktivera premiumkonto",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst.</p><p>Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Redigera inställningar för arbetsytor",
-  "workspaces.switchingIndicator.switchingTo": "Switching to"
+  "workspaces.switchingIndicator.switchingTo": "Byter till"
 }
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 0038d0a14..4fa22605f 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Yenile",
   "app.errorHandler.headline": "Bir terslik çıktı",
+  "changeserver.headline": "Sunucuyu değiştir",
+  "changeserver.label": "Sunucu",
+  "changeserver.submit": "Gönder",
   "feature.announcements.changelog.headline": "Ferdi {version} Sürümündeki Değişiklikler",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Beklememek için Ferdi Destek Lisansı'nı satın alın",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Ferdi'ı Yeniden Yükle",
   "menu.view.reloadService": "Servisi Tekrar Yükle",
   "menu.view.resetZoom": "Orijinal Boyut",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Geliştirici Araçlarına Geç",
   "menu.view.toggleFullScreen": "Tam Ekrana Geç",
   "menu.view.toggleServiceDevTools": "Hizmet Geliştirici Araçlarını Değiştir",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Arka planda aç",
   "settings.app.form.autoLaunchOnStart": "Ferdi'ı başlangıçta aç",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Beta versiyonları dahil et",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Şifre",
   "settings.app.form.minimizeToSystemTray": "Ferdi'ı sistem tepsisine küçült",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Pencereyi kapatırken Ferdi'ı arka planda tut",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "Kime:",
   "settings.app.form.scheduledDNDStart": "Kimden:",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Sunucu",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster",
   "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Ayarlar",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Önbellek",
-  "settings.app.todoServerInfo": "Bu sunucu \"Ferdi Yapılacaklar Listesi\" özelliği için kullanılacakdır. (varsayılan: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Ferdi'ı senin diline tercüme etmemiz için yardım et.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Güncelleme mevcut, indiriliyor...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Arkadaşlarınla Paylaş",
   "settings.supportFerdi.title": "Ferdi'yi seviyor musun? Hayat paylaştıkça güzel!",
-  "settings.team.contentHeadline": "Ekipler için Ferdi",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Takım",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "getferdi.com adresinden Ekibini yönet",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 9c1cedab5..cc0f4f1dd 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Перезавантажити",
   "app.errorHandler.headline": "Щось пішло не так",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Подати",
   "feature.announcements.changelog.headline": "Зміни у Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Будь ласка, придбайте ліцензію Ferdi Supporter аби пропустити очікування",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Перезавантажити Ferdi",
   "menu.view.reloadService": "Перезавантажити сервіс",
   "menu.view.resetZoom": "Фактичний розмір",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Переключити інструмент розробника",
   "menu.view.toggleFullScreen": "Переключитися на повний екран",
   "menu.view.toggleServiceDevTools": "Переключити інструменти розробника сервісу",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Відкрити у фоновому режимі",
   "settings.app.form.autoLaunchOnStart": "Запускати Ferdi на початку",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Включити бета-версії",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Пароль",
   "settings.app.form.minimizeToSystemTray": "Мінімізувати Ferdi до системного лотка",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Тримати Ferdi в фоні при закритті вікна",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Показати вкладку вимкнених сервісів",
   "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Налаштування",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Кеш",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Допоможіть перекласти Ferdi на Вашу мову.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Оновлення доступне, завантаження...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Команда",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 5c34e563b..6ffed81a1 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "Server",
+  "changeserver.submit": "Submit",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "Settings",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 658304768..c842d890d 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -1,6 +1,9 @@
 {
   "app.errorHandler.action": "重新加載",
   "app.errorHandler.headline": "出現錯誤",
+  "changeserver.headline": "切換服務器",
+  "changeserver.label": "伺服器",
+  "changeserver.submit": "送出",
   "feature.announcements.changelog.headline": "Ferdi 有了更新 {version}",
   "feature.debugger.title": "發布除錯訊息",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -154,6 +157,7 @@
   "menu.view.reloadFranz": "Reload Ferdi",
   "menu.view.reloadService": "重新載入",
   "menu.view.resetZoom": "實際大小",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "切換開發人員工具",
   "menu.view.toggleFullScreen": "切換全螢幕",
   "menu.view.toggleServiceDevTools": "切換開發人員服務工具",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "背景啟動",
   "settings.app.form.autoLaunchOnStart": "開機時啟動",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "包含開發中版本",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "啟用夜間模式",
   "settings.app.form.enableGPUAcceleration": "開啟顯示卡（GPU）加速",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "密碼",
   "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "取消更新",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "關閉時保持在背景運作",
@@ -297,12 +303,11 @@
   "settings.app.form.scheduledDNDEnd": "至",
   "settings.app.form.scheduledDNDStart": "從",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "伺服器",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "開始時最小化到系統匣",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.headline": "設置",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "有可用更新，下載中...",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "告訴你的朋友",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "團隊",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 5c34e563b..4260e7375 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -1,15 +1,18 @@
 {
-  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
+  "app.errorHandler.action": "重新加载",
+  "app.errorHandler.headline": "出了些问题",
+  "changeserver.headline": "Change server",
+  "changeserver.label": "服务器：",
+  "changeserver.submit": "Submit",
+  "feature.announcements.changelog.headline": "Ferdi的变化",
+  "feature.debugger.title": "发布调试信息",
+  "feature.delayApp.headline": "请购买Ferdi 支持者许可证来跳过等待",
+  "feature.delayApp.text": "Ferdi将在 {seconds} 秒后继续。",
   "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
   "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
   "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
+  "feature.delayApp.upgrade.action": "获得Ferdi 支持者许可证",
+  "feature.delayApp.upgrade.actionShort": "升级账户",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
@@ -26,20 +29,20 @@
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
+  "feature.publishDebugInfo.error": "发布调试信息时出错。请稍后再试或查看控制台以获取更多信息。",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-  "feature.publishDebugInfo.privacy": "Privacy policy",
-  "feature.publishDebugInfo.publish": "Accept and publish",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.privacy": "隐私权政策",
+  "feature.publishDebugInfo.publish": "接受并发布",
+  "feature.publishDebugInfo.published": "您的调试日志已经发布，现在可用于",
   "feature.publishDebugInfo.terms": "Terms of service",
-  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.publishDebugInfo.title": "发布调试信息",
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.quickSwitch.search": "搜索...",
+  "feature.quickSwitch.title": "快速切换",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
+  "feature.shareFranz.action.email": "以邮件形式发送",
+  "feature.shareFranz.action.facebook": "在 Facebook 上分享",
+  "feature.shareFranz.action.twitter": "在Twitter上分享",
   "feature.shareFranz.headline": "Ferdi is better together!",
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
@@ -55,7 +58,7 @@
   "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
   "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
+  "global.franzProRequired": "需要Ferdi 专业版",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
@@ -80,7 +83,7 @@
   "invite.skip.label": "I want to do this later",
   "invite.submit.label": "Send invites",
   "invite.successInfo": "Invitations sent successfully",
-  "locked.headline": "Locked",
+  "locked.headline": "已锁定",
   "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
@@ -103,57 +106,58 @@
   "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
   "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Ferdi",
-  "menu.app.announcement": "What's new?",
+  "menu.app.announcement": "新功能",
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.quit": "Quit",
-  "menu.app.settings": "Settings",
-  "menu.app.unhide": "Unhide",
-  "menu.edit": "Edit",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
-  "menu.edit.delete": "Delete",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
-  "menu.edit.speech": "Speech",
+  "menu.app.hide": "隐藏",
+  "menu.app.hideOthers": "隐藏其它",
+  "menu.app.quit": "退出",
+  "menu.app.settings": "设置",
+  "menu.app.unhide": "取消隐藏",
+  "menu.edit": "编辑",
+  "menu.edit.copy": "复制",
+  "menu.edit.cut": "剪切",
+  "menu.edit.delete": "删除",
+  "menu.edit.emojiSymbols": "Emoji 和符号",
+  "menu.edit.findInPage": "页内搜索",
+  "menu.edit.paste": "粘贴",
+  "menu.edit.pasteAndMatchStyle": "粘贴和匹配样式",
+  "menu.edit.redo": "重做",
+  "menu.edit.selectAll": "选择所有",
+  "menu.edit.speech": "语音",
   "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.undo": "Undo",
-  "menu.file": "File",
-  "menu.help": "Help",
-  "menu.help.changelog": "Changelog",
-  "menu.help.debugInfo": "Copy Debug Information",
+  "menu.edit.startSpeaking": "开始说话",
+  "menu.edit.stopSpeaking": "停止说话",
+  "menu.edit.undo": "撤销",
+  "menu.file": "文件",
+  "menu.help": "帮助",
+  "menu.help.changelog": "更新日志",
+  "menu.help.debugInfo": "复制调试信息",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
-  "menu.help.support": "Support",
-  "menu.help.tos": "Terms of Service",
-  "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service...",
-  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "View",
-  "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
+  "menu.help.publishDebugInfo": "发布调试信息",
+  "menu.help.support": "支持",
+  "menu.help.tos": "服务条款",
+  "menu.services": "服务",
+  "menu.services.activatePreviousService": "激活以前的服务",
+  "menu.services.addNewService": "添加新服务",
+  "menu.services.goHome": "主页",
+  "menu.services.setNextServiceActive": "激活下一个服务",
+  "menu.todos": "待办事项",
+  "menu.todos.enableTodos": "启用待办事项",
+  "menu.view": "查看",
+  "menu.view.back": "返回",
+  "menu.view.enterFullScreen": "进入全屏",
+  "menu.view.exitFullScreen": "退出全屏",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
   "menu.view.reloadFranz": "Reload Ferdi",
-  "menu.view.reloadService": "Reload Service",
+  "menu.view.reloadService": "重新加载服务",
   "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
@@ -175,7 +179,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "premiumFeature.button.upgradeAccount": "升级账户",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -273,7 +277,9 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -289,7 +295,7 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
+  "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -297,15 +303,14 @@
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
-  "settings.app.headline": "Settings",
+  "settings.app.headline": "设置",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -321,10 +326,8 @@
   "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.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
   "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -334,7 +337,7 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
+  "settings.navigation.settings": "设置",
   "settings.navigation.supportFerdi": "Support Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -373,7 +376,7 @@
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
-  "settings.service.form.iconDelete": "Delete",
+  "settings.service.form.iconDelete": "删除",
   "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
   "settings.service.form.indirectMessages": "Show message badge for all new messages",
@@ -411,11 +414,11 @@
   "settings.supportFerdi.openCollective": "Support our Open Collective",
   "settings.supportFerdi.share": "Tell your Friends",
   "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.contentHeadline": "Franz Team Management",
+  "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
@@ -452,7 +455,7 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
+  "sidebar.settings": "设置",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -482,21 +485,21 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
+  "tabs.item.edit": "编辑",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
-  "tabs.item.reload": "Reload",
+  "tabs.item.reload": "重新加载",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
   "validation.required": "{field} is required",
   "validation.url": "{field} is not a valid URL",
-  "webControls.back": "Back",
+  "webControls.back": "返回",
   "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
+  "webControls.goHome": "主页",
   "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "Reload",
+  "webControls.reload": "重新加载",
   "welcome.loginButton": "Login to your account",
   "welcome.signupButton": "Create a free account",
   "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",