fix merge conflicts with latest develop

84 files changed, 9331 insertions, 842 deletions

diff --git a/.babelrc b/.babelrc
index 299d5b4a0..6277978b9 100644
--- a/.babelrc
+++ b/.babelrc
@@ -25,7 +25,12 @@
       }
     ],
     "@babel/proposal-throw-expressions",
-    "@babel/syntax-dynamic-import"
+    "@babel/syntax-dynamic-import",
+    ["react-intl", {
+      "messagesDir": "./src/i18n/messages/",
+      "enforceDescriptions": false,
+      "extractSourceLocation": true
+    }]
   ],
   "sourceMaps": "inline"
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index 245057c46..d38c475bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ node_modules
 flow-typed
 out
 .DS_Store
+.idea
 build
 .tmp
 .stage
diff --git a/appveyor.yml b/appveyor.yml
index 7240dd9db..70b8d6f1f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,7 @@ environment:
 version: 5.0.0.{build}
 
 install:
-  - ps: $version = Get-Content .\.nvmrc -Raw
-  - ps: Install-Product node $version
+  - ps: Install-Product node 10
   - npx lerna bootstrap
 
 cache:
diff --git a/package-lock.json b/package-lock.json
index d7c209cc6..1f1ac3c00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3139,6 +3139,17 @@
         }
       }
     },
+    "babel-plugin-react-intl": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-3.0.1.tgz",
+      "integrity": "sha512-FqnEO+Tq7kJVUPKsSG3s5jaHi3pAC4RUR11IrscvjsfkOApLP2DtzNo6dtQ+tX+OzEzJx7cUms8aCw5BFyW5xg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.0.0",
+        "intl-messageformat-parser": "^1.2.0",
+        "mkdirp": "^0.5.1"
+      }
+    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -6125,9 +6136,9 @@
       "dev": true
     },
     "electron": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.4.tgz",
-      "integrity": "sha512-zG5VtLrmPfmw1fXY/3BEtRZk7OZ7djQhweZ6rW+R5NeF6s8RTz/AwTGtLoBo4z8wmJ5QTy0Y941FZw4pe5YlpA==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.7.tgz",
+      "integrity": "sha512-KYQ9SJZFWNKqoq6XjKW1bLFHjmAGeSC3XNuhHK/Sd2MK5H5sO3iKjvZU/YhiBUtkB/cBSkOdQTVEaLcMwU8l3A==",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",
@@ -6136,9 +6147,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "10.12.26",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.26.tgz",
-          "integrity": "sha512-nMRqS+mL1TOnIJrL6LKJcNZPB8V3eTfRo9FQA2b5gDvrHurC8XbSA86KNe0dShlEL7ReWJv/OU9NL7Z0dnqWTg==",
+          "version": "10.12.29",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz",
+          "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==",
           "dev": true
         }
       }
@@ -6239,12 +6250,6 @@
             "jsonfile": "^4.0.0",
             "universalify": "^0.1.0"
           }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
         }
       }
     },
@@ -11242,6 +11247,15 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -11277,6 +11291,12 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -11442,11 +11462,6 @@
       "integrity": "sha1-P55JkK3K0MaGwOcB92RYaPdfkes=",
       "dev": true
     },
-    "keymaster": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/keymaster/-/keymaster-1.6.2.tgz",
-      "integrity": "sha1-4a5U0OqUiPn2C2a2aPAumhlGxus="
-    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -14981,6 +14996,18 @@
         }
       }
     },
+    "react-intl-translations-manager": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz",
+      "integrity": "sha512-EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.2",
+        "glob": "^7.1.2",
+        "json-stable-stringify": "^1.0.1",
+        "mkdirp": "^0.5.1"
+      }
+    },
     "react-is": {
       "version": "16.8.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz",
diff --git a/package.json b/package.json
index b0ede2e7e..14e0df7ca 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "start:live": "cross-env LIVE_API=1 npm start",
     "dev": "cross-env NODE_ENV=development gulp dev",
     "lint": "eslint src",
+    "manage-translations": "node ./src/i18n/manage-translations.js",
     "sign": "gulp sign",
     "prebuild": "gulp build",
     "build": "npx electron-builder --publish onTag",
@@ -52,7 +53,6 @@
     "fs-extra": "7.0.1",
     "hex-to-rgba": "1.0.2",
     "jsonwebtoken": "^7.4.1",
-    "keymaster": "^1.6.2",
     "lodash": "^4.17.4",
     "mdi": "^1.9.33",
     "mime-types": "2.1.21",
@@ -108,11 +108,12 @@
     "@types/uuid": "3.4.4",
     "babel-eslint": "10.0.1",
     "babel-loader": "^8.0.4",
+    "babel-plugin-react-intl": "3.0.1",
     "conventional-changelog-cli": "2.0.11",
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "2.1.0",
     "dotenv": "^4.0.0",
-    "electron": "4.0.4",
+    "electron": "4.0.7",
     "electron-builder": "20.38.4",
     "electron-rebuild": "1.8.4",
     "eslint": "5.10.0",
@@ -137,6 +138,7 @@
     "mocha": "5.2.0",
     "node-sass": "4.11.0",
     "prettier": "1.15.2",
+    "react-intl-translations-manager": "5.0.3",
     "terser-webpack-plugin": "1.2.1",
     "ts-loader": "5.3.2",
     "tslint": "5.12.0",
@@ -157,7 +159,7 @@
   ],
   "husky": {
     "hooks": {
-      "pre-push": "npm run lint && npm run reformat-files"
+      "pre-push": "npm run lint && npm run reformat-files && npm run manage-translations"
     }
   }
 }
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index f2d3ca8c0..181b95c8c 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -44,10 +44,6 @@ const messages = defineMessages({
     id: 'settings.account.accountType.premium',
     defaultMessage: '!!!Premium Supporter Account',
   },
-  accountTypeEnterprise: {
-    id: 'settings.account.accountType.enterprise',
-    defaultMessage: '!!!Enterprise Account',
-  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 90da8ddc3..7a818d100 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -35,31 +35,29 @@ const messages = defineMessages({
     id: 'subscription.includedFeatures',
     defaultMessage: '!!!The Franz Premium Supporter Account includes',
   },
-  features: {
-    onpremise: {
-      id: 'subscription.features.onpremise.mattermost',
-      defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
-    },
-    noInterruptions: {
-      id: 'subscription.features.noInterruptions',
-      defaultMessage: '!!!No app delays & nagging to upgrade license',
-    },
-    proxy: {
-      id: 'subscription.features.proxy',
-      defaultMessage: '!!!Proxy support for services',
-    },
-    spellchecker: {
-      id: 'subscription.features.spellchecker',
-      defaultMessage: '!!!Support for Spellchecker',
-    },
-    ads: {
-      id: 'subscription.features.ads',
-      defaultMessage: '!!!No ads, ever!',
-    },
-    comingSoon: {
-      id: 'subscription.features.comingSoon',
-      defaultMessage: '!!!coming soon',
-    },
+  onpremise: {
+    id: 'subscription.features.onpremise.mattermost',
+    defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
+  },
+  noInterruptions: {
+    id: 'subscription.features.noInterruptions',
+    defaultMessage: '!!!No app delays & nagging to upgrade license',
+  },
+  proxy: {
+    id: 'subscription.features.proxy',
+    defaultMessage: '!!!Proxy support for services',
+  },
+  spellchecker: {
+    id: 'subscription.features.spellchecker',
+    defaultMessage: '!!!Support for Spellchecker',
+  },
+  ads: {
+    id: 'subscription.features.ads',
+    defaultMessage: '!!!No ads, ever!',
+  },
+  comingSoon: {
+    id: 'subscription.features.comingSoon',
+    defaultMessage: '!!!coming soon',
   },
   euTaxInfo: {
     id: 'subscription.euTaxInfo',
@@ -85,7 +83,7 @@ export default @observer class SubscriptionForm extends Component {
     showSkipOption: false,
     skipAction: () => null,
     skipButtonLabel: '',
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -162,18 +160,18 @@ export default @observer class SubscriptionForm extends Component {
             </p>
             <div className="subscription">
               <ul className="subscription__premium-features">
-                <li>{intl.formatMessage(messages.features.onpremise)}</li>
+                <li>{intl.formatMessage(messages.onpremise)}</li>
                 <li>
-                  {intl.formatMessage(messages.features.noInterruptions)}
+                  {intl.formatMessage(messages.noInterruptions)}
                 </li>
                 <li>
-                  {intl.formatMessage(messages.features.spellchecker)}
+                  {intl.formatMessage(messages.spellchecker)}
                 </li>
                 <li>
-                  {intl.formatMessage(messages.features.proxy)}
+                  {intl.formatMessage(messages.proxy)}
                 </li>
                 <li>
-                  {intl.formatMessage(messages.features.ads)}
+                  {intl.formatMessage(messages.ads)}
                 </li>
               </ul>
             </div>
diff --git a/src/config.js b/src/config.js
index 30a5a5cc0..d619a7492 100644
--- a/src/config.js
+++ b/src/config.js
@@ -64,3 +64,9 @@ export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
 // Replacing app.asar is not beautiful but unforunately necessary
 export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries'));
+
+export const ALLOWED_PROTOCOLS = [
+  'https:',
+  'http:',
+  'ftp:',
+];
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index bade928a0..81f689400 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -23,23 +23,21 @@ const messages = defineMessages({
     id: 'settings.user.form.email',
     defaultMessage: '!!!Email',
   },
-  accountType: {
-    label: {
-      id: 'settings.user.form.accountType.label',
-      defaultMessage: '!!!Account type',
-    },
-    individual: {
-      id: 'settings.user.form.accountType.individual',
-      defaultMessage: '!!!Individual',
-    },
-    nonProfit: {
-      id: 'settings.user.form.accountType.non-profit',
-      defaultMessage: '!!!Non-Profit',
-    },
-    company: {
-      id: 'settings.user.form.accountType.company',
-      defaultMessage: '!!!Company',
-    },
+  accountTypeLabel: {
+    id: 'settings.user.form.accountType.label',
+    defaultMessage: '!!!Account type',
+  },
+  accountTypeIndividual: {
+    id: 'settings.user.form.accountType.individual',
+    defaultMessage: '!!!Individual',
+  },
+  accountTypeNonProfit: {
+    id: 'settings.user.form.accountType.non-profit',
+    defaultMessage: '!!!Non-Profit',
+  },
+  accountTypeCompany: {
+    id: 'settings.user.form.accountType.company',
+    defaultMessage: '!!!Company',
   },
   currentPassword: {
     id: 'settings.user.form.currentPassword',
@@ -94,21 +92,21 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
         accountType: {
           value: user.accountType,
           validators: [required],
-          label: intl.formatMessage(messages.accountType.label),
+          label: intl.formatMessage(messages.accountTypeLabel),
           options: [{
             value: 'individual',
-            label: intl.formatMessage(messages.accountType.individual),
+            label: intl.formatMessage(messages.accountTypeIndividual),
           }, {
             value: 'non-profit',
-            label: intl.formatMessage(messages.accountType.nonProfit),
+            label: intl.formatMessage(messages.accountTypeNonProfit),
           }, {
             value: 'company',
-            label: intl.formatMessage(messages.accountType.company),
+            label: intl.formatMessage(messages.accountTypeCompany),
           }],
         },
         organization: {
-          label: intl.formatMessage(messages.accountType.company),
-          placeholder: intl.formatMessage(messages.accountType.company),
+          label: intl.formatMessage(messages.accountTypeCompany),
+          placeholder: intl.formatMessage(messages.accountTypeCompany),
           value: user.organization,
         },
         oldPassword: {
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 83dd83712..74b718734 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -4,7 +4,7 @@ import { autoUpdater } from 'electron-updater';
 const debug = require('debug')('Franz:ipcApi:autoUpdate');
 
 export default (params) => {
-  if (process.platform === 'darwin' || process.platform === 'win32') {
+  if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
     ipcMain.on('autoUpdate', (event, args) => {
       try {
         autoUpdater.autoInstallOnAppQuit = false;
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index d463664df..ef43a54fa 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -20,29 +20,25 @@ const messages = defineMessages({
     id: 'feature.shareFranz.text',
     defaultMessage: '!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.',
   },
-  actions: {
-    email: {
-      id: 'feature.shareFranz.action.email',
-      defaultMessage: '!!!Share as email',
-    },
-    facebook: {
-      id: 'feature.shareFranz.action.facebook',
-      defaultMessage: '!!!Share on Facebook',
-    },
-    twitter: {
-      id: 'feature.shareFranz.action.twitter',
-      defaultMessage: '!!!Share on Twitter',
-    },
+  actionsEmail: {
+    id: 'feature.shareFranz.action.email',
+    defaultMessage: '!!!Share as email',
   },
-  shareText: {
-    email: {
-      id: 'feature.shareFranz.shareText.email',
-      defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
-    },
-    twitter: {
-      id: 'feature.shareFranz.shareText.twitter',
-      defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz',
-    },
+  actionsFacebook: {
+    id: 'feature.shareFranz.action.facebook',
+    defaultMessage: '!!!Share on Facebook',
+  },
+  actionsTwitter: {
+    id: 'feature.shareFranz.action.twitter',
+    defaultMessage: '!!!Share on Twitter',
+  },
+  shareTextEmail: {
+    id: 'feature.shareFranz.shareText.email',
+    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
+  },
+  shareTextTwitter: {
+    id: 'feature.shareFranz.shareText.twitter',
+    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz',
   },
 });
 
@@ -90,7 +86,7 @@ const styles = theme => ({
 export default @injectSheet(styles) @inject('stores') @observer class ShareFranzModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -128,17 +124,17 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
         <p>{intl.formatMessage(messages.text)}</p>
         <div className={classes.actions}>
           <Button
-            label={intl.formatMessage(messages.actions.email)}
+            label={intl.formatMessage(messages.actionsEmail)}
             className={classes.cta}
             icon="mdiEmail"
-            href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareText.email, { count: serviceCount })}}`}
+            href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`}
             target="_blank"
             onClick={() => {
               gaEvent('Share Franz', 'share', 'Share via email');
             }}
           />
           <Button
-            label={intl.formatMessage(messages.actions.facebook)}
+            label={intl.formatMessage(messages.actionsFacebook)}
             className={classes.cta}
             icon="mdiFacebookBox"
             href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button"
@@ -148,10 +144,10 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             }}
           />
           <Button
-            label={intl.formatMessage(messages.actions.twitter)}
+            label={intl.formatMessage(messages.actionsTwitter)}
             className={classes.cta}
             icon="mdiTwitter"
-            href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareText.twitter, { count: serviceCount })}`}
+            href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`}
             target="_blank"
             onClick={() => {
               gaEvent('Share Franz', 'share', 'Share via Twitter');
diff --git a/src/helpers/url-helpers.js b/src/helpers/url-helpers.js
new file mode 100644
index 000000000..750d1f00c
--- /dev/null
+++ b/src/helpers/url-helpers.js
@@ -0,0 +1,15 @@
+import { URL } from 'url';
+
+import { ALLOWED_PROTOCOLS } from '../config';
+
+const debug = require('debug')('Franz:Helpers:url');
+
+export function isValidExternalURL(url) {
+  const parsedUrl = new URL(url);
+
+  const isAllowed = ALLOWED_PROTOCOLS.includes(parsedUrl.protocol);
+
+  debug('protocol check is', isAllowed, 'for:', url);
+
+  return isAllowed;
+}
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 7b1618602..1b5ece223 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -1,10 +1,6 @@
 import { defineMessages } from 'react-intl';
 
 export default defineMessages({
-  upgradeAccount: {
-    id: 'global.premium.upgradeAccount',
-    defaultMessage: '!!!Please upgrade your account to add a new service.',
-  },
   APIUnhealthy: {
     id: 'global.api.unhealthy',
     defaultMessage: '!!!Can\'t connect to Franz Online Services',
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index aa3f2316a..9ddcc3519 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -35,7 +35,8 @@ export const SPELLCHECKER_LOCALES = {
   'da-dk': 'Dansk',
   'de-de': 'Deutsch',
   'el-gr': 'ελληνικά (Greek)',
-  'en-us': 'English',
+  'en-gb': 'English (GB)',
+  'en-us': 'English (US)',
   'es-es': 'Español',
   'et-ee': 'Estonian',
   'fa-ir': 'فارسی (Persian)',
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index ed6f7bacd..f374fddd9 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Recarrega",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Quelcom ha anat malament",
    "feature.delayApp.action" : "Aconsegueix una llicència de suport per a Franz",
    "feature.delayApp.headline" : "Si us plau, compra una llicència de suport per a Franz per saltar l'espera",
    "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
    "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
+   "global.spellchecker.useDefault" : "Utilitzar el predeterminat del sistema ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Corrector ortogràfic",
    "import.headline" : "Importa els teus serveis Franz 4",
    "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
    "import.skip.label" : "Vull afegir serveis manualment",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Edita {name}",
    "service.errorHandler.headline" : "Oh no!",
    "service.errorHandler.message" : "Error",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} ha fallat al carregar",
    "services.getStarted" : "Introducció",
    "services.welcome" : "Benvingut a Franz",
    "settings.account.account.editButton" : "Editar Compte",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
    "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
    "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Ajustaments Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Host Proxy \/ IP",
    "settings.service.form.proxy.info" : "Els ajustaments del Proxy no es sincronitzaran amb els servidors de Franz",
    "settings.service.form.proxy.isEnabled" : "Utilitzar Proxy",
    "settings.service.form.proxy.password" : "Contrasenya (opcional)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.restartInfo" : "Siusplau, reinicieu el Franz després de canviar els ajustaments de proxy",
    "settings.service.form.proxy.user" : "Usuari (opcional)",
    "settings.service.form.saveButton" : "Desa el servei",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Idioma del corrector",
+   "settings.service.form.spellcheckerLanguage.default" : "Utilitzar el predeterminat del sistema ({default})",
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ⭐️",
    "settings.service.form.team" : "Equip",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index b8bfd2526..3fc6318a2 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Obnovit",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Něco se pokazilo",
+   "feature.delayApp.action" : "Podpoř Franz a získej Supporter licenci",
+   "feature.delayApp.headline" : "Kup si Franz Supporter licenci a nebudeš už muset čekat",
+   "feature.delayApp.text" : "Franz bude pokračovat v {seconds} sekundách.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nemůžeme připojit Franz k online službám",
    "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Oprava překlepů jazyka",
    "import.headline" : "Importovat služby z Franz 4",
    "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Franz 5",
    "import.skip.label" : "Chci přidat službu ručně",
@@ -81,7 +92,7 @@
    "password.noUser" : "Pro emailovou adresu nebyl nalezený žádný uživatel",
    "password.submit.label" : "Odeslat",
    "password.successInfo" : "Prosím, zkontrolujte svůj e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Vylepši si svůj účet",
    "pricing.headline" : "Podpořit Franz",
    "pricing.link.skipPayment" : "Nechci podporovat vývoj aplikace Franz.",
    "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Upravit {name}",
    "service.errorHandler.headline" : "Ale ne!",
    "service.errorHandler.message" : "Chyba",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} se nepodařilo načíst.",
    "services.getStarted" : "Začněme",
    "services.welcome" : "Vítejte v programu Franz",
    "settings.account.account.editButton" : "Upravit účet",
@@ -127,7 +138,7 @@
    "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
    "settings.app.form.beta" : "Zahrnout beta verze",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Připoj se k Temné straně",
    "settings.app.form.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
    "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu nabídce",
    "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
@@ -138,7 +149,7 @@
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
    "settings.app.form.showDisabledServices" : "Zobrazit záložky vypnutých služeb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Oprava překlepů jazyka",
    "settings.app.headline" : "Nastavení",
    "settings.app.headlineAdvanced" : "Pokročilé",
    "settings.app.headlineAppearance" : "Vzhled",
@@ -179,7 +190,7 @@
    "settings.service.form.editServiceHeadline" : "Upravit {name}",
    "settings.service.form.enableAudio" : "Zapnout zvuk",
    "settings.service.form.enableBadge" : "Ukázat odznaky nepřečtených zpráv",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Povolit Tmavý vzhled",
    "settings.service.form.enableNotification" : "Povolit upozornění",
    "settings.service.form.enableService" : "Povolit službu",
    "settings.service.form.headlineBadges" : "Odznaky nepřečtených zpráv",
@@ -192,7 +203,7 @@
    "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
    "settings.service.form.isMutedInfo" : "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
    "settings.service.form.name" : "Jméno",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Nastavení HTTP\/HTTPS Proxy",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 0c1fb8aa6..3ca62ca56 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,11 +1,22 @@
 {
-   "app.errorHandler.action" : "Neuladen",
+   "app.errorHandler.action" : "Neu laden",
    "app.errorHandler.headline" : "Es trat ein Fehler auf",
    "feature.delayApp.action" : "Upgrade deinen Account",
    "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
    "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
+   "global.spellchecker.useDefault" : "Standard benutzen ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Sprache für Rechtschreibprüfung",
    "import.headline" : "Deine Franz 4 Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
    "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
new file mode 100644
index 000000000..c8bb03ded
--- /dev/null
+++ b/src/i18n/locales/defaultMessages.json
@@ -0,0 +1,4118 @@
+[
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Import your Franz 4 services",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.headline",
+        "start": {
+          "column": 12,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Services not yet supported in Franz 5",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.notSupportedHeadline",
+        "start": {
+          "column": 24,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Import {count} services",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.submit.label",
+        "start": {
+          "column": 21,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!I want to add services manually",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.skip.label",
+        "start": {
+          "column": 19,
+          "line": 25
+        }
+      }
+    ],
+    "path": "src/components/auth/Import.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Invite Friends",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "settings.invite.headline",
+        "start": {
+          "column": 20,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.headline.friends",
+        "start": {
+          "column": 12,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.name.label",
+        "start": {
+          "column": 13,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.email.label",
+        "start": {
+          "column": 14,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Send invites",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.submit.label",
+        "start": {
+          "column": 21,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!I want to do this later",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.skip.label",
+        "start": {
+          "column": 19,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Invitations sent successfully",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.successInfo",
+        "start": {
+          "column": 21,
+          "line": 40
+        }
+      }
+    ],
+    "path": "src/components/auth/Invite.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Sign in",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.headline",
+        "start": {
+          "column": 12,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.email.label",
+        "start": {
+          "column": 14,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Password",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.password.label",
+        "start": {
+          "column": 17,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Sign in",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.submit.label",
+        "start": {
+          "column": 21,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Email or password not valid",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.invalidCredentials",
+        "start": {
+          "column": 22,
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!Your session expired, please login again.",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.tokenExpired",
+        "start": {
+          "column": 16,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Your session expired, please login again.",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.serverLogout",
+        "start": {
+          "column": 16,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Create a free account",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.link.signup",
+        "start": {
+          "column": 14,
+          "line": 45
+        }
+      },
+      {
+        "defaultMessage": "!!!Forgot password",
+        "end": {
+          "column": 3,
+          "line": 52
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.link.password",
+        "start": {
+          "column": 16,
+          "line": 49
+        }
+      }
+    ],
+    "path": "src/components/auth/Login.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Forgot password",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.email.label",
+        "start": {
+          "column": 14,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Submit",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.submit.label",
+        "start": {
+          "column": 21,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Your new password was sent to your email address",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.successInfo",
+        "start": {
+          "column": 15,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!No user affiliated with that email address",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.noUser",
+        "start": {
+          "column": 10,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Create a free account",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.link.signup",
+        "start": {
+          "column": 14,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Sign in to your account",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.link.login",
+        "start": {
+          "column": 13,
+          "line": 38
+        }
+      }
+    ],
+    "path": "src/components/auth/Password.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Support Franz",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.headline",
+        "start": {
+          "column": 12,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Select your support plan",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.support.label",
+        "start": {
+          "column": 23,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Support the development of Franz",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.submit.label",
+        "start": {
+          "column": 21,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!I don't want to support the development of Franz.",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.link.skipPayment",
+        "start": {
+          "column": 15,
+          "line": 25
+        }
+      }
+    ],
+    "path": "src/components/auth/Pricing.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Sign up",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.headline",
+        "start": {
+          "column": 12,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Firstname",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.firstname.label",
+        "start": {
+          "column": 18,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Lastname",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.lastname.label",
+        "start": {
+          "column": 17,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.email.label",
+        "start": {
+          "column": 14,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Company",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.company.label",
+        "start": {
+          "column": 16,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Password",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.password.label",
+        "start": {
+          "column": 17,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!By creating a Franz account you accept the",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.legal.info",
+        "start": {
+          "column": 13,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Terms of service",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.legal.terms",
+        "start": {
+          "column": 9,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Privacy Statement",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.legal.privacy",
+        "start": {
+          "column": 11,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Create account",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.submit.label",
+        "start": {
+          "column": 21,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Already have an account, sign in?",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.link.login",
+        "start": {
+          "column": 13,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!A user with that email address already exists",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.emailDuplicate",
+        "start": {
+          "column": 18,
+          "line": 62
+        }
+      }
+    ],
+    "path": "src/components/auth/Signup.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Create a free account",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/auth/Welcome.js",
+        "id": "welcome.signupButton",
+        "start": {
+          "column": 16,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Login to your account",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/auth/Welcome.js",
+        "id": "welcome.loginButton",
+        "start": {
+          "column": 15,
+          "line": 13
+        }
+      }
+    ],
+    "path": "src/components/auth/Welcome.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your services have been updated.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.servicesUpdated",
+        "start": {
+          "column": 19,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!A new update for Franz is available.",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.updateAvailable",
+        "start": {
+          "column": 19,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload services",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.buttonReloadServices",
+        "start": {
+          "column": 24,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Changelog",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.buttonChangelog",
+        "start": {
+          "column": 13,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Restart & install update",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.buttonInstallUpdate",
+        "start": {
+          "column": 23,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load services and user information",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.requiredRequestsFailed",
+        "start": {
+          "column": 26,
+          "line": 42
+        }
+      }
+    ],
+    "path": "src/components/layout/AppLayout.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.settings",
+        "start": {
+          "column": 12,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Add new service",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.addNewService",
+        "start": {
+          "column": 17,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.muteApp",
+        "start": {
+          "column": 8,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.unmuteApp",
+        "start": {
+          "column": 10,
+          "line": 23
+        }
+      }
+    ],
+    "path": "src/components/layout/Sidebar.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Oh no!",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!{name} has failed to load.",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.text",
+        "start": {
+          "column": 8,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload {name}",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.action",
+        "start": {
+          "column": 10,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit {name}",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.editAction",
+        "start": {
+          "column": 14,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Error:",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.message",
+        "start": {
+          "column": 16,
+          "line": 28
+        }
+      }
+    ],
+    "path": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!{name} is disabled",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/services/content/ServiceDisabled.js",
+        "id": "service.disabledHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable {name}",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/ServiceDisabled.js",
+        "id": "service.disabledHandler.action",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      }
+    ],
+    "path": "src/components/services/content/ServiceDisabled.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Welcome to Franz",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.welcome",
+        "start": {
+          "column": 11,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Get started",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.getStarted",
+        "start": {
+          "column": 14,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/services/content/Services.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Oh no!",
+        "end": {
+          "column": 3,
+          "line": 13
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 10
+        }
+      },
+      {
+        "defaultMessage": "!!!{name} has caused an error.",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.text",
+        "start": {
+          "column": 8,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload {name}",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.action",
+        "start": {
+          "column": 10,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.autoReload",
+        "start": {
+          "column": 14,
+          "line": 22
+        }
+      }
+    ],
+    "path": "src/components/services/content/WebviewCrashHandler.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.reload",
+        "start": {
+          "column": 10,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.edit",
+        "start": {
+          "column": 8,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable notifications",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.disableNotifications",
+        "start": {
+          "column": 24,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable notifications",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.enableNotification",
+        "start": {
+          "column": 23,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable audio",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.disableAudio",
+        "start": {
+          "column": 16,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable audio",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.enableAudio",
+        "start": {
+          "column": 15,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable Service",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.disableService",
+        "start": {
+          "column": 18,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Service",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.enableService",
+        "start": {
+          "column": 17,
+          "line": 43
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete Service",
+        "end": {
+          "column": 3,
+          "line": 50
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.deleteService",
+        "start": {
+          "column": 17,
+          "line": 47
+        }
+      }
+    ],
+    "path": "src/components/services/tabs/TabItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Your Subscription",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineSubscription",
+        "start": {
+          "column": 24,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your Account",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineUpgrade",
+        "start": {
+          "column": 19,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!Invoices",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineInvoices",
+        "start": {
+          "column": 20,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!Danger Zone",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineDangerZone",
+        "start": {
+          "column": 22,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Manage your subscription",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.manageSubscription.label",
+        "start": {
+          "column": 33,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Basic Account",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountType.basic",
+        "start": {
+          "column": 20,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Premium Supporter Account",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountType.premium",
+        "start": {
+          "column": 22,
+          "line": 43
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit Account",
+        "end": {
+          "column": 3,
+          "line": 50
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.account.editButton",
+        "start": {
+          "column": 21,
+          "line": 47
+        }
+      },
+      {
+        "defaultMessage": "!!!Download",
+        "end": {
+          "column": 3,
+          "line": 54
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.invoiceDownload",
+        "start": {
+          "column": 19,
+          "line": 51
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load user information",
+        "end": {
+          "column": 3,
+          "line": 58
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.userInfoRequestFailed",
+        "start": {
+          "column": 25,
+          "line": 55
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 62
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.tryReloadUserInfoRequest",
+        "start": {
+          "column": 28,
+          "line": 59
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete account",
+        "end": {
+          "column": 3,
+          "line": 66
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.deleteAccount",
+        "start": {
+          "column": 17,
+          "line": 63
+        }
+      },
+      {
+        "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": 70
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.deleteInfo",
+        "start": {
+          "column": 14,
+          "line": 67
+        }
+      },
+      {
+        "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+        "end": {
+          "column": 3,
+          "line": 74
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.deleteEmailSent",
+        "start": {
+          "column": 19,
+          "line": 71
+        }
+      }
+    ],
+    "path": "src/components/settings/account/AccountDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Available services",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.availableServices",
+        "start": {
+          "column": 21,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Your services",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourServices",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.account",
+        "start": {
+          "column": 11,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.settings",
+        "start": {
+          "column": 12,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Invite Friends",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.inviteFriends",
+        "start": {
+          "column": 17,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Logout",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.logout",
+        "start": {
+          "column": 10,
+          "line": 33
+        }
+      }
+    ],
+    "path": "src/components/settings/navigation/SettingsNavigation.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Available Services",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Search service",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.searchService",
+        "start": {
+          "column": 17,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Most popular",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.mostPopular",
+        "start": {
+          "column": 22,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!All services",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.all",
+        "start": {
+          "column": 14,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Development",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.dev",
+        "start": {
+          "column": 14,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Sorry, but no service matched your search term.",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.nothingFound",
+        "start": {
+          "column": 16,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Service successfully added",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.servicesSuccessfulAddedInfo",
+        "start": {
+          "column": 31,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Missing a service?",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.missingService",
+        "start": {
+          "column": 18,
+          "line": 43
+        }
+      }
+    ],
+    "path": "src/components/settings/recipes/RecipesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Save service",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.saveButton",
+        "start": {
+          "column": 15,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete Service",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.deleteButton",
+        "start": {
+          "column": 17,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Available services",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.availableServices",
+        "start": {
+          "column": 21,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Your services",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.yourServices",
+        "start": {
+          "column": 16,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Add {name}",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.addServiceHeadline",
+        "start": {
+          "column": 22,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit {name}",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.editServiceHeadline",
+        "start": {
+          "column": 23,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Hosted",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.tabHosted",
+        "start": {
+          "column": 13,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Self hosted ⭐️",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.tabOnPremise",
+        "start": {
+          "column": 16,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Use the hosted {name} service.",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.useHostedService",
+        "start": {
+          "column": 20,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not validate custom {name} server.",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.customUrlValidationError",
+        "start": {
+          "column": 28,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.customUrlPremiumInfo",
+        "start": {
+          "column": 24,
+          "line": 62
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your account",
+        "end": {
+          "column": 3,
+          "line": 69
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.customUrlUpgradeAccount",
+        "start": {
+          "column": 27,
+          "line": 66
+        }
+      },
+      {
+        "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+        "end": {
+          "column": 3,
+          "line": 73
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.indirectMessageInfo",
+        "start": {
+          "column": 23,
+          "line": 70
+        }
+      },
+      {
+        "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
+        "end": {
+          "column": 3,
+          "line": 77
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.isMutedInfo",
+        "start": {
+          "column": 15,
+          "line": 74
+        }
+      },
+      {
+        "defaultMessage": "!!!Notifications",
+        "end": {
+          "column": 3,
+          "line": 81
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineNotifications",
+        "start": {
+          "column": 25,
+          "line": 78
+        }
+      },
+      {
+        "defaultMessage": "!!!Unread message badges",
+        "end": {
+          "column": 3,
+          "line": 85
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineBadges",
+        "start": {
+          "column": 18,
+          "line": 82
+        }
+      },
+      {
+        "defaultMessage": "!!!General",
+        "end": {
+          "column": 3,
+          "line": 89
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineGeneral",
+        "start": {
+          "column": 19,
+          "line": 86
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete",
+        "end": {
+          "column": 3,
+          "line": 93
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.iconDelete",
+        "start": {
+          "column": 14,
+          "line": 90
+        }
+      },
+      {
+        "defaultMessage": "!!!Drop your image, or click here",
+        "end": {
+          "column": 3,
+          "line": 97
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.iconUpload",
+        "start": {
+          "column": 14,
+          "line": 94
+        }
+      },
+      {
+        "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
+        "end": {
+          "column": 3,
+          "line": 101
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.proxy.headline",
+        "start": {
+          "column": 17,
+          "line": 98
+        }
+      },
+      {
+        "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+        "end": {
+          "column": 3,
+          "line": 105
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.proxy.restartInfo",
+        "start": {
+          "column": 20,
+          "line": 102
+        }
+      },
+      {
+        "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+        "end": {
+          "column": 3,
+          "line": 109
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.proxy.info",
+        "start": {
+          "column": 13,
+          "line": 106
+        }
+      }
+    ],
+    "path": "src/components/settings/services/EditServiceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Error",
+        "end": {
+          "column": 3,
+          "line": 13
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.error.headline",
+        "start": {
+          "column": 12,
+          "line": 10
+        }
+      },
+      {
+        "defaultMessage": "!!!Back to services",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.error.goBack",
+        "start": {
+          "column": 10,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Available services",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.form.availableServices",
+        "start": {
+          "column": 21,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load service recipe.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.error.message",
+        "start": {
+          "column": 16,
+          "line": 22
+        }
+      }
+    ],
+    "path": "src/components/settings/services/ServiceError.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Service is disabled",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/settings/services/ServiceItem.js",
+        "id": "settings.services.tooltip.isDisabled",
+        "start": {
+          "column": 21,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Notifications are disabled",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/services/ServiceItem.js",
+        "id": "settings.services.tooltip.notificationsDisabled",
+        "start": {
+          "column": 32,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!All sounds are muted",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/services/ServiceItem.js",
+        "id": "settings.services.tooltip.isMuted",
+        "start": {
+          "column": 18,
+          "line": 19
+        }
+      }
+    ],
+    "path": "src/components/settings/services/ServiceItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your services",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Search service",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.searchService",
+        "start": {
+          "column": 17,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any services yet.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.noServicesAdded",
+        "start": {
+          "column": 19,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Sorry, but no service matched your search term.",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.recipes.nothingFound",
+        "start": {
+          "column": 18,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Discover services",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.discoverServices",
+        "start": {
+          "column": 20,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load your services",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.servicesRequestFailed",
+        "start": {
+          "column": 25,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.account.tryReloadServices",
+        "start": {
+          "column": 21,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.updatedInfo",
+        "start": {
+          "column": 15,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Service has been deleted",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.deletedInfo",
+        "start": {
+          "column": 15,
+          "line": 46
+        }
+      }
+    ],
+    "path": "src/components/settings/services/ServicesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headline",
+        "start": {
+          "column": 12,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!General",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineGeneral",
+        "start": {
+          "column": 19,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineLanguage",
+        "start": {
+          "column": 20,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Updates",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineUpdates",
+        "start": {
+          "column": 19,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Appearance",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineAppearance",
+        "start": {
+          "column": 22,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Advanced",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineAdvanced",
+        "start": {
+          "column": 20,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Help us to translate Franz into your language.",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.translationHelp",
+        "start": {
+          "column": 19,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Cache",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.subheadlineCache",
+        "start": {
+          "column": 20,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.cacheInfo",
+        "start": {
+          "column": 13,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Clear cache",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.buttonClearAllCache",
+        "start": {
+          "column": 23,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Check for updates",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.buttonSearchForUpdate",
+        "start": {
+          "column": 25,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Restart & install update",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.buttonInstallUpdate",
+        "start": {
+          "column": 23,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Is searching for update",
+        "end": {
+          "column": 3,
+          "line": 67
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.updateStatusSearching",
+        "start": {
+          "column": 25,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Update available, downloading...",
+        "end": {
+          "column": 3,
+          "line": 71
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.updateStatusAvailable",
+        "start": {
+          "column": 25,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!You are using the latest version of Franz",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.updateStatusUpToDate",
+        "start": {
+          "column": 24,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Current version:",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.currentVersion",
+        "start": {
+          "column": 18,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!Changes require restart",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.restartRequired",
+        "start": {
+          "column": 29,
+          "line": 80
+        }
+      }
+    ],
+    "path": "src/components/settings/settings/EditSettingsForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Update Profile",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headlineProfile",
+        "start": {
+          "column": 19,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Account Information",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headlineAccount",
+        "start": {
+          "column": 19,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Change Password",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headlinePassword",
+        "start": {
+          "column": 20,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.successInfo",
+        "start": {
+          "column": 15,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Update profile",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 35
+        }
+      }
+    ],
+    "path": "src/components/settings/user/EditUserForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Support the development of Franz",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.submit.label",
+        "start": {
+          "column": 21,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not initialize payment form",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.paymentSessionError",
+        "start": {
+          "column": 23,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!free",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.type.free",
+        "start": {
+          "column": 12,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!month",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.type.month",
+        "start": {
+          "column": 15,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!year",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.type.year",
+        "start": {
+          "column": 14,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!The Franz Premium Supporter Account includes",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.includedFeatures",
+        "start": {
+          "column": 20,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.onpremise.mattermost",
+        "start": {
+          "column": 13,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!No app delays & nagging to upgrade license",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.noInterruptions",
+        "start": {
+          "column": 19,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Proxy support for services",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.proxy",
+        "start": {
+          "column": 9,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Support for Spellchecker",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.spellchecker",
+        "start": {
+          "column": 16,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!No ads, ever!",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.ads",
+        "start": {
+          "column": 7,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!coming soon",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.comingSoon",
+        "start": {
+          "column": 14,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!EU residents: local sales tax may apply",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.euTaxInfo",
+        "start": {
+          "column": 13,
+          "line": 62
+        }
+      }
+    ],
+    "path": "src/components/subscription/SubscriptionForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Cancel",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/subscription/SubscriptionPopup.js",
+        "id": "subscriptionPopup.buttonCancel",
+        "start": {
+          "column": 16,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Done",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/subscription/SubscriptionPopup.js",
+        "id": "subscriptionPopup.buttonDone",
+        "start": {
+          "column": 14,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/subscription/SubscriptionPopup.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Upgrade account",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/ui/PremiumFeatureContainer/index.js",
+        "id": "premiumFeature.button.upgradeAccount",
+        "start": {
+          "column": 10,
+          "line": 14
+        }
+      }
+    ],
+    "path": "src/components/ui/PremiumFeatureContainer/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Something went wrong.",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/util/ErrorBoundary/index.js",
+        "id": "app.errorHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/util/ErrorBoundary/index.js",
+        "id": "app.errorHandler.action",
+        "start": {
+          "column": 10,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/util/ErrorBoundary/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.name",
+        "start": {
+          "column": 8,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable service",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableService",
+        "start": {
+          "column": 17,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Notifications",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableNotification",
+        "start": {
+          "column": 22,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Show unread message badges",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableBadge",
+        "start": {
+          "column": 15,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable audio",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableAudio",
+        "start": {
+          "column": 15,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Team",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.team",
+        "start": {
+          "column": 8,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom server",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.customUrl",
+        "start": {
+          "column": 13,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Show message badge for all new messages",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.indirectMessages",
+        "start": {
+          "column": 20,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom icon",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.icon",
+        "start": {
+          "column": 8,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Dark Mode",
+        "end": {
+          "column": 3,
+          "line": 67
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableDarkMode",
+        "start": {
+          "column": 18,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Proxy",
+        "end": {
+          "column": 3,
+          "line": 71
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.isEnabled",
+        "start": {
+          "column": 15,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!Proxy Host/IP",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.host",
+        "start": {
+          "column": 13,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Port",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.port",
+        "start": {
+          "column": 13,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!User",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.user",
+        "start": {
+          "column": 13,
+          "line": 80
+        }
+      },
+      {
+        "defaultMessage": "!!!Password",
+        "end": {
+          "column": 3,
+          "line": 87
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.password",
+        "start": {
+          "column": 17,
+          "line": 84
+        }
+      }
+    ],
+    "path": "src/containers/settings/EditServiceScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Launch Franz on start",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.autoLaunchOnStart",
+        "start": {
+          "column": 21,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in background",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.autoLaunchInBackground",
+        "start": {
+          "column": 26,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Keep Franz in background when closing the window",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.runInBackground",
+        "start": {
+          "column": 19,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Show Franz in system tray",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableSystemTray",
+        "start": {
+          "column": 20,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Minimize Franz to system tray",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.minimizeToSystemTray",
+        "start": {
+          "column": 24,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.language",
+        "start": {
+          "column": 12,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Dark Mode",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.darkMode",
+        "start": {
+          "column": 12,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Display disabled services tabs",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.showDisabledServices",
+        "start": {
+          "column": 24,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.showMessagesBadgesWhenMuted",
+        "start": {
+          "column": 29,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable spell checking",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableSpellchecking",
+        "start": {
+          "column": 23,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable GPU Acceleration",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableGPUAcceleration",
+        "start": {
+          "column": 25,
+          "line": 62
+        }
+      },
+      {
+        "defaultMessage": "!!!Include beta versions",
+        "end": {
+          "column": 3,
+          "line": 69
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.beta",
+        "start": {
+          "column": 8,
+          "line": 66
+        }
+      }
+    ],
+    "path": "src/containers/settings/EditSettingsScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Firstname",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.firstname",
+        "start": {
+          "column": 13,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Lastname",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.lastname",
+        "start": {
+          "column": 12,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Email",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.email",
+        "start": {
+          "column": 9,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Account type",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.label",
+        "start": {
+          "column": 20,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Individual",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.individual",
+        "start": {
+          "column": 25,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Non-Profit",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.non-profit",
+        "start": {
+          "column": 24,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Company",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.company",
+        "start": {
+          "column": 22,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Current password",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.currentPassword",
+        "start": {
+          "column": 19,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!New password",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.newPassword",
+        "start": {
+          "column": 15,
+          "line": 46
+        }
+      }
+    ],
+    "path": "src/containers/settings/EditUserScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Please purchase license to skip waiting",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Get a Franz Supporter License",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.action",
+        "start": {
+          "column": 10,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.text",
+        "start": {
+          "column": 8,
+          "line": 23
+        }
+      }
+    ],
+    "path": "src/features/delayApp/Component.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Franz is better together!",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.text",
+        "start": {
+          "column": 8,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Share as email",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.action.email",
+        "start": {
+          "column": 16,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Share on Facebook",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.action.facebook",
+        "start": {
+          "column": 19,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Share on Twitter",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.action.twitter",
+        "start": {
+          "column": 18,
+          "line": 31
+        }
+      },
+      {
+        "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": 38
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.shareText.email",
+        "start": {
+          "column": 18,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.shareText.twitter",
+        "start": {
+          "column": 20,
+          "line": 39
+        }
+      }
+    ],
+    "path": "src/features/shareFranz/Component.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.submitButton",
+        "start": {
+          "column": 16,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.name",
+        "start": {
+          "column": 8,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Delete workspace",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonDelete",
+        "start": {
+          "column": 16,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.name",
+        "start": {
+          "column": 8,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Services in this Workspace",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+        "start": {
+          "column": 31,
+          "line": 32
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.headline",
+        "start": {
+          "column": 12,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any workspaces yet.",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.noWorkspacesAdded",
+        "start": {
+          "column": 19,
+          "line": 16
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Field is required",
+        "end": {
+          "column": 3,
+          "line": 7
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.required",
+        "start": {
+          "column": 12,
+          "line": 4
+        }
+      },
+      {
+        "defaultMessage": "!!!Email not valid",
+        "end": {
+          "column": 3,
+          "line": 11
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.email",
+        "start": {
+          "column": 9,
+          "line": 8
+        }
+      },
+      {
+        "defaultMessage": "!!!Not a valid URL",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.url",
+        "start": {
+          "column": 7,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!Too few characters",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.minLength",
+        "start": {
+          "column": 13,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!At least one is required",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.oneRequired",
+        "start": {
+          "column": 15,
+          "line": 20
+        }
+      }
+    ],
+    "path": "src/helpers/validation-helpers.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Can't connect to Franz Online Services",
+        "end": {
+          "column": 3,
+          "line": 7
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.api.unhealthy",
+        "start": {
+          "column": 16,
+          "line": 4
+        }
+      },
+      {
+        "defaultMessage": "!!!You are not connected to the internet.",
+        "end": {
+          "column": 3,
+          "line": 11
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.notConnectedToTheInternet",
+        "start": {
+          "column": 29,
+          "line": 8
+        }
+      },
+      {
+        "defaultMessage": "!!!Spell checking language",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecking.language",
+        "start": {
+          "column": 24,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!Use System Default ({default})",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecker.useDefault",
+        "start": {
+          "column": 29,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Detect language automatically",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecking.autodetect",
+        "start": {
+          "column": 34,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Automatic",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecking.autodetect.short",
+        "start": {
+          "column": 39,
+          "line": 24
+        }
+      }
+    ],
+    "path": "src/i18n/globalMessages.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Edit",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit",
+        "start": {
+          "column": 8,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!Undo",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.undo",
+        "start": {
+          "column": 8,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Redo",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.redo",
+        "start": {
+          "column": 8,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Cut",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.cut",
+        "start": {
+          "column": 7,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Copy",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.copy",
+        "start": {
+          "column": 8,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Paste",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.paste",
+        "start": {
+          "column": 9,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Paste And Match Style",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.pasteAndMatchStyle",
+        "start": {
+          "column": 22,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.delete",
+        "start": {
+          "column": 10,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Select All",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.selectAll",
+        "start": {
+          "column": 13,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Speech",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.speech",
+        "start": {
+          "column": 10,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Start Speaking",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.startSpeaking",
+        "start": {
+          "column": 17,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Stop Speaking",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.stopSpeaking",
+        "start": {
+          "column": 16,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Start Dictation",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.startDictation",
+        "start": {
+          "column": 18,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Emoji & Symbols",
+        "end": {
+          "column": 3,
+          "line": 67
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.emojiSymbols",
+        "start": {
+          "column": 16,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Actual Size",
+        "end": {
+          "column": 3,
+          "line": 71
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.resetZoom",
+        "start": {
+          "column": 13,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!Zoom In",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.zoomIn",
+        "start": {
+          "column": 10,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Zoom Out",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.zoomOut",
+        "start": {
+          "column": 11,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!Enter Full Screen",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.enterFullScreen",
+        "start": {
+          "column": 19,
+          "line": 80
+        }
+      },
+      {
+        "defaultMessage": "!!!Exit Full Screen",
+        "end": {
+          "column": 3,
+          "line": 87
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.exitFullScreen",
+        "start": {
+          "column": 18,
+          "line": 84
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Full Screen",
+        "end": {
+          "column": 3,
+          "line": 91
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleFullScreen",
+        "start": {
+          "column": 20,
+          "line": 88
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Developer Tools",
+        "end": {
+          "column": 3,
+          "line": 95
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleDevTools",
+        "start": {
+          "column": 18,
+          "line": 92
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Service Developer Tools",
+        "end": {
+          "column": 3,
+          "line": 99
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleServiceDevTools",
+        "start": {
+          "column": 25,
+          "line": 96
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload Service",
+        "end": {
+          "column": 3,
+          "line": 103
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.reloadService",
+        "start": {
+          "column": 17,
+          "line": 100
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload Franz",
+        "end": {
+          "column": 3,
+          "line": 107
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.reloadFranz",
+        "start": {
+          "column": 15,
+          "line": 104
+        }
+      },
+      {
+        "defaultMessage": "!!!Minimize",
+        "end": {
+          "column": 3,
+          "line": 111
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.window.minimize",
+        "start": {
+          "column": 12,
+          "line": 108
+        }
+      },
+      {
+        "defaultMessage": "!!!Close",
+        "end": {
+          "column": 3,
+          "line": 115
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.window.close",
+        "start": {
+          "column": 9,
+          "line": 112
+        }
+      },
+      {
+        "defaultMessage": "!!!Learn More",
+        "end": {
+          "column": 3,
+          "line": 119
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.learnMore",
+        "start": {
+          "column": 13,
+          "line": 116
+        }
+      },
+      {
+        "defaultMessage": "!!!Changelog",
+        "end": {
+          "column": 3,
+          "line": 123
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.changelog",
+        "start": {
+          "column": 13,
+          "line": 120
+        }
+      },
+      {
+        "defaultMessage": "!!!Support",
+        "end": {
+          "column": 3,
+          "line": 127
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.support",
+        "start": {
+          "column": 11,
+          "line": 124
+        }
+      },
+      {
+        "defaultMessage": "!!!Terms of Service",
+        "end": {
+          "column": 3,
+          "line": 131
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.tos",
+        "start": {
+          "column": 7,
+          "line": 128
+        }
+      },
+      {
+        "defaultMessage": "!!!Privacy Statement",
+        "end": {
+          "column": 3,
+          "line": 135
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.privacy",
+        "start": {
+          "column": 11,
+          "line": 132
+        }
+      },
+      {
+        "defaultMessage": "!!!File",
+        "end": {
+          "column": 3,
+          "line": 139
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.file",
+        "start": {
+          "column": 8,
+          "line": 136
+        }
+      },
+      {
+        "defaultMessage": "!!!View",
+        "end": {
+          "column": 3,
+          "line": 143
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view",
+        "start": {
+          "column": 8,
+          "line": 140
+        }
+      },
+      {
+        "defaultMessage": "!!!Services",
+        "end": {
+          "column": 3,
+          "line": 147
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services",
+        "start": {
+          "column": 12,
+          "line": 144
+        }
+      },
+      {
+        "defaultMessage": "!!!Window",
+        "end": {
+          "column": 3,
+          "line": 151
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.window",
+        "start": {
+          "column": 10,
+          "line": 148
+        }
+      },
+      {
+        "defaultMessage": "!!!Help",
+        "end": {
+          "column": 3,
+          "line": 155
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help",
+        "start": {
+          "column": 8,
+          "line": 152
+        }
+      },
+      {
+        "defaultMessage": "!!!About Franz",
+        "end": {
+          "column": 3,
+          "line": 159
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.about",
+        "start": {
+          "column": 9,
+          "line": 156
+        }
+      },
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 163
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.settings",
+        "start": {
+          "column": 12,
+          "line": 160
+        }
+      },
+      {
+        "defaultMessage": "!!!Hide",
+        "end": {
+          "column": 3,
+          "line": 167
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.hide",
+        "start": {
+          "column": 8,
+          "line": 164
+        }
+      },
+      {
+        "defaultMessage": "!!!Hide Others",
+        "end": {
+          "column": 3,
+          "line": 171
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.hideOthers",
+        "start": {
+          "column": 14,
+          "line": 168
+        }
+      },
+      {
+        "defaultMessage": "!!!Unhide",
+        "end": {
+          "column": 3,
+          "line": 175
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.unhide",
+        "start": {
+          "column": 10,
+          "line": 172
+        }
+      },
+      {
+        "defaultMessage": "!!!Quit",
+        "end": {
+          "column": 3,
+          "line": 179
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.quit",
+        "start": {
+          "column": 8,
+          "line": 176
+        }
+      },
+      {
+        "defaultMessage": "!!!Add New Service...",
+        "end": {
+          "column": 3,
+          "line": 183
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.addNewService",
+        "start": {
+          "column": 17,
+          "line": 180
+        }
+      },
+      {
+        "defaultMessage": "!!!Add New Workspace...",
+        "end": {
+          "column": 3,
+          "line": 187
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.addNewWorkspace",
+        "start": {
+          "column": 19,
+          "line": 184
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate next service...",
+        "end": {
+          "column": 3,
+          "line": 191
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.setNextServiceActive",
+        "start": {
+          "column": 23,
+          "line": 188
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate previous service...",
+        "end": {
+          "column": 3,
+          "line": 195
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.activatePreviousService",
+        "start": {
+          "column": 27,
+          "line": 192
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 199
+        },
+        "file": "src/lib/Menu.js",
+        "id": "sidebar.muteApp",
+        "start": {
+          "column": 11,
+          "line": 196
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 203
+        },
+        "file": "src/lib/Menu.js",
+        "id": "sidebar.unmuteApp",
+        "start": {
+          "column": 13,
+          "line": 200
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 207
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces",
+        "start": {
+          "column": 14,
+          "line": 204
+        }
+      },
+      {
+        "defaultMessage": "!!!Default",
+        "end": {
+          "column": 3,
+          "line": 211
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.defaultWorkspace",
+        "start": {
+          "column": 20,
+          "line": 208
+        }
+      }
+    ],
+    "path": "src/lib/Menu.json"
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 671eecd41..9639ec5f7 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Επαναφόρτωση",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Κάτι δεν λειτουργεί",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.text" : "Franz θα συνεχίσει σε {seconds} δευτερόλεπτα.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Franz",
    "global.notConnectedToTheInternet" : "Έχετε αποσυνδεθεί από το Διαδίκτυο",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Εισαγάγετε τις υπηρεσίες σας Franz 4",
    "import.notSupportedHeadline" : "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Franz 5",
    "import.skip.label" : "Θέλω να προσθέσω υπηρεσίες χειροκίνητα",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 2a51662a2..1041a8b5f 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,300 +1,298 @@
 {
+  "app.errorHandler.action": "Reload",
+  "app.errorHandler.headline": "Something went wrong",
+  "feature.delayApp.action": "Get a Franz Supporter License",
+  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
+  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
+  "feature.shareFranz.action.email": "Send as email",
+  "feature.shareFranz.action.facebook": "Share on Facebook",
+  "feature.shareFranz.action.twitter": "Share on Twitter",
+  "feature.shareFranz.headline": "Franz is better together!",
+  "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 @MeetFranz",
+  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Franz online services",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
-  "global.spellchecking.language": "Spell checking language",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
-  "welcome.signupButton": "Create a free account",
-  "welcome.loginButton": "Login to your account",
-  "welcome.slogan": "Messaging that works for you",
-  "login.headline": "Sign in",
+  "global.spellchecking.language": "Spell checking language",
+  "import.headline": "Import your Franz 4 services",
+  "import.notSupportedHeadline": "Services not yet supported in Franz 5",
+  "import.skip.label": "I want to add services manually",
+  "import.submit.label": "Import services",
+  "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.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.email.label": "Email address",
+  "login.headline": "Sign in",
+  "login.invalidCredentials": "Email or password not valid",
+  "login.link.password": "Reset password",
+  "login.link.signup": "Create a free account",
   "login.password.label": "Password",
+  "login.serverLogout": "Your session expired, please login again.",
   "login.submit.label": "Sign in",
-  "login.invalidCredentials": "Email or password not valid",
   "login.tokenExpired": "Your session expired, please login again.",
-  "login.serverLogout": "Your session expired, please login again.",
-  "login.link.signup": "Create a free account",
-  "login.link.password": "Reset password",
-  "password.headline": "Reset password",
+  "menu.app.about": "About Franz",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
+  "menu.app.settings": "Settings",
+  "menu.app.unhide": "Unhide",
+  "menu.edit": "Edit",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
+  "menu.edit.delete": "Delete",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
+  "menu.edit.speech": "Speech",
+  "menu.edit.startDictation": "Start Dictation",
+  "menu.edit.startSpeaking": "Start Speaking",
+  "menu.edit.stopSpeaking": "Stop Speaking",
+  "menu.edit.undo": "Undo",
+  "menu.file": "File",
+  "menu.help": "Help",
+  "menu.help.changelog": "Changelog",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of Service",
+  "menu.services": "Services",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
+  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.view": "View",
+  "menu.view.enterFullScreen": "Enter Full Screen",
+  "menu.view.exitFullScreen": "Exit Full Screen",
+  "menu.view.reloadFranz": "Reload Franz",
+  "menu.view.reloadService": "Reload Service",
+  "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDevTools": "Toggle Developer Tools",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
+  "menu.workspaces": "Workspaces",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.defaultWorkspace": "All services",
   "password.email.label": "Email address",
-  "password.submit.label": "Submit",
+  "password.headline": "Reset password",
+  "password.link.login": "Sign in to your account",
+  "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
+  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "password.link.signup": "Create a free account",
-  "password.link.login": "Sign in to your account",
-  "signup.headline": "Sign up",
-  "signup.firstname.label": "First Name",
-  "signup.lastname.label": "Last Name",
-  "signup.email.label": "Email address",
-  "signup.company.label": "Company",
-  "signup.password.label": "Password",
-  "signup.submit.label": "Create account",
-  "signup.link.login": "Already have an account, sign in?",
-  "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.legal.info": "By creating a Franz account you accept the",
-  "signup.legal.terms": "Terms of service",
-  "signup.legal.privacy": "Privacy Statement",
+  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.headline": "Support Franz",
-  "pricing.support.label": "Select your support plan",
-  "pricing.submit.label": "I want to support the development of Franz",
   "pricing.link.skipPayment": "I don't want to support the development of Franz.",
-  "import.headline": "Import your Franz 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Franz 5",
-  "import.submit.label": "Import services",
-  "import.skip.label": "I want to add services manually",
-  "invite.submit.label": "Send invites",
-  "invite.headline.friends": "Invite 3 of your friends or colleagues",
-  "invite.name.label": "Name",
-  "invite.email.label": "Email address",
-  "invite.skip.label": "I want to do this later",
-  "invite.successInfo": "Invitations sent successfully",
-  "subscription.submit.label": "I want to support the development of Franz",
-  "subscription.paymentSessionError": "Could not initialize payment form",
-  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
-  "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
-  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
-  "subscription.features.encryptedSync": "Encrypted session synchronization",
-  "subscription.features.proxy": "Proxy support for services",
-  "subscription.features.ads": "No ads, ever!",
-  "subscription.features.spellchecker": "Support for spellchecker",
-  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
-  "subscription.features.comingSoon": "coming soon",
-  "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.updateAvailable": "A new update for Franz is available.",
-  "infobar.buttonReloadServices": "Reload services",
-  "infobar.buttonInstallUpdate": "Restart & install update",
-  "infobar.buttonChangelog": "What is new?",
-  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "sidebar.settings": "Settings",
-  "sidebar.addNewService": "Add new service",
-  "sidebar.muteApp": "Disable notifications & audio",
-  "sidebar.unmuteApp": "Enable notifications & audio",
-  "services.welcome": "Welcome to Franz",
+  "pricing.submit.label": "I want to support the development of Franz",
+  "pricing.support.label": "Select your support plan",
+  "service.crashHandler.action": "Reload {name}",
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.crashHandler.headline": "Oh no!",
+  "service.crashHandler.text": "{name} has caused an error.",
+  "service.disabledHandler.action": "Enable {name}",
+  "service.disabledHandler.headline": "{name} is disabled",
+  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.editAction": "Edit {name}",
+  "service.errorHandler.headline": "Oh no!",
+  "service.errorHandler.message": "Error",
+  "service.errorHandler.text": "{name} has failed to load.",
   "services.getStarted": "Get started",
-  "settings.searchService": "Search service",
-  "settings.account.headline": "Account",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
-  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.manageSubscription.label": "Manage your subscription",
+  "services.welcome": "Welcome to Franz",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
-  "settings.account.account.editButton": "Edit account",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlinePassword": "Change password",
-  "settings.account.successInfo": "Your changes have been saved",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
-  "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.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 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",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlineProfile": "Update profile",
+  "settings.account.headlineSubscription": "Your subscription",
+  "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
+  "settings.account.invoiceDownload": "Download",
+  "settings.account.manageSubscription.label": "Manage your subscription",
+  "settings.account.successInfo": "Your changes have been saved",
+  "settings.account.tryReloadServices": "Try again",
+  "settings.account.tryReloadUserInfoRequest": "Try again",
+  "settings.account.userInfoRequestFailed": "Could not load user information",
+  "settings.app.buttonClearAllCache": "Clear cache",
+  "settings.app.buttonInstallUpdate": "Restart & install update",
+  "settings.app.buttonSearchForUpdate": "Check for updates",
+  "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 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 Franz in system tray",
+  "settings.app.form.language": "Language",
+  "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
+  "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
+  "settings.app.form.showDisabledServices": "Display disabled services tabs",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.headline": "Settings",
+  "settings.app.headlineAdvanced": "Advanced",
+  "settings.app.headlineAppearance": "Appearance",
+  "settings.app.headlineGeneral": "General",
+  "settings.app.headlineLanguage": "Language",
+  "settings.app.headlineUpdates": "Updates",
+  "settings.app.restartRequired": "Changes require restart",
+  "settings.app.subheadlineCache": "Cache",
+  "settings.app.translationHelp": "Help us to translate Franz 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 Franz",
   "settings.invite.headline": "Invite Friends",
-  "settings.navigation.availableServices": "Available services",
-  "settings.navigation.yourServices": "Your services",
-  "settings.navigation.yourWorkspaces": "Your workspaces",
   "settings.navigation.account": "Account",
-  "settings.navigation.settings": "Settings",
+  "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.recipes.headline": "Available services",
-  "settings.recipes.mostPopular": "Most popular",
+  "settings.navigation.settings": "Settings",
+  "settings.navigation.yourServices": "Your services",
+  "settings.navigation.yourWorkspaces": "Your workspaces",
   "settings.recipes.all": "All services",
   "settings.recipes.dev": "Development",
+  "settings.recipes.headline": "Available services",
+  "settings.recipes.missingService": "Missing a service?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
-  "settings.recipes.missingService": "Missing a service?",
-  "settings.service.form.saveButton": "Save service",
-  "settings.service.form.deleteButton": "Delete service",
-  "settings.service.form.availableServices": "Available services",
-  "settings.service.form.yourServices": "Your services",
+  "settings.searchService": "Search service",
+  "settings.service.error.goBack": "Back to services",
+  "settings.service.error.headline": "Error",
+  "settings.service.error.message": "Could not load service recipe.",
   "settings.service.form.addServiceHeadline": "Add {name}",
-  "settings.service.form.editServiceHeadline": "Edit {name}",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
-  "settings.service.form.useHostedService": "Use the hosted {name} service.",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.availableServices": "Available services",
+  "settings.service.form.customUrl": "Custom server",
   "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.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-  "settings.service.form.name": "Name",
-  "settings.service.form.enableService": "Enable service",
-  "settings.service.form.enableNotification": "Enable notifications",
-  "settings.service.form.enableBadge": "Show unread message badges",
-  "settings.service.form.team": "Team",
-  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.indirectMessages": "Show message badge for all new messages",
+  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
-  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.headlineNotifications": "Notifications",
+  "settings.service.form.enableBadge": "Show unread message badges",
+  "settings.service.form.enableDarkMode": "Enable Dark Mode",
+  "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
   "settings.service.form.headlineGeneral": "General",
+  "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
   "settings.service.form.iconDelete": "Delete",
   "settings.service.form.iconUpload": "Drop your image, or click here",
-  "settings.service.form.enableDarkMode": "Enable Dark Mode",
+  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+  "settings.service.form.indirectMessages": "Show message badge for all new messages",
+  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.name": "Name",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.user": "User (optional)",
-  "settings.service.form.proxy.password": "Password (optional)",
   "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 Franz after changing proxy Settings.",
-  "settings.service.form.spellcheckerLanguage": "Spell checking Language",
-  "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.goBack": "Back to services",
-  "settings.service.error.message": "Could not load service recipe.",
-  "settings.services.tooltip.isDisabled": "Service is disabled",
-  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
-  "settings.services.tooltip.isMuted": "All sounds are muted",
+  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.saveButton": "Save service",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.team": "Team",
+  "settings.service.form.useHostedService": "Use the hosted {name} service.",
+  "settings.service.form.yourServices": "Your services",
+  "settings.services.deletedInfo": "Service has been deleted",
+  "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "You haven't added any services yet.",
-  "settings.services.discoverServices": "Discover services",
+  "settings.services.servicesRequestFailed": "Could not load your services",
+  "settings.services.tooltip.isDisabled": "Service is disabled",
+  "settings.services.tooltip.isMuted": "All sounds are muted",
+  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
   "settings.services.updatedInfo": "Your changes have been saved",
-  "settings.services.deletedInfo": "Service has been deleted",
-  "settings.app.headline": "Settings",
-  "settings.app.headlineGeneral": "General",
-  "settings.app.headlineLanguage": "Language",
-  "settings.app.headlineUpdates": "Updates",
-  "settings.app.headlineAppearance": "Appearance",
-  "settings.app.headlineAdvanced": "Advanced",
-  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "settings.app.buttonInstallUpdate": "Restart & install update",
-  "settings.app.updateStatusSearching": "Is searching for update",
-  "settings.app.updateStatusAvailable": "Update available, downloading...",
-  "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
-  "settings.app.subheadlineCache": "Cache",
-  "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.",
-  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
-  "settings.app.form.autoLaunchInBackground": "Open in background",
-  "settings.app.form.enableSystemTray": "Show Franz in system tray",
-  "settings.app.form.darkMode": "Join the Dark Side",
-  "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
-  "settings.app.form.enableMenuBar": "Show Franz in Menu Bar",
-  "settings.app.form.hideDockIcon": "Hide Franz icon in Dock",
-  "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
-  "settings.app.form.language": "Language",
-  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.spellcheckerLanguage": "Spell checking language",
-  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.beta": "Include beta versions",
-  "settings.app.translationHelp": "Help us to translate Franz into your language.",
-  "settings.app.currentVersion": "Current version:",
-  "settings.app.restartRequired": "Changes require restart",
+  "settings.user.form.accountType.company": "Company",
+  "settings.user.form.accountType.individual": "Individual",
+  "settings.user.form.accountType.label": "Account type",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.currentPassword": "Current password",
+  "settings.user.form.email": "Email",
   "settings.user.form.firstname": "First Name",
   "settings.user.form.lastname": "Last Name",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Current password",
   "settings.user.form.newPassword": "New password",
-  "settings.user.form.accountType.label": "Account type",
-  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Company",
-  "settings.workspaces.headline": "Your workspaces",
-  "settings.workspace.add.form.submitButton": "Create Workspace",
   "settings.workspace.add.form.name": "Name",
-  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspace.add.form.submitButton": "Save workspace",
+  "settings.workspace.form.buttonDelete": "Delete workspace",
+  "settings.workspace.form.buttonSave": "Save workspace",
   "settings.workspace.form.name": "Name",
-  "settings.workspace.form.buttonDelete": "Delete Workspace",
-  "settings.workspace.form.buttonSave": "Save Workspace",
   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
+  "sidebar.addNewService": "Add new service",
+  "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.settings": "Settings",
+  "sidebar.unmuteApp": "Enable notifications & audio",
+  "signup.company.label": "Company",
+  "signup.email.label": "Email address",
+  "signup.emailDuplicate": "A user with that email address already exists",
+  "signup.firstname.label": "First Name",
+  "signup.headline": "Sign up",
+  "signup.lastname.label": "Last Name",
+  "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.euTaxInfo": "EU residents: local sales tax may apply",
+  "subscription.features.ads": "No ads, ever!",
+  "subscription.features.comingSoon": "coming soon",
+  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
+  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
+  "subscription.features.proxy": "Proxy support for services",
+  "subscription.features.spellchecker": "Support for spellchecker",
+  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
+  "subscription.paymentSessionError": "Could not initialize payment form",
+  "subscription.submit.label": "I want to support the development of Franz",
   "subscription.type.free": "free",
   "subscription.type.month": "month",
   "subscription.type.year": "year",
-  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
-  "tabs.item.reload": "Reload",
-  "tabs.item.edit": "Edit",
-  "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.enableNotification": "Enable notifications",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
+  "tabs.item.edit": "Edit",
+  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
-  "tabs.item.deleteService": "Delete service",
-  "service.crashHandler.headline": "Oh no!",
-  "service.crashHandler.text": "{name} has caused an error.",
-  "service.crashHandler.action": "Reload {name}",
-  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
-  "service.errorHandler.headline": "Oh no!",
-  "service.errorHandler.text": "{name} has failed to load.",
-  "service.errorHandler.message": "Error",
-  "service.errorHandler.action": "Reload {name}",
-  "service.errorHandler.editAction": "Edit {name}",
-  "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}",
-  "menu.edit": "Edit",
-  "menu.edit.undo": "Undo",
-  "menu.edit.redo": "Redo",
-  "menu.edit.cut": "Cut",
-  "menu.edit.copy": "Copy",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.delete": "Delete",
-  "menu.edit.selectAll": "Select All",
-  "menu.edit.speech": "Speech",
-  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.view.resetZoom": "Actual Size",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
-  "menu.view.toggleDevTools": "Toggle Developer Tools",
-  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
-  "menu.view.reloadService": "Reload Service",
-  "menu.view.reloadFranz": "Reload Franz",
-  "menu.window.minimize": "Minimize",
-  "menu.window.close": "Close",
-  "menu.help.learnMore": "Learn More",
-  "menu.help.changelog": "Changelog",
-  "menu.help.support": "Support",
-  "menu.help.tos": "Terms of Service",
-  "menu.help.privacy": "Privacy Statement",
-  "menu.file": "File",
-  "menu.view": "View",
-  "menu.services": "Services",
-  "menu.window": "Window",
-  "menu.help": "Help",
-  "menu.app.about": "About Franz",
-  "menu.app.settings": "Settings",
-  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
-  "menu.app.quit": "Quit",
-  "menu.services.addNewService": "Add New Service",
-  "menu.workspaces": "Workspaces",
-  "menu.workspaces.defaultWorkspace": "All services",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace",
-  "validation.required": "{field} is required",
+  "tabs.item.reload": "Reload",
   "validation.email": "{field} is not valid",
-  "validation.url": "{field} is not a valid URL",
   "validation.minLength": "{field} should be at least {length} characters long",
-  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
-  "feature.delayApp.action": "Get a Franz Supporter License",
-  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "app.errorHandler.headline": "Something went wrong",
-  "app.errorHandler.action": "Reload",
-  "feature.shareFranz.headline": "Franz is better together!",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "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 @MeetFranz"
-}
+  "validation.oneRequired": "At least one is required",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
+  "welcome.loginButton": "Login to your account",
+  "welcome.signupButton": "Create a free account"
+}
\ No newline at end of file
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 669b4d2dd..3ac23d9a5 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Recargar",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Ha surgido un error",
    "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
    "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
-   "feature.delayApp.text" : "Franz continuará en {seconds}  segundos.",
+   "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
    "global.notConnectedToTheInternet" : "No estás conectado a Internet",
+   "global.spellchecker.useDefault" : "Utilizar estándar del sistema ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Corrector de ortografía",
    "import.headline" : "Importa tus servicios de Franz 4",
    "import.notSupportedHeadline" : "Servicios no admitidos aún en Franz 5",
    "import.skip.label" : "Quiero agregar servicios manualmente",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Editar {name}",
    "service.errorHandler.headline" : "¡Oh, no!",
    "service.errorHandler.message" : "Error",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} ha fallado la carga",
    "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Mostrar señal de notificación para todos los mensajes nuevos",
    "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
    "settings.service.form.name" : "Nombre",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Ajustes Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Las configuraciones de Proxy no se sincronizarán con los servidores de Franz.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Contraseña (opcional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "Puerto",
+   "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.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Marcar faltas de ortografía",
+   "settings.service.form.spellcheckerLanguage.default" : "Utilizar estándar del sistema ({default})",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ⭐️",
    "settings.service.form.team" : "Equipo",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index a83767f1e..8af875a3d 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Recharger",
-   "app.errorHandler.headline" : "Une erreur s'est produite.",
+   "app.errorHandler.headline" : "Une erreur s'est produite",
    "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
    "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
-   "feature.delayApp.text" : "Franz continuera dans {seconds} secondes.",
+   "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
    "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
+   "global.spellchecker.useDefault" : "Par défaut ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Langue de la vérification orthographique",
    "import.headline" : "Importez vos services depuis la version 4 de Franz.",
    "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
    "import.skip.label" : "Je veux ajouter des services manuellement",
@@ -198,10 +209,10 @@
    "settings.service.form.proxy.isEnabled" : "Utiliser un proxy",
    "settings.service.form.proxy.password" : "Mot de passe (facultatif)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifier les paramètres proxy.",
+   "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifié les paramètres proxy.",
    "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
    "settings.service.form.saveButton" : "Enregistrer le service",
-   "settings.service.form.spellcheckerLanguage" : "Veuillez vérifier l'épellation Langage",
+   "settings.service.form.spellcheckerLanguage" : "Langue de vérification d'orthographe",
    "settings.service.form.spellcheckerLanguage.default" : "Par défaut ({default})",
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 0d3d8623e..2b3d39b73 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -4,8 +4,19 @@
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Ní féidir nascadh le seirbhísí Franz ar líne",
    "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Iompórtáil do sheirbhísí Franz 4",
    "import.notSupportedHeadline" : "Níl na seirbhísí seo taca ag Franz 5 go fóill",
    "import.skip.label" : "Ba mhaith liom seirbhísí a chur de láimh",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 2ff69755d..dc1d579fa 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -4,8 +4,19 @@
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nije se moguće povezati na Francove on-line servise. ",
    "global.notConnectedToTheInternet" : "Sada ste povezani s internetom. ",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Uvezite svoje Franc 4 servise. ",
    "import.notSupportedHeadline" : "Franc 5 trenutno ne podržava taj servis",
    "import.skip.label" : "Želim ručno dodati ove usluge",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 0b396cf3b..ddaffeebb 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Újratöltés",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Valami nem jött össze",
+   "feature.delayApp.action" : "Szerezz egy Franz Támogatói Liszencet",
+   "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.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
    "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
+   "global.spellchecker.useDefault" : "Rendszer alapbeállítás használata ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Helyesírás-ellenőrző nyelve",
    "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",
@@ -51,7 +62,7 @@
    "menu.edit.startSpeaking" : "Beszélgetés kezdeményezése",
    "menu.edit.stopSpeaking" : "Beszéd vége",
    "menu.edit.undo" : "Visszavonás",
-   "menu.file" : "fájl",
+   "menu.file" : "Fájl",
    "menu.help" : "Súgó",
    "menu.help.changelog" : "Változások listája",
    "menu.help.learnMore" : "Tudjon meg többet",
@@ -59,16 +70,16 @@
    "menu.help.support" : "Támogatás",
    "menu.help.tos" : "Felhasználói feltételek",
    "menu.services" : "Szolgáltatások",
-   "menu.services.addNewService" : "Új kiszolgál�� hozzáadása",
+   "menu.services.addNewService" : "Új szolgáltat��s hozzáadása...",
    "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",
    "menu.view.reloadFranz" : "Franz újrainditása",
-   "menu.view.reloadService" : "Kiszolgál�� újraindítása",
+   "menu.view.reloadService" : "Szolgáltat��s újraindítása",
    "menu.view.resetZoom" : "Tényleges méret",
-   "menu.view.toggleDevTools" : "fejlesztői eszközök bekapcsolása",
-   "menu.view.toggleFullScreen" : "Váltás Teljes képernyős módra",
-   "menu.view.toggleServiceDevTools" : "Kiszolgál�� Fejlesztői Eszközök Bekapcsolása",
+   "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.zoomIn" : "Nagyítás",
    "menu.view.zoomOut" : "Kicsinyítés",
    "menu.window" : "Ablak",
@@ -81,13 +92,13 @@
    "password.noUser" : "Nem található felhasználó a megadott email címmel",
    "password.submit.label" : "Küldés",
    "password.successInfo" : "Ellenőrizd az email fiókodat",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Fiók frissítése",
    "pricing.headline" : "Támogasd a Franz-ot",
    "pricing.link.skipPayment" : "Nem szeretném támogatni a Franz fejlesztését.",
-   "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését.",
+   "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését",
    "pricing.support.label" : "Válaszd ki a támogatás módját",
    "service.crashHandler.action" : "{name} újratöltése",
-   "service.crashHandler.autoReload" : "Megpróbáljuk automatikusan helyreállítani {name}-t {seconds} mp-en belül",
+   "service.crashHandler.autoReload" : "{name} automatikusan helyreállítása {seconds} másodpercen belül",
    "service.crashHandler.headline" : "Jajj ne!",
    "service.crashHandler.text" : "{name} hibát okozott.",
    "service.disabledHandler.action" : "{name} engedélyezése",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "{name} szerkesztése",
    "service.errorHandler.headline" : "Jajj ne!",
    "service.errorHandler.message" : "Hiba",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} nem tudott betöltődni.",
    "services.getStarted" : "Kezdj hozzá",
    "services.welcome" : "Üdvözöl a Franz",
    "settings.account.account.editButton" : "Fiók szerkesztése",
@@ -108,7 +119,7 @@
    "settings.account.deleteInfo" : "Ha még nem szeretnéd fenntartani a Franz-fiókodat, akkor itt törölheted minden hozzá kapcsolódó adattal együtt.",
    "settings.account.headline" : "Fiók",
    "settings.account.headlineAccount" : "Fiókinformációk",
-   "settings.account.headlineDangerZone" : "Veszélyes terület, óvatosan!",
+   "settings.account.headlineDangerZone" : "Veszélyes terület",
    "settings.account.headlineInvoices" : "Számlák",
    "settings.account.headlinePassword" : "Jelszócsere",
    "settings.account.headlineProfile" : "Profil frissítése",
@@ -122,13 +133,13 @@
    "settings.app.buttonClearAllCache" : "Gyorsítótár törlése",
    "settings.app.buttonInstallUpdate" : "Újraindítás és frissítések telepítése",
    "settings.app.buttonSearchForUpdate" : "Frissítések keresése",
-   "settings.app.cacheInfo" : "A Franz gyorsítótár jelenleg {space} lemezterületet használ.",
+   "settings.app.cacheInfo" : "A Franz gyorsítótár jelenleg {size} lemezterületet használ.",
    "settings.app.currentVersion" : "Aktuális verzió:",
    "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
    "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
    "settings.app.form.beta" : "Béta verziók keresése",
-   "settings.app.form.darkMode" : "Join the Dark Side",
-   "settings.app.form.enableGPUAcceleration" : "hardveres gyorsítás engedélyezése",
+   "settings.app.form.darkMode" : "Csatlakozz a Sötét Oldalhoz",
+   "settings.app.form.enableGPUAcceleration" : "Hardveres gyorsítás engedélyezése",
    "settings.app.form.enableMenuBar" : "Franz megjelenítése a menüsorban",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
@@ -137,8 +148,8 @@
    "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
    "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Mutass az 'olvasatlan üzenet' jelzést amikor az értesítések le vannak tiltva.",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
+   "settings.app.form.spellcheckerLanguage" : "Helyesírás-ellenőrző nyelve",
    "settings.app.headline" : "Beállítások",
    "settings.app.headlineAdvanced" : "Haladó",
    "settings.app.headlineAppearance" : "Megjelenés",
@@ -151,7 +162,7 @@
    "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
    "settings.app.updateStatusSearching" : "Frissítéseket keres",
    "settings.app.updateStatusUpToDate" : "A Franz legfrissebb verzióját használod",
-   "settings.invite.headline" : "Barát meghívása",
+   "settings.invite.headline" : "Barátok meghívása",
    "settings.navigation.account" : "Fiók",
    "settings.navigation.availableServices" : "Elérhető szolgáltatások",
    "settings.navigation.inviteFriends" : "Barát meghívása",
@@ -164,7 +175,7 @@
    "settings.recipes.missingService" : "Hiányzik egy szolgáltatás?",
    "settings.recipes.mostPopular" : "Legnépszerűbb",
    "settings.recipes.nothingFound" : "Sajnáljuk, nincs egyezés a szolgáltatások között a keresett kifejezésre.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva",
    "settings.searchService" : "Szolgáltatások keresése",
    "settings.service.error.goBack" : "Vissza a szolgáltatásokhoz",
    "settings.service.error.headline" : "Hiba",
@@ -174,12 +185,12 @@
    "settings.service.form.customUrl" : "Egyéni szerver",
    "settings.service.form.customUrlPremiumInfo" : "Egyénileg üzemeltetett szolgáltatások hozzáadásához Franz Prémium Támogató Fiók szükséges.",
    "settings.service.form.customUrlUpgradeAccount" : "Frissítsd fiókodat",
-   "settings.service.form.customUrlValidationError" : "Nem sikerült hitelesíteni az egyéni {name} szervert.",
+   "settings.service.form.customUrlValidationError" : "Nem sikerült érvényesíteni az egyéni {name} kiszolgálót.",
    "settings.service.form.deleteButton" : "Szolgáltatás törlése",
    "settings.service.form.editServiceHeadline" : "{name} szerkesztése",
    "settings.service.form.enableAudio" : "Hang engedélyezése",
    "settings.service.form.enableBadge" : "Mutasd az olvasatlan jelzéseket",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Sötét mód engedélyezése",
    "settings.service.form.enableNotification" : "Értesítések engedélyezése",
    "settings.service.form.enableService" : "Szolgáltatás engedélyezése",
    "settings.service.form.headlineBadges" : "Olvasatlan üzenet jelzések",
@@ -188,31 +199,31 @@
    "settings.service.form.icon" : "Egyedi ikon",
    "settings.service.form.iconDelete" : "Törlés",
    "settings.service.form.iconUpload" : "Húzd ide a képet, vagy kattints ide",
-   "settings.service.form.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna @here és egyéb említések esetén",
+   "settings.service.form.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna, @here és egyéb említések esetén",
    "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
-   "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül.",
+   "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül",
    "settings.service.form.name" : "Név",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy beállítások",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "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.info" : "Proxy beállítások nem szinkronizálódnak a Franz kiszolgálókkal.",
+   "settings.service.form.proxy.isEnabled" : "Proxy használata",
+   "settings.service.form.proxy.password" : "Jelszó (opcionális)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.restartInfo" : "Kérjük indítsd újra a Franz-ot a proxy beállítások megváltoztatása után.",
+   "settings.service.form.proxy.user" : "Felhasználó (opcionális)",
    "settings.service.form.saveButton" : "Szolgáltatás mentése",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Helyesírás-ellenőrző nyelve",
+   "settings.service.form.spellcheckerLanguage.default" : "Rendszer alapbeállítás használata ({default})",
    "settings.service.form.tabHosted" : "Üzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
-   "settings.service.form.useHostedService" : "A távoli {name} szolgáltatás használata",
+   "settings.service.form.useHostedService" : "A távoli {name} szolgáltatás használata.",
    "settings.service.form.yourServices" : "Szolgáltatásaid",
    "settings.services.deletedInfo" : "A szolgáltatás törlésre került",
    "settings.services.discoverServices" : "Szolgáltatások felfedezése",
    "settings.services.headline" : "Szolgáltatásaid",
    "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.",
-   "settings.services.tooltip.isDisabled" : "Ez a szolgáltatás le van tiltva.",
+   "settings.services.tooltip.isDisabled" : "A szolgáltatás le van tiltva",
    "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
    "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
    "settings.services.updatedInfo" : "A módosításokat elmentettük",
@@ -243,13 +254,13 @@
    "signup.submit.label" : "Fiók létrehozása",
    "subscription.euTaxInfo" : "EU állampolgárok: helyi vásárlás esetén adók kerülhetnek felszámolásra",
    "subscription.features.ads" : "Hirdetésmentes, mindig!",
-   "subscription.features.comingSoon" : "Hamarosan!",
+   "subscription.features.comingSoon" : "hamarosan",
    "subscription.features.encryptedSync" : "Titkosított munkamenet szinkronizálás",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Nincs több app késlekedés és liszencfrissítési piszkálás",
    "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
+   "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
+   "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
    "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
    "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
    "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
@@ -268,8 +279,8 @@
    "tabs.item.enableService" : "Szolgáltatás engedélyezése",
    "tabs.item.reload" : "Újratöltés",
    "validation.email" : "{field} nem érvényes",
-   "validation.minLength" : "{field} legalább {length} karakter hosszúnak kell lennie",
-   "validation.required" : "{field} Kitöltése kötelező",
+   "validation.minLength" : "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
+   "validation.required" : "{field} kitöltése kötelező",
    "validation.url" : "{field} nem érvényes URL",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
    "welcome.signupButton" : "Új fiók létrehozása",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 11596d142..6abbf064b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Muat Ulang",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Terjadi kesalahan",
    "feature.delayApp.action" : "Dapatkan Franz Supporter License",
    "feature.delayApp.headline" : "Beli Franz Supporter License agar tidak perlu menunggu",
    "feature.delayApp.text" : "Franz akan melanjutkan dalam {seconds} detik.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
    "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
+   "global.spellchecker.useDefault" : "Gunakan Bawaan Sistem ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Periksa ejaan",
    "import.headline" : "Impor layanan Franz 4 Anda",
    "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
    "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
@@ -92,11 +103,11 @@
    "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
    "service.disabledHandler.action" : "Aktifkan {name}",
    "service.disabledHandler.headline" : "{name} dinonaktifkan",
-   "service.errorHandler.action" : "Muat Ulang {name}",
+   "service.errorHandler.action" : "Muat ulang {name}",
    "service.errorHandler.editAction" : "Edit {nama}",
-   "service.errorHandler.headline" : "Ya Ampun!",
+   "service.errorHandler.headline" : "Oh tidak!",
    "service.errorHandler.message" : "Kesalahan",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} gagal dimuat",
    "services.getStarted" : "Ayo mulai!",
    "services.welcome" : "Selamat datang di Franz",
    "settings.account.account.editButton" : "Edit akun",
@@ -167,7 +178,7 @@
    "settings.recipes.servicesSuccessfulAddedInfo" : "Layanan berhasil ditambahkan",
    "settings.searchService" : "Cari layanan",
    "settings.service.error.goBack" : "Kembali ke layanan",
-   "settings.service.error.headline" : "Kesalahan",
+   "settings.service.error.headline" : "Terjadi kesalahan",
    "settings.service.error.message" : "Tidak dapat memuat konfigurasi layanan.",
    "settings.service.form.addServiceHeadline" : "Tambahkan {name}",
    "settings.service.form.availableServices" : "Layanan tersedia",
@@ -176,7 +187,7 @@
    "settings.service.form.customUrlUpgradeAccount" : "Tingkatkan akun Anda",
    "settings.service.form.customUrlValidationError" : "Gagal memvalidasi server {nama} khusus.",
    "settings.service.form.deleteButton" : "Hapus layanan",
-   "settings.service.form.editServiceHeadline" : "Edit {nama}",
+   "settings.service.form.editServiceHeadline" : "Edit {name}",
    "settings.service.form.enableAudio" : "Aktifkan audio",
    "settings.service.form.enableBadge" : "Tampilkan lencana pesan belum dibaca",
    "settings.service.form.enableDarkMode" : "Aktifkan Mode Gelap",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan baru",
    "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
    "settings.service.form.name" : "Nama",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Pengaturan Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Host\/IP Proksi",
    "settings.service.form.proxy.info" : "Pengaturan proksi tidak akan disinkronkan dengan server Franz.",
    "settings.service.form.proxy.isEnabled" : "Gunakan Proksi",
    "settings.service.form.proxy.password" : "Sandi (opsional)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.restartInfo" : "Silahkan mulai ulang Franz setelah mengubah Setelan proxy",
    "settings.service.form.proxy.user" : "Pengguna (opsional)",
    "settings.service.form.saveButton" : "Simpan layanan",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Periksa ejaan Bahasa",
+   "settings.service.form.spellcheckerLanguage.default" : "Gunakan Bawaan Sistem ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 47cbd8f1e..b63b30a90 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Ricarica",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Qualcosa è andato storto",
    "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
    "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
    "feature.delayApp.text" : "Franz continuerà a funzionare tra {seconds} secondi.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
    "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
+   "global.spellchecker.useDefault" : "Usa le impostazioni predefinite di sistema ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Lingua per controllo ortografico",
    "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",
@@ -81,7 +92,7 @@
    "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo e-mail",
    "password.submit.label" : "Invia",
    "password.successInfo" : "Per favore controlla la tua email",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Effettua l'upgrade del tuo account",
    "pricing.headline" : "Supporta Franz",
    "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Modifica {name}",
    "service.errorHandler.headline" : "Oh no!",
    "service.errorHandler.message" : "Errore",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} non si è caricato correttamente.",
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto su Franz",
    "settings.account.account.editButton" : "Modifica account",
@@ -138,7 +149,7 @@
    "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.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Lingua per controllo ortografico",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Mostra l'etichetta per tutti i nuovi messaggi",
    "settings.service.form.isMutedInfo" : "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Impostazioni Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "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 Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "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 Franz dopo aver cambiato le impostazioni del proxy.",
+   "settings.service.form.proxy.user" : "Utente (opzionale)",
    "settings.service.form.saveButton" : "Salva servizio",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Lingua per controllo ortografico",
+   "settings.service.form.spellcheckerLanguage.default" : "Usa le impostazioni predefinite di sistema ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
    "settings.service.form.team" : "Gruppo",
@@ -245,11 +256,11 @@
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
    "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "L'upgrade della licenza avrà impatti sull'utilizzo dell'App",
    "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hosted come HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "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.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
    "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 6eea64c3a..838dc81ea 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,16 +1,27 @@
 {
    "app.errorHandler.action" : "再読み込み",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Franz サポーターライセンスを購入する",
-   "feature.delayApp.headline" : "Franz をすぐに起動するには、Franz サポーターライセンスを購入してください。",
-   "feature.delayApp.text" : "Franz はあと{seconds}秒後に起動します。",
+   "app.errorHandler.headline" : "間違えている部分があります",
+   "feature.delayApp.action" : "Franzサポーターライセンスを購入する",
+   "feature.delayApp.headline" : "Franzをすぐに起動するには、Franz サポーターライセンスを購入してください。",
+   "feature.delayApp.text" : "Franzはあと{seconds}秒後に起動します。",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Franzのオンラインサービスに接続できません。",
    "global.notConnectedToTheInternet" : "インターネットに接続されていません。",
+   "global.spellchecker.useDefault" : " {default}を初期設定で使用してください",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "スペルチェックする言語",
    "import.headline" : "Franz 4のサービスをインポートして下さい",
    "import.notSupportedHeadline" : "Franz 5ではこのサービスにまだ対応していません",
    "import.skip.label" : "手動でサービスを追加する",
    "import.submit.label" : "サービスをインポートして下さい",
-   "infobar.buttonChangelog" : "���新の情���",
+   "infobar.buttonChangelog" : "���新��歴を見る",
    "infobar.buttonInstallUpdate" : "再起動して更新をインストールする",
    "infobar.buttonReloadServices" : "サービスの再読み込み",
    "infobar.requiredRequestsFailed" : "サービスとユーザー情報を読み込めませんでした",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "{name}を編集",
    "service.errorHandler.headline" : "しまった！",
    "service.errorHandler.message" : "エラー",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} はロードに失敗しました",
    "services.getStarted" : "はじめる",
    "services.welcome" : "Franzにようこそ",
    "settings.account.account.editButton" : "アカウントの編集",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "すべての新規メッセージについてバッジを表示する",
    "settings.service.form.isMutedInfo" : "無効化されている場合、全ての通知音やオーディオ再生は無音になります",
    "settings.service.form.name" : "サービス名",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPSのプロキシ設定",
    "settings.service.form.proxy.host" : "プロキシサーバー\/IP",
    "settings.service.form.proxy.info" : "プロキシ設定はFranz アカウントで同期されません。",
    "settings.service.form.proxy.isEnabled" : "プロキシ設定を有効にする",
    "settings.service.form.proxy.password" : "パスワード（任意）",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "ポート",
+   "settings.service.form.proxy.restartInfo" : "プロキシ設定を変更してから、Franzを再起動してください",
    "settings.service.form.proxy.user" : "ユーザー名（任意）",
    "settings.service.form.saveButton" : "サービスの保存",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "言語のスペルチェック",
+   "settings.service.form.spellcheckerLanguage.default" : " {default}を初期設定で使用してください",
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ⭐️",
    "settings.service.form.team" : "チーム",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 632ca618e..ec0cdd375 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -4,8 +4,19 @@
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Franz-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
    "global.notConnectedToTheInternet" : "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "შემოიტანე Franz 4-ის სერვისები",
    "import.notSupportedHeadline" : "სერვისები ჯერ არ არის მხარდაჭერილი Franz 5-ში",
    "import.skip.label" : "I want to add services manually",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index c38a7f024..2082edd6d 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,74 +1,85 @@
 {
    "app.errorHandler.action" : "Herladen",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Er ging iets mis",
+   "feature.delayApp.action" : "Neem een Franz Supporter Licentie ",
+   "feature.delayApp.headline" : "Neem een Franz Supporter Licentie om niet meer te hoeven wachten",
+   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
    "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
+   "global.spellchecker.useDefault" : "Gebruik Systeemstandaard ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Taal spellingscontrole",
    "import.headline" : "Importeer je Franz 4 services",
    "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
-   "import.skip.label" : "Ik wens services manueel toe te voegen",
+   "import.skip.label" : "Ik wil services handmatig toevoegen",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
-   "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
-   "infobar.buttonReloadServices" : "Herlaad de services",
-   "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
-   "infobar.servicesUpdated" : "Je services zijn geüpdatet.",
-   "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
+   "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
+   "infobar.buttonReloadServices" : "Services opnieuw laden",
+   "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
+   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
+   "infobar.updateAvailable" : "Er is een nieuwe update voor Franz beschikbaar.",
    "invite.email.label" : "E-mailadres",
    "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
-   "invite.submit.label" : "Verzend uitnodigingen",
+   "invite.submit.label" : "Uitnodigingen verzenden",
    "invite.successInfo" : "Uitnodiging met succes verzonden",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
    "login.link.password" : "Wachtwoord resetten",
-   "login.link.signup" : "Maak een gratis account",
+   "login.link.signup" : "Maak een gratis account aan",
    "login.password.label" : "Wachtwoord",
    "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
-   "login.submit.label" : "Log in",
+   "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "menu.app.about" : "Over Franz",
    "menu.app.hide" : "Verbergen",
-   "menu.app.hideOthers" : "Andere verbergen",
+   "menu.app.hideOthers" : "Andere Verbergen",
    "menu.app.quit" : "Afsluiten",
    "menu.app.settings" : "Instellingen",
-   "menu.app.unhide" : "Zichtbaar maken",
-   "menu.edit" : "Aanpassen",
+   "menu.app.unhide" : "Tonen",
+   "menu.edit" : "Bewerken",
    "menu.edit.copy" : "Kopiëren",
    "menu.edit.cut" : "Knippen",
    "menu.edit.delete" : "Verwijderen",
    "menu.edit.emojiSymbols" : "Emoji & Symbolen",
    "menu.edit.paste" : "Plakken",
    "menu.edit.pasteAndMatchStyle" : "Plakken en stijl overeen laten komen",
-   "menu.edit.redo" : "Opnieuw uitvoeren",
-   "menu.edit.selectAll" : "Selecteer alles",
+   "menu.edit.redo" : "Opnieuw doen",
+   "menu.edit.selectAll" : "Selecteer Alles",
    "menu.edit.speech" : "Spraakuitvoer",
    "menu.edit.startDictation" : "Beginnen met dicteren",
-   "menu.edit.startSpeaking" : "Begin met spreken",
-   "menu.edit.stopSpeaking" : "Stoppen met spreken",
+   "menu.edit.startSpeaking" : "Begin met Spreken",
+   "menu.edit.stopSpeaking" : "Stoppen met Spreken",
    "menu.edit.undo" : "Ongedaan maken",
    "menu.file" : "Bestand",
    "menu.help" : "Help",
    "menu.help.changelog" : "Logboek",
-   "menu.help.learnMore" : "Meer weten",
+   "menu.help.learnMore" : "Meer Weten",
    "menu.help.privacy" : "Privacyverklaring",
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
-   "menu.services" : "Diensten",
+   "menu.services" : "Services",
    "menu.services.addNewService" : "Nieuwe service toevoegen...",
-   "menu.view" : "Beeld",
+   "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Volledig scherm openen",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
    "menu.view.reloadFranz" : "Franz Herladen",
-   "menu.view.reloadService" : "Service herladen",
-   "menu.view.resetZoom" : "Werkelijke grootte",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Volledig scherm aan\/uit",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.reloadService" : "Service Herladen",
+   "menu.view.resetZoom" : "Werkelijke Grootte",
+   "menu.view.toggleDevTools" : "Ontwikkelaarstools Aan\/Uit",
+   "menu.view.toggleFullScreen" : "Volledig Scherm Aan\/Uit",
+   "menu.view.toggleServiceDevTools" : "Service Ontwikkelaarstools Aan\/Uit",
    "menu.view.zoomIn" : "Inzoomen",
    "menu.view.zoomOut" : "Uitzoomen",
    "menu.window" : "Venster",
@@ -78,47 +89,47 @@
    "password.headline" : "Wachtwoord resetten",
    "password.link.login" : "Log in op je account",
    "password.link.signup" : "Maak een gratis account",
-   "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
-   "password.submit.label" : "Doorgaan",
+   "password.noUser" : "Geen gebruiker gevonden met dat e-mailadres",
+   "password.submit.label" : "Verzenden",
    "password.successInfo" : "Controleer alsjeblieft je e-mail",
    "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Ondersteun Franz",
+   "pricing.headline" : "Steun Franz",
    "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
    "service.crashHandler.action" : "{naam} herladen",
-   "service.crashHandler.autoReload" : "Automatisch herstellen {name} proberen in {seconds} seconden",
+   "service.crashHandler.autoReload" : "Ga proberen om {name} te herstellen over {seconds} seconden",
    "service.crashHandler.headline" : "Oh nee!",
    "service.crashHandler.text" : "{name} heeft een probleem veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
    "service.errorHandler.action" : "{naam} herladen",
-   "service.errorHandler.editAction" : "{name} aanpassen",
+   "service.errorHandler.editAction" : "Bewerk {name}",
    "service.errorHandler.headline" : "Oh nee!",
    "service.errorHandler.message" : "Fout",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} kon niet geladen worden.",
    "services.getStarted" : "Beginnen",
    "services.welcome" : "Welkom bij Franz",
-   "settings.account.account.editButton" : "Bewerk account",
+   "settings.account.account.editButton" : "Account bewerken",
    "settings.account.accountType.basic" : "Basis Account",
    "settings.account.accountType.premium" : "Premium Supporter Account",
-   "settings.account.buttonSave" : "Profiel aanpassen",
+   "settings.account.buttonSave" : "Profiel bijwerken",
    "settings.account.deleteAccount" : "Account verwijderen",
    "settings.account.deleteEmailSent" : "U heeft een email ontvangen met een bevestiginslink om uw account te verwijderen. Uw account en de bijhorende gegevens kunnen niet meer worden herstel na deze actie!",
-   "settings.account.deleteInfo" : "Indien u uw Franz account nietmeer nodig heeft, kan u hier uw account en de gerelateerde gegegevens verwijderen.",
+   "settings.account.deleteInfo" : "Indien u uw Franz account niet meer nodig heeft, kan u hier uw account en alle gerelateerde gegevens verwijderen.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Account informatie",
-   "settings.account.headlineDangerZone" : "Gevaren Zone",
+   "settings.account.headlineDangerZone" : "Gevarenzone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
-   "settings.account.headlineProfile" : "Profiel aanpassen",
+   "settings.account.headlineProfile" : "Profiel bijwerken",
    "settings.account.headlineSubscription" : "Je abonnement",
    "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
-   "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache wissen",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
@@ -126,47 +137,47 @@
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
-   "settings.app.form.beta" : "Inclusief bèta versies",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.beta" : "Inclusief beta versies",
+   "settings.app.form.darkMode" : "Word lid van de Dark Side",
    "settings.app.form.enableGPUAcceleration" : "GPU Acceleratie Activeren",
    "settings.app.form.enableMenuBar" : "Toon Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Verberg Franz in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+   "settings.app.form.spellcheckerLanguage" : "Taal spellingscontrole",
    "settings.app.headline" : "Instellingen",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Geavanceerd",
+   "settings.app.headlineAppearance" : "Weergave",
    "settings.app.headlineGeneral" : "Algemeen",
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
-   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
    "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Nodig vrienden uit",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Beschikbare services",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
    "settings.navigation.logout" : "Uitloggen",
    "settings.navigation.settings" : "Instellingen",
    "settings.navigation.yourServices" : "Jouw services",
    "settings.recipes.all" : "Alle services",
    "settings.recipes.dev" : "Ontwikkeling",
    "settings.recipes.headline" : "Beschikbare services",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Mist er een service?",
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Sorry, maar geen enkele service kwam overeen met je zoekterm.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
-   "settings.searchService" : "Search service",
-   "settings.service.error.goBack" : "Terug naar de services",
+   "settings.searchService" : "Service zoeken",
+   "settings.service.error.goBack" : "Terug naar services",
    "settings.service.error.headline" : "Fout",
    "settings.service.error.message" : "Kon het service-recept niet laden.",
    "settings.service.form.addServiceHeadline" : "{name} toevoegen",
@@ -177,62 +188,62 @@
    "settings.service.form.customUrlValidationError" : "Kon de custom {name} server niet valideren.",
    "settings.service.form.deleteButton" : "Service verwijderen",
    "settings.service.form.editServiceHeadline" : "{name} aanpassen",
-   "settings.service.form.enableAudio" : "Enable audio",
-   "settings.service.form.enableBadge" : "Show unread message badges",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableAudio" : "Audio inschakelen",
+   "settings.service.form.enableBadge" : "Toon badges met ongelezen berichten",
+   "settings.service.form.enableDarkMode" : "Dark Mode aanzetten",
    "settings.service.form.enableNotification" : "Notificaties aanzetten",
    "settings.service.form.enableService" : "Service aanzetten",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Ongelezen berichten badges",
    "settings.service.form.headlineGeneral" : "Algemeen",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.headlineNotifications" : "Meldingen",
+   "settings.service.form.icon" : "Aangepast icoon",
    "settings.service.form.iconDelete" : "Verwijderen",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.iconUpload" : "Sleep en drop je afbeelding, of klik hier",
    "settings.service.form.indirectMessageInfo" : "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldingsgeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Instellingen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "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 Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
-   "settings.service.form.saveButton" : "Service bewaren",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.proxy.info" : "Proxy instellingen worden niet gesynchroniseerd met de Franz servers.",
+   "settings.service.form.proxy.isEnabled" : "Proxy gebruiken",
+   "settings.service.form.proxy.password" : "Wachtwoord (optioneel)",
+   "settings.service.form.proxy.port" : "Poort",
+   "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw op na het aanpassen van proxy Instellingen.",
+   "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
+   "settings.service.form.saveButton" : "Service opslaan",
+   "settings.service.form.spellcheckerLanguage" : "Taal spellingscontrole",
+   "settings.service.form.spellcheckerLanguage.default" : "Gebruik Systeemstandaard ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
    "settings.service.form.team" : "Team",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Gebruik de gehoste {name} service.",
    "settings.service.form.yourServices" : "Jouw services",
    "settings.services.deletedInfo" : "Service werd verwijderd",
    "settings.services.discoverServices" : "Services ontdekken",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
-   "settings.services.tooltip.isDisabled" : "Service staat uit",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
+   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
-   "settings.services.updatedInfo" : "Je wijzigingen werden bewaard",
+   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.user.form.accountType.company" : "Bedrijf",
    "settings.user.form.accountType.individual" : "Particulier",
    "settings.user.form.accountType.label" : "Account type",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Huidig wachtwoord",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "Naam",
+   "settings.user.form.firstname" : "Voornaam",
    "settings.user.form.lastname" : "Achternaam",
    "settings.user.form.newPassword" : "Nieuw wachtwoord",
-   "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.addNewService" : "Nieuw service toevoegen",
+   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
    "sidebar.settings" : "Instellingen",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
    "signup.company.label" : "Bedrijf",
    "signup.email.label" : "E-mailadres",
-   "signup.emailDuplicate" : "Er bestaat reeds een gebruiker met dat e-mailadres",
-   "signup.firstname.label" : "Naam",
+   "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
+   "signup.firstname.label" : "Voornaam",
    "signup.headline" : "Registreren",
    "signup.lastname.label" : "Achternaam",
    "signup.legal.info" : "Door een account aan te maken aanvaard je de",
@@ -241,15 +252,15 @@
    "signup.link.login" : "Al een account, inloggen?",
    "signup.password.label" : "Wachtwoord",
    "signup.submit.label" : "Account aanmaken",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen reclame, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
    "subscription.features.encryptedSync" : "Synchronisatie van geëncrypteerde sessies",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
    "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
+   "subscription.features.proxy" : "Proxy ondersteuning voor services",
+   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
    "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
    "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
@@ -259,19 +270,19 @@
    "subscriptionPopup.buttonCancel" : "Annuleren",
    "subscriptionPopup.buttonDone" : "Klaar",
    "tabs.item.deleteService" : "Service verwijderen",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Audio uitschakelen",
    "tabs.item.disableNotifications" : "Notificaties uitschakelen",
    "tabs.item.disableService" : "Service uitschakelen",
    "tabs.item.edit" : "Aanpassen",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Audio inschakelen",
    "tabs.item.enableNotification" : "Notificaties inschakelen",
-   "tabs.item.enableService" : "Service aanzetten",
+   "tabs.item.enableService" : "Service inschakelen",
    "tabs.item.reload" : "Herladen",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} is niet geldig",
+   "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.required" : "{field} is vereist",
+   "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Inloggen op je account",
    "welcome.signupButton" : "Maak een gratis account aan",
-   "welcome.slogan" : "Messaging that works for you"
+   "welcome.slogan" : "Messaging die voor jou werkt"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 940f24b0b..df0549a28 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,11 +1,22 @@
 {
-   "app.errorHandler.action" : "Laad opnieuw",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.action" : "Herladen",
+   "app.errorHandler.headline" : "Er ging iets mis",
    "feature.delayApp.action" : "Sponsor Franz",
    "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
    "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
+   "global.spellchecker.useDefault" : "Gebruik systeemstandaard ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spelling checken",
    "import.headline" : "Importeer uw Franz 4-services",
    "import.notSupportedHeadline" : "Services die nog niet ondersteund worden in Franz 5",
    "import.skip.label" : "Ik wil services handmatig toevoegen",
@@ -92,11 +103,11 @@
    "service.crashHandler.text" : "{name} heeft een fout veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
-   "service.errorHandler.action" : "Laad {name} opnieuw",
+   "service.errorHandler.action" : "{name} herladen",
    "service.errorHandler.editAction" : "Bewerk {name}",
    "service.errorHandler.headline" : "Oh nee!",
    "service.errorHandler.message" : "Fout",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} kon niet geladen worden.",
    "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy instellingen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy instellingen worden niet gesynchroniseerd met de Franz servers",
    "settings.service.form.proxy.isEnabled" : "Proxy gebruiken",
    "settings.service.form.proxy.password" : "Wachtwoord (optioneel)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "Poort",
+   "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw na het aanpassen van proxy instellingen.",
    "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Spellingcontrole taal",
+   "settings.service.form.spellcheckerLanguage.default" : "Gebruik systeemstandaard ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ⭐️",
    "settings.service.form.team" : "Team",
@@ -247,7 +258,7 @@
    "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
    "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
    "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
    "subscription.features.proxy" : "Proxy understeuning voor diensten",
    "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
    "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
@@ -266,7 +277,7 @@
    "tabs.item.enableAudio" : "Audio inschakelen",
    "tabs.item.enableNotification" : "Meldingen inschakelen",
    "tabs.item.enableService" : "Service inschakelen",
-   "tabs.item.reload" : "Laad opnieuw",
+   "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
    "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
    "validation.required" : "{field} is vereist",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index d45e5ce24..e1a1747b3 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Przeładuj",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Coś poszło nie tak",
    "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
-   "feature.delayApp.headline" : "Kup licencję Franz Supporter , aby nie czekać",
+   "feature.delayApp.headline" : "Aby nie czekać kup licencję Franz Supporter",
    "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
    "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
+   "global.spellchecker.useDefault" : "Użyj domyślnego dla systemu ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Język słownika",
    "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",
@@ -25,7 +36,7 @@
    "login.email.label" : "Adres email",
    "login.headline" : "Zaloguj się",
    "login.invalidCredentials" : "Adres email lub hasło są błędne",
-   "login.link.password" : "Wyzeruj hasło",
+   "login.link.password" : "Przypomnij hasło",
    "login.link.signup" : "Załóż darmowe konto",
    "login.password.label" : "Hasło",
    "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
@@ -36,7 +47,7 @@
    "menu.app.hideOthers" : "Ukryj pozostałe",
    "menu.app.quit" : "Zakończ",
    "menu.app.settings" : "Ustawienia",
-   "menu.app.unhide" : "Pokaż",
+   "menu.app.unhide" : "Pokaż więcej",
    "menu.edit" : "Edytuj",
    "menu.edit.copy" : "Skopiuj",
    "menu.edit.cut" : "Wytnij",
@@ -68,20 +79,20 @@
    "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 serwisu",
+   "menu.view.toggleServiceDevTools" : "Włącz narzędzia developerskie usługi",
    "menu.view.zoomIn" : "Powiększ",
    "menu.view.zoomOut" : "Pomniejsz",
    "menu.window" : "Okno",
    "menu.window.close" : "Zamknij",
    "menu.window.minimize" : "Zminimalizuj",
    "password.email.label" : "Adres email",
-   "password.headline" : "Wyzeruj hasło",
+   "password.headline" : "Przypomnij hasło",
    "password.link.login" : "Zaloguj się na swoje konto",
    "password.link.signup" : "Stwórz darmowe konto",
    "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" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Ulepsz swoje konto",
    "pricing.headline" : "Wspieraj Franz",
    "pricing.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
    "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Edytuj {name}",
    "service.errorHandler.headline" : "O nie!",
    "service.errorHandler.message" : "Błąd",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "Nie udało się załadować {name}.",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
    "settings.account.account.editButton" : "Modyfikuj konta",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
    "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
    "settings.service.form.name" : "Nazwa",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Ustawienia Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Host Proxy\/IP",
    "settings.service.form.proxy.info" : "Ustawienia proxy nie będą zsynchronizowane z serwerami Franza.",
    "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" : "Please restart Franz after changing proxy Settings.",
+   "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.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Język sprawdzania pisowni",
+   "settings.service.form.spellcheckerLanguage.default" : "Użyj domyślnego dla systemu ({default})",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
    "settings.service.form.team" : "Zespół",
@@ -245,11 +256,11 @@
    "subscription.features.ads" : "Brak reklam, na zawsze!",
    "subscription.features.comingSoon" : "wkrótce dostępne",
    "subscription.features.encryptedSync" : "Szyfrowana synchronizacja sesji",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Bez opóźnień i przypominania o ulepszeniu licencji",
    "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
    "subscription.features.proxy" : "Obsługa proxy dla usług",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
    "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
    "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index c0cf0039f..0ab5bdd21 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Recarregar",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Alguma coisa deu errado",
    "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
    "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
    "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
    "global.notConnectedToTheInternet" : "Você não está conectado à internet",
+   "global.spellchecker.useDefault" : "Use o padrão do sistema ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Idioma de verificação ortográfica",
    "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",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Editar {name}",
    "service.errorHandler.headline" : "Ah, não!",
    "service.errorHandler.message" : "Erro",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} não pôde ser carregado.",
    "services.getStarted" : "Iniciar",
    "services.welcome" : "Bem-vindo ao Franz!",
    "settings.account.account.editButton" : "Editar conta",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
    "settings.service.form.isMutedInfo" : "Quando desativado, as notificações sonoras e áudios ficarão em silêncio",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Configurações de HTTP\/HTTPS Proxy",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "As configurações de proxy não serão sincronizadas com os servidores do Franz.",
    "settings.service.form.proxy.isEnabled" : "Usar o Proxy",
    "settings.service.form.proxy.password" : "Senha (opcional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "Porta",
+   "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.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Língua do corretor ortográfico",
+   "settings.service.form.spellcheckerLanguage.default" : "Use o padrão do sistema ({default})",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
    "settings.service.form.team" : "Equipe",
@@ -245,9 +256,9 @@
    "subscription.features.ads" : "Sem anúncios, pra sempre!",
    "subscription.features.comingSoon" : "em breve",
    "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Sem demora e sem chateação para comprar uma licença. ",
    "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "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.includedFeatures" : "A conta Apoiador Franz Premium inclui",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 80e8094f5..9e7455bdf 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,14 +1,25 @@
 {
    "app.errorHandler.action" : "Recarregar",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Alguma coisa correu mal",
+   "feature.delayApp.action" : "Faz parte do grupo de apoio do Franz",
+   "feature.delayApp.headline" : "Por favor compre uma licença Franz Supporter para saltar a fila de espera",
+   "feature.delayApp.text" : "Franz irá continuar em {seconds} segundos.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Não foi possível estabelecer ligação aos serviços do Franz",
-   "global.notConnectedToTheInternet" : "Não existe ligação à Internet",
-   "import.headline" : "Importe os seus serviços do Franz 4",
-   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
-   "import.skip.label" : "Pretendo adicionar serviços manualmente",
+   "global.notConnectedToTheInternet" : "Não estás ligado à Internet",
+   "global.spellchecker.useDefault" : "Utilizar o Sistema por Omissão ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Linguagem para correção ortográfica",
+   "import.headline" : "Importa os teus serviços do Franz",
+   "import.notSupportedHeadline" : "Estes serviços ainda não são suportados pelo Franz 5",
+   "import.skip.label" : "Eu quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "O que há de novo?",
    "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
@@ -66,7 +77,7 @@
    "menu.view.reloadFranz" : "Recarregar Franz",
    "menu.view.reloadService" : "Recarregar serviço",
    "menu.view.resetZoom" : "Tamanho Real",
-   "menu.view.toggleDevTools" : "Activar\/Desativar Ferramentas de Desenvolvimento",
+   "menu.view.toggleDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento",
    "menu.view.toggleFullScreen" : "Ativar\/Desativar Ecrã Completo",
    "menu.view.toggleServiceDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento de Serviços",
    "menu.view.zoomIn" : "Aumentar",
@@ -81,7 +92,7 @@
    "password.noUser" : "Não existe nenhuma conta associada a esse endereço de e-mail",
    "password.submit.label" : "Submeter",
    "password.successInfo" : "Por favor verifique o seu endereço de e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Atualiza a tua conta",
    "pricing.headline" : "Apoie o Franz",
    "pricing.link.skipPayment" : "Não pretendo patrocinar o desenvolvimento do Franz",
    "pricing.submit.label" : "Pretendo patrocinar o desenvolvimento do Franz",
@@ -96,11 +107,11 @@
    "service.errorHandler.editAction" : "Editar {name}",
    "service.errorHandler.headline" : "Oh não!",
    "service.errorHandler.message" : "Erro",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} falhou o carregamento",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
-   "settings.account.accountType.basic" : "Conta básica",
+   "settings.account.accountType.basic" : "Conta Básica",
    "settings.account.accountType.premium" : "Conta Premium",
    "settings.account.buttonSave" : "Atualizar o perfil",
    "settings.account.deleteAccount" : "Apagar conta",
@@ -127,7 +138,7 @@
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Iniciar o Franz após iniciar o computador",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Junta-te ao Lado Negro",
    "settings.app.form.enableGPUAcceleration" : "Activar Aceleração de GPU",
    "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
@@ -138,7 +149,7 @@
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
    "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Linguagem para correção ortográfica",
    "settings.app.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -151,10 +162,10 @@
    "settings.app.updateStatusAvailable" : "Atualização disponivel, a transferir...",
    "settings.app.updateStatusSearching" : "A procurar atualizações",
    "settings.app.updateStatusUpToDate" : "Está a usar a versão mais recente do Franz",
-   "settings.invite.headline" : "Convide amigos",
+   "settings.invite.headline" : "Convide Amigos",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.inviteFriends" : "Convide amigos",
+   "settings.navigation.inviteFriends" : "Convide Amigos",
    "settings.navigation.logout" : "Terminar sessão",
    "settings.navigation.settings" : "Definições",
    "settings.navigation.yourServices" : "Os seus serviços",
@@ -163,9 +174,9 @@
    "settings.recipes.headline" : "Serviços disponíveis",
    "settings.recipes.missingService" : "Falta um serviço?",
    "settings.recipes.mostPopular" : "Os mais populares",
-   "settings.recipes.nothingFound" : "Lamentamos, nenhum serviço corresponde ao pesquisado.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
-   "settings.searchService" : "Pesquisa de serviço",
+   "settings.recipes.nothingFound" : "Lamentamos, nenhum serviço corresponde ao termo pesquisado.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado com sucesso",
+   "settings.searchService" : "Pesquisar erviço",
    "settings.service.error.goBack" : "Voltar aos serviços",
    "settings.service.error.headline" : "Erro",
    "settings.service.error.message" : "Não foi possível carregar a receita do serviço.",
@@ -179,30 +190,30 @@
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Ativar áudio",
    "settings.service.form.enableBadge" : "Mostrar emblemas de mensagens não lidas",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Ativar o Tema Escuro",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
    "settings.service.form.headlineBadges" : "Emblema de mensagem não lida",
    "settings.service.form.headlineGeneral" : "Geral",
    "settings.service.form.headlineNotifications" : "Notificações",
-   "settings.service.form.icon" : "Personalizar ícone",
+   "settings.service.form.icon" : "Ícone personalizado",
    "settings.service.form.iconDelete" : "Apagar",
    "settings.service.form.iconUpload" : "Arraste a sua imagem, ou clique aqui",
    "settings.service.form.indirectMessageInfo" : "Será notificado sobre todas as novas mensagens num canal, não apenas @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
    "settings.service.form.isMutedInfo" : "Quando desativado, todos sons e reproduções de áudio serão silenciados",
    "settings.service.form.name" : "Nome",
-   "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 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 Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "Definições HTTP\/HTTPS Proxy",
+   "settings.service.form.proxy.host" : "Host\/IP proxy",
+   "settings.service.form.proxy.info" : "As definições do proxy não serão guardadas nos servidores do Franz.",
+   "settings.service.form.proxy.isEnabled" : "Usar Proxy",
+   "settings.service.form.proxy.password" : "Palavra-chave (opcional)",
+   "settings.service.form.proxy.port" : "Porta",
+   "settings.service.form.proxy.restartInfo" : "Reinicie, por favor, após atualizar as definições do Franz",
+   "settings.service.form.proxy.user" : "Utilizador (opcional)",
    "settings.service.form.saveButton" : "Guardar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Linguagem de correção ortográfica",
+   "settings.service.form.spellcheckerLanguage.default" : "Utilizar o Sistema por Omissão ({default})",
    "settings.service.form.tabHosted" : "Com domínio",
    "settings.service.form.tabOnPremise" : "Com domínio próprio ⭐️",
    "settings.service.form.team" : "Equipa",
@@ -211,7 +222,7 @@
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os seus serviços",
-   "settings.services.noServicesAdded" : "Ainda não adicionou um serviço.",
+   "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
@@ -245,11 +256,11 @@
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "em breve",
    "subscription.features.encryptedSync" : "Sincronização encriptada de sessão",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Sem atrasos na aplicação nem mensagens para comprar uma licença",
    "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
+   "subscription.features.proxy" : "Suporte Proxy para os serviços",
+   "subscription.features.spellchecker" : "Suporte para correção ortográfica",
    "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
    "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
@@ -268,7 +279,7 @@
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "{field} não é válido",
-   "validation.minLength" : "{field} deveria ter pelo menos {comprimento} caracteres",
+   "validation.minLength" : "{field} deveria ter pelo menos {length} caracteres",
    "validation.required" : "{field} é obrigatório",
    "validation.url" : "{field} não é uma hiperligação válida",
    "welcome.loginButton" : "Iniciar sessão",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index b605afc4d..6098c8ad9 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "Перезагрузить",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Что-то пошло не так",
+   "feature.delayApp.action" : "Получите лицензию Franz Supporter",
+   "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Franz Supporter чтобы отменить ожидание",
+   "feature.delayApp.text" : "Franz продолжит работу через {seconds} секунд.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Невозможно подключиться к онлайн-сервисам Franz",
    "global.notConnectedToTheInternet" : "Вы не подключены к сети Интернет",
+   "global.spellchecker.useDefault" : "Использовать системные параметры по умолчанию ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Проверка правописания",
    "import.headline" : "Импортировать ваши сервисы из Franz 4",
    "import.notSupportedHeadline" : "Сервисы пока ещё не поддерживаются в Franz 5",
    "import.skip.label" : "Я хочу добавить сервисы вручную",
@@ -58,7 +69,7 @@
    "menu.help.privacy" : "Политика конфиденциальности",
    "menu.help.support" : "Поддержка",
    "menu.help.tos" : "Условия использования",
-   "menu.services" : "С��������ы",
+   "menu.services" : "������������",
    "menu.services.addNewService" : "Добавить новый сервис...",
    "menu.view" : "Вид",
    "menu.view.enterFullScreen" : "На весь экран",
@@ -81,7 +92,7 @@
    "password.noUser" : "Не найдено пользователя с таким адресом электронной почты",
    "password.submit.label" : "Принять",
    "password.successInfo" : "Проверьте вашу электронную почту",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Перейти на платную подписку",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
    "pricing.submit.label" : "Я хочу поддержать разработку Franz",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Редактирование {name}",
    "service.errorHandler.headline" : "О, нет!",
    "service.errorHandler.message" : "Ошибка",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} не смог загрузиться.",
    "services.getStarted" : "Начать работу",
    "services.welcome" : "Добро пожаловать во Franz",
    "settings.account.account.editButton" : "Редактировать аккаунт",
@@ -127,7 +138,7 @@
    "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
    "settings.app.form.autoLaunchOnStart" : "Запускать Franz при старте",
    "settings.app.form.beta" : "Включая бета версии",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Перейти на Тёмную сторону",
    "settings.app.form.enableGPUAcceleration" : "Включить ускорение GPU",
    "settings.app.form.enableMenuBar" : "Показывать Franz на панели меню",
    "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
@@ -138,7 +149,7 @@
    "settings.app.form.runInBackground" : "Оставлять Franz в фоне при закрытии окна",
    "settings.app.form.showDisabledServices" : "Показывать вкладки отключённых служб",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Проверка правописания",
    "settings.app.headline" : "Настройки",
    "settings.app.headlineAdvanced" : "Дополнительно",
    "settings.app.headlineAppearance" : "Внешний вид",
@@ -176,10 +187,10 @@
    "settings.service.form.customUrlUpgradeAccount" : "Улучшить ваш аккаунт",
    "settings.service.form.customUrlValidationError" : "Невозможно проверить сервер {name}.",
    "settings.service.form.deleteButton" : "Удалить сервис",
-   "settings.service.form.editServiceHeadline" : "Редактирование {name}",
+   "settings.service.form.editServiceHeadline" : "Редактировать {name}",
    "settings.service.form.enableAudio" : "Включить звук",
    "settings.service.form.enableBadge" : "Показывать иконку непрочитанных сообщений",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Включить Тёмный режим",
    "settings.service.form.enableNotification" : "Включить уведомления",
    "settings.service.form.enableService" : "Включить сервис",
    "settings.service.form.headlineBadges" : "Значки непрочитанных сообщений",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений для всех новых сообщений",
    "settings.service.form.isMutedInfo" : "Когда выключено, все звуковые уведомления будут отключены",
    "settings.service.form.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 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 Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "Настройки Прокси HTTP\/HTTPS",
+   "settings.service.form.proxy.host" : "Прокси Host\/IP",
+   "settings.service.form.proxy.info" : "Настройки прокси не будут синхронизированны с серверами Franz",
+   "settings.service.form.proxy.isEnabled" : "Использовать прокси",
+   "settings.service.form.proxy.password" : "Пароль (опционально)",
+   "settings.service.form.proxy.port" : "Порт",
+   "settings.service.form.proxy.restartInfo" : "Пожалуйста перезапустите Franz после изменения настроек прокси.",
+   "settings.service.form.proxy.user" : "Пользователь (опционально)",
    "settings.service.form.saveButton" : "Сохранить сервис",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Проверка правописания",
+   "settings.service.form.spellcheckerLanguage.default" : "Использовать системные параметры по умолчанию ({default})",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
    "settings.service.form.team" : "Команда",
@@ -245,11 +256,11 @@
    "subscription.features.ads" : "Без рекламы, навсегда!",
    "subscription.features.comingSoon" : "скоро",
    "subscription.features.encryptedSync" : "Зашифрованные сессии синхронизации",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Никаких задержек и предложений перейти на платную версию",
    "subscription.features.onpremise" : "Добавление облачных служб или служб на своём хостинге типа HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Локальные\/размещенные на хостинге сервисы, такие как Mattermost",
+   "subscription.features.proxy" : "Подержка прокси для сервисов",
+   "subscription.features.spellchecker" : "Поддержка проверки правописания",
    "subscription.includedFeatures" : "Платный премиум аккаунт Franz включает",
    "subscription.paymentSessionError" : "Невозможно загрузить форму оплаты",
    "subscription.submit.label" : "Я хочу поддержать разработку Franz",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index ca7335fe9..35c699322 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -4,8 +4,19 @@
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nedá sa pripojiť k online službám Franz",
    "global.notConnectedToTheInternet" : "Nie ste pripojení k internetu.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Importovať vaše služby z Franz 4",
    "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
    "import.skip.label" : "Chcem pridať služby ručne",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index df0b849c4..8ffc0c007 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -4,8 +4,19 @@
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nije moguće pristupiti Franz-ovim on-line servisima. ",
    "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Uvezite svoje Franz 4 servise",
    "import.notSupportedHeadline" : "Servis trenutno nije podržan u Franz 5",
    "import.skip.label" : "Желим да додам услуге ручно",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 9e7619454..70632b966 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,13 +1,24 @@
 {
-   "app.errorHandler.action" : "Yeniden Yükle",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın.",
-   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın.",
+   "app.errorHandler.action" : "Tekrar Yükle",
+   "app.errorHandler.headline" : "Bir terslik çıktı",
+   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın",
+   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın",
    "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
-   "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor",
    "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
-   "import.headline" : "Franz 4 servislerinizi ekleyin.",
-   "import.notSupportedHeadline" : "Servisler henüz Franz 5'te desteklenmiyor.",
+   "global.spellchecker.useDefault" : "Sistem Dilini Kullan ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "İmla kontrol dili",
+   "import.headline" : "Franz 4 servislerinizi içeri aktarın",
+   "import.notSupportedHeadline" : "Henüz Franz 5'te desteklenmeyen servisler",
    "import.skip.label" : "Servisleri kendim eklemek istiyorum",
    "import.submit.label" : "Servisleri içe aktar",
    "infobar.buttonChangelog" : "Yeni ne var?",
@@ -15,7 +26,7 @@
    "infobar.buttonReloadServices" : "Hizmetleri yeniden yükle",
    "infobar.requiredRequestsFailed" : "Hizmetler ve kullanıcı bilgileri yüklenemedi",
    "infobar.servicesUpdated" : "Hizmetleriniz güncellendi.",
-   "infobar.updateAvailable" : "Yeni Franz güncellemesi mevcut",
+   "infobar.updateAvailable" : "Yeni Franz güncellemesi mevcut.",
    "invite.email.label" : "E-posta adresi",
    "invite.headline.friends" : "3 arkadaşını ya da çalışma arkadaşını davet et",
    "invite.name.label" : "Ad",
@@ -59,7 +70,7 @@
    "menu.help.support" : "Destek",
    "menu.help.tos" : "Kullanım Şartları",
    "menu.services" : "Hizmetler",
-   "menu.services.addNewService" : "Yeni Servis Ekle",
+   "menu.services.addNewService" : "Yeni servis ekle...",
    "menu.view" : "Görünüm",
    "menu.view.enterFullScreen" : "Tam Ekrana Geç",
    "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
@@ -81,7 +92,7 @@
    "password.noUser" : "Bu e-posta adresinde bir kullanıcı bulunamadı",
    "password.submit.label" : "Gönder",
    "password.successInfo" : "E-postanızı kontrol ediniz",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Hesabı Yükselt",
    "pricing.headline" : "Franz'ı Destekle",
    "pricing.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
    "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
@@ -92,11 +103,11 @@
    "service.crashHandler.text" : "{name} bir hataya neden oldu.",
    "service.disabledHandler.action" : "{name} aktif",
    "service.disabledHandler.headline" : "{name} devredışı",
-   "service.errorHandler.action" : "{name} yeniden yükle",
+   "service.errorHandler.action" : "{İsim} Yeniden Yükle",
    "service.errorHandler.editAction" : "{name} düzenle",
-   "service.errorHandler.headline" : "Aman Tanrım hayır!",
+   "service.errorHandler.headline" : "Hayııırrr!",
    "service.errorHandler.message" : "Hata",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} yüklenemedi.",
    "services.getStarted" : "Haydi başlayalım",
    "services.welcome" : "Franz'a Hoşgeldiniz",
    "settings.account.account.editButton" : "Hesabı düzenle",
@@ -118,7 +129,7 @@
    "settings.account.manageSubscription.label" : "Aboneliğini yönet",
    "settings.account.successInfo" : "Değişikliklerin kaydedildi",
    "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
-   "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi.",
+   "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi",
    "settings.app.buttonClearAllCache" : "Önbelleği temizle",
    "settings.app.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
    "settings.app.buttonSearchForUpdate" : "Güncellemeleri kontrol et",
@@ -127,7 +138,7 @@
    "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
    "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
    "settings.app.form.beta" : "Beta versiyonları dahil et",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Karanlık tarafa katıl",
    "settings.app.form.enableGPUAcceleration" : "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
    "settings.app.form.enableMenuBar" : "Menü çubuğunda Franz'ı göster",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
@@ -138,7 +149,7 @@
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
    "settings.app.form.showDisabledServices" : "Devre dışı bırakılan servis sekmelerini göster",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "İmla kontrol dili",
    "settings.app.headline" : "Ayarlar",
    "settings.app.headlineAdvanced" : "Gelişmiş",
    "settings.app.headlineAppearance" : "Görünüm",
@@ -168,7 +179,7 @@
    "settings.searchService" : "Hizmeti ara",
    "settings.service.error.goBack" : "Servislere geri dön",
    "settings.service.error.headline" : "Hata",
-   "settings.service.error.message" : "Servis tarifi yüklenemedi",
+   "settings.service.error.message" : "Servis tarifi yüklenemedi.",
    "settings.service.form.addServiceHeadline" : "{name} Ekle",
    "settings.service.form.availableServices" : "Mevcut servisler",
    "settings.service.form.customUrl" : "Özel sunucu",
@@ -176,10 +187,10 @@
    "settings.service.form.customUrlUpgradeAccount" : "Hesabını yükselt",
    "settings.service.form.customUrlValidationError" : "{name} özel sunucu doğrulanamadı.",
    "settings.service.form.deleteButton" : "Servisi sil",
-   "settings.service.form.editServiceHeadline" : "{name} düzenle",
+   "settings.service.form.editServiceHeadline" : "{İsim} Düzenle",
    "settings.service.form.enableAudio" : "Sesi etkinleştirin",
    "settings.service.form.enableBadge" : "Okunmamış mesajları göster",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Karanlık modu aç",
    "settings.service.form.enableNotification" : "Bildirimleri etkinleştir",
    "settings.service.form.enableService" : "Servisi etkinleştir",
    "settings.service.form.headlineBadges" : "Okunmamış mesajlar",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Mesaj rozetini tüm yeni mesajlar için göster",
    "settings.service.form.isMutedInfo" : "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
    "settings.service.form.name" : "İsim",
-   "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 Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Ayarları",
+   "settings.service.form.proxy.host" : "Proxy Sunucusu\/IP",
+   "settings.service.form.proxy.info" : "Proxy ayarları Franz serverlarına yüklenmeyecektir.",
+   "settings.service.form.proxy.isEnabled" : "Proxy Kullan",
+   "settings.service.form.proxy.password" : "Parola (opsiyonel)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.restartInfo" : "Proxy ayarlarını değiştirdikten sonra Franz'ı yeniden başlatınız.",
+   "settings.service.form.proxy.user" : "Kullanıcı (opsiyonel)",
    "settings.service.form.saveButton" : "Servisi kaydet",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "İmla kontrol dili",
+   "settings.service.form.spellcheckerLanguage.default" : "Sistem Dilini Kullan ({default})",
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
    "settings.service.form.team" : "Takım",
@@ -238,7 +249,7 @@
    "signup.legal.info" : "Franz'ı hesabı oluşturark kabul ediyorsun",
    "signup.legal.privacy" : "Gizlilik Sözleşmesi",
    "signup.legal.terms" : "Kullanım Koşulları",
-   "signup.link.login" : "Mevcut hesabınla giriş yap.",
+   "signup.link.login" : "Hali hazırda hesabınız varsa giriş yapmak ister misiniz?",
    "signup.password.label" : "Şifre",
    "signup.submit.label" : "Hesap oluştur",
    "subscription.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
@@ -249,7 +260,7 @@
    "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
    "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
    "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
@@ -266,7 +277,7 @@
    "tabs.item.enableAudio" : "Sesi etkinleştir",
    "tabs.item.enableNotification" : "Bildirimleri etkinleştir",
    "tabs.item.enableService" : "Servisi etkinleştir",
-   "tabs.item.reload" : "Yeniden Yükle",
+   "tabs.item.reload" : "Tekrar yükle",
    "validation.email" : "{alan} geçerli değil",
    "validation.minLength" : "{field} en az {length} karakter uzunluğunda olmalı",
    "validation.required" : "{field} gereklidir",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 7d51b380e..db3145b36 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,13 +1,24 @@
 {
    "app.errorHandler.action" : "Перезавантажити",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
-   "global.api.unhealthy" : "Не можна підключитись до онлайн сервісів Franz",
+   "app.errorHandler.headline" : "Щось пішло не так",
+   "feature.delayApp.action" : "Отримати ліцензію Franz Supporter ",
+   "feature.delayApp.headline" : "Будь ласка, придбайте ліцензію Franz Supporter аби пропустити очікування",
+   "feature.delayApp.text" : "Franz відновить роботу за {seconds} секунд",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "global.api.unhealthy" : "Не можливо підключитись до онлайн сервісів Franz",
    "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
+   "global.spellchecker.useDefault" : "Використовувати системні параметри за змовчуванням ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Мова перевірки правопису",
    "import.headline" : "Імпортувати ваші сервіси з Franz 4",
-   "import.notSupportedHeadline" : "��ервіси щ�� ��е підтримуються в Franz 5",
+   "import.notSupportedHeadline" : "����разі с��рвіси не підтримуються у Franz 5",
    "import.skip.label" : "Я бажаю додати сервіс вручну",
    "import.submit.label" : "Імпортувати сервіси",
    "infobar.buttonChangelog" : "Що нового?",
@@ -17,20 +28,20 @@
    "infobar.servicesUpdated" : "Ваші сервіси було оновлено.",
    "infobar.updateAvailable" : "Нове оновлення для Franz доступне.",
    "invite.email.label" : "Email адреса",
-   "invite.headline.friends" : "Запросіть 3 ваших друзів або колег",
+   "invite.headline.friends" : "Запросіть 3-х ваших друзів або колег",
    "invite.name.label" : "Ім'я",
    "invite.skip.label" : "Я хочу зробити це пізніше",
    "invite.submit.label" : "Відправити запрошення",
-   "invite.successInfo" : "Запрошення успішно ��і����слані",
+   "invite.successInfo" : "Запрошення успішно ����������лані",
    "login.email.label" : "Email адреса",
    "login.headline" : "Увійти",
    "login.invalidCredentials" : "Email або пароль некоректні",
    "login.link.password" : "Скинути пароль",
    "login.link.signup" : "Створити безплатний акаунт",
    "login.password.label" : "Пароль",
-   "login.serverLogout" : "Ваша сесія закінчилась, будь ласка, ������діть знову.",
+   "login.serverLogout" : "Ваша сесія закінчилась, будь ласка, у��ійдіть знову.",
    "login.submit.label" : "Увійти",
-   "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, ������діть знову.",
+   "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, у��ійдіть знову.",
    "menu.app.about" : "Про Franz",
    "menu.app.hide" : "Приховати",
    "menu.app.hideOthers" : "Приховати інші",
@@ -81,7 +92,7 @@
    "password.noUser" : "Не знайдено жодного користувача з цією email адресою",
    "password.submit.label" : "Подати",
    "password.successInfo" : "Будь ласка, перевірте ваш email",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Преміум акаунт",
    "pricing.headline" : "Підтримайте Franz",
    "pricing.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
    "pricing.submit.label" : "Я хочу підтримати розробку Franz",
@@ -96,7 +107,7 @@
    "service.errorHandler.editAction" : "Редагувати {name}",
    "service.errorHandler.headline" : "О, ні!",
    "service.errorHandler.message" : "Помилка",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} не завантажено",
    "services.getStarted" : "Почати",
    "services.welcome" : "Ласкаво просимо в Franz",
    "settings.account.account.editButton" : "Редагувати акаунт",
@@ -127,7 +138,7 @@
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запускати Franz на початку",
    "settings.app.form.beta" : "Включити бета-версії",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Переходь на Темну Сторону",
    "settings.app.form.enableGPUAcceleration" : "Ввімкнути прискорення GPU",
    "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
@@ -138,7 +149,7 @@
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
    "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених сервісів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Мова перевірки правопису",
    "settings.app.headline" : "Налаштування",
    "settings.app.headlineAdvanced" : "Додаткові налаштування",
    "settings.app.headlineAppearance" : "Вигляд",
@@ -179,7 +190,7 @@
    "settings.service.form.editServiceHeadline" : "Редагувати {name}",
    "settings.service.form.enableAudio" : "Увімкнути звук",
    "settings.service.form.enableBadge" : "Показувати непрочитані повідомлення",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Переходь на Темну Сторону",
    "settings.service.form.enableNotification" : "Увімкнути сповіщення",
    "settings.service.form.enableService" : "Увімкнути сервіс",
    "settings.service.form.headlineBadges" : "Значки непрочитаних повідомлень",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "Показувати значок повідомлення для всіх нових повідомлень",
    "settings.service.form.isMutedInfo" : "Коли вимкнено, всі сповищення та відтворення ігноруються",
    "settings.service.form.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 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 Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "Налаштування HTTP\/HTTPS проксі ",
+   "settings.service.form.proxy.host" : "Проксі Host\/IP",
+   "settings.service.form.proxy.info" : "Налаштування проксі не будуть синхронізовані із серверами Franz",
+   "settings.service.form.proxy.isEnabled" : "Використовувати проксі",
+   "settings.service.form.proxy.password" : "Пароль (опційно)",
+   "settings.service.form.proxy.port" : "Порт",
+   "settings.service.form.proxy.restartInfo" : "Будь ласка, перезапустіть Franz після зміни налуштувань проксі",
+   "settings.service.form.proxy.user" : "Користувач (опційно)",
    "settings.service.form.saveButton" : "Зберегти сервіс",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "Мова перевірки правопису",
+   "settings.service.form.spellcheckerLanguage.default" : "Використовувати системні параметри за змовчуванням ({default})",
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
    "settings.service.form.team" : "Команда",
@@ -245,11 +256,11 @@
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
    "subscription.features.encryptedSync" : "Шифрована синхронізація сеансу",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Ніяких затримок та набридливих пропозицій з платних підписок",
    "subscription.features.onpremise" : "Додайте on-premise \/ hosted сервіси, такі як Hipchat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.onpremise.mattermost" : "Сервіси, що виконуються локально\/вимагають хостингу, приміром Mattermost",
+   "subscription.features.proxy" : "Підтримка проксі ",
+   "subscription.features.spellchecker" : "Підтримка перевірки правопису",
    "subscription.includedFeatures" : "Платний Преміальний Акаунт Прихильника Franz включає",
    "subscription.paymentSessionError" : "Не вдалося ініціалізувати форму платежу",
    "subscription.submit.label" : "Я хочу підтримати розробку Franz",
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
new file mode 100644
index 000000000..32960f8ce
--- /dev/null
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -0,0 +1,2 @@
+[
+]
\ No newline at end of file
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index cfb1d3dce..3ae08c9ef 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,11 +1,22 @@
 {
    "app.errorHandler.action" : "重新載入",
    "app.errorHandler.headline" : "有些東西出錯了",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
-   "global.api.unhealthy" : "無法連線至Franz的伺服器。",
+   "feature.delayApp.action" : "取得 Franz 支援授權",
+   "feature.delayApp.headline" : "請購買 Franz 支援授權以跳過等候",
+   "feature.delayApp.text" : "Franz 會在 {seconds} 秒後繼續。",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "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 @MeetFranz",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "global.api.unhealthy" : "無法連線至 Franz 的伺服器",
    "global.notConnectedToTheInternet" : "你沒有連上網路。",
+   "global.spellchecker.useDefault" : "使用系統預設 ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "拼字檢查語言",
    "import.headline" : "匯入 Franz 4 的服務",
    "import.notSupportedHeadline" : "Franz 5 尚未支援此服務",
    "import.skip.label" : "手動添加服務",
@@ -14,10 +25,10 @@
    "infobar.buttonInstallUpdate" : "重新啟動並安裝更新",
    "infobar.buttonReloadServices" : "重新載入服務",
    "infobar.requiredRequestsFailed" : "無法載入服務和使用者資訊",
-   "infobar.servicesUpdated" : "你的服������經被更新",
-   "infobar.updateAvailable" : "Franz有可用的更新",
+   "infobar.servicesUpdated" : "已經更新你的服務",
+   "infobar.updateAvailable" : "Franz 有可用的更新",
    "invite.email.label" : "電子郵件地址",
-   "invite.headline.friends" : "邀請3位你的朋友或同事",
+   "invite.headline.friends" : "邀請 3 位朋友或同事",
    "invite.name.label" : "名稱",
    "invite.skip.label" : "我想稍後再做",
    "invite.submit.label" : "送出邀請",
@@ -31,7 +42,7 @@
    "login.serverLogout" : "您的登入期間已過期，請重新登錄",
    "login.submit.label" : "登入",
    "login.tokenExpired" : "您的登入已過期，請重新登入。",
-   "menu.app.about" : "關於Franz",
+   "menu.app.about" : "關於 Franz",
    "menu.app.hide" : "隱藏",
    "menu.app.hideOthers" : "隱藏其他",
    "menu.app.quit" : "結束",
@@ -63,7 +74,7 @@
    "menu.view" : "檢視",
    "menu.view.enterFullScreen" : "進入全螢幕模式",
    "menu.view.exitFullScreen" : "離開全螢幕模式",
-   "menu.view.reloadFranz" : "重新載入Franz",
+   "menu.view.reloadFranz" : "重新載入 Franz",
    "menu.view.reloadService" : "重新載入服務",
    "menu.view.resetZoom" : "實際大小",
    "menu.view.toggleDevTools" : "切換開發者工具",
@@ -82,9 +93,9 @@
    "password.submit.label" : "送出",
    "password.successInfo" : "請檢查您的電子郵件",
    "premiumFeature.button.upgradeAccount" : "升級帳號",
-   "pricing.headline" : "支持Franz",
-   "pricing.link.skipPayment" : "我不想支持Franz的開發。",
-   "pricing.submit.label" : "我想支持Franz的開發。",
+   "pricing.headline" : "支持 Franz",
+   "pricing.link.skipPayment" : "我不想支持 Franz 的開發。",
+   "pricing.submit.label" : "我想支持 Franz 的開發。",
    "pricing.support.label" : "選擇您支持的計畫",
    "service.crashHandler.action" : "重新載入{name}",
    "service.crashHandler.autoReload" : "嘗試在{seconds}秒內自動恢復{name}",
@@ -92,20 +103,20 @@
    "service.crashHandler.text" : "{name}導致了一個錯誤。",
    "service.disabledHandler.action" : "啟用{name}",
    "service.disabledHandler.headline" : "{name}已停用",
-   "service.errorHandler.action" : "重新載入{name}",
+   "service.errorHandler.action" : "重新載入 {name}",
    "service.errorHandler.editAction" : "編輯{名稱}",
-   "service.errorHandler.headline" : "噢不!",
+   "service.errorHandler.headline" : "噢不！",
    "service.errorHandler.message" : "錯誤",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} 載入失敗。",
    "services.getStarted" : "開始",
-   "services.welcome" : "歡迎使用Franz",
+   "services.welcome" : "歡迎使用 Franz",
    "settings.account.account.editButton" : "編輯帳號",
    "settings.account.accountType.basic" : "基礎帳號",
-   "settings.account.accountType.premium" : "高級支���者帳戶",
+   "settings.account.accountType.premium" : "高級支���帳戶",
    "settings.account.buttonSave" : "更新簡介",
    "settings.account.deleteAccount" : "移除帳號",
    "settings.account.deleteEmailSent" : "移除帳號之確認電郵已送出。你的帳號及相關資料將無法恢復！",
-   "settings.account.deleteInfo" : "如果不再需要你的帳號了，你可以在這裡刪除帳號和相關資料",
+   "settings.account.deleteInfo" : "如果不再需要你的帳號，你可以在這裡刪除帳號和所有相關資料。",
    "settings.account.headline" : "帳號",
    "settings.account.headlineAccount" : "帳戶資訊",
    "settings.account.headlineDangerZone" : "危險地帶",
@@ -113,7 +124,7 @@
    "settings.account.headlinePassword" : "變更密碼",
    "settings.account.headlineProfile" : "更新簡介",
    "settings.account.headlineSubscription" : "您的訂閱",
-   "settings.account.headlineUpgrade" : "升級您的帳戶&支持Franz",
+   "settings.account.headlineUpgrade" : "升級您的帳戶並支持 Franz",
    "settings.account.invoiceDownload" : "下載",
    "settings.account.manageSubscription.label" : "管理您的訂閱",
    "settings.account.successInfo" : "您的更變已經被儲存",
@@ -122,20 +133,20 @@
    "settings.app.buttonClearAllCache" : "清除快取",
    "settings.app.buttonInstallUpdate" : "重新啟動並安裝更新",
    "settings.app.buttonSearchForUpdate" : "檢查更新",
-   "settings.app.cacheInfo" : "Franz快取目前占用磁碟空間{大小}。",
+   "settings.app.cacheInfo" : "Franz 快取目前占用 {size} ������碟空間。",
    "settings.app.currentVersion" : "目前的版本",
    "settings.app.form.autoLaunchInBackground" : "在背景開啟",
-   "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
+   "settings.app.form.autoLaunchOnStart" : "開機時啟動 Franz",
    "settings.app.form.beta" : "包含測試版",
-   "settings.app.form.darkMode" : "Join the Dark Side",
-   "settings.app.form.enableGPUAcceleration" : "啟用GPU加速",
-   "settings.app.form.enableMenuBar" : "顯示Franz在選單列",
+   "settings.app.form.darkMode" : "加入黑暗面",
+   "settings.app.form.enableGPUAcceleration" : "啟用 GPU 加速",
+   "settings.app.form.enableMenuBar" : "在選單列顯示 Franz",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
-   "settings.app.form.enableSystemTray" : "顯示Franz在系統列",
-   "settings.app.form.hideDockIcon" : "在工作列中隱藏Franz圖示",
+   "settings.app.form.enableSystemTray" : "在系統列顯示 Franz",
+   "settings.app.form.hideDockIcon" : "隱藏 Dock 中的 Franz 圖示",
    "settings.app.form.language" : "語言",
-   "settings.app.form.minimizeToSystemTray" : "最小化Franz到系統列",
-   "settings.app.form.runInBackground" : "當關閉視窗時保持Franz在背景運作",
+   "settings.app.form.minimizeToSystemTray" : "最小化 Franz 到系統列",
+   "settings.app.form.runInBackground" : "當關閉視窗時，保持 Franz 在背景運作",
    "settings.app.form.showDisabledServices" : "顯示停用的服務標籤",
    "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊息",
    "settings.app.form.spellcheckerLanguage" : "拼字檢查語言",
@@ -147,10 +158,10 @@
    "settings.app.headlineUpdates" : "更新",
    "settings.app.restartRequired" : "需要重啟以更變",
    "settings.app.subheadlineCache" : "快取",
-   "settings.app.translationHelp" : "幫助我們將Franz翻譯成您的語言。",
+   "settings.app.translationHelp" : "幫助我們將 Franz 翻譯成您的語言。",
    "settings.app.updateStatusAvailable" : "有可用更新，下載中...",
    "settings.app.updateStatusSearching" : "正在搜尋更新",
-   "settings.app.updateStatusUpToDate" : "您正在使用最新版本的Franz",
+   "settings.app.updateStatusUpToDate" : "您正在使用最新版本的 Franz",
    "settings.invite.headline" : "邀請朋友",
    "settings.navigation.account" : "帳號",
    "settings.navigation.availableServices" : "可使用的服務",
@@ -172,11 +183,11 @@
    "settings.service.form.addServiceHeadline" : "新增{name}",
    "settings.service.form.availableServices" : "可使用的服務",
    "settings.service.form.customUrl" : "自訂伺服器",
-   "settings.service.form.customUrlPremiumInfo" : "要添加自己託管的服務，您需要一個Franz 額外支持者帳戶。",
+   "settings.service.form.customUrlPremiumInfo" : "要添加自行託管的服務，您需要擁有 Franz 高級支援帳戶。",
    "settings.service.form.customUrlUpgradeAccount" : "升級您的帳戶",
    "settings.service.form.customUrlValidationError" : "無法驗證自定義{name}服務器。",
    "settings.service.form.deleteButton" : "刪除服務",
-   "settings.service.form.editServiceHeadline" : "編輯{名稱}",
+   "settings.service.form.editServiceHeadline" : "編輯 {名稱}",
    "settings.service.form.enableAudio" : "啟用音訊",
    "settings.service.form.enableBadge" : "顯示未讀訊息圖示",
    "settings.service.form.enableDarkMode" : "開啟深色模式",
@@ -192,17 +203,17 @@
    "settings.service.form.indirectMessages" : "顯示所有新消息的消息標誌",
    "settings.service.form.isMutedInfo" : "停用時，所有通知聲和聲音播放都將靜音",
    "settings.service.form.name" : "名稱",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS 代理伺服器設定",
+   "settings.service.form.proxy.host" : "代理伺服器網域 \/ IP",
    "settings.service.form.proxy.info" : "Proxy 設定不會與 Franz 伺服器同步",
    "settings.service.form.proxy.isEnabled" : "使用 Proxy",
    "settings.service.form.proxy.password" : "密碼 (選填)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "通訊阜",
+   "settings.service.form.proxy.restartInfo" : "在變更 Proxy 設定後，請重新啟動 Franz",
    "settings.service.form.proxy.user" : "使用者 (選填)",
    "settings.service.form.saveButton" : "保存服務",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.spellcheckerLanguage" : "拼字檢查語言",
+   "settings.service.form.spellcheckerLanguage.default" : "使用系統預設 ({default})",
    "settings.service.form.tabHosted" : "託管",
    "settings.service.form.tabOnPremise" : "自我託管⭐️",
    "settings.service.form.team" : "團隊",
@@ -215,7 +226,7 @@
    "settings.services.tooltip.isDisabled" : "服務已停用",
    "settings.services.tooltip.isMuted" : "所有的聲音都是靜音",
    "settings.services.tooltip.notificationsDisabled" : "通知已停用",
-   "settings.services.updatedInfo" : "你的更變已經儲存",
+   "settings.services.updatedInfo" : "已儲存你的變更",
    "settings.user.form.accountType.company" : "公司",
    "settings.user.form.accountType.individual" : "個人",
    "settings.user.form.accountType.label" : "帳戶類型",
@@ -235,7 +246,7 @@
    "signup.firstname.label" : "名",
    "signup.headline" : "註冊",
    "signup.lastname.label" : "姓",
-   "signup.legal.info" : "你接受透過創建一個Franz帳戶",
+   "signup.legal.info" : "透過創建一個 Franz 帳戶，你同意",
    "signup.legal.privacy" : "隱私聲明",
    "signup.legal.terms" : "服務條款",
    "signup.link.login" : "已經有一個帳戶，登入？",
@@ -245,14 +256,14 @@
    "subscription.features.ads" : "無廣告，永遠!",
    "subscription.features.comingSoon" : "即將推出",
    "subscription.features.encryptedSync" : "加密的會話同步",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "升級授權沒有延遲與打盹",
    "subscription.features.onpremise" : "添加本地\/託管服務如HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已預定 \/ 託管的服務",
+   "subscription.features.proxy" : "服務的代理伺服器支援",
    "subscription.features.spellchecker" : "支援拼字檢查",
-   "subscription.includedFeatures" : "包含高級Franz��費帳戶",
+   "subscription.includedFeatures" : "Franz ��級支援帳戶包含",
    "subscription.paymentSessionError" : "無法初始化付款表單",
-   "subscription.submit.label" : "我想支持Franz的開發",
+   "subscription.submit.label" : "我想支持 Franz 開發",
    "subscription.type.free" : "自由",
    "subscription.type.month" : "月",
    "subscription.type.year" : "年",
diff --git a/src/i18n/manage-translations.js b/src/i18n/manage-translations.js
new file mode 100644
index 000000000..ee64c9c09
--- /dev/null
+++ b/src/i18n/manage-translations.js
@@ -0,0 +1,9 @@
+require('@babel/register');
+const manageTranslations = require('react-intl-translations-manager').default;
+
+manageTranslations({
+  messagesDirectory: 'src/i18n/messages',
+  translationsDirectory: 'src/i18n/locales',
+  singleMessagesFile: true,
+  languages: ['en-US'],
+});
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
new file mode 100644
index 000000000..264fc729b
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Import.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "import.headline",
+    "defaultMessage": "!!!Import your Franz 4 services",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 13,
+      "column": 12
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "import.notSupportedHeadline",
+    "defaultMessage": "!!!Services not yet supported in Franz 5",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 17,
+      "column": 24
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "import.submit.label",
+    "defaultMessage": "!!!Import {count} services",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 21,
+      "column": 21
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "import.skip.label",
+    "defaultMessage": "!!!I want to add services manually",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 25,
+      "column": 19
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Invite.json b/src/i18n/messages/src/components/auth/Invite.json
new file mode 100644
index 000000000..57c9bddcf
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Invite.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "settings.invite.headline",
+    "defaultMessage": "!!!Invite Friends",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 16,
+      "column": 20
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.headline.friends",
+    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 20,
+      "column": 12
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.name.label",
+    "defaultMessage": "!!!Name",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 24,
+      "column": 13
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 28,
+      "column": 14
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.submit.label",
+    "defaultMessage": "!!!Send invites",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 32,
+      "column": 21
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.skip.label",
+    "defaultMessage": "!!!I want to do this later",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 36,
+      "column": 19
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.successInfo",
+    "defaultMessage": "!!!Invitations sent successfully",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 40,
+      "column": 21
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
new file mode 100644
index 000000000..177f6000b
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "login.headline",
+    "defaultMessage": "!!!Sign in",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 17,
+      "column": 12
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 21,
+      "column": 14
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.password.label",
+    "defaultMessage": "!!!Password",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 25,
+      "column": 17
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.submit.label",
+    "defaultMessage": "!!!Sign in",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 29,
+      "column": 21
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.invalidCredentials",
+    "defaultMessage": "!!!Email or password not valid",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 33,
+      "column": 22
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.tokenExpired",
+    "defaultMessage": "!!!Your session expired, please login again.",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 37,
+      "column": 16
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.serverLogout",
+    "defaultMessage": "!!!Your session expired, please login again.",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 41,
+      "column": 16
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.link.signup",
+    "defaultMessage": "!!!Create a free account",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 45,
+      "column": 14
+    },
+    "end": {
+      "line": 48,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.link.password",
+    "defaultMessage": "!!!Forgot password",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 49,
+      "column": 16
+    },
+    "end": {
+      "line": 52,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
new file mode 100644
index 000000000..f335b3acb
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Password.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "password.headline",
+    "defaultMessage": "!!!Forgot password",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 18,
+      "column": 14
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.submit.label",
+    "defaultMessage": "!!!Submit",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 22,
+      "column": 21
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.successInfo",
+    "defaultMessage": "!!!Your new password was sent to your email address",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 26,
+      "column": 15
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.noUser",
+    "defaultMessage": "!!!No user affiliated with that email address",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 30,
+      "column": 10
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.link.signup",
+    "defaultMessage": "!!!Create a free account",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 34,
+      "column": 14
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.link.login",
+    "defaultMessage": "!!!Sign in to your account",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 38,
+      "column": 13
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json
new file mode 100644
index 000000000..f711a55b4
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Pricing.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "pricing.headline",
+    "defaultMessage": "!!!Support Franz",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 13,
+      "column": 12
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.support.label",
+    "defaultMessage": "!!!Select your support plan",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 17,
+      "column": 23
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.submit.label",
+    "defaultMessage": "!!!Support the development of Franz",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 21,
+      "column": 21
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.link.skipPayment",
+    "defaultMessage": "!!!I don't want to support the development of Franz.",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 25,
+      "column": 15
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
new file mode 100644
index 000000000..a09745048
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -0,0 +1,158 @@
+[
+  {
+    "id": "signup.headline",
+    "defaultMessage": "!!!Sign up",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 18,
+      "column": 12
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.firstname.label",
+    "defaultMessage": "!!!Firstname",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 22,
+      "column": 18
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.lastname.label",
+    "defaultMessage": "!!!Lastname",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 26,
+      "column": 17
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 30,
+      "column": 14
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.company.label",
+    "defaultMessage": "!!!Company",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 34,
+      "column": 16
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.password.label",
+    "defaultMessage": "!!!Password",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 38,
+      "column": 17
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.legal.info",
+    "defaultMessage": "!!!By creating a Franz account you accept the",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 42,
+      "column": 13
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.legal.terms",
+    "defaultMessage": "!!!Terms of service",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 46,
+      "column": 9
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.legal.privacy",
+    "defaultMessage": "!!!Privacy Statement",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 50,
+      "column": 11
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.submit.label",
+    "defaultMessage": "!!!Create account",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 54,
+      "column": 21
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.link.login",
+    "defaultMessage": "!!!Already have an account, sign in?",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 58,
+      "column": 13
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.emailDuplicate",
+    "defaultMessage": "!!!A user with that email address already exists",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 62,
+      "column": 18
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json
new file mode 100644
index 000000000..b4d2ce689
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Welcome.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "welcome.signupButton",
+    "defaultMessage": "!!!Create a free account",
+    "file": "src/components/auth/Welcome.js",
+    "start": {
+      "line": 9,
+      "column": 16
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "welcome.loginButton",
+    "defaultMessage": "!!!Login to your account",
+    "file": "src/components/auth/Welcome.js",
+    "start": {
+      "line": 13,
+      "column": 15
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
new file mode 100644
index 000000000..07603d062
--- /dev/null
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "infobar.servicesUpdated",
+    "defaultMessage": "!!!Your services have been updated.",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 22,
+      "column": 19
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.updateAvailable",
+    "defaultMessage": "!!!A new update for Franz is available.",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 26,
+      "column": 19
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonReloadServices",
+    "defaultMessage": "!!!Reload services",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 30,
+      "column": 24
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonChangelog",
+    "defaultMessage": "!!!Changelog",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 34,
+      "column": 13
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonInstallUpdate",
+    "defaultMessage": "!!!Restart & install update",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 38,
+      "column": 23
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.requiredRequestsFailed",
+    "defaultMessage": "!!!Could not load services and user information",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 42,
+      "column": 26
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
new file mode 100644
index 000000000..7aa00a186
--- /dev/null
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "sidebar.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 11,
+      "column": 12
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.addNewService",
+    "defaultMessage": "!!!Add new service",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 15,
+      "column": 17
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.muteApp",
+    "defaultMessage": "!!!Disable notifications & audio",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.unmuteApp",
+    "defaultMessage": "!!!Enable notifications & audio",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 23,
+      "column": 10
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
new file mode 100644
index 000000000..c8fe802df
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "service.errorHandler.headline",
+    "defaultMessage": "!!!Oh no!",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 12,
+      "column": 12
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.text",
+    "defaultMessage": "!!!{name} has failed to load.",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 16,
+      "column": 8
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.action",
+    "defaultMessage": "!!!Reload {name}",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 20,
+      "column": 10
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.editAction",
+    "defaultMessage": "!!!Edit {name}",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 24,
+      "column": 14
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.message",
+    "defaultMessage": "!!!Error:",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 28,
+      "column": 16
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ServiceDisabled.json b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
new file mode 100644
index 000000000..8bfad28c7
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "service.disabledHandler.headline",
+    "defaultMessage": "!!!{name} is disabled",
+    "file": "src/components/services/content/ServiceDisabled.js",
+    "start": {
+      "line": 9,
+      "column": 12
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.disabledHandler.action",
+    "defaultMessage": "!!!Enable {name}",
+    "file": "src/components/services/content/ServiceDisabled.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
new file mode 100644
index 000000000..884ab0c90
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "services.welcome",
+    "defaultMessage": "!!!Welcome to Franz",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 11,
+      "column": 11
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.getStarted",
+    "defaultMessage": "!!!Get started",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 15,
+      "column": 14
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
new file mode 100644
index 000000000..c3d6c41a5
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "service.crashHandler.headline",
+    "defaultMessage": "!!!Oh no!",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 10,
+      "column": 12
+    },
+    "end": {
+      "line": 13,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.crashHandler.text",
+    "defaultMessage": "!!!{name} has caused an error.",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 14,
+      "column": 8
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.crashHandler.action",
+    "defaultMessage": "!!!Reload {name}",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 18,
+      "column": 10
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.crashHandler.autoReload",
+    "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 22,
+      "column": 14
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
new file mode 100644
index 000000000..08a07845c
--- /dev/null
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "tabs.item.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableNotifications",
+    "defaultMessage": "!!!Disable notifications",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 23,
+      "column": 24
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.enableNotification",
+    "defaultMessage": "!!!Enable notifications",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 27,
+      "column": 23
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableAudio",
+    "defaultMessage": "!!!Disable audio",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 31,
+      "column": 16
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.enableAudio",
+    "defaultMessage": "!!!Enable audio",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 35,
+      "column": 15
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableService",
+    "defaultMessage": "!!!Disable Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 39,
+      "column": 18
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.enableService",
+    "defaultMessage": "!!!Enable Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 43,
+      "column": 17
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.deleteService",
+    "defaultMessage": "!!!Delete Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 47,
+      "column": 17
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
new file mode 100644
index 000000000..603950395
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "settings.account.headline",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineSubscription",
+    "defaultMessage": "!!!Your Subscription",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 19,
+      "column": 24
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineUpgrade",
+    "defaultMessage": "!!!Upgrade your Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 23,
+      "column": 19
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineInvoices",
+    "defaultMessage": "!!Invoices",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 27,
+      "column": 20
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineDangerZone",
+    "defaultMessage": "!!Danger Zone",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 31,
+      "column": 22
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.manageSubscription.label",
+    "defaultMessage": "!!!Manage your subscription",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 35,
+      "column": 33
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.accountType.basic",
+    "defaultMessage": "!!!Basic Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 39,
+      "column": 20
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.accountType.premium",
+    "defaultMessage": "!!!Premium Supporter Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 43,
+      "column": 22
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.account.editButton",
+    "defaultMessage": "!!!Edit Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 47,
+      "column": 21
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.invoiceDownload",
+    "defaultMessage": "!!!Download",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 51,
+      "column": 19
+    },
+    "end": {
+      "line": 54,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.userInfoRequestFailed",
+    "defaultMessage": "!!!Could not load user information",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 55,
+      "column": 25
+    },
+    "end": {
+      "line": 58,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.tryReloadUserInfoRequest",
+    "defaultMessage": "!!!Try again",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 59,
+      "column": 28
+    },
+    "end": {
+      "line": 62,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteAccount",
+    "defaultMessage": "!!!Delete account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 63,
+      "column": 17
+    },
+    "end": {
+      "line": 66,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteInfo",
+    "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 67,
+      "column": 14
+    },
+    "end": {
+      "line": 70,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteEmailSent",
+    "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 71,
+      "column": 19
+    },
+    "end": {
+      "line": 74,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
new file mode 100644
index 000000000..4d8443b02
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "settings.navigation.availableServices",
+    "defaultMessage": "!!!Available services",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 9,
+      "column": 21
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.yourServices",
+    "defaultMessage": "!!!Your services",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 13,
+      "column": 16
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.yourWorkspaces",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 17,
+      "column": 18
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.account",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 21,
+      "column": 11
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 25,
+      "column": 12
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.inviteFriends",
+    "defaultMessage": "!!!Invite Friends",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 29,
+      "column": 17
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.logout",
+    "defaultMessage": "!!!Logout",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 33,
+      "column": 10
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
new file mode 100644
index 000000000..7d9ed3283
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "settings.recipes.headline",
+    "defaultMessage": "!!!Available Services",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.searchService",
+    "defaultMessage": "!!!Search service",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 19,
+      "column": 17
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.mostPopular",
+    "defaultMessage": "!!!Most popular",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 23,
+      "column": 22
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.all",
+    "defaultMessage": "!!!All services",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 27,
+      "column": 14
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.dev",
+    "defaultMessage": "!!!Development",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 31,
+      "column": 14
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.nothingFound",
+    "defaultMessage": "!!!Sorry, but no service matched your search term.",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 35,
+      "column": 16
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.servicesSuccessfulAddedInfo",
+    "defaultMessage": "!!!Service successfully added",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 39,
+      "column": 31
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.missingService",
+    "defaultMessage": "!!!Missing a service?",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 43,
+      "column": 18
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
new file mode 100644
index 000000000..42b741b7a
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -0,0 +1,288 @@
+[
+  {
+    "id": "settings.service.form.saveButton",
+    "defaultMessage": "!!!Save service",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 22,
+      "column": 15
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.deleteButton",
+    "defaultMessage": "!!!Delete Service",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 26,
+      "column": 17
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.availableServices",
+    "defaultMessage": "!!!Available services",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 30,
+      "column": 21
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.yourServices",
+    "defaultMessage": "!!!Your services",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 34,
+      "column": 16
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.addServiceHeadline",
+    "defaultMessage": "!!!Add {name}",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 38,
+      "column": 22
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.editServiceHeadline",
+    "defaultMessage": "!!!Edit {name}",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 42,
+      "column": 23
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.tabHosted",
+    "defaultMessage": "!!!Hosted",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 46,
+      "column": 13
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.tabOnPremise",
+    "defaultMessage": "!!!Self hosted ⭐️",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 50,
+      "column": 16
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.useHostedService",
+    "defaultMessage": "!!!Use the hosted {name} service.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 54,
+      "column": 20
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrlValidationError",
+    "defaultMessage": "!!!Could not validate custom {name} server.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 58,
+      "column": 28
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrlPremiumInfo",
+    "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 62,
+      "column": 24
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrlUpgradeAccount",
+    "defaultMessage": "!!!Upgrade your account",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 66,
+      "column": 27
+    },
+    "end": {
+      "line": 69,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.indirectMessageInfo",
+    "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 70,
+      "column": 23
+    },
+    "end": {
+      "line": 73,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.isMutedInfo",
+    "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 74,
+      "column": 15
+    },
+    "end": {
+      "line": 77,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineNotifications",
+    "defaultMessage": "!!!Notifications",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 78,
+      "column": 25
+    },
+    "end": {
+      "line": 81,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineBadges",
+    "defaultMessage": "!!!Unread message badges",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 82,
+      "column": 18
+    },
+    "end": {
+      "line": 85,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineGeneral",
+    "defaultMessage": "!!!General",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 86,
+      "column": 19
+    },
+    "end": {
+      "line": 89,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.iconDelete",
+    "defaultMessage": "!!!Delete",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 90,
+      "column": 14
+    },
+    "end": {
+      "line": 93,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.iconUpload",
+    "defaultMessage": "!!!Drop your image, or click here",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 94,
+      "column": 14
+    },
+    "end": {
+      "line": 97,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.headline",
+    "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 98,
+      "column": 17
+    },
+    "end": {
+      "line": 101,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.restartInfo",
+    "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 102,
+      "column": 20
+    },
+    "end": {
+      "line": 105,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.info",
+    "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 106,
+      "column": 13
+    },
+    "end": {
+      "line": 109,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceError.json b/src/i18n/messages/src/components/settings/services/ServiceError.json
new file mode 100644
index 000000000..648fc5b3e
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/ServiceError.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "settings.service.error.headline",
+    "defaultMessage": "!!!Error",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 10,
+      "column": 12
+    },
+    "end": {
+      "line": 13,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.error.goBack",
+    "defaultMessage": "!!!Back to services",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 14,
+      "column": 10
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.availableServices",
+    "defaultMessage": "!!!Available services",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 18,
+      "column": 21
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.error.message",
+    "defaultMessage": "!!!Could not load service recipe.",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 22,
+      "column": 16
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceItem.json b/src/i18n/messages/src/components/settings/services/ServiceItem.json
new file mode 100644
index 000000000..ffea8b9e1
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/ServiceItem.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "settings.services.tooltip.isDisabled",
+    "defaultMessage": "!!!Service is disabled",
+    "file": "src/components/settings/services/ServiceItem.js",
+    "start": {
+      "line": 11,
+      "column": 21
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.tooltip.notificationsDisabled",
+    "defaultMessage": "!!!Notifications are disabled",
+    "file": "src/components/settings/services/ServiceItem.js",
+    "start": {
+      "line": 15,
+      "column": 32
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.tooltip.isMuted",
+    "defaultMessage": "!!!All sounds are muted",
+    "file": "src/components/settings/services/ServiceItem.js",
+    "start": {
+      "line": 19,
+      "column": 18
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
new file mode 100644
index 000000000..3803c6512
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "settings.services.headline",
+    "defaultMessage": "!!!Your services",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.searchService",
+    "defaultMessage": "!!!Search service",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 18,
+      "column": 17
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.noServicesAdded",
+    "defaultMessage": "!!!You haven't added any services yet.",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 22,
+      "column": 19
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.nothingFound",
+    "defaultMessage": "!!!Sorry, but no service matched your search term.",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 26,
+      "column": 18
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.discoverServices",
+    "defaultMessage": "!!!Discover services",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 30,
+      "column": 20
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.servicesRequestFailed",
+    "defaultMessage": "!!!Could not load your services",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 34,
+      "column": 25
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.tryReloadServices",
+    "defaultMessage": "!!!Try again",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 38,
+      "column": 21
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.updatedInfo",
+    "defaultMessage": "!!!Your changes have been saved",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 42,
+      "column": 15
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.deletedInfo",
+    "defaultMessage": "!!!Service has been deleted",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 46,
+      "column": 15
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
new file mode 100644
index 000000000..c64f477be
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -0,0 +1,223 @@
+[
+  {
+    "id": "settings.app.headline",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 16,
+      "column": 12
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineGeneral",
+    "defaultMessage": "!!!General",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 20,
+      "column": 19
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineLanguage",
+    "defaultMessage": "!!!Language",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 24,
+      "column": 20
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineUpdates",
+    "defaultMessage": "!!!Updates",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 28,
+      "column": 19
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineAppearance",
+    "defaultMessage": "!!!Appearance",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 32,
+      "column": 22
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineAdvanced",
+    "defaultMessage": "!!!Advanced",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 36,
+      "column": 20
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.translationHelp",
+    "defaultMessage": "!!!Help us to translate Franz into your language.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 40,
+      "column": 19
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.subheadlineCache",
+    "defaultMessage": "!!!Cache",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 44,
+      "column": 20
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.cacheInfo",
+    "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 48,
+      "column": 13
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.buttonClearAllCache",
+    "defaultMessage": "!!!Clear cache",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 52,
+      "column": 23
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.buttonSearchForUpdate",
+    "defaultMessage": "!!!Check for updates",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 56,
+      "column": 25
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.buttonInstallUpdate",
+    "defaultMessage": "!!!Restart & install update",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 60,
+      "column": 23
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.updateStatusSearching",
+    "defaultMessage": "!!!Is searching for update",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 64,
+      "column": 25
+    },
+    "end": {
+      "line": 67,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.updateStatusAvailable",
+    "defaultMessage": "!!!Update available, downloading...",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 68,
+      "column": 25
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.updateStatusUpToDate",
+    "defaultMessage": "!!!You are using the latest version of Franz",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 72,
+      "column": 24
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.currentVersion",
+    "defaultMessage": "!!!Current version:",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 76,
+      "column": 18
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.restartRequired",
+    "defaultMessage": "!!!Changes require restart",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 80,
+      "column": 29
+    },
+    "end": {
+      "line": 83,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/user/EditUserForm.json b/src/i18n/messages/src/components/settings/user/EditUserForm.json
new file mode 100644
index 000000000..3a59f8681
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/user/EditUserForm.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "settings.account.headline",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineProfile",
+    "defaultMessage": "!!!Update Profile",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 19,
+      "column": 19
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineAccount",
+    "defaultMessage": "!!!Account Information",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 23,
+      "column": 19
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlinePassword",
+    "defaultMessage": "!!!Change Password",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 27,
+      "column": 20
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.successInfo",
+    "defaultMessage": "!!!Your changes have been saved",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 31,
+      "column": 15
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.buttonSave",
+    "defaultMessage": "!!!Update profile",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 35,
+      "column": 14
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
new file mode 100644
index 000000000..cc7470358
--- /dev/null
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -0,0 +1,171 @@
+[
+  {
+    "id": "subscription.submit.label",
+    "defaultMessage": "!!!Support the development of Franz",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 14,
+      "column": 21
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.paymentSessionError",
+    "defaultMessage": "!!!Could not initialize payment form",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 18,
+      "column": 23
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.type.free",
+    "defaultMessage": "!!!free",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 22,
+      "column": 12
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.type.month",
+    "defaultMessage": "!!!month",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 26,
+      "column": 15
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.type.year",
+    "defaultMessage": "!!!year",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 30,
+      "column": 14
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.includedFeatures",
+    "defaultMessage": "!!!The Franz Premium Supporter Account includes",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 34,
+      "column": 20
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.onpremise.mattermost",
+    "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 38,
+      "column": 13
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.noInterruptions",
+    "defaultMessage": "!!!No app delays & nagging to upgrade license",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 42,
+      "column": 19
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.proxy",
+    "defaultMessage": "!!!Proxy support for services",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 46,
+      "column": 9
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.spellchecker",
+    "defaultMessage": "!!!Support for Spellchecker",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 50,
+      "column": 16
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.ads",
+    "defaultMessage": "!!!No ads, ever!",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 54,
+      "column": 7
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.comingSoon",
+    "defaultMessage": "!!!coming soon",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 58,
+      "column": 14
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.euTaxInfo",
+    "defaultMessage": "!!!EU residents: local sales tax may apply",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 62,
+      "column": 13
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
new file mode 100644
index 000000000..c06da7531
--- /dev/null
+++ b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "subscriptionPopup.buttonCancel",
+    "defaultMessage": "!!!Cancel",
+    "file": "src/components/subscription/SubscriptionPopup.js",
+    "start": {
+      "line": 11,
+      "column": 16
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscriptionPopup.buttonDone",
+    "defaultMessage": "!!!Done",
+    "file": "src/components/subscription/SubscriptionPopup.js",
+    "start": {
+      "line": 15,
+      "column": 14
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
new file mode 100644
index 000000000..582d546fa
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "premiumFeature.button.upgradeAccount",
+    "defaultMessage": "!!!Upgrade account",
+    "file": "src/components/ui/PremiumFeatureContainer/index.js",
+    "start": {
+      "line": 14,
+      "column": 10
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/util/ErrorBoundary/index.json b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
new file mode 100644
index 000000000..43c323031
--- /dev/null
+++ b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "app.errorHandler.headline",
+    "defaultMessage": "!!!Something went wrong.",
+    "file": "src/components/util/ErrorBoundary/index.js",
+    "start": {
+      "line": 11,
+      "column": 12
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "app.errorHandler.action",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/util/ErrorBoundary/index.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
new file mode 100644
index 000000000..42ca42125
--- /dev/null
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "settings.service.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 28,
+      "column": 8
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableService",
+    "defaultMessage": "!!!Enable service",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 32,
+      "column": 17
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableNotification",
+    "defaultMessage": "!!!Enable Notifications",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 36,
+      "column": 22
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableBadge",
+    "defaultMessage": "!!!Show unread message badges",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 40,
+      "column": 15
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableAudio",
+    "defaultMessage": "!!!Enable audio",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 44,
+      "column": 15
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.team",
+    "defaultMessage": "!!!Team",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 48,
+      "column": 8
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrl",
+    "defaultMessage": "!!!Custom server",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 52,
+      "column": 13
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.indirectMessages",
+    "defaultMessage": "!!!Show message badge for all new messages",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 56,
+      "column": 20
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.icon",
+    "defaultMessage": "!!!Custom icon",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 60,
+      "column": 8
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableDarkMode",
+    "defaultMessage": "!!!Enable Dark Mode",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 64,
+      "column": 18
+    },
+    "end": {
+      "line": 67,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.isEnabled",
+    "defaultMessage": "!!!Use Proxy",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 68,
+      "column": 15
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.host",
+    "defaultMessage": "!!!Proxy Host/IP",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 72,
+      "column": 13
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.port",
+    "defaultMessage": "!!!Port",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 76,
+      "column": 13
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.user",
+    "defaultMessage": "!!!User",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 80,
+      "column": 13
+    },
+    "end": {
+      "line": 83,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.password",
+    "defaultMessage": "!!!Password",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 84,
+      "column": 17
+    },
+    "end": {
+      "line": 87,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
new file mode 100644
index 000000000..d3b413540
--- /dev/null
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -0,0 +1,158 @@
+[
+  {
+    "id": "settings.app.form.autoLaunchOnStart",
+    "defaultMessage": "!!!Launch Franz on start",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 22,
+      "column": 21
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.autoLaunchInBackground",
+    "defaultMessage": "!!!Open in background",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 26,
+      "column": 26
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.runInBackground",
+    "defaultMessage": "!!!Keep Franz in background when closing the window",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 30,
+      "column": 19
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableSystemTray",
+    "defaultMessage": "!!!Show Franz in system tray",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 34,
+      "column": 20
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.minimizeToSystemTray",
+    "defaultMessage": "!!!Minimize Franz to system tray",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 38,
+      "column": 24
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.language",
+    "defaultMessage": "!!!Language",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 42,
+      "column": 12
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.darkMode",
+    "defaultMessage": "!!!Dark Mode",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 46,
+      "column": 12
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.showDisabledServices",
+    "defaultMessage": "!!!Display disabled services tabs",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 50,
+      "column": 24
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.showMessagesBadgesWhenMuted",
+    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 54,
+      "column": 29
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableSpellchecking",
+    "defaultMessage": "!!!Enable spell checking",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 58,
+      "column": 23
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableGPUAcceleration",
+    "defaultMessage": "!!!Enable GPU Acceleration",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 62,
+      "column": 25
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.beta",
+    "defaultMessage": "!!!Include beta versions",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 66,
+      "column": 8
+    },
+    "end": {
+      "line": 69,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditUserScreen.json b/src/i18n/messages/src/containers/settings/EditUserScreen.json
new file mode 100644
index 000000000..70ff29945
--- /dev/null
+++ b/src/i18n/messages/src/containers/settings/EditUserScreen.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "settings.user.form.firstname",
+    "defaultMessage": "!!!Firstname",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 14,
+      "column": 13
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.lastname",
+    "defaultMessage": "!!!Lastname",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 18,
+      "column": 12
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.email",
+    "defaultMessage": "!!!Email",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 22,
+      "column": 9
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.label",
+    "defaultMessage": "!!!Account type",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 26,
+      "column": 20
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.individual",
+    "defaultMessage": "!!!Individual",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 30,
+      "column": 25
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.non-profit",
+    "defaultMessage": "!!!Non-Profit",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 34,
+      "column": 24
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.company",
+    "defaultMessage": "!!!Company",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 38,
+      "column": 22
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.currentPassword",
+    "defaultMessage": "!!!Current password",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 42,
+      "column": 19
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.newPassword",
+    "defaultMessage": "!!!New password",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 46,
+      "column": 15
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
new file mode 100644
index 000000000..bacd9444a
--- /dev/null
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "feature.delayApp.headline",
+    "defaultMessage": "!!!Please purchase license to skip waiting",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.action",
+    "defaultMessage": "!!!Get a Franz Supporter License",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 19,
+      "column": 10
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.text",
+    "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 23,
+      "column": 8
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
new file mode 100644
index 000000000..0fec9db64
--- /dev/null
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "feature.shareFranz.headline",
+    "defaultMessage": "!!!Franz is better together!",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.text",
+    "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.action.email",
+    "defaultMessage": "!!!Share as email",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 23,
+      "column": 16
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.action.facebook",
+    "defaultMessage": "!!!Share on Facebook",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 27,
+      "column": 19
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.action.twitter",
+    "defaultMessage": "!!!Share on Twitter",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 31,
+      "column": 18
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.shareText.email",
+    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 35,
+      "column": 18
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.shareText.twitter",
+    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 39,
+      "column": 20
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
new file mode 100644
index 000000000..1d5063a97
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "settings.workspace.add.form.submitButton",
+    "defaultMessage": "!!!Save workspace",
+    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+    "start": {
+      "line": 11,
+      "column": 16
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.add.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+    "start": {
+      "line": 15,
+      "column": 8
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
new file mode 100644
index 000000000..467f49cda
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "settings.workspace.form.buttonDelete",
+    "defaultMessage": "!!!Delete workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 16,
+      "column": 16
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.buttonSave",
+    "defaultMessage": "!!!Save workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 20,
+      "column": 14
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 24,
+      "column": 8
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.yourWorkspaces",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 28,
+      "column": 18
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+    "defaultMessage": "!!!Services in this Workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 32,
+      "column": 31
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
new file mode 100644
index 000000000..0e053a124
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "settings.workspaces.headline",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 12,
+      "column": 12
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.noWorkspacesAdded",
+    "defaultMessage": "!!!You haven't added any workspaces yet.",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 16,
+      "column": 19
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json
new file mode 100644
index 000000000..86bfe1500
--- /dev/null
+++ b/src/i18n/messages/src/helpers/validation-helpers.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "validation.required",
+    "defaultMessage": "!!!Field is required",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 4,
+      "column": 12
+    },
+    "end": {
+      "line": 7,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.email",
+    "defaultMessage": "!!!Email not valid",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 8,
+      "column": 9
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.url",
+    "defaultMessage": "!!!Not a valid URL",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 12,
+      "column": 7
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.minLength",
+    "defaultMessage": "!!!Too few characters",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 16,
+      "column": 13
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.oneRequired",
+    "defaultMessage": "!!!At least one is required",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 20,
+      "column": 15
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
new file mode 100644
index 000000000..28001614f
--- /dev/null
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "global.api.unhealthy",
+    "defaultMessage": "!!!Can't connect to Franz Online Services",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 4,
+      "column": 16
+    },
+    "end": {
+      "line": 7,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.notConnectedToTheInternet",
+    "defaultMessage": "!!!You are not connected to the internet.",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 8,
+      "column": 29
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.language",
+    "defaultMessage": "!!!Spell checking language",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 12,
+      "column": 24
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecker.useDefault",
+    "defaultMessage": "!!!Use System Default ({default})",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 16,
+      "column": 29
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.autodetect",
+    "defaultMessage": "!!!Detect language automatically",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 20,
+      "column": 34
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.autodetect.short",
+    "defaultMessage": "!!!Automatic",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 24,
+      "column": 39
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
new file mode 100644
index 000000000..53fa038c6
--- /dev/null
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -0,0 +1,652 @@
+[
+  {
+    "id": "menu.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 12,
+      "column": 8
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.undo",
+    "defaultMessage": "!!!Undo",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 16,
+      "column": 8
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.redo",
+    "defaultMessage": "!!!Redo",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 20,
+      "column": 8
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.cut",
+    "defaultMessage": "!!!Cut",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 24,
+      "column": 7
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.copy",
+    "defaultMessage": "!!!Copy",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 28,
+      "column": 8
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.paste",
+    "defaultMessage": "!!!Paste",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 32,
+      "column": 9
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.pasteAndMatchStyle",
+    "defaultMessage": "!!!Paste And Match Style",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 36,
+      "column": 22
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.delete",
+    "defaultMessage": "!!!Delete",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 40,
+      "column": 10
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.selectAll",
+    "defaultMessage": "!!!Select All",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 44,
+      "column": 13
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.speech",
+    "defaultMessage": "!!!Speech",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 48,
+      "column": 10
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.startSpeaking",
+    "defaultMessage": "!!!Start Speaking",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 52,
+      "column": 17
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.stopSpeaking",
+    "defaultMessage": "!!!Stop Speaking",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 56,
+      "column": 16
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.startDictation",
+    "defaultMessage": "!!!Start Dictation",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 60,
+      "column": 18
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.emojiSymbols",
+    "defaultMessage": "!!!Emoji & Symbols",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 64,
+      "column": 16
+    },
+    "end": {
+      "line": 67,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.resetZoom",
+    "defaultMessage": "!!!Actual Size",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 68,
+      "column": 13
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.zoomIn",
+    "defaultMessage": "!!!Zoom In",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 72,
+      "column": 10
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.zoomOut",
+    "defaultMessage": "!!!Zoom Out",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 76,
+      "column": 11
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.enterFullScreen",
+    "defaultMessage": "!!!Enter Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 80,
+      "column": 19
+    },
+    "end": {
+      "line": 83,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.exitFullScreen",
+    "defaultMessage": "!!!Exit Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 84,
+      "column": 18
+    },
+    "end": {
+      "line": 87,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleFullScreen",
+    "defaultMessage": "!!!Toggle Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 88,
+      "column": 20
+    },
+    "end": {
+      "line": 91,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleDevTools",
+    "defaultMessage": "!!!Toggle Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 92,
+      "column": 18
+    },
+    "end": {
+      "line": 95,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleServiceDevTools",
+    "defaultMessage": "!!!Toggle Service Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 96,
+      "column": 25
+    },
+    "end": {
+      "line": 99,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.reloadService",
+    "defaultMessage": "!!!Reload Service",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 100,
+      "column": 17
+    },
+    "end": {
+      "line": 103,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.reloadFranz",
+    "defaultMessage": "!!!Reload Franz",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 104,
+      "column": 15
+    },
+    "end": {
+      "line": 107,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window.minimize",
+    "defaultMessage": "!!!Minimize",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 108,
+      "column": 12
+    },
+    "end": {
+      "line": 111,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window.close",
+    "defaultMessage": "!!!Close",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 112,
+      "column": 9
+    },
+    "end": {
+      "line": 115,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.learnMore",
+    "defaultMessage": "!!!Learn More",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 116,
+      "column": 13
+    },
+    "end": {
+      "line": 119,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.changelog",
+    "defaultMessage": "!!!Changelog",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 120,
+      "column": 13
+    },
+    "end": {
+      "line": 123,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.support",
+    "defaultMessage": "!!!Support",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 124,
+      "column": 11
+    },
+    "end": {
+      "line": 127,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.tos",
+    "defaultMessage": "!!!Terms of Service",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 128,
+      "column": 7
+    },
+    "end": {
+      "line": 131,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.privacy",
+    "defaultMessage": "!!!Privacy Statement",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 132,
+      "column": 11
+    },
+    "end": {
+      "line": 135,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.file",
+    "defaultMessage": "!!!File",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 136,
+      "column": 8
+    },
+    "end": {
+      "line": 139,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view",
+    "defaultMessage": "!!!View",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 140,
+      "column": 8
+    },
+    "end": {
+      "line": 143,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services",
+    "defaultMessage": "!!!Services",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 144,
+      "column": 12
+    },
+    "end": {
+      "line": 147,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window",
+    "defaultMessage": "!!!Window",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 148,
+      "column": 10
+    },
+    "end": {
+      "line": 151,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help",
+    "defaultMessage": "!!!Help",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 152,
+      "column": 8
+    },
+    "end": {
+      "line": 155,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.about",
+    "defaultMessage": "!!!About Franz",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 156,
+      "column": 9
+    },
+    "end": {
+      "line": 159,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 160,
+      "column": 12
+    },
+    "end": {
+      "line": 163,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.hide",
+    "defaultMessage": "!!!Hide",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 164,
+      "column": 8
+    },
+    "end": {
+      "line": 167,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.hideOthers",
+    "defaultMessage": "!!!Hide Others",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 168,
+      "column": 14
+    },
+    "end": {
+      "line": 171,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.unhide",
+    "defaultMessage": "!!!Unhide",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 172,
+      "column": 10
+    },
+    "end": {
+      "line": 175,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.quit",
+    "defaultMessage": "!!!Quit",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 176,
+      "column": 8
+    },
+    "end": {
+      "line": 179,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.addNewService",
+    "defaultMessage": "!!!Add New Service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 180,
+      "column": 17
+    },
+    "end": {
+      "line": 183,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.addNewWorkspace",
+    "defaultMessage": "!!!Add New Workspace...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 184,
+      "column": 19
+    },
+    "end": {
+      "line": 187,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.setNextServiceActive",
+    "defaultMessage": "!!!Activate next service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 188,
+      "column": 23
+    },
+    "end": {
+      "line": 191,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.activatePreviousService",
+    "defaultMessage": "!!!Activate previous service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 192,
+      "column": 27
+    },
+    "end": {
+      "line": 195,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.muteApp",
+    "defaultMessage": "!!!Disable notifications & audio",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 196,
+      "column": 11
+    },
+    "end": {
+      "line": 199,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.unmuteApp",
+    "defaultMessage": "!!!Enable notifications & audio",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 200,
+      "column": 13
+    },
+    "end": {
+      "line": 203,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces",
+    "defaultMessage": "!!!Workspaces",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 204,
+      "column": 14
+    },
+    "end": {
+      "line": 207,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.defaultWorkspace",
+    "defaultMessage": "!!!Default",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 208,
+      "column": 20
+    },
+    "end": {
+      "line": 211,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 69cfa77e7..0e222c3d6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -34,6 +34,7 @@ import {
   DEFAULT_WINDOW_OPTIONS,
 } from './config';
 import { asarPath } from './helpers/asar-helpers';
+import { isValidExternalURL } from './helpers/url-helpers';
 /* eslint-enable import/first */
 
 const debug = require('debug')('Franz:App');
@@ -223,20 +224,24 @@ const createWindow = () => {
 
   // Emitted when the window is closed.
   mainWindow.on('close', (e) => {
+    debug('Window: close window');
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
     if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
       e.preventDefault();
       if (isWindows) {
+        debug('Window: minimize');
         mainWindow.minimize();
+
+        if (settings.get('minimizeToSystemTray')) {
+          debug('Skip taskbar: true');
+          mainWindow.setSkipTaskbar(true);
+        }
       } else {
+        debug('Window: hide');
         mainWindow.hide();
       }
-
-      if (isWindows) {
-        mainWindow.setSkipTaskbar(true);
-      }
     } else {
       app.quit();
     }
@@ -248,32 +253,39 @@ const createWindow = () => {
     app.wasMaximized = app.isMaximized;
 
     if (settings.get('minimizeToSystemTray')) {
+      debug('Skip taskbar: true');
       mainWindow.setSkipTaskbar(true);
       trayIcon.show();
     }
   });
 
   mainWindow.on('maximize', () => {
+    debug('Window: maximize');
     app.isMaximized = true;
   });
 
   mainWindow.on('unmaximize', () => {
+    debug('Window: unmaximize');
     app.isMaximized = false;
   });
 
   mainWindow.on('restore', () => {
+    debug('Window: restore');
     mainWindow.setSkipTaskbar(false);
 
     if (app.wasMaximized) {
+      debug('Window: was maximized before, maximize window');
       mainWindow.maximize();
     }
 
     if (!settings.get('enableSystemTray')) {
+      debug('Tray: hiding tray icon');
       trayIcon.hide();
     }
   });
 
   mainWindow.on('show', () => {
+    debug('Skip taskbar: false');
     mainWindow.setSkipTaskbar(false);
   });
 
@@ -281,8 +293,12 @@ const createWindow = () => {
   app.isMaximized = mainWindow.isMaximized();
 
   mainWindow.webContents.on('new-window', (e, url) => {
+    debug('Open url', url);
     e.preventDefault();
-    shell.openExternal(url);
+
+    if (isValidExternalURL(url)) {
+      shell.openExternal(url);
+    }
   });
 };
 
@@ -360,7 +376,10 @@ app.on('window-all-closed', () => {
   // to stay active until the user quits explicitly with Cmd + Q
   if (settings.get('runInBackground') === undefined
     || settings.get('runInBackground')) {
+    debug('Window: all windows closed, quit app');
     app.quit();
+  } else {
+    debug('Window: don\'t quit app');
   }
 });
 
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c572bbb70..b21a62b4d 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,5 +1,5 @@
 import { remote, shell } from 'electron';
-import { observable, autorun, computed } from 'mobx';
+import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
@@ -181,6 +181,26 @@ const menuItems = defineMessages({
     id: 'menu.services.addNewService',
     defaultMessage: '!!!Add New Service...',
   },
+  addNewWorkspace: {
+    id: 'menu.workspaces.addNewWorkspace',
+    defaultMessage: '!!!Add New Workspace...',
+  },
+  activateNextService: {
+    id: 'menu.services.setNextServiceActive',
+    defaultMessage: '!!!Activate next service...',
+  },
+  activatePreviousService: {
+    id: 'menu.services.activatePreviousService',
+    defaultMessage: '!!!Activate previous service...',
+  },
+  muteApp: {
+    id: 'sidebar.muteApp',
+    defaultMessage: '!!!Disable notifications & audio',
+  },
+  unmuteApp: {
+    id: 'sidebar.unmuteApp',
+    defaultMessage: '!!!Enable notifications & audio',
+  },
   workspaces: {
     id: 'menu.workspaces',
     defaultMessage: '!!!Workspaces',
@@ -189,10 +209,6 @@ const menuItems = defineMessages({
     id: 'menu.workspaces.defaultWorkspace',
     defaultMessage: '!!!Default',
   },
-  addNewWorkspace: {
-    id: 'menu.workspaces.addNewWorkspace',
-    defaultMessage: '!!!Add New Workspace...',
-  },
 });
 
 function getActiveWebview() {
@@ -253,16 +269,32 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.resetZoom),
-        role: 'resetzoom',
+        accelerator: 'Cmd+0',
+        click() {
+          getActiveWebview().setZoomLevel(0);
+        },
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        // accelerator: 'Cmd+=',
-        role: 'zoomin',
+        accelerator: 'Cmd+plus',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) activeService.setZoomLevel(level + 1);
+          });
+        },
       },
       {
         label: intl.formatMessage(menuItems.zoomOut),
-        role: 'zoomout',
+        accelerator: 'Cmd+-',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+            if (level > -9) activeService.setZoomLevel(level - 1);
+          });
+        },
       },
       {
         type: 'separator',
@@ -410,10 +442,12 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        accelerator: `${ctrlKey}+Plus`,
+        accelerator: `${ctrlKey}+=`,
         click() {
-          getActiveWebview().getZoomLevel((zoomLevel) => {
-            getActiveWebview().setZoomLevel(zoomLevel === 5 ? zoomLevel : zoomLevel + 1);
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) activeService.setZoomLevel(level + 1);
           });
         },
       },
@@ -421,8 +455,10 @@ const _titleBarTemplateFactory = intl => [
         label: intl.formatMessage(menuItems.zoomOut),
         accelerator: `${ctrlKey}+-`,
         click() {
-          getActiveWebview().getZoomLevel((zoomLevel) => {
-            getActiveWebview().setZoomLevel(zoomLevel === -5 ? zoomLevel : zoomLevel - 1);
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+            if (level > -9) activeService.setZoomLevel(level - 1);
           });
         },
       },
@@ -518,14 +554,14 @@ export default class FranzMenu {
 
   _build() {
     // need to clone object so we don't modify computed (cached) object
-    const serviceTpl = Object.assign([], this.serviceTpl);
-    const workspacesMenu = Object.assign([], this.workspacesMenu);
+    const serviceTpl = Object.assign([], this.serviceTpl());
+    const workspacesMenu = Object.assign([], this.workspacesMenu());
 
     if (window.franz === undefined) {
       return;
     }
 
-    const intl = window.franz.intl;
+    const { intl } = window.franz;
     const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
@@ -683,17 +719,6 @@ export default class FranzMenu {
       }, about);
     }
 
-    serviceTpl.unshift({
-      label: intl.formatMessage(menuItems.addNewService),
-      accelerator: `${cmdKey}+N`,
-      click: () => {
-        this.actions.ui.openSettings({ path: 'recipes' });
-      },
-      enabled: this.stores.user.isLoggedIn,
-    }, {
-      type: 'separator',
-    });
-
     if (serviceTpl.length > 0) {
       tpl[3].submenu = serviceTpl;
     }
@@ -705,25 +730,52 @@ export default class FranzMenu {
     Menu.setApplicationMenu(menu);
   }
 
-  @computed get serviceTpl() {
-    const services = this.stores.services.allDisplayed;
+  serviceTpl() {
+    const { intl } = window.franz;
+    const { user, services, settings } = this.stores;
+    if (!user.isLoggedIn) return [];
+    const menu = [];
 
-    if (this.stores.user.isLoggedIn) {
-      return services.map((service, i) => ({
-        label: this._getServiceName(service),
-        accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
-        type: 'radio',
-        checked: service.isActive,
-        click: () => {
-          this.actions.service.setActive({ serviceId: service.id });
-        },
-      }));
-    }
+    menu.push({
+      label: intl.formatMessage(menuItems.addNewService),
+      accelerator: `${cmdKey}+N`,
+      click: () => {
+        this.actions.ui.openSettings({ path: 'recipes' });
+      },
+    }, {
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(menuItems.activateNextService),
+      accelerator: `${cmdKey}+alt+right`,
+      click: () => this.actions.service.setActiveNext(),
+    }, {
+      label: intl.formatMessage(menuItems.activatePreviousService),
+      accelerator: `${cmdKey}+alt+left`,
+      click: () => this.actions.service.setActivePrev(),
+    }, {
+      label: intl.formatMessage(
+        settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp,
+      ).replace('&', '&&'),
+      accelerator: `${cmdKey}+shift+m`,
+      click: () => this.actions.app.toggleMuteApp(),
+    }, {
+      type: 'separator',
+    });
 
-    return [];
+    services.allDisplayed.forEach((service, i) => (menu.push({
+      label: this._getServiceName(service),
+      accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
+      type: 'radio',
+      checked: service.isActive,
+      click: () => {
+        this.actions.service.setActive({ serviceId: service.id });
+      },
+    })));
+
+    return menu;
   }
 
-  @computed get workspacesMenu() {
+  workspacesMenu() {
     const { workspaces, activeWorkspace } = workspacesState;
     const { intl } = window.franz;
     const menu = [];
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 168aa7e48..7784ff1f9 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -3,11 +3,11 @@ import {
   action, computed, observable, reaction,
 } from 'mobx';
 import moment from 'moment';
-import key from 'keymaster';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
 import AutoLaunch from 'auto-launch';
 import prettyBytes from 'pretty-bytes';
 import ms from 'ms';
+import { URL } from 'url';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -19,6 +19,7 @@ import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
+import { isValidExternalURL } from '../helpers/url-helpers';
 
 const debug = require('debug')('Franz:AppStore');
 
@@ -155,27 +156,6 @@ export default class AppStore extends Store {
       this.stores.router.push(url);
     });
 
-    // Set active the next service
-    key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
-        this.actions.service.setActiveNext();
-      },
-    );
-
-    // Set active the prev service
-    key(
-      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
-        this.actions.service.setActivePrev();
-      },
-    );
-
-    // Global Mute
-    key(
-      '⌘+shift+m ctrl+shift+m', () => {
-        this.actions.app.toggleMuteApp();
-      },
-    );
-
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
@@ -256,7 +236,14 @@ export default class AppStore extends Store {
   }
 
   @action _openExternalUrl({ url }) {
-    shell.openExternal(url);
+    const parsedUrl = new URL(url);
+    debug('open external url', parsedUrl);
+
+    if (isValidExternalURL(url)) {
+      shell.openExternal(url);
+    }
+
+    gaEvent('External URL', 'open', parsedUrl.host);
   }
 
   @action _checkForUpdates() {
@@ -280,7 +267,6 @@ export default class AppStore extends Store {
 
   @action _muteApp({ isMuted, overrideSystemMute = true }) {
     this.isSystemMuteOverridden = overrideSystemMute;
-
     this.actions.settings.update({
       type: 'app',
       data: {
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 8b7cc512a..9a003a922 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -124,15 +124,14 @@ html { overflow: hidden; }
   background: $theme-brand-warning;
   color: #FFF;
   display: block;
-  font-size: 10px;
+  font-size: 8px;
   height: auto;
   padding: 4px;
   position: fixed;
-  right: 5px;
-  top: 5px;
+  left: 9px;
+  bottom: 0px;
   transition: opacity .5s ease;
   width: auto;
   z-index: 999999999;
-
-  &:hover { opacity: 0; }
+  pointer-events: none;
 }