Merge Franz 5.3.2

author: vantezzen <properly@protonmail.com> 2019-09-13 18:00:03 +0200
committer: vantezzen <properly@protonmail.com> 2019-09-13 18:00:03 +0200
commit: ee67ec1e9486dfaf09b01db44eb401c8b6cd2277 (patch)
tree: a2c8b353313cb363a56722687e110c6f80f4b791
parent: Use ferdi namespace on debugger (diff)
parent: Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-ma... (diff)
download: ferdium-app-ee67ec1e9486dfaf09b01db44eb401c8b6cd2277.tar.gz
ferdium-app-ee67ec1e9486dfaf09b01db44eb401c8b6cd2277.tar.zst
ferdium-app-ee67ec1e9486dfaf09b01db44eb401c8b6cd2277.zip
44 files changed, 863 insertions, 866 deletions
diff --git a/.travis.yml b/.travis.yml
index ca238e86b..831f411f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,3 +34,13 @@ deploy:
  acl: public_read
  on:
    all_branches: true
+env:
+  global:
+  - secure: fddJzSmNYVX024jnhnFXEuAK1spEYi3y3RZdWaBtjQnzoObAxkcRW263JNpXQy+b7egnp2hSy8FvlQU+L967911F5Y70Pe3An4oI72hnS3DL4Njp2Dw5PwviwMA+X2ddWhzK4+k/JU6r8jBv1FGQ6ZjwSeaO/t8UKOsE8wDBFLRhnHqoR7QbM7zmKjzh/1oofunGbHsPOHmN4f7jBwSuSFTZltEENcQg3ZP++0NHU8UJdlpfqZOkro8v4AJMngAHeHlNtjwaAHdVv+6+kkwc4E/0Cy6YNyyBkbzipyngNY3GwnwzmNzvsfICD1TGklksjBlMQq7ld7eCiaYRNvyHVEmXJ17qlq7HhxkYgNy32hPRwb5Cv6o4M4tv8qS8UUk4W1RvBJ5fcmfZGQwGXPyQ/m85RJtrNfbYtr84jYcprTnSeji/9PuZv0f87dxELYm3DYmNUa1cgJqEdLUsEd0bMwUYNLnCSfu4ea2zxwir6LSBtJJCbGKxX87s5IOTrHkrWDe+PWd52v+UjQks7MBRlJnntTWo69Yy+ayXV1TnGVOHA5znHvPOvFlAF+y8tLGd4AGvehK1SAkf0+idmc9Q9xKk0QypT3ibjJui4D50p7sSajkzz3P2pUqOS/9HmjMfPMPN+Nl+48GU0CvB2aBGhdmp9vu54VaFzUaAGNGj4WI=
+  - secure: AjJvKhQ1jIloxogMdtOzJqovPQUBSA0lfHcRsmGdP8HIRKSRi9tKxCCgicTMpMWfvY7qtdexXBbl2/zl6cOhjfTYeAhNwwCg+dw7OVcE8LUn4E+gYZCYIKbNmmkVKsSckQd4h2IcyvqdqLwzjrEzdF95MoUI8WqdLwvQJLkoIaXju6ZT76FslGSUVXk58ZN7p2nr3kW8V7KclIzn/yyyYXE4bjBmS4djuvCReeSfSViCuX5CGT8avBb/IF/M5S7hcQVybmmalysOrranzSx0o9PPUIT9hHqqRpXW6iss2qVj+kCaFiC3ftlApVgizBoGcNAMA8N7hX8kkEjJSpiy7Vswuev9mVN9X94VwVZGyNvdYD8cKKxqTsfFDZDgefnuSYUhymKSBgM4yScYF6IPNJWFWJTugtVeMJ8ivqZhwJuD20nt6x7gGB1FS6m7axxRWeyp7h0FqWU9l6ZfmwHcRziVKNTk9BB4XIqco9M2wjV/YH321IGVwtVR5y6zty10+xk38TthCOidgBurFlMKbFKH5g9K5+84dhsCW0avMlJ0+QkgId0uAVyho+09Wx4cKqXLfobpznkUX+S0Um6G/NbAaUAU+SqBsm+X9CKFsPd/YJoxLdF7eBCG/3Fy4roKg3J4mBYeXe3wVnGft8Eeg0aNpOArMSStMY337UpdV80=
+  - secure: WNQBUyNvjTwMFm6pPzNXZYRvgLCTgEm93vLX/0amtr6gT6N8ZsTLL5+Ht3+v51MUOsjEe6tCM4cLSh4wSuwWcSEsUjK0jiqknlpgKKl6xLeo+1t8u6BKSgTpipWqrSD24TbvMrFUyeQrqCGRdZc3Ax/F1ERD81SXcsrg2evCL8g8zsYjxSMXc44drKrvYi68s/5ALrI+oH3t2PYsGuuP1ipj5CbaizUHEa5d8TukHRl96lxoEKCQ4Sa8UXRPNQsdb3TdkVmIEPIoioWU6AMPweBWR6Ky994aKwp0wWn1adWP49v8skMYWbirENniSxShtztF/NYqPQFyoyh0WD/C/ZJPh04HlMxnmQPUROq+LxBFz8WBY1eHDmz6GxH1lDYzneTtlRa5K8izvs2+ROhpVmmKeOgWHaL1ZRMy8Cn3V88kadF7i1K9NnqB6ZPyynJJctj7o0af6Os9/ZPqWfqIOWWeXgfXVzj17xJADfh6Z9epW95hdKZjnIf9IqGAI8aYTqhVL8DKTJ+PSGhJIOEX+ERm+0U9gMlwllwjHCDhBe42zCGuLaWZ239yD1eacM0Ko7yUM+xobiiF0FlB8VI/nBOpGdeUKNLeUfikLHILWd04AVRCNaQU67GMOHekfWdGR8tEh9I/5Y6GJR0IQL5eGmDUjSN0u/Ovss4jSEBOaXo=
+branches:
+  except:
+  - i18n
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ba1b521..7f8cb5729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-13)
+Merged Franz v5.3.2 into Ferdi
 ## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09)
 Merge Franz v5.3.1 into Ferdi.
diff --git a/appveyor.yml b/appveyor.yml
index 8df0934df..f8822d0a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,3 +20,7 @@ build_script:
 artifacts:
  - path: out\*.exe
  - path: out\*.yml
+branches:
+  except:
+    - i18n
diff --git a/package.json b/package.json
index 0b7fbc451..27ee107d4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "ferdi",
  "productName": "Ferdi",
  "appId": "com.kytwb.ferdi",
-  "version": "5.3.1",
+  "version": "5.3.2",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "kytwb",
  "main": "index.js",
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 1bf2554b5..4bc6feb15 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -8,6 +8,7 @@ import { Link } from 'react-router';
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
+import { todosStore } from '../../features/todos';
 const messages = defineMessages({
  settings: {
@@ -34,6 +35,14 @@ const messages = defineMessages({
    id: 'sidebar.closeWorkspaceDrawer',
    defaultMessage: '!!!Close workspace drawer',
  },
+  openTodosDrawer: {
+    id: 'sidebar.openTodosDrawer',
+    defaultMessage: '!!!Open Franz Todos',
+  },
+  closeTodosDrawer: {
+    id: 'sidebar.closeTodosDrawer',
+    defaultMessage: '!!!Close Franz Todos',
+  },
 });
 export default @observer class Sidebar extends Component {
@@ -79,6 +88,10 @@ export default @observer class Sidebar extends Component {
      toggleWorkspaceDrawer,
    } = this.props;
    const { intl } = this.context;
+    const todosToggleMessage = (
+      todosStore.isTodosPanelVisible ? messages.closeTodosDrawer : messages.openTodosDrawer
+    );
    const workspaceToggleMessage = (
      isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer
    );
@@ -91,54 +104,51 @@ export default @observer class Sidebar extends Component {
          enableToolTip={() => this.enableToolTip()}
          disableToolTip={() => this.disableToolTip()}
        />
-        {
+        {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
-          isLoggedIn ? (
+          <button
-            <>
+            type="button"
-              {workspaceStore.isFeatureEnabled ? (
+            onClick={() => {
-                <button
+              todoActions.toggleTodosPanel();
-                  type="button"
+              this.updateToolTip();
-                  onClick={() => {
+            }}
-                    toggleWorkspaceDrawer();
+            className="sidebar__button sidebar__button--workspaces"
-                    this.updateToolTip();
+            data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
-                  }}
+          >
-                  className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
+            <i className="mdi mdi-check-all" />
-                  data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
+          </button>
-                >
+        ) : null}
-                  <i className="mdi mdi-view-grid" />
+        {workspaceStore.isFeatureEnabled ? (
-                </button>
+          <button
-              ) : null}
+            type="button"
+            onClick={() => {
-              <button
+              toggleWorkspaceDrawer();
-                type="button"
+              this.updateToolTip();
-                onClick={() => {
+            }}
-                  toggleMuteApp();
+            className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-                  this.updateToolTip();
+            data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
-                }}
+          >
-                className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
+            <i className="mdi mdi-view-grid" />
-                data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
+          </button>
-              >
+        ) : null}
-                <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
+        <button
-              </button>
+          type="button"
-              <button
+          onClick={() => {
-                type="button"
+            toggleMuteApp();
-                onClick={() => openSettings({ path: 'recipes' })}
+            this.updateToolTip();
-                className="sidebar__button sidebar__button--new-service"
+          }}
-                data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
+          className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
-              >
+          data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
-                <i className="mdi mdi-plus-box" />
+        >
-              </button>
+          <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
-            </>
+        </button>
-          ) : (
+        <button
-            <Link
+          type="button"
-              to="/auth/welcome"
+          onClick={() => openSettings({ path: 'recipes' })}
-              className="sidebar__button sidebar__button--new-service"
+          className="sidebar__button sidebar__button--new-service"
-              data-tip="Login"
+          data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
-            >
+        >
-              <i className="mdi mdi-login-variant" />
+          <i className="mdi mdi-plus-box" />
-            </Link>
+        </button>
-          )
-        }
        <button
          type="button"
          onClick={() => openSettings({ path: 'app' })}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index b026222c3..835fd394b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -111,6 +111,7 @@ export default @observer class EditSettingsForm extends Component {
    cacheSize: PropTypes.string.isRequired,
    isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
    isTodosEnabled: PropTypes.bool.isRequired,
+    isWorkspaceEnabled: PropTypes.bool.isRequired,
  };
  static contextTypes = {
@@ -142,6 +143,7 @@ export default @observer class EditSettingsForm extends Component {
      cacheSize,
      isSpellcheckerIncludedInCurrentPlan,
      isTodosEnabled,
+      isWorkspaceEnabled,
    } = this.props;
    const { intl } = this.context;
@@ -182,9 +184,12 @@ export default @observer class EditSettingsForm extends Component {
              field={form.$('server')}
              autoFocus
            />
-            { isLoggedIn && (
+            {isLoggedIn && (
              <p>{ intl.formatMessage(messages.serverInfo) }</p>
            )}
+            {isWorkspaceEnabled && (
+              <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+            )}
            {isTodosEnabled && (
              <>
                <Toggle field={form.$('enableTodos')} />
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 73385d7b8..09e7b43ab 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -21,6 +21,8 @@ import { API, TODOS_FRONTEND } from '../../environment';
 import globalMessages from '../../i18n/globalMessages';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
+import WorkspacesStore from '../../features/workspaces/store';
+import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/workspaces';
 const messages = defineMessages({
  autoLaunchOnStart: {
@@ -87,6 +89,10 @@ const messages = defineMessages({
    id: 'settings.app.form.enableTodos',
    defaultMessage: '!!!Enable Franz Todos',
  },
+  keepAllWorkspacesLoaded: {
+    id: 'settings.app.form.keepAllWorkspacesLoaded',
+    defaultMessage: '!!!Keep all workspaces loaded',
+  },
 });
 export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
@@ -95,12 +101,13 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
  };
  onSubmit(settingsData) {
-    const { todos } = this.props.stores;
+    const { todos, workspaces } = this.props.stores;
    const {
      app,
      settings,
      user,
      todos: todosActions,
+      workspaces: workspaceActions,
    } = this.props.actions;
    app.launchOnStartup({
@@ -135,14 +142,24 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
      },
    });
+    if (workspaces.isFeatureActive) {
+      const { keepAllWorkspacesLoaded } = workspaces.settings;
+      if (keepAllWorkspacesLoaded !== settingsData.keepAllWorkspacesLoaded) {
+        workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
+      }
+    }
    if (todos.isFeatureActive) {
-      todosActions.toggleTodosFeatureVisibility();
+      const { isFeatureEnabledByUser } = todos.settings;
+      if (isFeatureEnabledByUser !== settingsData.enableTodos) {
+        todosActions.toggleTodosFeatureVisibility();
+      }
    }
  }
  prepareForm() {
    const {
-      app, settings, user, todos,
+      app, settings, user, todos, workspaces,
    } = this.props.stores;
    const { intl } = this.context;
@@ -242,6 +259,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
      },
    };
+    if (workspaces.isFeatureActive) {
+      config.fields.keepAllWorkspacesLoaded = {
+        label: intl.formatMessage(messages.keepAllWorkspacesLoaded),
+        value: workspaces.settings.keepAllWorkspacesLoaded,
+        default: DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
+      };
+    }
    if (todos.isFeatureActive) {
      config.fields.enableTodos = {
        label: intl.formatMessage(messages.enableTodos),
@@ -257,6 +282,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
    const {
      app,
      todos,
+      workspaces,
    } = this.props.stores;
    const {
      updateStatus,
@@ -287,6 +313,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
          onClearAllCache={clearAllCache}
          isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
          isTodosEnabled={todos.isFeatureActive}
+          isWorkspaceEnabled={workspaces.isFeatureActive}
        />
      </ErrorBoundary>
    );
@@ -299,6 +326,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
    user: PropTypes.instanceOf(UserStore).isRequired,
    settings: PropTypes.instanceOf(SettingsStore).isRequired,
    todos: PropTypes.instanceOf(TodosStore).isRequired,
+    workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
  }).isRequired,
  actions: PropTypes.shape({
    app: PropTypes.shape({
@@ -316,5 +344,8 @@ EditSettingsScreen.wrappedComponent.propTypes = {
    todos: PropTypes.shape({
      toggleTodosFeatureVisibility: PropTypes.func.isRequired,
    }).isRequired,
+    workspaces: PropTypes.shape({
+      toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
+    }).isRequired,
  }).isRequired,
 };
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index 7fe9d354b..d4271dba0 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -6,16 +6,11 @@ import Webview from 'react-electron-web-view';
 import { Icon } from '@meetfranz/ui';
 import { defineMessages, intlShape } from 'react-intl';
-import { mdiChevronRight, mdiCheckAll } from '@mdi/js';
+import { mdiCheckAll } from '@mdi/js';
 import * as environment from '../../../environment';
 import Appear from '../../../components/ui/effects/Appear';
 import UpgradeButton from '../../../components/ui/UpgradeButton';
-import SettingsStore from '../../../stores/SettingsStore';
-const OPEN_TODOS_BUTTON_SIZE = 45;
-const CLOSE_TODOS_BUTTON_SIZE = 35;
 const messages = defineMessages({
  premiumInfo: {
    id: 'feature.todos.premium.info',
@@ -63,50 +58,6 @@ const styles = theme => ({
    background: theme.todos.dragIndicator.background,
  },
-  openTodosButton: {
-    width: OPEN_TODOS_BUTTON_SIZE,
-    height: OPEN_TODOS_BUTTON_SIZE,
-    background: theme.todos.toggleButton.background,
-    position: 'absolute',
-    bottom: 120,
-    right: props => (props.width + (props.isVisible ? -OPEN_TODOS_BUTTON_SIZE / 2 : 0)),
-    borderRadius: OPEN_TODOS_BUTTON_SIZE / 2,
-    opacity: props => (props.isVisible ? 0 : 1),
-    transition: 'right 0.5s',
-    zIndex: 600,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    boxShadow: [0, 0, 10, theme.todos.toggleButton.shadowColor],
-    borderTopRightRadius: props => (props.isVisible ? null : 0),
-    borderBottomRightRadius: props => (props.isVisible ? null : 0),
-    '& svg': {
-      fill: theme.todos.toggleButton.textColor,
-      transition: 'all 0.5s',
-    },
-  },
-  closeTodosButton: {
-    width: CLOSE_TODOS_BUTTON_SIZE,
-    height: CLOSE_TODOS_BUTTON_SIZE,
-    background: theme.todos.toggleButton.background,
-    position: 'absolute',
-    bottom: 120,
-    right: ({ width }) => (width + -CLOSE_TODOS_BUTTON_SIZE / 2),
-    borderRadius: CLOSE_TODOS_BUTTON_SIZE / 2,
-    opacity: ({ isTodosIncludedInCurrentPlan }) => (!isTodosIncludedInCurrentPlan ? 1 : 0),
-    transition: 'opacity 0.5s',
-    zIndex: 600,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    boxShadow: [0, 0, 10, theme.todos.toggleButton.shadowColor],
-    '& svg': {
-      fill: theme.todos.toggleButton.textColor,
-    },
-  },
  premiumContainer: {
    display: 'flex',
    flexDirection: 'column',
@@ -134,7 +85,6 @@ class TodosWebview extends Component {
  static propTypes = {
    classes: PropTypes.object.isRequired,
    isVisible: PropTypes.bool.isRequired,
-    togglePanel: PropTypes.func.isRequired,
    handleClientMessage: PropTypes.func.isRequired,
    setTodosWebview: PropTypes.func.isRequired,
    resize: PropTypes.func.isRequired,
@@ -233,7 +183,6 @@ class TodosWebview extends Component {
    const {
      classes,
      isVisible,
-      togglePanel,
      isTodosIncludedInCurrentPlan,
      stores,
    } = this.props;
@@ -253,13 +202,6 @@ class TodosWebview extends Component {
        onMouseUp={() => this.stopResize()}
        ref={(node) => { this.node = node; }}
      >
-        <button
-          onClick={() => togglePanel()}
-          className={isVisible ? classes.closeTodosButton : classes.openTodosButton}
-          type="button"
-        >
-          <Icon icon={isVisible ? mdiChevronRight : mdiCheckAll} size={2} />
-        </button>
        <div
          className={classes.resizeHandler}
          style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 70818f9b8..d507237d1 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -33,7 +33,7 @@ export default class TodoStore extends FeatureStore {
  @computed get isTodosPanelForceHidden() {
    const { isAnnouncementShown } = this.stores.announcements;
-    return delayAppState.isDelayAppScreenVisible || !this.settings.isFeatureEnabledByUser || isAnnouncementShown;
+    return delayAppState.isDelayAppScreenVisible || !this.isFeatureEnabledByUser || isAnnouncementShown;
  }
  @computed get isTodosPanelVisible() {
@@ -41,6 +41,10 @@ export default class TodoStore extends FeatureStore {
    return this.settings.isTodosPanelVisible;
  }
+  @computed get isFeatureEnabledByUser() {
+    return this.settings.isFeatureEnabledByUser;
+  }
  @computed get settings() {
    return localStorage.getItem('todos') || {};
  }
diff --git a/src/features/workspaces/actions.js b/src/features/workspaces/actions.js
index a85f8f57f..5b5db422e 100644
--- a/src/features/workspaces/actions.js
+++ b/src/features/workspaces/actions.js
@@ -21,6 +21,7 @@ export const workspaceActions = createActionsFromDefinitions({
  deactivate: {},
  toggleWorkspaceDrawer: {},
  openWorkspaceSettings: {},
+  toggleKeepAllWorkspacesLoadedSetting: {},
 }, PropTypes.checkPropTypes);
 export default workspaceActions;
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 1947053df..560b732ab 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -5,6 +5,7 @@ import { resetApiRequests } from './api';
 const debug = require('debug')('Ferdi:feature:workspaces');
 export const GA_CATEGORY_WORKSPACES = 'Workspaces';
+export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
 export const workspaceStore = new WorkspacesStore();
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 1ad136a13..da1582a77 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -98,6 +98,7 @@ export default class WorkspacesStore extends FeatureStore {
      [workspaceActions.update, this._update],
      [workspaceActions.activate, this._setActiveWorkspace],
      [workspaceActions.deactivate, this._deactivateActiveWorkspace],
+      [workspaceActions.toggleKeepAllWorkspacesLoadedSetting, this._toggleKeepAllWorkspacesLoadedSetting],
    ]);
    this._allActions = this._freeUserActions.concat(this._premiumUserActions);
    this._registerActions(this._allActions);
@@ -246,6 +247,10 @@ export default class WorkspacesStore extends FeatureStore {
    await updateWorkspaceRequest.execute(activeWorkspace);
  };
+  _toggleKeepAllWorkspacesLoadedSetting = async () => {
+    this._updateSettings({ keepAllWorkspacesLoaded: !this.settings.keepAllWorkspacesLoaded });
+  };
  // Reactions
  _setFeatureEnabledReaction = () => {
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 8aa9ab3e3..4f1c5a052 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Afegeix un servei...",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Visualitza",
   "menu.view.enterFullScreen" : "Inicia la pantalla completa",
   "menu.view.exitFullScreen" : "Surt de pantalla completa",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
   "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Idioma",
   "settings.app.form.minimizeToSystemTray" : "Minimitza Ferdi a la safata del sistema",
   "settings.app.form.runInBackground" : "Mantén a Ferdi en segon pla en tancar la finestra",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Afegeix nou servei",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Desactivar notificacions i àudio",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Configuració",
   "sidebar.unmuteApp" : "Activar notificacions i àudio",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 34e072444..4380df0d8 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Přidat novou službu...",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Zobrazení",
   "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
   "menu.view.exitFullScreen" : "Ukončit celoobrazovkový režim",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
   "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Jazyk",
   "settings.app.form.minimizeToSystemTray" : "Minimalizovat Ferdi do systémové lišty",
   "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Přidat novou službu",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Vypnout upozornění a zvuky",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Nastavení",
   "sidebar.unmuteApp" : "Zapnout upozornění a zvuky",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 94156f420..2908b7dab 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Dienst hinzufügen",
   "menu.services.setNextServiceActive" : "Nächster Dienst",
   "menu.todos" : "ToDos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Darstellung",
   "menu.view.enterFullScreen" : "Vollbildmodus",
   "menu.view.exitFullScreen" : "Vollbildmodus aus",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
   "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
   "settings.app.form.enableTodos" : "Franz Todos aktivieren",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Sprache",
   "settings.app.form.minimizeToSystemTray" : "Ferdi in den Infobereich minimieren",
   "settings.app.form.runInBackground" : "Ferdi im Hintergrund behalten, wenn das Fenster geschlossen wird",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
   "settings.workspaces.workspacesRequestFailed" : "Workspaces konnte nicht geladen werden",
   "sidebar.addNewService" : "Neuen Dienst hinzufügen",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Workspaces schließen",
   "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Workspaces öffnen",
   "sidebar.settings" : "Einstellungen",
   "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index ea5abf38f..0dfe2055a 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2,7 +2,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!A new update for Ferdi is available.",
+        "defaultMessage": "!!!A new update for Franz is available.",
        "end": {
          "column": 3,
          "line": 12
@@ -46,7 +46,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!Import your Ferdi 4 services",
+        "defaultMessage": "!!!Import your Franz 4 services",
        "end": {
          "column": 3,
          "line": 16
@@ -59,7 +59,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Services not yet supported in Ferdi 5",
+        "defaultMessage": "!!!Services not yet supported in Franz 5",
        "end": {
          "column": 3,
          "line": 20
@@ -264,81 +264,55 @@
        }
      },
      {
-        "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
+          "line": 40
        },
        "file": "src/components/auth/Login.js",
        "id": "login.tokenExpired",
        "start": {
          "column": 16,
-          "line": 45
+          "line": 37
        }
      },
      {
        "defaultMessage": "!!!Your session expired, please login again.",
        "end": {
          "column": 3,
-          "line": 52
+          "line": 44
        },
        "file": "src/components/auth/Login.js",
        "id": "login.serverLogout",
        "start": {
          "column": 16,
-          "line": 49
+          "line": 41
        }
      },
      {
        "defaultMessage": "!!!Create a free account",
        "end": {
          "column": 3,
-          "line": 56
+          "line": 48
        },
        "file": "src/components/auth/Login.js",
        "id": "login.link.signup",
        "start": {
          "column": 14,
-          "line": 53
+          "line": 45
        }
      },
      {
        "defaultMessage": "!!!Forgot password",
        "end": {
          "column": 3,
-          "line": 60
+          "line": 52
        },
        "file": "src/components/auth/Login.js",
        "id": "login.link.password",
        "start": {
          "column": 16,
-          "line": 57
+          "line": 49
        }
      }
    ],
@@ -534,7 +508,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Continue to Ferdi",
+        "defaultMessage": "!!!Continue to Franz",
        "end": {
          "column": 3,
          "line": 46
@@ -630,7 +604,7 @@
        }
      },
      {
-        "defaultMessage": "!!!By creating a Ferdi account you accept the",
+        "defaultMessage": "!!!By creating a Franz account you accept the",
        "end": {
          "column": 3,
          "line": 44
@@ -747,52 +721,39 @@
        "defaultMessage": "!!!Your services have been updated.",
        "end": {
          "column": 3,
-          "line": 30
+          "line": 31
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.servicesUpdated",
        "start": {
          "column": 19,
-          "line": 27
+          "line": 28
        }
      },
      {
        "defaultMessage": "!!!Reload services",
        "end": {
          "column": 3,
-          "line": 34
+          "line": 35
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.buttonReloadServices",
        "start": {
          "column": 24,
-          "line": 31
+          "line": 32
        }
      },
      {
        "defaultMessage": "!!!Could not load services and user information",
        "end": {
          "column": 3,
-          "line": 38
+          "line": 39
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.requiredRequestsFailed",
        "start": {
          "column": 26,
-          "line": 35
+          "line": 36
-        }
-      },
-      {
-        "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": 42
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.authRequestFailed",
-        "start": {
-          "column": 21,
-          "line": 39
        }
      }
    ],
@@ -804,78 +765,104 @@
        "defaultMessage": "!!!Settings",
        "end": {
          "column": 3,
-          "line": 16
+          "line": 18
        },
        "file": "src/components/layout/Sidebar.js",
        "id": "sidebar.settings",
        "start": {
          "column": 12,
-          "line": 13
+          "line": 15
        }
      },
      {
        "defaultMessage": "!!!Add new service",
        "end": {
          "column": 3,
-          "line": 20
+          "line": 22
        },
        "file": "src/components/layout/Sidebar.js",
        "id": "sidebar.addNewService",
        "start": {
          "column": 17,
-          "line": 17
+          "line": 19
        }
      },
      {
        "defaultMessage": "!!!Disable notifications & audio",
        "end": {
          "column": 3,
-          "line": 24
+          "line": 26
        },
        "file": "src/components/layout/Sidebar.js",
        "id": "sidebar.muteApp",
        "start": {
          "column": 8,
-          "line": 21
+          "line": 23
        }
      },
      {
        "defaultMessage": "!!!Enable notifications & audio",
        "end": {
          "column": 3,
-          "line": 28
+          "line": 30
        },
        "file": "src/components/layout/Sidebar.js",
        "id": "sidebar.unmuteApp",
        "start": {
          "column": 10,
-          "line": 25
+          "line": 27
        }
      },
      {
        "defaultMessage": "!!!Open workspace drawer",
        "end": {
          "column": 3,
-          "line": 32
+          "line": 34
        },
        "file": "src/components/layout/Sidebar.js",
        "id": "sidebar.openWorkspaceDrawer",
        "start": {
          "column": 23,
-          "line": 29
+          "line": 31
        }
      },
      {
        "defaultMessage": "!!!Close workspace drawer",
        "end": {
          "column": 3,
-          "line": 36
+          "line": 38
        },
        "file": "src/components/layout/Sidebar.js",
        "id": "sidebar.closeWorkspaceDrawer",
        "start": {
          "column": 24,
-          "line": 33
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Open Franz Todos",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.openTodosDrawer",
+        "start": {
+          "column": 19,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Close Franz Todos",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.closeTodosDrawer",
+        "start": {
+          "column": 20,
+          "line": 43
        }
      }
    ],
@@ -1055,7 +1042,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!Welcome to Ferdi",
+        "defaultMessage": "!!!Welcome to Franz",
        "end": {
          "column": 3,
          "line": 17
@@ -1079,32 +1066,6 @@
          "column": 14,
          "line": 18
        }
-      },
-      {
-        "defaultMessage": "!!!Please login to use Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.login",
-        "start": {
-          "column": 9,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverInfo",
-        "start": {
-          "column": 14,
-          "line": 26
-        }
      }
    ],
    "path": "src/components/services/content/Services.json"
@@ -1460,7 +1421,7 @@
        }
      },
      {
-        "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+        "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
        "end": {
          "column": 3,
          "line": 73
@@ -1969,7 +1930,7 @@
        }
      },
      {
-        "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
+        "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
        "end": {
          "column": 3,
          "line": 67
@@ -2099,7 +2060,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
+        "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
        "end": {
          "column": 3,
          "line": 107
@@ -2112,7 +2073,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
+        "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
        "end": {
          "column": 3,
          "line": 111
@@ -2356,260 +2317,234 @@
        "defaultMessage": "!!!Settings",
        "end": {
          "column": 3,
-          "line": 20
+          "line": 19
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headline",
        "start": {
          "column": 12,
-          "line": 17
+          "line": 16
        }
      },
      {
        "defaultMessage": "!!!General",
        "end": {
          "column": 3,
-          "line": 24
+          "line": 23
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineGeneral",
        "start": {
          "column": 19,
-          "line": 21
+          "line": 20
-        }
-      },
-      {
-        "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": "!!!This server will be used for the \"Franz Todo\" feature. The default server will only work for premium users. (default: https://app.franztodos.com)",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.todoServerInfo",
-        "start": {
-          "column": 18,
-          "line": 29
        }
      },
      {
        "defaultMessage": "!!!Language",
        "end": {
          "column": 3,
-          "line": 36
+          "line": 27
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineLanguage",
        "start": {
          "column": 20,
-          "line": 33
+          "line": 24
        }
      },
      {
        "defaultMessage": "!!!Updates",
        "end": {
          "column": 3,
-          "line": 40
+          "line": 31
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineUpdates",
        "start": {
          "column": 19,
-          "line": 37
+          "line": 28
        }
      },
      {
        "defaultMessage": "!!!Appearance",
        "end": {
          "column": 3,
-          "line": 44
+          "line": 35
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineAppearance",
        "start": {
          "column": 22,
-          "line": 41
+          "line": 32
        }
      },
      {
        "defaultMessage": "!!!Advanced",
        "end": {
          "column": 3,
-          "line": 48
+          "line": 39
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.headlineAdvanced",
        "start": {
          "column": 20,
-          "line": 45
+          "line": 36
        }
      },
      {
-        "defaultMessage": "!!!Help us to translate Ferdi into your language.",
+        "defaultMessage": "!!!Help us to translate Franz into your language.",
        "end": {
          "column": 3,
-          "line": 52
+          "line": 43
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.translationHelp",
        "start": {
          "column": 19,
-          "line": 49
+          "line": 40
        }
      },
      {
        "defaultMessage": "!!!Cache",
        "end": {
          "column": 3,
-          "line": 56
+          "line": 47
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.subheadlineCache",
        "start": {
          "column": 20,
-          "line": 53
+          "line": 44
        }
      },
      {
-        "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
+        "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
        "end": {
          "column": 3,
-          "line": 60
+          "line": 51
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.cacheInfo",
        "start": {
          "column": 13,
-          "line": 57
+          "line": 48
        }
      },
      {
        "defaultMessage": "!!!Clear cache",
        "end": {
          "column": 3,
-          "line": 64
+          "line": 55
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.buttonClearAllCache",
        "start": {
          "column": 23,
-          "line": 61
+          "line": 52
        }
      },
      {
        "defaultMessage": "!!!Check for updates",
        "end": {
          "column": 3,
-          "line": 68
+          "line": 59
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.buttonSearchForUpdate",
        "start": {
          "column": 25,
-          "line": 65
+          "line": 56
        }
      },
      {
        "defaultMessage": "!!!Restart & install update",
        "end": {
          "column": 3,
-          "line": 72
+          "line": 63
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.buttonInstallUpdate",
        "start": {
          "column": 23,
-          "line": 69
+          "line": 60
        }
      },
      {
        "defaultMessage": "!!!Is searching for update",
        "end": {
          "column": 3,
-          "line": 76
+          "line": 67
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.updateStatusSearching",
        "start": {
          "column": 25,
-          "line": 73
+          "line": 64
        }
      },
      {
        "defaultMessage": "!!!Update available, downloading...",
        "end": {
          "column": 3,
-          "line": 80
+          "line": 71
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.updateStatusAvailable",
        "start": {
          "column": 25,
-          "line": 77
+          "line": 68
        }
      },
      {
-        "defaultMessage": "!!!You are using the latest version of Ferdi",
+        "defaultMessage": "!!!You are using the latest version of Franz",
        "end": {
          "column": 3,
-          "line": 84
+          "line": 75
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.updateStatusUpToDate",
        "start": {
          "column": 24,
-          "line": 81
+          "line": 72
        }
      },
      {
        "defaultMessage": "!!!Current version:",
        "end": {
          "column": 3,
-          "line": 88
+          "line": 79
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.currentVersion",
        "start": {
          "column": 18,
-          "line": 85
+          "line": 76
        }
      },
      {
        "defaultMessage": "!!!Changes require restart",
        "end": {
          "column": 3,
-          "line": 92
+          "line": 83
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.restartRequired",
        "start": {
          "column": 29,
-          "line": 89
+          "line": 80
        }
      },
      {
        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
        "end": {
          "column": 3,
-          "line": 96
+          "line": 87
        },
        "file": "src/components/settings/settings/EditSettingsForm.js",
        "id": "settings.app.languageDisclaimer",
        "start": {
          "column": 22,
-          "line": 93
+          "line": 84
        }
      }
    ],
@@ -2631,7 +2566,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Ferdi for Teams",
+        "defaultMessage": "!!!Franz for Teams",
        "end": {
          "column": 3,
          "line": 24
@@ -2657,7 +2592,7 @@
        }
      },
      {
-        "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!",
+        "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!",
        "end": {
          "column": 3,
          "line": 32
@@ -2989,91 +2924,91 @@
        "defaultMessage": "!!!Get a Franz Supporter License",
        "end": {
          "column": 3,
-          "line": 15
+          "line": 16
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "feature.delayApp.upgrade.action",
        "start": {
          "column": 10,
-          "line": 12
+          "line": 13
        }
      },
      {
        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
        "end": {
          "column": 3,
-          "line": 19
+          "line": 20
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "feature.delayApp.trial.action",
        "start": {
          "column": 15,
-          "line": 16
+          "line": 17
        }
      },
      {
        "defaultMessage": "!!!Upgrade account",
        "end": {
          "column": 3,
-          "line": 23
+          "line": 24
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "feature.delayApp.upgrade.actionShort",
        "start": {
          "column": 15,
-          "line": 20
+          "line": 21
        }
      },
      {
        "defaultMessage": "!!!Activate the free Franz Professional trial",
        "end": {
          "column": 3,
-          "line": 27
+          "line": 28
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "feature.delayApp.trial.actionShort",
        "start": {
          "column": 20,
-          "line": 24
+          "line": 25
        }
      },
      {
        "defaultMessage": "!!!No strings attached",
        "end": {
          "column": 3,
-          "line": 31
+          "line": 32
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "pricing.trial.terms.headline",
        "start": {
          "column": 29,
-          "line": 28
+          "line": 29
        }
      },
      {
        "defaultMessage": "!!!No credit card required",
        "end": {
          "column": 3,
-          "line": 35
+          "line": 36
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "pricing.trial.terms.noCreditCard",
        "start": {
          "column": 16,
-          "line": 32
+          "line": 33
        }
      },
      {
        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
        "end": {
          "column": 3,
-          "line": 39
+          "line": 40
        },
        "file": "src/components/ui/ActivateTrialButton/index.js",
        "id": "pricing.trial.terms.automaticTrialEnd",
        "start": {
          "column": 21,
-          "line": 36
+          "line": 37
        }
      }
    ],
@@ -3220,13 +3155,13 @@
        "defaultMessage": "!!!Upgrade account",
        "end": {
          "column": 3,
-          "line": 18
+          "line": 19
        },
        "file": "src/components/ui/PremiumFeatureContainer/index.js",
        "id": "premiumFeature.button.upgradeAccount",
        "start": {
          "column": 10,
-          "line": 15
+          "line": 16
        }
      }
    ],
@@ -3238,13 +3173,13 @@
        "defaultMessage": "!!!Upgrade to Franz Professional",
        "end": {
          "column": 3,
-          "line": 15
+          "line": 16
        },
        "file": "src/components/ui/UpgradeButton/index.js",
        "id": "global.upgradeButton.upgradeToPro",
        "start": {
          "column": 16,
-          "line": 12
+          "line": 13
        }
      }
    ],
@@ -3502,7 +3437,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!Launch Ferdi on start",
+        "defaultMessage": "!!!Launch Franz on start",
        "end": {
          "column": 3,
          "line": 29
@@ -3528,7 +3463,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Keep Ferdi in background when closing the window",
+        "defaultMessage": "!!!Keep Franz in background when closing the window",
        "end": {
          "column": 3,
          "line": 37
@@ -3541,7 +3476,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Show Ferdi in system tray",
+        "defaultMessage": "!!!Show Franz in system tray",
        "end": {
          "column": 3,
          "line": 41
@@ -3554,7 +3489,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Minimize Ferdi to system tray",
+        "defaultMessage": "!!!Minimize Franz to system tray",
        "end": {
          "column": 3,
          "line": 45
@@ -3567,147 +3502,121 @@
        }
      },
      {
-        "defaultMessage": "!!!Don't show message content in notifications",
+        "defaultMessage": "!!!Language",
        "end": {
          "column": 3,
          "line": 49
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.privateNotifications",
+        "id": "settings.app.form.language",
        "start": {
-          "column": 24,
+          "column": 12,
          "line": 46
        }
      },
      {
-        "defaultMessage": "!!!Server",
+        "defaultMessage": "!!!Dark Mode",
        "end": {
          "column": 3,
          "line": 53
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.server",
+        "id": "settings.app.form.darkMode",
        "start": {
-          "column": 10,
+          "column": 12,
          "line": 50
        }
      },
      {
-        "defaultMessage": "!!!Todo Server",
+        "defaultMessage": "!!!Display disabled services tabs",
        "end": {
          "column": 3,
          "line": 57
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.todoServer",
+        "id": "settings.app.form.showDisabledServices",
        "start": {
-          "column": 14,
+          "column": 24,
          "line": 54
        }
      },
      {
-        "defaultMessage": "!!!Language",
+        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
        "end": {
          "column": 3,
          "line": 61
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.language",
+        "id": "settings.app.form.showMessagesBadgesWhenMuted",
        "start": {
-          "column": 12,
+          "column": 29,
          "line": 58
        }
      },
      {
-        "defaultMessage": "!!!Dark Mode",
+        "defaultMessage": "!!!Enable spell checking",
        "end": {
          "column": 3,
          "line": 65
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.darkMode",
+        "id": "settings.app.form.enableSpellchecking",
        "start": {
-          "column": 12,
+          "column": 23,
          "line": 62
        }
      },
      {
-        "defaultMessage": "!!!Display disabled services tabs",
+        "defaultMessage": "!!!Enable GPU Acceleration",
        "end": {
          "column": 3,
          "line": 69
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDisabledServices",
+        "id": "settings.app.form.enableGPUAcceleration",
        "start": {
-          "column": 24,
+          "column": 25,
          "line": 66
        }
      },
      {
-        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+        "defaultMessage": "!!!Include beta versions",
        "end": {
          "column": 3,
          "line": 73
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showMessagesBadgesWhenMuted",
+        "id": "settings.app.form.beta",
        "start": {
-          "column": 29,
+          "column": 8,
          "line": 70
        }
      },
      {
-        "defaultMessage": "!!!Enable spell checking",
+        "defaultMessage": "!!!Enable Franz Todos",
        "end": {
          "column": 3,
          "line": 77
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableSpellchecking",
+        "id": "settings.app.form.enableTodos",
        "start": {
-          "column": 23,
+          "column": 15,
          "line": 74
        }
      },
      {
-        "defaultMessage": "!!!Enable GPU Acceleration",
+        "defaultMessage": "!!!Keep all workspaces loaded",
        "end": {
          "column": 3,
          "line": 81
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableGPUAcceleration",
+        "id": "settings.app.form.keepAllWorkspacesLoaded",
        "start": {
-          "column": 25,
+          "column": 27,
          "line": 78
        }
-      },
-      {
-        "defaultMessage": "!!!Include beta versions",
-        "end": {
-          "column": 3,
-          "line": 85
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.beta",
-        "start": {
-          "column": 8,
-          "line": 82
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Franz Todos",
-        "end": {
-          "column": 3,
-          "line": 89
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 86
-        }
      }
    ],
    "path": "src/containers/settings/EditSettingsScreen.json"
@@ -3837,16 +3746,16 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!Changes in Ferdi {version}",
+        "defaultMessage": "!!!Changes in Franz {version}",
        "end": {
          "column": 3,
-          "line": 22
+          "line": 23
        },
        "file": "src/features/announcements/components/AnnouncementScreen.js",
        "id": "feature.announcements.changelog.headline",
        "start": {
          "column": 12,
-          "line": 19
+          "line": 20
        }
      }
    ],
@@ -3858,65 +3767,65 @@
        "defaultMessage": "!!!Please purchase license to skip waiting",
        "end": {
          "column": 3,
-          "line": 17
+          "line": 20
        },
        "file": "src/features/delayApp/Component.js",
        "id": "feature.delayApp.headline",
        "start": {
          "column": 12,
-          "line": 14
+          "line": 17
        }
      },
      {
        "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
        "end": {
          "column": 3,
-          "line": 21
+          "line": 24
        },
        "file": "src/features/delayApp/Component.js",
        "id": "feature.delayApp.trial.headline",
        "start": {
          "column": 17,
-          "line": 18
+          "line": 21
        }
      },
      {
        "defaultMessage": "!!!Get a Franz Supporter License",
        "end": {
          "column": 3,
-          "line": 25
+          "line": 28
        },
        "file": "src/features/delayApp/Component.js",
        "id": "feature.delayApp.upgrade.action",
        "start": {
          "column": 10,
-          "line": 22
+          "line": 25
        }
      },
      {
        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
        "end": {
          "column": 3,
-          "line": 29
+          "line": 32
        },
        "file": "src/features/delayApp/Component.js",
        "id": "feature.delayApp.trial.action",
        "start": {
          "column": 15,
-          "line": 26
+          "line": 29
        }
      },
      {
-        "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
+        "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
        "end": {
          "column": 3,
-          "line": 33
+          "line": 36
        },
        "file": "src/features/delayApp/Component.js",
        "id": "feature.delayApp.text",
        "start": {
          "column": 8,
-          "line": 30
+          "line": 33
        }
      }
    ],
@@ -3946,26 +3855,26 @@
        "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
        "end": {
          "column": 3,
-          "line": 12
+          "line": 14
        },
        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
        "id": "feature.serviceLimit.limitReached",
        "start": {
          "column": 16,
-          "line": 9
+          "line": 11
        }
      },
      {
        "defaultMessage": "!!!Upgrade account",
        "end": {
          "column": 3,
-          "line": 16
+          "line": 18
        },
        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
        "id": "premiumFeature.button.upgradeAccount",
        "start": {
          "column": 10,
-          "line": 13
+          "line": 15
        }
      }
    ],
@@ -3974,94 +3883,94 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!Ferdi is better together!",
+        "defaultMessage": "!!!Franz is better together!",
        "end": {
          "column": 3,
-          "line": 20
+          "line": 21
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.headline",
        "start": {
          "column": 12,
-          "line": 17
+          "line": 18
        }
      },
      {
-        "defaultMessage": "!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
+        "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
        "end": {
          "column": 3,
-          "line": 24
+          "line": 25
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.text",
        "start": {
          "column": 8,
-          "line": 21
+          "line": 22
        }
      },
      {
        "defaultMessage": "!!!Share as email",
        "end": {
          "column": 3,
-          "line": 28
+          "line": 29
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.action.email",
        "start": {
          "column": 16,
-          "line": 25
+          "line": 26
        }
      },
      {
        "defaultMessage": "!!!Share on Facebook",
        "end": {
          "column": 3,
-          "line": 32
+          "line": 33
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.action.facebook",
        "start": {
          "column": 19,
-          "line": 29
+          "line": 30
        }
      },
      {
        "defaultMessage": "!!!Share on Twitter",
        "end": {
          "column": 3,
-          "line": 36
+          "line": 37
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.action.twitter",
        "start": {
          "column": 18,
-          "line": 33
+          "line": 34
        }
      },
      {
        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
        "end": {
          "column": 3,
-          "line": 40
+          "line": 41
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.shareText.email",
        "start": {
          "column": 18,
-          "line": 37
+          "line": 38
        }
      },
      {
        "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",
        "end": {
          "column": 3,
-          "line": 44
+          "line": 45
        },
        "file": "src/features/shareFranz/Component.js",
        "id": "feature.shareFranz.shareText.twitter",
        "start": {
          "column": 20,
-          "line": 41
+          "line": 42
        }
      }
    ],
@@ -4073,39 +3982,39 @@
        "defaultMessage": "!!!Franz Todos are available to premium users now!",
        "end": {
          "column": 3,
-          "line": 23
+          "line": 18
        },
        "file": "src/features/todos/components/TodosWebview.js",
        "id": "feature.todos.premium.info",
        "start": {
          "column": 15,
-          "line": 20
+          "line": 15
        }
      },
      {
        "defaultMessage": "!!!Upgrade Account",
        "end": {
          "column": 3,
-          "line": 27
+          "line": 22
        },
        "file": "src/features/todos/components/TodosWebview.js",
        "id": "feature.todos.premium.upgrade",
        "start": {
          "column": 14,
-          "line": 24
+          "line": 19
        }
      },
      {
        "defaultMessage": "!!!Everyone else will have to wait a little longer.",
        "end": {
          "column": 3,
-          "line": 31
+          "line": 26
        },
        "file": "src/features/todos/components/TodosWebview.js",
        "id": "feature.todos.premium.rollout",
        "start": {
          "column": 15,
-          "line": 28
+          "line": 23
        }
      }
    ],
@@ -4117,26 +4026,26 @@
        "defaultMessage": "!!!Create workspace",
        "end": {
          "column": 3,
-          "line": 15
+          "line": 16
        },
        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
        "id": "settings.workspace.add.form.submitButton",
        "start": {
          "column": 16,
-          "line": 12
+          "line": 13
        }
      },
      {
        "defaultMessage": "!!!Name",
        "end": {
          "column": 3,
-          "line": 19
+          "line": 20
        },
        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
        "id": "settings.workspace.add.form.name",
        "start": {
          "column": 8,
-          "line": 16
+          "line": 17
        }
      }
    ],
@@ -4148,91 +4057,91 @@
        "defaultMessage": "!!!Delete workspace",
        "end": {
          "column": 3,
-          "line": 20
+          "line": 22
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.workspace.form.buttonDelete",
        "start": {
          "column": 16,
-          "line": 17
+          "line": 19
        }
      },
      {
        "defaultMessage": "!!!Save workspace",
        "end": {
          "column": 3,
-          "line": 24
+          "line": 26
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.workspace.form.buttonSave",
        "start": {
          "column": 14,
-          "line": 21
+          "line": 23
        }
      },
      {
        "defaultMessage": "!!!Name",
        "end": {
          "column": 3,
-          "line": 28
+          "line": 30
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.workspace.form.name",
        "start": {
          "column": 8,
-          "line": 25
+          "line": 27
        }
      },
      {
        "defaultMessage": "!!!Your workspaces",
        "end": {
          "column": 3,
-          "line": 32
+          "line": 34
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.workspace.form.yourWorkspaces",
        "start": {
          "column": 18,
-          "line": 29
+          "line": 31
        }
      },
      {
        "defaultMessage": "!!!Services in this Workspace",
        "end": {
          "column": 3,
-          "line": 36
+          "line": 38
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
        "start": {
          "column": 31,
-          "line": 33
+          "line": 35
        }
      },
      {
        "defaultMessage": "!!!You haven't added any services yet.",
        "end": {
          "column": 3,
-          "line": 40
+          "line": 42
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.services.noServicesAdded",
        "start": {
          "column": 19,
-          "line": 37
+          "line": 39
        }
      },
      {
        "defaultMessage": "!!!Discover services",
        "end": {
          "column": 3,
-          "line": 44
+          "line": 46
        },
        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
        "id": "settings.services.discoverServices",
        "start": {
          "column": 20,
-          "line": 41
+          "line": 43
        }
      }
    ],
@@ -4244,104 +4153,104 @@
        "defaultMessage": "!!!Workspaces",
        "end": {
          "column": 3,
-          "line": 19
+          "line": 20
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.headline",
        "start": {
          "column": 12,
-          "line": 16
+          "line": 17
        }
      },
      {
        "defaultMessage": "!!!All services",
        "end": {
          "column": 3,
-          "line": 23
+          "line": 24
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.allServices",
        "start": {
          "column": 15,
-          "line": 20
+          "line": 21
        }
      },
      {
        "defaultMessage": "!!!Workspaces settings",
        "end": {
          "column": 3,
-          "line": 27
+          "line": 28
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.workspacesSettingsTooltip",
        "start": {
          "column": 29,
-          "line": 24
+          "line": 25
        }
      },
      {
        "defaultMessage": "!!!Info about workspace feature",
        "end": {
          "column": 3,
-          "line": 31
+          "line": 32
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.workspaceFeatureInfo",
        "start": {
          "column": 24,
-          "line": 28
+          "line": 29
        }
      },
      {
        "defaultMessage": "!!!Create your first workspace",
        "end": {
          "column": 3,
-          "line": 35
+          "line": 36
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.premiumCtaButtonLabel",
        "start": {
          "column": 25,
-          "line": 32
+          "line": 33
        }
      },
      {
        "defaultMessage": "!!!Reactivate premium account",
        "end": {
          "column": 3,
-          "line": 39
+          "line": 40
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.reactivatePremiumAccountLabel",
        "start": {
          "column": 28,
-          "line": 36
+          "line": 37
        }
      },
      {
        "defaultMessage": "!!!add new workspace",
        "end": {
          "column": 3,
-          "line": 43
+          "line": 44
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.addNewWorkspaceLabel",
        "start": {
          "column": 24,
-          "line": 40
+          "line": 41
        }
      },
      {
        "defaultMessage": "!!!Premium feature",
        "end": {
          "column": 3,
-          "line": 47
+          "line": 48
        },
        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
        "id": "workspaceDrawer.proFeatureBadge",
        "start": {
          "column": 23,
-          "line": 44
+          "line": 45
        }
      }
    ],
@@ -4472,7 +4381,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
+        "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
        "end": {
          "column": 3,
          "line": 50
@@ -4718,7 +4627,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "!!!Can't connect to Ferdi Online Services",
+        "defaultMessage": "!!!Can't connect to Franz Online Services",
        "end": {
          "column": 3,
          "line": 7
@@ -5126,7 +5035,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Reload Ferdi",
+        "defaultMessage": "!!!Reload Franz",
        "end": {
          "column": 3,
          "line": 116
@@ -5217,7 +5126,7 @@
        }
      },
      {
-        "defaultMessage": "!!!Ferdi Debug Information",
+        "defaultMessage": "!!!Franz Debug Information",
        "end": {
          "column": 3,
          "line": 144
@@ -5334,7 +5243,7 @@
        }
      },
      {
-        "defaultMessage": "!!!About Ferdi",
+        "defaultMessage": "!!!About Franz",
        "end": {
          "column": 3,
          "line": 180
@@ -5605,6 +5514,19 @@
          "column": 20,
          "line": 257
        }
+      },
+      {
+        "defaultMessage": "!!!Enable Todos",
+        "end": {
+          "column": 3,
+          "line": 264
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.todos.enableTodos",
+        "start": {
+          "column": 15,
+          "line": 261
+        }
      }
    ],
    "path": "src/lib/Menu.json"
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 63ce9b854..e28a9c65c 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Νέα Υπηρεσία",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Προβολή",
   "menu.view.enterFullScreen" : "Πλήρης Οθόνη",
   "menu.view.exitFullScreen" : "Έξοδος από πλήρη οθόνη",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Ενεργοποίηση ορθογραφικού ελέγχου",
   "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γραμμή ειδοποιήσεων",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Γλώσσα",
   "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων",
   "settings.app.form.runInBackground" : "Κρατήστε το Ferdi στο παρασκήνιο κατά το κλείσιμο του παραθύρου",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Προσθήκη νέας υπηρεσίας",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Απενεργοποίηση ειδοποιήσεων & ήχου",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ρυθμίσεις",
   "sidebar.unmuteApp" : "Ενεργοποίηση ειδοποιήσεων & ήχου",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index e6810509a..dcb9d92a2 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,53 +1,50 @@
 {
  "app.errorHandler.action": "Reload",
  "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
+  "feature.announcements.changelog.headline": "Changes in Franz {version}",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
+  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
+  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
+  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Franz Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
+  "feature.delayApp.trial.actionShort": "Activate the free Franz Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
+  "feature.delayApp.trial.headline": "Get the free Franz Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
+  "feature.delayApp.upgrade.action": "Get a Franz Supporter License",
  "feature.delayApp.upgrade.actionShort": "Upgrade account",
  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
  "feature.shareFranz.action.email": "Send as email",
  "feature.shareFranz.action.facebook": "Share on Facebook",
  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "feature.shareFranz.headline": "Ferdi is better together!",
+  "feature.shareFranz.headline": "Franz is better together!",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetFerdi.com",
+  "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
+  "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
+  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
+  "feature.todos.premium.info": "Franz Todos are available to premium users now!",
  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
  "feature.todos.premium.upgrade": "Upgrade Account",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.api.unhealthy": "Can't connect to Franz online services",
-  "global.franzProRequired": "!!!Franz Professional Required",
+  "global.franzProRequired": "Franz Professional Required",
  "global.notConnectedToTheInternet": "You are not connected to the internet.",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
  "global.spellchecking.autodetect.short": "Automatic",
  "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
+  "global.upgradeButton.upgradeToPro": "Upgrade to Franz Professional",
-  "import.headline": "Import your Ferdi 4 services",
+  "import.headline": "Import your Franz 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
+  "import.notSupportedHeadline": "Services not yet supported in Franz 5",
  "import.skip.label": "I want to add services manually",
  "import.submit.label": "Import services",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
  "infobar.buttonReloadServices": "Reload services",
  "infobar.requiredRequestsFailed": "Could not load services and user information",
  "infobar.servicesUpdated": "Your services have been updated.",
  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
-  "infobar.updateAvailable": "A new update for Ferdi is available.",
+  "infobar.updateAvailable": "A new update for Franz is available.",
  "invite.email.label": "Email address",
  "invite.headline.friends": "Invite 3 of your friends or colleagues",
  "invite.name.label": "Name",
  "invite.skip.label": "I want to do this later",
  "invite.submit.label": "Send invites",
  "invite.successInfo": "Invitations sent successfully",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
  "login.email.label": "Email address",
  "login.headline": "Sign in",
  "login.invalidCredentials": "Email or password not valid",
@@ -59,7 +56,7 @@
  "login.tokenExpired": "Your session expired, please login again.",
  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "About Ferdi",
+  "menu.app.about": "About Franz",
  "menu.app.announcement": "What's new?",
  "menu.app.checkForUpdates": "Check for updates",
  "menu.app.hide": "Hide",
@@ -86,7 +83,7 @@
  "menu.help.changelog": "Changelog",
  "menu.help.debugInfo": "Copy Debug Information",
  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.debugInfoCopiedHeadline": "Franz Debug Information",
  "menu.help.learnMore": "Learn More",
  "menu.help.privacy": "Privacy Statement",
  "menu.help.support": "Support",
@@ -96,10 +93,11 @@
  "menu.services.addNewService": "Add New Service...",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
+  "menu.todos.enableTodos": "Enable Todos",
  "menu.view": "View",
  "menu.view.enterFullScreen": "Enter Full Screen",
  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFranz": "Reload Franz",
  "menu.view.reloadService": "Reload Service",
  "menu.view.resetZoom": "Actual Size",
  "menu.view.toggleDevTools": "Toggle Developer Tools",
@@ -134,19 +132,19 @@
  "pricing.features.thirdPartyServices": "Install 3rd party services",
  "pricing.features.unlimitedServices": "Add unlimited services",
  "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
+  "pricing.plan.free": "Franz Free",
-  "pricing.plan.legacy": "Ferdi Premium",
+  "pricing.plan.legacy": "Franz Premium",
-  "pricing.plan.personal": "Ferdi Personal",
+  "pricing.plan.personal": "Franz Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
+  "pricing.plan.personal-monthly": "Franz Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
+  "pricing.plan.personal-yearly": "Franz Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
+  "pricing.plan.pro": "Franz Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
+  "pricing.plan.pro-monthly": "Franz Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
+  "pricing.plan.pro-yearly": "Franz Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
+  "pricing.trial.cta.accept": "Yes, upgrade my account to Franz Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
+  "pricing.trial.cta.skip": "Continue to Franz",
  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
+  "pricing.trial.features.headline": "Franz Professional includes:",
-  "pricing.trial.headline": "Ferdi Professional",
+  "pricing.trial.headline": "Franz Professional",
  "pricing.trial.subheadline": "Your personal welcome offer:",
  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
  "pricing.trial.terms.headline": "No strings attached",
@@ -163,22 +161,20 @@
  "service.errorHandler.message": "Error",
  "service.errorHandler.text": "{name} has failed to load.",
  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
+  "service.restrictedHandler.customUrl.headline": "Franz Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
+  "service.restrictedHandler.customUrl.text": "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
  "service.webviewLoader.loading": "Loading",
  "services.getStarted": "Get started",
-  "services.login": "Please login to use Ferdi.",
+  "services.welcome": "Welcome to Franz",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.welcome": "Welcome to Ferdi",
  "settings.account.account.editButton": "Edit account",
  "settings.account.accountType.basic": "Basic Account",
  "settings.account.accountType.premium": "Premium Supporter Account",
  "settings.account.buttonSave": "Update profile",
  "settings.account.deleteAccount": "Delete account",
  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+  "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
  "settings.account.headline": "Account",
  "settings.account.headlineAccount": "Account information",
  "settings.account.headlineDangerZone": "Danger Zone",
@@ -186,8 +182,8 @@
  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Update profile",
  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
+  "settings.account.headlineTrialUpgrade": "Get the free 14 day Franz Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
+  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Franz experience",
  "settings.account.invoiceDownload": "Download",
  "settings.account.manageSubscription.label": "Manage your subscription",
  "settings.account.successInfo": "Your changes have been saved",
@@ -196,30 +192,28 @@
  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
+  "settings.account.upgradeToPro.label": "Upgrade to Franz Professional",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Franz License",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.",
  "settings.app.currentVersion": "Current version:",
  "settings.app.form.autoLaunchInBackground": "Open in background",
-  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
  "settings.app.form.beta": "Include beta versions",
  "settings.app.form.darkMode": "Join the Dark Side",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Show Franz in system tray",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.enableTodos": "Enable Franz Todos",
+  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
-  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
-  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
-  "settings.app.form.server": "Server",
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.todoServer": "Todo Server",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
@@ -228,13 +222,11 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.restartRequired": "Changes require restart",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
  "settings.app.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. The default server may not work for non-premium users. (default: https://app.franztodos.com)",
+  "settings.app.translationHelp": "Help us to translate Franz into your language.",
-  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
  "settings.app.updateStatusAvailable": "Update available, downloading...",
  "settings.app.updateStatusSearching": "Is searching for update",
-  "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
+  "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
  "settings.invite.headline": "Invite Friends",
  "settings.navigation.account": "Account",
  "settings.navigation.availableServices": "Available services",
@@ -264,7 +256,7 @@
  "settings.service.form.addServiceHeadline": "Add {name}",
  "settings.service.form.availableServices": "Available services",
  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
+  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
  "settings.service.form.deleteButton": "Delete service",
@@ -286,11 +278,11 @@
  "settings.service.form.name": "Name",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
+  "settings.service.form.proxy.restartInfo": "Please restart Franz after changing proxy Settings.",
  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.saveButton": "Save service",
  "settings.service.form.tabHosted": "Hosted",
@@ -307,11 +299,11 @@
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
-  "settings.team.contentHeadline": "Ferdi for Teams",
+  "settings.team.contentHeadline": "Franz for Teams",
-  "settings.team.copy": "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!",
+  "settings.team.copy": "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!",
  "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+  "settings.team.intro": "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on meetFerdi.com",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
  "settings.team.upgradeAction": "Upgrade your Account",
  "settings.user.form.accountType.company": "Company",
  "settings.user.form.accountType.individual": "Individual",
@@ -334,12 +326,14 @@
  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
  "settings.workspaces.tryReloadWorkspaces": "Try again",
  "settings.workspaces.updatedInfo": "Your changes have been saved",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
+  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Franz Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+  "settings.workspaces.workspaceFeatureInfo": "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
  "sidebar.addNewService": "Add new service",
+  "sidebar.closeTodosDrawer": "Close Franz Todos",
  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
  "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.openTodosDrawer": "Open Franz Todos",
  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
  "sidebar.settings": "Settings",
  "sidebar.unmuteApp": "Enable notifications & audio",
@@ -348,18 +342,18 @@
  "signup.firstname.label": "First Name",
  "signup.headline": "Sign up",
  "signup.lastname.label": "Last Name",
-  "signup.legal.info": "By creating a Ferdi account you accept the",
+  "signup.legal.info": "By creating a Franz account you accept the",
  "signup.legal.privacy": "Privacy Statement",
  "signup.legal.terms": "Terms of service",
  "signup.link.login": "Already have an account, sign in?",
  "signup.password.label": "Password",
  "signup.submit.label": "Create account",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
+  "subscription.cta.activateTrial": "Yes, start the free Franz Professional trial",
  "subscription.cta.allOptions": "See all options",
  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
+  "subscription.includedProFeatures": "The Franz Professional Plan includes:",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
+  "subscription.teaser.includedFeatures": "Paid Franz Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
+  "subscription.teaser.intro": "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
  "subscriptionPopup.buttonCancel": "Cancel",
  "subscriptionPopup.buttonDone": "Done",
  "tabs.item.deleteService": "Delete service",
@@ -386,7 +380,7 @@
  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
  "workspaceDrawer.proFeatureBadge": "Premium feature",
  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
 \ No newline at end of file
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 4b23d06dd..3141a1512 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -7,7 +7,7 @@
   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
-   "feature.delayApp.upgrade.action" : "Consigue una Licencia de Soporte de Ferdi",
+   "feature.delayApp.upgrade.action" : "Consigue una Licencia de Soporte de Franz",
   "feature.delayApp.upgrade.actionShort" : "Mejora tu cuenta",
   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Enviar como correo",
@@ -56,7 +56,7 @@
   "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
-   "menu.app.about" : "Acerca de Ferdi",
+   "menu.app.about" : "Acerca de Franz",
   "menu.app.announcement" : "¿Qué hay de nuevo?",
   "menu.app.checkForUpdates" : "Comprobar actualizaciones",
   "menu.app.hide" : "Ocultar",
@@ -93,10 +93,11 @@
   "menu.services.addNewService" : "Añadir Nuevo Servicio...",
   "menu.services.setNextServiceActive" : "Activa el siguiente servicio",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Mostrar",
   "menu.view.enterFullScreen" : "Pasar a pantalla completa",
   "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
-   "menu.view.reloadFranz" : "Recargar Ferdi",
+   "menu.view.reloadFranz" : "Recargar Franz",
   "menu.view.reloadService" : "Recargar Servicio",
   "menu.view.resetZoom" : "Tamaño Actual",
   "menu.view.toggleDevTools" : "Activar las Herramientas para Desarrolladores",
@@ -140,7 +141,7 @@
   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
-   "pricing.trial.cta.skip" : "Continue to Ferdi",
+   "pricing.trial.cta.skip" : "Continue to Franz",
   "pricing.trial.error" : "Sorry, we could not activate your trial!",
   "pricing.trial.features.headline" : "Franz Professional includes:",
   "pricing.trial.headline" : "Franz Professional",
@@ -166,7 +167,7 @@
   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Cargando",
   "services.getStarted" : "Primeros pasos",
-   "services.welcome" : "Bienvenido a Ferdi",
+   "services.welcome" : "Bienvenido a Franz",
   "settings.account.account.editButton" : "Editar cuenta",
   "settings.account.accountType.basic" : "Cuenta Básica",
   "settings.account.accountType.premium" : "Cuenta Colaborador Premium",
@@ -197,19 +198,20 @@
   "settings.app.buttonClearAllCache" : "Limpiar caché",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
   "settings.app.buttonSearchForUpdate" : "Buscar actualizaciones",
-   "settings.app.cacheInfo" : "El cache de Ferdi actualmente usa {size} de espacio en disco.",
+   "settings.app.cacheInfo" : "El cache de Franz actualmente usa {size} de espacio en disco.",
   "settings.app.currentVersion" : "Versión actual:",
   "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Iniciar Ferdi al iniciar",
+   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz al iniciar",
   "settings.app.form.beta" : "Incluir versiones beta",
   "settings.app.form.darkMode" : "Únete al Lado Oscuro",
   "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
   "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
   "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Idioma",
-   "settings.app.form.minimizeToSystemTray" : "Minimizar Ferdi a la bandeja del sistema",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
-   "settings.app.form.runInBackground" : "Mantener Ferdi en segundo plano al cerrar la ventana",
+   "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
   "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
   "settings.app.headline" : "Configuración",
@@ -221,10 +223,10 @@
   "settings.app.languageDisclaimer" : "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
   "settings.app.restartRequired" : "Los cambios requieren reiniciar",
   "settings.app.subheadlineCache" : "Caché",
-   "settings.app.translationHelp" : "Ayúdanos a traducir Ferdi a tu idioma.",
+   "settings.app.translationHelp" : "Ayúdanos a traducir Franz a tu idioma.",
   "settings.app.updateStatusAvailable" : "Actualización disponible, descargando...",
   "settings.app.updateStatusSearching" : "Buscando actualizaciones",
-   "settings.app.updateStatusUpToDate" : "Estás utilizando la última versión de Ferdi",
+   "settings.app.updateStatusUpToDate" : "Estás utilizando la última versión de Franz",
   "settings.invite.headline" : "Invitar amigos",
   "settings.navigation.account" : "Cuenta",
   "settings.navigation.availableServices" : "Servicios disponibles",
@@ -280,7 +282,7 @@
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Contraseña (opcional)",
   "settings.service.form.proxy.port" : "Puerto",
-   "settings.service.form.proxy.restartInfo" : "Por favor reinicie Ferdi despues de modificar los ajustes proxy.",
+   "settings.service.form.proxy.restartInfo" : "Por favor reinicie Franz despues de modificar los ajustes proxy.",
   "settings.service.form.proxy.user" : "Usuario (opcional)",
   "settings.service.form.saveButton" : "Guardar servicio",
   "settings.service.form.tabHosted" : "Alojado",
@@ -297,11 +299,11 @@
   "settings.services.tooltip.isMuted" : "Todos los sonidos están silenciados",
   "settings.services.tooltip.notificationsDisabled" : "Las notificaciones están desactivadas",
   "settings.services.updatedInfo" : "Tus cambios han sido guardados",
-   "settings.team.contentHeadline" : "Ferdi for Teams",
+   "settings.team.contentHeadline" : "Franz para equipos",
-   "settings.team.copy" : "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!",
+   "settings.team.copy" : "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!",
   "settings.team.headline" : "Equipo",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.intro" : "¿Usted y su equipo usan a Franz? Ahora puede administrar las suscripciones Premium para tantos colegas, amigos o familiares como desee, todo desde una misma cuenta.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.manageAction" : "Gestione su equipo en meetfranz.com",
   "settings.team.upgradeAction" : "Actualiza tu cuenta",
   "settings.user.form.accountType.company" : "Empresa",
   "settings.user.form.accountType.individual" : "Individual",
@@ -313,23 +315,25 @@
   "settings.user.form.lastname" : "Apellido",
   "settings.user.form.newPassword" : "Nueva contraseña",
   "settings.workspace.add.form.name" : "Nombre",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.add.form.submitButton" : "Crear un sitio de trabajo",
   "settings.workspace.form.buttonDelete" : "Eliminar espacio de trabajo",
   "settings.workspace.form.buttonSave" : "Guardar espacio de trabajo",
   "settings.workspace.form.name" : "Nombre",
   "settings.workspace.form.servicesInWorkspaceHeadline" : "Servicios en este espacio de trabajo",
   "settings.workspace.form.yourWorkspaces" : "Tus espacios de trabajo",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.deletedInfo" : "Se ha eliminado el sitio de trabajo",
   "settings.workspaces.headline" : "Tus espacios de trabajo",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.noWorkspacesAdded" : "Aún no ha añadido ningún sitio de trabajo.",
   "settings.workspaces.tryReloadWorkspaces" : "Inténtalo de nuevo",
   "settings.workspaces.updatedInfo" : "Tus cambios han sido guardados",
-   "settings.workspaces.workspaceFeatureHeadline" : "Menos es más: Presentación de Ferdi Workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menos es más: Presentación de Franz Workspaces",
-   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Añadir nuevo servicio",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Cerrar cajón de espacio de trabajo",
   "sidebar.muteApp" : "Desactivar notificaciones y sonido",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Configuración",
   "sidebar.unmuteApp" : "Activar notificaciones y sonido",
@@ -338,26 +342,12 @@
   "signup.firstname.label" : "Nombre",
   "signup.headline" : "Registrarse",
   "signup.lastname.label" : "Apellido",
-   "signup.legal.info" : "Al crear una cuenta en Ferdi usted acepta",
+   "signup.legal.info" : "Al crear una cuenta en Franz usted acepta",
   "signup.legal.privacy" : "Declaración de privacidad",
   "signup.legal.terms" : "Términos de servicio",
   "signup.link.login" : "Ya tienes una cuenta, ¿Iniciar sesión?",
   "signup.password.label" : "Contraseña",
   "signup.submit.label" : "Crear cuenta",
-   "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
-   "subscription.features.ads" : "¡Sin publicidad, para siempre!",
-   "subscription.features.comingSoon" : "próximamente",
-   "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
-   "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
-   "subscription.features.proxy" : "Soporte Proxy para servicios",
-   "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Ferdi incluye",
-   "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
-   "subscription.submit.label" : "Quiero apoyar el desarrollo de Ferdi",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "mes",
-   "subscription.type.year" : "año",
   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
   "subscription.cta.allOptions" : "See all options",
   "subscription.cta.choosePlan" : "Choose your plan",
@@ -390,7 +380,7 @@
   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
   "workspaceDrawer.proFeatureBadge" : "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 6e5f5b893..eb8eda18e 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Ajouter un nouveau service...",
   "menu.services.setNextServiceActive" : "Activer le service suivant",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Aperçu",
   "menu.view.enterFullScreen" : "Entrer en mode plein écran",
   "menu.view.exitFullScreen" : "Sortir du mode plein écran",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
   "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Langue",
   "settings.app.form.minimizeToSystemTray" : "Minimiser Ferdi dans la zone de notification",
   "settings.app.form.runInBackground" : "Garder Ferdi ouvert en arrière-plan à la fermeture de la fenêtre",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment. Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.",
   "settings.workspaces.workspacesRequestFailed" : "Impossible de charger vos espaces de travail",
   "sidebar.addNewService" : "Ajouter un nouveau service",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Fermer l'espace de travail",
   "sidebar.muteApp" : "Désactiver les notifications et les sons",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Ouvrir l'espace de travail",
   "sidebar.settings" : "Paramètres",
   "sidebar.unmuteApp" : "Activer les notifications et les sons",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 1868bc4e7..503fe6e08 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Cuir seirbhís nua leis",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Amharc",
   "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
   "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Teanga",
   "settings.app.form.minimizeToSystemTray" : "Íoslaghdaigh Ferdi chuig tráidire an chórais",
   "settings.app.form.runInBackground" : "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Cuir seirbhís nua leis",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Díchumasaigh fógraí ⁊ fuaim",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Socruithe",
   "sidebar.unmuteApp" : "Cumasaigh fógraí ⁊ fuaim",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 31616c547..6d6c8d0d2 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Add New Service...",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "View",
   "menu.view.enterFullScreen" : "Enter Full Screen",
   "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Jezik",
   "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
   "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Ugasi obavijesti i zvuk",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Postavke",
   "sidebar.unmuteApp" : "Omogući obavijesti i zvuk",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 5673e8de8..77b1a9c53 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -4,8 +4,8 @@
   "feature.announcements.changelog.headline" : "Franz {version} változásai",
   "feature.delayApp.headline" : "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
   "feature.delayApp.text" : "A Franz továbblép {seconds} másodperc múlva.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.action" : "Igen, szeretném kipróbálni 14 napig a Franz Professional-t ingyen",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.actionShort" : "Aktiválom az ingyenes Franz Professional próbaidőszakot",
   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
   "feature.delayApp.upgrade.action" : "Szerezz egy Franz Támogatói Liszencet",
   "feature.delayApp.upgrade.actionShort" : "Fiók frissítése",
@@ -17,17 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
-   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.info" : "A Franz Tennivalók már elérhető a prémium felhasználók részére!",
-   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.rollout" : "Mindenki másnak még egy kicsit tovább kell várni.",
-   "feature.todos.premium.upgrade" : "Upgrade Account",
+   "feature.todos.premium.upgrade" : "Fiók frissítése",
   "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
-   "global.franzProRequired" : "Franz Professional Required",
+   "global.franzProRequired" : "Franz Professional szükséges",
   "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
   "global.spellchecker.useDefault" : "Rendszer alapbeállítás használata ({default})",
   "global.spellchecking.autodetect" : "Automatikus nyelvdetektálás",
   "global.spellchecking.autodetect.short" : "Automatikus",
   "global.spellchecking.language" : "Helyesírás-ellenőrző nyelve",
-   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "global.upgradeButton.upgradeToPro" : "Frissítés Franz Professional-ra",
   "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
   "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
   "import.skip.label" : "Manuálisan szeretném hozzáadni a szolgáltatásokat",
@@ -37,7 +37,7 @@
   "infobar.buttonReloadServices" : "Szolgáltatások újratöltése",
   "infobar.requiredRequestsFailed" : "Szolgáltatások és felhasználói információk nem tölthetők be",
   "infobar.servicesUpdated" : "A szolgáltatások frissítésre kerültek.",
-   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.trialActivated" : "A próbaidőszak aktiválva. Jó mulatást!",
   "infobar.updateAvailable" : "Új frissítés érhető el a Franz-hoz.",
   "invite.email.label" : "Email cím",
   "invite.headline.friends" : "Hívd meg 3 barátodat vagy kollégádat",
@@ -54,8 +54,8 @@
   "login.serverLogout" : "A munkamenet lejárt, kérlek lépj be újra.",
   "login.submit.label" : "Bejelentkezés",
   "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
-   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.closeTodosDrawer" : "Tennivalók sáv bezárása",
-   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Tennivalók sáv kinyitása",
   "menu.app.about" : "Névjegy",
   "menu.app.announcement" : "Mi újság?",
   "menu.app.checkForUpdates" : "Frissítések keresése",
@@ -81,9 +81,9 @@
   "menu.file" : "Fájl",
   "menu.help" : "Súgó",
   "menu.help.changelog" : "Változások listája",
-   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfo" : "Hibajelentés másolása",
-   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedBody" : "A Hibajelentést a vágólapra másoltuk.",
-   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Hibajelentés",
   "menu.help.learnMore" : "Tudjon meg többet",
   "menu.help.privacy" : "Adatvédelmi Nyilatkozatot",
   "menu.help.support" : "Támogatás",
@@ -92,7 +92,8 @@
   "menu.services.activatePreviousService" : "Előző szolgáltatás",
   "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
   "menu.services.setNextServiceActive" : "Következő szolgáltatás",
-   "menu.todos" : "Todos",
+   "menu.todos" : "Tennivalók",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Nézet",
   "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
   "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
@@ -102,7 +103,7 @@
   "menu.view.toggleDevTools" : "Fejlesztői eszközök ki\/bekapcsolása",
   "menu.view.toggleFullScreen" : "Teljes képernyős mód ki\/bekapcsolása",
   "menu.view.toggleServiceDevTools" : "Szolgáltatás Fejlesztői Eszközök ki\/bekapcsolása",
-   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Tennivalók Fejlesztői Eszközök kapcsolása",
   "menu.view.zoomIn" : "Nagyítás",
   "menu.view.zoomOut" : "Kicsinyítés",
   "menu.window" : "Ablak",
@@ -121,17 +122,17 @@
   "password.submit.label" : "Küldés",
   "password.successInfo" : "Ellenőrizd az email fiókodat",
   "premiumFeature.button.upgradeAccount" : "Fiók frissítése",
-   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.adFree" : "Hirdetésmentesség, örökre!",
-   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.appDelays" : "Nincsenek töltőképernyők",
-   "pricing.features.customWebsites" : "Add Custom Websites",
+   "pricing.features.customWebsites" : "Egyéni weboldalak megadása",
-   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.onPremise" : "Helyi és egyéb távoli szolgáltatások",
-   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.serviceProxies" : "Szolgáltatás Proxy-k",
-   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.spellchecker" : "Helyesírás-ellenőrzés támogatás",
-   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.teamManagement" : "Csapatkezelés",
-   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.thirdPartyServices" : "Harmadik féltől származó szolgáltatások használata",
-   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.unlimitedServices" : "Korlátlan szolgáltatások felvitele",
   "pricing.features.workspaces" : "Munkaterületek",
-   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.free" : "Ingyenes Franz",
   "pricing.plan.legacy" : "Franz Premium",
   "pricing.plan.personal" : "Franz Personal",
   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
@@ -159,7 +160,7 @@
   "service.errorHandler.headline" : "Jajj ne!",
   "service.errorHandler.message" : "Hiba",
   "service.errorHandler.text" : "{name} nem tudott betöltődni.",
-   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.action" : "Fiók frissítése",
   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
@@ -191,7 +192,7 @@
   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Próbáld újra",
   "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
-   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
+   "settings.account.upgradeToPro.label" : "Frissítés Franz Professional-ra",
   "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Gyorsítótár törlése",
@@ -206,7 +207,8 @@
   "settings.app.form.enableGPUAcceleration" : "Hardveres gyorsítás engedélyezése",
   "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
   "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
-   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.enableTodos" : "Franz Tennivalók bekapcsolása",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Nyelv",
   "settings.app.form.minimizeToSystemTray" : "Ferdi kicsinyítése a tálcára",
   "settings.app.form.runInBackground" : "Ferdi fusson a háttérben az ablak bezárásakor",
@@ -235,13 +237,13 @@
   "settings.navigation.yourServices" : "Szolgáltatásaid",
   "settings.navigation.yourWorkspaces" : "Munkaterületeid",
   "settings.recipes.all" : "Összes szolgáltatás",
-   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.custom" : "Egyéni szolgáltatások",
   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
-   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Egyéni, harmadik féltől származó receptek",
   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
-   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.intro" : "Az egyéni szolgáltatás hozzáadásához, másoljuk be annak receptjét:",
-   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openDevDocs" : "Fejlesztői dokumentáció",
-   "settings.recipes.customService.openFolder" : "Open folder",
+   "settings.recipes.customService.openFolder" : "Könyvtár megnyitása",
   "settings.recipes.headline" : "Elérhető szolgáltatások",
   "settings.recipes.missingService" : "Hiányzik egy szolgáltatás?",
   "settings.recipes.mostPopular" : "Legnépszerűbb",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor. Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.",
   "settings.workspaces.workspacesRequestFailed" : "Nem sikerült betölteni a munkaterületeket",
   "sidebar.addNewService" : "Szolgáltatás hozzáadása",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Munkaterület panel bezárása",
   "sidebar.muteApp" : "Értesítések és hangok letiltása",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Munkaterület panel megnyitása",
   "sidebar.settings" : "Beállítások",
   "sidebar.unmuteApp" : "Értesítések és hangok engedélyezése",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 13fa5b54c..bf9200064 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Tambahkan Layanan Baru...",
   "menu.services.setNextServiceActive" : "Aktifkan layanan berikutnya",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Tampilan",
   "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
   "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
   "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Bahasa",
   "settings.app.form.minimizeToSystemTray" : "Perkecil Ferdi ke baki sistem",
   "settings.app.form.runInBackground" : "Tetap jalankan Ferdi di latar belakang saat menutup jendela",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain. Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.",
   "settings.workspaces.workspacesRequestFailed" : "Tidak dapat memuat ruang kerja Anda",
   "sidebar.addNewService" : "Tambahkan layanan baru",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Tutup laci ruang kerja",
   "sidebar.muteApp" : "Nonaktifkan pemberitahuan & audio",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Buka laci ruang kerja",
   "sidebar.settings" : "Pengaturan",
   "sidebar.unmuteApp" : "Aktifkan pemberitahuan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 2317cdc8f..de43a10e0 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -4,12 +4,12 @@
   "feature.announcements.changelog.headline" : "Modifiche in Franz {Version}",
   "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
   "feature.delayApp.text" : "Franz continuerà tra {seconds} secondi.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.action" : "Sì, voglio la prova gratuita di 14 giorni di Franz Professional",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.actionShort" : "Attiva la prova gratuita di Franz Professional",
-   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.trial.headline" : "Ottieni la prova gratuita per 14 giorni di Franz Professional e salta la coda",
-   "feature.delayApp.upgrade.action" : "Ricevi una Licenza Supporter di Ferdi",
+   "feature.delayApp.upgrade.action" : "Ricevi una Licenza Supporter di Franz",
   "feature.delayApp.upgrade.actionShort" : "Effettua l'upgrade del tuo account",
-   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
+   "feature.serviceLimit.limitReached" : "Hai aggiunto {amount} su {limit} servizi che sono inclusi nel tuo piano. Per favore potenzia il tuo account per aggiungere più servizi.",
   "feature.shareFranz.action.email" : "Manda come email",
   "feature.shareFranz.action.facebook" : "Condividi su Facebook",
   "feature.shareFranz.action.twitter" : "Condividi su Twitter",
@@ -17,17 +17,17 @@
   "feature.shareFranz.shareText.email" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l'app gratuita per WhatsApp, Messenger, Slack, Skype e altri all'indirizzo www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l’app gratuita per WhatsApp, Messenger, Slack, Skype e altri all’indirizzo www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Di’ ai tuoi amici e colleghi quanto Franz è fantastico e aiutaci a diffondere la parola.",
-   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.info" : "Le attività Franz sono ora disponibili agli utenti premium!",
-   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.rollout" : "Chiunque altro dovrà aspettare un po' di più.",
-   "feature.todos.premium.upgrade" : "Upgrade Account",
+   "feature.todos.premium.upgrade" : "Potenzia l'Account",
-   "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Ferdi",
+   "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
-   "global.franzProRequired" : "Franz Professional Required",
+   "global.franzProRequired" : "Richiesto Franz Professional",
   "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
   "global.spellchecker.useDefault" : "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect" : "Rileva automaticamente la lingua",
   "global.spellchecking.autodetect.short" : "Automatico",
   "global.spellchecking.language" : "Lingua per controllo ortografico",
-   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "global.upgradeButton.upgradeToPro" : "Aggiorna a Franz Professional",
   "import.headline" : "Importa i servizi di Franz 4",
   "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
   "import.skip.label" : "Voglio aggiungere i servizi manualmente",
@@ -37,7 +37,7 @@
   "infobar.buttonReloadServices" : "Ricarica servizi",
   "infobar.requiredRequestsFailed" : "Impossibile caricare i servizi e le informazioni dell'utente",
   "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
-   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.trialActivated" : "La tua prova è stata attivata con successo. Buona chat!",
   "infobar.updateAvailable" : "È disponibile un nuovo aggiornamento di Franz.",
   "invite.email.label" : "Indirizzo email",
   "invite.headline.friends" : "Invita 3 dei tuoi amici o colleghi",
@@ -54,9 +54,9 @@
   "login.serverLogout" : "La tua sessione è scaduta, per favore accedi di nuovo.",
   "login.submit.label" : "Accedi",
   "login.tokenExpired" : "La tua sessione è scaduta, per favore accedi di nuovo.",
-   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.closeTodosDrawer" : "Chiudi il cassetto delle attività",
-   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Apri il cassetto delle attività",
-   "menu.app.about" : "Info su Ferdi",
+   "menu.app.about" : "Info su Franz",
   "menu.app.announcement" : "Cosa c'è di nuovo?",
   "menu.app.checkForUpdates" : "Controlla aggiornamenti",
   "menu.app.hide" : "Nascondi",
@@ -81,9 +81,9 @@
   "menu.file" : "File",
   "menu.help" : "Aiuto",
   "menu.help.changelog" : "Changelog",
-   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfo" : "Copia informazioni di debug",
-   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedBody" : "Le tue informazioni di debug sono state copiate nella tua clipboard.",
-   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
+   "menu.help.debugInfoCopiedHeadline" : "Informazioni di debug di Franz",
   "menu.help.learnMore" : "Maggiori Informazioni",
   "menu.help.privacy" : "Dichiarazione della Privacy",
   "menu.help.support" : "Supporto",
@@ -92,17 +92,18 @@
   "menu.services.activatePreviousService" : "Attiva servizio precedente",
   "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
   "menu.services.setNextServiceActive" : "Attiva servizio seguente",
-   "menu.todos" : "Todos",
+   "menu.todos" : "Attività",
+   "menu.todos.enableTodos" : "Abilita attività",
   "menu.view" : "Visualizza",
   "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
   "menu.view.exitFullScreen" : "Esci da Schermo Intero",
-   "menu.view.reloadFranz" : "Ricarica Ferdi",
+   "menu.view.reloadFranz" : "Ricarica Franz",
   "menu.view.reloadService" : "Ricarica Servizio",
   "menu.view.resetZoom" : "Dimensione Attuale",
   "menu.view.toggleDevTools" : "Attiva\/Disattiva Strumenti Sviluppo",
   "menu.view.toggleFullScreen" : "Attiva\/Disattiva Schermo Intero",
   "menu.view.toggleServiceDevTools" : "Attiva\/Disattiva Strumenti per Sviluppatori di Servizi",
-   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Attiva gli strumenti di sviluppo delle attività",
   "menu.view.zoomIn" : "Aumenta Zoom",
   "menu.view.zoomOut" : "Diminuisci Zoom",
   "menu.window" : "Finestra",
@@ -121,29 +122,29 @@
   "password.submit.label" : "Invia",
   "password.successInfo" : "Per favore controlla la tua email",
   "premiumFeature.button.upgradeAccount" : "Effettua l'upgrade del tuo account",
-   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.adFree" : "Senza pubblicità per sempre",
-   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.appDelays" : "Nessuna schermata di attesa",
-   "pricing.features.customWebsites" : "Add Custom Websites",
+   "pricing.features.customWebsites" : "Aggiungi siti web personalizzati",
-   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.onPremise" : "Servizi ospitati & on-premise",
-   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.serviceProxies" : "Proxy di servizio",
-   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.spellchecker" : "Supporto per il correttore ortografico",
-   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.teamManagement" : "Gestione del team",
-   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.thirdPartyServices" : "Installa servizi di terze parti",
-   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.unlimitedServices" : "Aggiungi servizi illimitati",
-   "pricing.features.workspaces" : "Workspaces",
+   "pricing.features.workspaces" : "Aree di lavoro",
-   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.free" : "Franz Gratuito",
   "pricing.plan.legacy" : "Franz Premium",
-   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal" : "Franz Personale",
-   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-monthly" : "Franz Personale Mensile",
-   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.personal-yearly" : "Franz Personale Annuale",
-   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro" : "Franz Professionale",
-   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-monthly" : "Franz Professionale Mensile",
-   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.plan.pro-yearly" : "Franz Professionale Annuale",
-   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.accept" : "Sì, potenzia il mio account a Franz Professionale",
-   "pricing.trial.cta.skip" : "Continue to Ferdi",
+   "pricing.trial.cta.skip" : "Continua su Franz",
   "pricing.trial.error" : "Sorry, we could not activate your trial!",
   "pricing.trial.features.headline" : "Franz Professional includes:",
-   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.headline" : "Franz Professionale",
   "pricing.trial.subheadline" : "Your personal welcome offer:",
   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
   "pricing.trial.terms.headline" : "No strings attached",
@@ -159,14 +160,14 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "Errore",
   "service.errorHandler.text" : "{name} non si è caricato correttamente.",
-   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.action" : "Potenzia l'Account",
   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Caricamento",
   "services.getStarted" : "Iniziamo",
-   "services.welcome" : "Benvenuto su Ferdi",
+   "services.welcome" : "Benvenuto su Franz",
   "settings.account.account.editButton" : "Modifica account",
   "settings.account.accountType.basic" : "Account Base",
   "settings.account.accountType.premium" : "Account Supporto Premium ",
@@ -191,25 +192,26 @@
   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Prova di nuovo",
   "settings.account.tryReloadUserInfoRequest" : "Riprova",
-   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
+   "settings.account.upgradeToPro.label" : "Aggiorna a Franz Professional",
   "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Svuota la cache",
   "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
   "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
-   "settings.app.cacheInfo" : "Ferdi sta utilizzando {size} di spazio su disco.",
+   "settings.app.cacheInfo" : "Franz sta utilizzando {size} di spazio su disco.",
   "settings.app.currentVersion" : "Versione attuale:",
   "settings.app.form.autoLaunchInBackground" : "Apri in background",
-   "settings.app.form.autoLaunchOnStart" : "Esegui Ferdi all'avvio",
+   "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
   "settings.app.form.beta" : "Includi versioni beta",
   "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
   "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
   "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
   "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Lingua",
-   "settings.app.form.minimizeToSystemTray" : "Minimizza Ferdi nell'area di notifica",
+   "settings.app.form.minimizeToSystemTray" : "Minimizza Franz nell'area di notifica",
-   "settings.app.form.runInBackground" : "Mantieni Ferdi in esecuzione quando chiudi la finestra",
+   "settings.app.form.runInBackground" : "Mantieni Franz in esecuzione quando chiudi la finestra",
   "settings.app.form.showDisabledServices" : "Mostra schede servizi disattivati",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
   "settings.app.headline" : "Impostazioni",
@@ -221,10 +223,10 @@
   "settings.app.languageDisclaimer" : "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
   "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
   "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Aiutaci a tradurre Ferdi nella tua lingua.",
+   "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
   "settings.app.updateStatusAvailable" : "Aggiornamento disponibile, download in corso...",
   "settings.app.updateStatusSearching" : "Ricerca aggiornamenti",
-   "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Ferdi",
+   "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Franz",
   "settings.invite.headline" : "Invita Amici",
   "settings.navigation.account" : "Account",
   "settings.navigation.availableServices" : "Servizi disponibili",
@@ -254,7 +256,7 @@
   "settings.service.form.addServiceHeadline" : "Aggiungi {name}",
   "settings.service.form.availableServices" : "Servizi disponibili",
   "settings.service.form.customUrl" : "Server personalizzato",
-   "settings.service.form.customUrlPremiumInfo" : "Per aggiungere servizi personalizzati, devi avere un account Ferdi Premium Supporter.",
+   "settings.service.form.customUrlPremiumInfo" : "Per aggiungere servizi personalizzati, devi avere un account Franz Premium Supporter.",
   "settings.service.form.customUrlUpgradeAccount" : "Aggiorna il tuo account",
   "settings.service.form.customUrlValidationError" : "Impossibile validare il server personalizzato {name}.",
   "settings.service.form.deleteButton" : "Elimina servizio",
@@ -276,11 +278,11 @@
   "settings.service.form.name" : "Nome",
   "settings.service.form.proxy.headline" : "Impostazioni Proxy HTTP\/HTTPS",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Le impostazioni proxy non verranno sincronizzate con i server Ferdi",
+   "settings.service.form.proxy.info" : "Le impostazioni proxy non verranno sincronizzate con i server Franz",
   "settings.service.form.proxy.isEnabled" : "Usa un Proxy",
   "settings.service.form.proxy.password" : "Password (opzionale)",
   "settings.service.form.proxy.port" : "Porta",
-   "settings.service.form.proxy.restartInfo" : "Riavvia Ferdi dopo aver cambiato le impostazioni del proxy.",
+   "settings.service.form.proxy.restartInfo" : "Riavvia Franz dopo aver cambiato le impostazioni del proxy.",
   "settings.service.form.proxy.user" : "Utente (opzionale)",
   "settings.service.form.saveButton" : "Salva servizio",
   "settings.service.form.tabHosted" : "Hosted",
@@ -297,8 +299,8 @@
   "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
   "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
   "settings.services.updatedInfo" : "Le tue modifiche sono state salvate",
-   "settings.team.contentHeadline" : "Ferdi per i Teams",
+   "settings.team.contentHeadline" : "Franz per i Teams",
-   "settings.team.copy" : "Ferdi per i Teams ti da la possibilità di invitare collaboratori al tuo team, invitandoli per email e gestendo la loro iscrizione all'interno delle preferenze del tuo account. Non perdere tempo impostando le iscrizioni di un singolo collaboratore individualmente, dimenticati di fatture multiple e cicli differenti di fatturazione - un team per comandarli tutti!",
+   "settings.team.copy" : "Franz per i Teams ti da la possibilità di invitare collaboratori al tuo team, invitandoli per email e gestendo la loro iscrizione all'interno delle preferenze del tuo account. Non perdere tempo impostando le iscrizioni di un singolo collaboratore individualmente, dimenticati di fatture multiple e cicli differenti di fatturazione - un team per comandarli tutti!",
   "settings.team.headline" : "Team",
   "settings.team.intro" : "Tu e il tuo team usate Franz? Ora puoi gestire le sottoscrizioni Premium per tutti i colleghi, amici e famigliari che vuoi, tutto da un singolo account.",
   "settings.team.manageAction" : "Gestisci il tuo Team su meetfranz.com",
@@ -324,12 +326,14 @@
   "settings.workspaces.noWorkspacesAdded" : "Non hai ancora aggiunto alcun workspace",
   "settings.workspaces.tryReloadWorkspaces" : "Riprova nuovamente",
   "settings.workspaces.updatedInfo" : "Le tue modifiche sono state salvate",
-   "settings.workspaces.workspaceFeatureHeadline" : "Meno è Meglio: I Workspaces di Ferdi",
+   "settings.workspaces.workspaceFeatureHeadline" : "Meno è Meglio: I Workspaces di Franz",
-   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces ti permette di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi. Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces ti permette di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi. Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.",
   "settings.workspaces.workspacesRequestFailed" : "Non è possibile caricare i tuoi workspaces",
   "sidebar.addNewService" : "Aggiungi un nuovo servizio",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Chiudi il menu dei workspace",
   "sidebar.muteApp" : "Disattiva notifiche e audio",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Apri il menu dei workspace",
   "sidebar.settings" : "Impostazioni",
   "sidebar.unmuteApp" : "Attiva notifiche e audio",
@@ -338,26 +342,12 @@
   "signup.firstname.label" : "Nome",
   "signup.headline" : "Iscriviti",
   "signup.lastname.label" : "Cognome",
-   "signup.legal.info" : "Creando un account di Ferdi accetti i ",
+   "signup.legal.info" : "Creando un account di Franz accetti i ",
   "signup.legal.privacy" : "Informativa sulla Privacy",
   "signup.legal.terms" : "Termini di Servizio",
   "signup.link.login" : "Hai già un account, vuoi accedere?",
   "signup.password.label" : "Password",
   "signup.submit.label" : "Crea un account",
-   "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
-   "subscription.features.ads" : "Nessuna pubblicità, mai!",
-   "subscription.features.comingSoon" : "in arrivo",
-   "subscription.features.noInterruptions" : "L'upgrade della licenza avrà impatti sull'utilizzo dell'App",
-   "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
-   "subscription.features.proxy" : "Supporto proxy per i servizi",
-   "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
-   "subscription.features.workspaces" : "Organizza i tuoi servizi in workspace",
-   "subscription.includedFeatures" : "L'account a pagamento Ferdi Premium Supporter include",
-   "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
-   "subscription.submit.label" : "Voglio supportare lo sviluppo di Ferdi",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "mese",
-   "subscription.type.year" : "anno",
   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
   "subscription.cta.allOptions" : "See all options",
   "subscription.cta.choosePlan" : "Choose your plan",
@@ -390,7 +380,7 @@
   "workspaceDrawer.premiumCtaButtonLabel" : "Crea il tuo primo workspace",
   "workspaceDrawer.proFeatureBadge" : "Funzionalità premium",
   "workspaceDrawer.reactivatePremiumAccountLabel" : "Riattiva l’account premium",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Ferdi Workspaces ti permette di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.<\/p><p>Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.<\/p>",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces ti permette di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.<\/p><p>Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.<\/p>",
   "workspaceDrawer.workspacesSettingsTooltip" : "Modifica le impostazioni dei workspace",
   "workspaces.switchingIndicator.switchingTo" : "Passa a "
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index b37c3ee5e..f6174cbbd 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "サービスを追加",
   "menu.services.setNextServiceActive" : "次のサービスを有効にする",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "表示",
   "menu.view.enterFullScreen" : "全画面表示",
   "menu.view.exitFullScreen" : "全画面表示を終了する",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
   "settings.app.form.enableSystemTray" : "Franzをシステムトレイに表示する",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "言語",
   "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイに最小化する",
   "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "サービスを追加",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "通知とオーディオを無効化",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "設定",
   "sidebar.unmuteApp" : "通知とオーディオを有効化",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 513dd0aef..3d5c8d29a 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Add New Service...",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "View",
   "menu.view.enterFullScreen" : "Enter Full Screen",
   "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Enable spell checking",
   "settings.app.form.enableSystemTray" : "აჩვენეთ Franz სისტემის უჯრაში",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "ენა",
   "settings.app.form.minimizeToSystemTray" : "ჩაკეცეთ Ferdi სისტემის უჯრაში",
   "settings.app.form.runInBackground" : "დატოვეთ Ferdi გაშვებული როდესაც ფანჯარა დაიხურება",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Add new service",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "პარამეტრები",
   "sidebar.unmuteApp" : "Enable notifications & audio",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index d3ecff3fc..c17439ea5 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Nieuwe service toevoegen...",
   "menu.services.setNextServiceActive" : "Volgende dienst activeren",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Weergave",
   "menu.view.enterFullScreen" : "Volledig scherm openen",
   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
   "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Taal",
   "settings.app.form.minimizeToSystemTray" : "Minimaliseer Ferdi naar de systeembalk",
   "settings.app.form.runInBackground" : "Houd Ferdi op de achtergrond wanneer het venster gesloten wordt",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Kan je werkruimtes niet laden",
   "sidebar.addNewService" : "Nieuw service toevoegen",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Werkruimtelade sluiten",
   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Werkruimtelade openen",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index e62bb7a09..236a688ba 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Nieuwe service toevoegen...",
   "menu.services.setNextServiceActive" : "Activeer volgende service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Weergave",
   "menu.view.enterFullScreen" : "Gebruik volledig scherm",
   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
   "settings.app.form.enableSystemTray" : "Pictogram voor Franz in systeemvak tonen",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Taal",
   "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar systeemvak",
   "settings.app.form.runInBackground" : "Houd Franz open op de achtergrond wanneer het venster gesloten wordt",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
   "settings.workspaces.workspacesRequestFailed" : "Kan jouw werkruimtes niet laden",
   "sidebar.addNewService" : "Voeg service toe",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Werkruimte pagina sluiten",
   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Werkruimte pagina openen",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 53b4d3c35..0c5eee9e6 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -4,30 +4,30 @@
   "feature.announcements.changelog.headline" : "Zmiany we Franzie {version}",
   "feature.delayApp.headline" : "Aby nie czekać, kup licencję Franz Supporter",
   "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.action" : "Tak, chcę darmową 14-dniową wersję próbną Franz Professional",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.actionShort" : "Aktywuj darmową wersję próbną Franz Professional",
   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
   "feature.delayApp.upgrade.action" : "Uzyskaj licencję Franz Supporter",
   "feature.delayApp.upgrade.actionShort" : "Ulepsz swoje konto",
-   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
+   "feature.serviceLimit.limitReached" : "Dodałeś {amount} z {limit} usług, które oferuje twój plan. Ulepsz swoje konto, aby dodać więcej usług.",
   "feature.shareFranz.action.email" : "Wyślij jako email",
   "feature.shareFranz.action.facebook" : "Udostępnij na Facebooku",
   "feature.shareFranz.action.twitter" : "Udostępnij na Twitterze",
-   "feature.shareFranz.headline" : "Ferdi jest lepszy, gdy tworzymy go razem!",
+   "feature.shareFranz.headline" : "Franz jest lepszy, gdy tworzymy go razem!",
-   "feature.shareFranz.shareText.email" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Dodałem {count} usług do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "Dodałem {count} usług do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Powiedz znajomym i kolegom o tym, jak odlotowy jest Franz i pomóż nam go spopularyzować.",
-   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.info" : "Listy zadań Franz są już dostępne dla użytkowników premium!",
-   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.rollout" : "Wszyscy inni będą musieli zaczekać nieco dłużej.",
-   "feature.todos.premium.upgrade" : "Upgrade Account",
+   "feature.todos.premium.upgrade" : "Ulepsz konto",
   "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
-   "global.franzProRequired" : "Franz Professional Required",
+   "global.franzProRequired" : "Wymagany Franz Professional",
   "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
   "global.spellchecker.useDefault" : "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect" : "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short" : "Automatycznie",
   "global.spellchecking.language" : "Język sprawdzania pisowni",
-   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "global.upgradeButton.upgradeToPro" : "Ulepsz konto do Franz Professional",
   "import.headline" : "Importuj usługi Franz 4",
   "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
   "import.skip.label" : "Chcę dodać usługi samodzielnie",
@@ -54,9 +54,9 @@
   "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
   "login.submit.label" : "Zaloguj się",
   "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
-   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.closeTodosDrawer" : "Zamknij zakładkę Lista zadań",
-   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Otwórz zakładkę Lista zadań",
-   "menu.app.about" : "O Ferdi",
+   "menu.app.about" : "O Franz",
   "menu.app.announcement" : "Co słychać?",
   "menu.app.checkForUpdates" : "Sprawdź aktualizacje",
   "menu.app.hide" : "Ukryj",
@@ -81,28 +81,29 @@
   "menu.file" : "Plik",
   "menu.help" : "Pomoc",
   "menu.help.changelog" : "Lista zmian",
-   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfo" : "Skopiuj informacje debugowania",
-   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedBody" : "Informacje debugowania zostały skopiowane do schowka.",
-   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
+   "menu.help.debugInfoCopiedHeadline" : "Informacje debugowania Franz",
   "menu.help.learnMore" : "Dowiedz się więcej",
   "menu.help.privacy" : "Polityka prywatności",
   "menu.help.support" : "Wsparcie",
   "menu.help.tos" : "Warunki świadczenia usług",
   "menu.services" : "Usługi",
-   "menu.services.activatePreviousService" : "Włącz poprzedni serwis",
+   "menu.services.activatePreviousService" : "Poprzednia usługa",
   "menu.services.addNewService" : "Dodaj nową usługę...",
-   "menu.services.setNextServiceActive" : "Włącz kolejny serwis",
+   "menu.services.setNextServiceActive" : "Następna usługa",
-   "menu.todos" : "Todos",
+   "menu.todos" : "Lista zadań",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Widok",
   "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
   "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
-   "menu.view.reloadFranz" : "Przeładuj Ferdi",
+   "menu.view.reloadFranz" : "Przeładuj Franz",
   "menu.view.reloadService" : "Przeładuj usługę",
   "menu.view.resetZoom" : "Domyślny rozmiar",
   "menu.view.toggleDevTools" : "Pokaż narzędzia developerskie",
   "menu.view.toggleFullScreen" : "Przełącz tryb pełnoekranowy",
   "menu.view.toggleServiceDevTools" : "Włącz narzędzia developerskie usługi",
-   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Przełącz narzędzia deweloperskie Listy zadań",
   "menu.view.zoomIn" : "Powiększ",
   "menu.view.zoomOut" : "Pomniejsz",
   "menu.window" : "Okno",
@@ -120,16 +121,16 @@
   "password.noUser" : "Nie znaleziono użytkownika z takim adresem email",
   "password.submit.label" : "Wyślij",
   "password.successInfo" : "Proszę sprawdzić swój email",
-   "premiumFeature.button.upgradeAccount" : "Ulepsz swoje konto",
+   "premiumFeature.button.upgradeAccount" : "Ulepsz konto",
-   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.adFree" : "Na zawsze bez reklam",
   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.features.customWebsites" : "Add Custom Websites",
+   "pricing.features.customWebsites" : "Dodawanie dowolnych stron internetowych",
   "pricing.features.onPremise" : "On-premise & other Hosted Services",
   "pricing.features.serviceProxies" : "Service Proxies",
-   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.spellchecker" : "Obsługa sprawdzania pisowni",
-   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.teamManagement" : "Zarządzanie zespołem",
-   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.thirdPartyServices" : "Instalacja zewnętrznych usług",
-   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.unlimitedServices" : "Dodawanie nielimitowanych usług",
   "pricing.features.workspaces" : "Obszary robocze",
   "pricing.plan.free" : "Franz Free",
   "pricing.plan.legacy" : "Franz Premium",
@@ -140,7 +141,7 @@
   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
-   "pricing.trial.cta.skip" : "Continue to Ferdi",
+   "pricing.trial.cta.skip" : "Continue to Franz",
   "pricing.trial.error" : "Sorry, we could not activate your trial!",
   "pricing.trial.features.headline" : "Franz Professional includes:",
   "pricing.trial.headline" : "Franz Professional",
@@ -159,14 +160,14 @@
   "service.errorHandler.headline" : "O nie!",
   "service.errorHandler.message" : "Błąd",
   "service.errorHandler.text" : "Nie udało się załadować {name}.",
-   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.action" : "Ulepsz konto",
   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Ładowanie",
   "services.getStarted" : "Zacznij",
-   "services.welcome" : "Witaj w programie Ferdi",
+   "services.welcome" : "Witaj w programie Franz",
   "settings.account.account.editButton" : "Modyfikuj konta",
   "settings.account.accountType.basic" : "Podstawowe konto",
   "settings.account.accountType.premium" : "Premium Supporter Account",
@@ -191,7 +192,7 @@
   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Spróbuj ponownie",
   "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
-   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
+   "settings.account.upgradeToPro.label" : "Ulepsz konto do Franz Professional",
   "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
@@ -200,16 +201,17 @@
   "settings.app.cacheInfo" : "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
   "settings.app.currentVersion" : "Aktualna wersja:",
   "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
-   "settings.app.form.autoLaunchOnStart" : "Uruchom Ferdi na początku",
+   "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na początku",
   "settings.app.form.beta" : "Uwzględnij wersje beta",
   "settings.app.form.darkMode" : "Przejdź na Ciemną Stronę",
   "settings.app.form.enableGPUAcceleration" : "Włącz akcelerację GPU",
   "settings.app.form.enableSpellchecking" : "Włącz sprawdzanie pisowni",
   "settings.app.form.enableSystemTray" : "Pokaż Franza w obszarze powiadomień",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Język",
-   "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Ferdi",
+   "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
-   "settings.app.form.runInBackground" : "Zachowaj aplikację Ferdi w tle po zamknięciu okna",
+   "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
   "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
   "settings.app.headline" : "Ustawienia",
@@ -219,12 +221,12 @@
   "settings.app.headlineLanguage" : "Język",
   "settings.app.headlineUpdates" : "Aktualizacje",
   "settings.app.languageDisclaimer" : "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Franz.",
-   "settings.app.restartRequired" : "Zmiany. wymagają ponownego uruchomienia",
+   "settings.app.restartRequired" : "Zmiany wymagają ponownego uruchomienia",
   "settings.app.subheadlineCache" : "Pamięć podręczna",
-   "settings.app.translationHelp" : "Pomóż nam tłumaczyć Ferdi na Twój język.",
+   "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
   "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
   "settings.app.updateStatusSearching" : "Szukam aktualizacji",
-   "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Ferdi",
+   "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Franz",
   "settings.invite.headline" : "Zaproś znajomych",
   "settings.navigation.account" : "Konto",
   "settings.navigation.availableServices" : "Dostępne usługi",
@@ -235,7 +237,7 @@
   "settings.navigation.yourServices" : "Twoje usługi",
   "settings.navigation.yourWorkspaces" : "Twoje obszary robocze",
   "settings.recipes.all" : "Wszystkie usługi",
-   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.custom" : "Własne usługi",
   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
@@ -247,7 +249,7 @@
   "settings.recipes.mostPopular" : "Najpopularniejsze",
   "settings.recipes.nothingFound" : "Żadna usługa nie została znaleziona.",
   "settings.recipes.servicesSuccessfulAddedInfo" : "Usługa została dodana pomyślnie",
-   "settings.searchService" : "Wyszukaj serwis",
+   "settings.searchService" : "Wyszukaj usługę",
   "settings.service.error.goBack" : "Wróć do usług",
   "settings.service.error.headline" : "Błąd",
   "settings.service.error.message" : "Nie można wczytać przepisu usługi.",
@@ -280,7 +282,7 @@
   "settings.service.form.proxy.isEnabled" : "Użyj Proxy",
   "settings.service.form.proxy.password" : "Hasło (opcjonalnie)",
   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Uruchom ponownie Ferdi po zmianie ustawień proxy.",
+   "settings.service.form.proxy.restartInfo" : "Uruchom ponownie Franz po zmianie ustawień proxy.",
   "settings.service.form.proxy.user" : "Użytkownik (opcjonalnie)",
   "settings.service.form.saveButton" : "Zapisz usługę",
   "settings.service.form.tabHosted" : "Hostowane",
@@ -297,8 +299,8 @@
   "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
   "settings.services.tooltip.notificationsDisabled" : "Powiadomienia są nieaktywne",
   "settings.services.updatedInfo" : "Zmiany zostały zapisane",
-   "settings.team.contentHeadline" : "Zespoły Ferdi",
+   "settings.team.contentHeadline" : "Zespoły Franz",
-   "settings.team.copy" : "Ferdi umożliwia zespołom opcję zapraszania pracowników do zespołu wysyłając im maila z zaproszeniem i pozwala zarządzać ich subskrypcją w ustawieniach konta. Nie trać czasu na ustawianie subskrypcji dla każdego zespołu osobno, zapomnij o wielu fakturach i różnych cyklicznych opłatach - jeden zespół do zarządzania wszystkim!",
+   "settings.team.copy" : "Franz umożliwia zespołom opcję zapraszania pracowników do zespołu wysyłając im maila z zaproszeniem i pozwala zarządzać ich subskrypcją w ustawieniach konta. Nie trać czasu na ustawianie subskrypcji dla każdego zespołu osobno, zapomnij o wielu fakturach i różnych cyklicznych opłatach - jeden zespół do zarządzania wszystkim!",
   "settings.team.headline" : "Zespół",
   "settings.team.intro" : "Czy Ty i zesół używacie programu Franz? Możesz teraz zarządzać subskrypcją Premium dla tylu kolegów, przyjaciół lub rodziny ilu chcesz, wszystko w obrębie jednego konta.",
   "settings.team.manageAction" : "Zarządzaj zespołem na meetfranz.com",
@@ -324,12 +326,14 @@
   "settings.workspaces.noWorkspacesAdded" : "Nie dodałeś jeszcze żadnego obszaru roboczego.",
   "settings.workspaces.tryReloadWorkspaces" : "Spróbuj ponownie",
   "settings.workspaces.updatedInfo" : "Twoje zmiany zostały zapisane",
-   "settings.workspaces.workspaceFeatureHeadline" : "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Ferdi",
+   "settings.workspaces.workspaceFeatureHeadline" : "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Franz",
-   "settings.workspaces.workspaceFeatureInfo" : "Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.",
+   "settings.workspaces.workspaceFeatureInfo" : "Obszary robocze programu Franz pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.",
   "settings.workspaces.workspacesRequestFailed" : "Nie można załadować obszaru roboczego",
   "sidebar.addNewService" : "Dodaj kolejną usługę",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Zamknij edycję obszaru roboczego",
   "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Otwórz edycję obszaru roboczego",
   "sidebar.settings" : "Ustawienia",
   "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
@@ -338,26 +342,12 @@
   "signup.firstname.label" : "Imię",
   "signup.headline" : "Zarejestruj się",
   "signup.lastname.label" : "Nazwisko",
-   "signup.legal.info" : "Poprzez utworzenie konta Ferdi akceptujesz",
+   "signup.legal.info" : "Poprzez utworzenie konta Franz akceptujesz",
   "signup.legal.privacy" : "Polityka prywatności",
   "signup.legal.terms" : "Warunki świadczenia usług",
   "signup.link.login" : "Masz już konto, zalogować się?",
   "signup.password.label" : "Hasło",
   "signup.submit.label" : "Stwórz konto",
-   "subscription.euTaxInfo" : "Rezydenci UE: lokalne stawki VAT mogą zostać zaaplikowane",
-   "subscription.features.ads" : "Brak reklam, na zawsze!",
-   "subscription.features.comingSoon" : "wkrótce dostępne",
-   "subscription.features.noInterruptions" : "Bez opóźnień i przypominania o ulepszeniu licencji",
-   "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
-   "subscription.features.proxy" : "Obsługa proxy dla usług",
-   "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
-   "subscription.features.workspaces" : "Zarządzaj usługami w obszarach roboczych",
-   "subscription.includedFeatures" : "Płatne konto Ferdi Premium obejmuje",
-   "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
-   "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Ferdi",
-   "subscription.type.free" : "za darmo",
-   "subscription.type.month" : "miesiąc",
-   "subscription.type.year" : "rok",
   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
   "subscription.cta.allOptions" : "See all options",
   "subscription.cta.choosePlan" : "Choose your plan",
@@ -390,7 +380,7 @@
   "workspaceDrawer.premiumCtaButtonLabel" : "Stwórz pierwszy obszar roboczy",
   "workspaceDrawer.proFeatureBadge" : "Funkcje Premium",
   "workspaceDrawer.reactivatePremiumAccountLabel" : "Aktywuj ponownie konto premium",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. <\/p><p>Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.<\/p>",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Obszary robocze programu Franz pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. <\/p><p>Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.<\/p>",
   "workspaceDrawer.workspacesSettingsTooltip" : "Edytuj ustawienia obszaru roboczego",
   "workspaces.switchingIndicator.switchingTo" : "Przełącz do"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 478f1e0ff..11f32c067 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -4,21 +4,21 @@
   "feature.announcements.changelog.headline" : "Mudanças no Franz {version}",
   "feature.delayApp.headline" : "Por favor, adquira uma licença para pular o tempo de espera",
   "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.action" : "Sim, eu quero o período de testes gratuito de 14 dias do Franz Professional",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.actionShort" : "Ativar período de testes gratuito do Franz Professional",
   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
-   "feature.delayApp.upgrade.action" : "Adquira uma licença de suporte Ferdi",
+   "feature.delayApp.upgrade.action" : "Adquira uma licença de suporte Franz",
   "feature.delayApp.upgrade.actionShort" : "Atualizar conta",
-   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
+   "feature.serviceLimit.limitReached" : "Você adicionou {amount} serviços de um total de {limit} que estão inclusos no seu plano. Por favor, atualize sua conta para adicionar mais serviços.",
   "feature.shareFranz.action.email" : "Enviar por e-mail",
   "feature.shareFranz.action.facebook" : "Compartilhar no Facebook",
   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
-   "feature.shareFranz.headline" : "Ferdi é melhor em grupo!",
+   "feature.shareFranz.headline" : "Franz é melhor em grupo!",
   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Eu adicionei uma contagem de serviços para o Franz! Baixe gratuitamente o aplicativo para WhatsApp, Messenger, Slack, Skype e outros em www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quanto incrível o Franz é e nos ajude a espalhar a mensagem.  ",
-   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.info" : "As Listas de Tarefa do Franz estão disponíveis para usuários premium!",
-   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.rollout" : "As outras pessoas terão que esperar um pouquinho mais.",
   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
   "global.franzProRequired" : "Franz Professional Required",
@@ -27,7 +27,7 @@
   "global.spellchecking.autodetect" : "Detectar idioma automaticamente.",
   "global.spellchecking.autodetect.short" : "Automático",
   "global.spellchecking.language" : "Idioma para verificação ortográfica",
-   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "global.upgradeButton.upgradeToPro" : "Atualizar para o Franz Profissional",
   "import.headline" : "Importe seus serviços do Franz 4 ",
   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
   "import.skip.label" : "Quero adicionar serviços manualmente",
@@ -37,7 +37,7 @@
   "infobar.buttonReloadServices" : "Recarregar serviços",
   "infobar.requiredRequestsFailed" : "Não foi possível carregar os serviços e informações de usuário",
   "infobar.servicesUpdated" : "Seus serviços foram atualizados.",
-   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.trialActivated" : "O seu período de testes foi ativado com sucesso! Boas mensagens!",
   "infobar.updateAvailable" : "Uma nova atualização do Franz está disponível.",
   "invite.email.label" : "Endereço de E-mail",
   "invite.headline.friends" : "Convide 3 amigos ou colegas",
@@ -54,9 +54,9 @@
   "login.serverLogout" : "Sua sessão expirou, faça o login novamente.",
   "login.submit.label" : "Entrar",
   "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
-   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.closeTodosDrawer" : "Fechar a gaveta de Listas de Tarefa",
-   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Abrir a gaveta de Listas de Tarefa",
-   "menu.app.about" : "Sobre Ferdi",
+   "menu.app.about" : "Sobre Franz",
   "menu.app.announcement" : "Quais as novidades?",
   "menu.app.checkForUpdates" : "Verificar se há atualizações",
   "menu.app.hide" : "Ocultar",
@@ -81,9 +81,9 @@
   "menu.file" : "Arquivo",
   "menu.help" : "Ajuda",
   "menu.help.changelog" : "Registro de Alterações ",
-   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfo" : "Copiar Informações de Depuração",
-   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedBody" : "As Informações de Depuração foram copiadas para a área de transferência.",
-   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
+   "menu.help.debugInfoCopiedHeadline" : "Informações de Depuração do Franz",
   "menu.help.learnMore" : "Saiba Mais ",
   "menu.help.privacy" : "Declaração de Privacidade ",
   "menu.help.support" : "Suporte",
@@ -93,16 +93,17 @@
   "menu.services.addNewService" : "Adicionar Novo Serviço",
   "menu.services.setNextServiceActive" : "Pular para próximo serviço",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Visualizar ",
   "menu.view.enterFullScreen" : "Modo Tela Cheia",
   "menu.view.exitFullScreen" : "Sair da Tela Cheia",
-   "menu.view.reloadFranz" : "Recarregar Ferdi",
+   "menu.view.reloadFranz" : "Recarregar Franz",
   "menu.view.reloadService" : "Reiniciar o Serviço",
   "menu.view.resetZoom" : "Tamanho real",
   "menu.view.toggleDevTools" : "Ferramentas de Desenvolvedor",
   "menu.view.toggleFullScreen" : "Modo Tela Cheia",
   "menu.view.toggleServiceDevTools" : "Ferramentas de Serviços de Desenvolvedor",
-   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Ativar as Ferramentas de Desenvolvedor das Listas de Tarefas ",
   "menu.view.zoomIn" : "Ampliar",
   "menu.view.zoomOut" : "Reduzir",
   "menu.window" : "Modo Janela",
@@ -122,31 +123,31 @@
   "password.successInfo" : "Por favor, verifique o seu e-mail",
   "premiumFeature.button.upgradeAccount" : "Atualizar conta",
   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.appDelays" : "Sem Telas de Espera",
-   "pricing.features.customWebsites" : "Add Custom Websites",
+   "pricing.features.customWebsites" : "Adicionar Websites Personalizados",
   "pricing.features.onPremise" : "On-premise & other Hosted Services",
   "pricing.features.serviceProxies" : "Service Proxies",
   "pricing.features.spellchecker" : "Spellchecker support",
-   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.teamManagement" : "Gestão de Time",
   "pricing.features.thirdPartyServices" : "Install 3rd party services",
   "pricing.features.unlimitedServices" : "Add unlimited services",
-   "pricing.features.workspaces" : "Workspaces",
+   "pricing.features.workspaces" : "Áreas de Trabalho",
-   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.free" : "Franz Gratuito",
   "pricing.plan.legacy" : "Franz Premium",
-   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal" : "Franz Pessoal",
-   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-monthly" : "Franz Pessoal Mensal",
-   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.personal-yearly" : "Franz Pessoal Anual",
-   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro" : "Franz Profissional",
-   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-monthly" : "Franz Profissional Mensal",
-   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.plan.pro-yearly" : "Franz Profissional Anual",
-   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.accept" : "Sim, atualizar minha conta para o Franz Profissional",
-   "pricing.trial.cta.skip" : "Continue to Ferdi",
+   "pricing.trial.cta.skip" : "Continuar para o Franz",
-   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.error" : "Desculpe, não conseguimos ativar o seu período de testes",
-   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.features.headline" : "Incluso no Franz Profissional:",
-   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.headline" : "Franz Profissional",
-   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.subheadline" : "Sua oferta pessoal de boas-vindas:",
-   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.automaticTrialEnd" : "Seu período de testes encerra automaticamente em 14 dias",
-   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.headline" : "Sem vínculos",
   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Recarregar {name}",
   "service.crashHandler.autoReload" : "Tentando reestabelecer {name} automaticamente em {seconds} segundos",
@@ -191,25 +192,26 @@
   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Tente novamente",
   "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
-   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
+   "settings.account.upgradeToPro.label" : "Atualizar para o Franz Profissional",
   "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Limpar cache",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização",
   "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
-   "settings.app.cacheInfo" : "O cache do Ferdi está usando {size} de espaço em disco atualmente.",
+   "settings.app.cacheInfo" : "O cache do Franz está usando {size} de espaço em disco atualmente.",
   "settings.app.currentVersion" : "Versão atual:",
   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Abrir o Ferdi ao iniciar o sistema",
+   "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
   "settings.app.form.beta" : "Incluir versões beta",
   "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
   "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
   "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
   "settings.app.form.enableSystemTray" : "Exibir o Franz na barra de sistema",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Idioma",
-   "settings.app.form.minimizeToSystemTray" : "Minimizar o Ferdi para a área de sistema",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de sistema",
-   "settings.app.form.runInBackground" : "Manter o Ferdi no fundo quando fechar a janela",
+   "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
   "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
   "settings.app.headline" : "Configurações",
@@ -221,10 +223,10 @@
   "settings.app.languageDisclaimer" : "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
   "settings.app.restartRequired" : "As mudanças exigem reiniciar o sistema",
   "settings.app.subheadlineCache" : "memória cache",
-   "settings.app.translationHelp" : "Ajude-nos a traduzir o Ferdi para seu idioma.",
+   "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para seu idioma.",
   "settings.app.updateStatusAvailable" : "Atualização disponível, baixando...",
   "settings.app.updateStatusSearching" : "Buscando atualizações",
-   "settings.app.updateStatusUpToDate" : "Você está usando a última versão do Ferdi",
+   "settings.app.updateStatusUpToDate" : "Você está usando a última versão do Franz",
   "settings.invite.headline" : "Convidar Amigos",
   "settings.navigation.account" : "Conta",
   "settings.navigation.availableServices" : "Serviços disponíveis",
@@ -254,7 +256,7 @@
   "settings.service.form.addServiceHeadline" : "Adicionar {name}",
   "settings.service.form.availableServices" : "Serviços disponíveis",
   "settings.service.form.customUrl" : "Servidor personalizado",
-   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços auto-hospedados, você precisa de uma conta Apoiador Ferdi Premium.",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços auto-hospedados, você precisa de uma conta Apoiador Franz Premium.",
   "settings.service.form.customUrlUpgradeAccount" : "Atualize a sua conta",
   "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor personalizado {name}.",
   "settings.service.form.deleteButton" : "Apagar serviço",
@@ -280,7 +282,7 @@
   "settings.service.form.proxy.isEnabled" : "Usar o Proxy",
   "settings.service.form.proxy.password" : "Senha (opcional)",
   "settings.service.form.proxy.port" : "Porta",
-   "settings.service.form.proxy.restartInfo" : "Por favor, reinicie o Ferdi após alterar as configurações de proxy.",
+   "settings.service.form.proxy.restartInfo" : "Por favor, reinicie o Franz após alterar as configurações de proxy.",
   "settings.service.form.proxy.user" : "Usuário (opcional)",
   "settings.service.form.saveButton" : "Salvar serviço",
   "settings.service.form.tabHosted" : "Hospedado",
@@ -297,8 +299,8 @@
   "settings.services.tooltip.isMuted" : "Sem som",
   "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
   "settings.services.updatedInfo" : "Suas mudanças foram gravadas",
-   "settings.team.contentHeadline" : "Ferdi para Equipes",
+   "settings.team.contentHeadline" : "Franz para Equipes",
-   "settings.team.copy" : "\"Ferdi para Equipes\" possui a opção de convidar ajudantes para a sua equipe através de mensagens por e-mail e gerenciar as inscrições deles em suas preferências de conta. Não perca tempo configurando as inscrições para membro da equipe individualmente, esqueça as múltiplas faturas e tempos de pagamento. Uma regra universal para todos os membros da equipe.",
+   "settings.team.copy" : "\"Franz para Equipes\" possui a opção de convidar ajudantes para a sua equipe através de mensagens por e-mail e gerenciar as inscrições deles em suas preferências de conta. Não perca tempo configurando as inscrições para membro da equipe individualmente, esqueça as múltiplas faturas e tempos de pagamento. Uma regra universal para todos os membros da equipe.",
   "settings.team.headline" : "Equipe",
   "settings.team.intro" : "Você e sua equipe usam Franz? Você pode agora administrar as inscrições pagas de todos os seus colegas, amigos e membros da família que você quiser, tudo isso em uma única conta.",
   "settings.team.manageAction" : "Gerencie sua Equipe no meetfranz.com",
@@ -324,12 +326,14 @@
   "settings.workspaces.noWorkspacesAdded" : "Você não possui nenhuma área de trabalho adicionadas anteriormente.",
   "settings.workspaces.tryReloadWorkspaces" : "Tente de novo",
   "settings.workspaces.updatedInfo" : "Suas mudanças foram salvas",
-   "settings.workspaces.workspaceFeatureHeadline" : "Menos é Mais: Introduzindo Workspaces do Ferdi",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menos é Mais: Introduzindo Workspaces do Franz",
-   "settings.workspaces.workspaceFeatureInfo" : "As áreas de trabalho do Ferdi permite você focar no que realmente é importante agora. Configure diferentes conjuntos de serviços e alterne entre eles facilmente em qualquer momento. Você decide quais serviços você precisa e onde deseja colocá-los, então nós podemos te ajudar a aumentar a produtividade de suas tarefas. Ou facilmente deletar os aplicativos que você nunca irá precisar.",
+   "settings.workspaces.workspaceFeatureInfo" : "As áreas de trabalho do Franz permite você focar no que realmente é importante agora. Configure diferentes conjuntos de serviços e alterne entre eles facilmente em qualquer momento. Você decide quais serviços você precisa e onde deseja colocá-los, então nós podemos te ajudar a aumentar a produtividade de suas tarefas. Ou facilmente deletar os aplicativos que você nunca irá precisar.",
   "settings.workspaces.workspacesRequestFailed" : "Não foi possível carregar suas áreas de trabalho",
   "sidebar.addNewService" : "Adicionar novo serviço",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Fechar o menu da área de trabalho",
   "sidebar.muteApp" : "Desativar notificações e áudio",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Abrir menu da área de trabalho",
   "sidebar.settings" : "Ajustes",
   "sidebar.unmuteApp" : "Ativar notificações e áudio",
@@ -344,26 +348,12 @@
   "signup.link.login" : "Já tem uma conta?",
   "signup.password.label" : "Senha",
   "signup.submit.label" : "Criar uma conta",
-   "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
-   "subscription.features.ads" : "Sem anúncios, pra sempre!",
-   "subscription.features.comingSoon" : "em breve",
-   "subscription.features.noInterruptions" : "Sem demora e sem chateação para comprar uma licença. ",
-   "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
-   "subscription.features.proxy" : "Suporte de proxy para serviços",
-   "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
-   "subscription.features.workspaces" : "Organize seus serviços em áreas de trabalho",
-   "subscription.includedFeatures" : "A conta Apoiador Ferdi Premium inclui",
-   "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
-   "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Ferdi",
-   "subscription.type.free" : "grátis",
-   "subscription.type.month" : "mês",
-   "subscription.type.year" : "ano",
   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
   "subscription.cta.allOptions" : "See all options",
   "subscription.cta.choosePlan" : "Choose your plan",
   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
+   "subscription.teaser.intro" : "O Franz 5 vem com uma variedade de novas funcionalidades para melhorar a sua comunicação diária - pilhas inclusas. Confira os nossos novos planos e encontre aquele que melhor serve para você!",
   "subscriptionPopup.buttonCancel" : "Cancelar",
   "subscriptionPopup.buttonDone" : "Feito",
   "tabs.item.deleteService" : "Excluir serviço",
@@ -390,7 +380,7 @@
   "workspaceDrawer.premiumCtaButtonLabel" : "Crie sua primeira área de trabalho",
   "workspaceDrawer.proFeatureBadge" : "Vantagem paga oferecida aos assinantes",
   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reative sua conta paga",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>As áreas de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento. <\/p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.<\/p>",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>As áreas de trabalho do Franz te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento. <\/p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.<\/p>",
   "workspaceDrawer.workspacesSettingsTooltip" : "Editar configurações das áreas de trabalho",
   "workspaces.switchingIndicator.switchingTo" : "Mudando para"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 88ebb34ea..d76a07165 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Adicionar Novo Serviço...",
   "menu.services.setNextServiceActive" : "Activar o próximo serviço",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Ver",
   "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
   "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
   "settings.app.form.enableSystemTray" : "Mostrar o Franz na barra do sistema",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Idioma",
   "settings.app.form.minimizeToSystemTray" : "Minimizar o Ferdi para a barra do sistema",
   "settings.app.form.runInBackground" : "Manter o Ferdi em segundo plano ao fechar a janela",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Adicionar um novo serviço",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Fechar a janela do Espaço de trabalho",
   "sidebar.muteApp" : "Desativar notificações e áudio",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Abrir a janela do Espaço de trabalho",
   "sidebar.settings" : "Definições",
   "sidebar.unmuteApp" : "Ativar notificações e áudio",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index ec4450380..691cb80e5 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Добавить новый сервис...",
   "menu.services.setNextServiceActive" : "Активировать следующий сервис",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Вид",
   "menu.view.enterFullScreen" : "На весь экран",
   "menu.view.exitFullScreen" : "В окне",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
   "settings.app.form.enableSystemTray" : "Показывать Franz в системном трее",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Язык",
   "settings.app.form.minimizeToSystemTray" : "Сворачивать Ferdi в системный трей",
   "settings.app.form.runInBackground" : "Оставлять Ferdi в фоне при закрытии окна",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Добавить новый сервис",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Закрыть меню окружений",
   "sidebar.muteApp" : "Отключить уведомления и звук",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Открыть меню окружений",
   "sidebar.settings" : "Настройки",
   "sidebar.unmuteApp" : "Включить уведомления и звук",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 0c5b8e880..631613f73 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Pridať novú službu...",
   "menu.services.setNextServiceActive" : "Aktivujte ďalšiu službu",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Zobraziť",
   "menu.view.enterFullScreen" : "Na celú obrazovku",
   "menu.view.exitFullScreen" : "Ukončiť režim na celú obrazovku",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
   "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Jazyk",
   "settings.app.form.minimizeToSystemTray" : "Minimalizovať Ferdi do systémovej lišty",
   "settings.app.form.runInBackground" : "Po zatvorení okna ponechať Ferdi spustený na pozadí",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte. Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné.",
   "settings.workspaces.workspacesRequestFailed" : "Nebolo možné načítať vaše workspace",
   "sidebar.addNewService" : "Pridať novú službu",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Zavrieť workspace záložku",
   "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Otvoriť workspace záložku",
   "sidebar.settings" : "Nastavenia",
   "sidebar.unmuteApp" : "Povoliť oznámenia a zvuky",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index f739078e1..64be18c66 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Додај нову услугу",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Преглед",
   "menu.view.enterFullScreen" : "Отвори у целом екрану",
   "menu.view.exitFullScreen" : "Напусти цео екран",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Jezik",
   "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
   "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Онемогући обавештења и звукове",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Postavke",
   "sidebar.unmuteApp" : "Искључи обавештења и звукове",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 7af5d1ba2..f90c11e89 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Yeni servis ekle...",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Görünüm",
   "menu.view.enterFullScreen" : "Tam Ekrana Geç",
   "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
   "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Dil",
   "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
   "settings.app.form.runInBackground" : "Pencereyi kapatırken Ferdi'ı arka planda tut",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Yeni servis ekle",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Bildirimleri ve sesli uyarıları kapat",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ayarlar",
   "sidebar.unmuteApp" : "Bildirimleri ve sesli uyarıları etkinleştir",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 12e4b9375..8376a29a4 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "Додати сервіс",
   "menu.services.setNextServiceActive" : "Activate next service",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "Вигляд",
   "menu.view.enterFullScreen" : "Вікно на повний екран",
   "menu.view.exitFullScreen" : "Вийти з повного екрану",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
   "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "Мова",
   "settings.app.form.minimizeToSystemTray" : "Мінімізувати Ferdi до системного лотка",
   "settings.app.form.runInBackground" : "Тримати Ferdi в фоні при закритті вікна",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Додати новий сервіс",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Вимкнути сповіщення та звуки",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Налаштування",
   "sidebar.unmuteApp" : "Увімкнути сповіщення та звуки",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 7f1aff3fe..7acc63037 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -93,6 +93,7 @@
   "menu.services.addNewService" : "新增服務",
   "menu.services.setNextServiceActive" : "啟動下一個服務",
   "menu.todos" : "Todos",
+   "menu.todos.enableTodos" : "Enable Todos",
   "menu.view" : "檢視",
   "menu.view.enterFullScreen" : "進入全螢幕模式",
   "menu.view.exitFullScreen" : "離開全螢幕模式",
@@ -207,6 +208,7 @@
   "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
   "settings.app.form.enableSystemTray" : "在系統列顯示 Ferdi",
   "settings.app.form.enableTodos" : "Enable Franz Todos",
+   "settings.app.form.keepAllWorkspacesLoaded" : "Keep all workspaces loaded",
   "settings.app.form.language" : "語言",
   "settings.app.form.minimizeToSystemTray" : "最小化 Ferdi 到系統列",
   "settings.app.form.runInBackground" : "當關閉視窗時，保持 Ferdi 在背景運作",
@@ -328,8 +330,10 @@
   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "新增新的服務",
+   "sidebar.closeTodosDrawer" : "Close Franz Todos",
   "sidebar.closeWorkspaceDrawer" : "關閉工作空間",
   "sidebar.muteApp" : "關閉通知和通知音效",
+   "sidebar.openTodosDrawer" : "Open Franz Todos",
   "sidebar.openWorkspaceDrawer" : "打開工作空間",
   "sidebar.settings" : "設定",
   "sidebar.unmuteApp" : "開啟通知和通知音效",
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index d67adc96e..837dc54bc 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Settings",
    "file": "src/components/layout/Sidebar.js",
    "start": {
-      "line": 13,
+      "line": 15,
      "column": 12
    },
    "end": {
-      "line": 16,
+      "line": 18,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!Add new service",
    "file": "src/components/layout/Sidebar.js",
    "start": {
-      "line": 17,
+      "line": 19,
      "column": 17
    },
    "end": {
-      "line": 20,
+      "line": 22,
      "column": 3
    }
  },
@@ -30,11 +30,11 @@
    "defaultMessage": "!!!Disable notifications & audio",
    "file": "src/components/layout/Sidebar.js",
    "start": {
-      "line": 21,
+      "line": 23,
      "column": 8
    },
    "end": {
-      "line": 24,
+      "line": 26,
      "column": 3
    }
  },
@@ -43,11 +43,11 @@
    "defaultMessage": "!!!Enable notifications & audio",
    "file": "src/components/layout/Sidebar.js",
    "start": {
-      "line": 25,
+      "line": 27,
      "column": 10
    },
    "end": {
-      "line": 28,
+      "line": 30,
      "column": 3
    }
  },
@@ -56,11 +56,11 @@
    "defaultMessage": "!!!Open workspace drawer",
    "file": "src/components/layout/Sidebar.js",
    "start": {
-      "line": 29,
+      "line": 31,
      "column": 23
    },
    "end": {
-      "line": 32,
+      "line": 34,
      "column": 3
    }
  },
@@ -69,11 +69,37 @@
    "defaultMessage": "!!!Close workspace drawer",
    "file": "src/components/layout/Sidebar.js",
    "start": {
-      "line": 33,
+      "line": 35,
      "column": 24
    },
    "end": {
-      "line": 36,
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.openTodosDrawer",
+    "defaultMessage": "!!!Open Franz Todos",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 39,
+      "column": 19
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.closeTodosDrawer",
+    "defaultMessage": "!!!Close Franz Todos",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 43,
+      "column": 20
+    },
+    "end": {
+      "line": 46,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index d50389066..d0a243ec0 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 Ferdi on start",
+    "defaultMessage": "!!!Launch Franz on start",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 26,
@@ -27,7 +27,7 @@
  },
  {
    "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
+    "defaultMessage": "!!!Keep Franz in background when closing the window",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 34,
@@ -40,7 +40,7 @@
  },
  {
    "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Show Ferdi in system tray",
+    "defaultMessage": "!!!Show Franz in system tray",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 38,
@@ -53,7 +53,7 @@
  },
  {
    "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Ferdi to system tray",
+    "defaultMessage": "!!!Minimize Franz to system tray",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 42,
@@ -65,12 +65,12 @@
    }
  },
  {
-    "id": "settings.app.form.privateNotifications",
+    "id": "settings.app.form.language",
-    "defaultMessage": "!!!Don't show message content in notifications",
+    "defaultMessage": "!!!Language",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 46,
-      "column": 24
+      "column": 12
    },
    "end": {
      "line": 49,
@@ -78,12 +78,12 @@
    }
  },
  {
-    "id": "settings.app.form.server",
+    "id": "settings.app.form.darkMode",
-    "defaultMessage": "!!!Server",
+    "defaultMessage": "!!!Dark Mode",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 50,
-      "column": 10
+      "column": 12
    },
    "end": {
      "line": 53,
@@ -91,12 +91,12 @@
    }
  },
  {
-    "id": "settings.app.form.todoServer",
+    "id": "settings.app.form.showDisabledServices",
-    "defaultMessage": "!!!Todo Server",
+    "defaultMessage": "!!!Display disabled services tabs",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 54,
-      "column": 14
+      "column": 24
    },
    "end": {
      "line": 57,
@@ -104,12 +104,12 @@
    }
  },
  {
-    "id": "settings.app.form.language",
+    "id": "settings.app.form.showMessagesBadgesWhenMuted",
-    "defaultMessage": "!!!Language",
+    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 58,
-      "column": 12
+      "column": 29
    },
    "end": {
      "line": 61,
@@ -117,12 +117,12 @@
    }
  },
  {
-    "id": "settings.app.form.darkMode",
+    "id": "settings.app.form.enableSpellchecking",
-    "defaultMessage": "!!!Dark Mode",
+    "defaultMessage": "!!!Enable spell checking",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 62,
-      "column": 12
+      "column": 23
    },
    "end": {
      "line": 65,
@@ -130,12 +130,12 @@
    }
  },
  {
-    "id": "settings.app.form.showDisabledServices",
+    "id": "settings.app.form.enableGPUAcceleration",
-    "defaultMessage": "!!!Display disabled services tabs",
+    "defaultMessage": "!!!Enable GPU Acceleration",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 66,
-      "column": 24
+      "column": 25
    },
    "end": {
      "line": 69,
@@ -143,12 +143,12 @@
    }
  },
  {
-    "id": "settings.app.form.showMessagesBadgesWhenMuted",
+    "id": "settings.app.form.beta",
-    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+    "defaultMessage": "!!!Include beta versions",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 70,
-      "column": 29
+      "column": 8
    },
    "end": {
      "line": 73,
@@ -156,12 +156,12 @@
    }
  },
  {
-    "id": "settings.app.form.enableSpellchecking",
+    "id": "settings.app.form.enableTodos",
-    "defaultMessage": "!!!Enable spell checking",
+    "defaultMessage": "!!!Enable Franz Todos",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 74,
-      "column": 23
+      "column": 15
    },
    "end": {
      "line": 77,
@@ -169,42 +169,16 @@
    }
  },
  {
-    "id": "settings.app.form.enableGPUAcceleration",
+    "id": "settings.app.form.keepAllWorkspacesLoaded",
-    "defaultMessage": "!!!Enable GPU Acceleration",
+    "defaultMessage": "!!!Keep all workspaces loaded",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
      "line": 78,
-      "column": 25
+      "column": 27
    },
    "end": {
      "line": 81,
      "column": 3
    }
-  },
-  {
-    "id": "settings.app.form.beta",
-    "defaultMessage": "!!!Include beta versions",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 82,
-      "column": 8
-    },
-    "end": {
-      "line": 85,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableTodos",
-    "defaultMessage": "!!!Enable Franz Todos",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 86,
-      "column": 15
-    },
-    "end": {
-      "line": 89,
-      "column": 3
-    }
  }
 ]
 \ No newline at end of file
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
index 664e8613b..7f230e82a 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": 20,
+      "line": 15,
      "column": 15
    },
    "end": {
-      "line": 23,
+      "line": 18,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!Upgrade Account",
    "file": "src/features/todos/components/TodosWebview.js",
    "start": {
-      "line": 24,
+      "line": 19,
      "column": 14
    },
    "end": {
-      "line": 27,
+      "line": 22,
      "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": 28,
+      "line": 23,
      "column": 15
    },
    "end": {
-      "line": 31,
+      "line": 26,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index aa4973216..26850c5b3 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -313,7 +313,7 @@
  },
  {
    "id": "menu.view.reloadFranz",
-    "defaultMessage": "!!!Reload Ferdi",
+    "defaultMessage": "!!!Reload Franz",
    "file": "src/lib/Menu.js",
    "start": {
      "line": 113,
@@ -404,7 +404,7 @@
  },
  {
    "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Ferdi Debug Information",
+    "defaultMessage": "!!!Franz Debug Information",
    "file": "src/lib/Menu.js",
    "start": {
      "line": 141,
@@ -521,7 +521,7 @@
  },
  {
    "id": "menu.app.about",
-    "defaultMessage": "!!!About Ferdi",
+    "defaultMessage": "!!!About Franz",
    "file": "src/lib/Menu.js",
    "start": {
      "line": 177,
@@ -791,5 +791,18 @@
      "line": 260,
      "column": 3
    }
+  },
+  {
+    "id": "menu.todos.enableTodos",
+    "defaultMessage": "!!!Enable Todos",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 261,
+      "column": 15
+    },
+    "end": {
+      "line": 264,
+      "column": 3
+    }
  }
 ]
 \ No newline at end of file
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e36b03977..7af1b36cb 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -7,7 +7,6 @@ import { workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
 import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
-import TodoStore from '../features/todos/store';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
@@ -258,6 +257,10 @@ const menuItems = defineMessages({
    id: 'menu.Todoss.closeTodosDrawer',
    defaultMessage: '!!!Close Todos drawer',
  },
+  enableTodos: {
+    id: 'menu.todos.enableTodos',
+    defaultMessage: '!!!Enable Todos',
+  },
 });
 function getActiveWebview() {
@@ -922,25 +925,33 @@ export default class FranzMenu {
  }
  todosMenu() {
-    const { isTodosPanelVisible } = TodoStore;
+    const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos;
-    const { intl } = window.ferdi;
+    const { intl } = window.franz;
    const menu = [];
-    // Open todos drawer:
+    const drawerLabel = isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer;
-    const drawerLabel = (
-      isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer
-    );
    menu.push({
      label: intl.formatMessage(drawerLabel),
      accelerator: `${cmdKey}+T`,
      click: () => {
        todoActions.toggleTodosPanel();
      },
-      enabled: this.stores.user.isLoggedIn,
+      enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
    }, {
      type: 'separator',
    });
+    if (!isFeatureEnabledByUser) {
+      menu.push({
+        label: intl.formatMessage(menuItems.enableTodos),
+        click: () => {
+          todoActions.toggleTodosFeatureVisibility();
+          gaEvent(GA_CATEGORY_TODOS, 'enable', 'menu');
+        },
+      });
+    }
    return menu;
  }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index c02f08201..374daf333 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -121,9 +121,10 @@ export default class ServicesStore extends Store {
  // This is just used to avoid unnecessary rerendering of resource-heavy webviews
  @computed get allDisplayedUnordered() {
    const { showDisabledServices } = this.stores.settings.all.app;
+    const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings;
    const services = this.allServicesRequest.execute().result || [];
    const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
-    return workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+    return keepAllWorkspacesLoaded ? filteredServices : workspaceStore.filterServicesByActiveWorkspace(filteredServices);
  }
  @computed get filtered() {
author	vantezzen <properly@protonmail.com>	2019-09-13 18:00:03 +0200
committer	vantezzen <properly@protonmail.com>	2019-09-13 18:00:03 +0200
commit	ee67ec1e9486dfaf09b01db44eb401c8b6cd2277 (patch)
tree	a2c8b353313cb363a56722687e110c6f80f4b791
parent	Use ferdi namespace on debugger (diff)
parent	Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-ma... (diff)
download	ferdium-app-ee67ec1e9486dfaf09b01db44eb401c8b6cd2277.tar.gz ferdium-app-ee67ec1e9486dfaf09b01db44eb401c8b6cd2277.tar.zst ferdium-app-ee67ec1e9486dfaf09b01db44eb401c8b6cd2277.zip