20 files changed, 183 insertions, 92 deletions

diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
index c4c2d0cae..da801b548 100644
--- a/src/i18n/messages/src/components/AppUpdateInfoBar.json
+++ b/src/i18n/messages/src/components/AppUpdateInfoBar.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "infobar.updateAvailable",
-    "defaultMessage": "!!!A new update for Franz is available.",
+    "defaultMessage": "!!!A new update for Ferdi is available.",
     "file": "src/components/AppUpdateInfoBar.js",
     "start": {
       "line": 9,
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
index 264fc729b..98ae2e61f 100644
--- a/src/i18n/messages/src/components/auth/Import.json
+++ b/src/i18n/messages/src/components/auth/Import.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "import.headline",
-    "defaultMessage": "!!!Import your Franz 4 services",
+    "defaultMessage": "!!!Import your Ferdi 4 services",
     "file": "src/components/auth/Import.js",
     "start": {
       "line": 13,
@@ -14,7 +14,7 @@
   },
   {
     "id": "import.notSupportedHeadline",
-    "defaultMessage": "!!!Services not yet supported in Franz 5",
+    "defaultMessage": "!!!Services not yet supported in Ferdi 5",
     "file": "src/components/auth/Import.js",
     "start": {
       "line": 17,
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
index 177f6000b..d593eac68 100644
--- a/src/i18n/messages/src/components/auth/Login.json
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -65,15 +65,41 @@
     }
   },
   {
+    "id": "login.customServerQuestion",
+    "defaultMessage": "!!!Using a custom Ferdi server?",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 37,
+      "column": 24
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.customServerSuggestion",
+    "defaultMessage": "!!!Try importing your Franz account",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 41,
+      "column": 26
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
     "id": "login.tokenExpired",
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 37,
+      "line": 45,
       "column": 16
     },
     "end": {
-      "line": 40,
+      "line": 48,
       "column": 3
     }
   },
@@ -82,11 +108,11 @@
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 41,
+      "line": 49,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 52,
       "column": 3
     }
   },
@@ -95,11 +121,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 45,
+      "line": 53,
       "column": 14
     },
     "end": {
-      "line": 48,
+      "line": 56,
       "column": 3
     }
   },
@@ -108,11 +134,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 49,
+      "line": 57,
       "column": 16
     },
     "end": {
-      "line": 52,
+      "line": 60,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index 2ea71e5ff..9aa7b25ab 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -66,7 +66,7 @@
   },
   {
     "id": "signup.legal.info",
-    "defaultMessage": "!!!By creating a Franz account you accept the",
+    "defaultMessage": "!!!By creating a Ferdi account you accept the",
     "file": "src/components/auth/Signup.js",
     "start": {
       "line": 41,
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 44cf4fab9..593a7bcb3 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -30,11 +30,24 @@
     "defaultMessage": "!!!Could not load services and user information",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 26
     },
     "end": {
-      "line": 39,
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.authRequestFailed",
+    "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 37,
+      "column": 21
+    },
+    "end": {
+      "line": 40,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
index eb466c0ac..cee7f42c0 100644
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "services.welcome",
-    "defaultMessage": "!!!Welcome to Franz",
+    "defaultMessage": "!!!Welcome to Ferdi",
     "file": "src/components/services/content/Services.js",
     "start": {
       "line": 14,
@@ -24,5 +24,31 @@
       "line": 21,
       "column": 3
     }
+  },
+  {
+    "id": "services.login",
+    "defaultMessage": "!!!Please login to use Ferdi.",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 19,
+      "column": 9
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverInfo",
+    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 23,
+      "column": 14
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 06d53e41d..48078c18d 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -170,7 +170,7 @@
   },
   {
     "id": "settings.account.deleteInfo",
-    "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
+    "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
       "line": 70,
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index e66db807d..45dc7b690 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -131,7 +131,7 @@
   },
   {
     "id": "settings.service.form.customUrlPremiumInfo",
-    "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
+    "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
       "line": 64,
@@ -261,7 +261,7 @@
   },
   {
     "id": "settings.service.form.proxy.restartInfo",
-    "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+    "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
       "line": 104,
@@ -274,7 +274,7 @@
   },
   {
     "id": "settings.service.form.proxy.info",
-    "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+    "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
       "line": 108,
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index fa21db10a..a62ddb5b8 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,24 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 23,
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.serverInfo",
+    "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 25,
+      "column": 14
+    },
+    "end": {
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +43,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 24,
+      "line": 29,
       "column": 20
     },
     "end": {
-      "line": 27,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +56,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 28,
+      "line": 33,
       "column": 19
     },
     "end": {
-      "line": 31,
+      "line": 36,
       "column": 3
     }
   },
@@ -56,11 +69,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 32,
+      "line": 37,
       "column": 22
     },
     "end": {
-      "line": 35,
+      "line": 40,
       "column": 3
     }
   },
@@ -69,24 +82,24 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 36,
+      "line": 41,
       "column": 20
     },
     "end": {
-      "line": 39,
+      "line": 44,
       "column": 3
     }
   },
   {
     "id": "settings.app.translationHelp",
-    "defaultMessage": "!!!Help us to translate Franz into your language.",
+    "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 40,
+      "line": 45,
       "column": 19
     },
     "end": {
-      "line": 43,
+      "line": 48,
       "column": 3
     }
   },
@@ -95,24 +108,24 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 44,
+      "line": 49,
       "column": 20
     },
     "end": {
-      "line": 47,
+      "line": 52,
       "column": 3
     }
   },
   {
     "id": "settings.app.cacheInfo",
-    "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+    "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 48,
+      "line": 53,
       "column": 13
     },
     "end": {
-      "line": 51,
+      "line": 56,
       "column": 3
     }
   },
@@ -121,11 +134,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 52,
+      "line": 57,
       "column": 23
     },
     "end": {
-      "line": 55,
+      "line": 60,
       "column": 3
     }
   },
@@ -134,11 +147,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 56,
+      "line": 61,
       "column": 25
     },
     "end": {
-      "line": 59,
+      "line": 64,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 60,
+      "line": 65,
       "column": 23
     },
     "end": {
-      "line": 63,
+      "line": 68,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 64,
+      "line": 69,
       "column": 25
     },
     "end": {
-      "line": 67,
+      "line": 72,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 68,
+      "line": 73,
       "column": 25
     },
     "end": {
-      "line": 71,
+      "line": 76,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!You are using the latest version of Franz",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 72,
+      "line": 77,
       "column": 24
     },
     "end": {
-      "line": 75,
+      "line": 80,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 76,
+      "line": 81,
       "column": 18
     },
     "end": {
-      "line": 79,
+      "line": 84,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 80,
+      "line": 85,
       "column": 29
     },
     "end": {
-      "line": 83,
+      "line": 88,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 84,
+      "line": 89,
       "column": 22
     },
     "end": {
-      "line": 87,
+      "line": 92,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 0c33fee5f..80adadb67 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -14,7 +14,7 @@
   },
   {
     "id": "settings.team.contentHeadline",
-    "defaultMessage": "!!!Franz for Teams",
+    "defaultMessage": "!!!Ferdi for Teams",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
       "line": 21,
@@ -40,7 +40,7 @@
   },
   {
     "id": "settings.team.copy",
-    "defaultMessage": "!!!Franz 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!",
+    "defaultMessage": "!!!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!",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
       "line": 29,
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
index 0cde4cee5..582d546fa 100644
--- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
+++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/components/ui/PremiumFeatureContainer/index.js",
     "start": {
-      "line": 16,
+      "line": 14,
       "column": 10
     },
     "end": {
-      "line": 19,
+      "line": 17,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 2b666e7e9..f802893e8 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "settings.app.form.autoLaunchOnStart",
-    "defaultMessage": "!!!Launch Franz on start",
+    "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 24,
@@ -27,7 +27,7 @@
   },
   {
     "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Franz in background when closing the window",
+    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 32,
@@ -40,7 +40,7 @@
   },
   {
     "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Show Franz in system tray",
+    "defaultMessage": "!!!Show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 36,
@@ -53,7 +53,7 @@
   },
   {
     "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Franz to system tray",
+    "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 40,
@@ -65,6 +65,19 @@
     }
   },
   {
+    "id": "settings.app.form.server",
+    "defaultMessage": "!!!Server",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 44,
+      "column": 10
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.language",
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
diff --git a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
index eb1b66916..ba8b624a1 100644
--- a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
+++ b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
@@ -1,14 +1,14 @@
 [
   {
     "id": "feature.announcements.changelog.headline",
-    "defaultMessage": "!!!Changes in Franz {version}",
+    "defaultMessage": "!!!Changes in Ferdi {version}",
     "file": "src/features/announcements/components/AnnouncementScreen.js",
     "start": {
-      "line": 20,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 23,
+      "line": 22,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
index 0d345a47b..6fe8b1334 100644
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -53,7 +53,7 @@
   },
   {
     "id": "feature.delayApp.text",
-    "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+    "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
     "file": "src/features/delayApp/Component.js",
     "start": {
       "line": 33,
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index 72150f2b0..6e3e9ad19 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "feature.shareFranz.headline",
-    "defaultMessage": "!!!Franz is better together!",
+    "defaultMessage": "!!!Ferdi is better together!",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 18,
@@ -14,7 +14,7 @@
   },
   {
     "id": "feature.shareFranz.text",
-    "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+    "defaultMessage": "!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 22,
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
index f62bac42c..1aabfb520 100644
--- a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
+++ b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Create workspace",
     "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
     "start": {
-      "line": 13,
+      "line": 12,
       "column": 16
     },
     "end": {
-      "line": 16,
+      "line": 15,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
     "start": {
-      "line": 17,
+      "line": 16,
       "column": 8
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
index 20ed99f8d..61abf8ba0 100644
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Delete workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 19,
+      "line": 17,
       "column": 16
     },
     "end": {
-      "line": 22,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Save workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 23,
+      "line": 21,
       "column": 14
     },
     "end": {
-      "line": 26,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 27,
+      "line": 25,
       "column": 8
     },
     "end": {
-      "line": 30,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 31,
+      "line": 29,
       "column": 18
     },
     "end": {
-      "line": 34,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Services in this Workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 35,
+      "line": 33,
       "column": 31
     },
     "end": {
-      "line": 38,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!You haven't added any services yet.",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 39,
+      "line": 37,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 43,
+      "line": 41,
       "column": 20
     },
     "end": {
-      "line": 46,
+      "line": 44,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
index 7eb4fab50..4111ba760 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -92,7 +92,7 @@
   },
   {
     "id": "settings.workspaces.workspaceFeatureHeadline",
-    "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+    "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
       "line": 47,
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index f4fd5b8b0..903de64cb 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "global.api.unhealthy",
-    "defaultMessage": "!!!Can't connect to Franz Online Services",
+    "defaultMessage": "!!!Can't connect to Ferdi Online Services",
     "file": "src/i18n/globalMessages.js",
     "start": {
       "line": 4,
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index cee46608c..43354bfca 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -404,7 +404,7 @@
   },
   {
     "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Franz Debug Information",
+    "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 142,