42 files changed, 3933 insertions, 84 deletions

diff --git a/.babelrc b/.babelrc
index 299d5b4a0..dd23bdabf 100644
--- a/.babelrc
+++ b/.babelrc
@@ -25,7 +25,12 @@
       }
     ],
     "@babel/proposal-throw-expressions",
-    "@babel/syntax-dynamic-import"
+    "@babel/syntax-dynamic-import",
+    ["react-intl", {
+      "messagesDir": "./translations/messages/",
+      "enforceDescriptions": false,
+      "extractSourceLocation": true
+    }]
   ],
   "sourceMaps": "inline"
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index 1a66f4ffd..82e9c9997 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3157,6 +3157,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",
@@ -11228,6 +11239,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",
@@ -11263,6 +11283,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",
@@ -14967,6 +14993,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 c28d29e90..33a0fb0d9 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 ./translations/manage-translations.js",
     "sign": "gulp sign",
     "prebuild": "gulp build",
     "build": "npx electron-builder --publish onTag",
@@ -108,6 +109,7 @@
     "@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",
@@ -137,6 +139,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",
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/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/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/translations/manage-translations.js b/translations/manage-translations.js
new file mode 100644
index 000000000..adbbe2363
--- /dev/null
+++ b/translations/manage-translations.js
@@ -0,0 +1,10 @@
+require('@babel/register');
+const manageTranslations = require('react-intl-translations-manager').default;
+// const { APP_LOCALES } = require('../src/i18n/languages');
+
+manageTranslations({
+  messagesDirectory: 'translations/messages',
+  translationsDirectory: 'src/i18n/locales',
+  singleMessagesFile: true,
+  languages: ['en-US'], // Object.keys(APP_LOCALES),
+});
diff --git a/translations/messages/src/components/auth/Import.json b/translations/messages/src/components/auth/Import.json
new file mode 100644
index 000000000..264fc729b
--- /dev/null
+++ b/translations/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/translations/messages/src/components/auth/Invite.json b/translations/messages/src/components/auth/Invite.json
new file mode 100644
index 000000000..57c9bddcf
--- /dev/null
+++ b/translations/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/translations/messages/src/components/auth/Login.json b/translations/messages/src/components/auth/Login.json
new file mode 100644
index 000000000..177f6000b
--- /dev/null
+++ b/translations/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/translations/messages/src/components/auth/Password.json b/translations/messages/src/components/auth/Password.json
new file mode 100644
index 000000000..f335b3acb
--- /dev/null
+++ b/translations/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/translations/messages/src/components/auth/Pricing.json b/translations/messages/src/components/auth/Pricing.json
new file mode 100644
index 000000000..f711a55b4
--- /dev/null
+++ b/translations/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/translations/messages/src/components/auth/Signup.json b/translations/messages/src/components/auth/Signup.json
new file mode 100644
index 000000000..a09745048
--- /dev/null
+++ b/translations/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/translations/messages/src/components/auth/Welcome.json b/translations/messages/src/components/auth/Welcome.json
new file mode 100644
index 000000000..b4d2ce689
--- /dev/null
+++ b/translations/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/translations/messages/src/components/layout/AppLayout.json b/translations/messages/src/components/layout/AppLayout.json
new file mode 100644
index 000000000..07603d062
--- /dev/null
+++ b/translations/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/translations/messages/src/components/layout/Sidebar.json b/translations/messages/src/components/layout/Sidebar.json
new file mode 100644
index 000000000..7aa00a186
--- /dev/null
+++ b/translations/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/translations/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/translations/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
new file mode 100644
index 000000000..c8fe802df
--- /dev/null
+++ b/translations/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/translations/messages/src/components/services/content/ServiceDisabled.json b/translations/messages/src/components/services/content/ServiceDisabled.json
new file mode 100644
index 000000000..8bfad28c7
--- /dev/null
+++ b/translations/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/translations/messages/src/components/services/content/Services.json b/translations/messages/src/components/services/content/Services.json
new file mode 100644
index 000000000..884ab0c90
--- /dev/null
+++ b/translations/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/translations/messages/src/components/services/content/WebviewCrashHandler.json b/translations/messages/src/components/services/content/WebviewCrashHandler.json
new file mode 100644
index 000000000..c3d6c41a5
--- /dev/null
+++ b/translations/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/translations/messages/src/components/services/tabs/TabItem.json b/translations/messages/src/components/services/tabs/TabItem.json
new file mode 100644
index 000000000..08a07845c
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/account/AccountDashboard.json b/translations/messages/src/components/settings/account/AccountDashboard.json
new file mode 100644
index 000000000..271328792
--- /dev/null
+++ b/translations/messages/src/components/settings/account/AccountDashboard.json
@@ -0,0 +1,210 @@
+[
+  {
+    "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.accountType.enterprise",
+    "defaultMessage": "!!!Enterprise Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 47,
+      "column": 25
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.account.editButton",
+    "defaultMessage": "!!!Edit Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 51,
+      "column": 21
+    },
+    "end": {
+      "line": 54,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.invoiceDownload",
+    "defaultMessage": "!!!Download",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 55,
+      "column": 19
+    },
+    "end": {
+      "line": 58,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.userInfoRequestFailed",
+    "defaultMessage": "!!!Could not load user information",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 59,
+      "column": 25
+    },
+    "end": {
+      "line": 62,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.tryReloadUserInfoRequest",
+    "defaultMessage": "!!!Try again",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 63,
+      "column": 28
+    },
+    "end": {
+      "line": 66,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteAccount",
+    "defaultMessage": "!!!Delete account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 67,
+      "column": 17
+    },
+    "end": {
+      "line": 70,
+      "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": 71,
+      "column": 14
+    },
+    "end": {
+      "line": 74,
+      "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": 75,
+      "column": 19
+    },
+    "end": {
+      "line": 78,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/translations/messages/src/components/settings/navigation/SettingsNavigation.json b/translations/messages/src/components/settings/navigation/SettingsNavigation.json
new file mode 100644
index 000000000..785ce9f29
--- /dev/null
+++ b/translations/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -0,0 +1,80 @@
+[
+  {
+    "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.account",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 17,
+      "column": 11
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 21,
+      "column": 12
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.inviteFriends",
+    "defaultMessage": "!!!Invite Friends",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 25,
+      "column": 17
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.logout",
+    "defaultMessage": "!!!Logout",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/translations/messages/src/components/settings/recipes/RecipesDashboard.json b/translations/messages/src/components/settings/recipes/RecipesDashboard.json
new file mode 100644
index 000000000..7d9ed3283
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/services/EditServiceForm.json b/translations/messages/src/components/settings/services/EditServiceForm.json
new file mode 100644
index 000000000..42b741b7a
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/services/ServiceError.json b/translations/messages/src/components/settings/services/ServiceError.json
new file mode 100644
index 000000000..648fc5b3e
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/services/ServiceItem.json b/translations/messages/src/components/settings/services/ServiceItem.json
new file mode 100644
index 000000000..ffea8b9e1
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/services/ServicesDashboard.json b/translations/messages/src/components/settings/services/ServicesDashboard.json
new file mode 100644
index 000000000..3803c6512
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/settings/EditSettingsForm.json b/translations/messages/src/components/settings/settings/EditSettingsForm.json
new file mode 100644
index 000000000..c64f477be
--- /dev/null
+++ b/translations/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/translations/messages/src/components/settings/user/EditUserForm.json b/translations/messages/src/components/settings/user/EditUserForm.json
new file mode 100644
index 000000000..3a59f8681
--- /dev/null
+++ b/translations/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/translations/messages/src/components/subscription/SubscriptionForm.json b/translations/messages/src/components/subscription/SubscriptionForm.json
new file mode 100644
index 000000000..cc7470358
--- /dev/null
+++ b/translations/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/translations/messages/src/components/subscription/SubscriptionPopup.json b/translations/messages/src/components/subscription/SubscriptionPopup.json
new file mode 100644
index 000000000..c06da7531
--- /dev/null
+++ b/translations/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/translations/messages/src/components/ui/PremiumFeatureContainer/index.json b/translations/messages/src/components/ui/PremiumFeatureContainer/index.json
new file mode 100644
index 000000000..582d546fa
--- /dev/null
+++ b/translations/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/translations/messages/src/components/util/ErrorBoundary/index.json b/translations/messages/src/components/util/ErrorBoundary/index.json
new file mode 100644
index 000000000..43c323031
--- /dev/null
+++ b/translations/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/translations/messages/src/containers/settings/EditServiceScreen.json b/translations/messages/src/containers/settings/EditServiceScreen.json
new file mode 100644
index 000000000..42ca42125
--- /dev/null
+++ b/translations/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/translations/messages/src/containers/settings/EditSettingsScreen.json b/translations/messages/src/containers/settings/EditSettingsScreen.json
new file mode 100644
index 000000000..d3b413540
--- /dev/null
+++ b/translations/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/translations/messages/src/containers/settings/EditUserScreen.json b/translations/messages/src/containers/settings/EditUserScreen.json
new file mode 100644
index 000000000..70ff29945
--- /dev/null
+++ b/translations/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/translations/messages/src/features/delayApp/Component.json b/translations/messages/src/features/delayApp/Component.json
new file mode 100644
index 000000000..bacd9444a
--- /dev/null
+++ b/translations/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/translations/messages/src/features/shareFranz/Component.json b/translations/messages/src/features/shareFranz/Component.json
new file mode 100644
index 000000000..0fec9db64
--- /dev/null
+++ b/translations/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/translations/messages/src/helpers/validation-helpers.json b/translations/messages/src/helpers/validation-helpers.json
new file mode 100644
index 000000000..86bfe1500
--- /dev/null
+++ b/translations/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/translations/messages/src/i18n/globalMessages.json b/translations/messages/src/i18n/globalMessages.json
new file mode 100644
index 000000000..46c43291c
--- /dev/null
+++ b/translations/messages/src/i18n/globalMessages.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "global.premium.upgradeAccount",
+    "defaultMessage": "!!!Please upgrade your account to add a new service.",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 4,
+      "column": 18
+    },
+    "end": {
+      "line": 7,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.api.unhealthy",
+    "defaultMessage": "!!!Can't connect to Franz Online Services",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 8,
+      "column": 16
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.notConnectedToTheInternet",
+    "defaultMessage": "!!!You are not connected to the internet.",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 12,
+      "column": 29
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.language",
+    "defaultMessage": "!!!Spell checking language",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 16,
+      "column": 24
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecker.useDefault",
+    "defaultMessage": "!!!Use System Default ({default})",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 20,
+      "column": 29
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.autodetect",
+    "defaultMessage": "!!!Detect language automatically",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 24,
+      "column": 34
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.autodetect.short",
+    "defaultMessage": "!!!Automatic",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 28,
+      "column": 39
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/translations/messages/src/lib/Menu.json b/translations/messages/src/lib/Menu.json
new file mode 100644
index 000000000..6958f0219
--- /dev/null
+++ b/translations/messages/src/lib/Menu.json
@@ -0,0 +1,561 @@
+[
+  {
+    "id": "menu.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 10,
+      "column": 8
+    },
+    "end": {
+      "line": 13,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.undo",
+    "defaultMessage": "!!!Undo",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 14,
+      "column": 8
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.redo",
+    "defaultMessage": "!!!Redo",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 18,
+      "column": 8
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.cut",
+    "defaultMessage": "!!!Cut",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 22,
+      "column": 7
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.copy",
+    "defaultMessage": "!!!Copy",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 26,
+      "column": 8
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.paste",
+    "defaultMessage": "!!!Paste",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 30,
+      "column": 9
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.pasteAndMatchStyle",
+    "defaultMessage": "!!!Paste And Match Style",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 34,
+      "column": 22
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.delete",
+    "defaultMessage": "!!!Delete",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 38,
+      "column": 10
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.selectAll",
+    "defaultMessage": "!!!Select All",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 42,
+      "column": 13
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.speech",
+    "defaultMessage": "!!!Speech",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 46,
+      "column": 10
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.startSpeaking",
+    "defaultMessage": "!!!Start Speaking",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 50,
+      "column": 17
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.stopSpeaking",
+    "defaultMessage": "!!!Stop Speaking",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 54,
+      "column": 16
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.startDictation",
+    "defaultMessage": "!!!Start Dictation",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 58,
+      "column": 18
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.emojiSymbols",
+    "defaultMessage": "!!!Emoji & Symbols",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 62,
+      "column": 16
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.resetZoom",
+    "defaultMessage": "!!!Actual Size",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 66,
+      "column": 13
+    },
+    "end": {
+      "line": 69,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.zoomIn",
+    "defaultMessage": "!!!Zoom In",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 70,
+      "column": 10
+    },
+    "end": {
+      "line": 73,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.zoomOut",
+    "defaultMessage": "!!!Zoom Out",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 74,
+      "column": 11
+    },
+    "end": {
+      "line": 77,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.enterFullScreen",
+    "defaultMessage": "!!!Enter Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 78,
+      "column": 19
+    },
+    "end": {
+      "line": 81,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.exitFullScreen",
+    "defaultMessage": "!!!Exit Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 82,
+      "column": 18
+    },
+    "end": {
+      "line": 85,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleFullScreen",
+    "defaultMessage": "!!!Toggle Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 86,
+      "column": 20
+    },
+    "end": {
+      "line": 89,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleDevTools",
+    "defaultMessage": "!!!Toggle Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 90,
+      "column": 18
+    },
+    "end": {
+      "line": 93,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleServiceDevTools",
+    "defaultMessage": "!!!Toggle Service Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 94,
+      "column": 25
+    },
+    "end": {
+      "line": 97,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.reloadService",
+    "defaultMessage": "!!!Reload Service",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 98,
+      "column": 17
+    },
+    "end": {
+      "line": 101,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.reloadFranz",
+    "defaultMessage": "!!!Reload Franz",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 102,
+      "column": 15
+    },
+    "end": {
+      "line": 105,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window.minimize",
+    "defaultMessage": "!!!Minimize",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 106,
+      "column": 12
+    },
+    "end": {
+      "line": 109,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window.close",
+    "defaultMessage": "!!!Close",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 110,
+      "column": 9
+    },
+    "end": {
+      "line": 113,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.learnMore",
+    "defaultMessage": "!!!Learn More",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 114,
+      "column": 13
+    },
+    "end": {
+      "line": 117,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.changelog",
+    "defaultMessage": "!!!Changelog",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 118,
+      "column": 13
+    },
+    "end": {
+      "line": 121,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.support",
+    "defaultMessage": "!!!Support",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 122,
+      "column": 11
+    },
+    "end": {
+      "line": 125,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.tos",
+    "defaultMessage": "!!!Terms of Service",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 126,
+      "column": 7
+    },
+    "end": {
+      "line": 129,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.privacy",
+    "defaultMessage": "!!!Privacy Statement",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 130,
+      "column": 11
+    },
+    "end": {
+      "line": 133,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.file",
+    "defaultMessage": "!!!File",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 134,
+      "column": 8
+    },
+    "end": {
+      "line": 137,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view",
+    "defaultMessage": "!!!View",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 138,
+      "column": 8
+    },
+    "end": {
+      "line": 141,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services",
+    "defaultMessage": "!!!Services",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 142,
+      "column": 12
+    },
+    "end": {
+      "line": 145,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window",
+    "defaultMessage": "!!!Window",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 146,
+      "column": 10
+    },
+    "end": {
+      "line": 149,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help",
+    "defaultMessage": "!!!Help",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 150,
+      "column": 8
+    },
+    "end": {
+      "line": 153,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.about",
+    "defaultMessage": "!!!About Franz",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 154,
+      "column": 9
+    },
+    "end": {
+      "line": 157,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 158,
+      "column": 12
+    },
+    "end": {
+      "line": 161,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.hide",
+    "defaultMessage": "!!!Hide",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 162,
+      "column": 8
+    },
+    "end": {
+      "line": 165,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.hideOthers",
+    "defaultMessage": "!!!Hide Others",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 166,
+      "column": 14
+    },
+    "end": {
+      "line": 169,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.unhide",
+    "defaultMessage": "!!!Unhide",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 170,
+      "column": 10
+    },
+    "end": {
+      "line": 173,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.quit",
+    "defaultMessage": "!!!Quit",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 174,
+      "column": 8
+    },
+    "end": {
+      "line": 177,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.addNewService",
+    "defaultMessage": "!!!Add New Service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 178,
+      "column": 17
+    },
+    "end": {
+      "line": 181,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file