110 files changed, 4843 insertions, 2171 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index c11a2994f..5317684cf 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--- Provide a general summary of the issue in the Title above -->
 
-<!-- This repository is only for the Franz client. Please use this form ( https://adlk.typeform.com/to/Bj7vGq ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
+<!-- This repository is only for the Franz client. Please use this form ( https://goo.gl/forms/zbwlx3VFvAo2oink2q ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
 
 <!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md -->
 
diff --git a/.travis.yml b/.travis.yml
index b3ebc4f25..78c1e3693 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,6 @@ matrix:
 language: node_js
 
 before_script:
-- yarn add global gulp-cli@1.2.2
-- yarn add global gulpjs/gulp#4.0
 - yarn add global node-sass
 - yarn install
 
@@ -19,7 +17,7 @@ script:
 - travis_wait yarn build
 
 node_js:
-- '7'
+- '8'
 
 before_install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi
diff --git a/.vscode/launch.json b/.vscode/launch.json
index abbbdd64b..a8300f84f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -22,6 +22,17 @@
             "env": {
                 "LIVE_API": "1"
             }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Franz – Local API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",
+            "env": {
+                "LOCAL_API": "1"
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 024afe93c..ef7e1c586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+<a name="5.0.0-beta.14"></a>
+# [5.0.0-beta.14](https://github.com/meetfranz/franz/compare/v5.0.0-beta.13...v5.0.0-beta.14) (2017-11-23)
+
+
+### Features
+
+* **App:** Add link to changelog in app update notification ([2cbd938](https://github.com/meetfranz/franz/commit/2cbd938))
+* **App:** Add option to enable/disable spell checker ([dcab45a](https://github.com/meetfranz/franz/commit/dcab45a))
+* **App:** Add option to mute all services in sidebar ([f5a9aa2](https://github.com/meetfranz/franz/commit/f5a9aa2)), closes [#8](https://github.com/meetfranz/franz/issues/8) [#162](https://github.com/meetfranz/franz/issues/162)
+* **App:** Decrease minimum window size to 600px width ([2521621](https://github.com/meetfranz/franz/commit/2521621)), closes [#239](https://github.com/meetfranz/franz/issues/239)
+* **App:** Respect System DoNotDisturb mode for service audio ([7d41227](https://github.com/meetfranz/franz/commit/7d41227)), closes [#162](https://github.com/meetfranz/franz/issues/162)
+* **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
+* **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
+* **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
+* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](http://i18n.meetfranz.com/)**
+
+
+### Bug Fixes
+
+* **Windows:** Fix notifications on Windows 10 (Fall Creators Update) ([eea4801](https://github.com/meetfranz/franz/commit/eea4801)), closes [#173](https://github.com/meetfranz/franz/issues/173)
+* **macOS:** Fix TouchBar related crash on macOS 10.12.1 and lower ([9e9a2ed](https://github.com/meetfranz/franz/commit/9e9a2ed)), closes [#70](https://github.com/meetfranz/franz/issues/70)
+* **App:** Add fallback to service menu when service name is empty ([42ed24d](https://github.com/meetfranz/franz/commit/42ed24d)), closes [#250](https://github.com/meetfranz/franz/issues/250)
+* **App:** Prevent app from redirecting when dropping link ([811a527](https://github.com/meetfranz/franz/commit/811a527)) ([dannyqiu](https://github.com/dannyqiu))
+* **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918)), closes [#314](https://github.com/meetfranz/franz/issues/314)
+* **Hosted Services:** Do not strip www from custom service Url  ([a764321](https://github.com/meetfranz/franz/commit/a764321)) ([BeneStem](https://github.com/BeneStem))
+* **Services:** Fix onNotify in service API ([b15421b](https://github.com/meetfranz/franz/commit/b15421b)) ([dannyqiu](https://github.com/dannyqiu))
+* **Sidebar:** Fix tabs reordering ([86413ba](https://github.com/meetfranz/franz/commit/86413ba)) ([josescgar](https://github.com/josescgar))
+
+
+
 <a name="5.0.0-beta.13"></a>
 # [5.0.0-beta.13](https://github.com/meetfranz/franz/compare/v5.0.0-beta.12...v5.0.0-beta.13) (2017-11-06)
 
diff --git a/README.md b/README.md
index 6110573a8..099100284 100644
--- a/README.md
+++ b/README.md
@@ -31,12 +31,6 @@ $ brew install yarn
 ##### Linux
 [Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/)
 
-#### Install Gulp 4
-```bash
-$ yarn add global gulp-cli@1.2.2
-$ yarn add global gulpjs/gulp#4.0
-```
-
 #### Fix native modules to match current electron node version
 ```bash
 $ yarn run rebuild
diff --git a/appveyor.yml b/appveyor.yml
index 4b2796f4b..d9296b1f6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,8 +11,6 @@ version: 5.0.0.{build}
 install:
   - ps: Install-Product node 8
   - yarn cache clean
-  - yarn add global gulp-cli@1.2.2
-  - yarn add global gulpjs/gulp#4.0
   - yarn install
 
 # cache:
@@ -22,7 +20,7 @@ before_build:
   - yarn lint
 
 build_script:
-  - yarn build
+  - yarn build --x64 --ia32
 
 notifications:
   - provider: Slack
@@ -31,3 +29,4 @@ notifications:
 
 artifacts:
   - path: out\*.exe
+  - path: out\*.yml
diff --git a/build-helpers/images/icon.png b/build-helpers/images/icon.png
index e0b4935b5..9c39f06e0 100644
--- a/build-helpers/images/icon.png
+++ b/build-helpers/images/icon.png
diff --git a/build-helpers/images/icons/1024x1024.png b/build-helpers/images/icons/1024x1024.png
index e0b4935b5..9c39f06e0 100644
--- a/build-helpers/images/icons/1024x1024.png
+++ b/build-helpers/images/icons/1024x1024.png
diff --git a/build-helpers/images/icons/128x128.png b/build-helpers/images/icons/128x128.png
new file mode 100644
index 000000000..8eb811283
--- /dev/null
+++ b/build-helpers/images/icons/128x128.png
diff --git a/build-helpers/images/icons/16x16.png b/build-helpers/images/icons/16x16.png
new file mode 100644
index 000000000..2523dd8a7
--- /dev/null
+++ b/build-helpers/images/icons/16x16.png
diff --git a/build-helpers/images/icons/24x24.png b/build-helpers/images/icons/24x24.png
new file mode 100644
index 000000000..9cb17a0b1
--- /dev/null
+++ b/build-helpers/images/icons/24x24.png
diff --git a/build-helpers/images/icons/256x256.png b/build-helpers/images/icons/256x256.png
new file mode 100644
index 000000000..5742147b8
--- /dev/null
+++ b/build-helpers/images/icons/256x256.png
diff --git a/build-helpers/images/icons/32x32.png b/build-helpers/images/icons/32x32.png
new file mode 100644
index 000000000..09b88a805
--- /dev/null
+++ b/build-helpers/images/icons/32x32.png
diff --git a/build-helpers/images/icons/48x48.png b/build-helpers/images/icons/48x48.png
new file mode 100644
index 000000000..c9d2f331c
--- /dev/null
+++ b/build-helpers/images/icons/48x48.png
diff --git a/build-helpers/images/icons/512x512.png b/build-helpers/images/icons/512x512.png
new file mode 100644
index 000000000..9d5f1c658
--- /dev/null
+++ b/build-helpers/images/icons/512x512.png
diff --git a/build-helpers/images/icons/64x64.png b/build-helpers/images/icons/64x64.png
new file mode 100644
index 000000000..7842217ed
--- /dev/null
+++ b/build-helpers/images/icons/64x64.png
diff --git a/build-helpers/images/icons/96x96.png b/build-helpers/images/icons/96x96.png
new file mode 100644
index 000000000..bbae07f45
--- /dev/null
+++ b/build-helpers/images/icons/96x96.png
diff --git a/electron-builder.yml b/electron-builder.yml
index 3f7ad1e85..96bd63cc2 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -2,7 +2,7 @@ directories:
   app: ./build
   output: ./out
 
-# forceCodeSigning: true
+appId: "com.meetfranz.franz"
 
 compression: maximum
 
@@ -24,10 +24,17 @@ linux:
   icon: ./build-helpers/images/icons
   category: Network;InstantMessaging;
   executableName: franz
+  synopsis: "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more."
+  description: "Franz is your messaging app / former Emperor of Austria and combines chat & messaging services into one application. Franz currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more. You can download Franz for free for Mac & Windows."
   target:
     - target: AppImage
     - target: deb
+    - target: tar.gz
 
 nsis:
   perMachine: false
   oneClick: true
+
+protocols: 
+  name: Franz
+  schemes: [franz] 
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index d947974b3..b50001b2d 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -110,7 +110,11 @@ export function watch() {
 }
 
 export function webserver() {
-  gulp.src(paths.dest)
+  gulp.src([
+    paths.dest,
+    `!${paths.dest}/electron/**`,
+    `!${paths.dest}/webview/**`,
+  ])
     .pipe(server({
       livereload: true,
     }));
diff --git a/package.json b/package.json
index 0cf18bfb1..6c4c65cb8 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,11 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
+  "homepage": "https://meetfranz.com",
   "repository": "https://github.com/meetfranz/franz.git",
   "private": true,
   "scripts": {
@@ -38,6 +39,7 @@
     "electron-updater": "^2.4.3",
     "electron-window-state": "^4.1.0",
     "fs-extra": "^3.0.1",
+    "gulp-cli": "1.2.2",
     "ini": "^1.3.4",
     "jshashes": "^1.0.6",
     "jsonwebtoken": "^7.4.1",
@@ -66,6 +68,7 @@
     "react-sortable-hoc": "^0.6.7",
     "react-tooltip": "^3.2.7",
     "route-parser": "^0.0.5",
+    "semver": "^5.4.1",
     "smoothscroll-polyfill": "^0.3.4",
     "tar": "^4.0.2",
     "uuid": "^3.0.1"
diff --git a/src/actions/app.js b/src/actions/app.js
index 25ff9344d..e4f648fc9 100644
--- a/src/actions/app.js
+++ b/src/actions/app.js
@@ -22,6 +22,7 @@ export default {
   healthCheck: {},
   muteApp: {
     isMuted: PropTypes.bool.isRequired,
+    overrideSystemMute: PropTypes.bool,
   },
   toggleMuteApp: {},
 };
diff --git a/src/actions/service.js b/src/actions/service.js
index 1b918251b..e3100e986 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -50,6 +50,10 @@ export default {
     channel: PropTypes.string.isRequired,
     args: PropTypes.object.isRequired,
   },
+  sendIPCMessageToAllServices: {
+    channel: PropTypes.string.isRequired,
+    args: PropTypes.object.isRequired,
+  },
   openWindow: {
     event: PropTypes.object.isRequired,
   },
diff --git a/src/actions/user.js b/src/actions/user.js
index fe32b8a05..ccf1fa56a 100644
--- a/src/actions/user.js
+++ b/src/actions/user.js
@@ -27,4 +27,5 @@ export default {
   importLegacyServices: PropTypes.arrayOf(PropTypes.shape({
     recipe: PropTypes.string.isRequired,
   })).isRequired,
+  delete: {},
 };
diff --git a/src/api/UserApi.js b/src/api/UserApi.js
index e8fd75bed..edfb88988 100644
--- a/src/api/UserApi.js
+++ b/src/api/UserApi.js
@@ -46,4 +46,8 @@ export default class UserApi {
   getLegacyServices() {
     return this.server.getLegacyServices();
   }
+
+  delete() {
+    return this.server.deleteAccount();
+  }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 932b70cdc..8b3136d27 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -12,6 +12,8 @@ import NewsModel from '../../models/News';
 import UserModel from '../../models/User';
 import OrderModel from '../../models/Order';
 
+import { sleep } from '../../helpers/async-helpers';
+
 import { API } from '../../environment';
 
 import {
@@ -125,6 +127,19 @@ export default class ServerApi {
     return user;
   }
 
+  async deleteAccount() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
+      method: 'DELETE',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    console.debug('ServerApi::deleteAccount resolves', data);
+    return data;
+  }
+
   // Services
   async getServices() {
     const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/services`, this._prepareAuthRequest({
@@ -290,18 +305,25 @@ export default class ServerApi {
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
+      console.debug('Recipe downloaded', recipeId);
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
-      tar.x({
+      await sleep(10);
+
+      await tar.x({
         file: archivePath,
         cwd: recipeTempDirectory,
-        sync: true,
+        preservePaths: true,
+        unlink: true,
+        preserveOwner: false,
+        onwarn: x => console.log('warn', recipeId, x),
       });
 
+      await sleep(10);
+
       const { id } = fs.readJsonSync(path.join(recipeTempDirectory, 'package.json'));
       const recipeDirectory = path.join(recipesDirectory, id);
-
       fs.copySync(recipeTempDirectory, recipeDirectory);
       fs.remove(recipeTempDirectory);
       fs.remove(path.join(recipesDirectory, recipeId, 'recipe.tar.gz'));
@@ -374,7 +396,7 @@ export default class ServerApi {
   // News
   async getLatestNews() {
     // eslint-disable-next-line
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/news?platform=${os.platform()}&arch=${os.arch()}version=${app.getVersion()}`,
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`,
       this._prepareAuthRequest({
         method: 'GET',
       }));
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 06493a0fd..078244434 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -24,7 +24,7 @@ const messages = defineMessages({
   },
   skipButtonLabel: {
     id: 'import.skip.label',
-    defaultMessage: '!!!I want add services manually',
+    defaultMessage: '!!!I want to add services manually',
   },
 });
 
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 06b10ecfe..eb9fbb847 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -55,12 +55,16 @@ export default class Login extends Component {
         </div>
         <div className="welcome__featured-services">
           {recipes.map(recipe => (
-            <img
+            <div
               key={recipe.id}
-              src={recipe.icons.svg}
               className="welcome__featured-service"
-              alt=""
-            />
+            >
+              <img
+                key={recipe.id}
+                src={recipe.icons.svg}
+                alt=""
+              />
+            </div>
           ))}
         </div>
       </div>
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index f60c170a8..20dc2f764 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -23,6 +23,10 @@ const messages = defineMessages({
     id: 'infobar.buttonReloadServices',
     defaultMessage: '!!!Reload services',
   },
+  changelog: {
+    id: 'infobar.buttonChangelog',
+    defaultMessage: '!!!Changelog',
+  },
   buttonInstallUpdate: {
     id: 'infobar.buttonInstallUpdate',
     defaultMessage: '!!!Restart & install update',
@@ -135,7 +139,9 @@ export default class AppLayout extends Component {
                 sticky
               >
                 <span className="mdi mdi-information" />
-                {intl.formatMessage(messages.updateAvailable)}
+                {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
+                  <u>{intl.formatMessage(messages.changelog)}</u>
+                </a>
               </InfoBar>
             )}
             {services}
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index ea34e8702..915ebeace 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactTooltip from 'react-tooltip';
 import { defineMessages, intlShape } from 'react-intl';
+import { observer } from 'mobx-react';
 
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
@@ -16,15 +17,16 @@ const messages = defineMessages({
     defaultMessage: '!!!Add new service',
   },
   mute: {
-    id: 'sidebar.mute',
-    defaultMessage: '!!!Disable audio',
+    id: 'sidebar.muteApp',
+    defaultMessage: '!!!Disable notifications & audio',
   },
   unmute: {
-    id: 'sidebar.unmute',
-    defaultMessage: '!!!Enable audio',
+    id: 'sidebar.unmuteApp',
+    defaultMessage: '!!!Enable notifications & audio',
   },
 });
 
+@observer
 export default class Sidebar extends Component {
   static propTypes = {
     openSettings: PropTypes.func.isRequired,
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 732b6c003..b5af3743d 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -35,7 +35,7 @@ export default class ServiceDisabled extends Component {
     const { intl } = this.context;
 
     return (
-      <div className="services__crash-handler">
+      <div className="services__info-layer">
         <h1>{intl.formatMessage(messages.headline, { name })}</h1>
         <Button
           label={intl.formatMessage(messages.action, { name })}
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index abbf21dee..c146abf4e 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -65,6 +65,7 @@ export default class ServiceWebview extends Component {
 
     const webviewClasses = classnames({
       services__webview: true,
+      'services__webview-wrapper': true,
       'is-active': service.isActive,
       'services__webview--force-repaint': this.state.forceRepaint,
     });
@@ -85,29 +86,29 @@ export default class ServiceWebview extends Component {
             reload={reload}
           />
         )}
-        {!service.isEnabled && (
+        {!service.isEnabled ? (
           <ServiceDisabled
             name={service.recipe.name}
             webview={service.webview}
             enable={enable}
           />
+        ) : (
+          <Webview
+            ref={(element) => { this.webview = element; }}
+            autosize
+            src={service.url}
+            preload="./webview/plugin.js"
+            partition={`persist:service-${service.id}`}
+            onDidAttach={() => setWebviewReference({
+              serviceId: service.id,
+              webview: this.webview.view,
+            })}
+            onUpdateTargetUrl={this.updateTargetUrl}
+            useragent={service.userAgent}
+            muted={isAppMuted || service.isMuted}
+            allowpopups
+          />
         )}
-        <Webview
-          ref={(element) => { this.webview = element; }}
-          autosize
-          src={service.url}
-          preload="./webview/plugin.js"
-          partition={`persist:service-${service.id}`}
-          onDidAttach={() => setWebviewReference({
-            serviceId: service.id,
-            webview: this.webview.view,
-          })}
-          onUpdateTargetUrl={this.updateTargetUrl}
-          useragent={service.userAgent}
-          muted={isAppMuted || service.isMuted}
-          disablewebsecurity
-          allowpopups
-        />
         {statusBar}
       </div>
     );
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index d48152c18..d3e6951f3 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -62,7 +62,7 @@ export default class WebviewCrashHandler extends Component {
     const { intl } = this.context;
 
     return (
-      <div className="services__crash-handler">
+      <div className="services__info-layer">
         <h1>{intl.formatMessage(messages.headline)}</h1>
         <p>{intl.formatMessage(messages.text, { name })}</p>
         <Button
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 2daf55676..489027d57 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -17,6 +17,8 @@ class TabBarSortableList extends Component {
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
     enableService: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   }
 
   render() {
@@ -30,6 +32,8 @@ class TabBarSortableList extends Component {
       disableService,
       enableService,
       openSettings,
+      showMessageBadgeWhenMutedSetting,
+      showMessageBadgesEvenWhenMuted,
     } = this.props;
 
     return (
@@ -50,6 +54,8 @@ class TabBarSortableList extends Component {
             disableService={() => disableService({ serviceId: service.id })}
             enableService={() => enableService({ serviceId: service.id })}
             openSettings={openSettings}
+            showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
+            showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
           />
         ))}
         {/* <li>
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index a7136c43f..7aed8fda7 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -63,6 +63,8 @@ class TabItem extends Component {
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
     enableService: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -81,6 +83,8 @@ class TabItem extends Component {
       disableService,
       enableService,
       openSettings,
+      showMessageBadgeWhenMutedSetting,
+      showMessageBadgesEvenWhenMuted,
     } = this.props;
     const { intl } = this.context;
 
@@ -121,6 +125,26 @@ class TabItem extends Component {
     }];
     const menu = Menu.buildFromTemplate(menuTemplate);
 
+    let notificationBadge = null;
+    if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && service.isBadgeEnabled) {
+      notificationBadge = (
+        <span>
+          {service.unreadDirectMessageCount > 0 && (
+            <span className="tab-item__message-count">
+              {service.unreadDirectMessageCount}
+            </span>
+          )}
+          {service.unreadIndirectMessageCount > 0
+            && service.unreadDirectMessageCount === 0
+            && service.isIndirectMessageBadgeEnabled && (
+              <span className="tab-item__message-count is-indirect">
+                •
+              </span>
+            )}
+        </span>
+      );
+    }
+
     return (
       <li
         className={classnames({
@@ -138,18 +162,7 @@ class TabItem extends Component {
           className="tab-item__icon"
           alt=""
         />
-        {service.unreadDirectMessageCount > 0 && (
-          <span className="tab-item__message-count">
-            {service.unreadDirectMessageCount}
-          </span>
-        )}
-        {service.unreadIndirectMessageCount > 0
-          && service.unreadDirectMessageCount === 0
-          && service.isIndirectMessageBadgeEnabled && (
-            <span className="tab-item__message-count is-indirect">
-            •
-            </span>
-          )}
+        {notificationBadge}
       </li>
     );
   }
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index fd4325107..ceb88c51c 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -18,6 +18,8 @@ export default class TabBar extends Component {
     toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     updateService: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   }
 
   onSortEnd = ({ oldIndex, newIndex }) => {
@@ -30,6 +32,8 @@ export default class TabBar extends Component {
     reorder({ oldIndex, newIndex });
   };
 
+  shouldPreventSorting = event => event.target.tagName !== 'LI';
+
   toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
 
@@ -62,6 +66,8 @@ export default class TabBar extends Component {
       toggleNotifications,
       toggleAudio,
       deleteService,
+      showMessageBadgeWhenMutedSetting,
+      showMessageBadgesEvenWhenMuted,
     } = this.props;
 
     return (
@@ -71,6 +77,7 @@ export default class TabBar extends Component {
           setActive={setActive}
           onSortEnd={this.onSortEnd}
           onSortStart={disableToolTip}
+          shouldCancelStart={this.shouldPreventSorting}
           reload={reload}
           toggleNotifications={toggleNotifications}
           toggleAudio={toggleAudio}
@@ -82,6 +89,8 @@ export default class TabBar extends Component {
           axis="y"
           lockAxis="y"
           helperClass="is-reordering"
+          showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
+          showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
         />
       </div>
     );
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 75dbdef49..89fa07800 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -28,6 +28,10 @@ const messages = defineMessages({
     id: 'settings.account.headlineInvoices',
     defaultMessage: '!!Invoices',
   },
+  headlineDangerZone: {
+    id: 'settings.account.headlineDangerZone',
+    defaultMessage: '!!Danger Zone',
+  },
   manageSubscriptionButtonLabel: {
     id: 'settings.account.manageSubscription.label',
     defaultMessage: '!!!Manage your subscription',
@@ -72,6 +76,18 @@ const messages = defineMessages({
     id: 'settings.account.mining.cancel',
     defaultMessage: '!!!Cancel mining',
   },
+  deleteAccount: {
+    id: 'settings.account.deleteAccount',
+    defaultMessage: '!!!Delete account',
+  },
+  deleteInfo: {
+    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.',
+  },
+  deleteEmailSent: {
+    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!',
+  },
 });
 
 @observer
@@ -90,6 +106,9 @@ export default class AccountDashboard extends Component {
     openExternalUrl: PropTypes.func.isRequired,
     onCloseSubscriptionWindow: PropTypes.func.isRequired,
     stopMiner: PropTypes.func.isRequired,
+    deleteAccount: PropTypes.func.isRequired,
+    isLoadingDeleteAccount: PropTypes.bool.isRequired,
+    isDeleteAccountSuccessful: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -111,6 +130,9 @@ export default class AccountDashboard extends Component {
       retryUserInfoRequest,
       onCloseSubscriptionWindow,
       stopMiner,
+      deleteAccount,
+      isLoadingDeleteAccount,
+      isDeleteAccountSuccessful,
     } = this.props;
     const { intl } = this.context;
 
@@ -201,7 +223,7 @@ export default class AccountDashboard extends Component {
                             />
                           </div>
                         </div>
-                        <div className="account__box account__box--last">
+                        <div className="account__box">
                           <h2>{intl.formatMessage(messages.headlineInvoices)}</h2>
                           <table className="invoices">
                             <tbody>
@@ -230,7 +252,7 @@ export default class AccountDashboard extends Component {
 
               {user.isMiner && (
                 <div className="account franz-form">
-                  <div className="account__box">
+                  <div className="account__box account__box--last">
                     <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
                     <div className="account__subscription">
                       <div>
@@ -267,7 +289,7 @@ export default class AccountDashboard extends Component {
                   <Loader />
                 ) : (
                   <div className="account franz-form">
-                    <div className="account__box account__box--last">
+                    <div className="account__box">
                       <h2>{intl.formatMessage(messages.headlineUpgrade)}</h2>
                       <SubscriptionForm
                         onCloseWindow={onCloseSubscriptionWindow}
@@ -276,8 +298,29 @@ export default class AccountDashboard extends Component {
                   </div>
                 )
               )}
+
+              <div className="account franz-form">
+                <div className="account__box">
+                  <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
+                  {!isDeleteAccountSuccessful && (
+                    <div className="account__subscription">
+                      <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                      <Button
+                        label={intl.formatMessage(messages.deleteAccount)}
+                        buttonType="danger"
+                        onClick={() => deleteAccount()}
+                        loaded={!isLoadingDeleteAccount}
+                      />
+                    </div>
+                  )}
+                  {isDeleteAccountSuccessful && (
+                    <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                  )}
+                </div>
+              </div>
             </div>
           )}
+
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
       </div>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 3b21a7765..fea8d682d 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -74,7 +74,6 @@ export default class SettingsNavigation extends Component {
         <Link
           to="/auth/logout"
           className="settings-navigation__link"
-          activeClassName="is-active"
         >
           {intl.formatMessage(messages.logout)}
         </Link>
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 02ea04e35..b6ade5da4 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -9,6 +9,7 @@ import Infobox from '../../ui/Infobox';
 import RecipeItem from './RecipeItem';
 import Loader from '../../ui/Loader';
 import Appear from '../../ui/effects/Appear';
+import { FRANZ_SERVICE_REQUEST } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -35,6 +36,10 @@ const messages = defineMessages({
     id: 'settings.recipes.servicesSuccessfulAddedInfo',
     defaultMessage: '!!!Service successfully added',
   },
+  missingService: {
+    id: 'settings.recipes.missingService',
+    defaultMessage: '!!!Missing a service?',
+  },
 });
 
 @observer
@@ -96,33 +101,39 @@ export default class RecipesDashboard extends Component {
               </Infobox>
             </Appear>
           )}
-          {!searchNeedle && (
-            <div className="recipes__navigation">
-              <Link
-                to="/settings/recipes"
-                className="badge"
-                activeClassName="badge--primary"
-              >
-                {intl.formatMessage(messages.mostPopularRecipes)}
-              </Link>
+          {/* {!searchNeedle && ( */}
+          <div className="recipes__navigation">
+            <Link
+              to="/settings/recipes"
+              className="badge"
+              activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
+              onClick={() => resetSearch()}
+            >
+              {intl.formatMessage(messages.mostPopularRecipes)}
+            </Link>
+            <Link
+              to="/settings/recipes/all"
+              className="badge"
+              activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
+              onClick={() => resetSearch()}
+            >
+              {intl.formatMessage(messages.allRecipes)}
+            </Link>
+            {devRecipesCount > 0 && (
               <Link
-                to="/settings/recipes/all"
+                to="/settings/recipes/dev"
                 className="badge"
-                activeClassName="badge--primary"
+                activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
+                onClick={() => resetSearch()}
               >
-                {intl.formatMessage(messages.allRecipes)}
+                {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
               </Link>
-              {devRecipesCount > 0 && (
-                <Link
-                  to="/settings/recipes/dev"
-                  className="badge"
-                  activeClassName="badge--primary"
-                >
-                  {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
-                </Link>
-              )}
-            </div>
-          )}
+            )}
+            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
+              {intl.formatMessage(messages.missingService)} <i className="mdi mdi-open-in-new" />
+            </a>
+          </div>
+          {/* )} */}
           {isLoading ? (
             <Loader />
           ) : (
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index bcbda7773..ee69d53aa 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -48,6 +48,10 @@ const messages = defineMessages({
     id: 'settings.service.form.tabOnPremise',
     defaultMessage: '!!!Self hosted ⭐️',
   },
+  useHostedService: {
+    id: 'settings.service.form.useHostedService',
+    defaultMessage: '!!!Use the hosted {name} service.',
+  },
   customUrlValidationError: {
     id: 'settings.service.form.customUrlValidationError',
     defaultMessage: '!!!Could not validate custom {name} server.',
@@ -68,6 +72,18 @@ const messages = defineMessages({
     id: 'settings.service.form.isMutedInfo',
     defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted',
   },
+  headlineNotifications: {
+    id: 'settings.service.form.headlineNotifications',
+    defaultMessage: '!!!Notifications',
+  },
+  headlineBadges: {
+    id: 'settings.service.form.headlineBadges',
+    defaultMessage: '!!!Unread message dadges',
+  },
+  headlineGeneral: {
+    id: 'settings.service.form.headlineGeneral',
+    defaultMessage: '!!!General',
+  },
 });
 
 @observer
@@ -109,13 +125,12 @@ export default class EditServiceForm extends Component {
     this.props.form.submit({
       onSuccess: async (form) => {
         const values = form.values();
-
         let isValid = true;
 
         if (recipe.validateUrl && values.customUrl) {
           this.setState({ isValidatingCustomUrl: true });
           try {
-            values.customUrl = normalizeUrl(values.customUrl);
+            values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false });
             isValid = await recipe.validateUrl(values.customUrl);
           } catch (err) {
             console.warn('ValidateURL', err);
@@ -167,6 +182,13 @@ export default class EditServiceForm extends Component {
       />
     );
 
+    let activeTabIndex = 0;
+    if (recipe.hasHostedOption && service.team) {
+      activeTabIndex = 1;
+    } else if (recipe.hasHostedOption && service.customUrl) {
+      activeTabIndex = 2;
+    }
+
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -207,11 +229,20 @@ export default class EditServiceForm extends Component {
             </div>
             {(recipe.hasTeamId || recipe.hasCustomUrl) && (
               <Tabs
-                active={service.customUrl ? 1 : 0}
+                active={activeTabIndex}
               >
+                {recipe.hasHostedOption && (
+                  <TabItem title={recipe.name}>
+                    {intl.formatMessage(messages.useHostedService, { name: recipe.name })}
+                  </TabItem>
+                )}
                 {recipe.hasTeamId && (
                   <TabItem title={intl.formatMessage(messages.tabHosted)}>
-                    <Input field={form.$('team')} suffix={recipe.urlInputSuffix} />
+                    <Input
+                      field={form.$('team')}
+                      prefix={recipe.urlInputPrefix}
+                      suffix={recipe.urlInputSuffix}
+                    />
                   </TabItem>
                 )}
                 {recipe.hasCustomUrl && (
@@ -240,20 +271,32 @@ export default class EditServiceForm extends Component {
               </Tabs>
             )}
             <div className="settings__options">
-              <Toggle field={form.$('isNotificationEnabled')} />
-              {recipe.hasIndirectMessages && (
-                <div>
-                  <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
-                  <p className="settings__help">
-                    {intl.formatMessage(messages.indirectMessageInfo)}
-                  </p>
-                </div>
-              )}
-              <Toggle field={form.$('isMuted')} />
-              <p className="settings__help">
-                {intl.formatMessage(messages.isMutedInfo)}
-              </p>
-              <Toggle field={form.$('isEnabled')} />
+              <div className="settings__settings-group">
+                <h3>{intl.formatMessage(messages.headlineNotifications)}</h3>
+                <Toggle field={form.$('isNotificationEnabled')} />
+                <Toggle field={form.$('isMuted')} />
+                <p className="settings__help">
+                  {intl.formatMessage(messages.isMutedInfo)}
+                </p>
+              </div>
+
+              <div className="settings__settings-group">
+                <h3>{intl.formatMessage(messages.headlineBadges)}</h3>
+                <Toggle field={form.$('isBadgeEnabled')} />
+                {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
+                  <div>
+                    <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
+                    <p className="settings__help">
+                      {intl.formatMessage(messages.indirectMessageInfo)}
+                    </p>
+                  </div>
+                )}
+              </div>
+
+              <div className="settings__settings-group">
+                <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
+                <Toggle field={form.$('isEnabled')} />
+              </div>
             </div>
             {recipe.message && (
               <p className="settings__message">
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index ba07b1a5b..ff398aa33 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -9,6 +9,8 @@ import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import Select from '../../ui/Select';
 
+import { FRANZ_TRANSLATION } from '../../../config';
+
 const messages = defineMessages({
   headline: {
     id: 'settings.app.headline',
@@ -30,6 +32,14 @@ const messages = defineMessages({
     id: 'settings.app.headlineAppearance',
     defaultMessage: '!!!Appearance',
   },
+  headlineAdvanced: {
+    id: 'settings.app.headlineAdvanced',
+    defaultMessage: '!!!Advanced',
+  },
+  translationHelp: {
+    id: 'settings.app.translationHelp',
+    defaultMessage: '!!!Help us to translate Franz into your language.',
+  },
   buttonSearchForUpdate: {
     id: 'settings.app.buttonSearchForUpdate',
     defaultMessage: '!!!Check for updates',
@@ -116,18 +126,38 @@ export default class EditSettingsForm extends Component {
             onChange={e => this.submit(e)}
             id="form"
           >
-            <h2>{intl.formatMessage(messages.headlineGeneral)}</h2>
+            {/* General */}
+            <h2 id="general">{intl.formatMessage(messages.headlineGeneral)}</h2>
             <Toggle field={form.$('autoLaunchOnStart')} />
             <Toggle field={form.$('runInBackground')} />
             <Toggle field={form.$('enableSystemTray')} />
             {process.platform === 'win32' && (
               <Toggle field={form.$('minimizeToSystemTray')} />
             )}
-            <h2>{intl.formatMessage(messages.headlineAppearance)}</h2>
+
+            {/* Appearance */}
+            <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2>
             <Toggle field={form.$('showDisabledServices')} />
-            <h2>{intl.formatMessage(messages.headlineLanguage)}</h2>
+            <Toggle field={form.$('showMessageBadgeWhenMuted')} />
+
+            {/* Language */}
+            <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
             <Select field={form.$('locale')} showLabel={false} />
-            <h2>{intl.formatMessage(messages.headlineUpdates)}</h2>
+            <a
+              href={FRANZ_TRANSLATION}
+              target="_blank"
+              className="link"
+            >
+              {intl.formatMessage(messages.translationHelp)} <i className="mdi mdi-open-in-new" />
+            </a>
+
+            {/* Advanced */}
+            <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2>
+            <Toggle field={form.$('enableSpellchecking')} />
+            {/* <Select field={form.$('spellcheckingLanguage')} /> */}
+
+            {/* Updates */}
+            <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2>
             {updateIsReadyToInstall ? (
               <Button
                 label={intl.formatMessage(messages.buttonInstallUpdate)}
diff --git a/src/components/ui/AppLoader.js b/src/components/ui/AppLoader.js
index 64a212969..ac3cdcb05 100644
--- a/src/components/ui/AppLoader.js
+++ b/src/components/ui/AppLoader.js
@@ -8,7 +8,7 @@ export default function () {
     <div className="app-loader">
       <Appear>
         <h1 className="app-loader__title">Franz</h1>
-        <Loader />
+        <Loader color="#FFF" />
       </Appear>
     </div>
   );
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 07e94192f..554206cb7 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -68,7 +68,7 @@ export default class Button extends Component {
           loaded={loaded}
           lines={10}
           scale={0.4}
-          color={buttonType === '' ? '#FFF' : '#373a3c'}
+          color={buttonType !== 'secondary' ? '#FFF' : '#373a3c'}
           component="span"
         />
         {label}
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index aea2bd888..84a5f1446 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -61,10 +61,13 @@ export default class InfoBar extends Component {
           [`${className}`]: true,
         })}
       >
-        <div onClick={onClick} className="info-bar__content">
+        <div className="info-bar__content">
           {children}
           {ctaLabel && (
-            <button className="info-bar__cta">
+            <button
+              className="info-bar__cta"
+              onClick={onClick}
+            >
               <Loader
                 loaded={!ctaLoading}
                 lines={10}
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js
index e4fbd96a2..f73296bb6 100644
--- a/src/components/ui/Loader.js
+++ b/src/components/ui/Loader.js
@@ -9,12 +9,14 @@ export default class LoaderComponent extends Component {
     children: oneOrManyChildElements,
     loaded: PropTypes.bool,
     className: PropTypes.string,
+    color: PropTypes.string,
   };
 
   static defaultProps = {
     children: null,
     loaded: false,
     className: '',
+    color: '#373a3c',
   };
 
   render() {
@@ -22,6 +24,7 @@ export default class LoaderComponent extends Component {
       children,
       loaded,
       className,
+      color,
     } = this.props;
 
     return (
@@ -30,7 +33,7 @@ export default class LoaderComponent extends Component {
         // lines={10}
         width={4}
         scale={0.6}
-        color="#373a3c"
+        color={color}
         component="span"
         className={className}
       >
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index fe0925a26..8bff72095 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -93,6 +93,10 @@ const messages = defineMessages({
     id: 'subscription.mining.moreInformation',
     defaultMessage: '!!!Get more information about this plan',
   },
+  euTaxInfo: {
+    id: 'subscription.euTaxInfo',
+    defaultMessage: '!!!EU residents: local sales tax may apply',
+  },
 });
 
 @observer
@@ -144,14 +148,18 @@ export default class SubscriptionForm extends Component {
             label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'year')
               ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}`
               : 'yearly'}`,
-          }, {
-            value: 'mining',
-            label: intl.formatMessage(messages.typeMining),
           }],
         },
       },
     };
 
+    if (this.props.plan.miner) {
+      form.fields.paymentTier.options.push({
+        value: 'mining',
+        label: intl.formatMessage(messages.typeMining),
+      });
+    }
+
     if (this.props.showSkipOption) {
       form.fields.paymentTier.options.unshift({
         value: 'skip',
@@ -259,6 +267,11 @@ export default class SubscriptionForm extends Component {
             onClick={() => handlePayment(this.form.$('paymentTier').value)}
           />
         )}
+        {this.form.$('paymentTier').value !== 'skip' && this.form.$('paymentTier').value !== 'mining' && (
+          <p className="legal">
+            {intl.formatMessage(messages.euTaxInfo)}
+          </p>
+        )}
       </Loader>
     );
   }
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js
index 5aae2c47a..528d02907 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/ui/SubscriptionPopup.js
@@ -58,7 +58,6 @@ export default class SubscriptionPopup extends Component {
 
             autosize
             src={encodeURI(url)}
-            disablewebsecurity
             onDidNavigate={completeCheck}
             // onNewWindow={(event, url, frameName, options) =>
             //   openWindow({ event, url, frameName, options })}
diff --git a/src/config.js b/src/config.js
index 1627993f5..e66594c59 100644
--- a/src/config.js
+++ b/src/config.js
@@ -7,11 +7,18 @@ export const GA_ID = 'UA-74126766-6';
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchOnStart: true,
   autoLaunchInBackground: false,
-  runInBackground: false,
+  runInBackground: true,
   enableSystemTray: true,
   minimizeToSystemTray: false,
   showDisabledServices: true,
-  locale: 'en-US',
+  showMessageBadgeWhenMuted: true,
+  enableSpellchecking: true,
+  // spellcheckingLanguage: 'auto',
+  locale: '',
+  fallbackLocale: 'en-US',
   beta: false,
   isAppMuted: false,
 };
+
+export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request';
+export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate';
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 8e5b3d2ed..e4a9d60c3 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -67,9 +67,6 @@ export default class AppLayoutContainer extends Component {
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    // const isLoadingRecipes = recipes.allRecipesRequest.isExecuting
-    //   && recipes.allRecipesRequest.isExecutingFirstTime;
-
     if (isLoadingServices) {
       return (
         <AppLoader />
@@ -80,7 +77,7 @@ export default class AppLayoutContainer extends Component {
       <Sidebar
         services={services.allDisplayed}
         setActive={setActive}
-        isAppMuted={Boolean(app.isSystemMuted) || Boolean(settings.all.isMuted)}
+        isAppMuted={settings.all.isAppMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
@@ -90,6 +87,8 @@ export default class AppLayoutContainer extends Component {
         deleteService={deleteService}
         updateService={updateService}
         toggleMuteApp={toggleMuteApp}
+        showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted}
+        showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
       />
     );
 
@@ -100,7 +99,7 @@ export default class AppLayoutContainer extends Component {
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
-        isAppMuted={settings.all.isMuted || false}
+        isAppMuted={settings.all.isAppMuted}
         update={updateService}
       />
     );
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index a1ac8bda3..008c495d4 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -69,6 +69,7 @@ export default class AccountScreen extends Component {
   render() {
     const { user, payment, app } = this.props.stores;
     const { openExternalUrl } = this.props.actions.app;
+    const { user: userActions } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
     const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting;
@@ -89,6 +90,9 @@ export default class AccountScreen extends Component {
         openExternalUrl={url => openExternalUrl({ url })}
         onCloseSubscriptionWindow={() => this.onCloseWindow()}
         stopMiner={() => this.stopMiner()}
+        deleteAccount={userActions.delete}
+        isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
+        isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
       />
     );
   }
@@ -109,6 +113,7 @@ AccountScreen.wrappedComponent.propTypes = {
     }).isRequired,
     user: PropTypes.shape({
       update: PropTypes.func.isRequired,
+      delete: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 52a9fa6db..8827896ef 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -26,6 +26,10 @@ const messages = defineMessages({
     id: 'settings.service.form.enableNotification',
     defaultMessage: '!!!Enable Notifications',
   },
+  enableBadge: {
+    id: 'settings.service.form.enableBadge',
+    defaultMessage: '!!!Show unread message badges',
+  },
   enableAudio: {
     id: 'settings.service.form.enableAudio',
     defaultMessage: '!!!Enable audio',
@@ -92,6 +96,11 @@ export default class EditServiceScreen extends Component {
           value: service.isNotificationEnabled,
           default: true,
         },
+        isBadgeEnabled: {
+          label: intl.formatMessage(messages.enableBadge),
+          value: service.isBadgeEnabled,
+          default: true,
+        },
         isMuted: {
           label: intl.formatMessage(messages.enableAudio),
           value: !service.isMuted,
@@ -127,11 +136,22 @@ export default class EditServiceScreen extends Component {
       });
     }
 
+    // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
       config.fields.team.validate = [oneRequired(['team', 'customUrl'])];
       config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])];
     }
 
+    // If a service can be hosted and has a teamId or customUrl
+    if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) {
+      if (config.fields.team) {
+        config.fields.team.validate = [];
+      }
+      if (config.fields.customUrl) {
+        config.fields.customUrl.validate = [url];
+      }
+    }
+
     if (recipe.hasIndirectMessages) {
       Object.assign(config.fields, {
         isIndirectMessageBadgeEnabled: {
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index b10acf3c6..45ded9e5c 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -7,7 +7,7 @@ import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
-import languages from '../../i18n/languages';
+import { APP_LOCALES } from '../../i18n/languages';
 import { gaPage } from '../../lib/analytics';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 
@@ -43,6 +43,22 @@ const messages = defineMessages({
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: '!!!Display disabled services tabs',
   },
+  showMessageBadgeWhenMuted: {
+    id: 'settings.app.form.showMessagesBadgesWhenMuted',
+    defaultMessage: '!!!Show unread message badge when notifications are disabled',
+  },
+  enableSpellchecking: {
+    id: 'settings.app.form.enableSpellchecking',
+    defaultMessage: '!!!Enable spell checking',
+  },
+  spellcheckingLanguage: {
+    id: 'settings.app.form.spellcheckingLanguage',
+    defaultMessage: '!!!Language for spell checking',
+  },
+  // spellcheckingAutomaticDetection: {
+  //   id: 'settings.app.form.spellcheckingAutomaticDetection',
+  //   defaultMessage: '!!!Detect language automatically',
+  // },
   beta: {
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
@@ -73,6 +89,9 @@ export default class EditSettingsScreen extends Component {
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         showDisabledServices: settingsData.showDisabledServices,
+        showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
+        enableSpellchecking: settingsData.enableSpellchecking,
+        // spellcheckingLanguage: settingsData.spellcheckingLanguage,
         locale: settingsData.locale,
         beta: settingsData.beta,
       },
@@ -89,14 +108,25 @@ export default class EditSettingsScreen extends Component {
     const { app, settings, user } = this.props.stores;
     const { intl } = this.context;
 
-    const options = [];
-    Object.keys(languages).forEach((key) => {
-      options.push({
+    const locales = [];
+    Object.keys(APP_LOCALES).forEach((key) => {
+      locales.push({
         value: key,
-        label: languages[key],
+        label: APP_LOCALES[key],
       });
     });
 
+    // const spellcheckerLocales = [{
+    //   value: 'auto',
+    //   label: intl.formatMessage(messages.spellcheckingAutomaticDetection),
+    // }];
+    // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => {
+    //   spellcheckerLocales.push({
+    //     value: key,
+    //     label: SPELLCHECKER_LOCALES[key],
+    //   });
+    // });
+
     const config = {
       fields: {
         autoLaunchOnStart: {
@@ -129,10 +159,26 @@ export default class EditSettingsScreen extends Component {
           value: settings.all.showDisabledServices,
           default: DEFAULT_APP_SETTINGS.showDisabledServices,
         },
+        showMessageBadgeWhenMuted: {
+          label: intl.formatMessage(messages.showMessageBadgeWhenMuted),
+          value: settings.all.showMessageBadgeWhenMuted,
+          default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted,
+        },
+        enableSpellchecking: {
+          label: intl.formatMessage(messages.enableSpellchecking),
+          value: settings.all.enableSpellchecking,
+          default: DEFAULT_APP_SETTINGS.enableSpellchecking,
+        },
+        // spellcheckingLanguage: {
+        //   label: intl.formatMessage(messages.spellcheckingLanguage),
+        //   value: settings.all.spellcheckingLanguage,
+        //   options: spellcheckerLocales,
+        //   default: DEFAULT_APP_SETTINGS.spellcheckingLanguage,
+        // },
         locale: {
           label: intl.formatMessage(messages.language),
           value: app.locale,
-          options,
+          options: locales,
           default: DEFAULT_APP_SETTINGS.locale,
         },
         beta: {
diff --git a/src/electron/deepLinking.js b/src/electron/deepLinking.js
new file mode 100644
index 000000000..ef23fd3c5
--- /dev/null
+++ b/src/electron/deepLinking.js
@@ -0,0 +1,7 @@
+export default function handleDeepLink(window, rawUrl) {
+  const url = rawUrl.replace('franz://', '');
+
+  if (!url) return;
+
+  window.webContents.send('navigateFromDeepLink', { url });
+}
diff --git a/src/helpers/async-helpers.js b/src/helpers/async-helpers.js
new file mode 100644
index 000000000..2ef01ee09
--- /dev/null
+++ b/src/helpers/async-helpers.js
@@ -0,0 +1,5 @@
+/* eslint-disable import/prefer-default-export */
+
+export function sleep(ms = 0) {
+  return new Promise(r => setTimeout(r, ms));
+}
diff --git a/src/helpers/webview-ime-focus-helpers.js b/src/helpers/webview-ime-focus-helpers.js
deleted file mode 100644
index 2593a5f26..000000000
--- a/src/helpers/webview-ime-focus-helpers.js
+++ /dev/null
@@ -1,38 +0,0 @@
-module.exports.releaseDocumentFocus = () => {
-  const element = document.createElement('span');
-  document.body.appendChild(element);
-
-  const range = document.createRange();
-  range.setStart(element, 0);
-
-  const selection = window.getSelection();
-  selection.removeAllRanges();
-  selection.addRange(range);
-  selection.removeAllRanges();
-
-  document.body.removeChild(element);
-};
-
-module.exports.claimDocumentFocus = () => {
-  const { activeElement } = document;
-  const selection = window.getSelection();
-
-  let selectionStart;
-  let selectionEnd;
-  let range;
-
-  if (activeElement) ({ selectionStart, selectionEnd } = activeElement);
-  if (selection.rangeCount) range = selection.getRangeAt(0);
-
-  const restoreOriginalSelection = () => {
-    if (selectionStart >= 0 && selectionEnd >= 0) {
-      activeElement.selectionStart = selectionStart;
-      activeElement.selectionEnd = selectionEnd;
-    } else if (range) {
-      selection.addRange(range);
-    }
-  };
-
-  exports.releaseDocumentFocus();
-  window.requestAnimationFrame(restoreOriginalSelection);
-};
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 72d7b26c1..f32c345af 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -1,17 +1,66 @@
-module.exports = {
+export const APP_LOCALES = {
   'en-US': 'English',
-  'pt-BR': 'Portuguese (Brazil)',
-  'el-GR': 'Ελληνικά (Greece)',
-  nl: 'Nederlands',
-  'nl-BE': 'Vlaams',
-  de: 'Deutsch',
+  ca: 'Catalan',
+  'zh-HANT': 'Chinese (Traditional)',
+  cs: 'Czech',
+  nl: 'Dutch',
+  es: 'Spanish',
   fr: 'French',
+  ka: 'Georgian',
+  de: 'German',
+  hu: 'Hungarian',
+  id: 'Indonesian',
+  ga: 'Irish',
+  it: 'Italian',
   ja: 'Japanese',
   pl: 'Polish',
-  ru: 'Русский',
-  ua: 'Українська',
-  it: 'Italian',
-  'es-ES': 'Español - España',
-  'zh-Hant': 'Chinese (Traditional)',
-  'nb-NO': 'Norsk',
+  pt: 'Portuguese',
+  'pt-BR': 'Portuguese (Brazil)',
+  ru: 'Russian',
+  sk: 'Slovak',
+  uk: 'Ukrainian',
+  'nl-BE': 'Vlaams',
 };
+
+export default APP_LOCALES;
+
+// export const SPELLCHECKER_LOCALES = {
+//   af: 'Afrikaans',
+//   sq: 'Albanian',
+//   ar: 'Arabic',
+//   bg: 'Bulgarian',
+//   zh: 'Chinese',
+//   hr: 'Croatian',
+//   cs: 'Czech',
+//   da: 'Danish',
+//   nl: 'Dutch',
+//   en: 'English',
+//   'en-AU': 'English (AU)',
+//   'en-CA': 'English (CA)',
+//   'en-GB': 'English (GB)',
+//   fi: 'Finnish',
+//   fr: 'French',
+//   ka: 'Georgian',
+//   de: 'German',
+//   el: 'Greek, Modern',
+//   hi: 'Hindi',
+//   hu: 'Hungarian',
+//   id: 'Indonesian',
+//   it: 'Italian',
+//   ja: 'Japanese',
+//   jv: 'Javanese',
+//   ko: 'Korean',
+//   lt: 'Lithuanian',
+//   lv: 'Latvian',
+//   ms: 'Malay',
+//   no: 'Norwegian',
+//   pl: 'Polish',
+//   pt: 'Portuguese',
+//   ro: 'Romanian, Moldavian, Moldovan',
+//   ru: 'Russian',
+//   sk: 'Slovak',
+//   es: 'Spanish',
+//   sv: 'Swedish',
+//   uk: 'Ukrainian',
+//   vi: 'Vietnamese',
+// };
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
new file mode 100644
index 000000000..6019d8023
--- /dev/null
+++ b/src/i18n/locales/ca.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
+   "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
+   "import.headline" : "Importa els teus serveis Franz 4",
+   "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
+   "import.skip.label" : "Vull afegir serveis manualment",
+   "import.submit.label" : "Importar serveis",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
+   "infobar.buttonReloadServices" : "Recarrega serveis",
+   "infobar.requiredRequestsFailed" : "No s'han pogut carregar els serveis i la informació de l'usuari",
+   "infobar.servicesUpdated" : "Els vostres serveis s'han actualitzat.",
+   "infobar.updateAvailable" : "Hi ha disponible una nova actualització per a Franz.",
+   "invite.email.label" : "Correu electrònic",
+   "invite.headline.friends" : "Convida 3 dels teus amics o companys",
+   "invite.name.label" : "Nom",
+   "invite.skip.label" : "Vull fer-ho més tard",
+   "invite.submit.label" : "Enviar invitacions",
+   "login.email.label" : "Correu electrònic",
+   "login.headline" : "Accedir",
+   "login.invalidCredentials" : "El correu electrònic o la contrasenya no són vàlids",
+   "login.link.password" : "Restablir contrasenya",
+   "login.link.signup" : "Crea un compte gratuït",
+   "login.password.label" : "Contrasenya",
+   "login.serverLogout" : "La teva sessió ha caducat, torna a iniciar la sessió.",
+   "login.submit.label" : "Accedir",
+   "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
+   "password.email.label" : "Correu electrònic",
+   "password.headline" : "Restablir contrasenya",
+   "password.link.login" : "Inicia la sessió al teu compte",
+   "password.link.signup" : "Crea un compte gratuït",
+   "password.noUser" : "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
+   "password.submit.label" : "Enviar",
+   "password.successInfo" : "Comproveu el vostre correu electrònic",
+   "pricing.headline" : "Donar suport a Franz",
+   "pricing.link.skipPayment" : "No vull donar suport al desenvolupament de Franz.",
+   "pricing.submit.label" : "Vull donar suport al desenvolupament de Franz",
+   "pricing.support.label" : "Seleccioneu el vostre pla de suport",
+   "service.crashHandler.action" : "Recarrega {name}",
+   "service.crashHandler.autoReload" : "Intentant restablir automàticament {name} en {seconds} segons",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} ha causat un error.",
+   "service.disabledHandler.action" : "Activar {name}",
+   "service.disabledHandler.headline" : "{name} està desactivat",
+   "services.getStarted" : "Introducció",
+   "services.welcome" : "Benvingut a Franz",
+   "settings.account.account.editButton" : "Editar Compte",
+   "settings.account.accountType.basic" : "Compte bàsic",
+   "settings.account.accountType.premium" : "Compte de Suport Premium",
+   "settings.account.buttonSave" : "Actualitzar el perfil",
+   "settings.account.headline" : "Compte",
+   "settings.account.headlineAccount" : "Informació del compte",
+   "settings.account.headlineInvoices" : "Factures",
+   "settings.account.headlinePassword" : "Canvia la contrasenya",
+   "settings.account.headlineProfile" : "Actualitza el perfil",
+   "settings.account.headlineSubscription" : "La vostra subscripció",
+   "settings.account.headlineUpgrade" : "Actualitzeu el vostre compte i doneu suport a Franz",
+   "settings.account.invoiceDownload" : "Descarregar",
+   "settings.account.manageSubscription.label" : "Gestioneu la vostra subscripció",
+   "settings.account.mining.active" : "Ara realitzeu {hashes} càlculs per segon.",
+   "settings.account.mining.cancel" : "Cancel·la la mineria",
+   "settings.account.mining.moreInformation" : "Obenir més informació",
+   "settings.account.mining.thankyou" : "Gràcies per donar suport a Franz amb el vostre poder de processament.",
+   "settings.account.successInfo" : "S'han desat els canvis",
+   "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
+   "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
+   "settings.app.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
+   "settings.app.buttonSearchForUpdate" : "Comprova si hi ha actualitzacions",
+   "settings.app.currentVersion" : "Versió actual:",
+   "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
+   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
+   "settings.app.form.beta" : "Inclou versions beta",
+   "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
+   "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
+   "settings.app.form.language" : "Idioma",
+   "settings.app.form.minimizeToSystemTray" : "Minimitza Franz a la safata del sistema",
+   "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
+   "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
+   "settings.app.headline" : "Configuració",
+   "settings.app.headlineAdvanced" : "Avançat",
+   "settings.app.headlineAppearance" : "Aparença",
+   "settings.app.headlineGeneral" : "General",
+   "settings.app.headlineLanguage" : "Idioma",
+   "settings.app.headlineUpdates" : "Actualitzacions",
+   "settings.app.restartRequired" : "Els canvis requereixen reiniciar",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Actualització disponible, descarregant ...",
+   "settings.app.updateStatusSearching" : "Està buscant actualitzacions",
+   "settings.app.updateStatusUpToDate" : "Esteu utilitzant la versió més recent de Franz",
+   "settings.navigation.account" : "Compte",
+   "settings.navigation.availableServices" : "Serveis disponibles",
+   "settings.navigation.logout" : "Sortir",
+   "settings.navigation.settings" : "Configuració",
+   "settings.navigation.yourServices" : "Els vostres serveis",
+   "settings.recipes.all" : "Tots els serveis",
+   "settings.recipes.dev" : "Desenvolupament",
+   "settings.recipes.headline" : "Serveis disponibles",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Els més populars",
+   "settings.recipes.nothingFound" : "Ho sentim, però cap servei coincideix amb el terme cercat.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "El servei s'ha afegit correctament",
+   "settings.service.error.goBack" : "Tornar als serveis",
+   "settings.service.error.headline" : "Error",
+   "settings.service.error.message" : "No s'ha pogut carregar la recepta del servei.",
+   "settings.service.form.addServiceHeadline" : "Afegir {name}",
+   "settings.service.form.availableServices" : "Serveis disponibles",
+   "settings.service.form.customUrl" : "Servidor personalitzat",
+   "settings.service.form.customUrlPremiumInfo" : "Per afegir serveis allotjats per vosaltres mateixos, necessiteu un Compte Franz Premium Supporter.",
+   "settings.service.form.customUrlUpgradeAccount" : "Actualitzeu el vostre compte",
+   "settings.service.form.customUrlValidationError" : "No s'ha pogut validar el servidor {name} personalitzat.",
+   "settings.service.form.deleteButton" : "Suprimeix el servei",
+   "settings.service.form.editServiceHeadline" : "Edita {name}",
+   "settings.service.form.enableAudio" : "Activa l'àudio",
+   "settings.service.form.enableNotification" : "Activa les notificacions",
+   "settings.service.form.enableService" : "Activa el servei",
+   "settings.service.form.indirectMessageInfo" : "Se't notificarà sobre tots els missatges nous en un canal, no només @usuari, @canal, @aquí ...",
+   "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
+   "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
+   "settings.service.form.name" : "Nom",
+   "settings.service.form.saveButton" : "Desa el servei",
+   "settings.service.form.tabHosted" : "Allotjat",
+   "settings.service.form.tabOnPremise" : "Allotjat per si mateix ⭐️",
+   "settings.service.form.team" : "Equip",
+   "settings.service.form.yourServices" : "Els vostres serveis",
+   "settings.services.deletedInfo" : "S'ha eliminat el servei",
+   "settings.services.discoverServices" : "Descobrir serveis",
+   "settings.services.headline" : "Els vostres serveis",
+   "settings.services.noServicesAdded" : "Encara no heu afegit cap servei.",
+   "settings.services.tooltip.isDisabled" : "El servei està desactivat",
+   "settings.services.tooltip.isMuted" : "Tots els sons estan desactivats",
+   "settings.services.tooltip.notificationsDisabled" : "Les notificacions estan desactivades",
+   "settings.services.updatedInfo" : "S'han desat els canvis",
+   "settings.user.form.accountType.company" : "Empresa",
+   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.label" : "Tipus de compte",
+   "settings.user.form.accountType.non-profit" : "Sense ànim de lucre",
+   "settings.user.form.currentPassword" : "Contrasenya actual",
+   "settings.user.form.email" : "Correu electrònic",
+   "settings.user.form.firstname" : "Nom",
+   "settings.user.form.lastname" : "Cognoms",
+   "settings.user.form.newPassword" : "Nova contrasenya",
+   "sidebar.addNewService" : "Afegeix nou servei",
+   "sidebar.mute" : "Desactiva l'àudio",
+   "sidebar.settings" : "Configuració",
+   "sidebar.unmute" : "Activa l'àudio",
+   "signup.company.label" : "Empresa",
+   "signup.email.label" : "Correu electrònic",
+   "signup.emailDuplicate" : "Ja existeix un usuari amb aquesta adreça de correu electrònic",
+   "signup.firstname.label" : "Nom",
+   "signup.headline" : "Donar-se d'alta",
+   "signup.lastname.label" : "Cognoms",
+   "signup.legal.info" : "En crear un compte de Franz, accepteu",
+   "signup.legal.privacy" : "Declaració de privacitat",
+   "signup.legal.terms" : "Termes del Servei",
+   "signup.link.login" : "Ja teniu un compte, iniciar la sessió?",
+   "signup.password.label" : "Contrasenya",
+   "signup.submit.label" : "Crea un compte",
+   "subscription.euTaxInfo" : "Residents d'EU: es poden aplicar impostos locals",
+   "subscription.features.ads" : "Sense anuncis, mai!",
+   "subscription.features.comingSoon" : "properament",
+   "subscription.features.customServices" : "Serveis privats per a vostè i el seu equip",
+   "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
+   "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
+   "subscription.features.vpn" : "Compatibilitat amb proxy i VPN",
+   "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
+   "subscription.mining.experimental" : "experimental",
+   "subscription.mining.headline" : "Com funciona?",
+   "subscription.mining.line1" : "Activant el \"Suport amb poder de processament\", Franz utilitzarà entre un 20-50% de la teva CPU de la mineria de la criptomoneda Monero que equival aproximadament a 5$\/l'any.",
+   "subscription.mining.line2" : "Adaptarem  l'ús de la CPU basant-nos en els teus habits de treball per no consumir la teva bateria ni relentir el teu ordinador.",
+   "subscription.mining.line3" : "Durant el periode que mantinguis la mineria activa, tindrás accés ilimitat a totes les carectarístiques ilimitades de Franz Premium Supporter.",
+   "subscription.mining.moreInformation" : "Obtenir més informació sobre aquest pla.",
+   "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
+   "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
+   "subscription.type.free" : "gratuït",
+   "subscription.type.mining" : "Donar suport a Franz amb el poder de processament",
+   "subscription.type.month" : "mes",
+   "subscription.type.year" : "any",
+   "subscriptionPopup.buttonCancel" : "Cancel·la",
+   "subscriptionPopup.buttonDone" : "Fet",
+   "tabs.item.deleteService" : "Suprimeix el servei",
+   "tabs.item.disableAudio" : "Desactiva l'àudio",
+   "tabs.item.disableNotifications" : "Desactiva les notificacions",
+   "tabs.item.disableService" : "Desactiva el servei",
+   "tabs.item.edit" : "Edita",
+   "tabs.item.enableAudio" : "Activa l'àudio",
+   "tabs.item.enableNotification" : "Activa les notificacions",
+   "tabs.item.enableService" : "Activa el servei",
+   "tabs.item.reload" : "Recarrega",
+   "welcome.loginButton" : "Inicia sessió al teu compte",
+   "welcome.signupButton" : "Crea un compte gratuït",
+   "welcome.slogan" : "Crea un compte gratuït"
+}
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
new file mode 100644
index 000000000..122fc9b53
--- /dev/null
+++ b/src/i18n/locales/cs.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Nemůžeme Franz připojit k online službám",
+   "global.notConnectedToTheInternet" : "Nejste připojen k internetu.",
+   "import.headline" : "Importovat služby z Franz 4",
+   "import.notSupportedHeadline" : "Služby nejsou podporovány v verzi Franz 5",
+   "import.skip.label" : "Chci přidat služby manuálně",
+   "import.submit.label" : "Importovat služby",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Restartovat a instalovat aktualizaci",
+   "infobar.buttonReloadServices" : "Obnovit služby",
+   "infobar.requiredRequestsFailed" : "Není možné nahrát služby a informace o uživateli",
+   "infobar.servicesUpdated" : "Vaše služby byly aktualizovány",
+   "infobar.updateAvailable" : "Nová aktualizace Franz je k dispozici",
+   "invite.email.label" : "E-mailová adresa",
+   "invite.headline.friends" : "Pozvěte 3 přátele nebo kolegy",
+   "invite.name.label" : "Jméno",
+   "invite.skip.label" : "Udělám to později",
+   "invite.submit.label" : "Poslat pozvánky",
+   "login.email.label" : "E-mailová adresa",
+   "login.headline" : "Přihlásit se",
+   "login.invalidCredentials" : "E-mail nebo heslo nesouhlasí",
+   "login.link.password" : "Obnovit heslo",
+   "login.link.signup" : "Vytvořit uživatelský účet zdarma",
+   "login.password.label" : "Heslo",
+   "login.serverLogout" : "Sezení vypršelo, prosím přihlaste se znovu.",
+   "login.submit.label" : "Přihlásit se",
+   "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
+   "password.email.label" : "E-mailová adresa",
+   "password.headline" : "Obnovit heslo",
+   "password.link.login" : "Přihlášení do vašeho účtu",
+   "password.link.signup" : "Vytvořit uživatelský účet zdarma",
+   "password.noUser" : "Uživatel s touto e-mailovou adresou nebyl nalezen",
+   "password.submit.label" : "Odeslat",
+   "password.successInfo" : "Prosím, zkontrolujte svůj e-mail",
+   "pricing.headline" : "Podpořte Franz",
+   "pricing.link.skipPayment" : "Nechci podpořit vývoj skvělé aplikace Franz.",
+   "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
+   "pricing.support.label" : "Vyberte váš plán podpory",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Začněme",
+   "services.welcome" : "Vítejte v programu Franz",
+   "settings.account.account.editButton" : "Upravit účet",
+   "settings.account.accountType.basic" : "Základní účet",
+   "settings.account.accountType.premium" : "Prémiový účet podporovatele",
+   "settings.account.buttonSave" : "Aktualizovat profil",
+   "settings.account.headline" : "Účet",
+   "settings.account.headlineAccount" : "Informace o účtu",
+   "settings.account.headlineInvoices" : "Faktury",
+   "settings.account.headlinePassword" : "Změnit heslo",
+   "settings.account.headlineProfile" : "Aktualizovat profil",
+   "settings.account.headlineSubscription" : "Vaše předplatné",
+   "settings.account.headlineUpgrade" : "Aktualizujte svůj účet a podpořte Franz",
+   "settings.account.invoiceDownload" : "Stáhnout",
+   "settings.account.manageSubscription.label" : "Spravovat vaše předplatné",
+   "settings.account.mining.active" : "Právě nyní provádíte {hashes} výpočtů za sekundu.",
+   "settings.account.mining.cancel" : "Zrušit dolování",
+   "settings.account.mining.moreInformation" : "Získat další informace",
+   "settings.account.mining.thankyou" : "Děkujeme, že jste podpořili Franz vašim výpočetním výkonem.",
+   "settings.account.successInfo" : "Vaše změny byly uloženy",
+   "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
+   "settings.account.userInfoRequestFailed" : "Nelze načíst informace o uživateli.",
+   "settings.app.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
+   "settings.app.buttonSearchForUpdate" : "Zkontrolovat aktualizace",
+   "settings.app.currentVersion" : "Aktuální verze:",
+   "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
+   "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
+   "settings.app.form.beta" : "Zahrnout beta verze",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
+   "settings.app.form.language" : "Jazyk",
+   "settings.app.form.minimizeToSystemTray" : "Minimalizovat Franz do systémové lišty",
+   "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Nastavení",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Obecné",
+   "settings.app.headlineLanguage" : "Jazyk",
+   "settings.app.headlineUpdates" : "Aktualizace",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Aktualizace k dispozici, stahování...",
+   "settings.app.updateStatusSearching" : "Hledá aktualizace",
+   "settings.app.updateStatusUpToDate" : "Používáte nejnovější verzi programu Franz",
+   "settings.navigation.account" : "Účet",
+   "settings.navigation.availableServices" : "Dostupné služby",
+   "settings.navigation.logout" : "Odhlásit",
+   "settings.navigation.settings" : "Nastavení",
+   "settings.navigation.yourServices" : "Vaše služby",
+   "settings.recipes.all" : "Všechny služby",
+   "settings.recipes.dev" : "Vývoj",
+   "settings.recipes.headline" : "Dostupné služby",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Nejpopulárnější",
+   "settings.recipes.nothingFound" : "Je nám líto, ale žádná služba neodpovídá vašemu hledanému výrazu.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Služba byla úspěšně přidána",
+   "settings.service.error.goBack" : "Zpět na služby",
+   "settings.service.error.headline" : "Chyba",
+   "settings.service.error.message" : "Nelze načíst službu.",
+   "settings.service.form.addServiceHeadline" : "Přidat {name}",
+   "settings.service.form.availableServices" : "Dostupné služby",
+   "settings.service.form.customUrl" : "Vlastní server",
+   "settings.service.form.customUrlPremiumInfo" : "Chcete-li přidat vlastní hostované služby, potřebujete účet Franz Premium Supporter.",
+   "settings.service.form.customUrlUpgradeAccount" : "Aktualizujte svůj účet",
+   "settings.service.form.customUrlValidationError" : "Nepodařilo se ověřit vlastní server {name}.",
+   "settings.service.form.deleteButton" : "Odstranit službu",
+   "settings.service.form.editServiceHeadline" : "Upravit {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Povolit upozornění",
+   "settings.service.form.enableService" : "Povolit službu",
+   "settings.service.form.indirectMessageInfo" : "Budete informováni o všech nových zprávách v kanálu, nikoliv pouze @název, @kanál, @kde, ...",
+   "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Jméno",
+   "settings.service.form.saveButton" : "Uložit službu",
+   "settings.service.form.tabHosted" : "Hostováno",
+   "settings.service.form.tabOnPremise" : "Samostatně hostované ⭐️",
+   "settings.service.form.team" : "Tým",
+   "settings.service.form.yourServices" : "Vaše služby",
+   "settings.services.deletedInfo" : "Služba byla odstraněna",
+   "settings.services.discoverServices" : "Objevte služby",
+   "settings.services.headline" : "Vaše služby",
+   "settings.services.noServicesAdded" : "Doposud jste nepřidali žádné služby.",
+   "settings.services.tooltip.isDisabled" : "Služba je zakázána",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Oznámení jsou zakázána",
+   "settings.services.updatedInfo" : "Vaše změny byly uloženy",
+   "settings.user.form.accountType.company" : "Společnost",
+   "settings.user.form.accountType.individual" : "Jednotlivec",
+   "settings.user.form.accountType.label" : "Druh účtu",
+   "settings.user.form.accountType.non-profit" : "Nezisková organizace",
+   "settings.user.form.currentPassword" : "Aktuální heslo",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "Nové heslo",
+   "sidebar.addNewService" : "Přidat novou službu",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Nastavení",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Společnost",
+   "signup.email.label" : "Emailová adresa",
+   "signup.emailDuplicate" : "Uživatel s touto emailovou adresou již existuje",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Přihlásit se",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "Vytvořením účtu Franz souhlasíte s",
+   "signup.legal.privacy" : "Prohlášení o ochraně soukromí",
+   "signup.legal.terms" : "Podmínky služby",
+   "signup.link.login" : "Již máte účet, přihlásit se?",
+   "signup.password.label" : "Heslo",
+   "signup.submit.label" : "Vytvořit účet",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Žádné reklamy, nikdy!",
+   "subscription.features.comingSoon" : "již brzy",
+   "subscription.features.customServices" : "Privátní služby pro vás a váš tým",
+   "subscription.features.encryptedSync" : "Šifrovaná synchronizace relací",
+   "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
+   "subscription.features.vpn" : "Proxy & VPN podpora",
+   "subscription.includedFeatures" : "Placený účet Premium Supporter Franz zahrnuje",
+   "subscription.mining.experimental" : "experimentální",
+   "subscription.mining.headline" : "Jak to funguje?",
+   "subscription.mining.line1" : "Povolením funkce \"Podpora se zpracováním výkonu\" použije Franz zhruba 20-50% vašeho procesoru, aby doloval kryptografickou měnu Monero, která se rovná přibližně 5 dolarům za rok.",
+   "subscription.mining.line2" : "Přizpůsobíme spotřebu CPU na základě vašeho pracovního chování, abychom nevyčerpali baterii a zpomalili vás a váš stroj.",
+   "subscription.mining.line3" : "Dokud je horník aktivní, budete mít neomezený přístup ke všem funkcím Franz Premium Supporter.",
+   "subscription.mining.moreInformation" : "Získejte více informací o tomto plánu.",
+   "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
+   "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
+   "subscription.type.free" : "zdarma",
+   "subscription.type.mining" : "Podpořte Franz výpočetním výkonem",
+   "subscription.type.month" : "měsíc",
+   "subscription.type.year" : "rok",
+   "subscriptionPopup.buttonCancel" : "Zrušit",
+   "subscriptionPopup.buttonDone" : "Dokončit",
+   "tabs.item.deleteService" : "Odstranit službu",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Zakázat upozornění",
+   "tabs.item.disableService" : "Zakázat službu",
+   "tabs.item.edit" : "Upravit",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Povolit oznamování",
+   "tabs.item.enableService" : "Povolit službu",
+   "tabs.item.reload" : "Obnovit",
+   "welcome.loginButton" : "Přihlášení do vašeho účtu",
+   "welcome.signupButton" : "Vytvořit účet zdarma",
+   "welcome.slogan" : "Zprávy, které pracují pro vás"
+}
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 80b66db08..cdfce9d55 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,168 +1,192 @@
-{
-  "global.api.unhealthy": "Verbindung mit dem Franz Online Service fehlgeschlagen.",
-  "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
-  "welcome.signupButton": "Kostenloses Konto erstellen",
-  "welcome.loginButton": "Anmelden",
-  "welcome.slogan": "Kommunikation, die für Dich funktioniert",
-  "login.headline": "Anmelden",
-  "login.email.label": "E-Mail-Adresse",
-  "login.password.label": "Passwort",
-  "login.submit.label": "Anmelden",
-  "login.invalidCredentials": "E-Mail-Adresse oder Passwort ungültig",
-  "login.tokenExpired": "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
-  "login.serverLogout": "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
-  "login.link.signup": "Kostenloses Konto erstellen",
-  "login.link.password": "Passwort zurücksetzen",
-  "password.headline": "Passwort zurücksetzen",
-  "password.email.label": "E-Mail-Adresse",
-  "password.submit.label": "Absenden",
-  "password.noUser": "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden",
-  "password.successInfo": "Bitte überprüfe Deine E-Mail-Adresse",
-  "password.link.signup": "Kostenloses Konto erstellen",
-  "password.link.login": "Anmelden",
-  "signup.headline": "Registrierung",
-  "signup.firstname.label": "Vorname",
-  "signup.lastname.label": "Nachname",
-  "signup.email.label": "E-Mail-Adresse",
-  "signup.company.label": "Unternehmen",
-  "signup.password.label": "Passwort",
-  "signup.submit.label": "Konto erstellen",
-  "signup.link.login": "Du hast bereits ein Konto? Melde Dich an.",
-  "signup.emailDuplicate": "Ein Benutzer mit dieser E-Mail-Adresse existiert bereits.",
-  "signup.legal.info": "Mit der Erstellung eines Franz Kontos, akzeptierst Du die",
-  "signup.legal.terms": "Nutzungsbedingungen",
-  "signup.legal.privacy": "Datenschutzerklärung",
-  "pricing.headline": "Unterstütze Franz",
-  "pricing.support.label": "Wie möchtest Du Franz unterstützen?",
-  "pricing.submit.label": "Ich möchte die Entwicklung von Franz unterstützen.",
-  "pricing.link.skipPayment": "Ich möchte die Entwicklung von Franz nicht unterstützen.",
-  "import.headline": "Importiere Deine Franz 4 Dienste",
-  "import.notSupportedHeadline": "Dienste, die noch nicht von Franz 5 unterstützt werden",
-  "import.submit.label": "Dienste importieren",
-  "import.skip.label": "Ich möchte einen Dienst manuell hinzufügen",
-  "invite.submit.label": "Einladungen senden",
-  "invite.headline.friends": "Lade 3 Deiner Freund oder Kollegen ein",
-  "invite.name.label": "Name",
-  "invite.email.label": "E-Mail-Adresse",
-  "invite.skip.label": "Ich möchte das später tun",
-  "subscription.submit.label": "Ich möchte die Entwicklung von Franz unterstützen",
-  "subscription.paymentSessionError": "Das Zahlungs-Formular konnte nicht geladen werden.",
-  "subscription.includedFeatures": "Bezahlte Franz Premium Support Konten beinhalten",
-  "subscription.features.onpremise": "Integration von gehosteten Diensten, wie HipChat",
-  "subscription.features.customServices": "Private Dienste für Dich und Dein Team",
-  "subscription.features.encryptedSync": "Verschlüsselte Sitzungs-Synchronisation",
-  "subscription.features.vpn": "Proxy & VPN Unterstützung",
-  "subscription.features.ads": "Nie mehr Werbung!",
-  "subscription.features.comingSoon": "folgt bald",
-  "infobar.servicesUpdated": "Deine Dienste wurden aktualisiert.",
-  "infobar.updateAvailable": "Eine neue Version von Franz ist verfügbar.",
-  "infobar.buttonReloadServices": "Dienste neuladen",
-  "infobar.buttonInstallUpdate": "Neustarten & Aktualisierung installieren",
-  "infobar.requiredRequestsFailed": "Dienste und Benutzerinformationen konnten nicht geladen werden",
-  "sidebar.settings": "Einstellungen",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Willkommen bei Franz",
-  "services.getStarted": "Loslegen",
-  "settings.account.headline": "Konto",
-  "settings.account.headlineSubscription": "Dein Abonnement",
-  "settings.account.headlineUpgrade": "Erweitere Dein Konto & unterstütze Franz",
-  "settings.account.headlineInvoices": "Rechnungen",
-  "settings.account.manageSubscription.label": "Verwalte Dein Abonnement",
-  "settings.account.accountType.basic": "Basis Konto",
-  "settings.account.accountType.premium": "Premium-Supporter Konto",
-  "settings.account.account.editButton": "Konto bearbeiten",
-  "settings.account.invoiceDownload": "Herunterladen",
-  "settings.account.userInfoRequestFailed": "Benutzerinformationen konnten nicht geladen werden",
-  "settings.account.tryReloadUserInfoRequest": "Erneut versuchen",
-  "settings.account.headlineProfile": "Profil aktualisieren",
-  "settings.account.headlineAccount": "Kontoinformationen",
-  "settings.account.headlinePassword": "Passwort ändern",
-  "settings.account.successInfo": "Deine Änderungen wurden gespeichert.",
-  "settings.account.buttonSave": "Profil aktualisieren",
-  "settings.account.mining.thankyou": "Vielen Dank, dass Du Franz mit Deiner Rechenleistung unterstützt.",
-  "settings.account.mining.active": "Du führst gerade {hashes} Berechnungen pro Sekunde aus.",
-  "settings.account.mining.moreInformation": "Weitere Informationen",
-  "settings.account.mining.cancel": "Mining abbrechen",
-  "settings.navigation.availableServices": "Verfügbare Dienste",
-  "settings.navigation.yourServices": "Deine Dienste",
-  "settings.navigation.account": "Konto",
-  "settings.navigation.settings": "Einstellungen",
-  "settings.navigation.logout": "Abmelden",
-  "settings.recipes.headline": "Verfügbare Dienste",
-  "settings.recipes.mostPopular": "Am beliebtesten",
-  "settings.recipes.all": "Alle Dienste",
-  "settings.recipes.dev": "Entwicklung",
-  "settings.recipes.nothingFound": "Entschuldigung, aber kein Dienst entspricht Deiner Suchanfrage.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Dienst erfolgreich hinzugefügt",
-  "settings.service.form.saveButton": "Dienst speichern",
-  "settings.service.form.deleteButton": "Dienst entfernen",
-  "settings.service.form.availableServices": "Verfügbare Dienste",
-  "settings.service.form.yourServices": "Deine Dienste",
-  "settings.service.form.addServiceHeadline": "{name} hinzufügen",
-  "settings.service.form.editServiceHeadline": "{name} bearbeiten",
-  "settings.service.form.tabHosted": "Gehostet",
-  "settings.service.form.tabOnPremise": "Selbst gehostet ⭐️",
-  "settings.service.form.customUrlValidationError": "Dein eigener {name} server konnte nicht verifiziert werden.",
-  "settings.service.form.customUrlPremiumInfo": "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Franz Premium-Supporter Konto.",
-  "settings.service.form.customUrlUpgradeAccount": "Erweitere Dein Konto",
-  "settings.service.form.indirectMessageInfo": "Du wirst über alle neuen Nachrichten in einem Kanal informiert, nicht nur @username, @channel, @here, ...",
-  "settings.service.error.headline": "Fehler",
-  "settings.service.error.goBack": "Zurück zu den Diensten",
-  "settings.service.error.message": "Das Dienst-Rezept konnte nicht geladen werden.",
-  "settings.services.tooltip.isDisabled": "Dienst deaktiviert",
-  "settings.services.tooltip.notificationsDisabled": "Benachrichtigungen deaktiviert",
-  "settings.services.headline": "Deine Dienste",
-  "settings.services.noServicesAdded": "Du hast noch keine Dienste hinzugefügt.",
-  "settings.services.discoverServices": "Dienste entdecken",
-  "settings.services.updatedInfo": "Deine Änderungen wurden gespeichert.",
-  "settings.services.deletedInfo": "Dienst wurde entfernt",
-  "settings.app.headline": "Einstellungen",
-  "settings.app.headlineGeneral": "Allgemein",
-  "settings.app.headlineLanguage": "Sprache",
-  "settings.app.headlineUpdates": "Aktualisierungen",
-  "settings.app.buttonSearchForUpdate": "Auf Aktualisierungen prüfen",
-  "settings.app.buttonInstallUpdate": "Neustarten & Aktualisierung installieren",
-  "settings.app.updateStatusSearching": "Suche nach Aktualisierungen",
-  "settings.app.updateStatusAvailable": "Aktualisierung verfügbar, herunterladen...",
-  "settings.app.updateStatusUpToDate": "Du nutzt die aktuellste Version von Franz",
-  "settings.app.form.autoLaunchOnStart": "Franz beim Systemstart ausführen",
-  "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen",
-  "settings.app.form.minimizeToSystemTray": "Franz in die Systemleiste minimieren",
-  "settings.app.form.runInBackground": "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
-  "settings.app.form.language": "Sprache",
-  "settings.app.form.beta": "Beta-Versionen einbeziehen",
-  "settings.app.currentVersion": "Aktuelle Version:",
-  "settings.service.form.name": "Name",
-  "settings.service.form.enableService": "Dienst aktivieren",
-  "settings.service.form.enableNotification": "Benachrichtigungen aktivieren",
-  "settings.service.form.team": "Team",
-  "settings.service.form.customUrl": "Eigener Server",
-  "settings.service.form.indirectMessages": "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
-  "settings.user.form.firstname": "Vorname",
-  "settings.user.form.lastname": "Nachname",
-  "settings.user.form.email": "E-Mail-Adresse",
-  "settings.user.form.currentPassword": "Aktuelles Passwort",
-  "settings.user.form.newPassword": "Neues Passwort",
-  "settings.user.form.accountType.label": "Konto-Typ",
-  "settings.user.form.accountType.individual": "Einzelperson",
-  "settings.user.form.accountType.non-profit": "Gemeinnützig",
-  "settings.user.form.accountType.company": "Unternehmen",
-  "subscription.type.free": "kostenlos",
-  "subscription.type.month": "Monat",
-  "subscription.type.year": "Jahr",
-  "subscription.type.mining": "Unterstütze Franz mit Rechenleistung",
-  "subscription.mining.headline": "Wie funktioniert das?",
-  "subscription.mining.experimental": "experimentell",
-  "subscription.mining.line1": "Durch das Aktivieren von \"Unterstützung mit Rechenleistung\", wird Franz circa 20-50% deines Prozessors nutzen, um die Crypto-Währung Monero zu minen, was ungefähr 5$/Jahr entspricht.",
-  "subscription.mining.line2": "Wir passen die Prozessor-Nutzung an Dein Arbeitsverhalten an, um Deinen Akku nicht unnötig zu belasten oder Dein System zu verlangsamen.",
-  "subscription.mining.line3": "So lange der Miner aktiv ist, hast Du unbegrenzten Zugang auf alle Franz Premium-Supporter Funktionen.",
-  "subscription.mining.moreInformation": "Erhalte mehr Informationen über diesen Plan.",
-  "subscriptionPopup.buttonCancel": "Abbrechen",
-  "subscriptionPopup.buttonDone": "Fertig",
-  "tabs.item.reload": "Neuladen",
-  "tabs.item.edit": "Bearbeiten",
-  "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
-  "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
-  "tabs.item.disableService": "Dienst deaktivieren",
-  "tabs.item.deleteService": "Dienst entfernen"
+{
+   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen.",
+   "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
+   "import.headline" : "Importiere deine Franz 4 Dienste",
+   "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
+   "import.skip.label" : "Ich möchte meine Dienste manuell hinzufügen",
+   "import.submit.label" : "Dienste importieren",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Neustarten & Update installieren",
+   "infobar.buttonReloadServices" : "Dienste neu laden",
+   "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
+   "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
+   "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar.",
+   "invite.email.label" : "E-Mail Adresse",
+   "invite.headline.friends" : "Lade 3 Freunde oder Kollegen ein",
+   "invite.name.label" : "Name",
+   "invite.skip.label" : "Ich möchte das später tun",
+   "invite.submit.label" : "Einladungen senden",
+   "login.email.label" : "E-Mail Adresse",
+   "login.headline" : "Anmelden",
+   "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
+   "login.link.password" : "Passwort zurücksetzen",
+   "login.link.signup" : "Kostenloses Konto erstellen",
+   "login.password.label" : "Passwort",
+   "login.serverLogout" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
+   "login.submit.label" : "Anmelden",
+   "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
+   "password.email.label" : "E-Mail Adresse",
+   "password.headline" : "Passwort zurücksetzen",
+   "password.link.login" : "Anmelden",
+   "password.link.signup" : "Kostenloses Konto erstellen",
+   "password.noUser" : "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
+   "password.submit.label" : "Absenden",
+   "password.successInfo" : "Wir haben dir ein E-Mail mit weiteren Anweisungen geschickt.",
+   "pricing.headline" : "Unterstütze Franz",
+   "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
+   "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
+   "pricing.support.label" : "Wie möchtest du Franz unterstützen?",
+   "service.crashHandler.action" : "Neu laden",
+   "service.crashHandler.autoReload" : "{name} wird automatisch wiederhergestellt in {seconds} sekunden",
+   "service.crashHandler.headline" : "Oh nein!",
+   "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
+   "service.disabledHandler.action" : "{name} aktivieren",
+   "service.disabledHandler.headline" : "{name} ist deaktiviert",
+   "services.getStarted" : "Loslegen",
+   "services.welcome" : "Willkommen bei Franz.",
+   "settings.account.account.editButton" : "Konto bearbeiten",
+   "settings.account.accountType.basic" : "Basis Konto",
+   "settings.account.accountType.premium" : "Premium-Supporter Konto",
+   "settings.account.buttonSave" : "Profil aktualisieren",
+   "settings.account.headline" : "Konto",
+   "settings.account.headlineAccount" : "Konto Informationen",
+   "settings.account.headlineInvoices" : "Rechnungen",
+   "settings.account.headlinePassword" : "Passwort ändern",
+   "settings.account.headlineProfile" : "Profil aktualisieren",
+   "settings.account.headlineSubscription" : "Dein Abonnement",
+   "settings.account.headlineUpgrade" : "Upgrade dein Konto & unterstütze Franz",
+   "settings.account.invoiceDownload" : "Download",
+   "settings.account.manageSubscription.label" : "Verwalte Dein Abonnement",
+   "settings.account.mining.active" : "Du führst gerade {hashes} Berechnungen pro Sekunde aus.",
+   "settings.account.mining.cancel" : "Mining abbrechen",
+   "settings.account.mining.moreInformation" : "Weitere Informationen",
+   "settings.account.mining.thankyou" : "Vielen Dank, dass du Franz mit deiner Rechenleistung unterstützt.",
+   "settings.account.successInfo" : "Deine Änderungen wurden gespeichert.",
+   "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
+   "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
+   "settings.app.buttonInstallUpdate" : "Neustarten & Update installieren",
+   "settings.app.buttonSearchForUpdate" : "Nach Updates suchen",
+   "settings.app.currentVersion" : "Aktuelle Version:",
+   "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
+   "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
+   "settings.app.form.beta" : "Beta-Versionen einbeziehen",
+   "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
+   "settings.app.form.enableSystemTray" : "Franz in der Systemleiste anzeigen",
+   "settings.app.form.language" : "Sprache",
+   "settings.app.form.minimizeToSystemTray" : "Franz in die Systemleiste minimieren",
+   "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
+   "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
+   "settings.app.headline" : "Einstellungen",
+   "settings.app.headlineAdvanced" : "Erweitert",
+   "settings.app.headlineAppearance" : "Darstellung",
+   "settings.app.headlineGeneral" : "Allgemein",
+   "settings.app.headlineLanguage" : "Sprache",
+   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam. ",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Update verfügbar, herunterladen...",
+   "settings.app.updateStatusSearching" : "Suche nach Updates",
+   "settings.app.updateStatusUpToDate" : "Du nutzt die aktuellste Version von Franz",
+   "settings.navigation.account" : "Konto",
+   "settings.navigation.availableServices" : "Verfügbare Dienste",
+   "settings.navigation.logout" : "Abmelden",
+   "settings.navigation.settings" : "Einstellungen",
+   "settings.navigation.yourServices" : "Deine Dienste",
+   "settings.recipes.all" : "Alle Dienste",
+   "settings.recipes.dev" : "Entwicklung",
+   "settings.recipes.headline" : "Verfügbare Dienste",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Am beliebtesten",
+   "settings.recipes.nothingFound" : "Entschuldigung, aber kein Dienst entspricht deiner Suchanfrage.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
+   "settings.service.error.goBack" : "Zurück zu den Diensten",
+   "settings.service.error.headline" : "Fehler",
+   "settings.service.error.message" : "Das Dienst-Rezept konnte nicht geladen werden.",
+   "settings.service.form.addServiceHeadline" : "{name} hinzufügen",
+   "settings.service.form.availableServices" : "Verfügbare Dienste",
+   "settings.service.form.customUrl" : "Eigener Server",
+   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst du ein Franz Premium-Supporter Konto.",
+   "settings.service.form.customUrlUpgradeAccount" : "Upgrade dein Konto",
+   "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.\",",
+   "settings.service.form.deleteButton" : "Dienst entfernen",
+   "settings.service.form.editServiceHeadline" : "{name} bearbeiten",
+   "settings.service.form.enableAudio" : "Audio aktivieren",
+   "settings.service.form.enableNotification" : "Benachrichtigungen aktivieren",
+   "settings.service.form.enableService" : "Dienst aktivieren",
+   "settings.service.form.indirectMessageInfo" : "Du wirst über alle neuen Nachrichten in einem Kanal informiert, nicht nur @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
+   "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
+   "settings.service.form.name" : "Name",
+   "settings.service.form.saveButton" : "Dienst speichern",
+   "settings.service.form.tabHosted" : "Gehostet",
+   "settings.service.form.tabOnPremise" : "Selbst gehostet ⭐️",
+   "settings.service.form.team" : "Team",
+   "settings.service.form.yourServices" : "Deine Dienste",
+   "settings.services.deletedInfo" : "Dienst wurde entfernt",
+   "settings.services.discoverServices" : "Dienste entdecken",
+   "settings.services.headline" : "Deine Dienste",
+   "settings.services.noServicesAdded" : "Du hast noch keine Dienste hinzugefügt.",
+   "settings.services.tooltip.isDisabled" : "Dienst deaktiviert",
+   "settings.services.tooltip.isMuted" : "Audio ist deaktiviert",
+   "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
+   "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.user.form.accountType.company" : "Unternehmen",
+   "settings.user.form.accountType.individual" : "Einzelperson",
+   "settings.user.form.accountType.label" : "Konto-Typ",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Aktuelles Passwort",
+   "settings.user.form.email" : "E-Mail",
+   "settings.user.form.firstname" : "Vorname",
+   "settings.user.form.lastname" : "Nachname",
+   "settings.user.form.newPassword" : "Neues Passwort",
+   "sidebar.addNewService" : "!!!Add new service",
+   "sidebar.mute" : "Audio deaktivieren",
+   "sidebar.settings" : "Einstellungen",
+   "sidebar.unmute" : "Audio aktivieren",
+   "signup.company.label" : "Unternehmen",
+   "signup.email.label" : "E-Mail Adresse",
+   "signup.emailDuplicate" : "Ein Benutzer mit dieser E-Mail Adresse existiert bereits.",
+   "signup.firstname.label" : "Vorname",
+   "signup.headline" : "Registrierung",
+   "signup.lastname.label" : "Nachname",
+   "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst du die",
+   "signup.legal.privacy" : "Datenschutzerklärung",
+   "signup.legal.terms" : "Nutzungsbedingungen",
+   "signup.link.login" : "Du hast bereits ein Konto? Melde dich an.",
+   "signup.password.label" : "Passwort",
+   "signup.submit.label" : "Konto erstellen",
+   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.  ",
+   "subscription.features.ads" : "Nie mehr Werbung!",
+   "subscription.features.comingSoon" : "folgt bald",
+   "subscription.features.customServices" : "Private Dienste für dich und dein Team",
+   "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
+   "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
+   "subscription.features.vpn" : "Proxy & VPN Unterstützung",
+   "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
+   "subscription.mining.experimental" : "experimentell",
+   "subscription.mining.headline" : "Wie funktioniert das?",
+   "subscription.mining.line1" : "Durch das Aktivieren von \"Unterstützung mit Rechenleistung\", wird Franz circa 20-50% deines Prozessors nutzen, um die Crypto-Währung Monero zu minen, was ungefähr 5$\/Jahr entspricht.",
+   "subscription.mining.line2" : "Wir passen die Prozessor-Nutzung an dein Arbeitsverhalten an, um deinen Akku nicht unnötig zu belasten oder dein System zu verlangsamen.",
+   "subscription.mining.line3" : "So lange der Miner aktiv ist, hast du unbegrenzten Zugang auf alle Franz Premium-Supporter Funktionen.",
+   "subscription.mining.moreInformation" : "Erhalte mehr Informationen über diesen Plan.",
+   "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
+   "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
+   "subscription.type.free" : "kostenlos",
+   "subscription.type.mining" : "Unterstütze Franz mit Rechenleistung",
+   "subscription.type.month" : "Monat",
+   "subscription.type.year" : "Jahr",
+   "subscriptionPopup.buttonCancel" : "Abbrechen",
+   "subscriptionPopup.buttonDone" : "Fertig",
+   "tabs.item.deleteService" : "Dienst entfernen",
+   "tabs.item.disableAudio" : "Audio deaktivieren",
+   "tabs.item.disableNotifications" : "Benachrichtigungen deaktivieren",
+   "tabs.item.disableService" : "Dienst deaktivieren",
+   "tabs.item.edit" : "Bearbeiten",
+   "tabs.item.enableAudio" : "Audio aktivieren",
+   "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
+   "tabs.item.enableService" : "Dienst aktivieren",
+   "tabs.item.reload" : "Neu laden",
+   "welcome.loginButton" : "Anmelden",
+   "welcome.signupButton" : "Kostenloses Konto erstellen",
+   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
 }
diff --git a/src/i18n/locales/el-GR.json b/src/i18n/locales/el-GR.json
deleted file mode 100644
index 3710bc9a2..000000000
--- a/src/i18n/locales/el-GR.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  "global.api.unhealthy": "Δεν είναι δυνατή η σύνδεση με τις online υπηρεσίες του Franz",
-  "global.notConnectedToTheInternet": "Δεν είστε συνδεδεμένοι στο διαδίκτυο.",
-  "welcome.signupButton": "Δημιουργία δωρεάν λογαριασμού",
-  "welcome.loginButton": "Σύνδεση στο λογαριασμό σας",
-  "welcome.slogan": "Μηνύματα που λειτουργούν για εσάς",
-  "login.headline": "Σύνδεση",
-  "login.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "login.password.label": "Κωδικός πρόσβασης",
-  "login.submit.label": "Σύνδεση",
-  "login.invalidCredentials": "Το email ή ο κωδικός πρόσβασης δεν είναι έγκυρος",
-  "login.tokenExpired": "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
-  "login.serverLogout": "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
-  "login.link.signup": "Δημιουργία δωρεάν λογαριασμού",
-  "login.link.password": "Επαναφορά κωδικού πρόσβασης",
-  "password.headline": "Επαναφορά κωδικού πρόσβασης",
-  "password.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "password.submit.label": "Υποβολή",
-  "password.noUser": "Δεν βρέθηκε χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "password.successInfo": "Ελέγξτε το email σας",
-  "password.link.signup": "Δημιουργία δωρεάν λογαριασμού",
-  "password.link.login": "Σύνδεση στο λογαριασμό σας",
-  "signup.headline": "Εγγραφή",
-  "signup.firstname.label": "Όνομα",
-  "signup.lastname.label": "Επίθετο",
-  "signup.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "signup.company.label": "Εταιρεία",
-  "signup.password.label": "Κωδικός πρόσβασης",
-  "signup.submit.label": "Δημιουργία λογαριασμού",
-  "signup.link.login": "Έχετε ήδη λογαριασμό, συνδεθείτε ?",
-  "signup.emailDuplicate": "Ένας χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη",
-  "signup.legal.info": "Δημιουργώντας έναν λογαριασμό Franz αποδέχεστε τους",
-  "signup.legal.terms": "Όροι υπηρεσίας",
-  "signup.legal.privacy": "Δήλωση απορρήτου",
-  "pricing.headline": "Υποστήριξη Franz",
-  "pricing.support.label": "Επιλέξτε το πακέτο υποστήριξης",
-  "pricing.submit.label": "Θέλω να βοηθήσω στήν ανάπτυξη του Franz",
-  "pricing.link.skipPayment": "Δεν θέλω να βοηθήσω στήν ανάπτυξη του Franz.",
-  "import.headline": "Εισαγάγετε τις Franz 4 υπηρεσίες σας",
-  "import.notSupportedHeadline": "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Franz 5",
-  "import.submit.label": "Υπηρεσίες εισαγωγής",
-  "import.skip.label": "Θέλω να προσθέσω υπηρεσίες χειροκίνητα",
-  "invite.submit.label": "Αποστολή  προσκλήσεων",
-  "invite.headline.friends": "Προσκαλέστε 3 από τους φίλους ή τους συναδέλφους σας",
-  "invite.name.label": "Όνομα",
-  "invite.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "invite.skip.label": "Θέλω να το κάνω αργότερα",
-  "subscription.submit.label": "Θέλω να βοηθήσω στήν ανάπτυξη του Franz",
-  "subscription.paymentSessionError": "Δεν ήταν δυνατή η προετοιμασία της φόρμας πληρωμής",
-  "subscription.includedFeatures": "Ο Premium λογαριασμός υποστήριξης Franz περιλαμβάνει",
-  "subscription.features.onpremise": "Add on-premise / hosted services όπως το HipChat",
-  "subscription.features.customServices": "Ιδιωτικές υπηρεσίες για εσάς και την ομάδα σας",
-  "subscription.features.encryptedSync": "Κρυπτογραφημένος συγχρονισμός περιόδου σύνδεσης",
-  "subscription.features.vpn": "Υποστήριξη μεσολαβητή (Proxy) και VPN",
-  "subscription.features.ads": "Τέλος στις διαφημίσεις, :-D",
-  "subscription.features.comingSoon": "σύντομα",
-  "infobar.servicesUpdated": "Οι υπηρεσίες σας έχουν ενημερωθεί.",
-  "infobar.updateAvailable": "Υπάρχει διαθέσιμη μια νέα ενημέρωση για τον Franz.",
-  "infobar.buttonReloadServices": "Υπηρεσίες ανανέωσης",
-  "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
-  "infobar.requiredRequestsFailed": "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών",
-  "sidebar.settings": "Ρυθμίσεις",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Καλώς ορίσατε στον Franz",
-  "services.getStarted": "Ξεκινήστε",
-  "settings.account.headline": "Λογαριασμός",
-  "settings.account.headlineSubscription": "Η συνδρομή σας",
-  "settings.account.headlineUpgrade": "Αναβάθμιση του λογαριασμού σας και υποστήριξη Franz",
-  "settings.account.headlineInvoices": "Τιμολόγια",
-  "settings.account.manageSubscription.label": "Διαχείριση της συνδρομής σας",
-  "settings.account.accountType.basic": "Βασικός λογαριασμός",
-  "settings.account.accountType.premium": "Υποστηριζόμενος λογαριασμός Premium",
-  "settings.account.account.editButton": "Επεξεργασία λογαριασμού",
-  "settings.account.invoiceDownload": "Λήψη",
-  "settings.account.userInfoRequestFailed": "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
-  "settings.account.tryReloadUserInfoRequest": "Δοκιμάστε ξανά",
-  "settings.account.headlineProfile": "Ενημέρωση προφίλ",
-  "settings.account.headlineAccount": "Πληροφορίες λογαριασμού",
-  "settings.account.headlinePassword": "Αλλαγή κωδικού πρόσβασης",
-  "settings.account.successInfo": "Οι αλλαγές σας έχουν αποθηκευτεί",
-  "settings.account.buttonSave": "Ενημέρωση προφίλ",
-  "settings.account.mining.thankyou": "Σας ευχαριστούμε για την υποστήριξη του Franz με την ισχύ επεξεργασίας σας",
-  "settings.account.mining.active": "Τώρα πραγματοποιείτε υπολογισμούς {hashes} ανά δευτερόλεπτο.",
-  "settings.account.mining.moreInformation": "Λάβετε περισσότερες πληροφορίες",
-  "settings.account.mining.cancel": "Άκυρο εξόρυξη",
-  "settings.navigation.availableServices": "Διαθέσιμες υπηρεσίες",
-  "settings.navigation.yourServices": "Οι υπηρεσίες σας",
-  "settings.navigation.account": "Λογαριασμός",
-  "settings.navigation.settings": "Ρυθμίσεις",
-  "settings.navigation.logout": "Αποσύνδεση",
-  "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
-  "settings.recipes.mostPopular": "Τα πιο δημοφιλή",
-  "settings.recipes.all": "Όλες οι υπηρεσίες",
-  "settings.recipes.dev": "Ανάπτυξη",
-  "settings.recipes.nothingFound": "Λυπούμαστε αλλά καμία υπηρεσία δεν ταιριάζει με τον όρο αναζήτησης.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Υπηρεσία προστέθηκε με επιτυχία",
-  "settings.service.form.saveButton": "Αποθήκευση υπηρεσίας",
-  "settings.service.form.deleteButton": "Διαγραφή υπηρεσίας",
-  "settings.service.form.availableServices": "Διαθέσιμες υπηρεσίες",
-  "settings.service.form.yourServices": "Οι υπηρεσίες σας",
-  "settings.service.form.addServiceHeadline": "Προσθήκη {όνομα}",
-  "settings.service.form.editServiceHeadline": "Επεξεργασία {όνομα}",
-  "settings.service.form.tabHosted": "Φιλοξενείται",
-  "settings.service.form.tabOnPremise": "Αυτο-φιλοξενείται ⭐️",
-  "settings.service.form.customUrlValidationError": "Δεν ήταν δυνατή η επικύρωση του προσαρμοσμένου διακομιστή {name}.",
-  "settings.service.form.customUrlPremiumInfo": "Για να προσθέσετε υπηρεσίες που φιλοξενούνται μόνος σας, χρειάζεστε έναν λογαριασμό υποστήριξης Premium Franz.",
-  "settings.service.form.customUrlUpgradeAccount": "Αναβάθμιση του λογαριασμού σας",
-  "settings.service.form.indirectMessageInfo": "Θα ειδοποιηθείτε για όλα τα νέα μηνύματα σε ένα κανάλι, όχι μόνο @username, @channel, @here, ...",
-  "settings.service.error.headline": "Σφάλμα",
-  "settings.service.error.goBack": "Επιστροφή στις υπηρεσίες",
-  "settings.service.error.message": "Δεν ήταν δυνατή η φόρτωση της συνταγής υπηρεσίας.",
-  "settings.services.tooltip.isDisabled": "Η υπηρεσία είναι απενεργοποιημένη",
-  "settings.services.tooltip.notificationsDisabled": "Οι ειδοποιήσεις είναι απενεργοποιημένες",
-  "settings.services.headline": "Οι υπηρεσίες σας",
-  "settings.services.noServicesAdded": "Δεν έχετε προσθέσει ακόμα υπηρεσίες.",
-  "settings.services.discoverServices": "Ανακαλύψτε τις υπηρεσίες",
-  "settings.services.updatedInfo": "Οι αλλαγές σας έχουν αποθηκευτεί",
-  "settings.services.deletedInfo": "Η υπηρεσία έχει διαγραφεί",
-  "settings.app.headline": "Ρυθμίσεις",
-  "settings.app.headlineΓενικά": "Γενικά",
-  "settings.app.headlineLanguage": "Γλώσσα",
-  "settings.app.headlineUpdates": "Ενημερώσεις",
-  "settings.app.buttonSearchForUpdate": "Έλεγχος για ενημερώσεις",
-  "settings.app.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
-  "settings.app.updateStatusSearching": "Ψάχνει για ενημέρωση",
-  "settings.app.updateStatusAvailable": "Διαθέσιμη ενημέρωση, λήψη ...",
-  "settings.app.updateStatusUpToDate": "Χρησιμοποιείτε την τελευταία έκδοση του Franz",
-  "settings.app.form.autoLaunchOnStart": "Εκκίνηση του Franz στην αρχή",
-  "settings.app.form.autoLaunchInBackground": "Άνοιγμα στο παρασκήνιο",
-  "settings.app.form.enableSystemTray": "Εμφάνιση του Franz στο δίσκο συστήματος",
-  "settings.app.form.minimizeToSystemTray": "Ελαχιστοποίηση του Franz στο δίσκο συστήματος",
-  "settings.app.form.runInBackground": "Κρατήστε Franz στο παρασκήνιο κατά το κλείσιμο του παραθύρου",
-  "settings.app.form.language": "Γλώσσα",
-  "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta",
-  "settings.app.currentVersion": "Τρέχουσα έκδοση:",
-  "settings.service.form.name": "Όνομα",
-  "settings.service.form.enableService": "Ενεργοποίηση υπηρεσίας",
-  "settings.service.form.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
-  "settings.service.form.team": "Ομάδα",
-  "settings.service.form.customUrl": "Προσαρμοσμένος διακομιστής",
-  "settings.service.form.indirectMessages": "Εμφάνιση ειδοποίησης μηνύματος για όλα τα νέα μηνύματα",
-  "settings.user.form.firstname": "Όνομα",
-  "settings.user.form.lastname": "Επίθετο",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Τρέχων κωδικός πρόσβασης",
-  "settings.user.form.newPassword": "Νέος κωδικός πρόσβασης",
-  "settings.user.form.accountType.label": "Τύπος λογαριασμού",
-  "settings.user.form.accountType.individual": "Ατομική",
-  "settings.user.form.accountType.non-profit": "Μη κερδοσκοπικό",
-  "settings.user.form.accountType.company": "Εταιρεία",
-  "subscription.type.free": "δωρεάν",
-  "subscription.type.month": "μήνας",
-  "subscription.type.year": "έτος",
-  "subscription.type.mining": "Υποστήριξη Franz με ισχύ CPU",
-  "subscription.mining.headline": "Πώς λειτουργεί αυτό;",
-  "subscription.mining.experimental": "πειραματική",
-  "subscription.mining.line1": "Franz χρησιμοποιεί περίπου το 20-50% της CPU σας για να εξορύξει την κρυπτογράφηση Monero που ισούται περίπου με $ 5 / έτος.",
-  "subscription.mining.line2": "Θα προσαρμόσουμε τη χρήση της CPU με βάση τη συμπεριφορά εργασίας σας ώστε να μην αποστραγγίσουμε την μπαταρία σας και να επιβραδύνουμε εσάς και το μηχάνημά σας.",
-  "subscription.mining.line3": "Εφόσον ο Miner είναι ενεργός, θα έχετε απεριόριστη πρόσβαση σε όλα τα χαρακτηριστικά του Franz Premium Supporter.",
-  "subscription.mining.moreInformation": "Λάβετε περισσότερες πληροφορίες σχετικά με αυτό το πακέτο.",
-  "subscriptionPopup.buttonCancel": "Ακύρωση",
-  "subscriptionPopup.buttonDone": "Έγινε",
-  "tabs.item.reload": "Επαναφόρτωση",
-  "tabs.item.edit": "Επεξεργασία",
-  "tabs.item.disableNotifications": "Απενεργοποίηση ειδοποιήσεων",
-  "tabs.item.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
-  "tabs.item.disableService": "Απενεργοποίηση υπηρεσίας",
-  "tabs.item.deleteService": "Διαγραφή υπηρεσίας"
-}
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
new file mode 100644
index 000000000..459d097f3
--- /dev/null
+++ b/src/i18n/locales/el.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Can't connect to Franz online services",
+   "global.notConnectedToTheInternet" : "You are not connected to the internet.",
+   "import.headline" : "Import your Franz 4 services",
+   "import.notSupportedHeadline" : "Services not yet supported in Franz 5",
+   "import.skip.label" : "I want to add services manually",
+   "import.submit.label" : "Import services",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Restart & install update",
+   "infobar.buttonReloadServices" : "Reload services",
+   "infobar.requiredRequestsFailed" : "Could not load services and user information",
+   "infobar.servicesUpdated" : "Your services have been updated.",
+   "infobar.updateAvailable" : "A new update for Franz is available.",
+   "invite.email.label" : "Email address",
+   "invite.headline.friends" : "Invite 3 of your friends or colleagues",
+   "invite.name.label" : "Name",
+   "invite.skip.label" : "I want to do this later",
+   "invite.submit.label" : "Send invites",
+   "login.email.label" : "Email address",
+   "login.headline" : "Sign in",
+   "login.invalidCredentials" : "Email or password not valid",
+   "login.link.password" : "Reset password",
+   "login.link.signup" : "Create a free account",
+   "login.password.label" : "Password",
+   "login.serverLogout" : "Your session expired, please login again.",
+   "login.submit.label" : "Sign in",
+   "login.tokenExpired" : "Your session expired, please login again.",
+   "password.email.label" : "Email address",
+   "password.headline" : "Reset password",
+   "password.link.login" : "Sign in to your account",
+   "password.link.signup" : "Create a free account",
+   "password.noUser" : "No user with that email address was found",
+   "password.submit.label" : "Submit",
+   "password.successInfo" : "Please check your email",
+   "pricing.headline" : "Support Franz",
+   "pricing.link.skipPayment" : "I don't want to support the development of Franz.",
+   "pricing.submit.label" : "I want to support the development of Franz",
+   "pricing.support.label" : "Select your support plan",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Get started",
+   "services.welcome" : "Welcome to Franz",
+   "settings.account.account.editButton" : "Edit account",
+   "settings.account.accountType.basic" : "Basic Account",
+   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.buttonSave" : "Update profile",
+   "settings.account.headline" : "Account",
+   "settings.account.headlineAccount" : "Account information",
+   "settings.account.headlineInvoices" : "Invoices",
+   "settings.account.headlinePassword" : "Change password",
+   "settings.account.headlineProfile" : "Update profile",
+   "settings.account.headlineSubscription" : "Your subscription",
+   "settings.account.headlineUpgrade" : "Upgrade your account & support Franz",
+   "settings.account.invoiceDownload" : "Download",
+   "settings.account.manageSubscription.label" : "Manage your subscription",
+   "settings.account.mining.active" : "You are right now performing {hashes} calculations per second.",
+   "settings.account.mining.cancel" : "Cancel mining",
+   "settings.account.mining.moreInformation" : "Get more information",
+   "settings.account.mining.thankyou" : "Thank you for supporting Franz with your processing power.",
+   "settings.account.successInfo" : "Your changes have been saved",
+   "settings.account.tryReloadUserInfoRequest" : "Try again",
+   "settings.account.userInfoRequestFailed" : "Could not load user information",
+   "settings.app.buttonInstallUpdate" : "Restart & install update",
+   "settings.app.buttonSearchForUpdate" : "Check for updates",
+   "settings.app.currentVersion" : "Current version:",
+   "settings.app.form.autoLaunchInBackground" : "Open in background",
+   "settings.app.form.autoLaunchOnStart" : "Launch Franz on start",
+   "settings.app.form.beta" : "Include beta versions",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
+   "settings.app.form.language" : "Language",
+   "settings.app.form.minimizeToSystemTray" : "Minimize Franz to system tray",
+   "settings.app.form.runInBackground" : "Keep Franz in background when closing the window",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Settings",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "General",
+   "settings.app.headlineLanguage" : "Language",
+   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Update available, downloading...",
+   "settings.app.updateStatusSearching" : "Is searching for update",
+   "settings.app.updateStatusUpToDate" : "You are using the latest version of Franz",
+   "settings.navigation.account" : "Account",
+   "settings.navigation.availableServices" : "Available services",
+   "settings.navigation.logout" : "Logout",
+   "settings.navigation.settings" : "Settings",
+   "settings.navigation.yourServices" : "Your services",
+   "settings.recipes.all" : "All services",
+   "settings.recipes.dev" : "Development",
+   "settings.recipes.headline" : "Available services",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Most popular",
+   "settings.recipes.nothingFound" : "Sorry, but no service matched your search term.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Service successfully added",
+   "settings.service.error.goBack" : "Back to services",
+   "settings.service.error.headline" : "Error",
+   "settings.service.error.message" : "Could not load service recipe.",
+   "settings.service.form.addServiceHeadline" : "Add {name}",
+   "settings.service.form.availableServices" : "Available services",
+   "settings.service.form.customUrl" : "Custom server",
+   "settings.service.form.customUrlPremiumInfo" : "To add self hosted services, you need a Franz Premium Supporter Account.",
+   "settings.service.form.customUrlUpgradeAccount" : "Upgrade your account",
+   "settings.service.form.customUrlValidationError" : "Could not validate custom {name} server.",
+   "settings.service.form.deleteButton" : "Delete service",
+   "settings.service.form.editServiceHeadline" : "Edit {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Enable notifications",
+   "settings.service.form.enableService" : "Enable service",
+   "settings.service.form.indirectMessageInfo" : "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Show message badge for all new messages",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Name",
+   "settings.service.form.saveButton" : "Save service",
+   "settings.service.form.tabHosted" : "Hosted",
+   "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
+   "settings.service.form.team" : "Team",
+   "settings.service.form.yourServices" : "Your services",
+   "settings.services.deletedInfo" : "Service has been deleted",
+   "settings.services.discoverServices" : "Discover services",
+   "settings.services.headline" : "Your services",
+   "settings.services.noServicesAdded" : "You haven't added any services yet.",
+   "settings.services.tooltip.isDisabled" : "Service is disabled",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Notifications are disabled",
+   "settings.services.updatedInfo" : "Your changes have been saved",
+   "settings.user.form.accountType.company" : "Company",
+   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.label" : "Account type",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Current password",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "New password",
+   "sidebar.addNewService" : "Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Settings",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Company",
+   "signup.email.label" : "Email address",
+   "signup.emailDuplicate" : "A user with that email address already exists",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Sign up",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "By creating a Franz account you accept the",
+   "signup.legal.privacy" : "Privacy Statement",
+   "signup.legal.terms" : "Terms of service",
+   "signup.link.login" : "Already have an account, sign in?",
+   "signup.password.label" : "Password",
+   "signup.submit.label" : "Create account",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "No ads, ever!",
+   "subscription.features.comingSoon" : "coming soon",
+   "subscription.features.customServices" : "Private services for you and your team",
+   "subscription.features.encryptedSync" : "Encrypted session synchronization",
+   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
+   "subscription.features.vpn" : "Proxy & VPN support",
+   "subscription.includedFeatures" : "Paid Franz Premium Supporter Account includes",
+   "subscription.mining.experimental" : "experimental",
+   "subscription.mining.headline" : "How does this work?",
+   "subscription.mining.line1" : "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5\/year.",
+   "subscription.mining.line2" : "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
+   "subscription.mining.line3" : "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
+   "subscription.mining.moreInformation" : "Get more information about this plan.",
+   "subscription.paymentSessionError" : "Could not initialize payment form",
+   "subscription.submit.label" : "I want to support the development of Franz",
+   "subscription.type.free" : "free",
+   "subscription.type.mining" : "Support Franz with processing power",
+   "subscription.type.month" : "month",
+   "subscription.type.year" : "year",
+   "subscriptionPopup.buttonCancel" : "Cancel",
+   "subscriptionPopup.buttonDone" : "Done",
+   "tabs.item.deleteService" : "Delete service",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Disable notifications",
+   "tabs.item.disableService" : "Disable service",
+   "tabs.item.edit" : "Edit",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Enable notifications",
+   "tabs.item.enableService" : "Enable service",
+   "tabs.item.reload" : "Reload",
+   "welcome.loginButton" : "Login to your account",
+   "welcome.signupButton" : "Create a free account",
+   "welcome.slogan" : "Messaging that works for you"
+}
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index fd8ba0fef..567537d75 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -21,8 +21,8 @@
   "password.link.signup": "Create a free account",
   "password.link.login": "Sign in to your account",
   "signup.headline": "Sign up",
-  "signup.firstname.label": "Firstname",
-  "signup.lastname.label": "Lastname",
+  "signup.firstname.label": "First Name",
+  "signup.lastname.label": "Last Name",
   "signup.email.label": "Email address",
   "signup.company.label": "Company",
   "signup.password.label": "Password",
@@ -39,7 +39,7 @@
   "import.headline": "Import your Franz 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Franz 5",
   "import.submit.label": "Import services",
-  "import.skip.label": "I want add services manually",
+  "import.skip.label": "I want to add services manually",
   "invite.submit.label": "Send invites",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
   "invite.name.label": "Name",
@@ -58,17 +58,19 @@
   "infobar.updateAvailable": "A new update for Franz is available.",
   "infobar.buttonReloadServices": "Reload services",
   "infobar.buttonInstallUpdate": "Restart & install update",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "sidebar.settings": "Settings",
   "sidebar.addNewService": "Add new service",
-  "sidebar.mute": "Disable audio",
-  "sidebar.unmute": "Enable audio",
+  "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.unmuteApp": "Enable notifications & audio",
   "services.welcome": "Welcome to Franz",
   "services.getStarted": "Get started",
   "settings.account.headline": "Account",
   "settings.account.headlineSubscription": "Your subscription",
   "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
   "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineDangerZone": "Danger Zone",
   "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
@@ -85,6 +87,9 @@
   "settings.account.mining.active": "You are right now performing {hashes} calculations per second.",
   "settings.account.mining.moreInformation": "Get more information",
   "settings.account.mining.cancel": "Cancel mining",
+  "settings.account.deleteAccount": "Delete account",
+  "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.account": "Account",
@@ -96,6 +101,7 @@
   "settings.recipes.dev": "Development",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
+  "settings.recipes.missingService": "Missing a service?",
   "settings.service.form.saveButton": "Save service",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.availableServices": "Available services",
@@ -104,6 +110,7 @@
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.tabHosted": "Hosted",
   "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.useHostedService": "Use the hosted {name} service.",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
@@ -111,11 +118,15 @@
   "settings.service.form.name": "Name",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.team": "Team",
   "settings.service.form.customUrl": "Custom server",
   "settings.service.form.indirectMessages": "Show message badge for all new messages",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.headlineNotifications": "Notifications",
+  "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineGeneral": "General",
   "settings.service.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -132,6 +143,7 @@
   "settings.app.headlineLanguage": "Language",
   "settings.app.headlineUpdates": "Updates",
   "settings.app.headlineAppearance": "Appearance",
+  "settings.app.headlineAdvanced": "Advanced",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.updateStatusSearching": "Is searching for update",
@@ -143,11 +155,15 @@
   "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
   "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
   "settings.app.form.language": "Language",
+  "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.translationHelp": "Help us to translate Franz into your language.",
   "settings.app.currentVersion": "Current version:",
-  "settings.user.form.firstname": "Firstname",
-  "settings.user.form.lastname": "Lastname",
+  "settings.app.restartRequired": "Changes require restart",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.email": "Email",
   "settings.user.form.currentPassword": "Current password",
   "settings.user.form.newPassword": "New password",
@@ -165,6 +181,7 @@
   "subscription.mining.line2": "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
   "subscription.mining.line3": "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
   "subscription.mining.moreInformation": "Get more information about this plan.",
+  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
   "tabs.item.reload": "Reload",
@@ -181,5 +198,5 @@
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}"    
+  "service.disabledHandler.action": "Enable {name}"
 }
diff --git a/src/i18n/locales/es-ES.json b/src/i18n/locales/es-ES.json
deleted file mode 100644
index f71b07b2d..000000000
--- a/src/i18n/locales/es-ES.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "global.api.unhealthy": "No se pudo conectar con los servicios online de Franz",
-  "global.notConnectedToTheInternet": "No estás conectado a internet.",
-  "welcome.signupButton": "Crea una cuenta gratuita",
-  "welcome.loginButton": "Accede a tu cuenta",
-  "welcome.slogan": "Mensajería hecha para ti",
-  "login.headline": "Acceder",
-  "login.email.label": "Dirección de Email",
-  "login.password.label": "Contraseña",
-  "login.submit.label": "Acceder",
-  "login.invalidCredentials": "Email o contraseña no válidos",
-  "login.tokenExpired": "Tu sesión ha expirado. Por favor, accede de nuevo.",
-  "login.serverLogout": "Tu sesión ha expirado. Por favor, accede de nuevo.",
-  "login.link.signup": "Crea una cuenta gratuita",
-  "login.link.password": "Restablecer contraseña",
-  "password.headline": "Restablecer contraseña",
-  "password.email.label": "Dirección de Email",
-  "password.submit.label": "Enviar",
-  "password.noUser": "No hemos encontrado un usuario con ese email",
-  "password.successInfo": "Por favor, comprueba tu email",
-  "password.link.signup": "Crea una cuenta gratuita",
-  "password.link.login": "Accede a tu cuenta",
-  "signup.headline": "Crea tu cuenta",
-  "signup.firstname.label": "Nombre",
-  "signup.lastname.label": "Apellidos",
-  "signup.email.label": "Dirección de Email",
-  "signup.company.label": "Empresa",
-  "signup.password.label": "Contraseña",
-  "signup.submit.label": "Crear cuenta",
-  "signup.link.login": "¿Tienes ya una cuenta? Accede",
-  "signup.emailDuplicate": "Ya existe un usuario con esa dirección de email",
-  "signup.legal.info": "Al crear una cuenta de Franz aceptas los",
-  "signup.legal.terms": "Términos de servicio",
-  "signup.legal.privacy": "Política de privacidad",
-  "pricing.headline": "Ayuda a Franz",
-  "pricing.support.label": "Selecciona tu plan de ayuda",
-  "pricing.submit.label": "Quiero ayudar al desarrollo de Franz",
-  "pricing.link.skipPayment": "No quiero ayudar al desarrollo de Franz.",
-  "import.headline": "Importa tus servicios de Franz 4",
-  "import.notSupportedHeadline": "Servicios aún no disponibles en Franz 5",
-  "import.submit.label": "Importar servicios",
-  "import.skip.label": "Quiero añadir los servicios manualmente",
-  "invite.submit.label": "Enviar invitaciones",
-  "invite.headline.friends": "Invita a 3 de tus amigos o compañeros",
-  "invite.name.label": "Nombre",
-  "invite.email.label": "Dirección de Email",
-  "invite.skip.label": "Prefiero hacer esto luego",
-  "subscription.submit.label": "Quiero ayudar al desarrollo de Franz",
-  "subscription.paymentSessionError": "No se ha podido inicializar el formulario de pago",
-  "subscription.includedFeatures": "La cuenta de Franz Premium Supporter incluye",
-  "subscription.features.onpremise": "Añadir servicios in-situ/alojados como HipChat",
-  "subscription.features.customServices": "Servicios privados para ti y tu equipo",
-  "subscription.features.encryptedSync": "Sincronización de sesión encriptada",
-  "subscription.features.vpn": "Soporte para Proxy y VPN",
-  "subscription.features.ads": "¡Sin anuncios, para siempre!",
-  "subscription.features.comingSoon": "próximamente",
-  "infobar.servicesUpdated": "Tus servicios han sido actualizados.",
-  "infobar.updateAvailable": "Una nueva actualización para Franz está disponible.",
-  "infobar.buttonReloadServices": "Volver a cargar servicios",
-  "infobar.buttonInstallUpdate": "Reiniciar e instalar actualizaciones",
-  "infobar.requiredRequestsFailed": "No se han podido cargar los servicios y la información de usuario",
-  "sidebar.settings": "Ajustes",
-  "services.welcome": "Bienvenido a Franz",
-  "services.getStarted": "Comienza",
-  "settings.account.headline": "Mi cuenta",
-  "settings.account.headlineSubscription": "Tu suscripción",
-  "settings.account.headlineUpgrade": "Mejora tu cuenta y ayuda a Franz",
-  "settings.account.headlineInvoices": "Recibos",
-  "settings.account.manageSubscription.label": "Administra tu suscripción",
-  "settings.account.accountType.basic": "Cuenta Básica",
-  "settings.account.accountType.premium": "Cuenta Premium Supporter",
-  "settings.account.account.editButton": "Editar cuenta",
-  "settings.account.invoiceDownload": "Descargar",
-  "settings.account.userInfoRequestFailed": "No se ha podido cargar la información de usuario",
-  "settings.account.tryReloadUserInfoRequest": "TPrueba otra vez",
-  "settings.account.headlineProfile": "Actualizar perfil",
-  "settings.account.headlineAccount": "Información de la cuenta",
-  "settings.account.headlinePassword": "Cambiar contraseña",
-  "settings.account.successInfo": "Tus cambios han sido guardados",
-  "settings.account.buttonSave": "Actualizar perfil",
-  "settings.account.mining.thankyou": "Gracias por ayudar a Franz con tu procesador.",
-  "settings.account.mining.active": "Ahora mismo estás haciendo {hashes} cálculos por segundo.",
-  "settings.account.mining.moreInformation": "Obtén más información",
-  "settings.account.mining.cancel": "Cancelar minado",
-  "settings.navigation.availableServices": "Servicios disponibles",
-  "settings.navigation.yourServices": "Tus servicios",
-  "settings.navigation.account": "Cuenta",
-  "settings.navigation.settings": "Ajustes",
-  "settings.navigation.logout": "Desconectar",
-  "settings.recipes.headline": "Servicios disponibles",
-  "settings.recipes.mostPopular": "Más populares",
-  "settings.recipes.all": "Todos los servicios",
-  "settings.recipes.dev": "Desarrollo",
-  "settings.recipes.nothingFound": "Lo sentimos, no hemos encontrado nada.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Servicio añadido con éxito",
-  "settings.service.form.saveButton": "Guardar servicio",
-  "settings.service.form.deleteButton": "Eliminar servicio",
-  "settings.service.form.availableServices": "Servicios disponibles",
-  "settings.service.form.yourServices": "Tus servicios",
-  "settings.service.form.addServiceHeadline": "Añadir {name}",
-  "settings.service.form.editServiceHeadline": "Editar {name}",
-  "settings.service.form.tabHosted": "Alojados",
-  "settings.service.form.tabOnPremise": "Autoalojados ⭐️",
-  "settings.service.form.customUrlValidationError": "No se ha podido validar el servidor personalizado {name}.",
-  "settings.service.form.customUrlPremiumInfo": "Para añadir servicios autoalojados necesitas una cuenta de Franz Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Mejora tu cuenta",
-  "settings.service.form.indirectMessageInfo": "Serás notificado sobre todos los nuevos mensajes en un canal, no solo @username, @channel, @here, ...",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.goBack": "Volver a los servicios",
-  "settings.service.error.message": "No se ha podido cargar el servicio.",
-  "settings.services.tooltip.isDisabled": "Servicio deshabilitado",
-  "settings.services.tooltip.notificationsDisabled": "Notificaciones deshabilitadas",
-  "settings.services.headline": "Tus servicios",
-  "settings.services.noServicesAdded": "Aún no has añadido ningún servicio.",
-  "settings.services.discoverServices": "Descubrir servicios",
-  "settings.services.updatedInfo": "Tu cambios han sido guardados",
-  "settings.services.deletedInfo": "Se ha eliminado el servicio",
-  "settings.app.headline": "Ajustes",
-  "settings.app.headlineGeneral": "Generales",
-  "settings.app.headlineLanguage": "Idioma",
-  "settings.app.headlineUpdates": "Actualizaciones",
-  "settings.app.buttonSearchForUpdate": "Buscar actualizaciones",
-  "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualizaciones",
-  "settings.app.updateStatusSearching": "Buscando actualizaciones",
-  "settings.app.updateStatusAvailable": "Actualización disponible, descargando...",
-  "settings.app.updateStatusUpToDate": "Estás utilizando la última versión de Franz",
-  "settings.app.form.autoLaunchOnStart": "Iniciar Franz al encender",
-  "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano",
-  "settings.app.form.enableSystemTray": "Mostrar Franz en la barra de tareas",
-  "settings.app.form.minimizeToSystemTray": "Minimizar Franz a la barra de tareas",
-  "settings.app.form.runInBackground": "Mantener Franz abierto en segundo plano al cerrar la ventana",
-  "settings.app.form.language": "Idioma",
-  "settings.app.form.beta": "Incluir versiones beta",
-  "settings.app.currentVersion": "Versión actual:",
-  "settings.service.form.name": "Nombre",
-  "settings.service.form.enableService": "Habilitar servicio",
-  "settings.service.form.enableNotification": "Habilitar notificaciones",
-  "settings.service.form.team": "Equipo",
-  "settings.service.form.customUrl": "Servidor personalizado",
-  "settings.service.form.indirectMessages": "Mostrar señal para todos los mensajes nuevos",
-  "settings.user.form.firstname": "Nombre",
-  "settings.user.form.lastname": "Apellidos",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Contraseña actual",
-  "settings.user.form.newPassword": "Nueva contraseña",
-  "settings.user.form.accountType.label": "Tipo de cuenta",
-  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.non-profit": "Sin ánimo de lucro",
-  "settings.user.form.accountType.company": "Empresa",
-  "subscription.type.free": "gratis",
-  "subscription.type.month": "mensual",
-  "subscription.type.year": "anual",
-  "subscription.type.mining": "Ayuda a Franz con tu procesador",
-  "subscription.mining.headline": "¿Cómo funciona?",
-  "subscription.mining.experimental": "experimental",
-  "subscription.mining.line1": "Al habilitar \"Ayuda a Franz con tu procesador\", Franz utilizará entre un 20-50% de tu CPU para minar la criptomoneda Monero, lo que equivale a aproximadamente 5$ anuales.",
-  "subscription.mining.line2": "Adaptaremos el uso de CPU basándonos en tu carga de trabajo para no vaciar tu batería ni realentizar tu ordenador.",
-  "subscription.mining.line3": "Siempre que el minero esté activo, tendrás acceso ilimitado a todas las ventajas de la cuenta Franz Premium Supporter.",
-  "subscription.mining.moreInformation": "Obtén más información sobre este plan.",
-  "subscriptionPopup.buttonCancel": "Cancelar",
-  "subscriptionPopup.buttonDone": "Hecho",
-  "tabs.item.reload": "Recargar",
-  "tabs.item.edit": "Editar",
-  "tabs.item.disableNotifications": "Desactivar notificaciones",
-  "tabs.item.enableNotification": "Activar notificaciones",
-  "tabs.item.disableService": "Deshabilitar servicio",
-  "tabs.item.deleteService": "Eliminar servicio"
-}
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
new file mode 100644
index 000000000..459d097f3
--- /dev/null
+++ b/src/i18n/locales/es.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Can't connect to Franz online services",
+   "global.notConnectedToTheInternet" : "You are not connected to the internet.",
+   "import.headline" : "Import your Franz 4 services",
+   "import.notSupportedHeadline" : "Services not yet supported in Franz 5",
+   "import.skip.label" : "I want to add services manually",
+   "import.submit.label" : "Import services",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Restart & install update",
+   "infobar.buttonReloadServices" : "Reload services",
+   "infobar.requiredRequestsFailed" : "Could not load services and user information",
+   "infobar.servicesUpdated" : "Your services have been updated.",
+   "infobar.updateAvailable" : "A new update for Franz is available.",
+   "invite.email.label" : "Email address",
+   "invite.headline.friends" : "Invite 3 of your friends or colleagues",
+   "invite.name.label" : "Name",
+   "invite.skip.label" : "I want to do this later",
+   "invite.submit.label" : "Send invites",
+   "login.email.label" : "Email address",
+   "login.headline" : "Sign in",
+   "login.invalidCredentials" : "Email or password not valid",
+   "login.link.password" : "Reset password",
+   "login.link.signup" : "Create a free account",
+   "login.password.label" : "Password",
+   "login.serverLogout" : "Your session expired, please login again.",
+   "login.submit.label" : "Sign in",
+   "login.tokenExpired" : "Your session expired, please login again.",
+   "password.email.label" : "Email address",
+   "password.headline" : "Reset password",
+   "password.link.login" : "Sign in to your account",
+   "password.link.signup" : "Create a free account",
+   "password.noUser" : "No user with that email address was found",
+   "password.submit.label" : "Submit",
+   "password.successInfo" : "Please check your email",
+   "pricing.headline" : "Support Franz",
+   "pricing.link.skipPayment" : "I don't want to support the development of Franz.",
+   "pricing.submit.label" : "I want to support the development of Franz",
+   "pricing.support.label" : "Select your support plan",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Get started",
+   "services.welcome" : "Welcome to Franz",
+   "settings.account.account.editButton" : "Edit account",
+   "settings.account.accountType.basic" : "Basic Account",
+   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.buttonSave" : "Update profile",
+   "settings.account.headline" : "Account",
+   "settings.account.headlineAccount" : "Account information",
+   "settings.account.headlineInvoices" : "Invoices",
+   "settings.account.headlinePassword" : "Change password",
+   "settings.account.headlineProfile" : "Update profile",
+   "settings.account.headlineSubscription" : "Your subscription",
+   "settings.account.headlineUpgrade" : "Upgrade your account & support Franz",
+   "settings.account.invoiceDownload" : "Download",
+   "settings.account.manageSubscription.label" : "Manage your subscription",
+   "settings.account.mining.active" : "You are right now performing {hashes} calculations per second.",
+   "settings.account.mining.cancel" : "Cancel mining",
+   "settings.account.mining.moreInformation" : "Get more information",
+   "settings.account.mining.thankyou" : "Thank you for supporting Franz with your processing power.",
+   "settings.account.successInfo" : "Your changes have been saved",
+   "settings.account.tryReloadUserInfoRequest" : "Try again",
+   "settings.account.userInfoRequestFailed" : "Could not load user information",
+   "settings.app.buttonInstallUpdate" : "Restart & install update",
+   "settings.app.buttonSearchForUpdate" : "Check for updates",
+   "settings.app.currentVersion" : "Current version:",
+   "settings.app.form.autoLaunchInBackground" : "Open in background",
+   "settings.app.form.autoLaunchOnStart" : "Launch Franz on start",
+   "settings.app.form.beta" : "Include beta versions",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
+   "settings.app.form.language" : "Language",
+   "settings.app.form.minimizeToSystemTray" : "Minimize Franz to system tray",
+   "settings.app.form.runInBackground" : "Keep Franz in background when closing the window",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Settings",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "General",
+   "settings.app.headlineLanguage" : "Language",
+   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Update available, downloading...",
+   "settings.app.updateStatusSearching" : "Is searching for update",
+   "settings.app.updateStatusUpToDate" : "You are using the latest version of Franz",
+   "settings.navigation.account" : "Account",
+   "settings.navigation.availableServices" : "Available services",
+   "settings.navigation.logout" : "Logout",
+   "settings.navigation.settings" : "Settings",
+   "settings.navigation.yourServices" : "Your services",
+   "settings.recipes.all" : "All services",
+   "settings.recipes.dev" : "Development",
+   "settings.recipes.headline" : "Available services",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Most popular",
+   "settings.recipes.nothingFound" : "Sorry, but no service matched your search term.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Service successfully added",
+   "settings.service.error.goBack" : "Back to services",
+   "settings.service.error.headline" : "Error",
+   "settings.service.error.message" : "Could not load service recipe.",
+   "settings.service.form.addServiceHeadline" : "Add {name}",
+   "settings.service.form.availableServices" : "Available services",
+   "settings.service.form.customUrl" : "Custom server",
+   "settings.service.form.customUrlPremiumInfo" : "To add self hosted services, you need a Franz Premium Supporter Account.",
+   "settings.service.form.customUrlUpgradeAccount" : "Upgrade your account",
+   "settings.service.form.customUrlValidationError" : "Could not validate custom {name} server.",
+   "settings.service.form.deleteButton" : "Delete service",
+   "settings.service.form.editServiceHeadline" : "Edit {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Enable notifications",
+   "settings.service.form.enableService" : "Enable service",
+   "settings.service.form.indirectMessageInfo" : "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Show message badge for all new messages",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Name",
+   "settings.service.form.saveButton" : "Save service",
+   "settings.service.form.tabHosted" : "Hosted",
+   "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
+   "settings.service.form.team" : "Team",
+   "settings.service.form.yourServices" : "Your services",
+   "settings.services.deletedInfo" : "Service has been deleted",
+   "settings.services.discoverServices" : "Discover services",
+   "settings.services.headline" : "Your services",
+   "settings.services.noServicesAdded" : "You haven't added any services yet.",
+   "settings.services.tooltip.isDisabled" : "Service is disabled",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Notifications are disabled",
+   "settings.services.updatedInfo" : "Your changes have been saved",
+   "settings.user.form.accountType.company" : "Company",
+   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.label" : "Account type",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Current password",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "New password",
+   "sidebar.addNewService" : "Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Settings",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Company",
+   "signup.email.label" : "Email address",
+   "signup.emailDuplicate" : "A user with that email address already exists",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Sign up",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "By creating a Franz account you accept the",
+   "signup.legal.privacy" : "Privacy Statement",
+   "signup.legal.terms" : "Terms of service",
+   "signup.link.login" : "Already have an account, sign in?",
+   "signup.password.label" : "Password",
+   "signup.submit.label" : "Create account",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "No ads, ever!",
+   "subscription.features.comingSoon" : "coming soon",
+   "subscription.features.customServices" : "Private services for you and your team",
+   "subscription.features.encryptedSync" : "Encrypted session synchronization",
+   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
+   "subscription.features.vpn" : "Proxy & VPN support",
+   "subscription.includedFeatures" : "Paid Franz Premium Supporter Account includes",
+   "subscription.mining.experimental" : "experimental",
+   "subscription.mining.headline" : "How does this work?",
+   "subscription.mining.line1" : "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5\/year.",
+   "subscription.mining.line2" : "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
+   "subscription.mining.line3" : "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
+   "subscription.mining.moreInformation" : "Get more information about this plan.",
+   "subscription.paymentSessionError" : "Could not initialize payment form",
+   "subscription.submit.label" : "I want to support the development of Franz",
+   "subscription.type.free" : "free",
+   "subscription.type.mining" : "Support Franz with processing power",
+   "subscription.type.month" : "month",
+   "subscription.type.year" : "year",
+   "subscriptionPopup.buttonCancel" : "Cancel",
+   "subscriptionPopup.buttonDone" : "Done",
+   "tabs.item.deleteService" : "Delete service",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Disable notifications",
+   "tabs.item.disableService" : "Disable service",
+   "tabs.item.edit" : "Edit",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Enable notifications",
+   "tabs.item.enableService" : "Enable service",
+   "tabs.item.reload" : "Reload",
+   "welcome.loginButton" : "Login to your account",
+   "welcome.signupButton" : "Create a free account",
+   "welcome.slogan" : "Messaging that works for you"
+}
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 2863f47e4..d54d7c34e 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,168 +1,192 @@
-{
-  "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Franz",
-  "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
-  "welcome.signupButton": "Créer un compte gratuitement",
-  "welcome.loginButton": "Connectez-vous à votre compte",
-  "welcome.slogan": "Une messagerie qui fonctionne pour vous",
-  "login.headline": "S'inscrire",
-  "login.email.label": "Adresse e-mail",
-  "login.password.label": "Mot de passe",
-  "login.submit.label": "Se connecter",
-  "login.invalidCredentials": "E-mail ou mot de passe invalide",
-  "login.tokenExpired": "Votre session a expiré, veuillez vous reconnecter.",
-  "login.serverLogout": "Votre session a expiré, veuillez vous reconnecter.",
-  "login.link.signup": "Créer un compte gratuitement",
-  "login.link.password": "Réinitialiser le mot de passe",
-  "password.headline": "Réinitialiser le mot de passe",
-  "password.email.label": "Adresse e-mail",
-  "password.submit.label": "Soumettre",
-  "password.noUser": "Aucun utilisateur avec cette adresse e-mail n'a été trouvé",
-  "password.successInfo": "Merci de consulter vos e-mails",
-  "password.link.signup": "Créer un compte gratuitement",
-  "password.link.login": "Connectez-vous à votre compte",
-  "signup.headline": "S'inscrire",
-  "signup.firstname.label": "Prénom",
-  "signup.lastname.label": "Nom",
-  "signup.email.label": "Adresse e-mail",
-  "signup.company.label": "Compagnie",
-  "signup.password.label": "Mot de passe",
-  "signup.submit.label": "Créer un compte",
-  "signup.link.login": "Vous possédez déjà un compte ? Connectez-vous",
-  "signup.emailDuplicate": "Un utilisateur avec cette adresse e-mail existe déjà",
-  "signup.legal.info": "En créant un compte Franz, vous acceptez les",
-  "signup.legal.terms": "Conditions d'utilisation",
-  "signup.legal.privacy": "Déclaration de confidentialité",
-  "pricing.headline": "Supportez Franz",
-  "pricing.support.label": "Sélectionnez votre plan de soutien",
-  "pricing.submit.label": "Je veux soutenir le développement de Franz",
-  "pricing.link.skipPayment": "Je ne veux pas soutenir le développement de Franz.",
-  "import.headline": "Importez vos services depuis Franz 4",
-  "import.notSupportedHeadline": "Services non supportés actuellement dans Franz 5",
-  "import.submit.label": "Importer des services",
-  "import.skip.label": "Je veux ajouter des services manuellement",
-  "invite.submit.label": "Envoyer des invitations",
-  "invite.headline.friends": "Invitez 3 de vos amis ou collègues",
-  "invite.name.label": "Nom",
-  "invite.email.label": "Adresse e-mail",
-  "invite.skip.label": "Je veux faire cela plus tard",
-  "subscription.submit.label": "Je veux soutenir le développement de Franz",
-  "subscription.paymentSessionError": "Impossible d'initialiser le formulaire de paiement",
-  "subscription.includedFeatures": "Le compte payant Supporter Premium Franz inclut",
-  "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
-  "subscription.features.customServices": "Des services privés pour vous et votre équipe",
-  "subscription.features.encryptedSync": "Synchronisation de session chiffrée",
-  "subscription.features.vpn": "Support des Proxy et VPN",
-  "subscription.features.ads": "Aucune publicité !",
-  "subscription.features.comingSoon": "arrive bientôt",
-  "infobar.servicesUpdated": "Vos services ont été mis à jour.",
-  "infobar.updateAvailable": "Une nouvelle mise à jour est disponible pour Franz.",
-  "infobar.buttonReloadServices": "Recharger les services",
-  "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
-  "infobar.requiredRequestsFailed": "Impossible de charger les services et les informations de l'utilisateur",
-  "sidebar.settings": "Paramètres",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Bienvenue sur Franz",
-  "services.getStarted": "Commencer",
-  "settings.account.headline": "Compte",
-  "settings.account.headlineSubscription": "Votre abonnement",
-  "settings.account.headlineUpgrade": "Améliorez votre compte et supportez Franz",
-  "settings.account.headlineInvoices": "Factures",
-  "settings.account.manageSubscription.label": "Gérer votre abonnement",
-  "settings.account.accountType.basic": "Compte basique",
-  "settings.account.accountType.premium": "Compte Supporter Premium",
-  "settings.account.account.editButton": "Modifier le compte",
-  "settings.account.invoiceDownload": "Télécharger",
-  "settings.account.userInfoRequestFailed": "Impossible de charger les informations de l'utilisateur",
-  "settings.account.tryReloadUserInfoRequest": "Réessayer",
-  "settings.account.headlineProfile": "Mettre à jour le profil",
-  "settings.account.headlineAccount": "Informations de compte",
-  "settings.account.headlinePassword": "Changer le mot de passe",
-  "settings.account.successInfo": "Vos modifications ont été enregistrées",
-  "settings.account.buttonSave": "Mettre à jour le profil",
-  "settings.account.mining.thankyou": "Merci de soutenir Franz avec votre puissance de calcul.",
-  "settings.account.mining.active": "Vous êtes en train d'effectuer {hashes} calculs par seconde.",
-  "settings.account.mining.moreInformation": "Obtenir plus d'informations",
-  "settings.account.mining.cancel": "Annuler le minage",
-  "settings.navigation.availableServices": "Services disponibles",
-  "settings.navigation.yourServices": "Vos services",
-  "settings.navigation.account": "Compte",
-  "settings.navigation.settings": "Paramètres",
-  "settings.navigation.logout": "Se déconnecter",
-  "settings.recipes.headline": "Services disponibles",
-  "settings.recipes.mostPopular": "Les plus populaires",
-  "settings.recipes.all": "Tous les services",
-  "settings.recipes.dev": "Développement",
-  "settings.recipes.nothingFound": "Désolé, aucun service ne correspond à votre recherche.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Service ajouté avec succès",
-  "settings.service.form.saveButton": "Enregistrer le service",
-  "settings.service.form.deleteButton": "Supprimer le service",
-  "settings.service.form.availableServices": "Services disponibles",
-  "settings.service.form.yourServices": "Vos services",
-  "settings.service.form.addServiceHeadline": "Ajouter {name}",
-  "settings.service.form.editServiceHeadline": "Modifier {name}",
-  "settings.service.form.tabHosted": "Hébergé",
-  "settings.service.form.tabOnPremise": "Auto-hébergé ⭐️",
-  "settings.service.form.customUrlValidationError": "Impossible de valider le {name} personnalisé du serveur.",
-  "settings.service.form.customUrlPremiumInfo": "Pour ajouter des services auto-hébergés, vous avez besoin d'un compte Supporter Premium Franz.",
-  "settings.service.form.customUrlUpgradeAccount": "Améliorez votre compte",
-  "settings.service.form.indirectMessageInfo": "Vous serez averti de tous les nouveaux messages dans un salon, pas seulement @username, @channel, @here, ...",
-  "settings.service.error.headline": "Erreur",
-  "settings.service.error.goBack": "Retour aux services",
-  "settings.service.error.message": "Could not load service recipe.",
-  "settings.services.tooltip.isDisabled": "Le service est désactivé",
-  "settings.services.tooltip.notificationsDisabled": "Les notifications sont désactivées",
-  "settings.services.headline": "Vos services",
-  "settings.services.noServicesAdded": "Vous n'avez pas encore ajouté de services.",
-  "settings.services.discoverServices": "Découvrir des services",
-  "settings.services.updatedInfo": "Vos modifications ont été enregistrées",
-  "settings.services.deletedInfo": "Le service a été supprimé",
-  "settings.app.headline": "Paramètres",
-  "settings.app.headlineGeneral": "Général",
-  "settings.app.headlineLanguage": "Langue",
-  "settings.app.headlineUpdates": "Mises à jour",
-  "settings.app.buttonSearchForUpdate": "Vérifier les mises à jour",
-  "settings.app.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
-  "settings.app.updateStatusSearching": "Recherche des mises à jour",
-  "settings.app.updateStatusAvailable": "Mise à jour disponible, téléchargement...",
-  "settings.app.updateStatusUpToDate": "Vous utilisez la dernière version de Franz",
-  "settings.app.form.autoLaunchOnStart": "Lancer Franz au démarrage",
-  "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan",
-  "settings.app.form.minimizeToSystemTray": "Minimiser Franz dans la zone de notification",
-  "settings.app.form.runInBackground": "Gardez Franz en arrière-plan lors de la fermeture de la fenêtre",
-  "settings.app.form.language": "Langue",
-  "settings.app.form.beta": "Inclure les versions bêta",
-  "settings.app.currentVersion": "Version actuelle :",
-  "settings.service.form.name": "Nom",
-  "settings.service.form.enableService": "Activer le service",
-  "settings.service.form.enableNotification": "Activer les notifications",
-  "settings.service.form.team": "Équipe",
-  "settings.service.form.customUrl": "Serveur personnalisé",
-  "settings.service.form.indirectMessages": "Afficher le badge des messages pour tous les nouveaux messages",
-  "settings.user.form.firstname": "Prénom",
-  "settings.user.form.lastname": "Nom",
-  "settings.user.form.email": "E-mail",
-  "settings.user.form.currentPassword": "Mot de passe actuel",
-  "settings.user.form.newPassword": "Nouveau mot de passe",
-  "settings.user.form.accountType.label": "Type de compte",
-  "settings.user.form.accountType.individual": "Individuel",
-  "settings.user.form.accountType.non-profit": "Non lucratif",
-  "settings.user.form.accountType.company": "Compagnie",
-  "subscription.type.free": "gratuit",
-  "subscription.type.month": "mois",
-  "subscription.type.year": "année",
-  "subscription.type.mining": "Soutenez Franz avec de la puissance de calcul",
-  "subscription.mining.headline": "Comment cela fonctionne-t-il?",
-  "subscription.mining.experimental": "expérimental",
-  "subscription.mining.line1": "En activant \"Soutenez Franz avec de la puissance de calcul\", Franz utilisera environ de 20 à 50% de votre CPU pour miner la crypto-monnaie Monero, ce qui équivaut à environ 5$/an.",
-  "subscription.mining.line2": "Nous adapterons l'utilisation du processeur en fonction de vos habitudes de travail pour ne pas vider votre batterie et ne pas ralentir votre machine.",
-  "subscription.mining.line3": "Tant que le minage est actif, vous aurez un accès illimité à toutes les fonctionnalités Supporter Premium Franz.",
-  "subscription.mining.moreInformation": "Obtenir plus d'informations.",
-  "subscriptionPopup.buttonCancel": "Annuler",
-  "subscriptionPopup.buttonDone": "Terminé",
-  "tabs.item.reload": "Recharger",
-  "tabs.item.edit": "Modifier",
-  "tabs.item.disableNotifications": "Désactiver les notifications",
-  "tabs.item.enableNotification": "Activer les notifications",
-  "tabs.item.disableService": "Désactiver le service",
-  "tabs.item.deleteService": "Supprimer le service"
+{
+   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
+   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
+   "import.headline" : "Importez vos services depuis Franz 4",
+   "import.notSupportedHeadline" : "Services non supportés actuellement dans Franz 5",
+   "import.skip.label" : "Je veux ajouter des services manuellement",
+   "import.submit.label" : "Importer des services",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
+   "infobar.buttonReloadServices" : "Recharger les services",
+   "infobar.requiredRequestsFailed" : "Impossible de charger les services et les informations de l'utilisateur",
+   "infobar.servicesUpdated" : "Vos services ont été mis à jour.",
+   "infobar.updateAvailable" : "Une nouvelle mise à jour est disponible pour Franz.",
+   "invite.email.label" : "Adresse e-mail",
+   "invite.headline.friends" : "Invitez 3 de vos amis ou collègues",
+   "invite.name.label" : "Nom",
+   "invite.skip.label" : "Je veux faire cela plus tard",
+   "invite.submit.label" : "Envoyer des invitations",
+   "login.email.label" : "Adresse e-mail",
+   "login.headline" : "S'inscrire",
+   "login.invalidCredentials" : "E-mail ou mot de passe invalide",
+   "login.link.password" : "Réinitialiser le mot de passe",
+   "login.link.signup" : "Créer un compte gratuitement",
+   "login.password.label" : "Mot de passe",
+   "login.serverLogout" : "Votre session a expiré, veuillez vous reconnecter.",
+   "login.submit.label" : "Se connecter",
+   "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
+   "password.email.label" : "Adresse e-mail",
+   "password.headline" : "Réinitialiser le mot de passe",
+   "password.link.login" : "Connectez-vous à votre compte",
+   "password.link.signup" : "Créer un compte gratuitement",
+   "password.noUser" : "Aucun utilisateur avec cette adresse e-mail n'a été trouvé",
+   "password.submit.label" : "Soumettre",
+   "password.successInfo" : "Merci de consulter vos e-mails",
+   "pricing.headline" : "Supportez Franz",
+   "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
+   "pricing.submit.label" : "Je veux soutenir le développement de Franz",
+   "pricing.support.label" : "Sélectionnez votre plan de soutien",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Commencer",
+   "services.welcome" : "Bienvenue sur Franz",
+   "settings.account.account.editButton" : "Modifier le compte",
+   "settings.account.accountType.basic" : "Compte basique",
+   "settings.account.accountType.premium" : "Compte Supporter Premium",
+   "settings.account.buttonSave" : "Mettre à jour le profil",
+   "settings.account.headline" : "Compte",
+   "settings.account.headlineAccount" : "Informations de compte",
+   "settings.account.headlineInvoices" : "Factures",
+   "settings.account.headlinePassword" : "Changer le mot de passe",
+   "settings.account.headlineProfile" : "Mettre à jour le profil",
+   "settings.account.headlineSubscription" : "Votre abonnement",
+   "settings.account.headlineUpgrade" : "Améliorez votre compte et supportez Franz",
+   "settings.account.invoiceDownload" : "Télécharger",
+   "settings.account.manageSubscription.label" : "Gérer votre abonnement",
+   "settings.account.mining.active" : "Vous êtes en train d'effectuer {hashes} calculs par seconde.",
+   "settings.account.mining.cancel" : "Annuler le minage",
+   "settings.account.mining.moreInformation" : "Obtenir plus d'informations",
+   "settings.account.mining.thankyou" : "Merci de soutenir Franz avec votre puissance de calcul.",
+   "settings.account.successInfo" : "Vos modifications ont été enregistrées",
+   "settings.account.tryReloadUserInfoRequest" : "Réessayer",
+   "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
+   "settings.app.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
+   "settings.app.buttonSearchForUpdate" : "Vérifier les mises à jour",
+   "settings.app.currentVersion" : "Version actuelle:",
+   "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
+   "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
+   "settings.app.form.beta" : "Inclure les versions bêta",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
+   "settings.app.form.language" : "Langue",
+   "settings.app.form.minimizeToSystemTray" : "Minimiser Franz dans la zone de notification",
+   "settings.app.form.runInBackground" : "Ouvrir en arrière-plan",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Paramètres",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Général",
+   "settings.app.headlineLanguage" : "Langue",
+   "settings.app.headlineUpdates" : "Mises à jour",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Mise à jour disponible, téléchargement...",
+   "settings.app.updateStatusSearching" : "Recherche des mises à jour",
+   "settings.app.updateStatusUpToDate" : "Vous utilisez la dernière version de Franz",
+   "settings.navigation.account" : "Compte",
+   "settings.navigation.availableServices" : "Services disponibles",
+   "settings.navigation.logout" : "Se déconnecter",
+   "settings.navigation.settings" : "Paramètres",
+   "settings.navigation.yourServices" : "Vos services",
+   "settings.recipes.all" : "Tous les services",
+   "settings.recipes.dev" : "Développement",
+   "settings.recipes.headline" : "Services disponibles",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Les plus populaires",
+   "settings.recipes.nothingFound" : "Désolé, aucun service ne correspond à votre recherche.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Service ajouté avec succès",
+   "settings.service.error.goBack" : "Retour aux services",
+   "settings.service.error.headline" : "Erreur",
+   "settings.service.error.message" : "Impossible de charger le service.",
+   "settings.service.form.addServiceHeadline" : "Ajouter {name}",
+   "settings.service.form.availableServices" : "Services disponibles",
+   "settings.service.form.customUrl" : "Serveur personnalisé",
+   "settings.service.form.customUrlPremiumInfo" : "Pour ajouter des services auto-hébergés, vous avez besoin d'un compte Supporter Premium Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Améliorez votre compte",
+   "settings.service.form.customUrlValidationError" : "Impossible de valider le {name} personnalisé du serveur.",
+   "settings.service.form.deleteButton" : "Supprimer le service",
+   "settings.service.form.editServiceHeadline" : "Modifier {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Activer les notifications",
+   "settings.service.form.enableService" : "Activer le service",
+   "settings.service.form.indirectMessageInfo" : "Vous serez averti de tous les nouveaux messages dans un salon, pas seulement @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Nom",
+   "settings.service.form.saveButton" : "Enregistrer le service",
+   "settings.service.form.tabHosted" : "Hébergé",
+   "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
+   "settings.service.form.team" : "Équipe",
+   "settings.service.form.yourServices" : "Vos services",
+   "settings.services.deletedInfo" : "Le service a été supprimé",
+   "settings.services.discoverServices" : "Découvrir des services",
+   "settings.services.headline" : "Vos services",
+   "settings.services.noServicesAdded" : "Vous n'avez pas encore ajouté de services.",
+   "settings.services.tooltip.isDisabled" : "Le service est désactivé",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Les notifications sont désactivées",
+   "settings.services.updatedInfo" : "Vos modifications ont été enregistrées",
+   "settings.user.form.accountType.company" : "Entreprise",
+   "settings.user.form.accountType.individual" : "Individuel",
+   "settings.user.form.accountType.label" : "Type de compte",
+   "settings.user.form.accountType.non-profit" : "Non lucratif",
+   "settings.user.form.currentPassword" : "Mot de passe actuel",
+   "settings.user.form.email" : "E-mail",
+   "settings.user.form.firstname" : "Prénom",
+   "settings.user.form.lastname" : "Nom",
+   "settings.user.form.newPassword" : "Nouveau mot de passe",
+   "sidebar.addNewService" : "Ajouter un nouveau service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Paramètres",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Entreprise",
+   "signup.email.label" : "Adresse e-mail",
+   "signup.emailDuplicate" : "Un utilisateur avec cette adresse e-mail existe déjà",
+   "signup.firstname.label" : "Prénom",
+   "signup.headline" : "S'inscrire",
+   "signup.lastname.label" : "Nom",
+   "signup.legal.info" : "En créant un compte Franz, vous acceptez les",
+   "signup.legal.privacy" : "Déclaration de confidentialité",
+   "signup.legal.terms" : "Conditions d'utilisation",
+   "signup.link.login" : "Vous possédez déjà un compte ? Connectez-vous",
+   "signup.password.label" : "Mot de passe",
+   "signup.submit.label" : "Créer un compte",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Aucune publicité!",
+   "subscription.features.comingSoon" : "arrive bientôt",
+   "subscription.features.customServices" : "Des services privés pour vous et votre équipe",
+   "subscription.features.encryptedSync" : "Synchronisation de session chiffrée",
+   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
+   "subscription.features.vpn" : "Support des Proxy et VPN",
+   "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
+   "subscription.mining.experimental" : "expérimental",
+   "subscription.mining.headline" : "Comment cela fonctionne-t-il?",
+   "subscription.mining.line1" : "En activant \"Soutenez Franz avec de la puissance de calcul\", Franz utilisera environ de 20 à 50% de votre CPU pour miner la crypto-monnaie Monero, ce qui équivaut à environ 5$\/an.",
+   "subscription.mining.line2" : "Nous adapterons l'utilisation du processeur en fonction de vos habitudes de travail pour ne pas vider votre batterie et ne pas ralentir votre machine.",
+   "subscription.mining.line3" : "Tant que le minage est actif, vous aurez un accès illimité à toutes les fonctionnalités Supporter Premium Franz.",
+   "subscription.mining.moreInformation" : "Obtenir plus d'informations.",
+   "subscription.paymentSessionError" : "Impossible d'initialiser le formulaire de paiement",
+   "subscription.submit.label" : "Je veux soutenir le développement de Franz",
+   "subscription.type.free" : "gratuit",
+   "subscription.type.mining" : "Soutenez Franz avec de la puissance de calcul",
+   "subscription.type.month" : "mois",
+   "subscription.type.year" : "année",
+   "subscriptionPopup.buttonCancel" : "Annuler",
+   "subscriptionPopup.buttonDone" : "Terminé",
+   "tabs.item.deleteService" : "Supprimer le service",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Désactiver les notifications",
+   "tabs.item.disableService" : "Désactiver le service",
+   "tabs.item.edit" : "Modifier",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Activer les notifications",
+   "tabs.item.enableService" : "Activer le service",
+   "tabs.item.reload" : "Recharger",
+   "welcome.loginButton" : "Connectez-vous à votre compte",
+   "welcome.signupButton" : "Créer un compte gratuitement",
+   "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
new file mode 100644
index 000000000..63816cf65
--- /dev/null
+++ b/src/i18n/locales/ga.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Ní fhéadfar nascadh le seirbhísí arlíne Franz",
+   "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
+   "import.headline" : "Iompórtáil do chuid seirbhísí Franz 4",
+   "import.notSupportedHeadline" : "Níl na seirbhísí seo taca i Franz 5 go fóill",
+   "import.skip.label" : "Ba mhaith liom seirbhísí a chur leis de láimh",
+   "import.submit.label" : "Iomportaigh seirbhísí",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Atosaigh & suiteáil nuashonrú",
+   "infobar.buttonReloadServices" : "Athlódáil seirbhísí",
+   "infobar.requiredRequestsFailed" : "Ní fhéadfar seirbhísí agus eolas úsáideora a lódáil",
+   "infobar.servicesUpdated" : "Nuashonraítear do chuid seirbhísí.",
+   "infobar.updateAvailable" : "Tá nuashonrú nua do Franz le fáil.",
+   "invite.email.label" : "Seoladh ríomhphoist",
+   "invite.headline.friends" : "Tabhair cuireadh do thriúr de do chairde nó chomhghleacaithe",
+   "invite.name.label" : "Ainm",
+   "invite.skip.label" : "Ba mhaith liom é seo a dhéanamh níos deireanaí",
+   "invite.submit.label" : "Seol cuireadh",
+   "login.email.label" : "Seoladh ríomhphoist",
+   "login.headline" : "Logáil isteach",
+   "login.invalidCredentials" : "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
+   "login.link.password" : "Athshocraigh pasfhocal",
+   "login.link.signup" : "Cruthaigh cuntas saor in aisce",
+   "login.password.label" : "Pasfhocal",
+   "login.serverLogout" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
+   "login.submit.label" : "Logáil isteach",
+   "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
+   "password.email.label" : "Seoladh ríomhphoist",
+   "password.headline" : "Athshocraigh pasfhocal",
+   "password.link.login" : "Logáil isteach i do chúntas",
+   "password.link.signup" : "Cruthaigh cuntas saor in aisce",
+   "password.noUser" : "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
+   "password.submit.label" : "Cuir isteach",
+   "password.successInfo" : "Seiceáil do chuid ríomhphoist, le do thoil",
+   "pricing.headline" : "Tabhair tacaíocht do Franz",
+   "pricing.link.skipPayment" : "Ní mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
+   "pricing.submit.label" : "Ba maith liom tacaíocht a thabhairt d'fhorbairt Franz.",
+   "pricing.support.label" : "Roghnaigh do phlean tacaíochta",
+   "service.crashHandler.action" : "Athlódáil {name}",
+   "service.crashHandler.autoReload" : "Ag baint triail {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
+   "service.crashHandler.headline" : "Ó, ná habair!",
+   "service.crashHandler.text" : "Tá {name} tar éis earraid a dhéanamh.",
+   "service.disabledHandler.action" : "Cumasaigh {name}",
+   "service.disabledHandler.headline" : "Tá {name} díchumasaithe",
+   "services.getStarted" : "Tosaigh",
+   "services.welcome" : "Fáilte go Franz",
+   "settings.account.account.editButton" : "Cuir cuntas in eagar",
+   "settings.account.accountType.basic" : "Bunchuntas",
+   "settings.account.accountType.premium" : "Cuntas Phŕeimhtacadóra Franz",
+   "settings.account.buttonSave" : "Nuashonraigh próifíl",
+   "settings.account.headline" : "Cuntas",
+   "settings.account.headlineAccount" : "Eolas an chuntais",
+   "settings.account.headlineInvoices" : "Sonraisc",
+   "settings.account.headlinePassword" : "Athraigh pasfhocal",
+   "settings.account.headlineProfile" : "Nuashonraigh próifíl",
+   "settings.account.headlineSubscription" : "Do shintiús",
+   "settings.account.headlineUpgrade" : "Uasghrádaigh do chuntas chun tacaíocht a thabhairt do Franz",
+   "settings.account.invoiceDownload" : "Íoslódáil",
+   "settings.account.manageSubscription.label" : "Bainistigh do shintiús",
+   "settings.account.mining.active" : "Tá tú ag déanamh {hashes} áireamh in aghaidh an soicind anois.",
+   "settings.account.mining.cancel" : "Cuir an mhíneáil ar ceal",
+   "settings.account.mining.moreInformation" : "Faigh tuilleadh eolais",
+   "settings.account.mining.thankyou" : "Go raibh maith agat as ucht tacaíocht a thabhairt go Franz le do chumhacht phróiseála.",
+   "settings.account.successInfo" : "Sábhailtear do chuid athruithe",
+   "settings.account.tryReloadUserInfoRequest" : "Atriail",
+   "settings.account.userInfoRequestFailed" : "Ní fheadfar eolas úsáideora a lódáil",
+   "settings.app.buttonInstallUpdate" : "Atosaigh & suiteáil nuashonrú",
+   "settings.app.buttonSearchForUpdate" : "Seiceáil do nuashonruithe",
+   "settings.app.currentVersion" : "Leagan reatha:",
+   "settings.app.form.autoLaunchInBackground" : "Oscail sa chúlra",
+   "settings.app.form.autoLaunchOnStart" : "Láinseáil Franz ón tús",
+   "settings.app.form.beta" : "Cuir leagain béite san áireamh",
+   "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
+   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtrae an chórais",
+   "settings.app.form.language" : "Teanga",
+   "settings.app.form.minimizeToSystemTray" : "Íoslaghdaigh Franz go dtí trae an chórais",
+   "settings.app.form.runInBackground" : "Cóimeád Franz sa chúlra agus an fhuinneog a dhúnadh",
+   "settings.app.form.showDisabledServices" : "Taispeáin tabanna do sheirbhísí díchumasaithe",
+   "settings.app.headline" : "Socruithe",
+   "settings.app.headlineAdvanced" : "Casta",
+   "settings.app.headlineAppearance" : "Dealramh",
+   "settings.app.headlineGeneral" : "Ginearálta",
+   "settings.app.headlineLanguage" : "Teanga",
+   "settings.app.headlineUpdates" : "Nuashonruithe",
+   "settings.app.restartRequired" : "Ní gá tosú arís chun athruithe a chur i bhfeidhm",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Nuashonrú le fáil, ag íoslódáil",
+   "settings.app.updateStatusSearching" : "Ag cuardú le haghaidh nuashonrú",
+   "settings.app.updateStatusUpToDate" : "Tá tú ag baint úsáid as an leagn is deireanaí de Franz",
+   "settings.navigation.account" : "Cuntas",
+   "settings.navigation.availableServices" : "Seirbhísí le fáil",
+   "settings.navigation.logout" : "Logáil amach",
+   "settings.navigation.settings" : "Socruithe",
+   "settings.navigation.yourServices" : "Do chuid seirbhísí",
+   "settings.recipes.all" : "Gach seirbhís",
+   "settings.recipes.dev" : "Forbairt",
+   "settings.recipes.headline" : "Seirbhísí le fáil",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Is coitianta",
+   "settings.recipes.nothingFound" : "Tá brón orm, ach níl seirbhís ar bith ag teacht le do théarma chuardach.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Seirbhís curtha leis go ráthúil",
+   "settings.service.error.goBack" : "Ar ais go dtí seirbhísí",
+   "settings.service.error.headline" : "Earraid",
+   "settings.service.error.message" : "Ní fhéadfar oideas seirbhíse a lódáil.",
+   "settings.service.form.addServiceHeadline" : "Cuir {name} leis",
+   "settings.service.form.availableServices" : "Seirbhísí le fáil",
+   "settings.service.form.customUrl" : "Freastalaí saincheaptha",
+   "settings.service.form.customUrlPremiumInfo" : "Chun seirbhísí féinóstáilte a chur leis, ní gá Cuntas Phŕeimhtacadóra Franz a bheith agat.",
+   "settings.service.form.customUrlUpgradeAccount" : "Uasghrádaigh do chuntas",
+   "settings.service.form.customUrlValidationError" : "Ní fhéadfar seirbhís {name} saincheaptha a dheimhniú",
+   "settings.service.form.deleteButton" : "Scrios seirbhís",
+   "settings.service.form.editServiceHeadline" : "Cuir {name} in eagar",
+   "settings.service.form.enableAudio" : "Cumasaigh fuaim",
+   "settings.service.form.enableNotification" : "Cumasaigh fógraí",
+   "settings.service.form.enableService" : "Cumasaigh seirbhís",
+   "settings.service.form.indirectMessageInfo" : "Fógraítear thú faoi gach teachtaireacht nua i gcainéail, ní amháin @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Taispeáin comhartha theachtaireachta do theachtaireachtaí nua",
+   "settings.service.form.isMutedInfo" : "Nuair a dhíchumasaítear é seo, tachtar gach fuaim fógraí agus athchasadh fuaime",
+   "settings.service.form.name" : "Ainm",
+   "settings.service.form.saveButton" : "Sábhail seirbhís",
+   "settings.service.form.tabHosted" : "Óstáilte",
+   "settings.service.form.tabOnPremise" : "Féinóstáilte ⭐️",
+   "settings.service.form.team" : "Meitheal",
+   "settings.service.form.yourServices" : "Do chuid seirbhísí",
+   "settings.services.deletedInfo" : "Seirbhís scriosta",
+   "settings.services.discoverServices" : "Aimsigh seirbhísí",
+   "settings.services.headline" : "Do chuid seirbhísí",
+   "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat fós.",
+   "settings.services.tooltip.isDisabled" : "Seirbhís díchumasaithe",
+   "settings.services.tooltip.isMuted" : "Gach fuaim tachta",
+   "settings.services.tooltip.notificationsDisabled" : "Fógraí díchumasaithe",
+   "settings.services.updatedInfo" : "Sábháiltear do chuid athruithe",
+   "settings.user.form.accountType.company" : "Comhlacht",
+   "settings.user.form.accountType.individual" : "Aonair",
+   "settings.user.form.accountType.label" : "Cineál cuntais",
+   "settings.user.form.accountType.non-profit" : "Neamhbhrabúis",
+   "settings.user.form.currentPassword" : "Pasfhocal reatha",
+   "settings.user.form.email" : "Ríomhphost",
+   "settings.user.form.firstname" : "Céadainm",
+   "settings.user.form.lastname" : "Sloinne",
+   "settings.user.form.newPassword" : "Pasfhocal nua",
+   "sidebar.addNewService" : "Cuir seirbhís nua leis",
+   "sidebar.mute" : "Díchumasaigh fuaim",
+   "sidebar.settings" : "Socruithe",
+   "sidebar.unmute" : "Cumasaigh fuaim",
+   "signup.company.label" : "Comhlacht",
+   "signup.email.label" : "Seoladh ríomhphoist",
+   "signup.emailDuplicate" : "Tá úsáideoir leis an seoladh ríomhphoist sin chean féin",
+   "signup.firstname.label" : "Céadainm",
+   "signup.headline" : "Cláraigh",
+   "signup.lastname.label" : "Sloinne",
+   "signup.legal.info" : "Agus tú ag cruthú cuntais Franz glacann tú leis an",
+   "signup.legal.privacy" : "Ráiteas príobháideachais",
+   "signup.legal.terms" : "Tearmaí seirbhíse",
+   "signup.link.login" : "Cuntas agat cheana féin, logáil isteach?",
+   "signup.password.label" : "Pasfhocal",
+   "signup.submit.label" : "Cruthaigh cuntas",
+   "subscription.euTaxInfo" : "Áithritheoirí an tAÉ: féadfar cáin díolacháin áitiúla a chur i bhfeidhm",
+   "subscription.features.ads" : "Fógraí ar bith, choíche!",
+   "subscription.features.comingSoon" : "ag teacht go luath",
+   "subscription.features.customServices" : "Seirbhísí phríobháideach duitse agus do do mheitheal",
+   "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
+   "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
+   "subscription.features.vpn" : "Tacaíocht seachfhreastalaí & LPF",
+   "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhtacadóra Franz san áireamh",
+   "subscription.mining.experimental" : "turgnamhach",
+   "subscription.mining.headline" : "Conas a oibríonn sé seo?",
+   "subscription.mining.line1" : "Tar éis chur \"Tabhair tacaíocht le cumhacht phŕóiseála\" ar chumas, bainfidh Franz úsáid as thart ar 20-50\\% de do lárionad próiseála chun an airgeadra digiteach Monero a mhíneáil, a chothromaíonn $5 sa bhliain.",
+   "subscription.mining.line2" : "Cuirimid úsáid an láríonaid próiseála in oiriúint do d'iompar oibre ionas nach mbeidh do cheallra caite agus tú agus do ríomhaire moillithe.",
+   "subscription.mining.line3" : "Fad is go bhfuil an mhianadóir gníomhach, beidh rochtain gan teorainn agat do Phŕeimhghnéithe Taca Franz.",
+   "subscription.mining.moreInformation" : "Faigh tuilleadh eolais faoin bplean seo.",
+   "subscription.paymentSessionError" : "Ní fhéadfar tús a chur leis an bhfoirm íocaíochta",
+   "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
+   "subscription.type.free" : "saor in aisce",
+   "subscription.type.mining" : "Tabhair tacaíocht do Franz le cumhacht phróiseála",
+   "subscription.type.month" : "mí",
+   "subscription.type.year" : "bliain",
+   "subscriptionPopup.buttonCancel" : "Cuir ar ceal",
+   "subscriptionPopup.buttonDone" : "Déanta",
+   "tabs.item.deleteService" : "Scrios seirbhís",
+   "tabs.item.disableAudio" : "Díchumasaigh fuaim",
+   "tabs.item.disableNotifications" : "Díchumasaigh fógraí",
+   "tabs.item.disableService" : "Díchumasaigh seirbhís",
+   "tabs.item.edit" : "Cuir in eagar",
+   "tabs.item.enableAudio" : "Cumasaigh fuaim",
+   "tabs.item.enableNotification" : "Cumasaigh fógraí",
+   "tabs.item.enableService" : "Cumasaigh seirbhís",
+   "tabs.item.reload" : "Athlódáil",
+   "welcome.loginButton" : "Logáil isteach i do chuntas",
+   "welcome.signupButton" : "Cruthaigh cuntas nua",
+   "welcome.slogan" : "Teachtaireachtaí ag obair leat"
+}
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
new file mode 100644
index 000000000..f62c0ead9
--- /dev/null
+++ b/src/i18n/locales/hu.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatásaihoz",
+   "global.notConnectedToTheInternet" : "Nincs kapcsolat a kiszolgálóval.",
+   "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
+   "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
+   "import.skip.label" : "Kézzel szeretnék szolgáltatást felvenni",
+   "import.submit.label" : "Szolgáltatások importálása",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Újraindítás és a frissítés telepítése",
+   "infobar.buttonReloadServices" : "Szolgáltatások újratöltése",
+   "infobar.requiredRequestsFailed" : "Szolgáltatások és felhasználói információk nem tölthetők be",
+   "infobar.servicesUpdated" : "A szolgáltatások frissítésre kerültek.",
+   "infobar.updateAvailable" : "Új frissítés érhető el a Franz-hoz.",
+   "invite.email.label" : "Email cím",
+   "invite.headline.friends" : "Hívd meg 3 barátodat vagy kollégádat",
+   "invite.name.label" : "Név",
+   "invite.skip.label" : "Későbbre halasztom",
+   "invite.submit.label" : "Meghívók küldése",
+   "login.email.label" : "Email cím",
+   "login.headline" : "Bejelentkezés",
+   "login.invalidCredentials" : "Hibás email cím vagy jelszó",
+   "login.link.password" : "Jelszó visszaállítás",
+   "login.link.signup" : "Új fiók létrehozása",
+   "login.password.label" : "Jelszó",
+   "login.serverLogout" : "A munkamenet lejárt, kérlek lépj be újra.",
+   "login.submit.label" : "Bejelentkezés",
+   "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
+   "password.email.label" : "Email cím",
+   "password.headline" : "Jelszó visszaállítása",
+   "password.link.login" : "Jelentkezz be a fiókodba",
+   "password.link.signup" : "Új fiók létrehozása",
+   "password.noUser" : "Nem található felhasználó a megadott email címmel",
+   "password.submit.label" : "Küldés",
+   "password.successInfo" : "Ellenőrizd az email fiókodat",
+   "pricing.headline" : "Támogasd a Franz-ot",
+   "pricing.link.skipPayment" : "Nem szeretném támogatni a Franz fejlesztését.",
+   "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését.",
+   "pricing.support.label" : "Válaszd ki a támogatás módját",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Kezdj hozzá",
+   "services.welcome" : "Üdvözöl a Franz",
+   "settings.account.account.editButton" : "Fiók szerkesztése",
+   "settings.account.accountType.basic" : "Alap Fiók",
+   "settings.account.accountType.premium" : "Prémium Támogató Fiók",
+   "settings.account.buttonSave" : "Profil frissítése",
+   "settings.account.headline" : "Fiók",
+   "settings.account.headlineAccount" : "Fiókinformációk",
+   "settings.account.headlineInvoices" : "Számlák",
+   "settings.account.headlinePassword" : "Jelszócsere",
+   "settings.account.headlineProfile" : "Profil frissítése",
+   "settings.account.headlineSubscription" : "Előfizetésed",
+   "settings.account.headlineUpgrade" : "Frissítsd fiókod és támogasd a Franz-ot",
+   "settings.account.invoiceDownload" : "Letöltés",
+   "settings.account.manageSubscription.label" : "Előfizetés kezelése",
+   "settings.account.mining.active" : "Jelenleg {hashes} számítást végzel másodpercenként.",
+   "settings.account.mining.cancel" : "Bányászás megszakítása",
+   "settings.account.mining.moreInformation" : "Több információ",
+   "settings.account.mining.thankyou" : "Köszönjük, hogy számítási kapacitásoddal támogatod a Franz-ot.",
+   "settings.account.successInfo" : "A módosításokat elmentettük",
+   "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
+   "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
+   "settings.app.buttonInstallUpdate" : "Újraindítás és frissítések telepítése",
+   "settings.app.buttonSearchForUpdate" : "Frissítések keresése",
+   "settings.app.currentVersion" : "Aktuális verzió:",
+   "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
+   "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
+   "settings.app.form.beta" : "Béta verziók keresése",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
+   "settings.app.form.language" : "Nyelv",
+   "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
+   "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Beállítások",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Általános",
+   "settings.app.headlineLanguage" : "Nyelv",
+   "settings.app.headlineUpdates" : "Frissítések",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
+   "settings.app.updateStatusSearching" : "Frissítéseket keres",
+   "settings.app.updateStatusUpToDate" : "A Franz legfrissebb verzióját használod",
+   "settings.navigation.account" : "Fiók",
+   "settings.navigation.availableServices" : "Elérhető szolgáltatások",
+   "settings.navigation.logout" : "Kijelentkezés",
+   "settings.navigation.settings" : "Beállítások",
+   "settings.navigation.yourServices" : "Szolgáltatásaid",
+   "settings.recipes.all" : "Összes szolgáltatás",
+   "settings.recipes.dev" : "Fejlesztés",
+   "settings.recipes.headline" : "Elérhető szolgáltatások",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Legnépszerűbb",
+   "settings.recipes.nothingFound" : "Sajnáljuk, nincs egyezés a szolgáltatások között a keresett kifejezésre.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva.",
+   "settings.service.error.goBack" : "Vissza a szolgáltatásokhoz",
+   "settings.service.error.headline" : "Hiba",
+   "settings.service.error.message" : "Nem tölthető be a szolgáltatás receptje.",
+   "settings.service.form.addServiceHeadline" : "{name} hozzáadása",
+   "settings.service.form.availableServices" : "Elérhető szolgáltatások",
+   "settings.service.form.customUrl" : "Egyéni szerver",
+   "settings.service.form.customUrlPremiumInfo" : "Egyénileg üzemeltetett szolgáltatások hozzáadásához Franz Prémium Támogató Fiók szükséges.",
+   "settings.service.form.customUrlUpgradeAccount" : "Frissítsd fiókodat",
+   "settings.service.form.customUrlValidationError" : "Nem sikerült hitelesíteni az egyéni {name} szervert.",
+   "settings.service.form.deleteButton" : "Szolgáltatás törlése",
+   "settings.service.form.editServiceHeadline" : "{name} szerkesztése",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Értesítések engedélyezése",
+   "settings.service.form.enableService" : "Szolgáltatás engedélyezése",
+   "settings.service.form.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna @here és egyéb említések esetén",
+   "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Név",
+   "settings.service.form.saveButton" : "Szolgáltatás mentése",
+   "settings.service.form.tabHosted" : "Üzemeltetett",
+   "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
+   "settings.service.form.team" : "Csapat",
+   "settings.service.form.yourServices" : "Szolgáltatásaid",
+   "settings.services.deletedInfo" : "A szolgáltatás törlésre került",
+   "settings.services.discoverServices" : "Szolgáltatások felfedezése",
+   "settings.services.headline" : "Szolgáltatásaid",
+   "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.",
+   "settings.services.tooltip.isDisabled" : "Ez a szolgáltatás le van tiltva.",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
+   "settings.services.updatedInfo" : "A módosításokat elmentettük",
+   "settings.user.form.accountType.company" : "Cég",
+   "settings.user.form.accountType.individual" : "Egyén",
+   "settings.user.form.accountType.label" : "Fiók típusa",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Jelenlegi jelszó",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "Új jelszó",
+   "sidebar.addNewService" : "Szolgáltatás hozzáadása",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Beállítások",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Cég",
+   "signup.email.label" : "Email cím",
+   "signup.emailDuplicate" : "Ezzel az e-mail címmel már létezik felhasználó",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Regisztráció",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "A Franz fiók létrehozásával elfogadod az",
+   "signup.legal.privacy" : "Adatvédelmi Nyilatkozatot",
+   "signup.legal.terms" : "Felhasználási Feltételeket",
+   "signup.link.login" : "Már van fiókod? Lépj be!",
+   "signup.password.label" : "Jelszó",
+   "signup.submit.label" : "Fiók létrehozása",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Hirdetésmentes, mindig!",
+   "subscription.features.comingSoon" : "Hamarosan!",
+   "subscription.features.customServices" : "Privát szolgáltatások neked és a csapatodnak",
+   "subscription.features.encryptedSync" : "Titkosított munkamenet szinkronizálás",
+   "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
+   "subscription.features.vpn" : "Proxy & VPN támogatás",
+   "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
+   "subscription.mining.experimental" : "kísérleti",
+   "subscription.mining.headline" : "Hogyan működik?",
+   "subscription.mining.line1" : "A \"Franz támogatása számítási kapacitással\" opció bekapcsolásával a Franz a CPU teljesítményének 20-50%-át Monero kriptovaluta bányászatához fogja használni, ami évente $5-nak felel meg.",
+   "subscription.mining.line2" : "Alkalmazkodni fog a CPU használat a munkafolyamataidhoz, igyekszik nem terhelni az akkumulátort és lassítani a gépet.",
+   "subscription.mining.line3" : "Amíg a bányász aktív, korlátlan hozzáférésed van minden Franz Prémium Támogató Funkcióhoz.",
+   "subscription.mining.moreInformation" : "Több információ erről az opcióról.",
+   "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
+   "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
+   "subscription.type.free" : "ingyenes",
+   "subscription.type.mining" : "Franz támogatása számítási kapacitással",
+   "subscription.type.month" : "hónap",
+   "subscription.type.year" : "év",
+   "subscriptionPopup.buttonCancel" : "Mégsem",
+   "subscriptionPopup.buttonDone" : "Kész",
+   "tabs.item.deleteService" : "Szolgáltatás törlése",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Értesítések letiltása",
+   "tabs.item.disableService" : "Szolgáltatás letiltása",
+   "tabs.item.edit" : "Szerkesztés",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Értesítések engedélyezése",
+   "tabs.item.enableService" : "Szolgáltatás engedélyezése",
+   "tabs.item.reload" : "Újratöltés",
+   "welcome.loginButton" : "Jelentkezz be a fiókodba",
+   "welcome.signupButton" : "Új fiók létrehozása",
+   "welcome.slogan" : "Üzenetküldés okosan"
+}
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
new file mode 100644
index 000000000..611cad550
--- /dev/null
+++ b/src/i18n/locales/id.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Tidak bisa tersambung ke layanan Franz",
+   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
+   "import.headline" : "Impor layanan Franz 4 Anda",
+   "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
+   "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
+   "import.submit.label" : "Impor layanan",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
+   "infobar.buttonReloadServices" : "Muat ulang layanan",
+   "infobar.requiredRequestsFailed" : "Tidak bisa memuat layanan dan informasi pengguna",
+   "infobar.servicesUpdated" : "Layanan Anda telah diperbarui",
+   "infobar.updateAvailable" : "Versi baru Franz tersedia.",
+   "invite.email.label" : "Alamat email",
+   "invite.headline.friends" : "Undang 3 teman atau kolega Anda",
+   "invite.name.label" : "Nama",
+   "invite.skip.label" : "Saya ingin melakukannya nanti saja",
+   "invite.submit.label" : "Kirim undangan",
+   "login.email.label" : "Alamat email",
+   "login.headline" : "Masuk",
+   "login.invalidCredentials" : "Email atau sandi tidak valid",
+   "login.link.password" : "Setel ulang sandi",
+   "login.link.signup" : "Buat akun gratis",
+   "login.password.label" : "Sandi",
+   "login.serverLogout" : "Sesi Anda kedaluwarsa, silakan masuk kembali.",
+   "login.submit.label" : "Masuk",
+   "login.tokenExpired" : "Sesi Anda kedaluwarsa, silakan masuk kembali.",
+   "password.email.label" : "Alamat email",
+   "password.headline" : "Setel ulang sandi",
+   "password.link.login" : "Masuk ke akun Anda",
+   "password.link.signup" : "Buat akun gratis",
+   "password.noUser" : "Tidak ditemukan pengguna dengan email tersebut",
+   "password.submit.label" : "Kirim",
+   "password.successInfo" : "Periksa email Anda",
+   "pricing.headline" : "Dukung Franz",
+   "pricing.link.skipPayment" : "Saya tidak ingin mendukung pengembangan Franz.",
+   "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
+   "pricing.support.label" : "Pilih paket dukungan Anda",
+   "service.crashHandler.action" : "Muat Ulang {name}",
+   "service.crashHandler.autoReload" : "Mencoba memulihkan {name}  secara otomatis dalam {seconds} detik",
+   "service.crashHandler.headline" : "Ya Ampun!",
+   "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
+   "service.disabledHandler.action" : "Aktifkan {name}",
+   "service.disabledHandler.headline" : "{name} dinonaktifkan",
+   "services.getStarted" : "Memulai",
+   "services.welcome" : "Selamat datang di Franz",
+   "settings.account.account.editButton" : "Edit akun",
+   "settings.account.accountType.basic" : "Akun Dasar",
+   "settings.account.accountType.premium" : "Akun Pendukung Premium",
+   "settings.account.buttonSave" : "Perbarui profil",
+   "settings.account.headline" : "Akun",
+   "settings.account.headlineAccount" : "Informasi akun",
+   "settings.account.headlineInvoices" : "Tagihan",
+   "settings.account.headlinePassword" : "Ubah sandi",
+   "settings.account.headlineProfile" : "Perbarui profil",
+   "settings.account.headlineSubscription" : "Langganan Anda",
+   "settings.account.headlineUpgrade" : "Tingkatkan akun Anda & dukung Franz",
+   "settings.account.invoiceDownload" : "Unduh",
+   "settings.account.manageSubscription.label" : "Kelola langganan Anda",
+   "settings.account.mining.active" : "Anda sedang melakukan menjalankan {hashes} perhitungan per detik.",
+   "settings.account.mining.cancel" : "Batalkan penambangan",
+   "settings.account.mining.moreInformation" : "Dapatkan informasi lebih lanjut",
+   "settings.account.mining.thankyou" : "Terima kasih telah mendukung Franz dengan daya pemrosesan Anda.",
+   "settings.account.successInfo" : "Perubahan Anda telah disimpan",
+   "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
+   "settings.account.userInfoRequestFailed" : "Tidak bisa memuat informasi pengguna",
+   "settings.app.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
+   "settings.app.buttonSearchForUpdate" : "Periksa versi baru",
+   "settings.app.currentVersion" : "Versi saat ini:",
+   "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
+   "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
+   "settings.app.form.beta" : "Sertakan versi beta",
+   "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
+   "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
+   "settings.app.form.language" : "Bahasa",
+   "settings.app.form.minimizeToSystemTray" : "Perkecil Franz ke baki sistem",
+   "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
+   "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
+   "settings.app.headline" : "Pengaturan",
+   "settings.app.headlineAdvanced" : "Tingkat Lanjut",
+   "settings.app.headlineAppearance" : "Tampilan",
+   "settings.app.headlineGeneral" : "Umum",
+   "settings.app.headlineLanguage" : "Bahasa",
+   "settings.app.headlineUpdates" : "Versi Baru",
+   "settings.app.restartRequired" : "Perubahan membutuhkan mulai ulang",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Versi baru tersedia, mengunduh...",
+   "settings.app.updateStatusSearching" : "Sedang mencari versi baru",
+   "settings.app.updateStatusUpToDate" : "Anda sedang menggunakan versi terbaru Franz",
+   "settings.navigation.account" : "Akun",
+   "settings.navigation.availableServices" : "Layanan tersedia",
+   "settings.navigation.logout" : "Keluar",
+   "settings.navigation.settings" : "Pengaturan",
+   "settings.navigation.yourServices" : "Layanan Anda",
+   "settings.recipes.all" : "Semua layanan",
+   "settings.recipes.dev" : "Pengembangan",
+   "settings.recipes.headline" : "Layanan tersedia",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Paling populer",
+   "settings.recipes.nothingFound" : "Maaf, tidak ada layanan yang cocok dengan pencarian Anda.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Layanan berhasil ditambahkan",
+   "settings.service.error.goBack" : "Kembali ke layanan",
+   "settings.service.error.headline" : "Kesalahan",
+   "settings.service.error.message" : "Tidak dapat memuat konfigurasi layanan.",
+   "settings.service.form.addServiceHeadline" : "Tambahkan {name}",
+   "settings.service.form.availableServices" : "Layanan tersedia",
+   "settings.service.form.customUrl" : "Server khusus",
+   "settings.service.form.customUrlPremiumInfo" : "Untuk menambahkan layanan yang dijalankan mandiri, Anda membutuhkan Franz Premium Supporter Account.",
+   "settings.service.form.customUrlUpgradeAccount" : "Tingkatkan akun Anda",
+   "settings.service.form.customUrlValidationError" : "Tidak bisa memvalidasi server {name} khusus.",
+   "settings.service.form.deleteButton" : "Hapus layanan",
+   "settings.service.form.editServiceHeadline" : "Edit {name}",
+   "settings.service.form.enableAudio" : "Aktifkan audio",
+   "settings.service.form.enableNotification" : "Aktifkan pemberitahuan",
+   "settings.service.form.enableService" : "Aktifkan layanan",
+   "settings.service.form.indirectMessageInfo" : "Anda akan diberi tahu tentang semua pesan dalam kanal, bukan hanya @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan",
+   "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara notifikasi dan pemutaran audio akan dibisukan",
+   "settings.service.form.name" : "Nama",
+   "settings.service.form.saveButton" : "Simpan layanan",
+   "settings.service.form.tabHosted" : "Hosted",
+   "settings.service.form.tabOnPremise" : "Hosted mandiri",
+   "settings.service.form.team" : "Tim",
+   "settings.service.form.yourServices" : "Layanan Anda",
+   "settings.services.deletedInfo" : "Layanan telah dihapus",
+   "settings.services.discoverServices" : "Temukan layanan",
+   "settings.services.headline" : "Layanan Anda",
+   "settings.services.noServicesAdded" : "Anda belum menambahkan layanan.",
+   "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan",
+   "settings.services.tooltip.isMuted" : "Semua suara dibisukan",
+   "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan",
+   "settings.services.updatedInfo" : "Perubahan telah disimpan",
+   "settings.user.form.accountType.company" : "Perusahaan",
+   "settings.user.form.accountType.individual" : "Pribadi",
+   "settings.user.form.accountType.label" : "Jenis akun",
+   "settings.user.form.accountType.non-profit" : "Nirlaba",
+   "settings.user.form.currentPassword" : "Sandi saat ini",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "Nama Depan",
+   "settings.user.form.lastname" : "Nama Belakang",
+   "settings.user.form.newPassword" : "Sandi baru",
+   "sidebar.addNewService" : "Tambahkan layanan baru",
+   "sidebar.mute" : "Nonaktifkan audio",
+   "sidebar.settings" : "Pengaturan",
+   "sidebar.unmute" : "Aktifkan audio",
+   "signup.company.label" : "Perusahaan",
+   "signup.email.label" : "Alamat email",
+   "signup.emailDuplicate" : "Pengguna dengan alamat email ini sudah ada",
+   "signup.firstname.label" : "Nama Depan",
+   "signup.headline" : "Daftar",
+   "signup.lastname.label" : "Nama Akhir",
+   "signup.legal.info" : "Dengan membuat akun Franz, Anda menyetujui",
+   "signup.legal.privacy" : "Pernyataan Privasi",
+   "signup.legal.terms" : "Ketentuan layanan",
+   "signup.link.login" : "Sudah punya akun, masuk?",
+   "signup.password.label" : "Sandi",
+   "signup.submit.label" : "Buat akun",
+   "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku",
+   "subscription.features.ads" : "Tanpa iklan, selamanya!",
+   "subscription.features.comingSoon" : "segera hadir",
+   "subscription.features.customServices" : "Layanan pribadi untuk Anda dan tim Anda",
+   "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
+   "subscription.features.onpremise" : "Layanan add-on premise\/hosten seperti HipChat",
+   "subscription.features.vpn" : "Dukungan proxy & VPN",
+   "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
+   "subscription.mining.experimental" : "eksperimental",
+   "subscription.mining.headline" : "Bagaimana cara kerjanya?",
+   "subscription.mining.line1" : "Dengan mengaktifkan \"Dukung dengan daya pemrosesan\", Franz akan menggunakan 20%-50% kemampuan CPU Anda untuk menambang mata uang kripto Monero yang sepadan kira-kira $5\/tahun.",
+   "subscription.mining.line2" : "Kami akan menyesuaikan penggunaan CPU berdasarkan perilaku penggunaan komputer Anda agar tidak menghabiskan baterau dan memperlambat Anda dan pekerjaan Anda.",
+   "subscription.mining.line3" : "Selama penambang aktif Anda akan memiliki akses tak terbatas ke Franz Premium Supporter Features.",
+   "subscription.mining.moreInformation" : "Dapatkan informasi lebih lanjut tentang paket ini.",
+   "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
+   "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
+   "subscription.type.free" : "gratis",
+   "subscription.type.mining" : "Dukung Franz dengan daya pemrosesan",
+   "subscription.type.month" : "bulan",
+   "subscription.type.year" : "tahun",
+   "subscriptionPopup.buttonCancel" : "Batalkan",
+   "subscriptionPopup.buttonDone" : "Selesai",
+   "tabs.item.deleteService" : "Hapus layanan",
+   "tabs.item.disableAudio" : "Nonaktifkan audio",
+   "tabs.item.disableNotifications" : "Nonaktifkan pemberitahuan",
+   "tabs.item.disableService" : "Nonaktifkan layanan",
+   "tabs.item.edit" : "Edit",
+   "tabs.item.enableAudio" : "Aktifkan audio",
+   "tabs.item.enableNotification" : "Aktifkan pemberitahuan",
+   "tabs.item.enableService" : "Aktifkan layanan",
+   "tabs.item.reload" : "Muat Ulang",
+   "welcome.loginButton" : "Masuk ke akun Anda",
+   "welcome.signupButton" : "Buat akun gratis",
+   "welcome.slogan" : "Perpesanan yang bekerja untuk Anda"
+}
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index dd87599bb..ad3f9b880 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,168 +1,192 @@
-{
-  "global.api.unhealthy": "Impossibile connettersi ai servizi online di Franz",
-  "global.notConnectedToTheInternet": "Non sei connesso ad internet.",
-  "welcome.signupButton": "Iscriviti gratis",
-  "welcome.loginButton": "Accedi",
-  "welcome.slogan": "Messagistica che lavora per te",
-  "login.headline": "Accedi",
-  "login.email.label": "Indirizzo email",
-  "login.password.label": "Password",
-  "login.submit.label": "Accedi",
-  "login.invalidCredentials": "Email o password non validi",
-  "login.tokenExpired": "La tua sessione è scaduta, accedi di nuovo per favore.",
-  "login.serverLogout": "La tua sessione è scaduta, accedi di nuovo per favore.",
-  "login.link.signup": "Iscriviti gratis",
-  "login.link.password": "Reimposta password",
-  "password.headline": "Reimposta password",
-  "password.email.label": "Indirizzo email",
-  "password.submit.label": "Invia",
-  "password.noUser": "Non è stato trovato nessun utente con questa email",
-  "password.successInfo": "Per favore controlla la tua email",
-  "password.link.signup": "Iscriviti gratis",
-  "password.link.login": "Accedi",
-  "signup.headline": "Accedi",
-  "signup.firstname.label": "Nome",
-  "signup.lastname.label": "Cognome",
-  "signup.email.label": "Indirizzo email",
-  "signup.company.label": "Azienda",
-  "signup.password.label": "Password",
-  "signup.submit.label": "Registrati",
-  "signup.link.login": "Hai già fatto l'iscrizione? Accedi",
-  "signup.emailDuplicate": "Esiste già un utente con questo indirizzo email",
-  "signup.legal.info": "Iscrivendoti a Franz accetti",
-  "signup.legal.terms": "Termini di servizio",
-  "signup.legal.privacy": "Informativa sulla Privacy",
-  "pricing.headline": "Supporta Franz",
-  "pricing.support.label": "Seleziona il tuo piano di sostegno",
-  "pricing.submit.label": "Voglio sostenere lo sviluppo di Franz",
-  "pricing.link.skipPayment": "Non voglio sostenere lo sviluppo Franz.",
-  "import.headline": "Importa i tuoi servizi di Franz 4",
-  "import.notSupportedHeadline": "Servzi non ancora supportati in Franz 5",
-  "import.submit.label": "Importa servizi",
-  "import.skip.label": "Voglio aggiungere i servizi a mano",
-  "invite.submit.label": "Manda inviti",
-  "invite.headline.friends": "Invita 3 dei tuoi amici o colleghi",
-  "invite.name.label": "Nome",
-  "invite.email.label": "Indirizzo email",
-  "invite.skip.label": "Voglio farlo dopo",
-  "subscription.submit.label": "Voglio sostenere lo sviluppo di Franz",
-  "subscription.paymentSessionError": "Impossibile inizializzare il modulo di pagamento",
-  "subscription.includedFeatures": "La sottoscrizione a pagamento Franz Premium Supporter include",
-  "subscription.features.onpremise": "Agiunge servizi on-premise/hosted come HipChat",
-  "subscription.features.customServices": "Servizi privati per te ed il tuo team",
-  "subscription.features.encryptedSync": "Sincronizzazione sessione crittografata",
-  "subscription.features.vpn": "Supporto di Proxy e VPN",
-  "subscription.features.ads": "Nessuna pubblicità",
-  "subscription.features.comingSoon": "Presto disponibile",
-  "infobar.servicesUpdated": "I tuoi servizi sono stati aggiornati.",
-  "infobar.updateAvailable": "È disponibile un nuovo aggiornamento per Franz.",
-  "infobar.buttonReloadServices": "Ricarica i servizi",
-  "infobar.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
-  "infobar.requiredRequestsFailed": "Impossibile caricare i servizi e le informazioni dell'utente",
-  "sidebar.settings": "Impostazioni",
-  "services.welcome": "Benvenuto in Franz",
-  "services.getStarted": "Inizia",
-  "settings.account.headline": "Conto",
-  "settings.account.headlineSubscription": "La tua sottoscrizione",
-  "settings.account.headlineUpgrade": "Aggiorna il tuo conto e supporta Franz",
-  "settings.account.headlineInvoices": "Fatture",
-  "settings.account.manageSubscription.label": "Gestisci la tua sottoscrizione",
-  "settings.account.accountType.basic": "Conto Base",
-  "settings.account.accountType.premium": "Conto Premium Supporter",
-  "settings.account.account.editButton": "Modifica conto",
-  "settings.account.invoiceDownload": "Scarica",
-  "settings.account.userInfoRequestFailed": "Impossibile caricare le informazioni dell'utente",
-  "settings.account.tryReloadUserInfoRequest": "Prova ancora",
-  "settings.account.headlineProfile": "Aggiorna profilo",
-  "settings.account.headlineAccount": "Informazioni sul conto",
-  "settings.account.headlinePassword": "Cambia la password",
-  "settings.account.successInfo": "Le tue modifiche sono state salvate",
-  "settings.account.buttonSave": "Aggiorna profilo",
-  "settings.account.mining.thankyou": "Grazie per supportare Franz con la tua potenza di calcolo.",
-  "settings.account.mining.active": "Al momento stai eseguendo {hashes} calcoli al secondo.",
-  "settings.account.mining.moreInformation": "Ottieni piú informazioni",
-  "settings.account.mining.cancel": "Annulla mining",
-  "settings.navigation.availableServices": "Servizi disponibili",
-  "settings.navigation.yourServices": "I tuoi servizi",
-  "settings.navigation.account": "Conto",
-  "settings.navigation.settings": "Impostazioni",
-  "settings.navigation.logout": "Disconnetti",
-  "settings.recipes.headline": "Servizi disponibili",
-  "settings.recipes.mostPopular": "Piú popolari",
-  "settings.recipes.all": "Tutti i servizi",
-  "settings.recipes.dev": "Sviluppo",
-  "settings.recipes.nothingFound": "Mi dispiace, nessuno servizio corrisponde alla tua ricerca.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
-  "settings.service.form.saveButton": "Salva servizio",
-  "settings.service.form.deleteButton": "Elimina servizio",
-  "settings.service.form.availableServices": "Servizi disponibili",
-  "settings.service.form.yourServices": "I tuoi servizi",
-  "settings.service.form.addServiceHeadline": "Aggiungi {name}",
-  "settings.service.form.editServiceHeadline": "Modifica {name}",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
-  "settings.service.form.customUrlValidationError": "Impossibile validare il server personale {name}.",
-  "settings.service.form.customUrlPremiumInfo": "Per aggiungere servizi self hosted devi avere un conto Franz Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Aggiorna il tuo conto",
-  "settings.service.form.indirectMessageInfo": "Riceverai notifiche per tutti i nuovi messaggi in un canale, non solo @username, @channel, @here, ...",
-  "settings.service.error.headline": "Errore",
-  "settings.service.error.goBack": "Torna ai servizi",
-  "settings.service.error.message": "Impossibile caricare le specifiche del servizio.",
-  "settings.services.tooltip.isDisabled": "Il servizio è disabilitato",
-  "settings.services.tooltip.notificationsDisabled": "Le notifiche sono disabilitate",
-  "settings.services.headline": "I tuoi servizi",
-  "settings.services.noServicesAdded": "Non hai ancora aggiunto nessun servizio.",
-  "settings.services.discoverServices": "Trova servizi",
-  "settings.services.updatedInfo": "Le tue modifiche sono state salvate",
-  "settings.services.deletedInfo": "Il servizio è stato eliminato",
-  "settings.app.headline": "Impostazioni",
-  "settings.app.headlineGeneral": "Generale",
-  "settings.app.headlineLanguage": "Lingua",
-  "settings.app.headlineUpdates": "Aggiornamento",
-  "settings.app.buttonSearchForUpdate": "Controlla aggiornamento versione",
-  "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
-  "settings.app.updateStatusSearching": "Sto cercando l'aggiornamento",
-  "settings.app.updateStatusAvailable": "Aggiornamento disponibile, scarico...",
-  "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
-  "settings.app.form.autoLaunchOnStart": "Lancia Franz all'avvio",
-  "settings.app.form.autoLaunchInBackground": "Apri in background",
-  "settings.app.form.enableSystemTray": "Mostra Franz nella zona delle notifiche di sistema",
-  "settings.app.form.minimizeToSystemTray": "Minimizza Franz nella zona delle notifiche di sistema",
-  "settings.app.form.runInBackground": "Maniteni Franz attivo in background quando chiudi la finestra",
-  "settings.app.form.language": "Lingua",
-  "settings.app.form.beta": "Includi versioni beta",
-  "settings.app.currentVersion": "Versione corrente:",
-  "settings.service.form.name": "Nome",
-  "settings.service.form.enableService": "Abilita servizio",
-  "settings.service.form.enableNotification": "Abilita notifiche",
-  "settings.service.form.team": "Team",
-  "settings.service.form.customUrl": "Server personale",
-  "settings.service.form.indirectMessages": "Mostra il badge del messaggio per tutti i nuovi messaggi",
-  "settings.user.form.firstname": "Nome",
-  "settings.user.form.lastname": "Cognome",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Password corrente",
-  "settings.user.form.newPassword": "Nuova password",
-  "settings.user.form.accountType.label": "Tipo di conto",
-  "settings.user.form.accountType.individual": "Individuale",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Azienda",
-  "subscription.type.free": "gratis",
-  "subscription.type.month": "mese",
-  "subscription.type.year": "anno",
-  "subscription.type.mining": "Supporta Franz con della potenza di calcolo",
-  "subscription.mining.headline": "Come funziona?",
-  "subscription.mining.experimental": "sperimentale",
-  "subscription.mining.line1": "Abilitando \"Supporta Franz con della potenza di calcolo\",Franz userà circa il 20-50% della tua CPU per fare il mining della criptovaluta Monero che equivale approssimativamente a 5$/anno.",
-  "subscription.mining.line2": "Adatteremo l'utilizzo della CPU in base all tue abitudini di lavoro per non scaricare la tua batteria e rallentare la tua macchina.",
-  "subscription.mining.line3": "Fino a che il mining è attivo, avrai accesso illimitato a tutte le funzionalità del conto Franz Premium Supporter.",
-  "subscription.mining.moreInformation": "Ottieni più informazioni su questo piano.",
-  "subscriptionPopup.buttonCancel": "Annulla",
-  "subscriptionPopup.buttonDone": "Fatto",
-  "tabs.item.reload": "Ricarica",
-  "tabs.item.edit": "Modifica",
-  "tabs.item.disableNotifications": "Disabilita le notifiche",
-  "tabs.item.enableNotification": "Abilita le notifiche",
-  "tabs.item.disableService": "Disabilita servizio",
-  "tabs.item.deleteService": "Elimina servizio"
+{
+   "global.api.unhealthy" : "Impossibile collegarsi ai servizi online di Franz",
+   "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
+   "import.headline" : "Importa i tuoi servizi da Franz 4",
+   "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
+   "import.skip.label" : "Voglio aggiungere servizi manualmente",
+   "import.submit.label" : "Importa servizi",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
+   "infobar.buttonReloadServices" : "Ricarica servizi",
+   "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
+   "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
+   "infobar.updateAvailable" : "È disponibile un nuovo aggiornamento di Franz.",
+   "invite.email.label" : "Indirizzo e-mail",
+   "invite.headline.friends" : "Invita 3 dei tuoi amici o colleghi",
+   "invite.name.label" : "Nome",
+   "invite.skip.label" : "Voglio farlo dopo",
+   "invite.submit.label" : "Invia inviti",
+   "login.email.label" : "Indirizzo e-mail",
+   "login.headline" : "Accedi",
+   "login.invalidCredentials" : "E-mail o password non valide",
+   "login.link.password" : "Reimposta password",
+   "login.link.signup" : "Crea un account gratuito",
+   "login.password.label" : "Password",
+   "login.serverLogout" : "Sessione scaduta, accedi di nuovo.",
+   "login.submit.label" : "Accedi",
+   "login.tokenExpired" : "Sessione scaduta, accedi di nuovo.",
+   "password.email.label" : "Indirizzo e-mail",
+   "password.headline" : "Reimposta password",
+   "password.link.login" : "Accedi al tuo account",
+   "password.link.signup" : "Crea un account gratuito",
+   "password.noUser" : "Non è stato trovato nessun utente con quell'indirizzo e-mail",
+   "password.submit.label" : "Invia",
+   "password.successInfo" : "Controlla la tua e-mail",
+   "pricing.headline" : "Supporta Franz",
+   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
+   "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
+   "pricing.support.label" : "Seleziona il tuo piano di supporto",
+   "service.crashHandler.action" : "Ricarica {name}",
+   "service.crashHandler.autoReload" : "Prova a ripristinare automaticamente {name} in {seconds} secondi",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} ha causato un errore.",
+   "service.disabledHandler.action" : "Abilita {name}",
+   "service.disabledHandler.headline" : "{name} è disabilitato",
+   "services.getStarted" : "Iniziamo",
+   "services.welcome" : "Benvenuto in Franz",
+   "settings.account.account.editButton" : "Modifica account",
+   "settings.account.accountType.basic" : "Account Basic",
+   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.buttonSave" : "Aggiorna profilo",
+   "settings.account.headline" : "Account",
+   "settings.account.headlineAccount" : "Informazioni account",
+   "settings.account.headlineInvoices" : "Fatture",
+   "settings.account.headlinePassword" : "Cambia password",
+   "settings.account.headlineProfile" : "Aggiorna profilo",
+   "settings.account.headlineSubscription" : "La tua sottoscrizione",
+   "settings.account.headlineUpgrade" : "Aggiorna il tuo account e supporta Franz",
+   "settings.account.invoiceDownload" : "Scarica",
+   "settings.account.manageSubscription.label" : "Gestisci la tua sottoscrizione",
+   "settings.account.mining.active" : "Stai eseguendo {hashes} calcoli al secondo.",
+   "settings.account.mining.cancel" : "Annulla mining",
+   "settings.account.mining.moreInformation" : "Ottieni ulteriori informazioni",
+   "settings.account.mining.thankyou" : "Grazier per supportare Franz con la tua potenza di calcolo.",
+   "settings.account.successInfo" : "Le tue modifiche sono state salvate",
+   "settings.account.tryReloadUserInfoRequest" : "Riprova ancora",
+   "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
+   "settings.app.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
+   "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
+   "settings.app.currentVersion" : "Versione attuale:",
+   "settings.app.form.autoLaunchInBackground" : "Apri in secondo piano",
+   "settings.app.form.autoLaunchOnStart" : "Apri Franz all'avvio",
+   "settings.app.form.beta" : "Includi versioni beta",
+   "settings.app.form.enableSpellchecking" : "Abilita controllo ortografico",
+   "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
+   "settings.app.form.language" : "Lingua",
+   "settings.app.form.minimizeToSystemTray" : "Minimizza Franz nell'area di notifica",
+   "settings.app.form.runInBackground" : "Mantieni Franz in esecuzione quando chiudi la finestra",
+   "settings.app.form.showDisabledServices" : "Mostra i tab disabilitati",
+   "settings.app.headline" : "Impostazioni",
+   "settings.app.headlineAdvanced" : "Avanzate",
+   "settings.app.headlineAppearance" : "Aspetto",
+   "settings.app.headlineGeneral" : "Generale",
+   "settings.app.headlineLanguage" : "Lingua",
+   "settings.app.headlineUpdates" : "Aggiornamenti",
+   "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Aggiornamento disponibile, download in corso...",
+   "settings.app.updateStatusSearching" : "È in ricerca di un aggiornamento",
+   "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Franz",
+   "settings.navigation.account" : "Account",
+   "settings.navigation.availableServices" : "Servizi disponibili",
+   "settings.navigation.logout" : "Esci",
+   "settings.navigation.settings" : "Impostazioni",
+   "settings.navigation.yourServices" : "I tuoi servizi",
+   "settings.recipes.all" : "Tutti i servizi",
+   "settings.recipes.dev" : "Sviluppo",
+   "settings.recipes.headline" : "Servizi disponibili",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Più popolari",
+   "settings.recipes.nothingFound" : "Ci dispiace, ma nessun servizio corrisponde alla tua ricerca.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Servizio aggiunto con successo",
+   "settings.service.error.goBack" : "Indietro ai servizi",
+   "settings.service.error.headline" : "Errore",
+   "settings.service.error.message" : "Impossibile caricare il servizio.",
+   "settings.service.form.addServiceHeadline" : "Aggiungi {name}",
+   "settings.service.form.availableServices" : "Servizi disponibili",
+   "settings.service.form.customUrl" : "Server personalizzato",
+   "settings.service.form.customUrlPremiumInfo" : "Per aggiungere servizi self hosted, devi avere un account Franz da Premium Supporter.",
+   "settings.service.form.customUrlUpgradeAccount" : "Aggiorna il tuo account",
+   "settings.service.form.customUrlValidationError" : "Impossibile validare il server personalizzato {name}.",
+   "settings.service.form.deleteButton" : "Elimina servizio",
+   "settings.service.form.editServiceHeadline" : "Modifica {name}",
+   "settings.service.form.enableAudio" : "Abilita audio",
+   "settings.service.form.enableNotification" : "Attiva notifiche",
+   "settings.service.form.enableService" : "Attiva servizio",
+   "settings.service.form.indirectMessageInfo" : "Verrai notificato di tutti i messaggi in un canale, non solo @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Mostra il simbolo del messaggio per tutti i messaggi",
+   "settings.service.form.isMutedInfo" : "Quando disabilitato, tutte le notifiche sonore e le riproduzioni audio saranno disattivate",
+   "settings.service.form.name" : "Nome",
+   "settings.service.form.saveButton" : "Salva servizio",
+   "settings.service.form.tabHosted" : "Hosted",
+   "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
+   "settings.service.form.team" : "Team",
+   "settings.service.form.yourServices" : "I tuoi servizi",
+   "settings.services.deletedInfo" : "Il servizio è stato eliminato",
+   "settings.services.discoverServices" : "Scopri servizi",
+   "settings.services.headline" : "I tuoi servizi",
+   "settings.services.noServicesAdded" : "Non aggiunto ancora nessun servizio.",
+   "settings.services.tooltip.isDisabled" : "Servizio disattivato",
+   "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
+   "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono state disattivate",
+   "settings.services.updatedInfo" : "Le modifiche sono state salvate",
+   "settings.user.form.accountType.company" : "Società",
+   "settings.user.form.accountType.individual" : "Individuo",
+   "settings.user.form.accountType.label" : "Tipo account",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Password attuale",
+   "settings.user.form.email" : "E-mail",
+   "settings.user.form.firstname" : "Nome",
+   "settings.user.form.lastname" : "Cognome",
+   "settings.user.form.newPassword" : "Nuova password",
+   "sidebar.addNewService" : "Aggiungi nuovo servizio",
+   "sidebar.mute" : "Disabilita audio",
+   "sidebar.settings" : "Impostazioni",
+   "sidebar.unmute" : "Abilita audio",
+   "signup.company.label" : "Società",
+   "signup.email.label" : "Indirizzo e-mail",
+   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo e-mail",
+   "signup.firstname.label" : "Nome",
+   "signup.headline" : "Iscriviti",
+   "signup.lastname.label" : "Cognome",
+   "signup.legal.info" : "Creato un account Franz accetti",
+   "signup.legal.privacy" : "Informativa sulla Privacy",
+   "signup.legal.terms" : "Termini del Servizio",
+   "signup.link.login" : "Hai già un account, accedi?",
+   "signup.password.label" : "Password",
+   "signup.submit.label" : "Crea un account",
+   "subscription.euTaxInfo" : "Residente nella Comunità Europea, possono essere applicate tasse locali",
+   "subscription.features.ads" : "Nessuna pubblicità, mai!",
+   "subscription.features.comingSoon" : "in arrivo",
+   "subscription.features.customServices" : "Servizi privati per te e il tuo team",
+   "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
+   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hostati come HipChat",
+   "subscription.features.vpn" : "Supporto Proxy e VPN",
+   "subscription.includedFeatures" : "L'account Franz a pagamento Premium Supporter include",
+   "subscription.mining.experimental" : "sperimentale",
+   "subscription.mining.headline" : "Come funziona?",
+   "subscription.mining.line1" : "Attivando il \"Supporto con potenza di calcolo\", Franz utilizzerà circa il 20-50% della tua CPU per minare la criptomoneta Monero che equivale a circa 5$\/anno.",
+   "subscription.mining.line2" : "Adatteremo l'utilizzo della CPU in base al carico di lavoro per non drenare la batteria e rallentare la tua macchina.",
+   "subscription.mining.line3" : "Avrai accesso illimitato a tutte le caratteristiche Premium Supporter finché che il mining sarà attivo.",
+   "subscription.mining.moreInformation" : "Ottieni maggiori informazioni su questo piano.",
+   "subscription.paymentSessionError" : "Impossibile inizializzare il form del pagamento",
+   "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
+   "subscription.type.free" : "gratis",
+   "subscription.type.mining" : "Supporta Franz con potenza di calcolo",
+   "subscription.type.month" : "mese",
+   "subscription.type.year" : "anno",
+   "subscriptionPopup.buttonCancel" : "Annulla",
+   "subscriptionPopup.buttonDone" : "Fatto",
+   "tabs.item.deleteService" : "Elimina servizio",
+   "tabs.item.disableAudio" : "Disattiva audio",
+   "tabs.item.disableNotifications" : "Disattiva notifiche",
+   "tabs.item.disableService" : "Disattiva servizio",
+   "tabs.item.edit" : "Modifica",
+   "tabs.item.enableAudio" : "Attiva audio",
+   "tabs.item.enableNotification" : "Attiva notifiche",
+   "tabs.item.enableService" : "Attiva servizio",
+   "tabs.item.reload" : "Ricarica",
+   "welcome.loginButton" : "Accedi al tuo account",
+   "welcome.signupButton" : "Crea un account gratuito",
+   "welcome.slogan" : "Messaging that works for you"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 98b7cbb19..e091f1f5b 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,169 +1,192 @@
-{
-  "global.api.unhealthy": "Franzオンラインサービスに接続できません。",
-  "global.notConnectedToTheInternet": "Internetに接続されていません。",
-  "welcome.signupButton": "無料アカウントを作成",
-  "welcome.loginButton": "アカウントにログイン",
-  "welcome.slogan": "Messaging that works for you",
-  "login.headline": "サインイン",
-  "login.email.label": "メールアドレス",
-  "login.password.label": "パスワード",
-  "login.submit.label": "サインイン",
-  "login.invalidCredentials": "メールアドレスかパスワードに誤りがあります。",
-  "login.tokenExpired": "セッションが切れました。ログインし直して下さい。",
-  "login.serverLogout": "セッションが切れました。ログインし直して下さい。",
-  "login.link.signup": "無料アカウントを作成",
-  "login.link.password": "パスワードをリセット",
-  "password.headline": "パスワードをリセット",
-  "password.email.label": "メールアドレス",
-  "password.submit.label": "送信",
-  "password.noUser": "このメールアドレスは登録されていません",
-  "password.successInfo": "メールを確認して下さい",
-  "password.link.signup": "無料アカウントを作成",
-  "password.link.login": "サインイン",
-  "signup.headline": "アカウントの作成",
-  "signup.firstname.label": "名",
-  "signup.lastname.label": "姓",
-  "signup.email.label": "メールアドレス",
-  "signup.company.label": "会社名",
-  "signup.password.label": "パスワード",
-  "signup.submit.label": "作成する",
-  "signup.link.login": "アカウントを既に持っていますか? こちらからサインイン",
-  "signup.emailDuplicate": "このメールアドレスは既に登録されています",
-  "signup.legal.info": "Franzアカウントを作成することで、以下の規約に同意したものとみなします",
-  "signup.legal.terms": "利用規約",
-  "signup.legal.privacy": "プライバシーについて",
-  "pricing.headline": "Franzを支援する",
-  "pricing.support.label": "プランを選択して下さい",
-  "pricing.submit.label": "Franzの開発を支援したい",
-  "pricing.link.skipPayment": "Franzの開発を支援しない",
-  "import.headline": "Franz 4サービスのインポート",
-  "import.notSupportedHeadline": "サービスの機能はFranz 5ではまだ対応されていません",
-  "import.submit.label": "サービスのインポート",
-  "import.skip.label": "サービスの追加は後で行う",
-  "invite.submit.label": "招待を送る",
-  "invite.headline.friends": "あなたの友人や同僚の方を3名までFranzに招待できます",
-  "invite.name.label": "氏名",
-  "invite.email.label": "メールアドレス",
-  "invite.skip.label": "後にする",
-  "subscription.submit.label": "Franzの開発を支援したい",
-  "subscription.paymentSessionError": "支払いフォームを初期化出来ません",
-  "subscription.includedFeatures": "Franz Premium Supporter有料アカウントには以下が含まれます",
-  "subscription.features.onpremise": "HipChatのようなオンプレミス/ホスト型サービスの追加",
-  "subscription.features.customServices": "あなたとあなたのチームのためのプライベートサービス",
-  "subscription.features.encryptedSync": "暗号化されたセッションの同期",
-  "subscription.features.vpn": "プロキシサーバーとVPNのサポート",
-  "subscription.features.ads": "広告は一切ありません!",
-  "subscription.features.comingSoon": "まもなく登場",
-  "infobar.servicesUpdated": "サービスが更新されました",
-  "infobar.updateAvailable": "Franzの新しい更新があります",
-  "infobar.buttonReloadServices": "Serviceのリロード",
-  "infobar.buttonInstallUpdate": "再起動して更新をインストールする",
-  "infobar.requiredRequestsFailed": "サービスとユーザー情報が読み込めません",
-  "sidebar.settings": "設定",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Franzにようこそ",
-  "services.getStarted": "はじめる",
-  "settings.account.headline": "アカウント",
-  "settings.account.headlineSubscription": "サブスクリプション内容",
-  "settings.account.headlineUpgrade": "アカウントをアップグレードし、Franzを支援する",
-  "settings.account.headlineInvoices": "インボイス",
-  "settings.account.manageSubscription.label": "サブスクリプションの管理",
-  "settings.account.accountType.basic": "Basicアカウント",
-  "settings.account.accountType.premium": "Premium Supporterアカウント",
-  "settings.account.account.editButton": "アカウントを編集する",
-  "settings.account.invoiceDownload": "ダウンロード",
-  "settings.account.userInfoRequestFailed": "ユーザー情報が読み込めません",
-  "settings.account.tryReloadUserInfoRequest": "リトライ",
-  "settings.account.headlineProfile": "プロフィールを更新する",
-  "settings.account.headlineAccount": "アカウント情報",
-  "settings.account.headlinePassword": "パスワードを変更する",
-  "settings.account.successInfo": "変更内容が保存されました",
-  "settings.account.buttonSave": "プロフィールを更新",
-  "settings.account.mining.thankyou": "お使いのPCの処理能力をFranzの支援に活用して頂き、ありがとうございます。",
-  "settings.account.mining.active": "1秒あたり{hashes}個のハッシュを計算中です。",
-  "settings.account.mining.moreInformation": "詳細を確認する",
-  "settings.account.mining.cancel": "マイニングをキャンセルする",
-  "settings.navigation.availableServices": "利用可能なサービス",
-  "settings.navigation.yourServices": "利用中のサービス",
-  "settings.navigation.account": "アカウント",
-  "settings.navigation.settings": "設定",
-  "settings.navigation.logout": "ログアウト",
-  "settings.recipes.headline": "利用可能なサービス",
-  "settings.recipes.mostPopular": "最も人気",
-  "settings.recipes.all": "全てのサービス",
-  "settings.recipes.dev": "開発版",
-  "settings.recipes.nothingFound": "すみませんが、検索ワードに該当するサービスが見つかりませんでした。",
-  "settings.recipes.servicesSuccessfulAddedInfo": "サービスが追加されました",
-  "settings.service.form.saveButton": "サービスを保存する",
-  "settings.service.form.deleteButton": "サービスを削除する",
-  "settings.service.form.availableServices": "利用可能なサービス",
-  "settings.service.form.yourServices": "利用中のサービス",
-  "settings.service.form.addServiceHeadline": "{name}を追加",
-  "settings.service.form.editServiceHeadline": "{name}を編集",
-  "settings.service.form.tabHosted": "ホスト",
-  "settings.service.form.tabOnPremise": "セルフホスト ⭐️",
-  "settings.service.form.customUrlValidationError": "カスタムサービス{name}を検証できませんでした。",
-  "settings.service.form.customUrlPremiumInfo": "独自サービスを追加するためには、Franz Premium Supporterアカウントが必要です。",
-  "settings.service.form.customUrlUpgradeAccount": "アカウントをアップグレードする",
-  "settings.service.form.indirectMessageInfo": "@username、@channel、@hereだけでなく、チャンネル内のすべての新規メッセージについて通知されます。",
-  "settings.service.error.headline": "エラー",
-  "settings.service.error.goBack": "サービスに戻る",
-  "settings.service.error.message": "サービスのレシピが読み込めません。",
-  "settings.services.tooltip.isDisabled": "サービスが無効です",
-  "settings.services.tooltip.notificationsDisabled": "通知が無効です",
-  "settings.services.headline": "利用中のサービス",
-  "settings.services.noServicesAdded": "まだ、どのサービスも追加されていません。",
-  "settings.services.discoverServices": "サービスを見つける",
-  "settings.services.updatedInfo": "変更内容が保存されました",
-  "settings.services.deletedInfo": "サービスが削除されました",
-  "settings.app.headline": "設定",
-  "settings.app.headlineGeneral": "一般",
-  "settings.app.headlineLanguage": "言語",
-  "settings.app.headlineUpdates": "更新",
-  "settings.app.buttonSearchForUpdate": "更新の確認",
-  "settings.app.buttonInstallUpdate": "再起動して更新をインストール",
-  "settings.app.updateStatusSearching": "更新を確認中",
-  "settings.app.updateStatusAvailable": "更新が見つかりました。ダウンロードしています...",
-  "settings.app.updateStatusUpToDate": "お使いのFranzは最新です",
-  "settings.app.form.autoLaunchOnStart": "システム起動時にFranzを開く",
-  "settings.app.form.autoLaunchInBackground": "バックグラウンドで開く",
-  "settings.app.form.enableSystemTray": "Franzをシステムトレイに表示する",
-  "settings.app.form.minimizeToSystemTray": "Franzをシステムトレイに最小化する",
-  "settings.app.form.runInBackground": "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
-  "settings.app.form.language": "言語",
-  "settings.app.form.beta": "Betaバージョンを含める",
-  "settings.app.currentVersion": "現在のバージョン:",
-  "settings.service.form.name": "サービス名",
-  "settings.service.form.enableService": "サービスを有効にする",
-  "settings.service.form.enableNotification": "通知を有効にする",
-  "settings.service.form.team": "チーム",
-  "settings.service.form.customUrl": "カスタムサーバー",
-  "settings.service.form.indirectMessages": "すべての新規メッセージについてバッジを表示する",
-  "settings.user.form.firstname": "名",
-  "settings.user.form.lastname": "姓",
-  "settings.user.form.email": "メールアドレス",
-  "settings.user.form.currentPassword": "現在のパスワード",
-  "settings.user.form.newPassword": "新しいパスワード",
-  "settings.user.form.accountType.label": "アカウントの種類",
-  "settings.user.form.accountType.individual": "個人",
-  "settings.user.form.accountType.non-profit": "非営利",
-  "settings.user.form.accountType.company": "法人",
-  "subscription.type.free": "無料",
-  "subscription.type.month": "月間",
-  "subscription.type.year": "年間",
-  "subscription.type.mining": "PCの処理能力を使ってFranzを支援する",
-  "subscription.mining.headline": "これはどのような仕組みですか",
-  "subscription.mining.experimental": "実験的",
-  "subscription.mining.line1": "\"PCの処理能力を使ってFranzを支援する\"を有効にすることで、Franzはおよそ20-50%のCPUパワーを暗号通貨Moneroのマイニングに使用し、これはおよそ年間で5ドル分にあたります。",
-  "subscription.mining.line2": "処理能力に基づいてCPUの使用率を適応しますのでバッテリーを無駄に消費したり、システムを遅くすることはありません。",
-  "subscription.mining.line3": "マイニングが機能している限り、Franz Premium Supporterの全ての機能を無制限で利用できます。",
-  "subscription.mining.moreInformation": "このプランの詳細を確認する。",
-  "subscriptionPopup.buttonCancel": "キャンセルしました",
-  "subscriptionPopup.buttonDone": "完了しました",
-  "tabs.item.reload": "リロード",
-  "tabs.item.edit": "編集",
-  "tabs.item.disableNotifications": "通知を無効にする",
-  "tabs.item.enableNotification": "通知を有効にする",
-  "tabs.item.disableService": "サービスを無効にする",
-  "tabs.item.deleteService": "サービスを削除する"
+{
+   "global.api.unhealthy" : "Franzオンラインサービスに接続できません。",
+   "global.notConnectedToTheInternet" : "Internetに接続されていません。",
+   "import.headline" : "Franz 4サービスのインポート",
+   "import.notSupportedHeadline" : "サービスはFranz 5ではまだ対応されていません",
+   "import.skip.label" : "サービスの追加は後で行う",
+   "import.submit.label" : "サービスのインポート",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "再起動して更新をインストールする",
+   "infobar.buttonReloadServices" : "サービスのリロード",
+   "infobar.requiredRequestsFailed" : "サービスとユーザー情報が読み込めません",
+   "infobar.servicesUpdated" : "サービスが更新されました。",
+   "infobar.updateAvailable" : "Franzの新しい更新があります。",
+   "invite.email.label" : "メールアドレス",
+   "invite.headline.friends" : "あなたの友人や同僚の方を3名までFranzに招待できます",
+   "invite.name.label" : "氏名",
+   "invite.skip.label" : "後にする",
+   "invite.submit.label" : "招待を送る",
+   "login.email.label" : "メールアドレス",
+   "login.headline" : "サインイン",
+   "login.invalidCredentials" : "メールアドレスかパスワードに誤りがあります",
+   "login.link.password" : "パスワードをリセット",
+   "login.link.signup" : "無料アカウントを作成",
+   "login.password.label" : "パスワード",
+   "login.serverLogout" : "セッションが切れました。ログインし直して下さい。",
+   "login.submit.label" : "サインイン",
+   "login.tokenExpired" : "セッションが切れました。ログインし直して下さい。",
+   "password.email.label" : "メールアドレス",
+   "password.headline" : "パスワードのリセット",
+   "password.link.login" : "サインイン",
+   "password.link.signup" : "無料アカウントを作成",
+   "password.noUser" : "このメールアドレスは登録されていません",
+   "password.submit.label" : "送信",
+   "password.successInfo" : "メールを確認して下さい",
+   "pricing.headline" : "Franzを支援する",
+   "pricing.link.skipPayment" : "Franzの開発を支援しない。",
+   "pricing.submit.label" : "Franzの開発を支援したい。",
+   "pricing.support.label" : "プランを選択して下さい",
+   "service.crashHandler.action" : "{name} をリロード",
+   "service.crashHandler.autoReload" : "{seconds}秒後、自動的に{name}の復旧を試みます",
+   "service.crashHandler.headline" : "しまった!",
+   "service.crashHandler.text" : "{name}はエラーを起こしました。",
+   "service.disabledHandler.action" : "{name}を有効にする",
+   "service.disabledHandler.headline" : "{name}は無効です",
+   "services.getStarted" : "はじめる",
+   "services.welcome" : "Franzにようこそ",
+   "settings.account.account.editButton" : "アカウントの編集",
+   "settings.account.accountType.basic" : "Basicアカウント",
+   "settings.account.accountType.premium" : "Premium Supporterアカウント",
+   "settings.account.buttonSave" : "プロフィールの更新",
+   "settings.account.headline" : "アカウント",
+   "settings.account.headlineAccount" : "アカウント情報",
+   "settings.account.headlineInvoices" : "請求書",
+   "settings.account.headlinePassword" : "パスワードの変更",
+   "settings.account.headlineProfile" : "プロフィールの更新",
+   "settings.account.headlineSubscription" : "サブスクリプション内容",
+   "settings.account.headlineUpgrade" : "アカウントをアップグレードし、Franzを支援する",
+   "settings.account.invoiceDownload" : "ダウンロード",
+   "settings.account.manageSubscription.label" : "サブスクリプションの管理",
+   "settings.account.mining.active" : "1秒あたり{hashes}個のハッシュを計算中です。",
+   "settings.account.mining.cancel" : "マイニングをキャンセルする",
+   "settings.account.mining.moreInformation" : "詳細を確認する",
+   "settings.account.mining.thankyou" : "お使いのPCの処理能力をFranzの支援に活用して頂き、ありがとうございます。",
+   "settings.account.successInfo" : "変更内容が保存されました",
+   "settings.account.tryReloadUserInfoRequest" : "再試行",
+   "settings.account.userInfoRequestFailed" : "ユーザ情報を読み込めませんでした",
+   "settings.app.buttonInstallUpdate" : "再起動して更新をインストールする",
+   "settings.app.buttonSearchForUpdate" : "更新の確認",
+   "settings.app.currentVersion" : "現在のバージョン:",
+   "settings.app.form.autoLaunchInBackground" : "バックグラウンドで開く",
+   "settings.app.form.autoLaunchOnStart" : "システム起動時にFranzを開く",
+   "settings.app.form.beta" : "Betaバージョンを含める",
+   "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
+   "settings.app.form.enableSystemTray" : "Franzをシステムトレイに表示する",
+   "settings.app.form.language" : "言語",
+   "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイに最小化する",
+   "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
+   "settings.app.form.showDisabledServices" : "無効化されたサービスのタブを表示する",
+   "settings.app.headline" : "設定",
+   "settings.app.headlineAdvanced" : "詳細",
+   "settings.app.headlineAppearance" : "表示スタイル",
+   "settings.app.headlineGeneral" : "一般",
+   "settings.app.headlineLanguage" : "言語",
+   "settings.app.headlineUpdates" : "更新",
+   "settings.app.restartRequired" : "変更には再起動が必要です",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "更新が見つかりました。ダウンロードしています...",
+   "settings.app.updateStatusSearching" : "更新を確認中",
+   "settings.app.updateStatusUpToDate" : "お使いのFranzは最新です",
+   "settings.navigation.account" : "アカウント",
+   "settings.navigation.availableServices" : "利用可能なサービス",
+   "settings.navigation.logout" : "ログアウト",
+   "settings.navigation.settings" : "設定",
+   "settings.navigation.yourServices" : "利用中のサービス",
+   "settings.recipes.all" : "すべてのサービス",
+   "settings.recipes.dev" : "開発版",
+   "settings.recipes.headline" : "利用可能なサービス",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "最も人気",
+   "settings.recipes.nothingFound" : "すみませんが、検索ワードに該当するサービスが見つかりませんでした。",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "サービスが追加されました",
+   "settings.service.error.goBack" : "サービスに戻る",
+   "settings.service.error.headline" : "エラー",
+   "settings.service.error.message" : "サービスのレシピを読み込めませんでした。",
+   "settings.service.form.addServiceHeadline" : "{name}を追加",
+   "settings.service.form.availableServices" : "利用可能なサービス",
+   "settings.service.form.customUrl" : "独自サーバー",
+   "settings.service.form.customUrlPremiumInfo" : "独自サービスを追加するためには、Franz Premium Supporterアカウントが必要です。",
+   "settings.service.form.customUrlUpgradeAccount" : "アカウントをアップグレードする",
+   "settings.service.form.customUrlValidationError" : "独自サーバー{name}を検証できませんでした。",
+   "settings.service.form.deleteButton" : "サービスの削除",
+   "settings.service.form.editServiceHeadline" : "{name}を編集",
+   "settings.service.form.enableAudio" : "オーディオの有効化",
+   "settings.service.form.enableNotification" : "通知を有効にする",
+   "settings.service.form.enableService" : "サービスを有効にする",
+   "settings.service.form.indirectMessageInfo" : "@username、@channel、@hereだけでなく、チャンネル内のすべての新規メッセージについて通知されます。",
+   "settings.service.form.indirectMessages" : "すべての新規メッセージについてバッジを表示する",
+   "settings.service.form.isMutedInfo" : "無効化されている場合、全ての通知音やオーディオ再生は無音になります",
+   "settings.service.form.name" : "サービス名",
+   "settings.service.form.saveButton" : "サービスの保存",
+   "settings.service.form.tabHosted" : "ホスト",
+   "settings.service.form.tabOnPremise" : "セルフホスト ⭐️",
+   "settings.service.form.team" : "チーム",
+   "settings.service.form.yourServices" : "利用中のサービス",
+   "settings.services.deletedInfo" : "サービスが削除されました",
+   "settings.services.discoverServices" : "サービスを探す",
+   "settings.services.headline" : "利用中のサービス",
+   "settings.services.noServicesAdded" : "まだ、どのサービスも追加されていません。",
+   "settings.services.tooltip.isDisabled" : "サービスが無効です",
+   "settings.services.tooltip.isMuted" : "無音となっています",
+   "settings.services.tooltip.notificationsDisabled" : "通知は無効です",
+   "settings.services.updatedInfo" : "変更内容が保存されました",
+   "settings.user.form.accountType.company" : "法人",
+   "settings.user.form.accountType.individual" : "個人",
+   "settings.user.form.accountType.label" : "アカウントの種類",
+   "settings.user.form.accountType.non-profit" : "非営利",
+   "settings.user.form.currentPassword" : "現在のパスワード",
+   "settings.user.form.email" : "メールアドレス",
+   "settings.user.form.firstname" : "名",
+   "settings.user.form.lastname" : "姓",
+   "settings.user.form.newPassword" : "新しいパスワード",
+   "sidebar.addNewService" : "サービスを追加",
+   "sidebar.mute" : "オーディオの無効化",
+   "sidebar.settings" : "設定",
+   "sidebar.unmute" : "オーディオの有効化",
+   "signup.company.label" : "法人",
+   "signup.email.label" : "メールアドレス",
+   "signup.emailDuplicate" : "このメールアドレスは既に登録されています",
+   "signup.firstname.label" : "名",
+   "signup.headline" : "アカウントの作成",
+   "signup.lastname.label" : "姓",
+   "signup.legal.info" : "Franzアカウントを作成することで、以下の規約に同意したものとみなします",
+   "signup.legal.privacy" : "プライバシーについて",
+   "signup.legal.terms" : "利用規約",
+   "signup.link.login" : "アカウントを既に持っていますか? こちらからサインイン",
+   "signup.password.label" : "パスワード",
+   "signup.submit.label" : "アカウントの作成",
+   "subscription.euTaxInfo" : "EU在住者 : 地域の消費税が適用される可能性があります",
+   "subscription.features.ads" : "広告は一切ありません!",
+   "subscription.features.comingSoon" : "まもなく登場",
+   "subscription.features.customServices" : "あなたとあなたのチームのためのプライベートサービス",
+   "subscription.features.encryptedSync" : "暗号化されたセッションの同期",
+   "subscription.features.onpremise" : "HipChatのようなオンプレミス\/ホスト型サービスの追加",
+   "subscription.features.vpn" : "プロキシサーバーとVPNのサポート",
+   "subscription.includedFeatures" : "Franz Premium Supporter有料アカウントには以下が含まれます",
+   "subscription.mining.experimental" : "試験的",
+   "subscription.mining.headline" : "これはどのように機能しますか?",
+   "subscription.mining.line1" : "\"PCの処理能力を使ってFranzを支援する\"を有効にすることで、Franzはおよそ20-50%のCPUパワーを暗号通貨Moneroのマイニングに使用し、これはおよそ年間で5ドル分に相当します。",
+   "subscription.mining.line2" : "処理能力に基づいてCPUの使用率を適応しますのでバッテリーを無駄に消費したり、システムを遅くすることはありません。",
+   "subscription.mining.line3" : "マイニングが機能している限り、Franz Premium Supporterの全ての機能を無制限で利用できます。",
+   "subscription.mining.moreInformation" : "このプランの詳細を確認する。",
+   "subscription.paymentSessionError" : "支払いフォームを初期化出来ません",
+   "subscription.submit.label" : "Franzの開発を支援したい",
+   "subscription.type.free" : "無料",
+   "subscription.type.mining" : "PCの処理能力を使ってFranzを支援する",
+   "subscription.type.month" : "月間",
+   "subscription.type.year" : "年間",
+   "subscriptionPopup.buttonCancel" : "キャンセル",
+   "subscriptionPopup.buttonDone" : "完了",
+   "tabs.item.deleteService" : "サービスを削除する",
+   "tabs.item.disableAudio" : "オーディオの無効化",
+   "tabs.item.disableNotifications" : "通知を無効にする",
+   "tabs.item.disableService" : "サービスを無効にする",
+   "tabs.item.edit" : "編集",
+   "tabs.item.enableAudio" : "オーディオの有効化",
+   "tabs.item.enableNotification" : "通知を有効にする",
+   "tabs.item.enableService" : "サービスを有効にする",
+   "tabs.item.reload" : "再読み込み",
+   "welcome.loginButton" : "アカウントにログイン",
+   "welcome.signupButton" : "無料アカウントを作成",
+   "welcome.slogan" : "Messaging that works for you"
 }
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
new file mode 100644
index 000000000..30337cc61
--- /dev/null
+++ b/src/i18n/locales/ka.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Franz-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
+   "global.notConnectedToTheInternet" : "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
+   "import.headline" : "შემოიტანე Franz 4-ის სერვისები",
+   "import.notSupportedHeadline" : "სერვისები ჯერ არ არის მხარდაჭერილი Franz 5-ში",
+   "import.skip.label" : "მსურს სერვისების ხელით დამატება",
+   "import.submit.label" : "მოწვევის გაგზავნა",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "გადატვირთეთ და დააყენეთ განახლება",
+   "infobar.buttonReloadServices" : "სერვისების გადატვირთვა ",
+   "infobar.requiredRequestsFailed" : "სერვისებისა და მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
+   "infobar.servicesUpdated" : "თქვენი სერვისები განახლებულია.",
+   "infobar.updateAvailable" : "განახლება Franz-ისთვის ხელმისაწვდომია.",
+   "invite.email.label" : "მეილი",
+   "invite.headline.friends" : "მოიწვიეთ 3 თქვენი მეგობარი ან კოლეგა",
+   "invite.name.label" : "სახელი ",
+   "invite.skip.label" : "ამას მოგვიანებით გავაკეთებ",
+   "invite.submit.label" : "მოწვევის გაგზავნა",
+   "login.email.label" : "მეილი",
+   "login.headline" : "შესვლა",
+   "login.invalidCredentials" : "მეილი ან პაროლი არასწორია",
+   "login.link.password" : "პაროლის აღდგენა",
+   "login.link.signup" : "ანგარიშის შექმნა",
+   "login.password.label" : "პაროლი ",
+   "login.serverLogout" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
+   "login.submit.label" : "შესვლა",
+   "login.tokenExpired" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
+   "password.email.label" : "მეილი",
+   "password.headline" : "პაროლის აღდგენა",
+   "password.link.login" : "შედით თქვენს ანგარიშში",
+   "password.link.signup" : "ანგარიშის შექმნა",
+   "password.noUser" : "მომხმარებელი მითითებული მეილით ვერ მოიძებნა",
+   "password.submit.label" : "დადასტურება",
+   "password.successInfo" : "გთხოვთ შეამოწმეთ მეილი",
+   "pricing.headline" : "Franz-ის მხარდაჭერა",
+   "pricing.link.skipPayment" : "არ მინდა ხელი შევუწყო Franz-ის განვითარებას.",
+   "pricing.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
+   "pricing.support.label" : "აირჩიეთ თქვენი მხარდაჭერის გეგმა",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "დაწყება",
+   "services.welcome" : "მოგესალმებით Franz-ზე",
+   "settings.account.account.editButton" : "ანგარიშის მართვა",
+   "settings.account.accountType.basic" : "ძირითადი ანგარიში",
+   "settings.account.accountType.premium" : "პრემიუმ მხარდამჭერის ანგარიში",
+   "settings.account.buttonSave" : "პროფილის განახლება",
+   "settings.account.headline" : "ანგარიში",
+   "settings.account.headlineAccount" : "ანგარიშის ინფორმაცია",
+   "settings.account.headlineInvoices" : "ინვოისები",
+   "settings.account.headlinePassword" : "პაროლის შეცვლა",
+   "settings.account.headlineProfile" : "პროფილის განახლება",
+   "settings.account.headlineSubscription" : "თქვენი გამოწერა",
+   "settings.account.headlineUpgrade" : "განაახლეთ თქვენი ანგარიში და მხარი დაუჭირეთ Franz-ს",
+   "settings.account.invoiceDownload" : "გადმოწერა",
+   "settings.account.manageSubscription.label" : "თქვენი გამოწერის მართვა",
+   "settings.account.mining.active" : "თქვენ ახლა ასრულებთ {hashes} გაანგარიშებას წამში.",
+   "settings.account.mining.cancel" : "მაინინგის გაუქმება",
+   "settings.account.mining.moreInformation" : "მეტი ინფორმაციის მიღება",
+   "settings.account.mining.thankyou" : "გმადლობთ Franz-ის მხარდაჭერისთვის.",
+   "settings.account.successInfo" : "თქვენი ცვლილებები შენახულია",
+   "settings.account.tryReloadUserInfoRequest" : "სცადეთ ხელახლა",
+   "settings.account.userInfoRequestFailed" : "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
+   "settings.app.buttonInstallUpdate" : "გადატვირთეთ და დააყენეთ განახლება",
+   "settings.app.buttonSearchForUpdate" : "განახლებების შემოწმება",
+   "settings.app.currentVersion" : "ამჟამინდელი ვერსია:",
+   "settings.app.form.autoLaunchInBackground" : "გახსენით ფონზე",
+   "settings.app.form.autoLaunchOnStart" : "გაეშვას Franz სისტემის ჩატვირთვისას",
+   "settings.app.form.beta" : "ჩართეთ ბეტა ვერსიები",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "აჩვენეთ Franz სისტემის უჯრაში",
+   "settings.app.form.language" : "ენა",
+   "settings.app.form.minimizeToSystemTray" : "ჩაკეცეთ Franz სისტემის უჯრაში",
+   "settings.app.form.runInBackground" : "დატოვეთ Franz გაშვებული როდესაც ფანჯარა დაიხურება",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "პარამეტრები",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "მთავარი",
+   "settings.app.headlineLanguage" : "ენა",
+   "settings.app.headlineUpdates" : "განახლებები",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "განახლება ხელმისაწვდომია, იწყება გადმოწერა...",
+   "settings.app.updateStatusSearching" : "მიმდინარეობს განახლების ძიება",
+   "settings.app.updateStatusUpToDate" : "თქვენ იყენებთ Franz-ის უახლეს ვერსიას",
+   "settings.navigation.account" : "ანგარიში",
+   "settings.navigation.availableServices" : "ხელმისაწვდომი სერვისები",
+   "settings.navigation.logout" : "გასვლა",
+   "settings.navigation.settings" : "პარამეტრები",
+   "settings.navigation.yourServices" : "თქვენი სერვისები",
+   "settings.recipes.all" : "ყველა სერვისი",
+   "settings.recipes.dev" : "განვითარება",
+   "settings.recipes.headline" : "ხელმისაწვდომი სერვისები",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "ყველაზე პოპულარული",
+   "settings.recipes.nothingFound" : "უკაცრავად, მაგრამ არცერთი სერვისი არ შეესაბამება თქვენს ძიებას.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "სერვისი წარმატებით დაემატა",
+   "settings.service.error.goBack" : "სერვისებში დაბრუნება",
+   "settings.service.error.headline" : "შეცდომა",
+   "settings.service.error.message" : "სერვისის ჩატვირთვა ვერ მოხერხდა.",
+   "settings.service.form.addServiceHeadline" : "დაამატე {name}",
+   "settings.service.form.availableServices" : "ხელმისაწვდომი სერვისები",
+   "settings.service.form.customUrl" : "კერძო სერვერი",
+   "settings.service.form.customUrlPremiumInfo" : "თვით დაჰოსტილი სერვისების დასამატებლად საჭიროა Franz-ის პრემიუმ მხარდამჭერის ანგარიში.",
+   "settings.service.form.customUrlUpgradeAccount" : "განაახლეთ თქვენი ანგარიში",
+   "settings.service.form.customUrlValidationError" : "ვერ დადასტურდა {name} კერძო სერვერი.",
+   "settings.service.form.deleteButton" : "სერვისის წაშლა",
+   "settings.service.form.editServiceHeadline" : "შეასწორე {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "შეტყობინებების ჩართვა",
+   "settings.service.form.enableService" : "სერვისის ჩართვა",
+   "settings.service.form.indirectMessageInfo" : "თქვენ მიიღებთ შეტყობინებას ყოველი ახალი შეტყობინებისას არხზე, არამარტო @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "აჩვენე შეტყობინებების ნიშანი ყოველი ახალი შეტყობინებისთვის",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "სახელი",
+   "settings.service.form.saveButton" : "სერვისის შენახვა",
+   "settings.service.form.tabHosted" : "დაჰოსტილი",
+   "settings.service.form.tabOnPremise" : "თვით დაჰოსტილი ⭐️",
+   "settings.service.form.team" : "გუნდი",
+   "settings.service.form.yourServices" : "თქვენი სერვისები",
+   "settings.services.deletedInfo" : "სერვისი წაიშალა",
+   "settings.services.discoverServices" : "აღმოაჩინეთ სერვისები",
+   "settings.services.headline" : "თქვენი სერვისები",
+   "settings.services.noServicesAdded" : "თქვენ ჯერ არ გაქვთ სერვისები დამატებული.",
+   "settings.services.tooltip.isDisabled" : "სერვისი გათიშულია",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "შეტყობინებები გათიშულია",
+   "settings.services.updatedInfo" : "ცვლილებები შენახულია",
+   "settings.user.form.accountType.company" : "კომპანია",
+   "settings.user.form.accountType.individual" : "ინდივიდუალური",
+   "settings.user.form.accountType.label" : "ანგარიშის ტიპი",
+   "settings.user.form.accountType.non-profit" : "არაკომერციული",
+   "settings.user.form.currentPassword" : "ამჟამინდელი პაროლი",
+   "settings.user.form.email" : "მეილი",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "ახალი პაროლი",
+   "sidebar.addNewService" : "Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "პარამეტრები",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "კომპანია",
+   "signup.email.label" : "მეილი",
+   "signup.emailDuplicate" : "მომხმარებელი ამ მეილით უკვე არსებობს",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "ანგარიშის შექმნა",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "Franz-ის ანგარიშის შექმნით თქვენ ეთანხმებით",
+   "signup.legal.privacy" : "კონფიდენციალურობის შესახებ",
+   "signup.legal.terms" : "მომსახურების პირობები",
+   "signup.link.login" : "უკვე გაქვთ ანგარიში?",
+   "signup.password.label" : "პაროლი",
+   "signup.submit.label" : "ანგარიშის შექმნა",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "არანაირი რეკლამები, არასდროს!",
+   "subscription.features.comingSoon" : "მალე",
+   "subscription.features.customServices" : "პირადი მომსახურება თქვენთვის და თქვენი გუნდისთვის",
+   "subscription.features.encryptedSync" : "დაშიფრული სესიის სინქრონიზაცია",
+   "subscription.features.onpremise" : "on-premise\/hosted სერვისების დამატება, როგორიცაა HipChat",
+   "subscription.features.vpn" : "Proxy-სა და VPN-ის მხარდაჭერა",
+   "subscription.includedFeatures" : "ფასიანი Franz-ის პრემიუმ მხარმდამჭერი ანგარიში",
+   "subscription.mining.experimental" : "ექსპერიმენტული",
+   "subscription.mining.headline" : "როგორ მუშაობს?",
+   "subscription.mining.line1" : "\"პროცესორული დამუშავების ძალით მხარდაჭერის\" გააქტიურებით, Franz გამოიყენებს თქვენი პროცესორის 20-50% სიმძლავრეს Monero კრიპტოვალუტის მაინინგისთვის, რომელიც დაახლოებით გამოიმუშავებს $5-ს წელიწადში.",
+   "subscription.mining.line2" : "ჩვენ მოვახდენთ პროცესორის გამოყენების ადაპტირებას, რათა არ გაითიშოს თქვენი ბატარეა ან შეაყოვნოს თქვენი მოწყობილობა.",
+   "subscription.mining.line3" : "სანამ მაინიგი მიმდინარეობს, თქვენ გექნებათ ულიმიტო წვდომა ყველა Franz-ის პრემიუმ მხარდამჭერის მახასიათებლებზე.",
+   "subscription.mining.moreInformation" : "მიიღეთ მეტი ინფორმაცია ამის შესახებ.",
+   "subscription.paymentSessionError" : "გადახდის ფორმატის ინიციალიზაცია ვერ მოხერხდა",
+   "subscription.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
+   "subscription.type.free" : "უფასო",
+   "subscription.type.mining" : "Franz-ის მხარდაჭერა პროცესორული დამუშავების ძალით",
+   "subscription.type.month" : "თვე",
+   "subscription.type.year" : "წელი",
+   "subscriptionPopup.buttonCancel" : "გაუქმება",
+   "subscriptionPopup.buttonDone" : "შესრულებულია",
+   "tabs.item.deleteService" : "სერვისის წაშლა",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "შეტყობინებების გამორთვა",
+   "tabs.item.disableService" : "სერვისის გაუქმება",
+   "tabs.item.edit" : "რედაქტირება",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "შეტყობინებების ჩართვა",
+   "tabs.item.enableService" : "სერვისის ჩართვა",
+   "tabs.item.reload" : "ჩატვირთვა",
+   "welcome.loginButton" : "შედით თქვენს ანგარიშში",
+   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა",
+   "welcome.slogan" : "შეტყობინების აპლიკაცია, რომელიც მუშაობს შენთვის"
+}
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index a19d51b2b..70ae4467e 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,168 +1,192 @@
-{
-  "global.api.unhealthy": "Kan geen verbinding maken met de Franz online services",
-  "global.notConnectedToTheInternet": "Je bent niet verbonden met het internet.",
-  "welcome.signupButton": "Maak een gratis account aan",
-  "welcome.loginButton": "Inloggen op je account",
-  "welcome.slogan": "Messaging that works for you",
-  "login.headline": "Inloggen",
-  "login.email.label": "E-mailadres",
-  "login.password.label": "Wachtwoord",
-  "login.submit.label": "Log in",
-  "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
-  "login.tokenExpired": "Je sessie is verlopen, log opnieuw in a.u.b..",
-  "login.serverLogout": "Je sessie is verlopen, log opnieuw in a.u.b..",
-  "login.link.signup": "Gratis account aanmaken",
-  "login.link.password": "Wachtwoord resetten",
-  "password.headline": "Wachtwoord resetten",
-  "password.email.label": "E-mailadres",
-  "password.submit.label": "Doorgaan",
-  "password.noUser": "Geen gebruiker met dit e-mailadres gevonden",
-  "password.successInfo": "Kijk je mail na",
-  "password.link.signup": "Gratis account aanmaken",
-  "password.link.login": "Inloggen op je account",
-  "signup.headline": "Registreren",
-  "signup.firstname.label": "Naam",
-  "signup.lastname.label": "Achternaam",
-  "signup.email.label": "E-mailadres",
-  "signup.company.label": "Bedrijf",
-  "signup.password.label": "Wachtwoord",
-  "signup.submit.label": "Account aanmaken",
-  "signup.link.login": "Al een account, inloggen?",
-  "signup.emailDuplicate": "Er bestaat reeds een gebruiker met dat e-mailadres",
-  "signup.legal.info": "Door een account aan te maken aanvaard je de",
-  "signup.legal.terms": "Servicevoorwaarden",
-  "signup.legal.privacy": "Privacyverklaring",
-  "pricing.headline": "Franz Steunen",
-  "pricing.support.label": "Selecteer je steunplan",
-  "pricing.submit.label": "Ik wil de ontwikkeling van Franz steunen",
-  "pricing.link.skipPayment": "Ik wil de ontwikkeling van Franz niet steunen.",
-  "import.headline": "Je Franz 4 services importeren",
-  "import.notSupportedHeadline": "Services nog niet ondersteund in Franz 5",
-  "import.submit.label": "Services importeren",
-  "import.skip.label": "Ik wil services handmatig toevoegen",
-  "invite.submit.label": "Uitnodiging sturen",
-  "invite.headline.friends": "3 van je vrienden of collega's uitnodigen",
-  "invite.name.label": "Naam",
-  "invite.email.label": "E-mailadres",
-  "invite.skip.label": "Ik wil dit later doen",
-  "subscription.submit.label": "Ik wil de ontwikkeling van Franz steunen",
-  "subscription.paymentSessionError": "Betalingsformulier kon niet geladen worden",
-  "subscription.includedFeatures": "Een betalend account voor Franz omvat",
-  "subscription.features.onpremise": "Intern gehoste services zoals HipChat",
-  "subscription.features.customServices": "Persoonlijke services voor jou en je team",
-  "subscription.features.encryptedSync": "Synchronisatie van geëncrypteerde sessies",
-  "subscription.features.vpn": "Proxy & VPN ondersteuning",
-  "subscription.features.ads": "Geen reclame, nooit!",
-  "subscription.features.comingSoon": "komt binnenkort",
-  "infobar.servicesUpdated": "Je services zijn geüpdatet.",
-  "infobar.updateAvailable": "Er is een nieuwe update van Franz beschikbaar.",
-  "infobar.buttonReloadServices": "Services herladen",
-  "infobar.buttonInstallUpdate": "Herstarten & update installeren",
-  "infobar.requiredRequestsFailed": "Kon services en gebruikersinformatie niet laden",
-  "sidebar.settings": "Instellingen",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Welkom bij Franz",
-  "services.getStarted": "Begin",
-  "settings.account.headline": "Account",
-  "settings.account.headlineSubscription": "Je abonnement",
-  "settings.account.headlineUpgrade": "Upgrade je account & ondersteun Franz",
-  "settings.account.headlineInvoices": "Facturen",
-  "settings.account.manageSubscription.label": "Je abonnement beheren",
-  "settings.account.accountType.basic": "Basisaccount",
-  "settings.account.accountType.premium": "Premium Supporter Account",
-  "settings.account.account.editButton": "Account aanpassen",
-  "settings.account.invoiceDownload": "Downloaden",
-  "settings.account.userInfoRequestFailed": "Kon de gebruikersinformatie niet laden",
-  "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
-  "settings.account.headlineProfile": "Profiel aanpassen",
-  "settings.account.headlineAccount": "Accountinformatie",
-  "settings.account.headlinePassword": "Wachtwoord veranderen",
-  "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
-  "settings.account.buttonSave": "Profiel aanpassen",
-  "settings.account.mining.thankyou": "Bedankt om Franz te steunen met je rekenkracht.",
-  "settings.account.mining.active": "Op dit moment maak je {hashes} berekeningen per seconde.",
-  "settings.account.mining.moreInformation": "Meer informatie",
-  "settings.account.mining.cancel": "Mijnen annuleren",
-  "settings.navigation.availableServices": "Beschikbare services",
-  "settings.navigation.yourServices": "Jouw services",
-  "settings.navigation.account": "Account",
-  "settings.navigation.settings": "Instellingen",
-  "settings.navigation.logout": "Uitloggen",
-  "settings.recipes.headline": "Beschikbare services",
-  "settings.recipes.mostPopular": "Meest populair",
-  "settings.recipes.all": "Alle services",
-  "settings.recipes.dev": "Ontwikkeling",
-  "settings.recipes.nothingFound": "Sorry, maar geen enkele service kwam overeen met je zoekterm.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Service succesvol toegevoegd",
-  "settings.service.form.saveButton": "Service bewaren",
-  "settings.service.form.deleteButton": "Service verwijderen",
-  "settings.service.form.availableServices": "Beschikbare services",
-  "settings.service.form.yourServices": "Jouw services",
-  "settings.service.form.addServiceHeadline": "{name} toevoegen",
-  "settings.service.form.editServiceHeadline": "{name} aanpassen",
-  "settings.service.form.tabHosted": "Gehost",
-  "settings.service.form.tabOnPremise": "Intern gehost ⭐️",
-  "settings.service.form.customUrlValidationError": "Kon de custom {name} server niet valideren.",
-  "settings.service.form.customUrlPremiumInfo": "Om intern gehoste services toe te voegen heb je een Franz Premium Supporter Account nodig.",
-  "settings.service.form.customUrlUpgradeAccount": "Je account upgraden",
-  "settings.service.form.indirectMessageInfo": "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
-  "settings.service.error.headline": "Fout",
-  "settings.service.error.goBack": "Terug naar de services",
-  "settings.service.error.message": "Kon het service-recept niet laden.",
-  "settings.services.tooltip.isDisabled": "Service staat uit",
-  "settings.services.tooltip.notificationsDisabled": "Notificaties staan uit",
-  "settings.services.headline": "Jouw services",
-  "settings.services.noServicesAdded": "Je hebt nog geen services toegevoegd.",
-  "settings.services.discoverServices": "Services ontdekken",
-  "settings.services.updatedInfo": "Je wijzigingen werden bewaard",
-  "settings.services.deletedInfo": "Service werd verwijderd",
-  "settings.app.headline": "Instellingen",
-  "settings.app.headlineGeneral": "Algemeen",
-  "settings.app.headlineLanguage": "Talen",
-  "settings.app.headlineUpdates": "Updates",
-  "settings.app.buttonSearchForUpdate": "Controleren op updates",
-  "settings.app.buttonInstallUpdate": "Herstart & installeer update",
-  "settings.app.updateStatusSearching": "Zoeken naar updates",
-  "settings.app.updateStatusAvailable": "Update beschikbaar, wordt gedownload...",
-  "settings.app.updateStatusUpToDate": "Je gebruikt de laatste versie van Franz",
-  "settings.app.form.autoLaunchOnStart": "Franz lanceren bij het starten",
-  "settings.app.form.autoLaunchInBackground": "In de achtergrond openen",
-  "settings.app.form.minimizeToSystemTray": "Franz naar je systeemvak minimaliseren",
-  "settings.app.form.runInBackground": "Franz in de achtergrond draaien wanneer je het venster sluit",
-  "settings.app.form.language": "Taal",
-  "settings.app.form.beta": "Ook beta versies",
-  "settings.app.currentVersion": "Huidige versie:",
-  "settings.service.form.name": "Naam",
-  "settings.service.form.enableService": "Service aanzetten",
-  "settings.service.form.enableNotification": "Notificaties aanzetten",
-  "settings.service.form.team": "Team",
-  "settings.service.form.customUrl": "Aangepaste server",
-  "settings.service.form.indirectMessages": "Toon berichten-badge voor alle nieuwe berichten",
-  "settings.user.form.firstname": "Naam",
-  "settings.user.form.lastname": "Achternaam",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Huidig wachtwoord",
-  "settings.user.form.newPassword": "Nieuw wachtwoord",
-  "settings.user.form.accountType.label": "Account type",
-  "settings.user.form.accountType.individual": "Particulier",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Bedrijf",
-  "subscription.type.free": "gratis",
-  "subscription.type.month": "maand",
-  "subscription.type.year": "jaar",
-  "subscription.type.mining": "Franz ondersteunen met rekenkracht",
-  "subscription.mining.headline": "Hoe werkt dit?",
-  "subscription.mining.experimental": "experimenteel",
-  "subscription.mining.line1": "Door \"Ondersteunen met rekenkracht\" aan te zetten zal Franz ongeveer 20-50% van je CPU gebruiken om Monero cryptocurrency te minen, wat ongeveer op €4,3/jaar neerkomt.",
-  "subscription.mining.line2": "Het CPU gebruik zal aangepast worden aan je werkgedrag zodat we je batterij niet leeg laten lopen of jou en je machine vertragen.",
-  "subscription.mining.line3": "Zolang de miner actief is heb je ongelimiteerde toegang tot alle Franz Premium Supporter Features.",
-  "subscription.mining.moreInformation": "Meer informatie over dit plan.",
-  "subscriptionPopup.buttonCancel": "Annuleren",
-  "subscriptionPopup.buttonDone": "Klaar",
-  "tabs.item.reload": "Herladen",
-  "tabs.item.edit": "Aanpassen",
-  "tabs.item.disableNotifications": "Notificaties uitschakelen",
-  "tabs.item.enableNotification": "Notificaties inschakelen",
-  "tabs.item.disableService": "Service uitschakelen",
-  "tabs.item.deleteService": "Service verwijderen"
+{
+   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
+   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
+   "import.headline" : "Importeer je Franz 4 services",
+   "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
+   "import.skip.label" : "Ik wil handmatig een service toevoegen",
+   "import.submit.label" : "Importeer services",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
+   "infobar.buttonReloadServices" : "Herlaad de services",
+   "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
+   "infobar.servicesUpdated" : "Je services zijn geüpdatet.",
+   "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
+   "invite.email.label" : "E-mailadres",
+   "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
+   "invite.name.label" : "Naam",
+   "invite.skip.label" : "Ik wil dit later doen",
+   "invite.submit.label" : "Verzend uitnodigingen",
+   "login.email.label" : "E-mailadres",
+   "login.headline" : "Inloggen",
+   "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
+   "login.link.password" : "Wachtwoord resetten",
+   "login.link.signup" : "Maak een gratis account",
+   "login.password.label" : "Wachtwoord",
+   "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "login.submit.label" : "Log in",
+   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "password.email.label" : "E-mailadres",
+   "password.headline" : "Wachtwoord resetten",
+   "password.link.login" : "Log in op je account",
+   "password.link.signup" : "Maak een gratis account",
+   "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
+   "password.submit.label" : "Doorgaan",
+   "password.successInfo" : "Controleer alsjeblieft je e-mail",
+   "pricing.headline" : "Ondersteun Franz",
+   "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
+   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
+   "pricing.support.label" : "Selecteer je ondersteuningsplan",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Beginnen",
+   "services.welcome" : "Welkom bij Franz",
+   "settings.account.account.editButton" : "Bewerk account",
+   "settings.account.accountType.basic" : "Basis Account",
+   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.buttonSave" : "Profiel aanpassen",
+   "settings.account.headline" : "Account",
+   "settings.account.headlineAccount" : "Account informatie",
+   "settings.account.headlineInvoices" : "Facturen",
+   "settings.account.headlinePassword" : "Wijzig wachtwoord",
+   "settings.account.headlineProfile" : "Profiel aanpassen",
+   "settings.account.headlineSubscription" : "Je abonnement",
+   "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
+   "settings.account.invoiceDownload" : "Download",
+   "settings.account.manageSubscription.label" : "Beheer je abonnement",
+   "settings.account.mining.active" : "Op dit moment voer je {hashes} berekingen per seconde uit.",
+   "settings.account.mining.cancel" : "Stop mining",
+   "settings.account.mining.moreInformation" : "Meer informatie",
+   "settings.account.mining.thankyou" : "Bedankt voor je ondersteuning van Franz met je rekenkracht.",
+   "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
+   "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
+   "settings.app.buttonSearchForUpdate" : "Controleer op updates",
+   "settings.app.currentVersion" : "Huidige versie:",
+   "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
+   "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
+   "settings.app.form.beta" : "Inclusief bèta versies",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
+   "settings.app.form.language" : "Taal",
+   "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
+   "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Instellingen",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Algemeen",
+   "settings.app.headlineLanguage" : "Taal",
+   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
+   "settings.app.updateStatusSearching" : "Zoekt naar updates",
+   "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
+   "settings.navigation.account" : "Account",
+   "settings.navigation.availableServices" : "Beschikbare services",
+   "settings.navigation.logout" : "Uitloggen",
+   "settings.navigation.settings" : "Instellingen",
+   "settings.navigation.yourServices" : "Jouw services",
+   "settings.recipes.all" : "Alle services",
+   "settings.recipes.dev" : "Ontwikkeling",
+   "settings.recipes.headline" : "Beschikbare services",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Meest populair",
+   "settings.recipes.nothingFound" : "Sorry, maar geen enkele service kwam overeen met je zoekterm.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
+   "settings.service.error.goBack" : "Terug naar de services",
+   "settings.service.error.headline" : "Fout",
+   "settings.service.error.message" : "Kon het service-recept niet laden.",
+   "settings.service.form.addServiceHeadline" : "{name} toevoegen",
+   "settings.service.form.availableServices" : "Beschikbare services",
+   "settings.service.form.customUrl" : "Aangepaste server",
+   "settings.service.form.customUrlPremiumInfo" : "Om intern gehoste services toe te voegen heb je een Franz Premium Supporter Account nodig.",
+   "settings.service.form.customUrlUpgradeAccount" : "Je account upgraden",
+   "settings.service.form.customUrlValidationError" : "Kon de custom {name} server niet valideren.",
+   "settings.service.form.deleteButton" : "Service verwijderen",
+   "settings.service.form.editServiceHeadline" : "{name} aanpassen",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Notificaties aanzetten",
+   "settings.service.form.enableService" : "Service aanzetten",
+   "settings.service.form.indirectMessageInfo" : "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Naam",
+   "settings.service.form.saveButton" : "Service bewaren",
+   "settings.service.form.tabHosted" : "Gehost",
+   "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
+   "settings.service.form.team" : "Team",
+   "settings.service.form.yourServices" : "Jouw services",
+   "settings.services.deletedInfo" : "Service werd verwijderd",
+   "settings.services.discoverServices" : "Services ontdekken",
+   "settings.services.headline" : "Jouw services",
+   "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.tooltip.isDisabled" : "Service staat uit",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
+   "settings.services.updatedInfo" : "Je wijzigingen werden bewaard",
+   "settings.user.form.accountType.company" : "Bedrijf",
+   "settings.user.form.accountType.individual" : "Particulier",
+   "settings.user.form.accountType.label" : "Account type",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Huidig wachtwoord",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "Naam",
+   "settings.user.form.lastname" : "Achternaam",
+   "settings.user.form.newPassword" : "Nieuw wachtwoord",
+   "sidebar.addNewService" : "!!!Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Instellingen",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Bedrijf",
+   "signup.email.label" : "E-mailadres",
+   "signup.emailDuplicate" : "Er bestaat reeds een gebruiker met dat e-mailadres",
+   "signup.firstname.label" : "Naam",
+   "signup.headline" : "Registreren",
+   "signup.lastname.label" : "Achternaam",
+   "signup.legal.info" : "Door een account aan te maken aanvaard je de",
+   "signup.legal.privacy" : "Privacyverklaring",
+   "signup.legal.terms" : "Servicevoorwaarden",
+   "signup.link.login" : "Al een account, inloggen?",
+   "signup.password.label" : "Wachtwoord",
+   "signup.submit.label" : "Account aanmaken",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Geen reclame, nooit!",
+   "subscription.features.comingSoon" : "komt binnenkort",
+   "subscription.features.customServices" : "Persoonlijke services voor jou en je team",
+   "subscription.features.encryptedSync" : "Synchronisatie van geëncrypteerde sessies",
+   "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
+   "subscription.features.vpn" : "Proxy & VPN ondersteuning",
+   "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
+   "subscription.mining.experimental" : "experimenteel",
+   "subscription.mining.headline" : "Hoe werkt dit?",
+   "subscription.mining.line1" : "Door \"Ondersteunen met rekenkracht\" aan te zetten zal Franz ongeveer 20-50% van je CPU gebruiken om Monero cryptocurrency te minen, wat ongeveer op €4,3\/jaar neerkomt.",
+   "subscription.mining.line2" : "Het CPU gebruik zal aangepast worden aan je werkgedrag zodat we je batterij niet leeg laten lopen of jou en je machine vertragen.",
+   "subscription.mining.line3" : "Zolang de miner actief is heb je ongelimiteerde toegang tot alle Franz Premium Supporter Features.",
+   "subscription.mining.moreInformation" : "Meer informatie over dit plan.",
+   "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
+   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
+   "subscription.type.free" : "gratis",
+   "subscription.type.mining" : "Franz ondersteunen met rekenkracht",
+   "subscription.type.month" : "maand",
+   "subscription.type.year" : "jaar",
+   "subscriptionPopup.buttonCancel" : "Annuleren",
+   "subscriptionPopup.buttonDone" : "Klaar",
+   "tabs.item.deleteService" : "Service verwijderen",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Notificaties uitschakelen",
+   "tabs.item.disableService" : "Service uitschakelen",
+   "tabs.item.edit" : "Aanpassen",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Notificaties inschakelen",
+   "tabs.item.enableService" : "Service aanzetten",
+   "tabs.item.reload" : "Herladen",
+   "welcome.loginButton" : "Inloggen op je account",
+   "welcome.signupButton" : "Maak een gratis account aan",
+   "welcome.slogan" : "Messaging that works for you"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index aee1a52c8..a78a08878 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,169 +1,192 @@
-{
-  "global.api.unhealthy": "Kan niet verbinden met Franz online services",
-  "global.notConnectedToTheInternet": "Je bent niet verbonden met het internet.",
-  "welcome.signupButton": "Maak een gratis account",
-  "welcome.loginButton": "Log in op je account",
-  "welcome.slogan": "Messaging dat voor jou werkt",
-  "login.headline": "Inloggen",
-  "login.email.label": "E-mailadres",
-  "login.password.label": "Wachtwoord",
-  "login.submit.label": "Inloggen",
-  "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
-  "login.tokenExpired": "De sessie is verlopen, log opnieuw in alsjeblieft.",
-  "login.serverLogout": "De sessie is verlopen, log opnieuw in alsjeblieft.",
-  "login.link.signup": "Maak een gratis account",
-  "login.link.password": "Wachtwoord vergeten",
-  "password.headline": "Wachtwoord vergeten",
-  "password.email.label": "E-mailadres",
-  "password.submit.label": "Verzenden",
-  "password.noUser": "Geen gebruiker bekend met dat e-mailadres",
-  "password.successInfo": "Controleer alsjeblieft je e-mail",
-  "password.link.signup": "Maak een nieuw account aan",
-  "password.link.login": "Log in op je account",
-  "signup.headline": "Aanmelden",
-  "signup.firstname.label": "Voornaam",
-  "signup.lastname.label": "Achternaam",
-  "signup.email.label": "E-mailadres",
-  "signup.company.label": "Bedrijf",
-  "signup.password.label": "Wachtwoord",
-  "signup.submit.label": "Maak account aan",
-  "signup.link.login": "Al een account? Log in!",
-  "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
-  "signup.legal.info": "Door een Franz account aan te maken ga je akkoord met de",
-  "signup.legal.terms": "Gebruiksvoorwaarden",
-  "signup.legal.privacy": "Privacy Voorwaarden",
-  "pricing.headline": "Ondersteun Franz",
-  "pricing.support.label": "Selecteer je ondersteuningsplan",
-  "pricing.submit.label": "Ik wil de ontwikkeling van Franz ondersteunen",
-  "pricing.link.skipPayment": "Ik wil de ontwikkeling van Franz niet ondersteunen.",
-  "import.headline": "Importeer je Franz 4 services",
-  "import.notSupportedHeadline": "Services nog niet ondersteund in Franz 5",
-  "import.submit.label": "Importeer services",
-  "import.skip.label": "Ik wil services handmatig toevoegen",
-  "invite.submit.label": "Verzend uitnodigingen",
-  "invite.headline.friends": "Nodig 3 van je vrienden of collega's uit",
-  "invite.name.label": "Naam",
-  "invite.email.label": "E-mailadres",
-  "invite.skip.label": "Ik wil dit later doen",
-  "subscription.submit.label": "Ik wil de ontwikkeling van Franz ondersteunen",
-  "subscription.paymentSessionError": "Kan betaalformulier niet initialiseren",
-  "subscription.includedFeatures": "Betaald Franz Premium Supporter Account bevat",
-  "subscription.features.onpremise": "Add on-geschikt/gehoste services zoals HipChat",
-  "subscription.features.customServices": "Privé services voor jou en je team",
-  "subscription.features.encryptedSync": "Beveiligde sessie synchronisatie",
-  "subscription.features.vpn": "Proxy & VPN ondersteuning",
-  "subscription.features.ads": "Geen advertenties, nooit!",
-  "subscription.features.comingSoon": "komt binnenkort",
-  "infobar.servicesUpdated": "Je services zijn geüpdatet.",
-  "infobar.updateAvailable": "Een nieuwe update voor Franz is beschikbaar.",
-  "infobar.buttonReloadServices": "Herlaad services",
-  "infobar.buttonInstallUpdate": "Herstart & installeer update",
-  "infobar.requiredRequestsFailed": "Kon services en gebruikerinformatie niet laden",
-  "sidebar.settings": "Instellingen",
-  "sidebar.addNewService": "Voeg nieuwe service toe",
-  "services.welcome": "Welkom bij Franz",
-  "services.getStarted": "Beginnen",
-  "settings.account.headline": "Account",
-  "settings.account.headlineSubscription": "Je abonnement",
-  "settings.account.headlineUpgrade": "Upgrade je account & ondersteun Franz",
-  "settings.account.headlineInvoices": "Facturen",
-  "settings.account.manageSubscription.label": "Beheer je abonnement",
-  "settings.account.accountType.basic": "Basis Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
-  "settings.account.account.editButton": "Bewerk account",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.userInfoRequestFailed": "Kon gebruikerinformatie niet laden",
-  "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
-  "settings.account.headlineProfile": "Update profiel",
-  "settings.account.headlineAccount": "Account informatie",
-  "settings.account.headlinePassword": "Wijzig wachtwoord",
-  "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
-  "settings.account.buttonSave": "Update profiel",
-  "settings.account.mining.thankyou": "Bedankt voor je ondersteuning van Franz met je rekenkracht.",
-  "settings.account.mining.active": "Op dit moment voer je {hashes} berekingen per seconde uit.",
-  "settings.account.mining.moreInformation": "Meer informatie",
-  "settings.account.mining.cancel": "Stop mining",
-  "settings.navigation.availableServices": "Beschikbare services",
-  "settings.navigation.yourServices": "Jouw services",
-  "settings.navigation.account": "Account",
-  "settings.navigation.settings": "Instellingen",
-  "settings.navigation.logout": "Uitloggen",
-  "settings.recipes.headline": "Beschikbare services",
-  "settings.recipes.mostPopular": "Meest populair",
-  "settings.recipes.all": "Alle services",
-  "settings.recipes.dev": "Ontwikkeling",
-  "settings.recipes.nothingFound": "Geen service kwam overeen met je zoekopdracht.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Service succesvol toegevoegd",
-  "settings.service.form.saveButton": "Opslaan service",
-  "settings.service.form.deleteButton": "Verwijder service",
-  "settings.service.form.availableServices": "Beschikbare services",
-  "settings.service.form.yourServices": "Jouw services",
-  "settings.service.form.addServiceHeadline": "Toevoegen {name}",
-  "settings.service.form.editServiceHeadline": "Bewerk {name}",
-  "settings.service.form.tabHosted": "Gehost",
-  "settings.service.form.tabOnPremise": "Zelf-gehoste ??",
-  "settings.service.form.customUrlValidationError": "Kon custom server {name} niet valideren.",
-  "settings.service.form.customUrlPremiumInfo": "Om zelf-gehoste services toe te kunnen voegen, heb je een Franz Premium Supporter Account nodig.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade je account",
-  "settings.service.form.indirectMessageInfo": "Je ontvangt meldingen van alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
-  "settings.service.error.headline": "Fout",
-  "settings.service.error.goBack": "Terug naar services",
-  "settings.service.error.message": "Kon servicerecept niet laden.",
-  "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
-  "settings.services.tooltip.notificationsDisabled": "Meldingen zijn uitgeschakeld",
-  "settings.services.headline": "Jouw services",
-  "settings.services.noServicesAdded": "Je hebt nog geen services toegevoegd.",
-  "settings.services.discoverServices": "Ontdek services",
-  "settings.services.updatedInfo": "Je wijzigingen zijn opgeslagen",
-  "settings.services.deletedInfo": "Service is verwijderd",
-  "settings.app.headline": "Instellingen",
-  "settings.app.headlineGeneral": "Algemeen",
-  "settings.app.headlineLanguage": "Taal",
-  "settings.app.headlineUpdates": "Updates",
-  "settings.app.buttonSearchForUpdate": "Controleer op updates",
-  "settings.app.buttonInstallUpdate": "Herstart & installeer update",
-  "settings.app.updateStatusSearching": "Zoekt naar updates",
-  "settings.app.updateStatusAvailable": "Update beschikbaar, downloaden...",
-  "settings.app.updateStatusUpToDate": "Je gebruikt de laatste versie van Franz",
-  "settings.app.form.autoLaunchOnStart": "Lanceer Franz bij opstarten",
-  "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
-  "settings.app.form.enableSystemTray": "Toon Franz in de systeembalk",
-  "settings.app.form.minimizeToSystemTray": "Minimaliseer Franz naar de systeembal",
-  "settings.app.form.runInBackground": "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
-  "settings.app.form.language": "Taal",
-  "settings.app.form.beta": "Inclusief beta versies",
-  "settings.app.currentVersion": "Huidige versie:",
-  "settings.service.form.name": "Naam",
-  "settings.service.form.enableService": "Activeer service",
-  "settings.service.form.enableNotification": "Activeer meldingen",
-  "settings.service.form.team": "Team",
-  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.indirectMessages": "Toon berichtenbadge voor alle nieuwe berichten",
-  "settings.user.form.firstname": "Voornaam",
-  "settings.user.form.lastname": "Achternaam",
-  "settings.user.form.email": "E-mailadres",
-  "settings.user.form.currentPassword": "Huidig wachtwoord",
-  "settings.user.form.newPassword": "Nieuw wachtwoord",
-  "settings.user.form.accountType.label": "Account type",
-  "settings.user.form.accountType.individual": "Individueel",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Bedrijf",
-  "subscription.type.free": "gratis",
-  "subscription.type.month": "maand",
-  "subscription.type.year": "jaar",
-  "subscription.type.mining": "Ondersteun Franz met rekenkracht",
-  "subscription.mining.headline": "Hoe werkt dit?",
-  "subscription.mining.experimental": "experimenteel",
-  "subscription.mining.line1": "Door \"Ondersteun met rekenkracht\" te activeren, zal Franz ongeveer 20-50% van je CPU gebruiken om de cryptomunt Monero te minen, wat overeenkomt met ongeveer $ 5/jaar.",
-  "subscription.mining.line2": "We zullen het CPU-gebruik aanpassen aan je gebruik en daarmee voorkomen dat de batterij niet leegloopt of dat jij en je werk afgeremd wordt.",
-  "subscription.mining.line3": "Zolang de miner actief is, heb je onbeperkt toegang tot alle Franz Premium Supporter Features.",
-  "subscription.mining.moreInformation": "Verkrijg meer informatie over dit plan.",
-  "subscriptionPopup.buttonCancel": "Annuleer",
-  "subscriptionPopup.buttonDone": "Klaar",
-  "tabs.item.reload": "Herlaad",
-  "tabs.item.edit": "Bewerk",
-  "tabs.item.disableNotifications": "Uitschakelen meldingen",
-  "tabs.item.enableNotification": "Inschakelen meldingen",
-  "tabs.item.disableService": "Uitschakelen service",
-  "tabs.item.deleteService": "Verwijderen service"
+{
+   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
+   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
+   "import.headline" : "Importeer je Franz 4 services",
+   "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
+   "import.skip.label" : "Ik wil handmatig een service toevoegen",
+   "import.submit.label" : "Importeer services",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
+   "infobar.buttonReloadServices" : "Herlaad de services",
+   "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
+   "infobar.servicesUpdated" : "Je services zijn geüpdatet.",
+   "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
+   "invite.email.label" : "E-mailadres",
+   "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
+   "invite.name.label" : "Naam",
+   "invite.skip.label" : "Ik wil dit later doen",
+   "invite.submit.label" : "Verzend uitnodigingen",
+   "login.email.label" : "E-mailadres",
+   "login.headline" : "Inloggen",
+   "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
+   "login.link.password" : "Wachtwoord vergeten",
+   "login.link.signup" : "Maak een gratis account",
+   "login.password.label" : "Wachtwoord",
+   "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "login.submit.label" : "Inloggen",
+   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "password.email.label" : "E-mailadres",
+   "password.headline" : "Wachtwoord vergeten",
+   "password.link.login" : "Log in op je account",
+   "password.link.signup" : "Maak een gratis account",
+   "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
+   "password.submit.label" : "Verzenden",
+   "password.successInfo" : "Controleer alsjeblieft je e-mail",
+   "pricing.headline" : "Ondersteun Franz",
+   "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
+   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
+   "pricing.support.label" : "Selecteer je ondersteuningsplan",
+   "service.crashHandler.action" : "{name} herladen",
+   "service.crashHandler.autoReload" : "Probeer {name} te herstellen over {seconds} seconden",
+   "service.crashHandler.headline" : "Oh nee!",
+   "service.crashHandler.text" : "{name} heeft voor een fout gezorgd.",
+   "service.disabledHandler.action" : "Activeer {name}",
+   "service.disabledHandler.headline" : "{name} is uitgeschakeld",
+   "services.getStarted" : "Beginnen",
+   "services.welcome" : "Welkom bij Franz",
+   "settings.account.account.editButton" : "Bewerk account",
+   "settings.account.accountType.basic" : "Basis Account",
+   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.buttonSave" : "Update profiel",
+   "settings.account.headline" : "Account",
+   "settings.account.headlineAccount" : "Account informatie",
+   "settings.account.headlineInvoices" : "Facturen",
+   "settings.account.headlinePassword" : "Wijzig wachtwoord",
+   "settings.account.headlineProfile" : "Update profiel",
+   "settings.account.headlineSubscription" : "Je abonnement",
+   "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
+   "settings.account.invoiceDownload" : "Download",
+   "settings.account.manageSubscription.label" : "Beheer je abonnement",
+   "settings.account.mining.active" : "Op dit moment voer je {hashes} berekingen per seconde uit.",
+   "settings.account.mining.cancel" : "Stop mining",
+   "settings.account.mining.moreInformation" : "Meer informatie",
+   "settings.account.mining.thankyou" : "Bedankt voor je ondersteuning van Franz met je rekenkracht.",
+   "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
+   "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
+   "settings.app.buttonSearchForUpdate" : "Controleer op updates",
+   "settings.app.currentVersion" : "Huidige versie:",
+   "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
+   "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
+   "settings.app.form.beta" : "Inclusief bèta versies",
+   "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
+   "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
+   "settings.app.form.language" : "Taal",
+   "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
+   "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
+   "settings.app.form.showDisabledServices" : "Laat uitgeschakelde services zien",
+   "settings.app.headline" : "Instellingen",
+   "settings.app.headlineAdvanced" : "Geavanceerd",
+   "settings.app.headlineAppearance" : "Weergave",
+   "settings.app.headlineGeneral" : "Algemeen",
+   "settings.app.headlineLanguage" : "Taal",
+   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
+   "settings.app.updateStatusSearching" : "Zoekt naar updates",
+   "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
+   "settings.navigation.account" : "Account",
+   "settings.navigation.availableServices" : "Beschikbare services",
+   "settings.navigation.logout" : "Uitloggen",
+   "settings.navigation.settings" : "Instellingen",
+   "settings.navigation.yourServices" : "Jouw services",
+   "settings.recipes.all" : "Alle services",
+   "settings.recipes.dev" : "Ontwikkeling",
+   "settings.recipes.headline" : "Beschikbare services",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Meest populair",
+   "settings.recipes.nothingFound" : "Geen service kwam overeen met je zoekopdracht.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
+   "settings.service.error.goBack" : "Terug naar services",
+   "settings.service.error.headline" : "Fout",
+   "settings.service.error.message" : "Kon servicerecept niet laden.",
+   "settings.service.form.addServiceHeadline" : "Toevoegen {name}",
+   "settings.service.form.availableServices" : "Beschikbare services",
+   "settings.service.form.customUrl" : "Custom server",
+   "settings.service.form.customUrlPremiumInfo" : "Om zelf-gehoste services toe te kunnen voegen, heb je een Franz Premium Supporter Account nodig.",
+   "settings.service.form.customUrlUpgradeAccount" : "Upgrade je account",
+   "settings.service.form.customUrlValidationError" : "Kon custom server {name} niet valideren.",
+   "settings.service.form.deleteButton" : "Verwijder service",
+   "settings.service.form.editServiceHeadline" : "Bewerk {name}",
+   "settings.service.form.enableAudio" : "Audio inschakelen",
+   "settings.service.form.enableNotification" : "Meldingen inschakelen",
+   "settings.service.form.enableService" : "Service inschakelen",
+   "settings.service.form.indirectMessageInfo" : "Je ontvangt meldingen van alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
+   "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
+   "settings.service.form.name" : "Naam",
+   "settings.service.form.saveButton" : "Opslaan service",
+   "settings.service.form.tabHosted" : "Gehost",
+   "settings.service.form.tabOnPremise" : "Zelf-gehost *",
+   "settings.service.form.team" : "Team",
+   "settings.service.form.yourServices" : "Jouw services",
+   "settings.services.deletedInfo" : "Service is verwijderd",
+   "settings.services.discoverServices" : "Ontdek services",
+   "settings.services.headline" : "Jouw services",
+   "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
+   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
+   "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
+   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.user.form.accountType.company" : "Bedrijf",
+   "settings.user.form.accountType.individual" : "Individueel",
+   "settings.user.form.accountType.label" : "Account type",
+   "settings.user.form.accountType.non-profit" : "Non-Profit",
+   "settings.user.form.currentPassword" : "Huidig wachtwoord",
+   "settings.user.form.email" : "E-mailadres",
+   "settings.user.form.firstname" : "Voornaam",
+   "settings.user.form.lastname" : "Achternaam",
+   "settings.user.form.newPassword" : "Nieuw wachtwoord",
+   "sidebar.addNewService" : "Service toevoegen",
+   "sidebar.mute" : "Audio uitschakelen",
+   "sidebar.settings" : "Instellingen",
+   "sidebar.unmute" : "Audio inschakelen",
+   "signup.company.label" : "Bedrijf",
+   "signup.email.label" : "E-mailadres",
+   "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
+   "signup.firstname.label" : "Voornaam",
+   "signup.headline" : "Aanmelden",
+   "signup.lastname.label" : "Achternaam",
+   "signup.legal.info" : "Door een Franz account aan te maken ga je akkoord met de",
+   "signup.legal.privacy" : "Privacy Voorwaarden",
+   "signup.legal.terms" : "Gebruiksvoorwaarden",
+   "signup.link.login" : "Al een account? Log in!",
+   "signup.password.label" : "Wachtwoord",
+   "signup.submit.label" : "Maak een nieuw account aan",
+   "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
+   "subscription.features.ads" : "Geen advertenties, nooit!",
+   "subscription.features.comingSoon" : "komt binnenkort",
+   "subscription.features.customServices" : "Privé services voor jou en je team",
+   "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
+   "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
+   "subscription.features.vpn" : "Proxy & VPN ondersteuning",
+   "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
+   "subscription.mining.experimental" : "experimenteel",
+   "subscription.mining.headline" : "Hoe werkt dit?",
+   "subscription.mining.line1" : "Door \"Ondersteun met rekenkracht\" te activeren, zal Franz ongeveer 20-50% van je CPU gebruiken om de cryptomunt Monero te minen, wat overeenkomt met ongeveer $ 5\/jaar.",
+   "subscription.mining.line2" : "We zullen het CPU-gebruik aanpassen aan je gebruik en daarmee voorkomen dat de batterij niet leegloopt of dat jij en je werk afgeremd wordt.",
+   "subscription.mining.line3" : "Zolang de miner actief is, heb je onbeperkt toegang tot alle Franz Premium Supporter Features.",
+   "subscription.mining.moreInformation" : "Verkrijg meer informatie over dit plan.",
+   "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
+   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
+   "subscription.type.free" : "gratis",
+   "subscription.type.mining" : "Ondersteun Franz met rekenkracht",
+   "subscription.type.month" : "maand",
+   "subscription.type.year" : "jaar",
+   "subscriptionPopup.buttonCancel" : "Annuleer",
+   "subscriptionPopup.buttonDone" : "Klaar",
+   "tabs.item.deleteService" : "Verwijderen service",
+   "tabs.item.disableAudio" : "Audio uitschakelen",
+   "tabs.item.disableNotifications" : "Uitschakelen meldingen",
+   "tabs.item.disableService" : "Uitschakelen service",
+   "tabs.item.edit" : "Bewerk",
+   "tabs.item.enableAudio" : "Audio inschakelen",
+   "tabs.item.enableNotification" : "Inschakelen meldingen",
+   "tabs.item.enableService" : "Service inschakelen",
+   "tabs.item.reload" : "Herlaad",
+   "welcome.loginButton" : "Log in op je account",
+   "welcome.signupButton" : "Maak een gratis account",
+   "welcome.slogan" : "Messaging die voor jou werkt"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index a884ef319..67657155f 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,168 +1,192 @@
-{
-  "global.api.unhealthy": "Nie można połączyć się z usługą Franz",
-  "global.notConnectedToTheInternet": "Brak połączenia z Internetem.",
-  "welcome.signupButton": "Stwórz darmowe konto",
-  "welcome.loginButton": "Zaloguj się na swoje konto",
-  "welcome.slogan": "Komunikator który działa",
-  "login.headline": "Zaloguj się",
-  "login.email.label": "Adres email",
-  "login.password.label": "Hasło",
-  "login.submit.label": "Zaloguj się",
-  "login.invalidCredentials": "Adres email lub hasło są błędne",
-  "login.tokenExpired": "Twoja sesja wygasła, zaloguj się ponownie.",
-  "login.serverLogout": "Twoja sesja wygasła, zaloguj się ponownie.",
-  "login.link.signup": "Stwórz darmowe konto",
-  "login.link.password": "Zresetuj hasło",
-  "password.headline": "Zresetuj hasło",
-  "password.email.label": "Adres email",
-  "password.submit.label": "Wyślij",
-  "password.noUser": "Nie znaleziono użytkownika z takim adresem email",
-  "password.successInfo": "Sprawdź swoją skrzynkę email",
-  "password.link.signup": "Stwórz darmowe konto",
-  "password.link.login": "Zaloguj się na swoje konto",
-  "signup.headline": "Zarejestruj się",
-  "signup.firstname.label": "Imię",
-  "signup.lastname.label": "Nazwisko",
-  "signup.email.label": "Adres email",
-  "signup.company.label": "Firma",
-  "signup.password.label": "Hasło",
-  "signup.submit.label": "Stwórz konto",
-  "signup.link.login": "Masz już konto, zalogować się?",
-  "signup.emailDuplicate": "Użytkownik z takim adresem email już istnieje",
-  "signup.legal.info": "Poprzez utworzenie konta Franz akceptujesz",
-  "signup.legal.terms": "Warunki świadczenia usług",
-  "signup.legal.privacy": "Polityka prywatności",
-  "pricing.headline": "Wspomóż aplikację Franz",
-  "pricing.support.label": "Wybierz plan wsparcia",
-  "pricing.submit.label": "Chcę wspierać rozwój aplikacji Franz",
-  "pricing.link.skipPayment": "Nie chcę wspierać rozwoju aplikacji Franz.",
-  "import.headline": "Zaimportuj usługi Franz 4",
-  "import.notSupportedHeadline": "Usługi nie są jeszcze wspierane w Franz 5",
-  "import.submit.label": "Zaimportuj usługi",
-  "import.skip.label": "Chcę dodać usługi ręcznie",
-  "invite.submit.label": "Wyślij zaproszenia",
-  "invite.headline.friends": "Zaproś 3 znajomych lub kolegów z pracy",
-  "invite.name.label": "Nazwa",
-  "invite.email.label": "Adres email",
-  "invite.skip.label": "Chcę to zrobić później",
-  "subscription.submit.label": "Chcę wspierać rozwój aplikacji Franz",
-  "subscription.paymentSessionError": "Nie można wczytać formularza płatności",
-  "subscription.includedFeatures": "Płatne konto Franz Premium obejmuje",
-  "subscription.features.onpremise": "Dodawanie lokalnych/hostowanych usług takich jak HipChat",
-  "subscription.features.customServices": "Prywatne usługi dla Ciebie i Twojego zespołu",
-  "subscription.features.encryptedSync": "Szyfrowana synchronizacja sesji",
-  "subscription.features.vpn": "Wsprarcie Proxy i VPN",
-  "subscription.features.ads": "Brak reklam, na zawsze!",
-  "subscription.features.comingSoon": "wkrótce dostępne",
-  "infobar.servicesUpdated": "Twoje usługi zostały zaaktualizowane.",
-  "infobar.updateAvailable": "Aktualizacja aplikacji Franz jest dostępna.",
-  "infobar.buttonReloadServices": "Przeładuj usługi",
-  "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacje",
-  "infobar.requiredRequestsFailed": "Nie można wczytać usług i informacji o użytkowniku",
-  "sidebar.settings": "Ustawienia",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Witaj w aplikcji Franz",
-  "services.getStarted": "Zacznij",
-  "settings.account.headline": "Konto",
-  "settings.account.headlineSubscription": "Twoja subskrypcja",
-  "settings.account.headlineUpgrade": "Ulepsz swoje konto i wspieraj aplikację Franz",
-  "settings.account.headlineInvoices": "Faktury",
-  "settings.account.manageSubscription.label": "Zarządzaj swoimi subskrypcjami",
-  "settings.account.accountType.basic": "Podstawowe konto",
-  "settings.account.accountType.premium": "Konto Premium",
-  "settings.account.account.editButton": "Edytuj konto",
-  "settings.account.invoiceDownload": "Pobieranie",
-  "settings.account.userInfoRequestFailed": "Nie można wczytać informacji o użytkowniku",
-  "settings.account.tryReloadUserInfoRequest": "Spróbuj ponownie",
-  "settings.account.headlineProfile": "Aktualizuj profil",
-  "settings.account.headlineAccount": "Informacje o koncie",
-  "settings.account.headlinePassword": "Zmiana hasła",
-  "settings.account.successInfo": "Zmiany zostały zapisane",
-  "settings.account.buttonSave": "Aktualizuj profil",
-  "settings.account.mining.thankyou": "Dziękuję za wsparcie aplikacji Franz mocą obliczeniową.",
-  "settings.account.mining.active": "Obecnie wykonujesz {hashes} operacji na sekundę.",
-  "settings.account.mining.moreInformation": "Dowiedz się więcej",
-  "settings.account.mining.cancel": "Anuluj kopanie",
-  "settings.navigation.availableServices": "Dostępne usługi",
-  "settings.navigation.yourServices": "Twoje usługi",
-  "settings.navigation.account": "Konto",
-  "settings.navigation.settings": "Ustawienia",
-  "settings.navigation.logout": "Wylogowanie",
-  "settings.recipes.headline": "Dostępne usługi",
-  "settings.recipes.mostPopular": "Najpopularniejsze",
-  "settings.recipes.all": "Wszystkie usługi",
-  "settings.recipes.dev": "Rozwojowe",
-  "settings.recipes.nothingFound": "Żadna usługa nie została znaleziona.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Usługa została dodana pomyślnie",
-  "settings.service.form.saveButton": "Zapisz usługę",
-  "settings.service.form.deleteButton": "Usuń usługę",
-  "settings.service.form.availableServices": "Dostępne usługi",
-  "settings.service.form.yourServices": "Twoje usługi",
-  "settings.service.form.addServiceHeadline": "Dodaj {name}",
-  "settings.service.form.editServiceHeadline": "Edytuj {name}",
-  "settings.service.form.tabHosted": "Hostowane",
-  "settings.service.form.tabOnPremise": "Hostowane lokalnie ⭐️",
-  "settings.service.form.customUrlValidationError": "Nie można zweryfikować spersonalizowanego {name} serwera.",
-  "settings.service.form.customUrlPremiumInfo": "Aby dodać usługi hostowane lokalnie, musisz posiadać konto Premium.",
-  "settings.service.form.customUrlUpgradeAccount": "Ulepsz swoje konto",
-  "settings.service.form.indirectMessageInfo": "Będziesz informowany o wszystkich nowych wiadomościach na kanale, nie tylko @username, @channel, @here, ...",
-  "settings.service.error.headline": "Błąd",
-  "settings.service.error.goBack": "Wróć do usług",
-  "settings.service.error.message": "Nie można wczytać przepisu usługi.",
-  "settings.services.tooltip.isDisabled": "Usługa jest nieaktywna",
-  "settings.services.tooltip.notificationsDisabled": "Powiadomienia są nieaktywne",
-  "settings.services.headline": "Twoje usługi",
-  "settings.services.noServicesAdded": "Nie dodałeś jeszcze żadnych usług.",
-  "settings.services.discoverServices": "Przeglądaj usługi",
-  "settings.services.updatedInfo": "Zmiany zostały zapisane",
-  "settings.services.deletedInfo": "Usługa została usunięta",
-  "settings.app.headline": "Ustawienia",
-  "settings.app.headlineGeneral": "Ogólne",
-  "settings.app.headlineLanguage": "Język",
-  "settings.app.headlineUpdates": "Aktualizacje",
-  "settings.app.buttonSearchForUpdate": "Sprawdź czy są dostęne aktualizacje",
-  "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacje",
-  "settings.app.updateStatusSearching": "Szukam aktualizacji",
-  "settings.app.updateStatusAvailable": "Dostępna aktualizacja, pobieram...",
-  "settings.app.updateStatusUpToDate": "Używasz najnowszej wersji aplikacji Franz",
-  "settings.app.form.autoLaunchOnStart": "Uruchom aplikację Franz przy starcie systemu",
-  "settings.app.form.autoLaunchInBackground": "Uruchom w tle",
-  "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Franz",
-  "settings.app.form.runInBackground": "Zachowaj aplikację Franz w tle po zamknięciu okna",
-  "settings.app.form.language": "Język",
-  "settings.app.form.beta": "Uwzględniaj wersje beta",
-  "settings.app.currentVersion": "Obecna wersja:",
-  "settings.service.form.name": "Nazwa",
-  "settings.service.form.enableService": "Aktywuj usługę",
-  "settings.service.form.enableNotification": "Aktywuj powiadomienia",
-  "settings.service.form.team": "Zespół",
-  "settings.service.form.customUrl": "Spersonalizowany serwer",
-  "settings.service.form.indirectMessages": "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
-  "settings.user.form.firstname": "Imię",
-  "settings.user.form.lastname": "Nazwisko",
-  "settings.user.form.email": "Adres email",
-  "settings.user.form.currentPassword": "Obecne hasło",
-  "settings.user.form.newPassword": "Nowe hasło",
-  "settings.user.form.accountType.label": "Typ konta",
-  "settings.user.form.accountType.individual": "Prywatne",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Firma",
-  "subscription.type.free": "za darmo",
-  "subscription.type.month": "miesiąc",
-  "subscription.type.year": "rok",
-  "subscription.type.mining": "Wspieraj aplikację Franz mocą obliczeniową",
-  "subscription.mining.headline": "Jak to działa?",
-  "subscription.mining.experimental": "eksperymentalne",
-  "subscription.mining.line1": "Włączając \"wspieraj mocą obliczeniową\", aplikacja Franz będzie używać około 20-50% mocy Twojego procesora aby kopać kryptowalutę Monero co jest równe około $5/rok.",
-  "subscription.mining.line2": "Będziemy dostosowywać zużycie procesora do stylu Twojej pracy tak aby nie zużywać baterii i nie spowalniać działania urządzenia.",
-  "subscription.mining.line3": "Tak długo jak kopanie będzie aktywne, będziesz mieć nielimitowany dostęp do wszystkich funkcji dostępnych w koncie Premium.",
-  "subscription.mining.moreInformation": "Dowiedz się więcej o tym planie.",
-  "subscriptionPopup.buttonCancel": "Anuluj",
-  "subscriptionPopup.buttonDone": "Zrobione",
-  "tabs.item.reload": "Przeładuj",
-  "tabs.item.edit": "Edytuj",
-  "tabs.item.disableNotifications": "Wyłącz powiadomienia",
-  "tabs.item.enableNotification": "Włącz powiadomienia",
-  "tabs.item.disableService": "Wyłącz usługę",
-  "tabs.item.deleteService": "Usuń usługę"
+{
+   "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
+   "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
+   "import.headline" : "Importuj usługi Franz 4",
+   "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
+   "import.skip.label" : "Chcę ręcznie dodać usługi",
+   "import.submit.label" : "Zaimportuj usługi",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
+   "infobar.buttonReloadServices" : "Załaduj ponownie usługi",
+   "infobar.requiredRequestsFailed" : "Nie można załadować usług i informacji użytkownika",
+   "infobar.servicesUpdated" : "Usługi zostały zaktualizowane.",
+   "infobar.updateAvailable" : "Dostępna jest nowa wersja Franza.",
+   "invite.email.label" : "Adres email",
+   "invite.headline.friends" : "Zaproś 3 znajomych lub współpracowników",
+   "invite.name.label" : "Imię",
+   "invite.skip.label" : "Chcę to zrobić później",
+   "invite.submit.label" : "Wyślij zaproszenia",
+   "login.email.label" : "Adres email",
+   "login.headline" : "Zaloguj się",
+   "login.invalidCredentials" : "Adres email lub hasło są błędne",
+   "login.link.password" : "Wyzeruj hasło",
+   "login.link.signup" : "Załóż darmowe konto",
+   "login.password.label" : "Hasło",
+   "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
+   "login.submit.label" : "Zaloguj się",
+   "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
+   "password.email.label" : "Adres email",
+   "password.headline" : "Wyzeruj hasło",
+   "password.link.login" : "Zaloguj się na swoje konto",
+   "password.link.signup" : "Stwórz darmowe konto",
+   "password.noUser" : "Nie znaleziono użytkownika z takim adresem email",
+   "password.submit.label" : "Wyślij",
+   "password.successInfo" : "Proszę sprawdzić swój email",
+   "pricing.headline" : "Wspieraj Franz",
+   "pricing.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
+   "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
+   "pricing.support.label" : "Wybierz swój plan wsparcia",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Zacznij",
+   "services.welcome" : "Witaj w programie Franz",
+   "settings.account.account.editButton" : "Modyfikuj konta",
+   "settings.account.accountType.basic" : "Podstawowe konto",
+   "settings.account.accountType.premium" : "Premium Supporter Account",
+   "settings.account.buttonSave" : "Uaktualnij profil",
+   "settings.account.headline" : "Konto",
+   "settings.account.headlineAccount" : "Informacje o koncie",
+   "settings.account.headlineInvoices" : "Faktury",
+   "settings.account.headlinePassword" : "Zmień hasło",
+   "settings.account.headlineProfile" : "Uaktualnij profil",
+   "settings.account.headlineSubscription" : "Twoja subskrypcja",
+   "settings.account.headlineUpgrade" : "Ulepsz swoje konto i wspieraj aplikację Franz",
+   "settings.account.invoiceDownload" : "Pobierz",
+   "settings.account.manageSubscription.label" : "Zarządzaj swoimi subskrypcjami",
+   "settings.account.mining.active" : "Obecnie wykonujesz {hashes} operacji na sekundę.",
+   "settings.account.mining.cancel" : "Anuluj kopanie",
+   "settings.account.mining.moreInformation" : "Zdobądź więcej informacji",
+   "settings.account.mining.thankyou" : "Dziękuję za wsparcie aplikacji Franz mocą obliczeniową.",
+   "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
+   "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
+   "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
+   "settings.app.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
+   "settings.app.buttonSearchForUpdate" : "Sprawdź aktualizacje",
+   "settings.app.currentVersion" : "Aktualna wersja:",
+   "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
+   "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na początku",
+   "settings.app.form.beta" : "Uwzględnij wersje beta",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Pokaż Franza w tacy systemowej",
+   "settings.app.form.language" : "Język",
+   "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
+   "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Ustawienia",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Ogólne",
+   "settings.app.headlineLanguage" : "Język",
+   "settings.app.headlineUpdates" : "Aktualizacje",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
+   "settings.app.updateStatusSearching" : "Szukam aktualizacji",
+   "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Franz",
+   "settings.navigation.account" : "Konto",
+   "settings.navigation.availableServices" : "Dostępne usługi",
+   "settings.navigation.logout" : "Wyloguj",
+   "settings.navigation.settings" : "Ustawienia",
+   "settings.navigation.yourServices" : "Twoje usługi",
+   "settings.recipes.all" : "Wszystkie usługi",
+   "settings.recipes.dev" : "Rozwojowe",
+   "settings.recipes.headline" : "Dostępne usługi",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Najpopularniejsze",
+   "settings.recipes.nothingFound" : "Żadna usługa nie została znaleziona.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Usługa została dodana pomyślnie",
+   "settings.service.error.goBack" : "Wróć do usług",
+   "settings.service.error.headline" : "Błąd",
+   "settings.service.error.message" : "Nie można wczytać przepisu usługi.",
+   "settings.service.form.addServiceHeadline" : "Dodaj {name}",
+   "settings.service.form.availableServices" : "Dostępne usługi",
+   "settings.service.form.customUrl" : "Spersonalizowany serwer",
+   "settings.service.form.customUrlPremiumInfo" : "Aby dodać usługi hostowane lokalnie, musisz posiadać konto Premium.",
+   "settings.service.form.customUrlUpgradeAccount" : "Ulepsz swoje konto",
+   "settings.service.form.customUrlValidationError" : "Nie można zweryfikować spersonalizowanego {name} serwera.",
+   "settings.service.form.deleteButton" : "Usuń usługę",
+   "settings.service.form.editServiceHeadline" : "Edytuj {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
+   "settings.service.form.enableService" : "Aktywuj usługę",
+   "settings.service.form.indirectMessageInfo" : "Będziesz informowany o wszystkich nowych wiadomościach na kanale, nie tylko @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Nazwa",
+   "settings.service.form.saveButton" : "Zapisz usługę",
+   "settings.service.form.tabHosted" : "Hostowane",
+   "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
+   "settings.service.form.team" : "Zespół",
+   "settings.service.form.yourServices" : "Twoje usługi",
+   "settings.services.deletedInfo" : "Usługa została usunięta",
+   "settings.services.discoverServices" : "Przeglądaj usługi",
+   "settings.services.headline" : "Twoje usługi",
+   "settings.services.noServicesAdded" : "Nie dodałeś jeszcze żadnych usług.",
+   "settings.services.tooltip.isDisabled" : "Usługa jest nieaktywna",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Powiadomienia są nieaktywne",
+   "settings.services.updatedInfo" : "Zmiany zostały zapisane",
+   "settings.user.form.accountType.company" : "Firma",
+   "settings.user.form.accountType.individual" : "Prywatne",
+   "settings.user.form.accountType.label" : "Typ konta",
+   "settings.user.form.accountType.non-profit" : "Non-Profit ",
+   "settings.user.form.currentPassword" : "Obecne hasło",
+   "settings.user.form.email" : "Adres email",
+   "settings.user.form.firstname" : "Imię",
+   "settings.user.form.lastname" : "Nazwisko",
+   "settings.user.form.newPassword" : "Nowe hasło",
+   "sidebar.addNewService" : "!!!Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Ustawienia",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Firma",
+   "signup.email.label" : "Adres email",
+   "signup.emailDuplicate" : "Użytkownik z takim adresem email już istnieje",
+   "signup.firstname.label" : "Imię",
+   "signup.headline" : "Zarejestruj się",
+   "signup.lastname.label" : "Nazwisko",
+   "signup.legal.info" : "Poprzez utworzenie konta Franz akceptujesz",
+   "signup.legal.privacy" : "Polityka prywatności",
+   "signup.legal.terms" : "Warunki świadczenia usług",
+   "signup.link.login" : "Masz już konto, zalogować się?",
+   "signup.password.label" : "Hasło",
+   "signup.submit.label" : "Stwórz konto",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Brak reklam, na zawsze!",
+   "subscription.features.comingSoon" : "wkrótce dostępne",
+   "subscription.features.customServices" : "Prywatne usługi dla Ciebie i Twojego zespołu",
+   "subscription.features.encryptedSync" : "Szyfrowana synchronizacja sesji",
+   "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
+   "subscription.features.vpn" : "Wsprarcie Proxy i VPN",
+   "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
+   "subscription.mining.experimental" : "eksperymentalne",
+   "subscription.mining.headline" : "Jak to działa?",
+   "subscription.mining.line1" : "Włączając \"wspieraj mocą obliczeniową\", aplikacja Franz będzie używać około 20-50% mocy Twojego procesora aby kopać kryptowalutę Monero co jest równe około $5\/rok.",
+   "subscription.mining.line2" : "Będziemy dostosowywać zużycie procesora do stylu Twojej pracy tak aby nie zużywać baterii i nie spowalniać działania urządzenia.",
+   "subscription.mining.line3" : "Tak długo jak kopanie będzie aktywne, będziesz mieć nielimitowany dostęp do wszystkich funkcji dostępnych w koncie Premium.",
+   "subscription.mining.moreInformation" : "Dowiedz się więcej o tym planie.",
+   "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
+   "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
+   "subscription.type.free" : "za darmo",
+   "subscription.type.mining" : "Wspieraj aplikację Franz mocą obliczeniową",
+   "subscription.type.month" : "miesiąc",
+   "subscription.type.year" : "rok",
+   "subscriptionPopup.buttonCancel" : "Anuluj",
+   "subscriptionPopup.buttonDone" : "Zrobione",
+   "tabs.item.deleteService" : "Usuń usługę",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Wyłącz powiadomienia",
+   "tabs.item.disableService" : "Wyłącz usługę",
+   "tabs.item.edit" : "Edytuj",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Włącz powiadomienia",
+   "tabs.item.enableService" : "Aktywuj usługę",
+   "tabs.item.reload" : "Przeładuj",
+   "welcome.loginButton" : "Zaloguj się na swoje konto",
+   "welcome.signupButton" : "Stwórz darmowe konto",
+   "welcome.slogan" : "Komunikator który działa"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 8a139a4f5..5a20f387a 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,169 +1,192 @@
-{
-  "global.api.unhealthy": "Não foi possível conectar aos serviços online do Franz",
-  "global.notConnectedToTheInternet": "Você não está conectado à internet.",
-  "welcome.signupButton": "Criar uma conta grátis",
-  "welcome.loginButton": "Fazer login na sua conta",
-  "welcome.slogan": "Mensagens que funcionam para você",
-  "login.headline": "Login",
-  "login.email.label": "Endereço de email",
-  "login.password.label": "Senha",
-  "login.submit.label": "Login",
-  "login.invalidCredentials": "Email ou senha inválida",
-  "login.tokenExpired": "Sua sessão expirou, faça o login novamente.",
-  "login.serverLogout": "Sua sessão expirou, faça o login novamente.",
-  "login.link.signup": "Criar uma conta grátis",
-  "login.link.password": "Trocar a senha",
-  "password.headline": "Trocar a senha",
-  "password.email.label": "Endereço de email",
-  "password.submit.label": "Enviar",
-  "password.noUser": "Nenhum usuário com este email foi encontrado",
-  "password.successInfo": "Por favor, verifique o seu email",
-  "password.link.signup": "Criar uma conta grátis",
-  "password.link.login": "Fazer login na sua conta",
-  "signup.headline": "Cadastrar-se",
-  "signup.firstname.label": "Nome",
-  "signup.lastname.label": "Sobrenome",
-  "signup.email.label": "Endereço de email",
-  "signup.company.label": "Empresa",
-  "signup.password.label": "Senha",
-  "signup.submit.label": "Criar conta",
-  "signup.link.login": "Já tem uma conta. Fazer login?",
-  "signup.emailDuplicate": "Um usuário com esta conta já existe",
-  "signup.legal.info": "Ao criar uma conta Franz você aceita os ",
-  "signup.legal.terms": "Termos de Serviço",
-  "signup.legal.privacy": "Declaração de Privacidade",
-  "pricing.headline": "Apoie o Franz",
-  "pricing.support.label": "Selecione seu plano de apoio",
-  "pricing.submit.label": "Eu quero apoiar o desenvolvimento do Franz",
-  "pricing.link.skipPayment": "Eu não quero apoiar o desenvolvimento do Franz.",
-  "import.headline": "Importe seus serviços do Franz 4",
-  "import.notSupportedHeadline": "Serviços ainda não suportados no Franz 5",
-  "import.submit.label": "Importar serviços",
-  "import.skip.label": "Eu quero adicionar serviços manualmente",
-  "invite.submit.label": "Enviar convites",
-  "invite.headline.friends": "Convide 3 dos seus amigos ou colegas",
-  "invite.name.label": "Nome",
-  "invite.email.label": "Endereço de email",
-  "invite.skip.label": "Eu quero fazer isso depois",
-  "subscription.submit.label": "Eu quero apoiar o desenvolvimento do Franz",
-  "subscription.paymentSessionError": "Não foi possível abrir o formulário de pagamento",
-  "subscription.includedFeatures": "Conta Paga Franz Premium inclui",
-  "subscription.features.onpremise": "Adicionar serviços locais/hospedados como HipChat",
-  "subscription.features.customServices": "Serviços privados para você e sua equipe",
-  "subscription.features.encryptedSync": "Sincronização encriptada das sessões",
-  "subscription.features.vpn": "Suporte à proxy & VPN",
-  "subscription.features.ads": "Sem anúncios, sempre!",
-  "subscription.features.comingSoon": "em breve",
-  "infobar.servicesUpdated": "Seus serviços foram atualizados.",
-  "infobar.updateAvailable": "Uma nova atualização do Franz está disponível.",
-  "infobar.buttonReloadServices": "Recarregar serviços",
-  "infobar.buttonInstallUpdate": "Reiniciar & instalar atualização",
-  "infobar.requiredRequestsFailed": "Não foi possível carregar serviços e informações do usuário",
-  "sidebar.addNewService": "!!!Add new service",
-  "sidebar.settings": "Ajustes",
-  "services.welcome": "Bem-vindo ao Franz",
-  "services.getStarted": "Começar",
-  "settings.account.headline": "Conta",
-  "settings.account.headlineSubscription": "Sua assinatura",
-  "settings.account.headlineUpgrade": "Atualize a sua conta & apoie o Franz",
-  "settings.account.headlineInvoices": "Recibos",
-  "settings.account.manageSubscription.label": "Gerencie a sua assinatura",
-  "settings.account.accountType.basic": "Conta Básica",
-  "settings.account.accountType.premium": "Conta Apoiador Premium",
-  "settings.account.account.editButton": "Editar conta",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.userInfoRequestFailed": "Não foi possível carregar as informações do usuário",
-  "settings.account.tryReloadUserInfoRequest": "Tente novamente",
-  "settings.account.headlineProfile": "Atualizar perfil",
-  "settings.account.headlineAccount": "Informações de conta",
-  "settings.account.headlinePassword": "Mudar senha",
-  "settings.account.successInfo": "Suas mudanças foram salvas",
-  "settings.account.buttonSave": "Atualizar perfil",
-  "settings.account.mining.thankyou": "Obrigado por apoiar o Franz com poder de processamento.",
-  "settings.account.mining.active": "Você está realizando {hashes} cálculos por segundo agora.",
-  "settings.account.mining.moreInformation": "Obter mais informações",
-  "settings.account.mining.cancel": "Cancelar mineração",
-  "settings.navigation.availableServices": "Serviços disponíveis",
-  "settings.navigation.yourServices": "Seus serviços",
-  "settings.navigation.account": "Conta",
-  "settings.navigation.settings": "Ajustes",
-  "settings.navigation.logout": "Logout",
-  "settings.recipes.headline": "Serviços disponíveis",
-  "settings.recipes.mostPopular": "Mais populares",
-  "settings.recipes.all": "Todos serviços",
-  "settings.recipes.dev": "Desenvolvimento",
-  "settings.recipes.nothingFound": "Desculpe, mas nenhum serviço corresponde a sua pesquisa.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
-  "settings.service.form.saveButton": "Salvar serviço",
-  "settings.service.form.deleteButton": "Apagar serviço",
-  "settings.service.form.availableServices": "Serviços disponíveis",
-  "settings.service.form.yourServices": "Seus serviços",
-  "settings.service.form.addServiceHeadline": "Adicionar {name}",
-  "settings.service.form.editServiceHeadline": "Editar {name}",
-  "settings.service.form.tabHosted": "Hospedado",
-  "settings.service.form.tabOnPremise": "Auto-hospedado ⭐️",
-  "settings.service.form.customUrlValidationError": "Não foi possível validar o servidor personalizado {name}.",
-  "settings.service.form.customUrlPremiumInfo": "Para adicionar serviços auto-hospedados, você precisa de uma conta Franz Apoiador Premium.",
-  "settings.service.form.customUrlUpgradeAccount": "Atualize a sua conta",
-  "settings.service.form.indirectMessageInfo": "Você será notificado por todas as mensagens em um canal, não apenas @usuário, @channel, @here, ...",
-  "settings.service.error.headline": "Erro",
-  "settings.service.error.goBack": "Voltar aos serviços",
-  "settings.service.error.message": "Não foi possível carregar a receita de serviço.",
-  "settings.services.tooltip.isDisabled": "Serviço desativado",
-  "settings.services.tooltip.notificationsDisabled": "Notificações desativadas",
-  "settings.services.headline": "Seus serviços",
-  "settings.services.noServicesAdded": "Você ainda não adicionou nenhum serviço.",
-  "settings.services.discoverServices": "Descobrir serviços",
-  "settings.services.updatedInfo": "Suas mudanças foram salvas",
-  "settings.services.deletedInfo": "Serviço apagado",
-  "settings.app.headline": "Ajustes",
-  "settings.app.headlineGeneral": "Geral",
-  "settings.app.headlineLanguage": "Idioma",
-  "settings.app.headlineUpdates": "Atualizações",
-  "settings.app.buttonSearchForUpdate": "Verificar por atualizações",
-  "settings.app.buttonInstallUpdate": "Reiniciar & instalar atualização",
-  "settings.app.updateStatusSearching": "Em busca de atualização",
-  "settings.app.updateStatusAvailable": "Atualização disponível, fazendo download...",
-  "settings.app.updateStatusUpToDate": "Você está usando a última versão do Franz",
-  "settings.app.form.autoLaunchOnStart": "Abrir o Franz iniciar o sistema",
-  "settings.app.form.autoLaunchInBackground": "Abrir no fundo",
-  "settings.app.form.enableSystemTray": "Mostrar o Franz na bandeja do sistema",
-  "settings.app.form.minimizeToSystemTray": "Minimizar o Franz para a bandeja do sistema",
-  "settings.app.form.runInBackground": "Manter o Franz no fundo quando fechar a janela",
-  "settings.app.form.language": "Idioma",
-  "settings.app.form.beta": "Incluir versões beta",
-  "settings.app.currentVersion": "Versão atual:",
-  "settings.service.form.name": "Nome",
-  "settings.service.form.enableService": "Ativar serviço",
-  "settings.service.form.enableNotification": "Ativar notificações",
-  "settings.service.form.team": "Equipe",
-  "settings.service.form.customUrl": "Serviços personalizado",
-  "settings.service.form.indirectMessages": "Mostrar avisos para todas as mensagens",
-  "settings.user.form.firstname": "Nome",
-  "settings.user.form.lastname": "Sobrenome",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Senha atual",
-  "settings.user.form.newPassword": "Nova senha",
-  "settings.user.form.accountType.label": "Tipo de conta",
-  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.non-profit": "Sem fins lucrativos",
-  "settings.user.form.accountType.company": "Empresa",
-  "subscription.type.free": "grátis",
-  "subscription.type.month": "mês",
-  "subscription.type.year": "ano",
-  "subscription.type.mining": "Apoie o Franz com poder de processamento",
-  "subscription.mining.headline": "Como isso funciona?",
-  "subscription.mining.experimental": "experimental",
-  "subscription.mining.line1": "Habilitando o \"Apoio com poder de processamento\", o Franz vai usar cerca de 20-50% da sua CPU para minerar a criptomoeda Monero que equivale a aproximadamente $ 5/ano.",
-  "subscription.mining.line2": "Nós iremos adaptar o uso da CPU baseado nos seus hábitos para não drenar sua bateria nem deixar o seu computador lento.",
-  "subscription.mining.line3": "Enquanto o minerador estiver ativo, você terá acesso ilimitado à todas funções do Franz Apoiador Premium.",
-  "subscription.mining.moreInformation": "Obter mais informações sobre este plano.",
-  "subscriptionPopup.buttonCancel": "Cancelar",
-  "subscriptionPopup.buttonDone": "Feito",
-  "tabs.item.reload": "Recarregar",
-  "tabs.item.edit": "Editar",
-  "tabs.item.disableNotifications": "Desativar notificações",
-  "tabs.item.enableNotification": "Ativar notificações",
-  "tabs.item.disableService": "Desativar serviço",
-  "tabs.item.deleteService": "Apagar serviço"
+{
+   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços do Franz",
+   "global.notConnectedToTheInternet" : "Você não está conectado à internet.",
+   "import.headline" : "Importe seus serviços do Franz 4",
+   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
+   "import.skip.label" : "Quero adicionar serviços manualmente",
+   "import.submit.label" : "Importar serviços",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
+   "infobar.buttonReloadServices" : "Recarregar serviços",
+   "infobar.requiredRequestsFailed" : "Não foi possível carregar serviços e informações do usuário",
+   "infobar.servicesUpdated" : "Seus serviços foram atualizados.",
+   "infobar.updateAvailable" : "Uma nova atualização do Franz está disponível.",
+   "invite.email.label" : "Endereço de email ",
+   "invite.headline.friends" : "Convide 3 dos seus amigos ou colegas",
+   "invite.name.label" : "Nome",
+   "invite.skip.label" : "Quero fazer isso depois",
+   "invite.submit.label" : "Enviar convites",
+   "login.email.label" : "Endereço de e-mail",
+   "login.headline" : "Login",
+   "login.invalidCredentials" : "Email ou senha inválida",
+   "login.link.password" : "Trocar a senha",
+   "login.link.signup" : "Criar uma conta gratuita",
+   "login.password.label" : "Senha",
+   "login.serverLogout" : "Sua sessão expirou, faça o login novamente.\",",
+   "login.submit.label" : "Login",
+   "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
+   "password.email.label" : "Endereço de email",
+   "password.headline" : "Trocar a senha",
+   "password.link.login" : "Fazer login na sua conta",
+   "password.link.signup" : "Criar uma conta grátis",
+   "password.noUser" : "Nenhum usuário com este email foi encontrado",
+   "password.submit.label" : "Enviar",
+   "password.successInfo" : "Por favor, verifique o seu email",
+   "pricing.headline" : "Apoie o Franz",
+   "pricing.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
+   "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
+   "pricing.support.label" : "Selecione seu plano de apoio",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Começar",
+   "services.welcome" : "Bem-vindo ao Franz",
+   "settings.account.account.editButton" : "Editar conta",
+   "settings.account.accountType.basic" : "Conta Básica",
+   "settings.account.accountType.premium" : "Conta Apoiador Premium",
+   "settings.account.buttonSave" : "Atualizar perfil",
+   "settings.account.headline" : "Conta",
+   "settings.account.headlineAccount" : "Informações de conta",
+   "settings.account.headlineInvoices" : "Recibos",
+   "settings.account.headlinePassword" : "Mudar senha",
+   "settings.account.headlineProfile" : "Atualizar perfil",
+   "settings.account.headlineSubscription" : "Sua assinatura",
+   "settings.account.headlineUpgrade" : "Atualize a sua conta & apoie o Franz",
+   "settings.account.invoiceDownload" : "Download",
+   "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
+   "settings.account.mining.active" : "Você está realizando {hashes} cálculos por segundo agora.",
+   "settings.account.mining.cancel" : "Cancelar mineração",
+   "settings.account.mining.moreInformation" : "Obter mais informações",
+   "settings.account.mining.thankyou" : "Obrigado por apoiar o Franz com poder de processamento.",
+   "settings.account.successInfo" : "Suas mudanças foram salvas",
+   "settings.account.tryReloadUserInfoRequest" : "Tente novamente",
+   "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
+   "settings.app.buttonInstallUpdate" : "Reiniciar & instalar atualização",
+   "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
+   "settings.app.currentVersion" : "Versão atual:",
+   "settings.app.form.autoLaunchInBackground" : "Abrir no fundo",
+   "settings.app.form.autoLaunchOnStart" : "Abrir o Franz iniciar o sistema",
+   "settings.app.form.beta" : "Incluir versões beta",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
+   "settings.app.form.language" : "Idioma",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
+   "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Ajustes",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Geral",
+   "settings.app.headlineLanguage" : "Idioma",
+   "settings.app.headlineUpdates" : "Atualizações",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Atualização disponível, fazendo download...",
+   "settings.app.updateStatusSearching" : "Em busca de atualização",
+   "settings.app.updateStatusUpToDate" : "Você está usando a última versão do Franz",
+   "settings.navigation.account" : "Conta",
+   "settings.navigation.availableServices" : "Serviços disponíveis",
+   "settings.navigation.logout" : "Logout",
+   "settings.navigation.settings" : "Ajustes",
+   "settings.navigation.yourServices" : "Seus serviços",
+   "settings.recipes.all" : "Todos serviços",
+   "settings.recipes.dev" : "Desenvolvimento ",
+   "settings.recipes.headline" : "Serviços disponíveis",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Mais populares",
+   "settings.recipes.nothingFound" : "Desculpe, mas nenhum serviço corresponde a sua pesquisa.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado com sucesso",
+   "settings.service.error.goBack" : "Voltar aos serviços",
+   "settings.service.error.headline" : "Erro",
+   "settings.service.error.message" : "Não foi possível carregar a receita de serviço.",
+   "settings.service.form.addServiceHeadline" : "Adicionar {name}",
+   "settings.service.form.availableServices" : "Serviços disponíveis",
+   "settings.service.form.customUrl" : "Serviços personalizado",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços auto-hospedados, você precisa de uma conta Franz Apoiador Premium.",
+   "settings.service.form.customUrlUpgradeAccount" : "Atualize a sua conta",
+   "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor personalizado {name}.",
+   "settings.service.form.deleteButton" : "Apagar serviço",
+   "settings.service.form.editServiceHeadline" : "Editar {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Ativar notificações",
+   "settings.service.form.enableService" : "Ativar serviço",
+   "settings.service.form.indirectMessageInfo" : "Você será notificado por todas as mensagens em um canal, não apenas @usuário, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Nome",
+   "settings.service.form.saveButton" : "Salvar serviço",
+   "settings.service.form.tabHosted" : "Hospedado",
+   "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
+   "settings.service.form.team" : "Equipe",
+   "settings.service.form.yourServices" : "Seus serviços",
+   "settings.services.deletedInfo" : "Serviço apagado",
+   "settings.services.discoverServices" : "Descobrir serviços",
+   "settings.services.headline" : "Seus serviços",
+   "settings.services.noServicesAdded" : "Você ainda não adicionou nenhum serviço.",
+   "settings.services.tooltip.isDisabled" : "Serviço desativado",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
+   "settings.services.updatedInfo" : "Suas mudanças foram salvas",
+   "settings.user.form.accountType.company" : "Empresa",
+   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.label" : "Tipo de conta",
+   "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
+   "settings.user.form.currentPassword" : "Senha atual",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "Nome",
+   "settings.user.form.lastname" : "Sobrenome",
+   "settings.user.form.newPassword" : "Nova senha",
+   "sidebar.addNewService" : "Adicionar novo serviço",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Ajustes",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Empresa",
+   "signup.email.label" : "Endereço de email",
+   "signup.emailDuplicate" : "Um usuário com esta conta já existe",
+   "signup.firstname.label" : "Nome",
+   "signup.headline" : "Cadastrar-se",
+   "signup.lastname.label" : "Sobrenome",
+   "signup.legal.info" : "Ao criar uma conta Franz você aceita os ",
+   "signup.legal.privacy" : "Declaração de Privacidade",
+   "signup.legal.terms" : "Termos de Serviço",
+   "signup.link.login" : "Já tem uma conta. Fazer login?",
+   "signup.password.label" : "Senha",
+   "signup.submit.label" : "Criar conta",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Sem anúncios, sempre!",
+   "subscription.features.comingSoon" : "em breve",
+   "subscription.features.customServices" : "Serviços privados para você e sua equipe",
+   "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
+   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como HipChat",
+   "subscription.features.vpn" : "Suporte à proxy & VPN",
+   "subscription.includedFeatures" : "Conta Paga Franz Premium inclui",
+   "subscription.mining.experimental" : "experimental",
+   "subscription.mining.headline" : "Como isso funciona?",
+   "subscription.mining.line1" : "Habilitando o \"Apoio com poder de processamento\", o Franz vai usar cerca de 20-50% da sua CPU para minerar a criptomoeda Monero que equivale a aproximadamente $ 5\/ano.",
+   "subscription.mining.line2" : "Nós iremos adaptar o uso da CPU baseado nos seus hábitos para não drenar sua bateria nem deixar o seu computador lento.",
+   "subscription.mining.line3" : "Enquanto o minerador estiver ativo, você terá acesso ilimitado à todas funções do Franz Apoiador Premium.",
+   "subscription.mining.moreInformation" : "Obter mais informações sobre este plano.",
+   "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
+   "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
+   "subscription.type.free" : "grátis",
+   "subscription.type.mining" : "Apoie o Franz com poder de processamento",
+   "subscription.type.month" : "mês",
+   "subscription.type.year" : "ano",
+   "subscriptionPopup.buttonCancel" : "Cancelar",
+   "subscriptionPopup.buttonDone" : "Feito",
+   "tabs.item.deleteService" : "Apagar serviço",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Desativar notificações",
+   "tabs.item.disableService" : "Desativar serviço",
+   "tabs.item.edit" : "Editar",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Ativar notificações",
+   "tabs.item.enableService" : "Ativar serviço",
+   "tabs.item.reload" : "Recarregar",
+   "welcome.loginButton" : "Fazer login na sua conta",
+   "welcome.signupButton" : "Criar uma conta grátis",
+   "welcome.slogan" : "Mensagens que funcionam para você"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
new file mode 100644
index 000000000..dc776c1ad
--- /dev/null
+++ b/src/i18n/locales/pt.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Não foi possível conectar aos serviços do Franz",
+   "global.notConnectedToTheInternet" : "Não estás conectado à internet.",
+   "import.headline" : "Importar os teus 4 serviços Franz",
+   "import.notSupportedHeadline" : "Os serviços não são suportados no Franz 5",
+   "import.skip.label" : "Quero adicionar os serviços manualmente",
+   "import.submit.label" : "Importar serviços",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
+   "infobar.buttonReloadServices" : "Recarregar serviços",
+   "infobar.requiredRequestsFailed" : "Não foi possivel carregar os serviços e informações do utilizador",
+   "infobar.servicesUpdated" : "Os teus serviços foram atualizados",
+   "infobar.updateAvailable" : "Uma atualização está disponível",
+   "invite.email.label" : "Endereço de e-mail",
+   "invite.headline.friends" : "Manda 3 convites aos teus amigos ou colegas",
+   "invite.name.label" : "Nome",
+   "invite.skip.label" : "Quero adicionar mais tarde",
+   "invite.submit.label" : "Mandar convites",
+   "login.email.label" : "Endereço de e-mail",
+   "login.headline" : "Registar",
+   "login.invalidCredentials" : " O email ou a password estão incorretos",
+   "login.link.password" : "Repor a minha password",
+   "login.link.signup" : "Criar uma conta gratuita",
+   "login.password.label" : "Password",
+   "login.serverLogout" : "A tua sessão expirou, por favor, volta a fazer login.",
+   "login.submit.label" : "Iniciar Sessão",
+   "login.tokenExpired" : "A tua sessão expirou, por favor, volta a fazer login.",
+   "password.email.label" : "Endereço de e-mail",
+   "password.headline" : "Repor a minha password",
+   "password.link.login" : "Fazer login",
+   "password.link.signup" : "Criar uma conta gratuita",
+   "password.noUser" : "Não existe nenhuma conta associada a esse email",
+   "password.submit.label" : "Submeter",
+   "password.successInfo" : "Por favor, revê o teu email",
+   "pricing.headline" : "Apoia o Franz",
+   "pricing.link.skipPayment" : "Não quero ajudar no desenvolvimento do Franz",
+   "pricing.submit.label" : "Quero ajudar o desenvolvimento do Franz",
+   "pricing.support.label" : "Seleciona o teu plano",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Vamos começar",
+   "services.welcome" : "Bem-vindo ao Franz",
+   "settings.account.account.editButton" : "Editar conta",
+   "settings.account.accountType.basic" : "Conta básica",
+   "settings.account.accountType.premium" : "Conta Premium, a ajudar o Franz",
+   "settings.account.buttonSave" : "Atualizar o perfil",
+   "settings.account.headline" : "Conta",
+   "settings.account.headlineAccount" : "Informação da conta",
+   "settings.account.headlineInvoices" : "Faturas",
+   "settings.account.headlinePassword" : "Mudar password",
+   "settings.account.headlineProfile" : "Actualizar o perfil",
+   "settings.account.headlineSubscription" : "A tua subscrição",
+   "settings.account.headlineUpgrade" : "Atualiza a tua conta e ajuda o Franz",
+   "settings.account.invoiceDownload" : "Descarregar",
+   "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
+   "settings.account.mining.active" : "Agora, estás a executar {hashes} hashes por segundo",
+   "settings.account.mining.cancel" : "Cancelar mineração",
+   "settings.account.mining.moreInformation" : "Mais informação",
+   "settings.account.mining.thankyou" : "Obrigado por ajudares o Franz com o teu poder de processamento",
+   "settings.account.successInfo" : "As tuas mudanças foram feitas com sucesso",
+   "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
+   "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador.",
+   "settings.app.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
+   "settings.app.buttonSearchForUpdate" : "Procurar por atualizações",
+   "settings.app.currentVersion" : "Versão atual",
+   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
+   "settings.app.form.autoLaunchOnStart" : "Inicar o Franz quando inciar o computador",
+   "settings.app.form.beta" : "Incluir versões instáveis (beta)",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
+   "settings.app.form.language" : "Idioma:",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
+   "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Definições",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Geral",
+   "settings.app.headlineLanguage" : "Idioma:",
+   "settings.app.headlineUpdates" : "Atualizações",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Atualização disponivel, a descarregar...",
+   "settings.app.updateStatusSearching" : "Está a procurar atualizações",
+   "settings.app.updateStatusUpToDate" : "Estás a usar a última versão do Franz",
+   "settings.navigation.account" : "Conta",
+   "settings.navigation.availableServices" : "Serviços disponíveis",
+   "settings.navigation.logout" : "Terminar Sessão",
+   "settings.navigation.settings" : "Definições",
+   "settings.navigation.yourServices" : "Os teus serviços",
+   "settings.recipes.all" : "Todos os serviços",
+   "settings.recipes.dev" : "Desenvolvimento",
+   "settings.recipes.headline" : "Serviços disponíveis",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Os mais populares",
+   "settings.recipes.nothingFound" : "Desculpa, mas não existe nenhum serviço com este termo.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
+   "settings.service.error.goBack" : "Voltar aos serviços",
+   "settings.service.error.headline" : "Erro",
+   "settings.service.error.message" : "Não foi possível carregar a receita do serviço.",
+   "settings.service.form.addServiceHeadline" : "Adicionar {name}",
+   "settings.service.form.availableServices" : "Serviços disponíveis",
+   "settings.service.form.customUrl" : "Servidor personalizado",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços de hospedagem própria, precisas de uma Conta Premium Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Atualizar a conta",
+   "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor {nome}.",
+   "settings.service.form.deleteButton" : "Apagar serviço",
+   "settings.service.form.editServiceHeadline" : "Editar {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Ativar notificações",
+   "settings.service.form.enableService" : "Ativar serviço",
+   "settings.service.form.indirectMessageInfo" : "Serás notificado sobre todas as novas mensagens de um canal, não só @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Nome",
+   "settings.service.form.saveButton" : "Guardar serviço",
+   "settings.service.form.tabHosted" : "Hospedado",
+   "settings.service.form.tabOnPremise" : "Hospedado por si próprio ⭐️",
+   "settings.service.form.team" : "Equipa",
+   "settings.service.form.yourServices" : "Os teus serviços",
+   "settings.services.deletedInfo" : "O serviço foi apagado",
+   "settings.services.discoverServices" : "Descobrir serviços",
+   "settings.services.headline" : "Os teus serviços",
+   "settings.services.noServicesAdded" : "Ainda não adicionaste nenhum serviço.",
+   "settings.services.tooltip.isDisabled" : "O serviço está desativado",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "As notificações estão desabilitadas",
+   "settings.services.updatedInfo" : "As alterações foram guardadas",
+   "settings.user.form.accountType.company" : "Empresa",
+   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.label" : "Tipo de conta",
+   "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
+   "settings.user.form.currentPassword" : "Password atual",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "Nova password",
+   "sidebar.addNewService" : "Adicionar um novo serviço",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Definições",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Empresa",
+   "signup.email.label" : "Endereço de e-mail",
+   "signup.emailDuplicate" : "Uma conta já tem esse email associado",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Iniciar Sessão",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "Ao criar uma conta Franz, aceitas",
+   "signup.legal.privacy" : "Declaração de privacidade",
+   "signup.legal.terms" : "Termos de Serviço",
+   "signup.link.login" : "Já tens uma conta?",
+   "signup.password.label" : "Password",
+   "signup.submit.label" : "Criar uma Conta",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Sem anúncios, para sempre!",
+   "subscription.features.comingSoon" : "Em breve!",
+   "subscription.features.customServices" : "Serviços privados para ti e para os teus amigos\/colegas",
+   "subscription.features.encryptedSync" : "Sincronização encriptada de serviços",
+   "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
+   "subscription.features.vpn" : "Suporte para proxy\/VPN",
+   "subscription.includedFeatures" : "Ao pagares para o Franz Premium, tens acesso a",
+   "subscription.mining.experimental" : "experimental",
+   "subscription.mining.headline" : "Como é que isto funciona?",
+   "subscription.mining.line1" : "Ao habilitar \\\"Ajudar com poder de processamento\\\", o Franz vai usar cerca de 20-50% do teu CPU para minerar Monero que equivale aproximadamente a $5\/ano.",
+   "subscription.mining.line2" : "Vamos adaptar o uso da CPU com base no teu comportamento de trabalho para não drenar a bateria ou diminuir a velocidade da máquina.",
+   "subscription.mining.line3" : "Enquanto a mineração estiver ativa, terás acesso ilimitado a todas as Características de Suporte Premium da Franz.",
+   "subscription.mining.moreInformation" : "Obter informação sobre este plano.",
+   "subscription.paymentSessionError" : "Erro no serviço de pagamento",
+   "subscription.submit.label" : "Quero ajudar o desenvolvimento do Franz",
+   "subscription.type.free" : "Gratuito",
+   "subscription.type.mining" : "Ajudar o Franz com poder de processamento",
+   "subscription.type.month" : "mês",
+   "subscription.type.year" : "ano",
+   "subscriptionPopup.buttonCancel" : "Cancelar",
+   "subscriptionPopup.buttonDone" : "Concluído",
+   "tabs.item.deleteService" : "Apagar serviço",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Desativar notificações",
+   "tabs.item.disableService" : "Desativar serviço",
+   "tabs.item.edit" : "Editar",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Ativar notificações",
+   "tabs.item.enableService" : "Ativar serviço",
+   "tabs.item.reload" : "Recarregar",
+   "welcome.loginButton" : "Fazer login",
+   "welcome.signupButton" : "Criar uma conta gratuita",
+   "welcome.slogan" : "Messaging that works for you"
+}
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 97b746097..62a8a0f84 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,169 +1,192 @@
-{
-  "global.api.unhealthy": "Невозможно подключиться к сервисам Franz",
-  "global.notConnectedToTheInternet": "Нет Интернет-соединения",
-  "welcome.signupButton": "Создать аккаунт",
-  "welcome.loginButton": "Вход",
-  "welcome.slogan": "Общение, которое просто работает",
-  "login.headline": "Регистрация",
-  "login.email.label": "Email адрес",
-  "login.password.label": "Пароль",
-  "login.submit.label": "Регистрация",
-  "login.invalidCredentials": "Неправильный email или пароль",
-  "login.tokenExpired": "Сессия устарела, пожалуйста, войдите снова.",
-  "login.serverLogout": "Сессия устарела, пожалуйста, войдите снова.",
-  "login.link.signup": "Создать бесплатный аккаунт",
-  "login.link.password": "Восстановить пароль",
-  "password.headline": "Восстановление пароля",
-  "password.email.label": "Email адрес",
-  "password.submit.label": "Отправить",
-  "password.noUser": "Не найдено пользователя с таким email",
-  "password.successInfo": "Проверьте Ваш email",
-  "password.link.signup": "Создать аккаунт",
-  "password.link.login": "Вход",
-  "signup.headline": "Регистрация",
-  "signup.firstname.label": "Имя",
-  "signup.lastname.label": "Фамилия",
-  "signup.email.label": "Email адрес",
-  "signup.company.label": "Организация",
-  "signup.password.label": "Пароль",
-  "signup.submit.label": "Создать аккаунт",
-  "signup.link.login": "Уже есть аккаунт, войти?",
-  "signup.emailDuplicate": "Пользователь с указанным email уже существует",
-  "signup.legal.info": "Создавая аккаунт Franz, Вы принимаете",
-  "signup.legal.terms": "Условия обслуживания",
-  "signup.legal.privacy": "Политика конфиденциальности",
-  "pricing.headline": "Поддержать Franz",
-  "pricing.support.label": "Выберите план поддержки",
-  "pricing.submit.label": "Я хочу поддержать разработку Franz",
-  "pricing.link.skipPayment": "Я не хочу поддерживать разработку Franz.",
-  "import.headline": "Импортировать сервисы Franz 4",
-  "import.notSupportedHeadline": "Сервисы еще не поддержаны в Franz 5",
-  "import.submit.label": "Импортировать сервисы",
-  "import.skip.label": "Я хочу добавить сервисы вручную",
-  "invite.submit.label": "Выслать приглашения",
-  "invite.headline.friends": "Пригласите 3х друзей или коллег",
-  "invite.name.label": "Имя",
-  "invite.email.label": "Email адрес",
-  "invite.skip.label": "Я сделаю это позже",
-  "subscription.submit.label": "Я хочу поддержать разработку Franz",
-  "subscription.paymentSessionError": "Невозможно загрузить форму оплаты",
-  "subscription.includedFeatures": "Оплаченный Franz Премиум аккаунт включает",
-  "subscription.features.onpremise": "Добавить облачные службы или службы со своим хостингом типа HipChat",
-  "subscription.features.customServices": "Настраиваемые сервисы для Вас и Вашей команды",
-  "subscription.features.encryptedSync": "Шифрованная синхронизация сессии",
-  "subscription.features.vpn": "Поддержка прокси и VPN",
-  "subscription.features.ads": "Без рекламы, навсегда!",
-  "subscription.features.comingSoon": "следите за обновлениями",
-  "infobar.servicesUpdated": "Ваши сервисы были обновлены.",
-  "infobar.updateAvailable": "Доступно обновление Franz.",
-  "infobar.buttonReloadServices": "Перезагрузить сервисы",
-  "infobar.buttonInstallUpdate": "Перезапустить и обновить",
-  "infobar.requiredRequestsFailed": "Невозможно загрузить сервисы и информацию пользователя",
-  "sidebar.settings": "Настройки",
-  "sidebar.addNewService": "!!!Add new service",
-  "services.welcome": "Добро пожаловать во Franz",
-  "services.getStarted": "Начать работу",
-  "settings.account.headline": "Аккаунт",
-  "settings.account.headlineSubscription": "Ваша подписка",
-  "settings.account.headlineUpgrade": "Улучшить аккаунт и поддержать Franz",
-  "settings.account.headlineInvoices": "Счета",
-  "settings.account.manageSubscription.label": "Управление подпиской",
-  "settings.account.accountType.basic": "Базовый аккаунт",
-  "settings.account.accountType.premium": "Премиум аккаунт",
-  "settings.account.account.editButton": "Редактировать аккаунт",
-  "settings.account.invoiceDownload": "Скачать",
-  "settings.account.userInfoRequestFailed": "Невозможно загрузить информацию пользователя",
-  "settings.account.tryReloadUserInfoRequest": "Попробовать снова",
-  "settings.account.headlineProfile": "Обновить профиль",
-  "settings.account.headlineAccount": "Информация аккаунта",
-  "settings.account.headlinePassword": "Сменить пароль",
-  "settings.account.successInfo": "Изменения сохранены",
-  "settings.account.buttonSave": "Сохранить изменения",
-  "settings.account.mining.thankyou": "Спасибо за поддержку Franz Вашими процессорными мощностями.",
-  "settings.account.mining.active": "Вы выполняете {hashes} вычислений в секунду.",
-  "settings.account.mining.moreInformation": "Больше информации",
-  "settings.account.mining.cancel": "Отменить майнинг",
-  "settings.navigation.availableServices": "Доступные сервисы",
-  "settings.navigation.yourServices": "Ваши сервисы",
-  "settings.navigation.account": "Аккаунт",
-  "settings.navigation.settings": "Настройки",
-  "settings.navigation.logout": "Выход",
-  "settings.recipes.headline": "Доступные сервисы",
-  "settings.recipes.mostPopular": "Популярные",
-  "settings.recipes.all": "Все сервисы",
-  "settings.recipes.dev": "Разработка",
-  "settings.recipes.nothingFound": "Ничего не найдено по Вашему запросу.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
-  "settings.service.form.saveButton": "Сохранить сервис",
-  "settings.service.form.deleteButton": "Удалить сервис",
-  "settings.service.form.availableServices": "Доступные сервисы",
-  "settings.service.form.yourServices": "Ваши сервисы",
-  "settings.service.form.addServiceHeadline": "Добавление {name}",
-  "settings.service.form.editServiceHeadline": "Редактирование {name}",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Свой хостинг ⭐️",
-  "settings.service.form.customUrlValidationError": "Невозможно проверить сервер {name}.",
-  "settings.service.form.customUrlPremiumInfo": "Для добавния сервиса на своем хостинге, необходим аккаунт Franz Premium.",
-  "settings.service.form.customUrlUpgradeAccount": "Улучшить аккаунт",
-  "settings.service.form.indirectMessageInfo": "Вы будете получать уведомления для всех сообщений, не только для @username, @channel, @here, ...",
-  "settings.service.error.headline": "Ошибка",
-  "settings.service.error.goBack": "Вернуться к сервисам",
-  "settings.service.error.message": "Невозможно загрузить рецепт сервиса.",
-  "settings.services.tooltip.isDisabled": "Сервис отключен",
-  "settings.services.tooltip.notificationsDisabled": "Уведомления отключены",
-  "settings.services.headline": "Ваши сервисы",
-  "settings.services.noServicesAdded": "У Вас пока нет сервисов",
-  "settings.services.discoverServices": "Найти сервисы",
-  "settings.services.updatedInfo": "Изменения сохранены",
-  "settings.services.deletedInfo": "Сервис удален",
-  "settings.app.headline": "Настройки",
-  "settings.app.headlineGeneral": "Общие",
-  "settings.app.headlineLanguage": "Язык",
-  "settings.app.headlineUpdates": "Обновления",
-  "settings.app.buttonSearchForUpdate": "Проверить обновления",
-  "settings.app.buttonInstallUpdate": "Перезапустить и обновить",
-  "settings.app.updateStatusSearching": "Поиск обновлений",
-  "settings.app.updateStatusAvailable": "Доступно обновление, загрука...",
-  "settings.app.updateStatusUpToDate": "Вы используете актуальную версию Franz",
-  "settings.app.form.autoLaunchOnStart": "Запускать Franz при старте",
-  "settings.app.form.autoLaunchInBackground": "Открывать в фоне",
-  "settings.app.form.enableSystemTray": "Показывать Franz в трее",
-  "settings.app.form.minimizeToSystemTray": "Сворачивать Franz в трей",
-  "settings.app.form.runInBackground": "Оставлять Franz в фоне при закрытии окна",
-  "settings.app.form.language": "Язык",
-  "settings.app.form.beta": "Включая бета версии",
-  "settings.app.currentVersion": "Текущая версия:",
-  "settings.service.form.name": "Название",
-  "settings.service.form.enableService": "Включить сервис",
-  "settings.service.form.enableNotification": "Включить уведомления",
-  "settings.service.form.team": "Команда",
-  "settings.service.form.customUrl": "Адрес сервера",
-  "settings.service.form.indirectMessages": "Показывать значок уведомлений для всех новых сообщений",
-  "settings.user.form.firstname": "Имя",
-  "settings.user.form.lastname": "Фамилия",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Текущий пароль",
-  "settings.user.form.newPassword": "Новый пароль",
-  "settings.user.form.accountType.label": "Тип аккаунта",
-  "settings.user.form.accountType.individual": "Индивидуальный",
-  "settings.user.form.accountType.non-profit": "Некоммерческий",
-  "settings.user.form.accountType.company": "Компания",
-  "subscription.type.free": "бесплатно",
-  "subscription.type.month": "месяц",
-  "subscription.type.year": "год",
-  "subscription.type.mining": "Поддерживать Franz, предоставляя процессорную мощность",
-  "subscription.mining.headline": "Как это работает?",
-  "subscription.mining.experimental": "экспериментально",
-  "subscription.mining.line1": "Включая \"Поддерживать Franz, предоставляя процессорную мощность\", Franz будет использовать 20-50% процессорного времени для майнинга криптовалюты Monero в примерном объеме 5$/год.",
-  "subscription.mining.line2": "Мы будем регулировать использование процессора, чтобы не садить батарею и не мешать Вашей работе",
-  "subscription.mining.line3": "Пока разрешен майнинг, Вам будут достуны все возможности Franz Premium без ограничений",
-  "subscription.mining.moreInformation": "Узнать больше об этом плане.",
-  "subscriptionPopup.buttonCancel": "Отмена",
-  "subscriptionPopup.buttonDone": "Готово",
-  "tabs.item.reload": "Перезагрузить",
-  "tabs.item.edit": "Редактировать",
-  "tabs.item.disableNotifications": "Отключить уведомления",
-  "tabs.item.enableNotification": "Включить уведомления",
-  "tabs.item.disableService": "Отключить сервис",
-  "tabs.item.deleteService": "Удалить сервис"
+{
+   "global.api.unhealthy" : "Невозможно подключиться к сервисам Franz",
+   "global.notConnectedToTheInternet" : "Нет Интернет-соединения",
+   "import.headline" : "Импортировать сервисы Franz 4",
+   "import.notSupportedHeadline" : "Сервисы еще не поддержаны в Franz 5",
+   "import.skip.label" : "Я хочу добавить сервисы вручную",
+   "import.submit.label" : "Импортировать сервисы",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Перезапустить и обновить",
+   "infobar.buttonReloadServices" : "Перезагрузить сервисы",
+   "infobar.requiredRequestsFailed" : "Невозможно загрузить сервисы и информацию пользователя",
+   "infobar.servicesUpdated" : "Ваши сервисы были обновлены.",
+   "infobar.updateAvailable" : "Доступно обновление Franz.",
+   "invite.email.label" : "Email адрес",
+   "invite.headline.friends" : "Пригласите 3х друзей или коллег",
+   "invite.name.label" : "Имя",
+   "invite.skip.label" : "Я сделаю это позже",
+   "invite.submit.label" : "Выслать приглашения",
+   "login.email.label" : "Email адрес",
+   "login.headline" : "Регистрация",
+   "login.invalidCredentials" : "Неправильный email или пароль",
+   "login.link.password" : "Восстановить пароль",
+   "login.link.signup" : "Создать бесплатный аккаунт",
+   "login.password.label" : "Пароль",
+   "login.serverLogout" : "Сессия устарела, пожалуйста, войдите снова.",
+   "login.submit.label" : "Регистрация",
+   "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
+   "password.email.label" : "Email адрес",
+   "password.headline" : "Восстановление пароля",
+   "password.link.login" : "Вход",
+   "password.link.signup" : "Создать аккаунт",
+   "password.noUser" : "Не найдено пользователя с таким email",
+   "password.submit.label" : "Отправить",
+   "password.successInfo" : "Проверьте Ваш email",
+   "pricing.headline" : "Поддержать Franz",
+   "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
+   "pricing.submit.label" : "Я хочу поддержать разработку Franz",
+   "pricing.support.label" : "Выберите план поддержки",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Начать работу",
+   "services.welcome" : "Добро пожаловать во Franz",
+   "settings.account.account.editButton" : "Редактировать аккаунт",
+   "settings.account.accountType.basic" : "Базовый аккаунт",
+   "settings.account.accountType.premium" : "Премиум аккаунт",
+   "settings.account.buttonSave" : "Сохранить изменения",
+   "settings.account.headline" : "Аккаунт",
+   "settings.account.headlineAccount" : "Информация аккаунта",
+   "settings.account.headlineInvoices" : "Счета",
+   "settings.account.headlinePassword" : "Сменить пароль",
+   "settings.account.headlineProfile" : "Обновить профиль",
+   "settings.account.headlineSubscription" : "Ваша подписка",
+   "settings.account.headlineUpgrade" : "Улучшить аккаунт и поддержать Franz",
+   "settings.account.invoiceDownload" : "Скачать",
+   "settings.account.manageSubscription.label" : "Управление подпиской",
+   "settings.account.mining.active" : "Вы выполняете {hashes} вычислений в секунду.",
+   "settings.account.mining.cancel" : "Отменить майнинг",
+   "settings.account.mining.moreInformation" : "Больше информации",
+   "settings.account.mining.thankyou" : "Спасибо за поддержку Franz Вашими процессорными мощностями.",
+   "settings.account.successInfo" : "Изменения сохранены",
+   "settings.account.tryReloadUserInfoRequest" : "Попробовать снова",
+   "settings.account.userInfoRequestFailed" : "Невозможно загрузить информацию пользователя",
+   "settings.app.buttonInstallUpdate" : "Перезапустить и обновить",
+   "settings.app.buttonSearchForUpdate" : "Проверить обновления",
+   "settings.app.currentVersion" : "Текущая версия:",
+   "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
+   "settings.app.form.autoLaunchOnStart" : "Запускать Franz при старте",
+   "settings.app.form.beta" : "Включая бета версии",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Показывать Franz в трее",
+   "settings.app.form.language" : "Язык",
+   "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в трей",
+   "settings.app.form.runInBackground" : "Оставлять Franz в фоне при закрытии окна",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Настройки",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Общие",
+   "settings.app.headlineLanguage" : "Язык",
+   "settings.app.headlineUpdates" : "Обновления",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Доступно обновление, загрука...",
+   "settings.app.updateStatusSearching" : "Поиск обновлений",
+   "settings.app.updateStatusUpToDate" : "Вы используете актуальную версию Franz",
+   "settings.navigation.account" : "Аккаунт",
+   "settings.navigation.availableServices" : "Доступные сервисы",
+   "settings.navigation.logout" : "Выход",
+   "settings.navigation.settings" : "Настройки",
+   "settings.navigation.yourServices" : "Ваши сервисы",
+   "settings.recipes.all" : "Все сервисы",
+   "settings.recipes.dev" : "Разработка",
+   "settings.recipes.headline" : "Доступные сервисы",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Популярные",
+   "settings.recipes.nothingFound" : "Ничего не найдено по Вашему запросу.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Сервис успешно добавлен",
+   "settings.service.error.goBack" : "Вернуться к сервисам",
+   "settings.service.error.headline" : "Ошибка",
+   "settings.service.error.message" : "Невозможно загрузить рецепт сервиса.",
+   "settings.service.form.addServiceHeadline" : "Добавление {name}",
+   "settings.service.form.availableServices" : "Доступные сервисы",
+   "settings.service.form.customUrl" : "Адрес сервера",
+   "settings.service.form.customUrlPremiumInfo" : "Для добавния сервиса на своем хостинге, необходим аккаунт Franz Premium.",
+   "settings.service.form.customUrlUpgradeAccount" : "Улучшить аккаунт",
+   "settings.service.form.customUrlValidationError" : "Невозможно проверить сервер {name}.",
+   "settings.service.form.deleteButton" : "Удалить сервис",
+   "settings.service.form.editServiceHeadline" : "Редактирование {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Включить уведомления",
+   "settings.service.form.enableService" : "Включить сервис",
+   "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомления для всех сообщений, не только для @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Показывать значок уведомлений для всех новых сообщений",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Название",
+   "settings.service.form.saveButton" : "Сохранить сервис",
+   "settings.service.form.tabHosted" : "Hosted",
+   "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
+   "settings.service.form.team" : "Команда",
+   "settings.service.form.yourServices" : "Ваши сервисы",
+   "settings.services.deletedInfo" : "Сервис удален",
+   "settings.services.discoverServices" : "Найти сервисы",
+   "settings.services.headline" : "Ваши сервисы",
+   "settings.services.noServicesAdded" : "У Вас пока нет сервисов",
+   "settings.services.tooltip.isDisabled" : "Сервис отключен",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Уведомления отключены",
+   "settings.services.updatedInfo" : "Изменения сохранены",
+   "settings.user.form.accountType.company" : "Компания",
+   "settings.user.form.accountType.individual" : "Индивидуальный",
+   "settings.user.form.accountType.label" : "Тип аккаунта",
+   "settings.user.form.accountType.non-profit" : "Некоммерческий",
+   "settings.user.form.currentPassword" : "Текущий пароль",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "Имя",
+   "settings.user.form.lastname" : "Фамилия",
+   "settings.user.form.newPassword" : "Новый пароль",
+   "sidebar.addNewService" : "!!!Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Настройки",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Организация",
+   "signup.email.label" : "Email адрес",
+   "signup.emailDuplicate" : "Пользователь с указанным email уже существует",
+   "signup.firstname.label" : "Имя",
+   "signup.headline" : "Регистрация",
+   "signup.lastname.label" : "Фамилия",
+   "signup.legal.info" : "Создавая аккаунт Franz, Вы принимаете",
+   "signup.legal.privacy" : "Политика конфиденциальности",
+   "signup.legal.terms" : "Условия обслуживания",
+   "signup.link.login" : "Уже есть аккаунт, войти?",
+   "signup.password.label" : "Пароль",
+   "signup.submit.label" : "Создать аккаунт",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Без рекламы, навсегда!",
+   "subscription.features.comingSoon" : "следите за обновлениями",
+   "subscription.features.customServices" : "Настраиваемые сервисы для Вас и Вашей команды",
+   "subscription.features.encryptedSync" : "Шифрованная синхронизация сессии",
+   "subscription.features.onpremise" : "Добавить облачные службы или службы со своим хостингом типа HipChat",
+   "subscription.features.vpn" : "Поддержка прокси и VPN",
+   "subscription.includedFeatures" : "Оплаченный Franz Премиум аккаунт включает",
+   "subscription.mining.experimental" : "экспериментально",
+   "subscription.mining.headline" : "Как это работает?\",",
+   "subscription.mining.line1" : "Включая \"Поддерживать Franz, предоставляя процессорную мощность\", Franz будет использовать 20-50% процессорного времени для майнинга криптовалюты Monero в примерном объеме 5$\/год.",
+   "subscription.mining.line2" : "Мы будем регулировать использование процессора, чтобы не садить батарею и не мешать Вашей работе",
+   "subscription.mining.line3" : "Пока разрешен майнинг, Вам будут достуны все возможности Franz Premium без ограничений",
+   "subscription.mining.moreInformation" : "Узнать больше об этом плане.",
+   "subscription.paymentSessionError" : "Невозможно загрузить форму оплаты",
+   "subscription.submit.label" : "Я хочу поддержать разработку Franz",
+   "subscription.type.free" : "бесплатно",
+   "subscription.type.mining" : "Поддерживать Franz, предоставляя процессорную мощность",
+   "subscription.type.month" : "месяц",
+   "subscription.type.year" : "год",
+   "subscriptionPopup.buttonCancel" : "Отмена",
+   "subscriptionPopup.buttonDone" : "Готово",
+   "tabs.item.deleteService" : "Удалить сервис",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Отключить уведомления",
+   "tabs.item.disableService" : "Отключить сервис",
+   "tabs.item.edit" : "Редактировать",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Включить уведомления",
+   "tabs.item.enableService" : "Включить сервис",
+   "tabs.item.reload" : "Перезагрузить",
+   "welcome.loginButton" : "Вход",
+   "welcome.signupButton" : "Создать аккаунт",
+   "welcome.slogan" : "Общение, которое просто работает"
 }
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
new file mode 100644
index 000000000..d8415762d
--- /dev/null
+++ b/src/i18n/locales/sk.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Franz sa nemôže pripojit k online službám",
+   "global.notConnectedToTheInternet" : "Nie ste pripojený k internetu",
+   "import.headline" : "Importovať služby z Franz 4",
+   "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
+   "import.skip.label" : "Chcem pridať služby manuálne",
+   "import.submit.label" : "Importovať služby",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Reštartovať a inštalovať aktualizáciu",
+   "infobar.buttonReloadServices" : "Obnoviť služby",
+   "infobar.requiredRequestsFailed" : "Nie je možné načítať služby a informácie o užívateľovi",
+   "infobar.servicesUpdated" : "Vaše služby boli aktualizované.",
+   "infobar.updateAvailable" : "Nová aktualizácia Franz je k dispozícii.",
+   "invite.email.label" : "E-mailová adresa",
+   "invite.headline.friends" : "Pozvite 3 priateľov alebo kolegov",
+   "invite.name.label" : "Meno",
+   "invite.skip.label" : "Spravím to neskôr",
+   "invite.submit.label" : "Poslať pozvánky",
+   "login.email.label" : "Emailová adresa",
+   "login.headline" : "Prihlásiť sa",
+   "login.invalidCredentials" : "E-mail alebo heslo nesúhlasí",
+   "login.link.password" : "Obnoviť heslo",
+   "login.link.signup" : "Vytvoriť užívateľský účet zdarma",
+   "login.password.label" : "Heslo",
+   "login.serverLogout" : "Relácia vypršala, prihláste sa prosím znova.",
+   "login.submit.label" : "Prihlásiť sa",
+   "login.tokenExpired" : "Relácia vypršala, prosím prihláste sa znova.",
+   "password.email.label" : "Emailová adresa",
+   "password.headline" : "Vynulovať heslo",
+   "password.link.login" : "Prihlásenie do vašeho účtu",
+   "password.link.signup" : "Vytvoriť užívateľský účet zdarma",
+   "password.noUser" : "Užívateľ s touto emailovou adresou nebol nájdený",
+   "password.submit.label" : "Odoslať",
+   "password.successInfo" : "Prosím, zkontrolujte svoj e-mail",
+   "pricing.headline" : "Podporte Franz",
+   "pricing.link.skipPayment" : "Nechcem podporiť vývoj aplikácie Franz.",
+   "pricing.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
+   "pricing.support.label" : "Vyberte váš plán podpory",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Začíname",
+   "services.welcome" : "Víta vás Franz",
+   "settings.account.account.editButton" : "Upraviť účet",
+   "settings.account.accountType.basic" : "Základný účet",
+   "settings.account.accountType.premium" : "Prémiový účet podporovateľa",
+   "settings.account.buttonSave" : "Aktualizovať profil",
+   "settings.account.headline" : "Účet",
+   "settings.account.headlineAccount" : "Informácie o účte",
+   "settings.account.headlineInvoices" : "Faktúry",
+   "settings.account.headlinePassword" : "Zmeniť heslo",
+   "settings.account.headlineProfile" : "Aktualizovať profil",
+   "settings.account.headlineSubscription" : "Vaše predplatné",
+   "settings.account.headlineUpgrade" : "Inovujte svoj účet a podporte Franz",
+   "settings.account.invoiceDownload" : "Stiahnuť",
+   "settings.account.manageSubscription.label" : "Spravovať vaše predplatné",
+   "settings.account.mining.active" : "Práve vykonávate {hashes} výpočty za sekundu.",
+   "settings.account.mining.cancel" : "Zrušiť ťažbu",
+   "settings.account.mining.moreInformation" : "Získať viac informácií",
+   "settings.account.mining.thankyou" : "Ďakujeme, že podporujete Franz vaším výpočetným výkonom.",
+   "settings.account.successInfo" : "Vaše zmeny boli uložené",
+   "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
+   "settings.account.userInfoRequestFailed" : "Nebolo možné získať informácie o užívateľovi",
+   "settings.app.buttonInstallUpdate" : "Reštart a inštalácia aktualizácií",
+   "settings.app.buttonSearchForUpdate" : "Skontrolovať aktualizácie",
+   "settings.app.currentVersion" : "Aktuálna verzia:",
+   "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
+   "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
+   "settings.app.form.beta" : "Vrátane beta verzií",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
+   "settings.app.form.language" : "Jazyk",
+   "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
+   "settings.app.form.runInBackground" : "Ponechať Franz spustený v pozadí pri zatvorení okna",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Nastavenia",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Všeobecné",
+   "settings.app.headlineLanguage" : "Jazyk",
+   "settings.app.headlineUpdates" : "Aktualizácie",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Dostupná aktualizácia, sťahujem...",
+   "settings.app.updateStatusSearching" : "Vyhľadávam aktualizácie",
+   "settings.app.updateStatusUpToDate" : "Používate najnovšiu verziu Franz",
+   "settings.navigation.account" : "Účet",
+   "settings.navigation.availableServices" : "Dostupné služby",
+   "settings.navigation.logout" : "Odhlásiť sa",
+   "settings.navigation.settings" : "Nastavenia",
+   "settings.navigation.yourServices" : "Vaše služby",
+   "settings.recipes.all" : "Všetky služby",
+   "settings.recipes.dev" : "Vývoj",
+   "settings.recipes.headline" : "Dostupné služby",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Najpopulárnejšie",
+   "settings.recipes.nothingFound" : "Je nám ľúto, ale žiadna služba nezodpovedala vášmu hľadanému výrazu.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Služba úspešne pridaná",
+   "settings.service.error.goBack" : "Späť na služby",
+   "settings.service.error.headline" : "Chyba",
+   "settings.service.error.message" : "Nepodarilo sa načítať službu.",
+   "settings.service.form.addServiceHeadline" : "Pridať {názov}",
+   "settings.service.form.availableServices" : "Dostupné služby",
+   "settings.service.form.customUrl" : "Vlastný server",
+   "settings.service.form.customUrlPremiumInfo" : "Ak chcete pridať vlastné hostované služby, potrebujete účet Franz Premium Supporter.",
+   "settings.service.form.customUrlUpgradeAccount" : "Inovujte váš účet",
+   "settings.service.form.customUrlValidationError" : "Nebolo možné overiť vlastný server: {name}.",
+   "settings.service.form.deleteButton" : "Odstrániť službu",
+   "settings.service.form.editServiceHeadline" : "Upraviť {meno}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Povoliť oznámenia",
+   "settings.service.form.enableService" : "Povoliť službu",
+   "settings.service.form.indirectMessageInfo" : "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @meno, @kanál, @kde, ...",
+   "settings.service.form.indirectMessages" : "Zobraziť znak správy pre všetky nové správy",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Meno",
+   "settings.service.form.saveButton" : "Uložiť službu",
+   "settings.service.form.tabHosted" : "Hostovaný",
+   "settings.service.form.tabOnPremise" : "Vlastné hosťovanie ⭐️",
+   "settings.service.form.team" : "Tím",
+   "settings.service.form.yourServices" : "Vaše služby",
+   "settings.services.deletedInfo" : "Služba bola odstránená",
+   "settings.services.discoverServices" : "Preskúmajte služby",
+   "settings.services.headline" : "Vaše služby",
+   "settings.services.noServicesAdded" : "Nepridali ste ešte žiadne služby",
+   "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
+   "settings.services.updatedInfo" : "Vaše zmeny boli uložené",
+   "settings.user.form.accountType.company" : "Spoločnosť",
+   "settings.user.form.accountType.individual" : "Jednotlivec",
+   "settings.user.form.accountType.label" : "Typ účtu",
+   "settings.user.form.accountType.non-profit" : "Nezisková organizácia",
+   "settings.user.form.currentPassword" : "Súčasné heslo",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "Nové heslo",
+   "sidebar.addNewService" : "Pridať novú službu",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Nastavenia",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Spoločnosť",
+   "signup.email.label" : "Emailová adresa",
+   "signup.emailDuplicate" : "Kontakt s touto emailovou adresou už existuje",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Prihlásiť sa",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "Vytvorením účtu Franz akceptujete",
+   "signup.legal.privacy" : "Vyhlásenie o ochrane súkromia",
+   "signup.legal.terms" : "Podmienky služby",
+   "signup.link.login" : "Už máte účet, prihlásiť sa?",
+   "signup.password.label" : "Heslo",
+   "signup.submit.label" : "Vytvoriť účet",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Žiadne reklamy, nikdy!",
+   "subscription.features.comingSoon" : "už čoskoro",
+   "subscription.features.customServices" : "Privátne ​​služby pre vás a váš tím",
+   "subscription.features.encryptedSync" : "Šifrovaná synchronizácia relácie",
+   "subscription.features.onpremise" : "Pridať vlastné\/hostované služby, ako je HipChat",
+   "subscription.features.vpn" : "Proxy & VPN podpora",
+   "subscription.includedFeatures" : "Platený účet Premium Supporter Franz zahŕňa",
+   "subscription.mining.experimental" : "experimentálne",
+   "subscription.mining.headline" : "Ako toto funguje?",
+   "subscription.mining.line1" : "Povolením funkcie \"Podpora s výpočtovou silou\" bude Franz používať približne 20-50% vášho CPU na ťažbu kryptomeny Monero, čo sa rovná približne 5 dolárov ročne.",
+   "subscription.mining.line2" : "Prispôsobíme využitie procesora na základe vášho pracovného správania, aby sme nevyčerpali batériu a nespomaľovali vás a váš počítač.",
+   "subscription.mining.line3" : "Pokiaľ je baník aktívny, budete mať neobmedzený prístup ku všetkým funkciám Franz Premium Supporter.",
+   "subscription.mining.moreInformation" : "Získať viac informácií o tomto pláne.",
+   "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
+   "subscription.submit.label" : "Chcem podporiť vývoj programu Franz",
+   "subscription.type.free" : "Zdarma",
+   "subscription.type.mining" : "Podporiť Franz výpočetným výkonom",
+   "subscription.type.month" : "mesiac",
+   "subscription.type.year" : "rok",
+   "subscriptionPopup.buttonCancel" : "Zrušiť",
+   "subscriptionPopup.buttonDone" : "Dokončiť",
+   "tabs.item.deleteService" : "Odstrániť službu",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Zakázať oznámenia",
+   "tabs.item.disableService" : "Vypnúť službu",
+   "tabs.item.edit" : "Upraviť",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Povoliť oznámenia",
+   "tabs.item.enableService" : "Povoliť službu",
+   "tabs.item.reload" : "Obnoviť",
+   "welcome.loginButton" : "Prihláste sa k vášmu účtu",
+   "welcome.signupButton" : "Vytvoriť užívateľský účet zdarma",
+   "welcome.slogan" : "Správy, ktoré pracujú pre vás"
+}
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
new file mode 100644
index 000000000..902368150
--- /dev/null
+++ b/src/i18n/locales/uk.json
@@ -0,0 +1,192 @@
+{
+   "global.api.unhealthy" : "Не можна підключитись до онлайн сервісів Franz",
+   "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
+   "import.headline" : "Імпортувати ваші сервіси з Franz 4",
+   "import.notSupportedHeadline" : "Сервіси ще не підтримуються в Franz 5",
+   "import.skip.label" : "Я хочу додати сервіси вручну",
+   "import.submit.label" : "Імпортувати сервіси",
+   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonInstallUpdate" : "Перезавантажити і встановити оновлення",
+   "infobar.buttonReloadServices" : "Перезавантажити сервіси",
+   "infobar.requiredRequestsFailed" : "Не вдалося завантажити сервіси та інформацію користувача",
+   "infobar.servicesUpdated" : "Ваші сервіси було оновлено.",
+   "infobar.updateAvailable" : "Нове оновлення для Franz доступне.",
+   "invite.email.label" : "Email адреса",
+   "invite.headline.friends" : "Запросіть 3 ваших друзів або колег",
+   "invite.name.label" : "Ім'я",
+   "invite.skip.label" : "Я хочу зробити це пізніше",
+   "invite.submit.label" : "Відправити запрошення",
+   "login.email.label" : "Email адреса",
+   "login.headline" : "Увійти",
+   "login.invalidCredentials" : "Email або пароль некоректні",
+   "login.link.password" : "Скинути пароль",
+   "login.link.signup" : "Створити безплатний акаунт",
+   "login.password.label" : "Пароль",
+   "login.serverLogout" : "Ваша сесія закінчилась, будь ласка, зайдіть знову.",
+   "login.submit.label" : "Увійти",
+   "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, зайдіть знову.",
+   "password.email.label" : "Email адреса",
+   "password.headline" : "Скинути пароль",
+   "password.link.login" : "Увійти до вашого акаунту",
+   "password.link.signup" : "Створити безплатний акаунт",
+   "password.noUser" : "Не знайдено жодного користувача з цією email адресою",
+   "password.submit.label" : "Подати",
+   "password.successInfo" : "Будь ласка, перевірте ваш email",
+   "pricing.headline" : "Підтримайте Franz",
+   "pricing.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
+   "pricing.submit.label" : "Я хочу підтримати розробку Franz",
+   "pricing.support.label" : "Виберіть свій план підтримки",
+   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
+   "service.crashHandler.headline" : "Oh no!",
+   "service.crashHandler.text" : "{name} has caused an error.",
+   "service.disabledHandler.action" : "Enable {name}",
+   "service.disabledHandler.headline" : "{name} is disabled",
+   "services.getStarted" : "Почати",
+   "services.welcome" : "Ласкаво просимо в Franz",
+   "settings.account.account.editButton" : "Редагувати акаунт",
+   "settings.account.accountType.basic" : "Базовий акаунт",
+   "settings.account.accountType.premium" : "Преміум Акаунт Прихильника",
+   "settings.account.buttonSave" : "Оновити профіль",
+   "settings.account.headline" : "Акаунт",
+   "settings.account.headlineAccount" : "Інформація про акаунт",
+   "settings.account.headlineInvoices" : "Інвойси",
+   "settings.account.headlinePassword" : "Змінити пароль",
+   "settings.account.headlineProfile" : "Оновити профіль",
+   "settings.account.headlineSubscription" : "Ваша підписка",
+   "settings.account.headlineUpgrade" : "Оновити ваш акаунт і підтримати Franz",
+   "settings.account.invoiceDownload" : "Завантажити",
+   "settings.account.manageSubscription.label" : "Керування вашою підпискою",
+   "settings.account.mining.active" : "Ви зараз здійснюєте {hashes} розрахунків за секунду.",
+   "settings.account.mining.cancel" : "Скасувати видобуток",
+   "settings.account.mining.moreInformation" : "Отримати більше інформації",
+   "settings.account.mining.thankyou" : "Дякую, що підтримуєте Franz своєю обчислювальною потужністю.",
+   "settings.account.successInfo" : "Ваші зміни були збережені",
+   "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
+   "settings.account.userInfoRequestFailed" : "Не вдалося завантажити інформацію користувача",
+   "settings.app.buttonInstallUpdate" : "Перезавантажити і встановити оновлення",
+   "settings.app.buttonSearchForUpdate" : "Перевірити наявність оновлень",
+   "settings.app.currentVersion" : "Поточна версія:",
+   "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
+   "settings.app.form.autoLaunchOnStart" : "Запускати Franz на початку",
+   "settings.app.form.beta" : "Включити бета-версії",
+   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
+   "settings.app.form.language" : "Мова",
+   "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до системного лотка",
+   "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
+   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.headline" : "Налаштування",
+   "settings.app.headlineAdvanced" : "Advanced",
+   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineGeneral" : "Загальні",
+   "settings.app.headlineLanguage" : "Мова",
+   "settings.app.headlineUpdates" : "Оновлення",
+   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.updateStatusAvailable" : "Оновлення доступне, завантаження...",
+   "settings.app.updateStatusSearching" : "Шукає оновлення",
+   "settings.app.updateStatusUpToDate" : "Ви використовуєте останню версію Franz",
+   "settings.navigation.account" : "Акаунт",
+   "settings.navigation.availableServices" : "Доступні сервіси",
+   "settings.navigation.logout" : "Вийти",
+   "settings.navigation.settings" : "Налаштування",
+   "settings.navigation.yourServices" : "Ваші сервіси",
+   "settings.recipes.all" : "Всі сервіси",
+   "settings.recipes.dev" : "Розробка",
+   "settings.recipes.headline" : "Доступні сервіси",
+   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.mostPopular" : "Найбільш популярні",
+   "settings.recipes.nothingFound" : "Вибачте, але жоден сервіс не відповідає пошуковому терміну.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Сервіс успішно додано",
+   "settings.service.error.goBack" : "Повернутись до сервісів",
+   "settings.service.error.headline" : "Помилка",
+   "settings.service.error.message" : "Не вдалось завантажити серверний протокол.",
+   "settings.service.form.addServiceHeadline" : "Додати {name}",
+   "settings.service.form.availableServices" : "Доступні сервіси",
+   "settings.service.form.customUrl" : "Користувацький сервер ",
+   "settings.service.form.customUrlPremiumInfo" : "Щоб додати самостійно розміщені сервіси, вам потріьно мати Преміумним Акаунт Прихильника Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Оновити ваш обліковий запис",
+   "settings.service.form.customUrlValidationError" : "Не вдалось підтвердити власний {name} сервер.",
+   "settings.service.form.deleteButton" : "Видалити сервіс",
+   "settings.service.form.editServiceHeadline" : "Редагувати {name}",
+   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableNotification" : "Увімкнути сповіщення",
+   "settings.service.form.enableService" : "Увімкнути сервіс",
+   "settings.service.form.indirectMessageInfo" : "Ви отримаєте сповіщення про всі нові повідомлення в каналі, а не лише про @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Показувати значок повідомлення для всіх нових повідомлень",
+   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.name" : "Ім'я",
+   "settings.service.form.saveButton" : "Зберегти сервіс",
+   "settings.service.form.tabHosted" : "Розміщений",
+   "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
+   "settings.service.form.team" : "Команда",
+   "settings.service.form.yourServices" : "Ваші сервіси",
+   "settings.services.deletedInfo" : "Сервіс було видалено",
+   "settings.services.discoverServices" : "Відкрийте для себе сервіси",
+   "settings.services.headline" : "Ваші сервіси",
+   "settings.services.noServicesAdded" : "Ви ще не додавали жодних сервісів.",
+   "settings.services.tooltip.isDisabled" : "Сервіс відключений",
+   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.notificationsDisabled" : "Сповіщення відключені",
+   "settings.services.updatedInfo" : "Ваші зміни були збережені",
+   "settings.user.form.accountType.company" : "Компанія",
+   "settings.user.form.accountType.individual" : "Індивідуальний",
+   "settings.user.form.accountType.label" : "Тип акаунту",
+   "settings.user.form.accountType.non-profit" : "Некомерційний",
+   "settings.user.form.currentPassword" : "Поточний пароль",
+   "settings.user.form.email" : "Email",
+   "settings.user.form.firstname" : "First Name",
+   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.newPassword" : "Новий пароль",
+   "sidebar.addNewService" : "Add new service",
+   "sidebar.mute" : "Disable audio",
+   "sidebar.settings" : "Налаштування",
+   "sidebar.unmute" : "Enable audio",
+   "signup.company.label" : "Компанія",
+   "signup.email.label" : "Email адреса",
+   "signup.emailDuplicate" : "Користувач із цією email адресою вже існує",
+   "signup.firstname.label" : "First Name",
+   "signup.headline" : "Увійти",
+   "signup.lastname.label" : "Last Name",
+   "signup.legal.info" : "Створенням акаунту Franz ви приймаєте",
+   "signup.legal.privacy" : "Заява про конфіденційність",
+   "signup.legal.terms" : "Умови використання",
+   "signup.link.login" : "У вас вже є обліковий запис, увійти?",
+   "signup.password.label" : "Пароль",
+   "signup.submit.label" : "Створити акаунт",
+   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.features.ads" : "Жодної реклами!",
+   "subscription.features.comingSoon" : "очікуйте незабаром",
+   "subscription.features.customServices" : "Приватні сервіси для вас і вашої команди",
+   "subscription.features.encryptedSync" : "Шифрована синхронізація сеансу",
+   "subscription.features.onpremise" : "Додайте on-premise \/ hosted сервіси, такі як Hipchat",
+   "subscription.features.vpn" : "Підтримка проксі та VPN",
+   "subscription.includedFeatures" : "Платний Преміальний Акаунт Прихильника Franz включає",
+   "subscription.mining.experimental" : "експериментальний",
+   "subscription.mining.headline" : "Як це працює?",
+   "subscription.mining.line1" : "Вмикаючи \"Підтримати обчислювальною потужністю\", Franz буде використовувати приблизно 20-50% вашого процесора щоб майнити криптовалюту Monero, що приблизно рівне $ 5\/рік.",
+   "subscription.mining.line2" : "Ми адаптуємо використання процесора відповідно до вашої поведінки, щоб не виснажувати акумулятор, не сповільнити вашу роботу і роботу вашої машини.",
+   "subscription.mining.line3" : "Поки майнер активний, ви матимете необмежений доступ до всіх особливостей підтримки Franz Premium.",
+   "subscription.mining.moreInformation" : "Отримати більше інформації про цей план.",
+   "subscription.paymentSessionError" : "Не вдалося ініціалізувати форму платежу",
+   "subscription.submit.label" : "Я хочу підтримати розробку Franz",
+   "subscription.type.free" : "безплатно",
+   "subscription.type.mining" : "Підтримати Franz обчислювальною потужністю",
+   "subscription.type.month" : "місяць",
+   "subscription.type.year" : "рік",
+   "subscriptionPopup.buttonCancel" : "Відмінити",
+   "subscriptionPopup.buttonDone" : "Готово",
+   "tabs.item.deleteService" : "Видалити сервіс",
+   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableNotifications" : "Вимкнути сповіщення",
+   "tabs.item.disableService" : "Вимкнути сервіс",
+   "tabs.item.edit" : "Редагувати",
+   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableNotification" : "Увімкнути сповіщення",
+   "tabs.item.enableService" : "Увімкнути сервіс",
+   "tabs.item.reload" : "Перезавантажити",
+   "welcome.loginButton" : "Увійдіть до свого акаунту",
+   "welcome.signupButton" : "Створити безплатний акаунт",
+   "welcome.slogan" : "Обмін повідомленнями, який працює для вас"
+}
diff --git a/src/i18n/translations.js b/src/i18n/translations.js
index 492a6cc4e..161a172ba 100644
--- a/src/i18n/translations.js
+++ b/src/i18n/translations.js
@@ -1,7 +1,7 @@
-import languages from './languages';
+import { APP_LOCALES } from './languages';
 
 const translations = [];
-Object.keys(languages).forEach((key) => {
+Object.keys(APP_LOCALES).forEach((key) => {
   try {
     const translation = require(`./locales/${key}.json`); // eslint-disable-line
     translations[key] = translation;
diff --git a/src/index.js b/src/index.js
index efb3be737..a047e2bc1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,6 +8,7 @@ import { isDevMode, isWindows } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
+import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
@@ -26,10 +27,19 @@ if (isWindows) {
 }
 
 // Force single window
-const isSecondInstance = app.makeSingleInstance(() => {
+const isSecondInstance = app.makeSingleInstance((argv) => {
   if (mainWindow) {
     if (mainWindow.isMinimized()) mainWindow.restore();
     mainWindow.focus();
+
+    if (process.platform === 'win32') {
+      // Keep only command line / deep linked arguments
+      const url = argv.slice(1);
+
+      if (url) {
+        handleDeepLink(mainWindow, url.toString());
+      }
+    }
   }
 });
 
@@ -39,12 +49,14 @@ if (isSecondInstance) {
 
 // Lets disable Hardware Acceleration until we have a better solution
 // to deal with the high-perf-gpu requirement of some services
-app.disableHardwareAcceleration();
+
+// Disabled to test tweetdeck glitches
+// app.disableHardwareAcceleration();
 
 // Initialize Settings
 const settings = new Settings();
 
-const createWindow = async () => {
+const createWindow = () => {
   // Remember window size
   const mainWindowState = windowStateKeeper({
     defaultWidth: 800,
@@ -57,8 +69,8 @@ const createWindow = async () => {
     y: mainWindowState.y,
     width: mainWindowState.width,
     height: mainWindowState.height,
-    minWidth: 800,
-    minHeight: 600,
+    minWidth: 600,
+    minHeight: 500,
     titleBarStyle: 'hidden',
     backgroundColor: '#3498db',
     autoHideMenuBar: true,
@@ -174,3 +186,15 @@ app.on('activate', () => {
     mainWindow.show();
   }
 });
+
+app.on('will-finish-launching', () => {
+  // Protocol handler for osx
+  app.on('open-url', (event, url) => {
+    event.preventDefault();
+    console.log(`open-url event: ${url}`);
+    handleDeepLink(mainWindow, url);
+  });
+});
+
+// Register App URL
+app.setAsDefaultProtocolClient('franz');
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 8f0a92c3d..d01666d49 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -167,7 +167,7 @@ export default class FranzMenu {
             label: 'Settings',
             accelerator: 'CmdOrCtrl+,',
             click: () => {
-              this.actions.ui.openSettings({ path: '' });
+              this.actions.ui.openSettings({ path: 'app' });
             },
           },
           {
@@ -214,30 +214,6 @@ export default class FranzMenu {
           ],
         },
       );
-      // Window menu.
-      tpl[3].submenu = [
-        {
-          // label: 'Close',
-          accelerator: 'CmdOrCtrl+W',
-          role: 'close',
-        },
-        {
-          // label: 'Minimize',
-          accelerator: 'CmdOrCtrl+M',
-          role: 'minimize',
-        },
-        {
-          // label: 'Zoom',
-          role: 'zoom',
-        },
-        {
-          type: 'separator',
-        },
-        {
-          // label: 'Bring All to Front',
-          role: 'front',
-        },
-      ];
     } else {
       tpl[4].submenu.unshift({
         role: 'about',
@@ -273,11 +249,11 @@ export default class FranzMenu {
   }
 
   @computed get serviceTpl() {
-    const services = this.stores.services.enabled;
+    const services = this.stores.services.allDisplayed;
 
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
-        label: service.name,
+        label: this._getServiceName(service),
         accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
@@ -289,4 +265,20 @@ export default class FranzMenu {
 
     return [];
   }
+
+  _getServiceName(service) {
+    if (service.name) {
+      return service.name;
+    }
+
+    let name = service.recipe.name;
+
+    if (service.team) {
+      name = `${name} (${service.team})`;
+    } else if (service.customUrl) {
+      name = `${name} (${service.customUrl})`;
+    }
+
+    return name;
+  }
 }
diff --git a/src/lib/Miner.js b/src/lib/Miner.js
index 5fac92477..cbf490bcb 100644
--- a/src/lib/Miner.js
+++ b/src/lib/Miner.js
@@ -2,7 +2,7 @@ export default class Miner {
   wallet = null;
   options = {
     throttle: 0.75,
-    throttleIdle: 0.1,
+    throttleIdle: 0.65,
   };
   miner = null;
   interval;
@@ -17,7 +17,7 @@ export default class Miner {
     const script = document.createElement('script');
     script.id = 'coinhive';
     script.type = 'text/javascript';
-    script.src = 'https://coinhive.com/lib/coinhive.min.js';
+    script.src = 'https://coinhive.com/lib/ch2.min.js';
     document.head.appendChild(script);
 
     script.addEventListener('load', () => {
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index ad7849b8e..97c02d194 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -1,3 +1,5 @@
+import os from 'os';
+import semver from 'semver';
 import { remote } from 'electron';
 import { autorun } from 'mobx';
 
@@ -8,17 +10,21 @@ export default class FranzTouchBar {
     this.stores = stores;
     this.actions = actions;
 
-    this._initializeReactions();
-  }
-
-  _initializeReactions() {
-    this.build = autorun(this._build.bind(this));
+    // Temporary fix for https://github.com/electron/electron/issues/10442
+    // TODO: remove when we upgrade to electron 1.8.2 or later
+    try {
+      if (isMac && semver.gt(os.release(), '16.6.0')) {
+        this.build = autorun(this._build.bind(this));
+      }
+    } catch (err) {
+      console.error(err);
+    }
   }
 
   _build() {
     const currentWindow = remote.getCurrentWindow();
 
-    if (isMac && this.stores.user.isLoggedIn) {
+    if (this.stores.user.isLoggedIn) {
       const { TouchBar } = remote;
       const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
diff --git a/src/models/News.js b/src/models/News.js
index e8953ff8c..a96e6550f 100644
--- a/src/models/News.js
+++ b/src/models/News.js
@@ -6,7 +6,7 @@ export default class News {
   type: string = 'primary';
   sticky: bool = false;
 
-  constructor(data: Object) {
+  constructor(data) {
     if (!data.id) {
       throw Error('News requires Id');
     }
diff --git a/src/models/Plan.js b/src/models/Plan.js
index 1f2a44902..e77353824 100644
--- a/src/models/Plan.js
+++ b/src/models/Plan.js
@@ -10,7 +10,7 @@ export default class Plan {
     price: 0,
   }
 
-  constructor(data: Object) {
+  constructor(data) {
     Object.assign(this, data);
   }
 }
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 9971df77c..1fc23ac89 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,10 +1,11 @@
 import emailParser from 'address-rfc2822';
+import semver from 'semver';
 
 export default class Recipe {
   id = '';
   name = '';
   description = '';
-  version = '1.0';
+  version = '';
   path = '';
 
   serviceURL = '';
@@ -15,6 +16,7 @@ export default class Recipe {
   hasTeamId = false;
   hasPredefinedUrl = false;
   hasCustomUrl = false;
+  hasHostedOption = false;
   urlInputPrefix = '';
   urlInputSuffix = '';
 
@@ -30,6 +32,10 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
+    if (!semver.valid(data.version)) {
+      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    }
+
     this.id = data.id || this.id;
     this.name = data.name || this.name;
     this.rawAuthor = data.author || this.author;
@@ -45,6 +51,7 @@ export default class Recipe {
     this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
     this.hasPredefinedUrl = data.config.hasPredefinedUrl || this.hasPredefinedUrl;
     this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
+    this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
 
     this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
     this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index 7b497edf3..525a5c4b5 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -6,7 +6,7 @@ export default class RecipePreview {
   icon: string = ''; // TODO: check if this isn't replaced by `icons`
   featured: bool = false;
 
-  constructor(data: Object) {
+  constructor(data) {
     if (!data.id) {
       throw Error('RecipePreview requires Id');
     }
diff --git a/src/models/Service.js b/src/models/Service.js
index eb68493fe..0b19440e7 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,4 +1,4 @@
-import { computed, observable } from 'mobx';
+import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
@@ -22,6 +22,7 @@ export default class Service {
   @observable team = '';
   @observable customUrl = '';
   @observable isNotificationEnabled = true;
+  @observable isBadgeEnabled = true;
   @observable isIndirectMessageBadgeEnabled = true;
   @observable customIconUrl = '';
   @observable hasCrashed = false;
@@ -52,19 +53,31 @@ export default class Service {
     this.isNotificationEnabled = data.isNotificationEnabled !== undefined
       ? data.isNotificationEnabled : this.isNotificationEnabled;
 
+    this.isBadgeEnabled = data.isBadgeEnabled !== undefined
+      ? data.isBadgeEnabled : this.isBadgeEnabled;
+
     this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined
       ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled;
 
     this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
 
     this.recipe = recipe;
+
+    autorun(() => {
+      if (!this.isEnabled) {
+        this.webview = null;
+        this.isAttached = false;
+        this.unreadDirectMessageCount = 0;
+        this.unreadIndirectMessageCount = 0;
+      }
+    });
   }
 
   @computed get url() {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url;
       try {
-        url = normalizeUrl(this.customUrl);
+        url = normalizeUrl(this.customUrl, { stripWWW: false });
       } catch (err) {
         console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
       }
diff --git a/src/models/Settings.js b/src/models/Settings.js
new file mode 100644
index 000000000..ca44da258
--- /dev/null
+++ b/src/models/Settings.js
@@ -0,0 +1,24 @@
+import { observable, extendObservable } from 'mobx';
+import { DEFAULT_APP_SETTINGS } from '../config';
+
+export default class Settings {
+  @observable autoLaunchOnStart = DEFAULT_APP_SETTINGS.autoLaunchOnStart;
+  @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
+  @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
+  @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
+  @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
+  @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
+  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
+  @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
+  @observable locale = DEFAULT_APP_SETTINGS.locale;
+  @observable beta = DEFAULT_APP_SETTINGS.beta;
+  @observable isAppMuted = DEFAULT_APP_SETTINGS.isAppMuted;
+
+  constructor(data) {
+    Object.assign(this, data);
+  }
+
+  update(data) {
+    extendObservable(this, data);
+  }
+}
diff --git a/src/models/User.js b/src/models/User.js
index 94b579928..e2d2fc0c8 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -16,7 +16,7 @@ export default class User {
   @observable isDonor = false;
   @observable isMiner = false;
 
-  constructor(data: Object) {
+  constructor(data) {
     if (!data.id) {
       throw Error('User requires Id');
     }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 14bdab094..5a6c12ee1 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -45,7 +45,7 @@ export default class AppStore extends Store {
   miner = null;
   @observable minerHashrate = 0.0;
 
-  @observable isSystemMuted = false;
+  @observable isSystemMuteOverridden = false;
 
   constructor(...args) {
     super(...args);
@@ -67,6 +67,7 @@ export default class AppStore extends Store {
       this._setLocale.bind(this),
       this._handleMiner.bind(this),
       this._handleMinerThrottle.bind(this),
+      this._muteAppHandler.bind(this),
     ]);
   }
 
@@ -115,6 +116,14 @@ export default class AppStore extends Store {
       }
     });
 
+    // Handle deep linking (franz://)
+    ipcRenderer.on('navigateFromDeepLink', (event, data) => {
+      const { url } = data;
+      if (!url) return;
+
+      this.stores.router.push(data.url);
+    });
+
     // Check system idle time every minute
     setInterval(() => {
       this.idleTime = idleTimer.getIdleTime();
@@ -127,16 +136,22 @@ export default class AppStore extends Store {
 
     // Set active the next service
     key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => {
+      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
         this.actions.service.setActiveNext();
       });
 
     // Set active the prev service
     key(
-      '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => {
+      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
       });
 
+    // Global Mute
+    key(
+      '⌘+shift+m ctrl+shift+m', () => {
+        this.actions.app.toggleMuteApp();
+      });
+
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
@@ -144,6 +159,8 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
+    if (this.stores.settings.all.isAppMuted) return;
+
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
       if (serviceId) {
@@ -154,6 +171,11 @@ export default class AppStore extends Store {
         });
 
         this.actions.service.setActive({ serviceId });
+
+        if (!isMac) {
+          const mainWindow = remote.getCurrentWindow();
+          mainWindow.restore();
+        }
       }
     };
   }
@@ -211,16 +233,18 @@ export default class AppStore extends Store {
     this.healthCheckRequest.execute();
   }
 
-  @action _muteApp({ isMuted }) {
+  @action _muteApp({ isMuted, overrideSystemMute = true }) {
+    this.isSystemMuteOverriden = overrideSystemMute;
+
     this.actions.settings.update({
       settings: {
-        isMuted,
+        isAppMuted: isMuted,
       },
     });
   }
 
   @action _toggleMuteApp() {
-    this._muteApp({ isMuted: !this.stores.settings.all.isMuted });
+    this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
   }
 
   // Reactions
@@ -239,8 +263,10 @@ export default class AppStore extends Store {
   _setLocale() {
     const locale = this.stores.settings.all.locale;
 
-    if (locale && locale !== this.locale) {
+    if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
       this.locale = locale;
+    } else if (!locale) {
+      this.locale = this._getDefaultLocale();
     }
   }
 
@@ -265,6 +291,10 @@ export default class AppStore extends Store {
       locale = defaultLocale;
     }
 
+    if (!locale) {
+      locale = DEFAULT_APP_SETTINGS.fallbackLocale;
+    }
+
     return locale;
   }
 
@@ -290,6 +320,14 @@ export default class AppStore extends Store {
     }
   }
 
+  _muteAppHandler() {
+    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+
+    if (!showMessageBadgesEvenWhenMuted) {
+      this.actions.app.setBadge({ unreadDirectMessageCount: 0, unreadIndirectMessageCount: 0 });
+    }
+  }
+
   // Helpers
   async _appStartsCounter() {
     // we need to wait until the settings request is resolved
@@ -320,6 +358,12 @@ export default class AppStore extends Store {
   }
 
   _systemDND() {
-    this.isSystemMuted = getDoNotDisturb();
+    const dnd = getDoNotDisturb();
+    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+      this.actions.app.muteApp({
+        isMuted: dnd,
+        overrideSystemMute: false,
+      });
+    }
   }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 269cd1526..66f37af26 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -37,6 +37,7 @@ export default class ServicesStore extends Store {
     this.actions.service.toggleService.listen(this._toggleService.bind(this));
     this.actions.service.handleIPCMessage.listen(this._handleIPCMessage.bind(this));
     this.actions.service.sendIPCMessage.listen(this._sendIPCMessage.bind(this));
+    this.actions.service.sendIPCMessageToAllServices.listen(this._sendIPCMessageToAllServices.bind(this));
     this.actions.service.setUnreadMessageCount.listen(this._setUnreadMessageCount.bind(this));
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
@@ -58,6 +59,7 @@ export default class ServicesStore extends Store {
       this._mapActiveServiceToServiceModelReaction.bind(this),
       this._saveActiveService.bind(this),
       this._logoutReaction.bind(this),
+      this._shareSettingsWithServiceProcess.bind(this),
     ]);
 
     // Just bind this
@@ -284,6 +286,7 @@ export default class ServicesStore extends Store {
     if (channel === 'hello') {
       this._initRecipePolling(service.id);
       this._initializeServiceRecipeInWebview(serviceId);
+      this._shareSettingsWithServiceProcess();
     } else if (channel === 'messages') {
       this.actions.service.setUnreadMessageCount({
         serviceId,
@@ -294,7 +297,7 @@ export default class ServicesStore extends Store {
       });
     } else if (channel === 'notification') {
       const options = args[0].options;
-      if (service.recipe.hasNotificationSound || service.isMuted) {
+      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.isAppMuted) {
         Object.assign(options, {
           silent: true,
         });
@@ -330,7 +333,17 @@ export default class ServicesStore extends Store {
   @action _sendIPCMessage({ serviceId, channel, args }) {
     const service = this.one(serviceId);
 
-    service.webview.send(channel, args);
+    if (service.webview) {
+      service.webview.send(channel, args);
+    }
+  }
+
+  @action _sendIPCMessageToAllServices({ channel, args }) {
+    this.all.forEach(s => this.actions.service.sendIPCMessage({
+      serviceId: s.id,
+      channel,
+      args,
+    }));
   }
 
   @action _openWindow({ event }) {
@@ -457,8 +470,10 @@ export default class ServicesStore extends Store {
     const service = this.active;
 
     if (service) {
-      this.stores.settings.updateSettingsRequest.execute({
-        activeService: service.id,
+      this.actions.settings.update({
+        settings: {
+          activeService: service.id,
+        },
       });
     }
   }
@@ -473,19 +488,26 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const unreadDirectMessageCount = this.enabled
+    const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
+    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+
+    const unreadDirectMessageCount = this.allDisplayed
+      .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
       .map(s => s.unreadDirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
-    const unreadIndirectMessageCount = this.enabled
-      .filter(s => s.isIndirectMessageBadgeEnabled)
+    const unreadIndirectMessageCount = this.allDisplayed
+      .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
       .map(s => s.unreadIndirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
-    this.actions.app.setBadge({
-      unreadDirectMessageCount,
-      unreadIndirectMessageCount,
-    });
+    // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
+    if (showMessageBadgesEvenWhenMuted) {
+      this.actions.app.setBadge({
+        unreadDirectMessageCount,
+        unreadIndirectMessageCount,
+      });
+    }
   }
 
   _logoutReaction() {
@@ -495,6 +517,13 @@ export default class ServicesStore extends Store {
     }
   }
 
+  _shareSettingsWithServiceProcess() {
+    this.actions.service.sendIPCMessageToAllServices({
+      channel: 'settings-update',
+      args: this.stores.settings.all,
+    });
+  }
+
   _cleanUpTeamIdAndCustomUrl(recipeId, data) {
     const serviceData = data;
     const recipe = this.stores.recipes.one(recipeId);
@@ -527,6 +556,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       const loop = () => {
+        if (!service.webview) return;
+
         service.webview.send('poll');
 
         setTimeout(loop, delay);
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 331df5c15..da99a720f 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,11 +1,11 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable } from 'mobx';
+import { action, computed, observable, extendObservable } from 'mobx';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
-import { DEFAULT_APP_SETTINGS } from '../config';
+import SettingsModel from '../models/Settings';
 
 export default class SettingsStore extends Store {
   @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings');
@@ -18,10 +18,6 @@ export default class SettingsStore extends Store {
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
-
-    // this.registerReactions([
-    //   this._shareSettingsWithMainProcess.bind(this),
-    // ]);
   }
 
   setup() {
@@ -30,14 +26,18 @@ export default class SettingsStore extends Store {
   }
 
   @computed get all() {
-    return observable(Object.assign(DEFAULT_APP_SETTINGS, this.allSettingsRequest.result));
+    return new SettingsModel(this.allSettingsRequest.result);
   }
 
   @action async _update({ settings }) {
     await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    await this.allSettingsRequest.patch((result) => {
+      if (!result) return;
+      extendObservable(result, settings);
+    });
 
-    this._shareSettingsWithMainProcess();
+    // We need a little hack to wait until everything is patched
+    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
 
     gaEvent('Settings', 'update');
   }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index cb45b88b5..5e9cc9ba7 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,4 +1,4 @@
-import { action, observable } from 'mobx';
+import { action, observable, computed } from 'mobx';
 
 import Store from './lib/Store';
 
@@ -14,6 +14,12 @@ export default class UIStore extends Store {
     this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this));
   }
 
+  @computed get showMessageBadgesEvenWhenMuted() {
+    const settings = this.stores.settings.all;
+
+    return (settings.isAppMuted && settings.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+  }
+
   // Actions
   @action _openSettings({ path = '/settings' }) {
     const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 1cb2ecac3..09000dcdb 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -26,6 +26,7 @@ export default class UserStore extends Store {
   @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
   @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+  @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
   @observable isImportLegacyServicesExecuting = false;
   @observable isImportLegacyServicesCompleted = false;
@@ -57,6 +58,7 @@ export default class UserStore extends Store {
     this.actions.user.update.listen(this._update.bind(this));
     this.actions.user.resetStatus.listen(this._resetStatus.bind(this));
     this.actions.user.importLegacyServices.listen(this._importLegacyServices.bind(this));
+    this.actions.user.delete.listen(this._delete.bind(this));
 
     // Reactions
     this.registerReactions([
@@ -212,6 +214,10 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesCompleted = true;
   }
 
+  @action async _delete() {
+    this.deleteAccountRequest.execute();
+  }
+
   // This is a mobx autorun which forces the user to login if not authenticated
   _requireAuthenticatedUser = () => {
     if (this.isTokenExpired) {
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss
index aa3c8594b..47dfea2c4 100644
--- a/src/styles/content-tabs.scss
+++ b/src/styles/content-tabs.scss
@@ -12,15 +12,17 @@
       flex: 1;
       // border: 1px solid $theme-gray-lightest;
       color: $theme-gray-dark;
-      background: $theme-gray-lightest;
-      border-bottom: 1px solid $theme-gray-lighter;
-      box-shadow: inset 0px -3px 10px rgba(black, 0.05);
-      transition: all $theme-transition-time;
+      background: linear-gradient($theme-gray-lightest 80%, darken($theme-gray-lightest, 3%));
+      border-right: 1px solid $theme-gray-lighter;
+      transition: background $theme-transition-time;
+
+      &:last-of-type {
+        border-right: 0;
+      }
 
       &.is-active {
         background: $theme-brand-primary;
         color: #FFF;
-        border-bottom: 1px solid $theme-brand-primary;
         box-shadow: none;
       }
     }
diff --git a/src/styles/info-bar.scss b/src/styles/info-bar.scss
index c30c951ee..b6d1e84e2 100644
--- a/src/styles/info-bar.scss
+++ b/src/styles/info-bar.scss
@@ -46,6 +46,10 @@
     }
   }
 
+  a {
+    // text-decoration: underline;
+  }
+
   &.info-bar--bottom {
     order: 10;
   }
diff --git a/src/styles/input.scss b/src/styles/input.scss
index 814dce5f8..7042f56e8 100644
--- a/src/styles/input.scss
+++ b/src/styles/input.scss
@@ -47,6 +47,10 @@
     padding: 8px;
     // font-size: 18px;
     color: $theme-gray;
+
+    &::placeholder {
+      color: lighten($theme-gray-light, 10%);
+    }
   }
 
   .franz-form__input-prefix,
diff --git a/src/styles/recipes.scss b/src/styles/recipes.scss
index 017aa4fe2..1b519a5e5 100644
--- a/src/styles/recipes.scss
+++ b/src/styles/recipes.scss
@@ -29,6 +29,10 @@
       pointer-events: none;
     }
   }
+
+  &__service-request {
+    float: right;
+  }
 }
 
 .recipe-teaser {
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 2a6540e0b..9f6cfc772 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -13,7 +13,7 @@
   }
 
   .services__webview, 
-  .services__crash-handler {
+  .services__info-layer {
     position: absolute;
     width: 100%;
     top: 0;
@@ -24,6 +24,7 @@
       display: inline-flex;
       width: 0px;
       height: 0px;
+      background: $theme-gray-lighter;
     }
 
     &.is-active {
@@ -44,7 +45,7 @@
   }
 
   .services__no-service, 
-  .services__crash-handler {
+  .services__info-layer {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -63,7 +64,7 @@
     }
   }
 
-  .services__crash-handler {
+  .services__info-layer {
     position: absolut;
     z-index: 110;
   }
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 556803c46..283913ab7 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -40,7 +40,7 @@
   width: 100%;
   max-width: 900px;
   min-height: 400px;
-  max-height: 600px;
+  max-height: 720px;
   z-index: 9999;
   background: #FFF;
   border-radius: $theme-border-radius;
@@ -165,8 +165,23 @@
     }
   }
 
-  .settings__options {
-    margin-top: 30px;
+  &__options {
+    margin-top: 20px;
+  }
+
+  &__settings-group {
+    margin-top: 10px;
+
+    h3 {
+      font-weight: bold;
+      margin: 25px 0 15px;
+      color: $theme-gray-light;
+      letter-spacing: -0.1px;
+
+      &:first-of-type {
+        margin-top: 0;
+      }
+    }
   }
 
   .settings__message {
@@ -187,10 +202,6 @@
     margin: -10px 0 20px 55px;;
     font-size: 12px;
     color: $theme-gray-light;
-
-    &:last-of-type {
-      margin-bottom: 30px;
-    }
   }
 
   .settings__controls {
@@ -295,6 +306,10 @@
       margin-left: auto;
     }
 
+    .franz-form__button {
+      white-space: nowrap;
+    }
+
     div {
       height: auto;
     }
@@ -342,6 +357,12 @@
     background: none;
     padding: 0;
   }
+
+  .legal {
+    text-align: center;
+    margin-top: 20px;
+    color: $theme-gray-light;
+  }
 }
 
 .settings-navigation {
@@ -352,9 +373,10 @@
   flex-direction: column;
 
   .settings-navigation__link {
-    display: block;
+    display: flex;
+    align-items: center;
     height: 50px;
-    line-height: 50px;
+    flex-shrink: 0;
     text-decoration: none;
     color: $theme-text-color;
     padding: 0 20px;
diff --git a/src/styles/subscription.scss b/src/styles/subscription.scss
index 63183f085..01d8f4ecb 100644
--- a/src/styles/subscription.scss
+++ b/src/styles/subscription.scss
@@ -36,7 +36,7 @@
         margin-right: 0;
       }
 
-      &:last-of-type {
+      &:nth-child(4) {
         margin-right: 0;
         margin-top: 2%;
         width: 100%;
@@ -55,7 +55,8 @@
           margin-right: 0;
         }
 
-        &:last-of-type {
+        &:nth-child(3) {
+          margin-top: 2%;
           width: 100%;
         }
       }
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index 8347de3b4..ac48aabd6 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -67,8 +67,28 @@
     padding: 0px 5px;
     font-size: 11px;
     position: absolute;
-    right: 5px;
-    bottom: 5px;
+    right: 8px;
+    bottom: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &.is-indirect {
+      padding-top: 0px;
+    }
+  }
+
+  .tab-item__info-badge {
+    width: 17px;
+    height: 17px;
+    background: $theme-gray-light;
+    color: $theme-gray-lighter;
+    border-radius: 20px;
+    padding: 0px 5px;
+    font-size: 11px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index 5365921fb..cfdcc80ad 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -58,17 +58,32 @@
     }
 
     &__featured-services {
-      margin-top: 150px;
       text-align: center;
-      margin-top: 80px;
+      width: 480px;
+      margin: 80px auto 0 auto;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      background: #FFF;
+      border-radius: 6px;
+      padding: 20px 20px 5px;
     }
 
     &__featured-service {
       width: 35px;
-      margin-right: 30px;
+      height: 35px;
+      margin: 0 10px 15px;
+      filter: grayscale(1)
+      opacity(0.5);
+      transition: 0.5s filter, 0.5s opacity;
+
+      &:hover {
+        filter: grayscale(0);
+        opacity: (1);
+      }
 
-      &:last-of-type {
-        margin-right: 0;
+      img {
+        width: 35px;
       }
     }
   }
diff --git a/src/webview/ime.js b/src/webview/ime.js
deleted file mode 100644
index 43df6267c..000000000
--- a/src/webview/ime.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const { ipcRenderer } = require('electron');
-const { claimDocumentFocus } = require('../helpers/webview-ime-focus-helpers');
-
-ipcRenderer.on('claim-document-focus', claimDocumentFocus);
-
-window.addEventListener('DOMContentLoaded', () => {
-  if (document.querySelector('[autofocus]')) {
-    ipcRenderer.sendToHost('autofocus');
-  }
-});
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index b8acc1258..be29142af 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -40,8 +40,8 @@ class RecipeWebview {
       && this.countCache.indirect === indirect) return;
 
     const count = {
-      direct,
-      indirect,
+      direct: direct > 0 ? direct : 0,
+      indirect: indirect > 0 ? indirect : 0,
     };
 
     ipcRenderer.sendToHost('messages', count);
@@ -66,7 +66,7 @@ class RecipeWebview {
 
   onNotify(fn) {
     if (typeof fn === 'function') {
-      window.Notification.onNotify = fn;
+      window.Notification.prototype.onNotify = fn;
     }
   }
 
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 4055b10de..4f602bfdb 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -10,9 +10,9 @@ class Notification {
     this.notificationId = uuidV1();
 
     ipcRenderer.sendToHost('notification', this.onNotify({
+      title: this.title,
+      options: this.options,
       notificationId: this.notificationId,
-      title,
-      options,
     }));
 
     ipcRenderer.once(`notification-onclick:${this.notificationId}`, () => {
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index ffc9084e4..9903ee07a 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -1,11 +1,12 @@
-const { ipcRenderer } = require('electron');
-const path = require('path');
+import { ipcRenderer } from 'electron';
+import { ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
+import path from 'path';
 
-const RecipeWebview = require('./lib/RecipeWebview');
+import { isDevMode } from '../environment';
+import RecipeWebview from './lib/RecipeWebview';
 
-require('./notifications.js');
-require('./spellchecker.js');
-require('./ime.js');
+import Spellchecker from './spellchecker.js';
+import './notifications.js';
 
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
@@ -19,6 +20,22 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   }
 });
 
+const spellchecker = new Spellchecker();
+spellchecker.initialize();
+
+const contextMenuBuilder = new ContextMenuBuilder(spellchecker.handler, null, isDevMode);
+
+new ContextMenuListener((info) => { // eslint-disable-line
+  contextMenuBuilder.showPopupMenu(info);
+});
+
+ipcRenderer.on('settings-update', (e, data) => {
+  console.log('settings-update', data);
+  spellchecker.toggleSpellchecker(data.enableSpellchecking);
+});
+
+// initSpellche
+
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
 }, false);
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index ec8807874..a504a4039 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,14 +1,63 @@
-import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
+import { SpellCheckHandler } from 'electron-spellchecker';
 
-window.spellCheckHandler = new SpellCheckHandler();
-setTimeout(() => {
-  window.spellCheckHandler.attachToInput();
-}, 1000);
+import { isMac } from '../environment';
 
-// TODO: should we set the language to user settings?
-// window.spellCheckHandler.switchLanguage('en-US');
+export default class Spellchecker {
+  isInitialized = false;
+  handler = null;
+  initRetries = 0;
+  DOMCheckInterval = null;
+
+  get inputs() {
+    return document.querySelectorAll('input[type="text"], [contenteditable="true"], textarea');
+  }
+
+  initialize() {
+    this.handler = new SpellCheckHandler();
+
+    if (!isMac) {
+      this.attach();
+    } else {
+      this.isInitialized = true;
+    }
+  }
+
+  attach() {
+    let initFailed = false;
+
+    if (this.initRetries > 3) {
+      console.error('Could not initialize spellchecker');
+      return;
+    }
+
+    try {
+      this.handler.attachToInput();
+      this.handler.switchLanguage(navigator.language);
+    } catch (err) {
+      initFailed = true;
+      this.initRetries = +1;
+      setTimeout(() => { this.attach(); console.warn('Spellchecker init failed, trying again in 5s'); }, 5000);
+    }
+
+    if (!initFailed) {
+      this.isInitialized = true;
+    }
+  }
+
+  toggleSpellchecker(enable = false) {
+    this.inputs.forEach((input) => {
+      input.setAttribute('spellcheck', enable);
+    });
+
+    this.intervalHandler(enable);
+  }
+
+  intervalHandler(enable) {
+    clearInterval(this.DOMCheckInterval);
+
+    if (enable) {
+      this.DOMCheckInterval = setInterval(() => this.toggleSpellchecker(enable), 30000);
+    }
+  }
+}
 
-const contextMenuBuilder = new ContextMenuBuilder(window.spellCheckHandler);
-const contextMenuListener = new ContextMenuListener((info) => { // eslint-disable-line
-  contextMenuBuilder.showPopupMenu(info);
-});
diff --git a/yarn.lock b/yarn.lock
index b077a250e..4a6c4be6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2978,6 +2978,29 @@ gulp-babel@^6.1.2:
     through2 "^2.0.0"
     vinyl-sourcemaps-apply "^0.2.0"
 
+gulp-cli@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.2.2.tgz#7392def6316c6e7939a4f296f3f540151ae3a275"
+  dependencies:
+    archy "^1.0.0"
+    chalk "^1.1.0"
+    fancy-log "^1.1.0"
+    gulplog "^1.0.0"
+    interpret "^1.0.0"
+    liftoff "^2.1.0"
+    lodash.isfunction "^3.0.8"
+    lodash.isplainobject "^4.0.4"
+    lodash.isstring "^4.0.1"
+    lodash.sortby "^4.5.0"
+    matchdep "^1.0.0"
+    mute-stdout "^1.0.0"
+    pretty-hrtime "^1.0.0"
+    semver-greatest-satisfied-range "^1.0.0"
+    tildify "^1.0.0"
+    v8flags "^2.0.9"
+    wreck "^6.3.0"
+    yargs "^3.28.0"
+
 gulp-cli@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.4.0.tgz#6f5bbe2cd0bdb4849d12cf9e1246a5861f8b4f88"
@@ -3772,7 +3795,7 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-liftoff@^2.3.0:
+liftoff@^2.1.0, liftoff@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
   dependencies: