1 files changed, 286 insertions, 102 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 0641c510c..c8bb03ded 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1299,55 +1299,68 @@
         }
       },
       {
-        "defaultMessage": "!!!Account",
+        "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
           "line": 20
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 17
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 28
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 21
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 32
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.inviteFriends",
         "start": {
           "column": 17,
-          "line": 25
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 36
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 29
+          "line": 33
         }
       }
     ],
@@ -3165,6 +3178,138 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.submitButton",
+        "start": {
+          "column": 16,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.name",
+        "start": {
+          "column": 8,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Delete workspace",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonDelete",
+        "start": {
+          "column": 16,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.name",
+        "start": {
+          "column": 8,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Services in this Workspace",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+        "start": {
+          "column": 31,
+          "line": 32
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.headline",
+        "start": {
+          "column": 12,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any workspaces yet.",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.noWorkspacesAdded",
+        "start": {
+          "column": 19,
+          "line": 16
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
@@ -3321,611 +3466,650 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 13
+          "line": 15
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 10
+          "line": 12
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 19
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 14
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 23
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 26
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 35
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 30
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 39
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 34
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 43
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 38
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 47
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 42
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 51
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 46
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 55
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 50
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 59
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 54
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 63
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 58
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 67
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 62
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 71
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 66
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 75
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 70
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 79
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 74
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Enter Full Screen",
         "end": {
           "column": 3,
-          "line": 81
+          "line": 83
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.enterFullScreen",
         "start": {
           "column": 19,
-          "line": 78
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Exit Full Screen",
         "end": {
           "column": 3,
-          "line": 85
+          "line": 87
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.exitFullScreen",
         "start": {
           "column": 18,
-          "line": 82
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 91
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 86
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 93
+          "line": 95
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 90
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 97
+          "line": 99
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 94
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 101
+          "line": 103
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 98
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Reload Franz",
         "end": {
           "column": 3,
-          "line": 105
+          "line": 107
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 102
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 111
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 106
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 113
+          "line": 115
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 110
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 117
+          "line": 119
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 114
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 121
+          "line": 123
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 118
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 125
+          "line": 127
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 122
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 129
+          "line": 131
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 126
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 135
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 130
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 137
+          "line": 139
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 134
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 141
+          "line": 143
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 138
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 145
+          "line": 147
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 142
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 149
+          "line": 151
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 146
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 153
+          "line": 155
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 150
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!About Franz",
         "end": {
           "column": 3,
-          "line": 157
+          "line": 159
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 154
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 161
+          "line": 163
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 158
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 165
+          "line": 167
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 162
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 169
+          "line": 171
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 166
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 173
+          "line": 175
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 170
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 177
+          "line": 179
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 174
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 181
+          "line": 183
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 178
+          "line": 180
+        }
+      },
+      {
+        "defaultMessage": "!!!Add New Workspace...",
+        "end": {
+          "column": 3,
+          "line": 187
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.addNewWorkspace",
+        "start": {
+          "column": 19,
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 185
+          "line": 191
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 182
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 189
+          "line": 195
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 186
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 193
+          "line": 199
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 190
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 197
+          "line": 203
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 194
+          "line": 200
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 207
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces",
+        "start": {
+          "column": 14,
+          "line": 204
+        }
+      },
+      {
+        "defaultMessage": "!!!Default",
+        "end": {
+          "column": 3,
+          "line": 211
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.defaultWorkspace",
+        "start": {
+          "column": 20,
+          "line": 208
         }
       }
     ],