Merge pull request #808 from meetfranz/release/5.0.0-beta.17v5.0.0-beta.17

Franz 5.0.0 beta.17

51 files changed, 2269 insertions, 433 deletions

diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..797ed2e27
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+8.2.1
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index a8300f84f..17d506895 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,8 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "NODE_ENV": "development"
+                "NODE_ENV": "development",
+                "DEBUG": "*,-engine.io*,-socket.io*"
             }
         },
         {
@@ -18,9 +19,10 @@
             "name": "Franz – Live API",
             "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
             "program": "${workspaceFolder}/build/index.js",
-            "protocol": "inspector",
+            "protocol": "inspector",    
             "env": {
-                "LIVE_API": "1"
+                "LIVE_API": "1",
+                "DEBUG": "*,-engine.io*,-socket.io*"
             }
         },
         {
@@ -31,7 +33,47 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "LOCAL_API": "1"
+                "LOCAL_API": "1",
+                "DEBUG": "*,-engine.io*,-socket.io*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "(Win Sim) Franz - Test API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",
+            "env": {
+                "NODE_ENV": "development",
+                "OS_PLATFORM": "win32",
+                "DEBUG": "*,-engine.io*,-socket.io*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "(Win Sim) Franz – Live API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",    
+            "env": {
+                "LIVE_API": "1",
+                "OS_PLATFORM": "win32",
+                "DEBUG": "*,-engine.io*,-socket.io*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "(Win Sim) Franz – Local API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",
+            "env": {
+                "LOCAL_API": "1",
+                "OS_PLATFORM": "win32",
+                "DEBUG": "*,-engine.io*,-socket.io*"
             }
         }
     ]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75d58602e..0d5364ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,35 @@
+<a name="5.0.0-beta.17"></a>
+# [5.0.0-beta.17](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.17) (2018-03-20)
+
+### General
+
+* **App:** Various performance improvments
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+### Features
+
+* **Windows:** Replace window frame with custom menu bar ([9af5fd0](https://github.com/meetfranz/franz/commit/9af5fd0))
+* **Electron:** Update electron to 1.8.4 ([b9c6616](https://github.com/meetfranz/franz/commit/b9c6616))
+* **Mac:** Add dock bounce when new update is available ([47885bb](https://github.com/meetfranz/franz/commit/47885bb))
+* **Services:** Improve performance when reordering services ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
+* **Translations:** Add option to translate error messages and system menus ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
+
+### Bug Fixes
+
+* **App:** Fix app reload when coming back from sleep ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+* **App:** Fix issue with app not showing services when recipe has invalid version (e.g. mailbox.org) ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+* **Linux:** Fix missing/flickering ubuntu tray icon ([592f00a](https://github.com/meetfranz/franz/commit/592f00a))
+* **Service Tabs:** Remove "delete service" context menu when not in development mode ([3a5c3f0](https://github.com/meetfranz/franz/commit/3a5c3f0))
+* **Windows:** Improve app window handling ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+
+
 <a name="5.0.0-beta.16"></a>
 # [5.0.0-beta.16](https://github.com/meetfranz/franz/compare/v5.0.0-beta.15...v5.0.0-beta.16) (2018-02-23)
 
 ### General
 * **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1))
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 * **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44))
@@ -18,13 +45,15 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
 * **App:** Fix Franz-wide form validation ([7618f51](https://github.com/meetfranz/franz/commit/7618f51))
 * **App:** Fix service tooltips not initialized properly ([8765b8f](https://github.com/meetfranz/franz/commit/8765b8f))
 * **Linux:** Invert tray icon color & add border for bright UI's ([0de9c60](https://github.com/meetfranz/franz/commit/0de9c60))
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 
 
 <a name="5.0.0-beta.15"></a>
 # [5.0.0-beta.15](https://github.com/meetfranz/franz/compare/v5.0.0-beta.14...v5.0.0-beta.15) (2018-01-10)
 
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
@@ -37,7 +66,6 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
 * **Services:** Improve handling of external links ([e2d6edf](https://github.com/meetfranz/franz/commit/e2d6edf))
 * **Services:** Improve user experience of service search ([7e784c6](https://github.com/meetfranz/franz/commit/7e784c6))
 * **Account:** Enable a user to delete their own account ([1f3df73](https://github.com/meetfranz/franz/commit/1f3df73))
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 
 
diff --git a/package.json b/package.json
index fd96c602b..1d7ab2852 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.16",
+  "version": "5.0.0-beta.17",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
@@ -33,8 +33,10 @@
     "babel-polyfill": "^6.23.0",
     "babel-runtime": "^6.23.0",
     "classnames": "^2.2.5",
+    "debug-electron": "^0.0.4",
     "du": "^0.1.0",
     "electron-fetch": "^1.1.0",
+    "electron-react-titlebar": "^0.7.1",
     "electron-spellchecker": "^1.1.2",
     "electron-updater": "^2.4.3",
     "electron-window-state": "^4.1.0",
@@ -91,7 +93,7 @@
     "cz-conventional-changelog": "^2.0.0",
     "del": "^2.2.2",
     "dotenv": "^4.0.0",
-    "electron": "^1.7.12",
+    "electron": "1.8.4",
     "electron-builder": "19.15.1",
     "electron-packager": "^8.7.0",
     "electron-rebuild": "^1.6.0",
diff --git a/src/I18n.js b/src/I18n.js
index ae3ba2fa9..4ee34157c 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -9,11 +9,18 @@ import UserStore from './stores/UserStore';
 
 @inject('stores') @observer
 export default class I18N extends Component {
+  componentDidUpdate() {
+    window.franz.menu.rebuild();
+  }
+
   render() {
     const { stores, children } = this.props;
     const { locale } = stores.app;
     return (
-      <IntlProvider {...{ locale, key: locale, messages: translations[locale] }}>
+      <IntlProvider
+        {...{ locale, key: locale, messages: translations[locale] }}
+        ref={(intlProvider) => { window.franz.intl = intlProvider ? intlProvider.getChildContext().intl : null; }}
+      >
         {children}
       </IntlProvider>
     );
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index aa3a7d655..4d2497c61 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -3,6 +3,8 @@ import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('LocalApi');
+
 const { session } = remote;
 
 export default class LocalApi {
@@ -13,7 +15,7 @@ export default class LocalApi {
       du(partitionsDir, (err, size) => {
         if (err) reject(err);
 
-        console.debug('LocalApi::getAppCacheSize resolves', size);
+        debug('LocalApi::getAppCacheSize resolves', size);
         resolve(size);
       });
     });
@@ -22,14 +24,14 @@ export default class LocalApi {
   async clearCache(serviceId) {
     const s = session.fromPartition(`persist:service-${serviceId}`);
 
-    console.debug('LocalApi::clearCache resolves', serviceId);
+    debug('LocalApi::clearCache resolves', serviceId);
     return new Promise(resolve => s.clearCache(resolve));
   }
 
   async clearAppCache() {
     const s = session.defaultSession;
 
-    console.debug('LocalApi::clearCache clearAppCache');
+    debug('LocalApi::clearCache clearAppCache');
     return new Promise(resolve => s.clearCache(resolve));
   }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 8f3297d13..353faa7f4 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -27,6 +27,8 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('ServerApi');
+
 module.paths.unshift(
   getDevRecipeDirectory(),
   getRecipeDirectory(),
@@ -55,7 +57,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::login resolves', u);
+    debug('ServerApi::login resolves', u);
     return u.token;
   }
 
@@ -69,7 +71,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::signup resolves', u);
+    debug('ServerApi::signup resolves', u);
     return u.token;
   }
 
@@ -82,7 +84,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::inviteUser');
+    debug('ServerApi::inviteUser');
     return true;
   }
 
@@ -98,7 +100,7 @@ export default class ServerApi {
     }
     const r = await request.json();
 
-    console.debug('ServerApi::retrievePassword');
+    debug('ServerApi::retrievePassword');
     return r;
   }
 
@@ -112,7 +114,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const user = new UserModel(data);
-    console.debug('ServerApi::userInfo resolves', user);
+    debug('ServerApi::userInfo resolves', user);
 
     return user;
   }
@@ -128,7 +130,7 @@ export default class ServerApi {
     const updatedData = await request.json();
 
     const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) });
-    console.debug('ServerApi::updateUserInfo resolves', user);
+    debug('ServerApi::updateUserInfo resolves', user);
     return user;
   }
 
@@ -141,7 +143,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::deleteAccount resolves', data);
+    debug('ServerApi::deleteAccount resolves', data);
     return data;
   }
 
@@ -157,7 +159,7 @@ export default class ServerApi {
 
     let services = await this._mapServiceModels(data);
     services = services.filter(service => service !== null);
-    console.debug('ServerApi::getServices resolves', services);
+    debug('ServerApi::getServices resolves', services);
     return services;
   }
 
@@ -181,7 +183,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::createService resolves', service);
+    debug('ServerApi::createService resolves', service);
     return service;
   }
 
@@ -205,7 +207,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::updateService resolves', service);
+    debug('ServerApi::updateService resolves', service);
     return service;
   }
 
@@ -240,7 +242,7 @@ export default class ServerApi {
       throw request;
     }
     const serviceData = await request.json();
-    console.debug('ServerApi::reorderService resolves', serviceData);
+    debug('ServerApi::reorderService resolves', serviceData);
     return serviceData;
   }
 
@@ -255,7 +257,7 @@ export default class ServerApi {
 
     removeServicePartitionDirectory(id, true);
 
-    console.debug('ServerApi::deleteService resolves', data);
+    debug('ServerApi::deleteService resolves', data);
     return data;
   }
 
@@ -277,7 +279,7 @@ export default class ServerApi {
 
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
-    console.debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
+    debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
     return this.recipes;
   }
 
@@ -290,7 +292,7 @@ export default class ServerApi {
       throw request;
     }
     const recipes = await request.json();
-    console.debug('ServerApi::getRecipeUpdates resolves', recipes);
+    debug('ServerApi::getRecipeUpdates resolves', recipes);
     return recipes;
   }
 
@@ -305,7 +307,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getRecipes resolves', recipePreviews);
+    debug('ServerApi::getRecipes resolves', recipePreviews);
 
     return recipePreviews;
   }
@@ -322,7 +324,7 @@ export default class ServerApi {
     // data = this._addLocalRecipesToPreviews(data);
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
+    debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -336,7 +338,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
+    debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -350,7 +352,7 @@ export default class ServerApi {
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
-      console.debug('Recipe downloaded', recipeId);
+      debug('Recipe downloaded', recipeId);
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
@@ -392,7 +394,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const plan = new PlanModel(data);
-    console.debug('ServerApi::getPlans resolves', plan);
+    debug('ServerApi::getPlans resolves', plan);
     return plan;
   }
 
@@ -408,7 +410,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getHostedPage resolves', data);
+    debug('ServerApi::getHostedPage resolves', data);
     return data;
   }
 
@@ -421,7 +423,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getPaymentDashboardUrl resolves', data);
+    debug('ServerApi::getPaymentDashboardUrl resolves', data);
     return data;
   }
 
@@ -434,7 +436,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const orders = this._mapOrderModels(data);
-    console.debug('ServerApi::getSubscriptionOrders resolves', orders);
+    debug('ServerApi::getSubscriptionOrders resolves', orders);
     return orders;
   }
 
@@ -451,7 +453,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const news = this._mapNewsModels(data);
-    console.debug('ServerApi::getLatestNews resolves', news);
+    debug('ServerApi::getLatestNews resolves', news);
     return news;
   }
 
@@ -465,7 +467,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::hideNews resolves', id);
+    debug('ServerApi::hideNews resolves', id);
   }
 
   // Health Check
@@ -476,7 +478,7 @@ export default class ServerApi {
     if (!request.ok) {
       throw request;
     }
-    console.debug('ServerApi::healthCheck resolves');
+    debug('ServerApi::healthCheck resolves');
   }
 
   async getLegacyServices() {
@@ -502,7 +504,7 @@ export default class ServerApi {
           return service;
         }));
 
-        console.debug('ServerApi::getLegacyServices resolves', services);
+        debug('ServerApi::getLegacyServices resolves', services);
         return services;
       }
     } catch (err) {
@@ -535,7 +537,7 @@ export default class ServerApi {
 
       return new ServiceModel(service, recipe);
     } catch (e) {
-      console.debug(e);
+      debug(e);
       return null;
     }
   }
@@ -553,7 +555,7 @@ export default class ServerApi {
 
           await this.getRecipePackage(recipeId);
 
-          console.debug('Rerun ServerAPI::getInstalledRecipes');
+          debug('Rerun ServerAPI::getInstalledRecipes');
           await this.getInstalledRecipes();
 
           recipe = this.recipes.find(r => r.id === recipeId);
@@ -653,7 +655,7 @@ export default class ServerApi {
 
       return recipes;
     } catch (err) {
-      console.debug('Could not load dev recipes');
+      debug('Could not load dev recipes');
       return false;
     }
   }
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 20dc2f764..66aef1730 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -2,10 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
+import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
 import globalMessages from '../../i18n/globalMessages';
 
+import { isWindows } from '../../environment';
+
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
 }
@@ -87,64 +90,67 @@ export default class AppLayout extends Component {
     return (
       <div>
         <div className="app">
-          {sidebar}
-          <div className="app__service">
-            {news.length > 0 && news.map(item => (
-              <InfoBar
-                key={item.id}
-                position="top"
-                type={item.type}
-                sticky={item.sticky}
-                onHide={() => removeNewsItem({ newsId: item.id })}
-              >
-                <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-              </InfoBar>
-            ))}
-            {!isOnline && (
-              <InfoBar
-                type="danger"
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-              </InfoBar>
-            )}
-            {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-              <InfoBar
-                type="danger"
-                ctaLabel="Try again"
-                ctaLoading={areRequiredRequestsLoading}
-                sticky
-                onClick={retryRequiredRequests}
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(messages.requiredRequestsFailed)}
-              </InfoBar>
-            )}
-            {showServicesUpdatedInfoBar && (
-              <InfoBar
-                type="primary"
-                ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                onClick={reloadServicesAfterUpdate}
-                sticky
-              >
-                <span className="mdi mdi-power-plug" />
-                {intl.formatMessage(messages.servicesUpdated)}
-              </InfoBar>
-            )}
-            {appUpdateIsDownloaded && (
-              <InfoBar
-                type="primary"
-                ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
-                onClick={installAppUpdate}
-                sticky
-              >
-                <span className="mdi mdi-information" />
-                {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
-                  <u>{intl.formatMessage(messages.changelog)}</u>
-                </a>
-              </InfoBar>
-            )}
-            {services}
+          {isWindows && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          <div className="app__content">
+            {sidebar}
+            <div className="app__service">
+              {news.length > 0 && news.map(item => (
+                <InfoBar
+                  key={item.id}
+                  position="top"
+                  type={item.type}
+                  sticky={item.sticky}
+                  onHide={() => removeNewsItem({ newsId: item.id })}
+                >
+                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                </InfoBar>
+              ))}
+              {!isOnline && (
+                <InfoBar
+                  type="danger"
+                >
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                </InfoBar>
+              )}
+              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                <InfoBar
+                  type="danger"
+                  ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
+                  sticky
+                  onClick={retryRequiredRequests}
+                >
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(messages.requiredRequestsFailed)}
+                </InfoBar>
+              )}
+              {showServicesUpdatedInfoBar && (
+                <InfoBar
+                  type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                  onClick={reloadServicesAfterUpdate}
+                  sticky
+                >
+                  <span className="mdi mdi-power-plug" />
+                  {intl.formatMessage(messages.servicesUpdated)}
+                </InfoBar>
+              )}
+              {appUpdateIsDownloaded && (
+                <InfoBar
+                  type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
+                  onClick={installAppUpdate}
+                  sticky
+                >
+                  <span className="mdi mdi-information" />
+                  {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
+                    <u>{intl.formatMessage(messages.changelog)}</u>
+                  </a>
+                </InfoBar>
+              )}
+              {services}
+            </div>
           </div>
         </div>
         {children}
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 7aed8fda7..638262f7f 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 import { SortableElement } from 'react-sortable-hoc';
 
 import ServiceModel from '../../../models/Service';
-import { ctrlKey } from '../../../environment';
+import { isDevMode, ctrlKey } from '../../../environment';
 
 const { Menu } = remote;
 
@@ -119,10 +119,14 @@ class TabItem extends Component {
       click: () => (service.isEnabled ? disableService() : enableService()),
     }, {
       type: 'separator',
-    }, {
-      label: intl.formatMessage(messages.deleteService),
-      click: () => deleteService(),
     }];
+
+    if (isDevMode) {
+      menuTemplate.push({
+        label: intl.formatMessage(messages.deleteService),
+        click: () => deleteService(),
+      });
+    }
     const menu = Menu.buildFromTemplate(menuTemplate);
 
     let notificationBadge = null;
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index e4a9d60c3..075bd5e34 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -94,7 +94,7 @@ export default class AppLayoutContainer extends Component {
 
     const servicesContainer = (
       <Services
-        services={services.allDisplayed}
+        services={services.allDisplayedUnordered}
         handleIPCMessage={handleIPCMessage}
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
diff --git a/src/environment.js b/src/environment.js
index e185120c0..e1762129b 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -4,11 +4,17 @@ export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-export const isMac = process.platform === 'darwin';
-export const isWindows = process.platform === 'win32';
-export const isLinux = process.platform === 'linux';
+let platform = process.platform;
+if (process.env.OS_PLATFORM) {
+  platform = process.env.OS_PLATFORM;
+}
+
+export const isMac = platform === 'darwin';
+export const isWindows = platform === 'win32';
+export const isLinux = platform === 'linux';
 
 export const ctrlKey = isMac ? '⌘' : 'Ctrl';
+export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
 let api;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index a8a242d54..2f762437d 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -1,6 +1,31 @@
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  required: {
+    id: 'validation.required',
+    defaultMessage: '!!!Field is required',
+  },
+  email: {
+    id: 'validation.email',
+    defaultMessage: '!!!Email not valid',
+  },
+  url: {
+    id: 'validation.url',
+    defaultMessage: '!!!Not a valid URL',
+  },
+  minLength: {
+    id: 'validation.minLength',
+    defaultMessage: '!!!Too few characters',
+  },
+  oneRequired: {
+    id: 'validation.oneRequired',
+    defaultMessage: '!!!At least one is required',
+  },
+});
+
 export function required({ field }) {
   const isValid = (field.value.trim() !== '');
-  return [isValid, `${field.label} is required`];
+  return [isValid, window.franz.intl.formatMessage(messages.required, { field: field.label })];
 }
 
 export function email({ field }) {
@@ -13,7 +38,7 @@ export function email({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} not valid`];
+  return [isValid, window.franz.intl.formatMessage(messages.email, { field: field.label })];
 }
 
 export function url({ field }) {
@@ -27,7 +52,7 @@ export function url({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} is not a valid url`];
+  return [isValid, window.franz.intl.formatMessage(messages.url, { field: field.label })];
 }
 
 export function minLength(length) {
@@ -36,13 +61,13 @@ export function minLength(length) {
     if (field.touched) {
       isValid = field.value.length >= length;
     }
-    return [isValid, `${field.label} should be at least ${length} characters long.`];
+    return [isValid, window.franz.intl.formatMessage(messages.minLength, { field: field.label, length })];
   };
 }
 
 export function oneRequired(targets) {
   return ({ field, form }) => {
     const invalidFields = targets.filter(target => form.$(target).value === '');
-    return [targets.length !== invalidFields.length, `${field.label} is required`];
+    return [targets.length !== invalidFields.length, window.franz.intl.formatMessage(messages.required, { field: field.label })];
   };
 }
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 524dfe0fb..be9059727 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "La teva sessió ha caducat, torna a iniciar la sessió.",
    "login.submit.label" : "Accedir",
    "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Configuració",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Edita",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Suprimeix",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Declaració de privacitat",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Correu electrònic",
    "password.headline" : "Restablir contrasenya",
    "password.link.login" : "Inicia la sessió al teu compte",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Activa les notificacions",
    "tabs.item.enableService" : "Activa el servei",
    "tabs.item.reload" : "Recarrega",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Inicia sessió al teu compte",
    "welcome.signupButton" : "Crea un compte gratuït",
    "welcome.slogan" : "Crea un compte gratuït"
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 62eb4a1ee..b4142b928 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Sezení vypršelo, je třeba se znovu přihlásit.",
    "login.submit.label" : "Přihlásit se",
    "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Nastavení",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Upravit",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Smazat",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Prohlášení o ochraně soukromí",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "E-mailová adresa",
    "password.headline" : "Obnovit heslo",
    "password.link.login" : "Přihlásit se k účtu",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Povolit oznamování",
    "tabs.item.enableService" : "Zapnout službu",
    "tabs.item.reload" : "Obnovit",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Přihlášení do vašeho účtu",
    "welcome.signupButton" : "Vytvořit účet zdarma",
    "welcome.slogan" : "Zprávy, které pracují pro vás"
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 7a03cce87..9aaef0465 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
    "login.submit.label" : "Anmelden",
    "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
+   "menu.app.about" : "Über Franz",
+   "menu.app.hide" : "Franz ausblenden",
+   "menu.app.hideOthers" : "Andere ausblenden",
+   "menu.app.quit" : "Franz Beenden",
+   "menu.app.settings" : "Einstellungen",
+   "menu.app.unhide" : "Alle einblenden",
+   "menu.edit" : "Bearbeiten",
+   "menu.edit.copy" : "Kopieren",
+   "menu.edit.cut" : "Ausschneiden",
+   "menu.edit.delete" : "Löschen",
+   "menu.edit.emojiSymbols" : "Emoji & Symbole",
+   "menu.edit.paste" : "Einfügen",
+   "menu.edit.pasteAndMatchStyle" : "Einfügen und Stil anpassen",
+   "menu.edit.redo" : "Wiederholen",
+   "menu.edit.selectAll" : "Alle auswählen",
+   "menu.edit.speech" : "Sprachausgabe",
+   "menu.edit.startDictation" : "Diktat starten ...",
+   "menu.edit.startSpeaking" : "Sprachausgabe starten",
+   "menu.edit.stopSpeaking" : "Sprachausgabe stoppen",
+   "menu.edit.undo" : "Widerrufen",
+   "menu.file" : "Datei",
+   "menu.help" : "Hilfe",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Mehr erfahren",
+   "menu.help.privacy" : "Datenschutzerklärung",
+   "menu.help.support" : "Hilfe",
+   "menu.help.tos" : "Nutzungsbedingungen",
+   "menu.services" : "Dienste",
+   "menu.services.addNewService" : "Dienst hinzufügen",
+   "menu.view" : "Darstellung",
+   "menu.view.enterFullScreen" : "Vollbildmodus",
+   "menu.view.exitFullScreen" : "Vollbildmodus aus",
+   "menu.view.reloadFranz" : "Franz neu laden",
+   "menu.view.reloadService" : "Dienst neu laden",
+   "menu.view.resetZoom" : "Originalgröße",
+   "menu.view.toggleDevTools" : "Entwicklertools anzeigen",
+   "menu.view.toggleFullScreen" : "Vollbildmodus umschalten",
+   "menu.view.toggleServiceDevTools" : "Entwicklertools für Dienst anzeigen",
+   "menu.view.zoomIn" : "Vergrößern",
+   "menu.view.zoomOut" : "Verkleinern",
+   "menu.window" : "Fenster",
+   "menu.window.close" : "Schließen",
+   "menu.window.minimize" : "Minimieren",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
    "password.link.login" : "An deinem Konto anmelden",
@@ -157,7 +200,7 @@
    "settings.user.form.firstname" : "Vorname",
    "settings.user.form.lastname" : "Nachname",
    "settings.user.form.newPassword" : "Neues Passwort",
-   "sidebar.addNewService" : "Neuem Dienst hinzufügen",
+   "sidebar.addNewService" : "Neuen Dienst hinzufügen",
    "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
    "sidebar.settings" : "Einstellungen",
    "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
    "tabs.item.enableService" : "Dienst aktivieren",
    "tabs.item.reload" : "Neuladen",
+   "validation.email" : "{field} ist ungültig",
+   "validation.minLength" : "{field} muss mindestens {length} Zeichen enthalten",
+   "validation.required" : "{field} wird benötigt",
+   "validation.url" : "{field} ist keine gültige URL",
    "welcome.loginButton" : "Bei Franz einloggen",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
    "welcome.slogan" : "Kommunikation, die für dich funktioniert"
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index b0c465940..ae37d1f5e 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
    "login.submit.label" : "Σύνδεση",
    "login.tokenExpired" : "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Ρυθμίσεις",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Επεξεργασία",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Διαγραφή",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Δήλωση απορρήτου",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
    "password.headline" : "Επαναφορά κωδικού πρόσβασης",
    "password.link.login" : "Σύνδεση στο λογαριασμό σας",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Ενεργοποίηση ειδοποιήσεων",
    "tabs.item.enableService" : "Ενεργοποίηση υπηρεσίας",
    "tabs.item.reload" : "Επαναφόρτωση",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Σύνδεση στο λογαριασμό σας",
    "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού",
    "welcome.slogan" : "Επικοινωνία που λειτουργεί για εσάς"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d5c0ea441..400a9a5d8 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -199,5 +199,52 @@
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}"
+  "service.disabledHandler.action": "Enable {name}",
+  "menu.edit": "Edit",
+  "menu.edit.undo": "Undo",
+  "menu.edit.redo": "Redo",
+  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Copy",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.delete": "Delete",
+  "menu.edit.selectAll": "Select All",
+  "menu.edit.speech": "Speech",
+  "menu.edit.startSpeaking": "Start Speaking",
+  "menu.edit.stopSpeaking": "Stop Speaking",
+  "menu.edit.startDictation": "Start Dictation",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.view.resetZoom": "Actual Size",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.enterFullScreen": "Enter Full Screen",
+  "menu.view.exitFullScreen": "Exit Full Screen",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleDevTools": "Toggle Developer Tools",
+  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.view.reloadService": "Reload Service",
+  "menu.view.reloadFranz": "Reload Franz",
+  "menu.window.minimize": "Minimize",
+  "menu.window.close": "Close",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.changelog": "Changelog",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of Service",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.file": "File",
+  "menu.view": "View",
+  "menu.services": "Services",
+  "menu.window": "Window",
+  "menu.help": "Help",
+  "menu.app.about": "About Franz",
+  "menu.app.settings": "Settings",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.unhide": "Unhide",
+  "menu.app.quit": "Quit",
+  "menu.services.addNewService": "Add New Service...",
+  "validation.required": "{field} is required",
+  "validation.email": "{field} is not valid",
+  "validation.url": "{field} is not a valid URL",
+  "validation.minLength": "{field} should be at least {length} characters long"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 407266285..640f87c20 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,6 +1,6 @@
 {
    "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz.",
-   "global.notConnectedToTheInternet" : "No estás conectado a Internet",
+   "global.notConnectedToTheInternet" : "No está conectado a Internet",
    "import.headline" : "Importa tus servicios de Franz 4",
    "import.notSupportedHeadline" : "Servicios no soportados aún en Franz 5",
    "import.skip.label" : "Quiero agregar servicios manualmente",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Tu sesión ha expirado, por favor inicia la sesión de nuevo.",
    "login.submit.label" : "Iniciar sesión",
    "login.tokenExpired" : "Tu sesión expiró, por favor la inicia sesión nuevamente.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Configuración",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Editar",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Borrar",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Declaración de privacidad",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Dirección de correo electrónico",
    "password.headline" : "Restablecer contraseña",
    "password.link.login" : "Iniciar sesión en tu cuenta",
@@ -76,7 +119,7 @@
    "settings.app.form.enableMenuBar" : "mostrar a franz en La barra de menús",
    "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Ocultar Icono de Franz en barra de herramientas",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Activar notificaciones",
    "tabs.item.enableService" : "Activar servicio",
    "tabs.item.reload" : "Recargar",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Accede a tu cuenta",
    "welcome.signupButton" : "Crear una cuenta gratuita",
    "welcome.slogan" : "Mensajería que funciona para ti"
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 35a55fcc2..a40a60833 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,6 +1,6 @@
 {
-   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz.",
-   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté(e) à Internet.",
+   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
+   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
    "import.headline" : "Importez vos services depuis la version 4 de Franz.",
    "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
    "import.skip.label" : "Je veux ajouter des services manuellement",
@@ -16,7 +16,7 @@
    "invite.name.label" : "Nom",
    "invite.skip.label" : "Je veux faire cela plus tard",
    "invite.submit.label" : "Envoyer des invitations",
-   "invite.successInfo" : "Invitations envoyées.",
+   "invite.successInfo" : "Invitations envoyées",
    "login.email.label" : "Adresse e-mail",
    "login.headline" : "S'inscrire",
    "login.invalidCredentials" : "E-mail ou mot de passe invalide",
@@ -26,11 +26,54 @@
    "login.serverLogout" : "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
    "login.submit.label" : "Connexion",
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Paramètres",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Éditer",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Supprimer",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Déclaration de confidentialité",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Adresse e-mail",
    "password.headline" : "Réinitialiser le mot de passe",
    "password.link.login" : "Connectez-vous à votre compte",
    "password.link.signup" : "Créer un compte gratuit.",
-   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail ",
+   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail",
    "password.submit.label" : "Soumettre",
    "password.successInfo" : "Merci de consulter vos e-mails",
    "pricing.headline" : "Soutenez Franz",
@@ -94,7 +137,7 @@
    "settings.app.updateStatusAvailable" : "Mise à jour disponible, téléchargement en cours...",
    "settings.app.updateStatusSearching" : "Recherche d'une mise à jour",
    "settings.app.updateStatusUpToDate" : "Vous utilisez la dernière version de Franz",
-   "settings.invite.headline" : "Invite 3 amis",
+   "settings.invite.headline" : "Invite des amis",
    "settings.navigation.account" : "Compte",
    "settings.navigation.availableServices" : "Services disponibles",
    "settings.navigation.inviteFriends" : "Inviter des amis",
@@ -138,7 +181,7 @@
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
    "settings.service.form.team" : "Équipe",
-   "settings.service.form.useHostedService" : "Utilisez le service hébergé {nom}.",
+   "settings.service.form.useHostedService" : "Utilisez le service hébergé {name}.",
    "settings.service.form.yourServices" : "Vos services",
    "settings.services.deletedInfo" : "Le service a été supprimé",
    "settings.services.discoverServices" : "Découvrir les services",
@@ -174,30 +217,34 @@
    "signup.password.label" : "Mot de passe",
    "signup.submit.label" : "Créer un compte",
    "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
-   "subscription.features.ads" : "No ads, ever!",
-   "subscription.features.comingSoon" : "coming soon",
-   "subscription.features.customServices" : "Private services for you and your team",
-   "subscription.features.encryptedSync" : "Encrypted session synchronization",
+   "subscription.features.ads" : "Plus de pubs !",
+   "subscription.features.comingSoon" : "Bientôt disponible",
+   "subscription.features.customServices" : "Services privés pour vous et votre équipe",
+   "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
    "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.vpn" : "Support des Proxy et VPN",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
-   "subscription.paymentSessionError" : "Could not initialize payment form",
-   "subscription.submit.label" : "I want to support the development of Franz",
-   "subscription.type.free" : "free",
-   "subscription.type.month" : "month",
-   "subscription.type.year" : "year",
-   "subscriptionPopup.buttonCancel" : "Cancel",
-   "subscriptionPopup.buttonDone" : "Done",
-   "tabs.item.deleteService" : "Delete service",
+   "subscription.paymentSessionError" : "Initialisation du paiement impossible",
+   "subscription.submit.label" : "Je souhaite aider au développement de Franz",
+   "subscription.type.free" : "gratuit",
+   "subscription.type.month" : "mois",
+   "subscription.type.year" : "année",
+   "subscriptionPopup.buttonCancel" : "Annuler",
+   "subscriptionPopup.buttonDone" : "Terminé",
+   "tabs.item.deleteService" : "Supprimer le service",
    "tabs.item.disableAudio" : "Désactiver l'audio",
-   "tabs.item.disableNotifications" : "Disable notifications",
-   "tabs.item.disableService" : "Disable service",
-   "tabs.item.edit" : "Edit",
+   "tabs.item.disableNotifications" : "Désactiver les notifications",
+   "tabs.item.disableService" : "Désactiver le service",
+   "tabs.item.edit" : "Éditer",
    "tabs.item.enableAudio" : "Activer l'audio",
-   "tabs.item.enableNotification" : "Enable notifications",
+   "tabs.item.enableNotification" : "Activer les notifications",
    "tabs.item.enableService" : "Activer le service",
-   "tabs.item.reload" : "Reload",
-   "welcome.loginButton" : "Login to your account",
-   "welcome.signupButton" : "Create a free account",
+   "tabs.item.reload" : "Recharger",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
+   "welcome.loginButton" : "Se connecter sur son compte",
+   "welcome.signupButton" : "Créer un compte gratuit",
    "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 13b251755..80aeb0a1b 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
    "login.submit.label" : "Logáil isteach",
    "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Socruithe",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Cuir in eagar",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Scrios",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Ráiteas phríobháideachais",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Seoladh ríomhphoist",
    "password.headline" : "Athshocraigh pasfhocal",
    "password.link.login" : "Logáil isteach i do chuntas",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Cumasaigh fógraí",
    "tabs.item.enableService" : "Cumasaigh seirbhís",
    "tabs.item.reload" : "Athlódáil",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Logáil isteach i do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
    "welcome.slogan" : "Teachtaireachtaí a oibríonn duitse"
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 97bfc19f4..72930f686 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "Ime",
    "invite.skip.label" : "Želim da ovo uradim kasnije",
    "invite.submit.label" : "Pošalji pozivnice",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Pozivnice uspješno poslane",
    "login.email.label" : "Vaša e-adresa:",
    "login.headline" : "Prijavite se",
    "login.invalidCredentials" : "E-mail ili lozinka nisu točni",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Postavke",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Uredi",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Obriši",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Izjava o privatnosti ",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš račun",
@@ -68,12 +111,12 @@
    "settings.app.buttonClearAllCache" : "Očisti memoriju",
    "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
    "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Franz predmemorija trenutno koristi {size} prostora na disku",
    "settings.app.currentVersion" : "Trenutna verzija:",
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
    "settings.app.form.beta" : "Obuhvati i beta verzije",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableMenuBar" : "Prikaži Franz u traci izbornika",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
    "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
@@ -89,15 +132,15 @@
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni zagon",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Predmemorija",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
    "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
    "settings.app.updateStatusSearching" : "Traže se ažuriranja",
    "settings.app.updateStatusUpToDate" : "Koristite najnoviju verziju Franca.",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Pozovi prijatelje",
    "settings.navigation.account" : "Račun",
    "settings.navigation.availableServices" : "Dostupne usluge",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Pozovi prijatelje",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
    "settings.navigation.yourServices" : "Vaše usluge",
@@ -108,7 +151,7 @@
    "settings.recipes.mostPopular" : "Najpopularniji",
    "settings.recipes.nothingFound" : "Žao nam je, ali ne postoje usluge koje se poklapaju s onima koje tražite. ",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usluga uspješno dodana. ",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Potraži servis",
    "settings.service.error.goBack" : "Nazad do servisa",
    "settings.service.error.headline" : "Greška",
    "settings.service.error.message" : "Nemoguće učitati sadržaj usluge. ",
@@ -126,10 +169,10 @@
    "settings.service.form.enableService" : "Omogućite usluge",
    "settings.service.form.headlineBadges" : "Unread message badges",
    "settings.service.form.headlineGeneral" : "Općenito",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Obavijesti",
+   "settings.service.form.icon" : "Prilagođena ikona",
+   "settings.service.form.iconDelete" : "Obriši",
+   "settings.service.form.iconUpload" : "Ispusti sliku ili klikni ovdje",
    "settings.service.form.indirectMessageInfo" : "Vi ćete biti obavješteni o svim novim porukama na kanalu, ne samo o @imenima, kanalima, @ovdje, ...",
    "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
    "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna. ",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Omogući obavijesti",
    "tabs.item.enableService" : "Omogući usluge",
    "tabs.item.reload" : "Ponovno učitavanje",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Prijavite se na račun",
    "welcome.signupButton" : "Stvorite novi korisnički račun",
    "welcome.slogan" : "Poruke koje su stvorene za tebe"
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 15bdd33f4..308559f3b 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "A munkamenet lejárt, kérlek lépj be újra.",
    "login.submit.label" : "Bejelentkezés",
    "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Beállítások",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Szerkesztés",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Törlés",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Adatvédelmi Nyilatkozatot",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Email cím",
    "password.headline" : "Jelszó visszaállítása",
    "password.link.login" : "Jelentkezz be a fiókodba",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Értesítések engedélyezése",
    "tabs.item.enableService" : "Szolgáltatás engedélyezése",
    "tabs.item.reload" : "Újratöltés",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
    "welcome.signupButton" : "Új fiók létrehozása",
    "welcome.slogan" : "Üzenetküldés okosan"
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 509c5ad9c..51820150f 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Sesi Anda telah berakhir, silakan masuk kembali.",
    "login.submit.label" : "Masuk",
    "login.tokenExpired" : "Sesi Anda kedaluwarsa, silakan masuk kembali.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Pengaturan",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Edit",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Hapus",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Pernyataan Privasi",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Alamat email",
    "password.headline" : "Setel ulang sandi",
    "password.link.login" : "Masuk ke akun Anda",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Aktifkan pemberitahuan",
    "tabs.item.enableService" : "Aktifkan layanan",
    "tabs.item.reload" : "Muat Ulang",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Masuk ke akun Anda",
    "welcome.signupButton" : "Buat akun gratis",
    "welcome.slogan" : "Perpesanan yang bekerja untuk Anda"
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index a1392afba..c45587c87 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -26,17 +26,60 @@
    "login.serverLogout" : "La tua sessione è scaduta, accedi nuovamente.",
    "login.submit.label" : "Accedi",
    "login.tokenExpired" : "La tua sessione è scaduta, accedi nuovamente.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Impostazioni",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Modifica",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Elimina",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Informativa sulla Privacy",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Indirizzo email",
    "password.headline" : "Reimposta password",
    "password.link.login" : "Accedi al tuo account",
    "password.link.signup" : "Crea un account gratuito",
    "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo e-mail",
    "password.submit.label" : "Invia",
-   "password.successInfo" : "Controlla la tua email",
-   "pricing.headline" : "Supporta Franz",
-   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
+   "password.successInfo" : "Please check your email",
+   "pricing.headline" : "Support Franz",
+   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz.",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
-   "pricing.support.label" : "Seleziona il tuo piano di supporto",
+   "pricing.support.label" : "Select your support plan",
    "service.crashHandler.action" : "Ricarica {name}",
    "service.crashHandler.autoReload" : "Tentativo di ripristino automatico di {name} in {seconds} secondi",
    "service.crashHandler.headline" : "Oh no!",
@@ -44,8 +87,8 @@
    "service.disabledHandler.action" : "Attiva {name}",
    "service.disabledHandler.headline" : "{name} è disattivato",
    "services.getStarted" : "Iniziamo",
-   "services.welcome" : "Benvenuto in Franz",
-   "settings.account.account.editButton" : "Modifica account",
+   "services.welcome" : "Welcome to Franz",
+   "settings.account.account.editButton" : "Edit account",
    "settings.account.accountType.basic" : "Account Basic",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Aggiorna profilo",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Attiva notifiche",
    "tabs.item.enableService" : "Attiva servizio",
    "tabs.item.reload" : "Aggiorna",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Accedi al tuo account",
    "welcome.signupButton" : "Crea un account gratuito",
    "welcome.slogan" : "Un sistema di messaggistica che funziona"
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 9fc0a211b..0634a8fc8 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "セッションの期限が切れました。ログインし直して下さい。",
    "login.submit.label" : "サインイン",
    "login.tokenExpired" : "セッションの期限が切れました。ログインし直して下さい。",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "設定",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "編集",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "削除",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "プライバシーについて",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "メールアドレス",
    "password.headline" : "パスワードのリセット",
    "password.link.login" : "サインイン",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "通知を有効にする",
    "tabs.item.enableService" : "サービスを有効にする",
    "tabs.item.reload" : "再読み込み",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "アカウントにログイン",
    "welcome.signupButton" : "無料アカウントを作成",
    "welcome.slogan" : "Messaging that works for you"
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 67e81e12b..8eb0fff56 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
    "login.submit.label" : "შესვლა",
    "login.tokenExpired" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "პარამეტრები",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "რედაქტირება",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Delete",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "კონფიდენციალურობის შესახებ",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "მეილი",
    "password.headline" : "პაროლის აღდგენა",
    "password.link.login" : "შედით თქვენს ანგარიშში",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "შეტყობინებების ჩართვა",
    "tabs.item.enableService" : "სერვისის ჩართვა",
    "tabs.item.reload" : "ჩატვირთვა",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "შედით თქვენს ანგარიშში",
    "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა",
    "welcome.slogan" : "შეტყობინების აპლიკაცია, რომელიც მუშაობს შენთვის"
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index dab23f607..fe0135a14 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "login.submit.label" : "Log in",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Instellingen",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Aanpassen",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Delete",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Privacyverklaring",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord resetten",
    "password.link.login" : "Log in op je account",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Notificaties inschakelen",
    "tabs.item.enableService" : "Service aanzetten",
    "tabs.item.reload" : "Herladen",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Inloggen op je account",
    "welcome.signupButton" : "Maak een gratis account aan",
    "welcome.slogan" : "Messaging that works for you"
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index e2b14ceab..ac436fc54 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "De sessie is verlopen, log alsjeblieft opnieuw in.",
    "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Instellingen",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Bewerk",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Verwijderen",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Privacy Voorwaarden",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord vergeten",
    "password.link.login" : "Log in op je account",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Meldingen inschakelen",
    "tabs.item.enableService" : "Service inschakelen",
    "tabs.item.reload" : "Laad opnieuw",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Log in op je account",
    "welcome.signupButton" : "Maak een gratis account",
    "welcome.slogan" : "Messaging die voor jou werkt"
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 95e269ea7..74ffbe231 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "Imię",
    "invite.skip.label" : "Chcę to zrobić później",
    "invite.submit.label" : "Wyślij zaproszenia",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Zaproszenia zostały wysłane",
    "login.email.label" : "Adres email",
    "login.headline" : "Zaloguj się",
    "login.invalidCredentials" : "Adres email lub hasło są błędne",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
    "login.submit.label" : "Zaloguj się",
    "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Ustawienia",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Edytuj",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Usuń",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Polityka prywatności",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Adres email",
    "password.headline" : "Wyzeruj hasło",
    "password.link.login" : "Zaloguj się na swoje konto",
@@ -41,7 +84,7 @@
    "service.crashHandler.autoReload" : "Próba automatycznego odnowienia {name} za {seconds} sekund\/y",
    "service.crashHandler.headline" : "O nie!",
    "service.crashHandler.text" : "{name} spowodował problem.",
-   "service.disabledHandler.action" : "Dost��pny {name}",
+   "service.disabledHandler.action" : "Wł��cz {name}",
    "service.disabledHandler.headline" : "{name} jest wyłączony",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
@@ -65,18 +108,18 @@
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
    "settings.app.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
    "settings.app.buttonSearchForUpdate" : "Sprawdź aktualizacje",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
    "settings.app.currentVersion" : "Aktualna wersja:",
    "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
    "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na początku",
    "settings.app.form.beta" : "Uwzględnij wersje beta",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableMenuBar" : "Pokaż Franz na pasku menu",
    "settings.app.form.enableSpellchecking" : "Włącz sprawdzanie pisowni",
    "settings.app.form.enableSystemTray" : "Pokaż Franza w tacy systemowej",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Ukrywaj ikonę Franz w zasobniku systemowym",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
@@ -89,15 +132,15 @@
    "settings.app.headlineLanguage" : "Język",
    "settings.app.headlineUpdates" : "Aktualizacje",
    "settings.app.restartRequired" : "Zmiany. wymagają ponownego uruchomienia",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Pamięć podręczna",
    "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
    "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
    "settings.app.updateStatusSearching" : "Szukam aktualizacji",
    "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Zaproś znajomych",
    "settings.navigation.account" : "Konto",
    "settings.navigation.availableServices" : "Dostępne usługi",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Zaproś znajomych",
    "settings.navigation.logout" : "Wyloguj",
    "settings.navigation.settings" : "Ustawienia",
    "settings.navigation.yourServices" : "Twoje usługi",
@@ -108,7 +151,7 @@
    "settings.recipes.mostPopular" : "Najpopularniejsze",
    "settings.recipes.nothingFound" : "Żadna usługa nie została znaleziona.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usługa została dodana pomyślnie",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Wyszukaj serwis",
    "settings.service.error.goBack" : "Wróć do usług",
    "settings.service.error.headline" : "Błąd",
    "settings.service.error.message" : "Nie można wczytać przepisu usługi.",
@@ -121,15 +164,15 @@
    "settings.service.form.deleteButton" : "Usuń usługę",
    "settings.service.form.editServiceHeadline" : "Edytuj {name}",
    "settings.service.form.enableAudio" : "Włącz dźwięk",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Pokaż znacznik nieprzeczytanych wiadomości",
    "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
    "settings.service.form.enableService" : "Aktywuj usługę",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Znaczniki nieprzeczytanych wiadomości",
    "settings.service.form.headlineGeneral" : "Ogólne",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Powiadomienia",
+   "settings.service.form.icon" : "Własna ikona",
+   "settings.service.form.iconDelete" : "Usuń",
+   "settings.service.form.iconUpload" : "Przeciągnij i upuść obraz lub kliknij tutaj",
    "settings.service.form.indirectMessageInfo" : "Będziesz informowany o wszystkich nowych wiadomościach na kanale, nie tylko @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
    "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Włącz powiadomienia",
    "tabs.item.enableService" : "Aktywuj usługę",
    "tabs.item.reload" : "Przeładuj",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Zaloguj się na swoje konto",
    "welcome.signupButton" : "Stwórz darmowe konto",
    "welcome.slogan" : "Komunikator który działa"
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index acdf38f8d..6ba448999 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,5 +1,5 @@
 {
-   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços do Franz",
+   "global.api.unhealthy" : "Não foi possível conectar aos serviços do Franz",
    "global.notConnectedToTheInternet" : "Você não está conectado à internet.",
    "import.headline" : "Importe seus serviços do Franz 4",
    "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Sua sessão expirou, faça o login novamente.",
    "login.submit.label" : "Entrar",
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Ajustes",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Editar",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Excluir",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Declaração de privacidade",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Endereço de e-mail",
    "password.headline" : "Trocar a senha",
    "password.link.login" : "Fazer login na sua conta",
@@ -197,7 +240,11 @@
    "tabs.item.enableNotification" : "Ativar notificações",
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Entrar na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
-   "welcome.slogan" : "Mensageria que funciona, para você"
+   "welcome.slogan" : "Mensagens que funcionam para você"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index fb08ebd2a..9e6d6ac94 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,112 +1,155 @@
 {
-   "global.api.unhealthy" : "Não foi possível conectar aos serviços do Franz",
-   "global.notConnectedToTheInternet" : "Não estás conectado à internet.",
-   "import.headline" : "Importar os teus serviços do Franz 4",
-   "import.notSupportedHeadline" : "Os serviços não são suportados no Franz 5",
+   "global.api.unhealthy" : "Não foi possível conetar aos serviços do Franz",
+   "global.notConnectedToTheInternet" : "Não existe ligação à Internet.",
+   "import.headline" : "Importe os seus serviços do Franz 4",
+   "import.notSupportedHeadline" : "Serviços ainda não são suportados pelo Franz 5",
    "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "Novidades?",
    "infobar.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "infobar.buttonReloadServices" : "Recarregar serviços",
    "infobar.requiredRequestsFailed" : "Não foi possivel carregar os serviços e informações do utilizador",
-   "infobar.servicesUpdated" : "Os teus serviços foram atualizados",
-   "infobar.updateAvailable" : "Uma atualização está disponível",
+   "infobar.servicesUpdated" : "Os seus serviços foram atualizados.",
+   "infobar.updateAvailable" : "Está disponível uma atualização",
    "invite.email.label" : "Endereço de e-mail",
-   "invite.headline.friends" : "Manda 3 convites aos teus amigos ou colegas",
+   "invite.headline.friends" : "Convide 3 amigos ou colegas",
    "invite.name.label" : "Nome",
-   "invite.skip.label" : "Quero adicionar mais tarde",
-   "invite.submit.label" : "Mandar convites",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.skip.label" : "Quero fazer isto mais tarde",
+   "invite.submit.label" : "Enviar convites",
+   "invite.successInfo" : "Convites enviados com sucesso",
    "login.email.label" : "Endereço de e-mail",
    "login.headline" : "Registar",
-   "login.invalidCredentials" : " O email ou a password estão incorretos",
-   "login.link.password" : "Repor a minha password",
+   "login.invalidCredentials" : "O email ou a palavra-passe estão incorretos",
+   "login.link.password" : "Repor a minha palavra-passe",
    "login.link.signup" : "Criar uma conta gratuita",
-   "login.password.label" : "Password",
-   "login.serverLogout" : "A tua sessão expirou, por favor, volta a fazer login.",
-   "login.submit.label" : "Iniciar Sessão",
-   "login.tokenExpired" : "A tua sessão expirou, por favor, volta a fazer login.",
+   "login.password.label" : "Palavra-passe",
+   "login.serverLogout" : "A sua sessão expirou, inicie sessão novamente.",
+   "login.submit.label" : "Iniciar sessão",
+   "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Definições",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Editar",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Apagar",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Declaração de privacidade",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Endereço de e-mail",
-   "password.headline" : "Repor a minha password",
-   "password.link.login" : "Fazer login",
+   "password.headline" : "Repor a minha palavra-passe",
+   "password.link.login" : "Iniciar sessão",
    "password.link.signup" : "Criar uma conta gratuita",
    "password.noUser" : "Não existe nenhuma conta associada a esse email",
    "password.submit.label" : "Submeter",
-   "password.successInfo" : "Por favor, revê o teu email",
-   "pricing.headline" : "Apoia o Franz",
-   "pricing.link.skipPayment" : "Não quero ajudar no desenvolvimento do Franz",
-   "pricing.submit.label" : "Quero ajudar o desenvolvimento do Franz",
-   "pricing.support.label" : "Seleciona o teu plano",
-   "service.crashHandler.action" : "Actualizar",
-   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} seconds",
+   "password.successInfo" : "Por favor reveja o seu email",
+   "pricing.headline" : "Apoie o Franz",
+   "pricing.link.skipPayment" : "Não pretendo ajudar no desenvolvimento do Franz",
+   "pricing.submit.label" : "Pretendo ajudar no desenvolvimento do Franz",
+   "pricing.support.label" : "Selecione o seu plano",
+   "service.crashHandler.action" : "Recarregar",
+   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} segundos",
    "service.crashHandler.headline" : "Oh não!",
    "service.crashHandler.text" : "{name} causou um erro.",
-   "service.disabledHandler.action" : "Habilitar {name}",
-   "service.disabledHandler.headline" : "{name} está desactivado",
+   "service.disabledHandler.action" : "Ativar {name}",
+   "service.disabledHandler.headline" : "{name} está desativado",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
    "settings.account.accountType.basic" : "Conta básica",
-   "settings.account.accountType.premium" : "Conta Premium, a ajudar o Franz",
+   "settings.account.accountType.premium" : "Conta Premium",
    "settings.account.buttonSave" : "Atualizar o perfil",
    "settings.account.deleteAccount" : "Apagar conta",
-   "settings.account.deleteEmailSent" : "Recebeu um email com um endereço para confirmar a remoção da sua conta. A sua conta e dados não são possiveis de restaurar!",
-   "settings.account.deleteInfo" : "Se não precisa mais da sua conta Franz, pode apagar a conta e os seus dados aqui.",
+   "settings.account.deleteEmailSent" : "Recebeu um email com um endereço para confirmar a remoção da sua conta. A sua conta e dados não poderão ser restaurados!",
+   "settings.account.deleteInfo" : "Se não necessita mais da sua conta Franz, pode apagar a sua conta e dados aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informação da conta",
    "settings.account.headlineDangerZone" : "Zona de perigo",
    "settings.account.headlineInvoices" : "Faturas",
-   "settings.account.headlinePassword" : "Mudar password",
-   "settings.account.headlineProfile" : "Actualizar o perfil",
-   "settings.account.headlineSubscription" : "A tua subscrição",
-   "settings.account.headlineUpgrade" : "Atualiza a tua conta e ajuda o Franz",
-   "settings.account.invoiceDownload" : "Descarregar",
+   "settings.account.headlinePassword" : "Alterar palavra-passe",
+   "settings.account.headlineProfile" : "Atualizar perfil",
+   "settings.account.headlineSubscription" : "A sua subscrição",
+   "settings.account.headlineUpgrade" : "Atualize a sua conta e ajude o Franz",
+   "settings.account.invoiceDownload" : "Transferir",
    "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
-   "settings.account.successInfo" : "As tuas mudanças foram feitas com sucesso",
+   "settings.account.successInfo" : "As suas mudanças foram efetuadas com sucesso",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
-   "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador.",
-   "settings.app.buttonClearAllCache" : "Limpar a 'cache'",
+   "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
+   "settings.app.buttonClearAllCache" : "Limpar cache",
    "settings.app.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "settings.app.buttonSearchForUpdate" : "Procurar por atualizações",
-   "settings.app.cacheInfo" : "O 'chache' do Franz está a usar {size} do espaço do disco.",
+   "settings.app.cacheInfo" : "A cache do Franz está a usar {size} do espaço em disco.",
    "settings.app.currentVersion" : "Versão atual",
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Inicar o Franz quando inciar o computador",
+   "settings.app.form.autoLaunchOnStart" : "Iniciar o Franz com o início de sessão",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
-   "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.enableSystemTray" : "Mostrar o Franz na barra do sistema",
+   "settings.app.form.hideDockIcon" : "Esconder ícone na Dock",
    "settings.app.form.language" : "Idioma:",
-   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a barra do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
-   "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desactivados",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar icon com o número de mensagens não lidas quando as notificações estão desactivadas",
+   "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desativados",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desactivadas",
    "settings.app.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma:",
    "settings.app.headlineUpdates" : "Atualizações",
-   "settings.app.restartRequired" : "Alterações requerem reiniciar",
+   "settings.app.restartRequired" : "Alterações requerem reinício",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Ajude a traduzir a Franz para a sua língua. ",
-   "settings.app.updateStatusAvailable" : "Atualização disponivel, a descarregar...",
-   "settings.app.updateStatusSearching" : "Está a procurar atualizações",
-   "settings.app.updateStatusUpToDate" : "Estás a usar a última versão do Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.app.translationHelp" : "Ajude-nos a traduzir a Franz para a sua língua.",
+   "settings.app.updateStatusAvailable" : "Atualização disponivel, a transferir...",
+   "settings.app.updateStatusSearching" : "Procurando por atualizações",
+   "settings.app.updateStatusUpToDate" : "Está a usar a versão mais recente do Franz",
+   "settings.invite.headline" : "Convide amigos",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.inviteFriends" : "Invite Friends",
-   "settings.navigation.logout" : "Terminar Sessão",
+   "settings.navigation.inviteFriends" : "Convide amigos",
+   "settings.navigation.logout" : "Terminar sessão",
    "settings.navigation.settings" : "Definições",
-   "settings.navigation.yourServices" : "Os teus serviços",
+   "settings.navigation.yourServices" : "Os seus serviços",
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
    "settings.recipes.missingService" : "A faltar um serviço?",
    "settings.recipes.mostPopular" : "Os mais populares",
-   "settings.recipes.nothingFound" : "Desculpa, mas não existe nenhum serviço com este termo.",
+   "settings.recipes.nothingFound" : "Lamentamos, mas não existe nenhum serviço corresponde ao pesquisado.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
    "settings.searchService" : "Pesquisa de serviço",
    "settings.service.error.goBack" : "Voltar aos serviços",
@@ -115,89 +158,93 @@
    "settings.service.form.addServiceHeadline" : "Adicionar {name}",
    "settings.service.form.availableServices" : "Serviços disponíveis",
    "settings.service.form.customUrl" : "Servidor personalizado",
-   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços de hospedagem própria, precisas de uma Conta Premium Franz.",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços com domínio próprio, é necessário uma Conta Premium.",
    "settings.service.form.customUrlUpgradeAccount" : "Atualizar a conta",
    "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor {nome}.",
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
-   "settings.service.form.enableAudio" : "Activar áudio",
+   "settings.service.form.enableAudio" : "Ativar áudio",
    "settings.service.form.enableBadge" : "Mostrar emblema de mensagens não vistas",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
    "settings.service.form.headlineBadges" : "Emblema de mensagem não vista",
    "settings.service.form.headlineGeneral" : "Geral",
    "settings.service.form.headlineNotifications" : "Notificações",
-   "settings.service.form.icon" : "Icon personaliz��vel",
+   "settings.service.form.icon" : "Personalizar ��cone",
    "settings.service.form.iconDelete" : "Apagar",
    "settings.service.form.iconUpload" : "Arraste a sua imagem, ou clique aqui",
-   "settings.service.form.indirectMessageInfo" : "Serás notificado sobre todas as novas mensagens de um canal, não só @username, @channel, @here, ...",
+   "settings.service.form.indirectMessageInfo" : "Será notificado sobre todas as novas mensagens de um canal, não apenas @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
-   "settings.service.form.isMutedInfo" : "Quando desactivado, todo o audio das notificações estará em silêncio",
+   "settings.service.form.isMutedInfo" : "Quando desativado, todas as notificações de áudio serão silenciadas",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Guardar serviço",
-   "settings.service.form.tabHosted" : "Hospedado",
-   "settings.service.form.tabOnPremise" : "Hospedado por si próprio ⭐️",
+   "settings.service.form.tabHosted" : "Com domínio",
+   "settings.service.form.tabOnPremise" : "Com domínio próprio ⭐️",
    "settings.service.form.team" : "Equipa",
    "settings.service.form.useHostedService" : "Utilize o serviço oferecido por {name}.",
-   "settings.service.form.yourServices" : "Os teus serviços",
+   "settings.service.form.yourServices" : "Os seus serviços",
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
-   "settings.services.headline" : "Os teus serviços",
-   "settings.services.noServicesAdded" : "Ainda não adicionaste nenhum serviço.",
+   "settings.services.headline" : "Os seus serviços",
+   "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
-   "settings.services.tooltip.notificationsDisabled" : "As notificações estão desabilitadas",
+   "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
    "settings.services.updatedInfo" : "As alterações foram guardadas",
    "settings.user.form.accountType.company" : "Empresa",
-   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.individual" : "Indivíduo",
    "settings.user.form.accountType.label" : "Tipo de conta",
    "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
-   "settings.user.form.currentPassword" : "Password atual",
+   "settings.user.form.currentPassword" : "Palavra-passe atual",
    "settings.user.form.email" : "Email",
    "settings.user.form.firstname" : "Primeiro Nome",
    "settings.user.form.lastname" : "Último Nome",
-   "settings.user.form.newPassword" : "Nova password",
+   "settings.user.form.newPassword" : "Nova palavra-passe",
    "sidebar.addNewService" : "Adicionar um novo serviço",
-   "sidebar.muteApp" : "Desactivar notificações e audio",
+   "sidebar.muteApp" : "Desativar notificações e áudio",
    "sidebar.settings" : "Definições",
-   "sidebar.unmuteApp" : "Activar notificações e audio",
+   "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Endereço de e-mail",
-   "signup.emailDuplicate" : "Uma conta já tem esse email associado",
+   "signup.emailDuplicate" : "Já existe uma conta associada a este endereço",
    "signup.firstname.label" : "Primeiro Nome",
-   "signup.headline" : "Iniciar Sessão",
+   "signup.headline" : "Criar conta",
    "signup.lastname.label" : "Último Nome",
-   "signup.legal.info" : "Ao criar uma conta Franz, aceitas",
+   "signup.legal.info" : "Ao criar uma conta Franz, aceita",
    "signup.legal.privacy" : "Declaração de privacidade",
    "signup.legal.terms" : "Termos de Serviço",
-   "signup.link.login" : "Já tens uma conta?",
-   "signup.password.label" : "Password",
-   "signup.submit.label" : "Criar uma Conta",
+   "signup.link.login" : "Já tem conta, iniciar sessão?",
+   "signup.password.label" : "Palavra-passe",
+   "signup.submit.label" : "Criar uma conta",
    "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "Em breve!",
-   "subscription.features.customServices" : "Serviços privados para ti e para os teus amigos\/colegas",
+   "subscription.features.customServices" : "Serviços privados para si e para a sua equipa",
    "subscription.features.encryptedSync" : "Sincronização encriptada de serviços",
    "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
    "subscription.features.vpn" : "Suporte para proxy\/VPN",
-   "subscription.includedFeatures" : "Ao pagares para o Franz Premium, tens acesso a",
+   "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
-   "subscription.submit.label" : "Quero ajudar o desenvolvimento do Franz",
+   "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
    "subscription.type.free" : "Gratuito",
    "subscription.type.month" : "mês",
    "subscription.type.year" : "ano",
    "subscriptionPopup.buttonCancel" : "Cancelar",
    "subscriptionPopup.buttonDone" : "Concluído",
    "tabs.item.deleteService" : "Apagar serviço",
-   "tabs.item.disableAudio" : "Desactivar audio",
+   "tabs.item.disableAudio" : "Desativar áudio",
    "tabs.item.disableNotifications" : "Desativar notificações",
    "tabs.item.disableService" : "Desativar serviço",
    "tabs.item.edit" : "Editar",
-   "tabs.item.enableAudio" : "Activar áudio",
+   "tabs.item.enableAudio" : "Ativar áudio",
    "tabs.item.enableNotification" : "Ativar notificações",
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
-   "welcome.loginButton" : "Fazer login",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
+   "welcome.loginButton" : "Iniciar sessão",
    "welcome.signupButton" : "Criar uma conta gratuita",
    "welcome.slogan" : "Messaging that works for you"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 65b61c1e5..4d9f7f274 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -26,13 +26,56 @@
    "login.serverLogout" : "Сессия устарела, пожалуйста, войдите снова.",
    "login.submit.label" : "Вход",
    "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Настройки",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Редактировать",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Удалить",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Политика конфиденциальности",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Email адрес",
-   "password.headline" : "������ст��н����лен��е парол��",
+   "password.headline" : "������осить парол��",
    "password.link.login" : "Вход",
-   "password.link.signup" : "Создать а����������т",
+   "password.link.signup" : "Создать учёт��ую з������сь ��ол����ователя",
    "password.noUser" : "Не найдено пользователя с таким email",
-   "password.submit.label" : "��о��ст��новить",
-   "password.successInfo" : "Проверьте Ваш email",
+   "password.submit.label" : "������н����ь",
+   "password.successInfo" : "Проверьте Вашу электронную почту",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
    "pricing.submit.label" : "Я хочу поддержать разработку Franz",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Включить уведомления",
    "tabs.item.enableService" : "Включить службу",
    "tabs.item.reload" : "Перезагрузить",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Вход",
    "welcome.signupButton" : "Создать аккаунт",
    "welcome.slogan" : "Общение, которое просто работает"
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 35f06531f..87c1acebc 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Relácia vypršala, prihláste sa prosím znova.",
    "login.submit.label" : "Prihlásiť sa",
    "login.tokenExpired" : "Relácia vypršala, prosím prihláste sa znova.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Nastavenia",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Upraviť",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Zmazať",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Vyhlásenie o ochrane súkromia",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Emailová adresa",
    "password.headline" : "Vynulovať heslo",
    "password.link.login" : "Prihlásenie do vašeho účtu",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Povoliť oznámenia",
    "tabs.item.enableService" : "Povoliť službu",
    "tabs.item.reload" : "Obnoviť",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Prihláste sa k vášmu účtu",
    "welcome.signupButton" : "Vytvoriť užívateľský účet zdarma",
    "welcome.slogan" : "Správy, ktoré pracujú pre vás"
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 90e1a04b9..d93712d88 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Postavke",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Uredi",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Delete",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Izjava o privatnosti",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš račun",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Omogući obavijesti",
    "tabs.item.enableService" : "Omogući usluge",
    "tabs.item.reload" : "Ponovno učitavanje",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Prijavite se na račun",
    "welcome.signupButton" : "Stvorite novi korisnički račun",
    "welcome.slogan" : "Poruke koje su stvorene za tebe"
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index bcf0dd483..96738d462 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "Ad",
    "invite.skip.label" : "Daha sonra yapmak istiyorum",
    "invite.submit.label" : "Davetiye gönder",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Davetiyeler başarıyla gönderildi",
    "login.email.label" : "E-posta adresi",
    "login.headline" : "Oturum Aç",
    "login.invalidCredentials" : "Yanlış parola ya da e-posta adresi",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
    "login.submit.label" : "Oturum Aç",
    "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Ayarlar",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Düzenle",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Sil",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Gizlilik Sözleşmesi",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "E-posta adresi",
    "password.headline" : "Parola sıfırla",
    "password.link.login" : "Hesabına giriş yap",
@@ -73,10 +116,10 @@
    "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
    "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
    "settings.app.form.beta" : "Beta versiyonları dahil et",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableMenuBar" : "Menü çubuğunda Franz'ı göster",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
+   "settings.app.form.hideDockIcon" : "Franz Simgesini Gösterme",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
@@ -94,10 +137,10 @@
    "settings.app.updateStatusAvailable" : "Güncelleme mevcut, indiriliyor...",
    "settings.app.updateStatusSearching" : "Güncellemeleri denetliyor",
    "settings.app.updateStatusUpToDate" : "Franz'ın son versiyonunu kullanıyorsun",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Arkadaşlarını davet et",
    "settings.navigation.account" : "Hesap",
    "settings.navigation.availableServices" : "Mevcut servisler",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Arkadaşlarını Davet Et",
    "settings.navigation.logout" : "Çıkış",
    "settings.navigation.settings" : "Ayarlar",
    "settings.navigation.yourServices" : "Servislerin",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Bildirimleri etkinleştir",
    "tabs.item.enableService" : "Servisi etkinleştir",
    "tabs.item.reload" : "Yeniden Yükle",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Hesabına giriş yap",
    "welcome.signupButton" : "Ücretsiz hesap oluştur",
    "welcome.slogan" : "Sizin için çalışan mesajlaşma"
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 4baf234ac..f7c946436 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -16,7 +16,7 @@
    "invite.name.label" : "Ім'я",
    "invite.skip.label" : "Я хочу зробити це пізніше",
    "invite.submit.label" : "Відправити запрошення",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "Запрошення успішно відослані",
    "login.email.label" : "Email адреса",
    "login.headline" : "Увійти",
    "login.invalidCredentials" : "Email або пароль некоректні",
@@ -26,6 +26,49 @@
    "login.serverLogout" : "Ваша сесія закінчилась, будь ласка, зайдіть знову.",
    "login.submit.label" : "Увійти",
    "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, зайдіть знову.",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "Налаштування",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "Редагувати",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Видалити",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "Заява про конфіденційність",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "Email адреса",
    "password.headline" : "Скинути пароль",
    "password.link.login" : "Увійти до вашого акаунту",
@@ -50,7 +93,7 @@
    "settings.account.accountType.premium" : "Преміум Акаунт Прихильника",
    "settings.account.buttonSave" : "Оновити профіль",
    "settings.account.deleteAccount" : "Видалити обліковий запис",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+   "settings.account.deleteEmailSent" : "Ви отримали електронного листа з лінком, щоб підтвердити видалення облікового запису. Ваш обліковий запис і дані не можна буде відновити!",
    "settings.account.deleteInfo" : "Якщо Вам більше не потрібний обліковий запис Franz, Ви можете його видалити і всі суміжні дані.",
    "settings.account.headline" : "Акаунт",
    "settings.account.headlineAccount" : "Інформація про акаунт",
@@ -65,22 +108,22 @@
    "settings.account.successInfo" : "Ваші зміни були збережені",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "Не вдалося завантажити інформацію користувача",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Очистити кеш",
    "settings.app.buttonInstallUpdate" : "Перезавантажити і встановити оновлення",
    "settings.app.buttonSearchForUpdate" : "Перевірити наявність оновлень",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Кеш, який використовує Franz, займає {розмір} диску.",
    "settings.app.currentVersion" : "Поточна версія:",
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запускати Franz на початку",
    "settings.app.form.beta" : "Включити бета-версії",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
+   "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
    "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
    "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до системного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених сервісів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
    "settings.app.headline" : "Налаштування",
    "settings.app.headlineAdvanced" : "Advanced",
@@ -89,15 +132,15 @@
    "settings.app.headlineLanguage" : "Мова",
    "settings.app.headlineUpdates" : "Оновлення",
    "settings.app.restartRequired" : "Зміни потребують перезапуску",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Кеш",
    "settings.app.translationHelp" : "Допоможіть перекласти Franz на Вашу мову.",
    "settings.app.updateStatusAvailable" : "Оновлення доступне, завантаження...",
    "settings.app.updateStatusSearching" : "Шукає оновлення",
    "settings.app.updateStatusUpToDate" : "Ви використовуєте останню версію Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Запросити друзів",
    "settings.navigation.account" : "Акаунт",
    "settings.navigation.availableServices" : "Доступні сервіси",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Запросити друзів",
    "settings.navigation.logout" : "Вийти",
    "settings.navigation.settings" : "Налаштування",
    "settings.navigation.yourServices" : "Ваші сервіси",
@@ -126,10 +169,10 @@
    "settings.service.form.enableService" : "Увімкнути сервіс",
    "settings.service.form.headlineBadges" : "Unread message badges",
    "settings.service.form.headlineGeneral" : "Загальні",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Сповіщення",
+   "settings.service.form.icon" : "Своя іконка",
+   "settings.service.form.iconDelete" : "Видалити",
+   "settings.service.form.iconUpload" : "Скиньте своє зображення або натисніть тут",
    "settings.service.form.indirectMessageInfo" : "Ви отримаєте сповіщення про всі нові повідомлення в каналі, а не лише про @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показувати значок повідомлення для всіх нових повідомлень",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "Увімкнути сповіщення",
    "tabs.item.enableService" : "Увімкнути службу",
    "tabs.item.reload" : "Перезавантажити",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Увійдіть до свого акаунту",
    "welcome.signupButton" : "Створити безплатний акаунт",
    "welcome.slogan" : "Обмін повідомленнями, який працює для вас"
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 5feef50f2..71e6d65bc 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -26,6 +26,49 @@
    "login.serverLogout" : "您的登入期間已過期，請重新登錄",
    "login.submit.label" : "登入",
    "login.tokenExpired" : "您的登入已過期，請重新登入。",
+   "menu.app.about" : "About Franz",
+   "menu.app.hide" : "Hide",
+   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.quit" : "Quit",
+   "menu.app.settings" : "設定",
+   "menu.app.unhide" : "Unhide",
+   "menu.edit" : "編輯",
+   "menu.edit.copy" : "Copy",
+   "menu.edit.cut" : "Cut",
+   "menu.edit.delete" : "Delete",
+   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.paste" : "Paste",
+   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.redo" : "Redo",
+   "menu.edit.selectAll" : "Select All",
+   "menu.edit.speech" : "Speech",
+   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.undo" : "Undo",
+   "menu.file" : "File",
+   "menu.help" : "Help",
+   "menu.help.changelog" : "Changelog",
+   "menu.help.learnMore" : "Learn More",
+   "menu.help.privacy" : "隱私聲明",
+   "menu.help.support" : "Support",
+   "menu.help.tos" : "Terms of Service",
+   "menu.services" : "Services",
+   "menu.services.addNewService" : "Add New Service...",
+   "menu.view" : "View",
+   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadService" : "Reload Service",
+   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomOut" : "Zoom Out",
+   "menu.window" : "Window",
+   "menu.window.close" : "Close",
+   "menu.window.minimize" : "Minimize",
    "password.email.label" : "電子郵件地址",
    "password.headline" : "重設密碼",
    "password.link.login" : "登入您的帳號",
@@ -197,6 +240,10 @@
    "tabs.item.enableNotification" : "啟用通知",
    "tabs.item.enableService" : "啟用服務",
    "tabs.item.reload" : "重新載入",
+   "validation.email" : "{field} is not valid",
+   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.required" : "{field} is required",
+   "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "登入您的帳戶",
    "welcome.signupButton" : "建立免費帳號",
    "welcome.slogan" : "為你通信"
diff --git a/src/index.html b/src/index.html
index 9e5acd705..5ce7f6a96 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,10 +11,15 @@
   <div class="dev-warning">DEV MODE</div>
   <div id="root"></div>
   <script>
-    document.querySelector('body').classList.add(process.platform);
+    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
 
     const { isDevMode } = require('./environment');
     if (isDevMode) {
+      const debugging = require('debug');
+      debugging.enable(process.env.DEBUG);
+      
+      const debug = debugging('Index');
+
       document.querySelector('body').classList.add('isDevMode');
 
       (function() {
@@ -25,7 +30,7 @@
         document.body.appendChild(s);
 
         s.onload = () => {
-          console.log('livereload loaded');
+          debug('livereload loaded');
           const originalReloadBehaviour = window._onLiveReloadFileChanged;
 
           window._onLiveReloadFileChanged = (file) => {
@@ -33,10 +38,10 @@
               originalReloadBehaviour(file);
             } else {              
               if (file.path.includes('/build/webview/')) {
-                console.log('Livereload: Reloading all webvies');
+                debug('Livereload: Reloading all webvies');
                 const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload());
               } else {
-                console.log('Livereload: skip reload as only main process files have changed');
+                debug('Livereload: skip reload as only main process files have changed');
               }
             }
           }
diff --git a/src/index.js b/src/index.js
index f82bb3590..897943a85 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import path from 'path';
 
 import windowStateKeeper from 'electron-window-state';
 
-import { isDevMode, isWindows } from './environment';
+import { isDevMode, isMac, isWindows, isLinux } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -18,8 +18,8 @@ let mainWindow;
 let willQuitApp = false;
 
 // Ensure that the recipe directory exists
-fs.ensureDir(path.join(app.getPath('userData'), 'recipes'));
 fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
+fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
 
 // Set App ID for Windows
 if (isWindows) {
@@ -48,11 +48,11 @@ if (isSecondInstance) {
   app.exit();
 }
 
-// Lets disable Hardware Acceleration until we have a better solution
-// to deal with the high-perf-gpu requirement of some services
-
-// Disabled to test tweetdeck glitches
-// app.disableHardwareAcceleration();
+// Fix Unity indicator issue
+// https://github.com/electron/electron/issues/9046
+if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
+  process.env.XDG_CURRENT_DESKTOP = 'Unity';
+}
 
 // Initialize Settings
 const settings = new Settings();
@@ -72,9 +72,9 @@ const createWindow = () => {
     height: mainWindowState.height,
     minWidth: 600,
     minHeight: 500,
-    titleBarStyle: 'hidden',
+    titleBarStyle: isMac ? 'hidden' : '',
+    frame: isLinux,
     backgroundColor: '#3498db',
-    autoHideMenuBar: true,
   });
 
   // Initialize System Tray
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 16e91374e..5a05e47b3 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,113 +1,477 @@
 import { remote, shell } from 'electron';
-import { autorun, computed, observable, toJS } from 'mobx';
+import { observable, autorun, computed } from 'mobx';
+import { defineMessages } from 'react-intl';
 
-import { isMac } from '../environment';
+import { isMac, ctrlKey, cmdKey } from '../environment';
 
 const { app, Menu, dialog } = remote;
 
-const template = [
+const menuItems = defineMessages({
+  edit: {
+    id: 'menu.edit',
+    defaultMessage: '!!!Edit',
+  },
+  undo: {
+    id: 'menu.edit.undo',
+    defaultMessage: '!!!Undo',
+  },
+  redo: {
+    id: 'menu.edit.redo',
+    defaultMessage: '!!!Redo',
+  },
+  cut: {
+    id: 'menu.edit.cut',
+    defaultMessage: '!!!Cut',
+  },
+  copy: {
+    id: 'menu.edit.copy',
+    defaultMessage: '!!!Copy',
+  },
+  paste: {
+    id: 'menu.edit.paste',
+    defaultMessage: '!!!Paste',
+  },
+  pasteAndMatchStyle: {
+    id: 'menu.edit.pasteAndMatchStyle',
+    defaultMessage: '!!!Paste And Match Style',
+  },
+  delete: {
+    id: 'menu.edit.delete',
+    defaultMessage: '!!!Delete',
+  },
+  selectAll: {
+    id: 'menu.edit.selectAll',
+    defaultMessage: '!!!Select All',
+  },
+  speech: {
+    id: 'menu.edit.speech',
+    defaultMessage: '!!!Speech',
+  },
+  startSpeaking: {
+    id: 'menu.edit.startSpeaking',
+    defaultMessage: '!!!Start Speaking',
+  },
+  stopSpeaking: {
+    id: 'menu.edit.stopSpeaking',
+    defaultMessage: '!!!Stop Speaking',
+  },
+  startDictation: {
+    id: 'menu.edit.startDictation',
+    defaultMessage: '!!!Start Dictation',
+  },
+  emojiSymbols: {
+    id: 'menu.edit.emojiSymbols',
+    defaultMessage: '!!!Emoji & Symbols',
+  },
+  resetZoom: {
+    id: 'menu.view.resetZoom',
+    defaultMessage: '!!!Actual Size',
+  },
+  zoomIn: {
+    id: 'menu.view.zoomIn',
+    defaultMessage: '!!!Zoom In',
+  },
+  zoomOut: {
+    id: 'menu.view.zoomOut',
+    defaultMessage: '!!!Zoom Out',
+  },
+  enterFullScreen: {
+    id: 'menu.view.enterFullScreen',
+    defaultMessage: '!!!Enter Full Screen',
+  },
+  exitFullScreen: {
+    id: 'menu.view.exitFullScreen',
+    defaultMessage: '!!!Exit Full Screen',
+  },
+  toggleFullScreen: {
+    id: 'menu.view.toggleFullScreen',
+    defaultMessage: '!!!Toggle Full Screen',
+  },
+  toggleDevTools: {
+    id: 'menu.view.toggleDevTools',
+    defaultMessage: '!!!Toggle Developer Tools',
+  },
+  toggleServiceDevTools: {
+    id: 'menu.view.toggleServiceDevTools',
+    defaultMessage: '!!!Toggle Service Developer Tools',
+  },
+  reloadService: {
+    id: 'menu.view.reloadService',
+    defaultMessage: '!!!Reload Service',
+  },
+  reloadFranz: {
+    id: 'menu.view.reloadFranz',
+    defaultMessage: '!!!Reload Franz',
+  },
+  minimize: {
+    id: 'menu.window.minimize',
+    defaultMessage: '!!!Minimize',
+  },
+  close: {
+    id: 'menu.window.close',
+    defaultMessage: '!!!Close',
+  },
+  learnMore: {
+    id: 'menu.help.learnMore',
+    defaultMessage: '!!!Learn More',
+  },
+  changelog: {
+    id: 'menu.help.changelog',
+    defaultMessage: '!!!Changelog',
+  },
+  support: {
+    id: 'menu.help.support',
+    defaultMessage: '!!!Support',
+  },
+  tos: {
+    id: 'menu.help.tos',
+    defaultMessage: '!!!Terms of Service',
+  },
+  privacy: {
+    id: 'menu.help.privacy',
+    defaultMessage: '!!!Privacy Statement',
+  },
+  file: {
+    id: 'menu.file',
+    defaultMessage: '!!!File',
+  },
+  view: {
+    id: 'menu.view',
+    defaultMessage: '!!!View',
+  },
+  services: {
+    id: 'menu.services',
+    defaultMessage: '!!!Services',
+  },
+  window: {
+    id: 'menu.window',
+    defaultMessage: '!!!Window',
+  },
+  help: {
+    id: 'menu.help',
+    defaultMessage: '!!!Help',
+  },
+  about: {
+    id: 'menu.app.about',
+    defaultMessage: '!!!About Franz',
+  },
+  settings: {
+    id: 'menu.app.settings',
+    defaultMessage: '!!!Settings',
+  },
+  hide: {
+    id: 'menu.app.hide',
+    defaultMessage: '!!!Hide',
+  },
+  hideOthers: {
+    id: 'menu.app.hideOthers',
+    defaultMessage: '!!!Hide Others',
+  },
+  unhide: {
+    id: 'menu.app.unhide',
+    defaultMessage: '!!!Unhide',
+  },
+  quit: {
+    id: 'menu.app.quit',
+    defaultMessage: '!!!Quit',
+  },
+  addNewService: {
+    id: 'menu.services.addNewService',
+    defaultMessage: '!!!Add New Service...',
+  },
+});
+
+function getActiveWebview() {
+  return window.franz.stores.services.active.webview;
+}
+
+const _templateFactory = intl => [
   {
-    label: 'Edit',
+    label: intl.formatMessage(menuItems.edit),
     submenu: [
       {
+        label: intl.formatMessage(menuItems.undo),
         role: 'undo',
       },
       {
+        label: intl.formatMessage(menuItems.redo),
         role: 'redo',
       },
       {
         type: 'separator',
       },
       {
-        role: 'cut',
+        label: intl.formatMessage(menuItems.cut),
+        accelerator: 'Cmd+X',
+        selector: 'cut:',
       },
       {
-        label: 'Copy',
-        accelerator: 'CmdOrCtrl+C',
+        label: intl.formatMessage(menuItems.copy),
+        accelerator: 'Cmd+C',
         selector: 'copy:',
       },
       {
-        label: 'Paste',
-        accelerator: 'CmdOrCtrl+V',
+        label: intl.formatMessage(menuItems.paste),
+        accelerator: 'Cmd+V',
         selector: 'paste:',
       },
       {
-        role: 'pasteandmatchstyle',
+        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
+        accelerator: 'Cmd+Shift+V',
+        selector: 'pasteAndMatchStyle:',
       },
       {
+        label: intl.formatMessage(menuItems.delete),
         role: 'delete',
       },
       {
-        role: 'selectall',
+        label: intl.formatMessage(menuItems.selectAll),
+        accelerator: 'Cmd+A',
+        selector: 'selectAll:',
       },
     ],
   },
   {
-    label: 'View',
+    label: intl.formatMessage(menuItems.view),
     submenu: [
       {
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.resetZoom),
         role: 'resetzoom',
       },
       {
+        label: intl.formatMessage(menuItems.zoomIn),
+        // accelerator: 'Cmd+=',
         role: 'zoomin',
-        accelerator: 'CommandOrControl+=',
       },
       {
+        label: intl.formatMessage(menuItems.zoomOut),
         role: 'zoomout',
       },
       {
         type: 'separator',
       },
       {
+        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
+          ? intl.formatMessage(menuItems.exitFullScreen)
+          : intl.formatMessage(menuItems.enterFullScreen),
         role: 'togglefullscreen',
       },
     ],
   },
   {
-    label: 'Services',
+    label: intl.formatMessage(menuItems.services),
     submenu: [],
   },
   {
+    label: intl.formatMessage(menuItems.window),
     role: 'window',
     submenu: [
       {
+        label: intl.formatMessage(menuItems.minimize),
         role: 'minimize',
       },
       {
+        label: intl.formatMessage(menuItems.close),
         role: 'close',
       },
     ],
   },
   {
+    label: intl.formatMessage(menuItems.help),
     role: 'help',
     submenu: [
       {
-        label: 'Learn More',
+        label: intl.formatMessage(menuItems.learnMore),
         click() { shell.openExternal('http://meetfranz.com'); },
       },
       {
-        label: 'Changelog',
+        label: intl.formatMessage(menuItems.changelog),
         click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
       },
       {
         type: 'separator',
       },
       {
-        label: 'Support',
+        label: intl.formatMessage(menuItems.support),
         click() { shell.openExternal('http://meetfranz.com/support'); },
       },
       {
         type: 'separator',
       },
       {
-        label: 'Terms of Service',
+        label: intl.formatMessage(menuItems.tos),
         click() { shell.openExternal('https://meetfranz.com/terms'); },
       },
       {
-        label: 'Privacy Statement',
+        label: intl.formatMessage(menuItems.privacy),
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+      },
+    ],
+  },
+];
+
+const _titleBarTemplateFactory = intl => [
+  {
+    label: intl.formatMessage(menuItems.edit),
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.undo),
+        accelerator: `${ctrlKey}+Z`,
+        click() {
+          getActiveWebview().undo();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.redo),
+        accelerator: `${ctrlKey}+Y`,
+        click() {
+          getActiveWebview().redo();
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.cut),
+        accelerator: `${ctrlKey}+X`,
+        click() {
+          getActiveWebview().cut();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.copy),
+        accelerator: `${ctrlKey}+C`,
+        click() {
+          getActiveWebview().copy();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.paste),
+        accelerator: `${ctrlKey}+V`,
+        click() {
+          getActiveWebview().paste();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
+        accelerator: `${ctrlKey}+Shift+V`,
+        click() {
+          getActiveWebview().pasteAndMatchStyle();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.delete),
+        click() {
+          getActiveWebview().delete();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.selectAll),
+        accelerator: `${ctrlKey}+A`,
+        click() {
+          getActiveWebview().selectAll();
+        },
+      },
+    ],
+  },
+  {
+    label: intl.formatMessage(menuItems.view),
+    submenu: [
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.resetZoom),
+        accelerator: `${ctrlKey}+0`,
+        click() {
+          getActiveWebview().setZoomLevel(0);
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.zoomIn),
+        accelerator: `${ctrlKey}+Plus`,
+        click() {
+          getActiveWebview().getZoomLevel((zoomLevel) => {
+            getActiveWebview().setZoomLevel(zoomLevel === 5 ? zoomLevel : zoomLevel + 1);
+          });
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.zoomOut),
+        accelerator: `${ctrlKey}+-`,
+        click() {
+          getActiveWebview().getZoomLevel((zoomLevel) => {
+            getActiveWebview().setZoomLevel(zoomLevel === -5 ? zoomLevel : zoomLevel - 1);
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
+          ? intl.formatMessage(menuItems.exitFullScreen)
+          : intl.formatMessage(menuItems.enterFullScreen),
+        accelerator: `${ctrlKey}+F`,
+        click(menuItem, browserWindow) {
+          browserWindow.setFullScreen(!browserWindow.isFullScreen());
+        },
+      },
+    ],
+  },
+  {
+    label: intl.formatMessage(menuItems.services),
+    submenu: [],
+  },
+  {
+    label: intl.formatMessage(menuItems.window),
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.minimize),
+        accelerator: 'Alt+M',
+        click(menuItem, browserWindow) {
+          browserWindow.minimize();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.close),
+        accelerator: 'Alt+W',
+        click(menuItem, browserWindow) {
+          browserWindow.close();
+        },
+      },
+    ],
+  },
+  {
+    label: '?',
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.learnMore),
+        click() { shell.openExternal('http://meetfranz.com'); },
+      },
+      {
+        label: intl.formatMessage(menuItems.changelog),
+        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.support),
+        click() { shell.openExternal('http://meetfranz.com/support'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.tos),
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
+      },
+      {
+        label: intl.formatMessage(menuItems.privacy),
         click() { shell.openExternal('https://meetfranz.com/privacy'); },
       },
     ],
@@ -115,7 +479,7 @@ const template = [
 ];
 
 export default class FranzMenu {
-  @observable tpl = template;
+  @observable currentTemplate = [];
 
   constructor(stores, actions) {
     this.stores = stores;
@@ -124,23 +488,45 @@ export default class FranzMenu {
     autorun(this._build.bind(this));
   }
 
+  rebuild() {
+    this._build();
+  }
+
+  get template() {
+    return this.currentTemplate.toJS();
+  }
+
   _build() {
-    const tpl = toJS(this.tpl);
+    // console.log(window.franz);
+    const serviceTpl = Object.assign([], this.serviceTpl); // need to clone object so we don't modify computed (cached) object
+
+    if (window.franz === undefined) {
+      return;
+    }
+
+    const intl = window.franz.intl;
+    const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
-      role: 'toggledevtools',
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(menuItems.toggleDevTools),
+      accelerator: `${cmdKey}+Alt+I`,
+      click: (menuItem, browserWindow) => {
+        browserWindow.webContents.toggleDevTools();
+      },
     }, {
-      label: 'Toggle Service Developer Tools',
-      accelerator: 'CmdOrCtrl+Shift+Alt+i',
+      label: intl.formatMessage(menuItems.toggleServiceDevTools),
+      accelerator: `${cmdKey}+Shift+Alt+I`,
       click: () => {
         this.actions.service.openDevToolsForActiveService();
       },
     });
 
     tpl[1].submenu.unshift({
-      label: 'Reload Service',
-      id: 'reloadService',
-      accelerator: 'CmdOrCtrl+R',
+      label: intl.formatMessage(menuItems.reloadService),
+      id: 'reloadService', // TODO: needed?
+      accelerator: `${cmdKey}+R`,
       click: () => {
         if (this.stores.user.isLoggedIn
           && this.stores.services.enabled.length > 0) {
@@ -150,93 +536,128 @@ export default class FranzMenu {
         }
       },
     }, {
-      label: 'Reload Franz',
-      accelerator: 'CmdOrCtrl+Shift+R',
+      label: intl.formatMessage(menuItems.reloadFranz),
+      accelerator: `${cmdKey}+Shift+R`,
       click: () => {
         window.location.reload();
       },
     });
 
-    if (isMac) {
-      tpl.unshift({
-        label: app.getName(),
-        submenu: [
-          {
-            role: 'about',
-          },
-          {
-            type: 'separator',
-          },
-          {
-            label: 'Settings',
-            accelerator: 'CmdOrCtrl+,',
-            click: () => {
-              this.actions.ui.openSettings({ path: 'app' });
-            },
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'services',
-            submenu: [],
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'hide',
-          },
-          {
-            role: 'hideothers',
-          },
-          {
-            role: 'unhide',
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'quit',
+    tpl.unshift({
+      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      submenu: [
+        {
+          label: intl.formatMessage(menuItems.about),
+          role: 'about',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.settings),
+          accelerator: 'CmdOrCtrl+,',
+          click: () => {
+            this.actions.ui.openSettings({ path: 'app' });
           },
-        ],
-      });
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.services),
+          role: 'services',
+          submenu: [],
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.hide),
+          role: 'hide',
+        },
+        {
+          label: intl.formatMessage(menuItems.hideOthers),
+          role: 'hideothers',
+        },
+        {
+          label: intl.formatMessage(menuItems.unhide),
+          role: 'unhide',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.quit),
+          role: 'quit',
+        },
+      ],
+    });
+
+    const about = {
+      label: intl.formatMessage(menuItems.about),
+      click: () => {
+        dialog.showMessageBox({
+          type: 'info',
+          title: 'Franz',
+          message: 'Franz',
+          detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+        });
+      },
+    };
+
+    if (isMac) {
       // Edit menu.
       tpl[1].submenu.push(
         {
           type: 'separator',
         },
         {
-          label: 'Speech',
+          label: intl.formatMessage(menuItems.speech),
           submenu: [
             {
+              label: intl.formatMessage(menuItems.startSpeaking),
               role: 'startspeaking',
             },
             {
+              label: intl.formatMessage(menuItems.stopSpeaking),
               role: 'stopspeaking',
             },
           ],
         },
       );
+
+      tpl[4].submenu.unshift(about, {
+        type: 'separator',
+      });
     } else {
-      tpl[4].submenu.unshift({
-        role: 'about',
-        click: () => {
-          dialog.showMessageBox({
-            type: 'info',
-            title: 'Franz',
-            message: 'Franz',
-            detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
-          });
+      tpl[0].submenu = [
+        {
+          label: intl.formatMessage(menuItems.settings),
+          accelerator: 'Ctrl+P',
+          click: () => {
+            this.actions.ui.openSettings({ path: 'app' });
+          },
         },
-      });
-    }
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.quit),
+          accelerator: 'Alt+F4',
+          click: () => {
+            app.quit();
+          },
+        },
+      ];
 
-    const serviceTpl = this.serviceTpl;
+      tpl[5].submenu.push({
+        type: 'separator',
+      }, about);
+    }
 
     serviceTpl.unshift({
-      label: 'Add new Service',
-      accelerator: 'CmdOrCtrl+N',
+      label: intl.formatMessage(menuItems.addNewService),
+      accelerator: `${cmdKey}+N`,
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
@@ -245,9 +666,10 @@ export default class FranzMenu {
     });
 
     if (serviceTpl.length > 0) {
-      tpl[isMac ? 3 : 2].submenu = toJS(this.serviceTpl);
+      tpl[3].submenu = serviceTpl;
     }
 
+    this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
     Menu.setApplicationMenu(menu);
   }
@@ -258,7 +680,7 @@ export default class FranzMenu {
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
         label: this._getServiceName(service),
-        accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
+        accelerator: i <= 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index b13bf8faa..585cbcdba 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -2,6 +2,8 @@ import { remote } from 'electron';
 import { GA_ID } from '../config';
 // import { isDevMode } from '../environment';
 
+const debug = require('debug')('Analytics');
+
 const { app } = remote;
 
 /* eslint-disable */
@@ -28,13 +30,13 @@ ga('send', 'App');
 export function gaPage(page) {
   ga('send', 'pageview', page);
 
-  console.debug('GA track page', page);
+  debug('GA track page', page);
 }
 
 export function gaEvent(category, action, label) {
   ga('send', 'event', category, action, label);
 
-  console.debug('GA track page', category, action);
+  debug('GA track page', category, action);
 }
 
 setTimeout(() => {
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 1fc23ac89..032a9aa19 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -32,8 +32,12 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
-    if (!semver.valid(data.version)) {
-      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    try {
+      if (!semver.valid(data.version)) {
+        throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+      }
+    } catch (e) {
+      console.warn(e.message);
     }
 
     this.id = data.id || this.id;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 162422017..4ac8325d4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -98,6 +98,10 @@ export default class AppStore extends Store {
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
+
+        if (isMac) {
+          app.dock.bounce();
+        }
       }
 
       if (data.available !== undefined && !data.available) {
@@ -124,19 +128,6 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    // Reload all services after a healthy nap
-    // Alternative solution for powerMonitor as the resume event is not fired
-    // More information: https://github.com/electron/electron/issues/1615
-    const TIMEOUT = 5000;
-    let lastTime = (new Date()).getTime();
-    setInterval(() => {
-      const currentTime = (new Date()).getTime();
-      if (currentTime > (lastTime + TIMEOUT + 2000)) {
-        this._reactivateServices();
-      }
-      lastTime = currentTime;
-    }, TIMEOUT);
-
     // Set active the next service
     key(
       '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
@@ -244,7 +235,7 @@ export default class AppStore extends Store {
   }
 
   @action _muteApp({ isMuted, overrideSystemMute = true }) {
-    this.isSystemMuteOverriden = overrideSystemMute;
+    this.isSystemMuteOverridden = overrideSystemMute;
 
     this.actions.settings.update({
       settings: {
@@ -356,19 +347,9 @@ export default class AppStore extends Store {
     return autoLauncher.isEnabled() || false;
   }
 
-  _reactivateServices(retryCount = 0) {
-    if (!this.isOnline) {
-      console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
-      setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
-    } else {
-      console.debug('reactivateServices: reload Franz');
-      window.location.reload();
-    }
-  }
-
   _systemDND() {
     const dnd = getDoNotDisturb();
-    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+    if (dnd !== this.stores.settings.all.isAppMuted && !this.isSystemMuteOverridden) {
       this.actions.app.muteApp({
         isMuted: dnd,
         overrideSystemMute: false,
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 67fee1d50..a24308f6a 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,6 +5,8 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
+const debug = require('debug')('RecipeStore');
+
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
   @observable installRecipeRequest = new Request(this.api.recipes, 'install');
@@ -34,7 +36,7 @@ export default class RecipesStore extends Store {
         return activeRecipe;
       }
 
-      console.warn('Recipe not installed');
+      debug(`Recipe ${match.id} not installed`);
     }
 
     return null;
@@ -54,10 +56,8 @@ export default class RecipesStore extends Store {
 
   // Actions
   @action async _install({ recipeId }) {
-    // console.log(this.installRecipeRequest._promise);
     const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
     await this.allRecipesRequest.invalidate({ immediately: true })._promise;
-    // console.log(this.installRecipeRequest._promise);
 
     return recipe;
   }
@@ -67,7 +67,7 @@ export default class RecipesStore extends Store {
     const recipes = {};
 
     // Hackfix, reference this.all to fetch services
-    console.debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
+    debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
 
     recipeIds.forEach((r) => {
       const recipe = this.one(r);
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 4140ca362..595852583 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -2,6 +2,8 @@ import { action, computed, observable } from 'mobx';
 
 import Store from './lib/Store';
 
+const debug = require('debug')('RequestsStore');
+
 export default class RequestStore extends Store {
   @observable userInfoRequest;
   @observable servicesRequest;
@@ -52,7 +54,7 @@ export default class RequestStore extends Store {
         }
 
         this._autoRetry();
-        console.debug(`Retry required requests delayed in ${(delay) / 1000}s`);
+        debug(`Retry required requests delayed in ${(delay) / 1000}s`);
       }, delay);
     }
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index c38d0d9ee..f7d92b1ff 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -10,6 +10,8 @@ import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
 
+const debug = require('debug')('ServiceStore');
+
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
   @observable createServiceRequest = new Request(this.api.services, 'create');
@@ -87,6 +89,12 @@ export default class ServicesStore extends Store {
     return this.stores.settings.all.showDisabledServices ? this.all : this.enabled;
   }
 
+  // This is just used to avoid unnecessary rerendering of resource-heavy webviews 
+  @computed get allDisplayedUnordered() {
+    const services = this.allServicesRequest.execute().result || [];
+    return this.stores.settings.all.showDisabledServices ? services : services.filter(service => service.isEnabled);
+  }
+
   @computed get filtered() {
     return this.all.filter(service => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase()));
   }
@@ -103,7 +111,7 @@ export default class ServicesStore extends Store {
         return activeService;
       }
 
-      console.warn('Service not available');
+      debug('Service not available');
     }
 
     return null;
@@ -117,10 +125,10 @@ export default class ServicesStore extends Store {
     const recipesStore = this.stores.recipes;
 
     if (recipesStore.isInstalled(recipeId)) {
-      console.debug('Recipe is installed');
+      debug(`Recipe ${recipeId} is installed`);
       this._redirectToAddServiceRoute(recipeId);
     } else {
-      console.warn('Recipe is not installed');
+      debug(`Recipe ${recipeId} is not installed`);
       // We access the RecipeStore action directly
       // returns Promise instead of action
       await this.stores.recipes._install({ recipeId });
@@ -487,7 +495,7 @@ export default class ServicesStore extends Store {
     if (service) {
       service.webview.openDevTools();
     } else {
-      console.warn('No service is active');
+      debug('No service is active');
     }
   }
 
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index afdd7dec7..964a9fcea 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -6,7 +6,11 @@ html {
 
 .app {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
+
+  .app__content {
+    display: flex;
+  }
 
   .app__service {
     display: flex;
@@ -15,6 +19,10 @@ html {
   }
 }
 
+.electron-app-title-bar {
+  z-index: 99999999;
+}
+
 .window-draggable {
   position: absolute;
   width: 100%;
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 446bdca14..784a04d3d 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -4,6 +4,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 }
 
 @import './node_modules/mdi/scss/materialdesignicons.scss';
+@import './node_modules/electron-react-titlebar/assets/style';
 
 // modules
 @import './reset.scss';
@@ -28,6 +29,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './subscription-popup.scss';
 @import './content-tabs.scss';
 @import './invite.scss';
+@import './title-bar.scss';
 
 // form
 @import './input.scss';
diff --git a/src/styles/title-bar.scss b/src/styles/title-bar.scss
new file mode 100644
index 000000000..492245e2f
--- /dev/null
+++ b/src/styles/title-bar.scss
@@ -0,0 +1,50 @@
+#electron-app-title-bar {
+  background: $theme-gray-lightest;
+  border-bottom: 0;
+  box-shadow: 0px 0 8px rgba(#000, 0.1);
+
+  span {
+    line-height: normal;
+  }
+
+  div {
+    height: auto;
+  }
+
+  .toolbar-dropdown {
+    &.open {
+      box-shadow: 0px 0 8px rgba(#000, 0.1);
+    }
+
+    &:not(.open) {
+      .menu-item .menu-label {
+        opacity: 1;
+      }
+
+      &>.toolbar-button > button:hover {
+        background: $theme-brand-primary;
+      }
+    }
+  }
+
+  .list-item {
+    .menu-item {
+      margin: 4px;
+      border-radius: $theme-border-radius-small;
+    }
+    &.selected {
+      // background: $theme-brand-primary;
+      background: none;
+
+      .menu-item {
+        background: $theme-brand-primary;
+      }
+    }
+  }
+
+  .menu-pane {
+    box-shadow: 0px 0 10px rgba(#000, 0.5);
+    border-bottom-left-radius: $theme-border-radius-small;
+    border-bottom-right-radius: $theme-border-radius-small;
+  }
+}
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index d9e021e6d..52b19b3fd 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -30,7 +30,6 @@ new ContextMenuListener((info) => { // eslint-disable-line
 });
 
 ipcRenderer.on('settings-update', (e, data) => {
-  console.log('settings-update', data);
   spellchecker.toggleSpellchecker(data.enableSpellchecking);
 });
 
diff --git a/yarn.lock b/yarn.lock
index c788006b7..49ddfc31a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45,9 +45,9 @@
   dependencies:
     nan "^2.0.0"
 
-"@types/node@^7.0.18":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.0.24":
+  version "8.9.5"
+  resolved "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz#162b864bc70be077e6db212b322754917929e976"
 
 abbrev@1:
   version "1.1.0"
@@ -1367,7 +1367,7 @@ circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
-classnames@^2.2.0, classnames@^2.2.5:
+classnames@^2.2.0, classnames@^2.2.3, classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
@@ -1643,6 +1643,12 @@ dateformat@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
 
+debug-electron@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/debug-electron/-/debug-electron-0.0.4.tgz#9b035349ac8107b4e43da200d2339c4fd5b169e7"
+  dependencies:
+    debug "^2.4.1"
+
 debug@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.4.tgz#5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"
@@ -1667,6 +1673,12 @@ debug@^2.1.3, debug@^2.2.0, debug@^2.5.1, debug@^2.6.1, debug@^2.6.3, debug@^2.6
   dependencies:
     ms "2.0.0"
 
+debug@^2.4.1:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
 debug@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
@@ -1766,6 +1778,10 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+"dom-helpers@^2.4.0 || ^3.0.0":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
+
 dom-helpers@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
@@ -1995,6 +2011,13 @@ electron-publish@19.15.0:
     fs-extra-p "^4.3.0"
     mime "^1.3.6"
 
+electron-react-titlebar@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/electron-react-titlebar/-/electron-react-titlebar-0.7.1.tgz#d56517d01ef0e935caa994e9b577dfd63a56c66c"
+  dependencies:
+    lodash "^4.17.4"
+    react-virtualized "^9.7.6"
+
 electron-rebuild@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.6.0.tgz#e8d26f4d8e9fe5388df35864b3658e5cfd4dcb7e"
@@ -2066,11 +2089,11 @@ electron-window-state@^4.1.0:
     jsonfile "^2.2.3"
     mkdirp "^0.5.1"
 
-electron@^1.7.12:
-  version "1.7.12"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.12.tgz#dcc61a2c1b0c3df25f68b3425379a01abd01190e"
+electron@1.8.4:
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38"
   dependencies:
-    "@types/node" "^7.0.18"
+    "@types/node" "^8.0.24"
     electron-download "^3.0.1"
     extract-zip "^1.0.3"
 
@@ -2450,6 +2473,18 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
+fbjs@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
 fbjs@^0.8.9:
   version "0.8.14"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
@@ -4058,7 +4093,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -4948,6 +4983,14 @@ prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
 
+prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proxy-middleware@~0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
@@ -5126,6 +5169,16 @@ react-transition-group@^1.2.0:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
+react-virtualized@^9.7.6:
+  version "9.18.5"
+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.18.5.tgz#42dd390ebaa7ea809bfcaf775d39872641679b89"
+  dependencies:
+    babel-runtime "^6.26.0"
+    classnames "^2.2.3"
+    dom-helpers "^2.4.0 || ^3.0.0"
+    loose-envify "^1.3.0"
+    prop-types "^15.6.0"
+
 react@^15.4.1:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"