47 files changed, 2070 insertions, 143 deletions

diff --git a/src/actions/service.js b/src/actions/service.js
index 7f429ca32..cdd4bbf16 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -4,6 +4,8 @@ export default {
   setActive: {
     serviceId: PropTypes.string.isRequired,
   },
+  setActiveNext: {},
+  setActivePrev: {},
   showAddServiceInterface: {
     recipeId: PropTypes.string.isRequired,
   },
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 86f4c99e7..8b0b7563c 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,6 +1,6 @@
 import os from 'os';
 import path from 'path';
-import targz from 'tar.gz';
+import tar from 'tar';
 import fs from 'fs-extra';
 import { remote } from 'electron';
 
@@ -293,7 +293,11 @@ export default class ServerApi {
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
-      await targz().extract(archivePath, recipeTempDirectory);
+      tar.x({
+        file: archivePath,
+        cwd: recipeTempDirectory,
+        sync: true,
+      });
 
       const { id } = fs.readJsonSync(path.join(recipeTempDirectory, 'package.json'));
       const recipeDirectory = path.join(recipesDirectory, id);
@@ -443,6 +447,10 @@ export default class ServerApi {
 
   // Helper
   async _mapServiceModels(services) {
+    const recipes = services.map(s => s.recipeId);
+
+    await this._bulkRecipeCheck(recipes);
+
     return Promise.all(services
       .map(async service => await this._prepareServiceModel(service)) // eslint-disable-line
     );
@@ -454,19 +462,8 @@ export default class ServerApi {
       recipe = this.recipes.find(r => r.id === service.recipeId);
 
       if (!recipe) {
-        console.warn(`Recipe '${service.recipeId}' not installed, trying to fetch from server`);
-
-        await this.getRecipePackage(service.recipeId);
-
-        console.debug('Rerun ServerAPI::getInstalledRecipes');
-        await this.getInstalledRecipes();
-
-        recipe = this.recipes.find(r => r.id === service.recipeId);
-
-        if (!recipe) {
-          console.warn(`Could not load recipe ${service.recipeId}`);
-          return null;
-        }
+        console.warn(`Recipe ${service.recipeId} not loaded`);
+        return null;
       }
 
       return new ServiceModel(service, recipe);
@@ -476,6 +473,35 @@ export default class ServerApi {
     }
   }
 
+  async _bulkRecipeCheck(unfilteredRecipes) {
+    // Filter recipe duplicates as we don't need to download 3 Slack recipes
+    const recipes = unfilteredRecipes.filter((elem, pos, arr) => arr.indexOf(elem) === pos);
+
+    return Promise.all(recipes
+      .map(async (recipeId) => {
+        let recipe = this.recipes.find(r => r.id === recipeId);
+
+        if (!recipe) {
+          console.warn(`Recipe '${recipeId}' not installed, trying to fetch from server`);
+
+          await this.getRecipePackage(recipeId);
+
+          console.debug('Rerun ServerAPI::getInstalledRecipes');
+          await this.getInstalledRecipes();
+
+          recipe = this.recipes.find(r => r.id === recipeId);
+
+          if (!recipe) {
+            console.warn(`Could not load recipe ${recipeId}`);
+            return null;
+          }
+        }
+
+        return recipe;
+      }),
+    ).catch(err => console.error(err));
+  }
+
   _mapRecipePreviewModel(recipes) {
     return recipes.map((recipe) => {
       try {
diff --git a/src/assets/images/tray/darwin-dark/tray-active.png b/src/assets/images/tray/darwin-dark/tray-active.png
new file mode 100644
index 000000000..489533dbf
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-active.png
diff --git a/src/assets/images/tray/darwin-dark/tray-active@2x.png b/src/assets/images/tray/darwin-dark/tray-active@2x.png
new file mode 100644
index 000000000..76f212b52
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-active@2x.png
diff --git a/src/assets/images/tray/darwin-dark/tray-unread-active.png b/src/assets/images/tray/darwin-dark/tray-unread-active.png
new file mode 100644
index 000000000..e2fd1a822
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-unread-active.png
diff --git a/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png b/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png
new file mode 100644
index 000000000..9a64b3ef8
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png
diff --git a/src/assets/images/tray/darwin-dark/tray-unread.png b/src/assets/images/tray/darwin-dark/tray-unread.png
new file mode 100644
index 000000000..e2fd1a822
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-unread.png
diff --git a/src/assets/images/tray/darwin-dark/tray-unread@2x.png b/src/assets/images/tray/darwin-dark/tray-unread@2x.png
new file mode 100644
index 000000000..9a64b3ef8
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray-unread@2x.png
diff --git a/src/assets/images/tray/darwin-dark/tray.png b/src/assets/images/tray/darwin-dark/tray.png
new file mode 100644
index 000000000..489533dbf
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray.png
diff --git a/src/assets/images/tray/darwin-dark/tray@2x.png b/src/assets/images/tray/darwin-dark/tray@2x.png
new file mode 100644
index 000000000..76f212b52
--- /dev/null
+++ b/src/assets/images/tray/darwin-dark/tray@2x.png
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index cf83aa9c8..06493a0fd 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -99,7 +99,6 @@ export default class Import extends Component {
                   <tr
                     key={service.id}
                     className="service-table__row"
-                    onClick={() => service.$('add').set(!service.$('add').value)}
                   >
                     <td className="service-table__toggle">
                       <Toggle
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 015079f02..67e92849d 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -3,11 +3,14 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
+import { isDevMode, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
+import Infobox from '../ui/Infobox';
+
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -117,6 +120,11 @@ export default class Login extends Component {
             alt=""
           />
           <h1>{intl.formatMessage(messages.headline)}</h1>
+          {isDevMode && !useLiveAPI && (
+            <Infobox type="warning">
+              In Dev Mode your data is not persistent. Please use the live app for accesing the production API.
+            </Infobox>
+          )}
           {isTokenExpired && (
             <p className="error-message center">{intl.formatMessage(messages.tokenExpired)}</p>
           )}
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 71ca16111..a990a112e 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -3,12 +3,14 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
+import { isDevMode, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import Input from '../ui/Input';
 import Radio from '../ui/Radio';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
+import Infobox from '../ui/Infobox';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -145,6 +147,11 @@ export default class Signup extends Component {
               alt=""
             />
             <h1>{intl.formatMessage(messages.headline)}</h1>
+            {isDevMode && !useLiveAPI && (
+              <Infobox type="warning">
+                In Dev Mode your data is not persistent. Please use the live app for accesing the production API.
+              </Infobox>
+            )}
             <Radio field={form.$('accountType')} showLabel={false} />
             <div className="grid__row">
               <Input field={form.$('firstname')} focus />
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 043ff42ea..3ee3155be 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -6,6 +6,7 @@ import Webview from 'react-electron-web-view';
 import classnames from 'classnames';
 
 import ServiceModel from '../../../models/Service';
+import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
 
 @observer
 export default class ServiceWebview extends Component {
@@ -20,6 +21,8 @@ export default class ServiceWebview extends Component {
 
   state = {
     forceRepaint: false,
+    targetUrl: '',
+    statusBarVisible: false,
   };
 
   componentDidMount() {
@@ -33,6 +36,17 @@ export default class ServiceWebview extends Component {
     });
   }
 
+  updateTargetUrl = (event) => {
+    let visible = true;
+    if (event.url === '' || event.url === '#') {
+      visible = false;
+    }
+    this.setState({
+      targetUrl: event.url,
+      statusBarVisible: visible,
+    });
+  }
+
   webview = null;
 
   render() {
@@ -47,6 +61,13 @@ export default class ServiceWebview extends Component {
       'services__webview--force-repaint': this.state.forceRepaint,
     });
 
+    let statusBar = null;
+    if (this.state.statusBarVisible) {
+      statusBar = (
+        <StatusBarTargetUrl text={this.state.targetUrl} />
+      );
+    }
+
     return (
       <div className={webviewClasses}>
         <Webview
@@ -62,11 +83,14 @@ export default class ServiceWebview extends Component {
             webview: this.webview.view,
           })}
 
+          onUpdateTargetUrl={this.updateTargetUrl}
+
           useragent={service.userAgent}
 
           disablewebsecurity
           allowpopups
         />
+        {statusBar}
       </div>
     );
   }
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 02736dbb9..5675fecf4 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -115,6 +115,7 @@ export default class EditSettingsForm extends Component {
             <h2>{intl.formatMessage(messages.headlineGeneral)}</h2>
             <Toggle field={form.$('autoLaunchOnStart')} />
             <Toggle field={form.$('runInBackground')} />
+            <Toggle field={form.$('enableSystemTray')} />
             {process.platform === 'win32' && (
               <Toggle field={form.$('minimizeToSystemTray')} />
             )}
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
new file mode 100644
index 000000000..b7b198f42
--- /dev/null
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -0,0 +1,40 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import classnames from 'classnames';
+
+import Appear from '../ui/effects/Appear';
+
+@observer
+export default class StatusBarTargetUrl extends Component {
+  static propTypes = {
+    className: PropTypes.string,
+    text: PropTypes.string,
+  };
+
+  static defaultProps = {
+    className: '',
+    position: 'bottom',
+    text: '',
+  };
+
+  render() {
+    const {
+      className,
+      text,
+    } = this.props;
+
+    return (
+      <Appear
+        className={classnames({
+          'status-bar-target-url': true,
+          [`${className}`]: true,
+        })}
+      >
+        <div className="status-bar-target-url__content">
+          {text}
+        </div>
+      </Appear>
+    );
+  }
+}
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index ada5cc3e0..fe0925a26 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -79,7 +79,7 @@ const messages = defineMessages({
   },
   miningDetail1: {
     id: 'subscription.mining.line1',
-    defaultMessage: '!!!By enabling "Support with processing power", Franz will use about 20-50% of your CPU to mine cryptocurrency Monero which equals approximately $ 5/year.',
+    defaultMessage: '!!!By enabling "Support with processing power", Franz will use about 20-50% of your CPU to mine cryptocurrency Monero which equals approximately € 5/year.',
   },
   miningDetail2: {
     id: 'subscription.mining.line2',
@@ -136,12 +136,12 @@ export default class SubscriptionForm extends Component {
           validate: [required],
           options: [{
             value: 'month',
-            label: `$ ${Object.hasOwnProperty.call(this.props.plan, 'month')
+            label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'month')
               ? `${this.props.plan.month.price} / ${intl.formatMessage(messages.typeMonthly)}`
               : 'monthly'}`,
           }, {
             value: 'year',
-            label: `$ ${Object.hasOwnProperty.call(this.props.plan, 'year')
+            label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'year')
               ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}`
               : 'yearly'}`,
           }, {
@@ -155,7 +155,7 @@ export default class SubscriptionForm extends Component {
     if (this.props.showSkipOption) {
       form.fields.paymentTier.options.unshift({
         value: 'skip',
-        label: `$ 0 / ${intl.formatMessage(messages.typeFree)}`,
+        label: `€ 0 / ${intl.formatMessage(messages.typeFree)}`,
       });
     }
 
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js
index 72b6ccd98..5aae2c47a 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/ui/SubscriptionPopup.js
@@ -57,7 +57,7 @@ export default class SubscriptionPopup extends Component {
             className="subscription-popup__webview"
 
             autosize
-            src={url}
+            src={encodeURI(url)}
             disablewebsecurity
             onDidNavigate={completeCheck}
             // onNewWindow={(event, url, frameName, options) =>
diff --git a/src/config.js b/src/config.js
index acbf57f3c..0a4856ece 100644
--- a/src/config.js
+++ b/src/config.js
@@ -3,3 +3,13 @@ export const LOCAL_API = 'http://localhost:3000';
 export const DEV_API = 'https://dev.franzinfra.com';
 export const LIVE_API = 'https://api.franzinfra.com';
 export const GA_ID = 'UA-74126766-6';
+
+export const DEFAULT_APP_SETTINGS = {
+  autoLaunchOnStart: true,
+  autoLaunchInBackground: false,
+  runInBackground: false,
+  enableSystemTray: true,
+  minimizeToSystemTray: false,
+  locale: 'en-us', // TODO: Replace with proper solution once translations are in
+  beta: false,
+};
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 0e17cafce..6dc2175e1 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -9,6 +9,7 @@ import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
 import languages from '../../i18n/languages';
 import { gaPage } from '../../lib/analytics';
+import { DEFAULT_APP_SETTINGS } from '../../config';
 
 
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
@@ -26,6 +27,10 @@ const messages = defineMessages({
     id: 'settings.app.form.runInBackground',
     defaultMessage: '!!!Keep Franz in background when closing the window',
   },
+  enableSystemTray: {
+    id: 'settings.app.form.enableSystemTray',
+    defaultMessage: '!!!Show Franz in system tray',
+  },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
     defaultMessage: '!!!Minimize Franz to system tray',
@@ -61,6 +66,7 @@ export default class EditSettingsScreen extends Component {
     settings.update({
       settings: {
         runInBackground: settingsData.runInBackground,
+        enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         locale: settingsData.locale,
         beta: settingsData.beta,
@@ -91,33 +97,38 @@ export default class EditSettingsScreen extends Component {
         autoLaunchOnStart: {
           label: intl.formatMessage(messages.autoLaunchOnStart),
           value: app.autoLaunchOnStart,
-          default: true,
+          default: DEFAULT_APP_SETTINGS.autoLaunchOnStart,
         },
         autoLaunchInBackground: {
           label: intl.formatMessage(messages.autoLaunchInBackground),
           value: app.launchInBackground,
-          default: false,
+          default: DEFAULT_APP_SETTINGS.autoLaunchInBackground,
         },
         runInBackground: {
           label: intl.formatMessage(messages.runInBackground),
           value: settings.all.runInBackground,
-          default: true,
+          default: DEFAULT_APP_SETTINGS.runInBackground,
+        },
+        enableSystemTray: {
+          label: intl.formatMessage(messages.enableSystemTray),
+          value: settings.all.enableSystemTray,
+          default: DEFAULT_APP_SETTINGS.enableSystemTray,
         },
         minimizeToSystemTray: {
           label: intl.formatMessage(messages.minimizeToSystemTray),
           value: settings.all.minimizeToSystemTray,
-          default: false,
+          default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
         locale: {
           label: intl.formatMessage(messages.language),
           value: app.locale,
           options,
-          default: 'en-US',
+          default: DEFAULT_APP_SETTINGS.locale,
         },
         beta: {
           label: intl.formatMessage(messages.beta),
           value: user.data.beta,
-          default: false,
+          default: DEFAULT_APP_SETTINGS.beta,
         },
       },
     };
diff --git a/src/containers/ui/SubscriptionPopupScreen.js b/src/containers/ui/SubscriptionPopupScreen.js
index d17477b1d..0b6432e50 100644
--- a/src/containers/ui/SubscriptionPopupScreen.js
+++ b/src/containers/ui/SubscriptionPopupScreen.js
@@ -24,7 +24,7 @@ export default class SubscriptionPopupScreen extends Component {
   render() {
     return (
       <SubscriptionPopup
-        url={decodeURIComponent(this.props.router.params.url)}
+        url={this.props.router.params.url}
         closeWindow={() => window.close()}
         completeCheck={e => this.completeCheck(e)}
         isCompleted={this.state.complete}
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 049a08296..824b4c20c 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,5 +1,17 @@
+import { observable } from 'mobx';
+
+import { DEFAULT_APP_SETTINGS } from '../config';
+
 export default class Settings {
-  store = {};
+  @observable store = {
+    autoLaunchOnStart: DEFAULT_APP_SETTINGS.autoLaunchOnStart,
+    autoLaunchInBackground: DEFAULT_APP_SETTINGS.autoLaunchInBackground,
+    runInBackground: DEFAULT_APP_SETTINGS.runInBackground,
+    enableSystemTray: DEFAULT_APP_SETTINGS.enableSystemTray,
+    minimizeToSystemTray: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
+    locale: DEFAULT_APP_SETTINGS.locale,
+    beta: DEFAULT_APP_SETTINGS.beta,
+  };
 
   set(settings) {
     this.store = Object.assign(this.store, settings);
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index 576234d25..d31819068 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -1,12 +1,11 @@
-import { app, ipcMain, Tray, Menu } from 'electron';
+import { app, ipcMain } from 'electron';
 import path from 'path';
+import { autorun } from 'mobx';
 
-const INDICATOR_TRAY_PLAIN = 'tray';
-const INDICATOR_TRAY_UNREAD = 'tray-unread';
 const INDICATOR_TASKBAR = 'taskbar';
-
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
-let trayIcon;
+
+let isTrayIconEnabled;
 
 function getAsset(type, asset) {
   return path.join(
@@ -15,26 +14,14 @@ function getAsset(type, asset) {
 }
 
 export default (params) => {
-  trayIcon = new Tray(getAsset('tray', INDICATOR_TRAY_PLAIN));
-  const trayMenuTemplate = [
-    {
-      label: 'Show Franz',
-      click() {
-        params.mainWindow.show();
-      },
-    }, {
-      label: 'Quit Franz',
-      click() {
-        app.quit();
-      },
-    },
-  ];
-
-  const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
-  trayIcon.setContextMenu(trayMenu);
+  autorun(() => {
+    isTrayIconEnabled = params.settings.get('enableSystemTray');
 
-  trayIcon.on('click', () => {
-    params.mainWindow.show();
+    if (!isTrayIconEnabled) {
+      params.trayIcon.hide();
+    } else if (isTrayIconEnabled) {
+      params.trayIcon.show();
+    }
   });
 
   ipcMain.on('updateAppIndicator', (event, args) => {
@@ -68,13 +55,7 @@ export default (params) => {
       }
     }
 
-    // Update system tray
-    trayIcon.setImage(getAsset('tray', args.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
-
-    if (process.platform === 'darwin') {
-      trayIcon.setPressedImage(
-        getAsset('tray', `${args.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
-      );
-    }
+    // Update Tray
+    params.trayIcon.setIndicator(args.indicator);
   });
 };
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 1d7eafa6c..995b28fbd 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,10 +1,7 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  if (process.platform === 'darwin' || process.platform === 'win32') {
-    // eslint-disable-next-line
-    ipcMain.on('settings', (event, args) => {
-      params.settings.set(args);
-    });
-  }
+  ipcMain.on('settings', (event, args) => {
+    params.settings.set(args);
+  });
 };
diff --git a/src/electron/ipc-api/tray.js b/src/electron/ipc-api/tray.js
deleted file mode 100644
index 43364c0ed..000000000
--- a/src/electron/ipc-api/tray.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Tray, Menu, ipcMain } from 'electron';
-import path from 'path';
-
-const INDICATOR_PLAIN = 'franz-taskbar';
-const INDICATOR_UNREAD = 'franz-taskbar-unread';
-
-const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
-
-let trayIcon;
-
-function getAsset(asset) {
-  return path.join(
-    __dirname, '..', '..', 'assets', 'images', 'tray', process.platform, `${asset}.${FILE_EXTENSION}`,
-  );
-}
-
-export default (params) => {
-  // if (process.platform === 'win32' || process.platform === 'linux') {
-  trayIcon = new Tray(getAsset(INDICATOR_PLAIN));
-  const trayMenuTemplate = [
-    {
-      label: 'Show Franz',
-      click() {
-        params.mainWindow.show();
-      },
-    }, {
-      label: 'Quit Franz',
-      click() {
-        params.app.quit();
-      },
-    },
-  ];
-
-  const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
-  trayIcon.setContextMenu(trayMenu);
-
-  trayIcon.on('click', () => {
-    params.mainWindow.show();
-  });
-
-  ipcMain.on('updateTrayIconIndicator', (event, args) => {
-    trayIcon.setImage(getAsset(args.count !== 0 ? INDICATOR_UNREAD : INDICATOR_PLAIN));
-
-    if (process.platform === 'darwin') {
-      trayIcon.setPressedImage(getAsset(`${args.count !== 0 ? INDICATOR_UNREAD : INDICATOR_PLAIN}-active`));
-    }
-  });
-};
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 782853b43..9860295b3 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -1,4 +1,13 @@
 module.exports = {
   'en-US': 'English',
-  // 'de-DE': 'Deutsch',
+  'pt-BR': 'Portuguese (Brazil)',
+  'el-GR': 'Ελληνικά (Greece)',
+  nl: 'Nederlands',
+  'nl-BE': 'Vlaams',
+  de: 'Deutsch',
+  fr: 'French',
+  ja: 'Japanese',
+  pl: 'Polish',
+  ru: 'Русский',
+  ua: 'Українська',
 };
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
new file mode 100644
index 000000000..78de9903e
--- /dev/null
+++ b/src/i18n/locales/de.json
@@ -0,0 +1,167 @@
+{
+  "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",
+  "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 Taskleiste 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"
+}
diff --git a/src/i18n/locales/el-GR.json b/src/i18n/locales/el-GR.json
new file mode 100644
index 000000000..dfada77a2
--- /dev/null
+++ b/src/i18n/locales/el-GR.json
@@ -0,0 +1,168 @@
+{
+  "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": "Ρυθμίσεις",
+  "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/en-US.json b/src/i18n/locales/en-US.json
index 194b8047c..b9ed51b83 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -126,6 +126,7 @@
   "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
   "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
   "settings.app.form.autoLaunchInBackground": "Open in background",
+  "settings.app.form.enableSystemTray": "Show Franz in system tray",
   "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
   "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
   "settings.app.form.language": "Language",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
new file mode 100644
index 000000000..84cf54492
--- /dev/null
+++ b/src/i18n/locales/fr.json
@@ -0,0 +1,167 @@
+{
+  "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",
+  "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"
+}
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
new file mode 100644
index 000000000..a283154c9
--- /dev/null
+++ b/src/i18n/locales/ja.json
@@ -0,0 +1,167 @@
+{
+  "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": "設定",
+  "services.welcome": "Franzにようこそ",
+  "services.getStarted": "はじめる",
+  "settings.account.headline": "アカウント",
+  "settings.account.headlineSubscription": "サブスクリプション内容",
+  "settings.account.headlineUpgrade": "アカウントをアップグレードし、Franzを支援する",
+  "settings.account.headlineInvoices": "Invoices",
+  "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.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": "サービスを削除する"
+}
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
new file mode 100644
index 000000000..40cc14c50
--- /dev/null
+++ b/src/i18n/locales/nl-BE.json
@@ -0,0 +1,167 @@
+{
+  "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üpdated.",
+  "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",
+  "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 werden bewaard",
+  "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 veranderingen 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"
+}
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
new file mode 100644
index 000000000..159d1f328
--- /dev/null
+++ b/src/i18n/locales/nl.json
@@ -0,0 +1,168 @@
+{
+  "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",
+  "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": "Cancel",
+  "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"
+}
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
new file mode 100644
index 000000000..1a8e9ad54
--- /dev/null
+++ b/src/i18n/locales/pl.json
@@ -0,0 +1,167 @@
+{
+  "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",
+  "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ę"
+}
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
new file mode 100644
index 000000000..38f0836a7
--- /dev/null
+++ b/src/i18n/locales/pt-BR.json
@@ -0,0 +1,167 @@
+{
+  "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.settings": "Configurações",
+  "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": "Configurações",
+  "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": "Configurações",
+  "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.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"
+}
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
new file mode 100644
index 000000000..44ced9e43
--- /dev/null
+++ b/src/i18n/locales/ru.json
@@ -0,0 +1,168 @@
+{
+  "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": "Настройки",
+  "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": "Удалить сервис"
+}
diff --git a/src/i18n/locales/ua.json b/src/i18n/locales/ua.json
new file mode 100644
index 000000000..63135e52c
--- /dev/null
+++ b/src/i18n/locales/ua.json
@@ -0,0 +1,167 @@
+{
+  "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": "Додайте on-premise / hosted сервіси, такі як 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": "Налаштування",
+  "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": "Розміщений",
+  "settings.service.form.tabOnPremise": "Самостійно розміщений ⭐️",
+  "settings.service.form.customUrlValidationError": "Не вдалось підтвердити власний {name} сервер.",
+  "settings.service.form.customUrlPremiumInfo": "Щоб додати самостійно розміщені сервіси, вам потріьно мати Преміумним Акаунт Прихильника 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.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.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 буде використовувати приблизно 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": "Видалити сервіс"
+}
diff --git a/src/index.js b/src/index.js
index 3244c44ad..9ca059f48 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,21 +2,22 @@ import { app, BrowserWindow, shell } from 'electron';
 import fs from 'fs-extra';
 import path from 'path';
 
-// eslint-disable-next-line
+/* eslint-disable */
 if (require('electron-squirrel-startup')) app.quit();
 
-import windowStateKeeper from 'electron-window-state'; // eslint-disable-line
+import windowStateKeeper from 'electron-window-state';
 
-import { isDevMode, isWindows } from './environment';  // eslint-disable-line
-import ipcApi from './electron/ipc-api';  // eslint-disable-line
-import Settings from './electron/Settings';  // eslint-disable-line
-import { appId } from './package.json'; // eslint-disable-line
-import './electron/exception'; // eslint-disable-line
+import { isDevMode, isWindows } from './environment';
+import ipcApi from './electron/ipc-api';
+import Tray from './lib/Tray';
+import Settings from './electron/Settings';
+import { appId } from './package.json';
+import './electron/exception';
+/* eslint-enable */
 
 // Keep a global reference of the window object, if you don't, the window will

 // be closed automatically when the JavaScript object is garbage collected.

 let mainWindow;
-const settings = new Settings();
 let willQuitApp = false;
 
 // Ensure that the recipe directory exists
@@ -27,6 +28,23 @@ if (isWindows) {
   app.setAppUserModelId(appId);
 }
 
+// Force single window
+if (process.platform !== 'darwin') {
+  const isSecondInstance = app.makeSingleInstance(() => {
+    if (mainWindow) {
+      if (mainWindow.isMinimized()) mainWindow.restore();
+      mainWindow.focus();
+    }
+  });
+
+  if (isSecondInstance) {
+    app.quit();
+  }
+}
+
+// Initialize Settings
+const settings = new Settings();
+
 const createWindow = async () => {
   // Remember window size
   const mainWindowState = windowStateKeeper({
@@ -47,8 +65,11 @@ const createWindow = async () => {
     autoHideMenuBar: true,
   });
 
+  // Initialize System Tray
+  const trayIcon = new Tray(mainWindow);
+
   // Initialize ipcApi
-  ipcApi({ mainWindow, settings });
+  ipcApi({ mainWindow, settings, trayIcon });
 
   // Manage Window State
   mainWindowState.manage(mainWindow);
@@ -85,6 +106,7 @@ const createWindow = async () => {
 
     if (settings.get('minimizeToSystemTray')) {
       mainWindow.setSkipTaskbar(true);
+      trayIcon.show();
     }
   });
 
@@ -102,6 +124,10 @@ const createWindow = async () => {
     if (app.wasMaximized) {
       mainWindow.maximize();
     }
+
+    if (!settings.get('enableSystemTray')) {
+      trayIcon.hide();
+    }
   });
 
   mainWindow.on('show', () => {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 9f23c4d70..a6cde4d36 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -49,6 +49,7 @@ const template = [
       },
       {
         role: 'zoomin',
+        accelerator: 'CommandOrControl+=',
       },
       {
         role: 'zoomout',
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
new file mode 100644
index 000000000..67150971e
--- /dev/null
+++ b/src/lib/Tray.js
@@ -0,0 +1,73 @@
+import { app, Tray, Menu, systemPreferences } from 'electron';
+import path from 'path';
+
+const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
+const INDICATOR_TRAY_PLAIN = 'tray';
+const INDICATOR_TRAY_UNREAD = 'tray-unread';
+
+export default class TrayIcon {
+  mainWindow = null;
+  trayIcon = null;
+
+  constructor(mainWindow) {
+    this.mainWindow = mainWindow;
+  }
+
+  show() {
+    if (this.trayIcon) return;
+
+    this.trayIcon = new Tray(this._getAsset('tray', INDICATOR_TRAY_PLAIN));
+    const trayMenuTemplate = [
+      {
+        label: 'Show Franz',
+        click() {
+          this.mainWindow.show();
+        },
+      }, {
+        label: 'Quit Franz',
+        click() {
+          app.quit();
+        },
+      },
+    ];
+
+    const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
+    this.trayIcon.setContextMenu(trayMenu);
+
+    this.trayIcon.on('click', () => {
+      this.mainWindow.show();
+    });
+  }
+
+  hide() {
+    if (this.trayIcon) {
+      this.trayIcon.destroy();
+      this.trayIcon = null;
+    }
+  }
+
+  setIndicator(indicator) {
+    if (!this.trayIcon) return;
+
+    this.trayIcon.setImage(this._getAsset('tray', indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
+
+    if (process.platform === 'darwin') {
+      this.trayIcon.setPressedImage(
+        this._getAsset('tray', `${indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
+      );
+    }
+  }
+
+
+  _getAsset(type, asset) {
+    let platform = process.platform;
+
+    if (platform === 'darwin' && systemPreferences.isDarkMode()) {
+      platform = `${platform}-dark`;
+    }
+
+    return path.join(
+      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
+    );
+  }
+}
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index a5e0839f2..7dbef985d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -16,10 +16,6 @@ import Miner from '../lib/Miner';
 const { app, getCurrentWindow, powerMonitor } = remote;
 const defaultLocale = 'en-US';
 
-const appFolder = path.dirname(process.execPath);
-const updateExe = path.resolve(appFolder, '..', 'Update.exe');
-const exeName = path.basename(process.execPath);
-
 export default class AppStore extends Store {
   updateStatusTypes = {
     CHECKING: 'CHECKING',
@@ -84,7 +80,7 @@ export default class AppStore extends Store {
     // Check for updates once every 4 hours
     setInterval(() => this._checkForUpdates(), CHECK_INTERVAL);
     // Check for an update in 30s (need a delay to prevent Squirrel Installer lock file issues)
-    setTimeout(() => this._checkForUpdates(), 3000);
+    setTimeout(() => this._checkForUpdates(), 30000);
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
@@ -125,6 +121,18 @@ export default class AppStore extends Store {
       this.actions.service.openDevToolsForActiveService();
     });
 
+    // Set active the next service
+    key(
+      '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => {
+        this.actions.service.setActiveNext();
+      });
+
+    // Set active the prev service
+    key(
+      '⌘+pageup, ctrl+pageup, ⌘+tab, ctrl+tab', () => {
+        this.actions.service.setActivePrev();
+      });
+
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
@@ -161,24 +169,27 @@ export default class AppStore extends Store {
   @action _launchOnStartup({ enable, openInBackground }) {
     this.autoLaunchOnStart = enable;
 
-    const settings = {
+    let settings = {
       openAtLogin: enable,
-      openAsHidden: openInBackground,
-      path: updateExe,
-      args: [
-        '--processStart', `"${exeName}"`,
-      ],
     };
 
     // For Windows
-    if (openInBackground) {
-      settings.args.push(
-        '--process-start-args', '"--hidden"',
-      );
+    if (process.platform === 'win32') {
+      settings = Object.assign({
+        openAsHidden: openInBackground,
+        path: app.getPath('exe'),
+        args: [
+          '--processStart', `"${path.basename(app.getPath('exe'))}"`,
+        ],
+      }, settings);
+
+      if (openInBackground) {
+        settings.args.push(
+          '--process-start-args', '"--hidden"',
+        );
+      }
     }
 
-    app.setLoginItemSettings(settings);
-
     gaEvent('App', enable ? 'enable autostart' : 'disable autostart');
   }
 
@@ -291,6 +302,12 @@ export default class AppStore extends Store {
       // we need to wait until the settings request is resolved
       await this.stores.settings.allSettingsRequest;
 
+      // We don't set autostart on first launch for macOS as disabling
+      // the option is currently broken
+      // https://github.com/meetfranz/franz/issues/17
+      // https://github.com/electron/electron/issues/10880
+      if (process.platform === 'darwin') return;
+
       if (!this.stores.settings.all.appStarts) {
         this.actions.app.launchOnStartup({
           enable: true,
@@ -301,7 +318,7 @@ export default class AppStore extends Store {
 
   _checkAutoStart() {
     const loginItem = app.getLoginItemSettings({
-      path: updateExe,
+      path: app.getPath('exe'),
     });
 
     this.autoLaunchOnStart = loginItem.openAtLogin;
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index cdc274685..67fee1d50 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -65,6 +65,10 @@ export default class RecipesStore extends Store {
   @action async _update() {
     const recipeIds = this.recipeIdForServices;
     const recipes = {};
+
+    // Hackfix, reference this.all to fetch services
+    console.debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
+
     recipeIds.forEach((r) => {
       const recipe = this.one(r);
       recipes[r] = recipe.version;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 77d2e7da4..19db05494 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -24,6 +24,8 @@ export default class ServicesStore extends Store {
 
     // Register action handlers
     this.actions.service.setActive.listen(this._setActive.bind(this));
+    this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
+    this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
     this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
     this.actions.service.createService.listen(this._createService.bind(this));
     this.actions.service.createFromLegacyService.listen(this._createFromLegacyService.bind(this));
@@ -206,6 +208,24 @@ export default class ServicesStore extends Store {
     service.isActive = true;
   }
 
+  @action _setActiveNext() {
+    const nextIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), 1, this.enabled.length);
+
+    this.all.forEach((s, index) => {
+      this.all[index].isActive = false;
+    });
+    this.enabled[nextIndex].isActive = true;
+  }
+
+  @action _setActivePrev() {
+    const prevIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), -1, this.enabled.length);
+
+    this.all.forEach((s, index) => {
+      this.all[index].isActive = false;
+    });
+    this.enabled[prevIndex].isActive = true;
+  }
+
   @action _setUnreadMessageCount({ serviceId, count }) {
     const service = this.one(serviceId);
 
@@ -500,4 +520,8 @@ export default class ServicesStore extends Store {
   _reorderAnalytics = debounce(() => {
     gaEvent('Service', 'order');
   }, 5000);
+
+  _wrapIndex(index, delta, size) {
+    return (((index + delta) % size) + size) % size;
+  }
 }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 4927d615f..1cb2ecac3 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -192,6 +192,15 @@ export default class UserStore extends Store {
   @action async _importLegacyServices({ services }) {
     this.isImportLegacyServicesExecuting = true;
 
+    // Reduces recipe duplicates
+    const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id);
+
+    // Install recipes
+    for (const recipe of recipes) {
+      // eslint-disable-next-line
+      await this.stores.recipes._install({ recipeId: recipe });
+    }
+
     for (const service of services) {
       this.actions.service.createFromLegacyService({
         data: service,
diff --git a/src/styles/infobox.scss b/src/styles/infobox.scss
index ad363314d..7ab094058 100644
--- a/src/styles/infobox.scss
+++ b/src/styles/infobox.scss
@@ -31,6 +31,11 @@
     color: #FFF;
   }
 
+  &.infobox--warning {
+    background: $theme-brand-warning;
+    color: #FFF;
+  }
+
   .mdi {
     margin-right: 10px;
   }
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 8afc86f98..0a082729c 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -20,6 +20,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './auth.scss';
 @import './tooltip.scss';
 @import './info-bar.scss';
+@import './status-bar-target-url.scss';
 @import './animations.scss';
 @import './infobox.scss';
 @import './badge.scss';
diff --git a/src/styles/status-bar-target-url.scss b/src/styles/status-bar-target-url.scss
new file mode 100644
index 000000000..bc7438be9
--- /dev/null
+++ b/src/styles/status-bar-target-url.scss
@@ -0,0 +1,14 @@
+@import './config.scss';
+
+.status-bar-target-url {
+  height: auto;
+  background: $theme-gray-lighter;
+  padding: 4px;
+  position: absolute;
+  box-shadow: 0 0 8px rgba(black, 0.2);
+  font-size: 12px;
+  color: $theme-gray-dark;
+  bottom: 0;
+  right: 0;
+  border-top-left-radius: 5px;
+}