3 files changed, 30 insertions, 28 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index da79ff5c9..ffcf3e1dd 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4187,91 +4187,91 @@
         "defaultMessage": "!!!Delete workspace",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 24
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.buttonDelete",
         "start": {
           "column": 16,
-          "line": 17
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Save workspace",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 28
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.buttonSave",
         "start": {
           "column": 14,
-          "line": 21
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Name",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 32
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.name",
         "start": {
           "column": 8,
-          "line": 25
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 36
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 29
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Services in this Workspace",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 40
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.workspace.form.servicesInWorkspaceHeadline",
         "start": {
           "column": 31,
-          "line": 33
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!You haven't added any services yet.",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 44
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.services.noServicesAdded",
         "start": {
           "column": 19,
-          "line": 37
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Discover services",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 48
         },
         "file": "src/features/workspaces/components/EditWorkspaceForm.js",
         "id": "settings.services.discoverServices",
         "start": {
           "column": 20,
-          "line": 41
+          "line": 45
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 4b008a717..dd1b00d79 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -331,6 +331,8 @@
   "settings.workspace.add.form.submitButton": "Create workspace",
   "settings.workspace.form.buttonDelete": "Delete workspace",
   "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
+  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
   "settings.workspace.form.name": "Name",
   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
   "settings.workspace.form.yourWorkspaces": "Your workspaces",
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
index 61abf8ba0..5bb13a415 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": 17,
+      "line": 21,
       "column": 16
     },
     "end": {
-      "line": 20,
+      "line": 24,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Save workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 21,
+      "line": 25,
       "column": 14
     },
     "end": {
-      "line": 24,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 25,
+      "line": 29,
       "column": 8
     },
     "end": {
-      "line": 28,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 29,
+      "line": 33,
       "column": 18
     },
     "end": {
-      "line": 32,
+      "line": 36,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Services in this Workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 33,
+      "line": 37,
       "column": 31
     },
     "end": {
-      "line": 36,
+      "line": 40,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!You haven't added any services yet.",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 37,
+      "line": 41,
       "column": 19
     },
     "end": {
-      "line": 40,
+      "line": 44,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 41,
+      "line": 45,
       "column": 20
     },
     "end": {
-      "line": 44,
+      "line": 48,
       "column": 3
     }
   }