1 files changed, 179 insertions, 88 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 44a49317e..2dd778434 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2,7 +2,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!A new update for Franz is available.",
+        "defaultMessage": "!!!A new update for Ferdi is available.",
         "end": {
           "column": 3,
           "line": 12
@@ -46,7 +46,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Import your Franz 4 services",
+        "defaultMessage": "!!!Import your Ferdi 4 services",
         "end": {
           "column": 3,
           "line": 16
@@ -59,7 +59,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Services not yet supported in Franz 5",
+        "defaultMessage": "!!!Services not yet supported in Ferdi 5",
         "end": {
           "column": 3,
           "line": 20
@@ -264,55 +264,81 @@
         }
       },
       {
-        "defaultMessage": "!!!Your session expired, please login again.",
+        "defaultMessage": "!!!Using a custom Ferdi server?",
         "end": {
           "column": 3,
           "line": 40
         },
         "file": "src/components/auth/Login.js",
+        "id": "login.customServerQuestion",
+        "start": {
+          "column": 24,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Try importing your Franz account",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.customServerSuggestion",
+        "start": {
+          "column": 26,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Your session expired, please login again.",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/components/auth/Login.js",
         "id": "login.tokenExpired",
         "start": {
           "column": 16,
-          "line": 37
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Your session expired, please login again.",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 52
         },
         "file": "src/components/auth/Login.js",
         "id": "login.serverLogout",
         "start": {
           "column": 16,
-          "line": 41
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Create a free account",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 56
         },
         "file": "src/components/auth/Login.js",
         "id": "login.link.signup",
         "start": {
           "column": 14,
-          "line": 45
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Forgot password",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 60
         },
         "file": "src/components/auth/Login.js",
         "id": "login.link.password",
         "start": {
           "column": 16,
-          "line": 49
+          "line": 57
         }
       }
     ],
@@ -604,7 +630,7 @@
         }
       },
       {
-        "defaultMessage": "!!!By creating a Franz account you accept the",
+        "defaultMessage": "!!!By creating a Ferdi account you accept the",
         "end": {
           "column": 3,
           "line": 44
@@ -753,7 +779,20 @@
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 36
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.authRequestFailed",
+        "start": {
+          "column": 21,
+          "line": 37
         }
       }
     ],
@@ -1016,7 +1055,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Welcome to Franz",
+        "defaultMessage": "!!!Welcome to Ferdi",
         "end": {
           "column": 3,
           "line": 17
@@ -1040,6 +1079,32 @@
           "column": 14,
           "line": 18
         }
+      },
+      {
+        "defaultMessage": "!!!Please login to use Ferdi.",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.login",
+        "start": {
+          "column": 9,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.serverInfo",
+        "start": {
+          "column": 14,
+          "line": 23
+        }
       }
     ],
     "path": "src/components/services/content/Services.json"
@@ -1395,7 +1460,7 @@
         }
       },
       {
-        "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.",
         "end": {
           "column": 3,
           "line": 73
@@ -1904,7 +1969,7 @@
         }
       },
       {
-        "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.",
         "end": {
           "column": 3,
           "line": 67
@@ -2034,7 +2099,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+        "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
         "end": {
           "column": 3,
           "line": 107
@@ -2047,7 +2112,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+        "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
         "end": {
           "column": 3,
           "line": 111
@@ -2291,234 +2356,247 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 20
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headline",
         "start": {
           "column": 12,
-          "line": 16
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 20
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.serverInfo",
+        "start": {
+          "column": 14,
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 32
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 24
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 36
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 28
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 40
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 32
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 44
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 36
+          "line": 41
         }
       },
       {
-        "defaultMessage": "!!!Help us to translate Franz into your language.",
+        "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 48
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 40
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 52
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 44
+          "line": 49
         }
       },
       {
-        "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+        "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 56
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 48
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 60
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 52
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 64
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 56
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 68
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 60
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 72
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 64
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 76
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 68
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Franz",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 80
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 72
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 84
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 76
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 88
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 29,
-          "line": 80
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 92
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 84
+          "line": 89
         }
       }
     ],
@@ -2540,7 +2618,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz for Teams",
+        "defaultMessage": "!!!Ferdi for Teams",
         "end": {
           "column": 3,
           "line": 24
@@ -2566,7 +2644,7 @@
         }
       },
       {
-        "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!",
         "end": {
           "column": 3,
           "line": 32
@@ -3411,7 +3489,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Launch Franz on start",
+        "defaultMessage": "!!!Launch Ferdi on start",
         "end": {
           "column": 3,
           "line": 27
@@ -3437,7 +3515,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Keep Franz in background when closing the window",
+        "defaultMessage": "!!!Keep Ferdi in background when closing the window",
         "end": {
           "column": 3,
           "line": 35
@@ -3450,7 +3528,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Show Franz in system tray",
+        "defaultMessage": "!!!Show Ferdi in system tray",
         "end": {
           "column": 3,
           "line": 39
@@ -3463,7 +3541,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Minimize Franz to system tray",
+        "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
           "line": 43
@@ -3476,6 +3554,19 @@
         }
       },
       {
+        "defaultMessage": "!!!Server",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.server",
+        "start": {
+          "column": 10,
+          "line": 44
+        }
+      },
+      {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
@@ -3707,16 +3798,16 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Changes in Franz {version}",
+        "defaultMessage": "!!!Changes in Ferdi {version}",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 22
         },
         "file": "src/features/announcements/components/AnnouncementScreen.js",
         "id": "feature.announcements.changelog.headline",
         "start": {
           "column": 12,
-          "line": 20
+          "line": 19
         }
       }
     ],
@@ -3777,7 +3868,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+        "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
         "end": {
           "column": 3,
           "line": 36
@@ -3829,7 +3920,7 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 17
         },
         "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
         "id": "premiumFeature.button.upgradeAccount",
@@ -3857,7 +3948,7 @@
         }
       },
       {
-        "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.",
         "end": {
           "column": 3,
           "line": 25
@@ -3987,26 +4078,26 @@
         "defaultMessage": "!!!Create workspace",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 15
         },
         "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
         "id": "settings.workspace.add.form.submitButton",
         "start": {
           "column": 16,
-          "line": 13
+          "line": 12
         }
       },
       {
         "defaultMessage": "!!!Name",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 19
         },
         "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
         "id": "settings.workspace.add.form.name",
         "start": {
           "column": 8,
-          "line": 17
+          "line": 16
         }
       }
     ],
@@ -4018,91 +4109,91 @@
         "defaultMessage": "!!!Delete workspace",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 20
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.buttonDelete",
         "start": {
           "column": 16,
-          "line": 19
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Save workspace",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 24
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.buttonSave",
         "start": {
           "column": 14,
-          "line": 23
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Name",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 28
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.name",
         "start": {
           "column": 8,
-          "line": 27
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 32
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 31
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Services in this Workspace",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 36
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.servicesInWorkspaceHeadline",
         "start": {
           "column": 31,
-          "line": 35
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!You haven't added any services yet.",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 40
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.services.noServicesAdded",
         "start": {
           "column": 19,
-          "line": 39
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Discover services",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 44
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.services.discoverServices",
         "start": {
           "column": 20,
-          "line": 43
+          "line": 41
         }
       }
     ],
@@ -4588,7 +4679,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Can't connect to Franz Online Services",
+        "defaultMessage": "!!!Can't connect to Ferdi Online Services",
         "end": {
           "column": 3,
           "line": 7
@@ -5087,7 +5178,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz Debug Information",
+        "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
           "line": 145