9 files changed, 101 insertions, 75 deletions

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..77fabf236 100644
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Please purchase license to skip waiting",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 17,
+      "line": 14,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 17,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 21,
+      "line": 18,
       "column": 17
     },
     "end": {
-      "line": 24,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Get a Franz Supporter License",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 25,
+      "line": 22,
       "column": 10
     },
     "end": {
-      "line": 28,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,24 +43,24 @@
     "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 29,
+      "line": 26,
       "column": 15
     },
     "end": {
-      "line": 32,
+      "line": 29,
       "column": 3
     }
   },
   {
     "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,
+      "line": 30,
       "column": 8
     },
     "end": {
-      "line": 36,
+      "line": 33,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
index df5bc03e8..e35ad8dd8 100644
--- a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
+++ b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
     "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
     "start": {
-      "line": 11,
+      "line": 9,
       "column": 16
     },
     "end": {
-      "line": 14,
+      "line": 12,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
     "start": {
-      "line": 15,
+      "line": 13,
       "column": 10
     },
     "end": {
-      "line": 18,
+      "line": 16,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index 72150f2b0..402865ec5 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -1,27 +1,27 @@
 [
   {
     "id": "feature.shareFranz.headline",
-    "defaultMessage": "!!!Franz is better together!",
+    "defaultMessage": "!!!Ferdi is better together!",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 18,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 21,
+      "line": 20,
       "column": 3
     }
   },
   {
     "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,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 25,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Share as email",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 26,
+      "line": 25,
       "column": 16
     },
     "end": {
-      "line": 29,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Share on Facebook",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 30,
+      "line": 29,
       "column": 19
     },
     "end": {
-      "line": 33,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Share on Twitter",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 34,
+      "line": 33,
       "column": 18
     },
     "end": {
-      "line": 37,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 38,
+      "line": 37,
       "column": 18
     },
     "end": {
-      "line": 41,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 42,
+      "line": 41,
       "column": 20
     },
     "end": {
-      "line": 45,
+      "line": 44,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
index 7f230e82a..19ea81171 100644
--- a/src/i18n/messages/src/features/todos/components/TodosWebview.json
+++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Franz Todos are available to premium users now!",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 15,
+      "line": 17,
       "column": 15
     },
     "end": {
-      "line": 18,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Upgrade Account",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 19,
+      "line": 21,
       "column": 14
     },
     "end": {
-      "line": 22,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Everyone else will have to wait a little longer.",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 23,
+      "line": 25,
       "column": 15
     },
     "end": {
-      "line": 26,
+      "line": 28,
       "column": 3
     }
   }
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..4b047eac1 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": 21,
       "column": 16
     },
     "end": {
-      "line": 22,
+      "line": 24,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Save workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 23,
+      "line": 25,
       "column": 14
     },
     "end": {
-      "line": 26,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 27,
+      "line": 29,
       "column": 8
     },
     "end": {
-      "line": 30,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,37 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 31,
+      "line": 33,
       "column": 18
     },
     "end": {
-      "line": 34,
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.keepLoaded",
+    "defaultMessage": "!!!Keep this workspace loaded*",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 37,
+      "column": 14
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.keepLoadedInfo",
+    "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 41,
+      "column": 18
+    },
+    "end": {
+      "line": 44,
       "column": 3
     }
   },
@@ -56,11 +82,11 @@
     "defaultMessage": "!!!Services in this Workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 35,
+      "line": 45,
       "column": 31
     },
     "end": {
-      "line": 38,
+      "line": 48,
       "column": 3
     }
   },
@@ -69,11 +95,11 @@
     "defaultMessage": "!!!You haven't added any services yet.",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 39,
+      "line": 49,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 52,
       "column": 3
     }
   },
@@ -82,11 +108,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 43,
+      "line": 53,
       "column": 20
     },
     "end": {
-      "line": 46,
+      "line": 56,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
index 2f340f1e9..9f0935620 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 17,
+      "line": 16,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 21,
+      "line": 20,
       "column": 15
     },
     "end": {
-      "line": 24,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Workspaces settings",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 25,
+      "line": 24,
       "column": 29
     },
     "end": {
-      "line": 28,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 29,
+      "line": 28,
       "column": 24
     },
     "end": {
-      "line": 32,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Create your first workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 33,
+      "line": 32,
       "column": 25
     },
     "end": {
-      "line": 36,
+      "line": 35,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Reactivate premium account",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 37,
+      "line": 36,
       "column": 28
     },
     "end": {
-      "line": 40,
+      "line": 39,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!add new workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 41,
+      "line": 40,
       "column": 24
     },
     "end": {
-      "line": 44,
+      "line": 43,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Premium feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 45,
+      "line": 44,
       "column": 23
     },
     "end": {
-      "line": 48,
+      "line": 47,
       "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,