5.0.0 beta.18v5.0.0-beta.18

author: Stefan Malzner <stefan@adlk.io> 2018-04-04 21:23:38 +0200
committer: GitHub <noreply@github.com> 2018-04-04 21:23:38 +0200
commit: 1790b795238c2abe832285197cb88c0833bd98ca (patch)
tree: 89d4bc3632efc05822c0bec53a883b2d092bfd69
parent: Fix typo [ci skip] (diff)
parent: Merge branch 'master' into release/5.0.0-beta.18 (diff)
download: ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.gz
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.zst
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.zip
50 files changed, 862 insertions, 641 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5159fd09..cdc89b325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="5.0.0-beta.18"></a>
+# [5.0.0-beta.18](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.18) (2018-04-03)
+### General
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+### Features
+* **App:** Add option to enable/disable hardware acceleration ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
+### Bug Fixes
+* **Windows:** Fix shortcuts for closing, minimizing, quitting and toggling fullscreen ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
+* **Windows:** Hide title bar when in fullscreen ([655a6ed](https://github.com/meetfranz/franz/commit/655a6ed))
 <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)
diff --git a/appveyor.yml b/appveyor.yml
index d9296b1f6..8c83a5644 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ before_build:
  - yarn lint
 build_script:
-  - yarn build --x64 --ia32
+  - yarn build
 notifications:
  - provider: Slack
diff --git a/electron-builder.yml b/electron-builder.yml
index 96bd63cc2..3e72da4ce 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -18,7 +18,11 @@ dmg:
 win:
  icon: ./build-helpers/images/icon.ico
-  target: nsis
+  target:
+    target: nsis
+    arch:
+    - x64
+    - ia32
 linux:
  icon: ./build-helpers/images/icons
diff --git a/package.json b/package.json
index 1d7ab2852..3647e963b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "franz",
  "productName": "Franz",
  "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.17",
+  "version": "5.0.0-beta.18",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "adlk x franz - Stefan Malzner",
  "main": "index.js",
diff --git a/src/actions/settings.js b/src/actions/settings.js
index 3d53cd674..fd29b798b 100644
--- a/src/actions/settings.js
+++ b/src/actions/settings.js
@@ -2,9 +2,11 @@ import PropTypes from 'prop-types';
 export default {
  update: {
-    settings: PropTypes.object.isRequired,
+    type: PropTypes.string.isRequired,
+    data: PropTypes.object.isRequired,
  },
  remove: {
+    type: PropTypes.string.isRequired,
    key: PropTypes.string.isRequired,
  },
 };
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 59d7d8fa2..741917104 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,6 +4,14 @@ export default class LocalApi {
    this.local = local;
  }
+  getAppSettings() {
+    return this.local.getAppSettings();
+  }
+  updateAppSettings(data) {
+    return this.local.updateAppSettings(data);
+  }
  getAppCacheSize() {
    return this.local.getAppCacheSize();
  }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index 4d2497c61..78deb7aa5 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import { ipcRenderer, remote } from 'electron';
 import du from 'du';
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
@@ -8,6 +8,23 @@ const debug = require('debug')('LocalApi');
 const { session } = remote;
 export default class LocalApi {
+  // Settings
+  getAppSettings() {
+    return new Promise((resolve) => {
+      ipcRenderer.once('appSettings', (event, data) => {
+        debug('LocalApi::getAppSettings resolves', data);
+        resolve(data);
+      });
+      ipcRenderer.send('getAppSettings');
+    });
+  }
+  async updateAppSettings(data) {
+    debug('LocalApi::updateAppSettings resolves', data);
+    ipcRenderer.send('updateAppSettings', data);
+  }
  // Services
  async getAppCacheSize() {
    const partitionsDir = getServicePartitionsDirectory();
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 66aef1730..746775a7f 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -43,6 +43,7 @@ const messages = defineMessages({
 @observer
 export default class AppLayout extends Component {
  static propTypes = {
+    isFullScreen: PropTypes.bool.isRequired,
    sidebar: PropTypes.element.isRequired,
    services: PropTypes.element.isRequired,
    children: PropTypes.element,
@@ -69,6 +70,7 @@ export default class AppLayout extends Component {
  render() {
    const {
+      isFullScreen,
      sidebar,
      services,
      children,
@@ -90,7 +92,7 @@ export default class AppLayout extends Component {
    return (
      <div>
        <div className="app">
-          {isWindows && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
          <div className="app__content">
            {sidebar}
            <div className="app__service">
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 72aa5a8af..97f535594 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -76,6 +76,10 @@ const messages = defineMessages({
    id: 'settings.app.currentVersion',
    defaultMessage: '!!!Current version:',
  },
+  enableGPUAccelerationInfo: {
+    id: 'settings.app.restartRequired',
+    defaultMessage: '!!!Changes require restart',
+  },
 });
 @observer
@@ -172,6 +176,8 @@ export default class EditSettingsForm extends Component {
            {/* Advanced */}
            <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2>
            <Toggle field={form.$('enableSpellchecking')} />
+            <Toggle field={form.$('enableGPUAcceleration')} />
+            <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p>
            {/* <Select field={form.$('spellcheckingLanguage')} /> */}
            <div className="settings__settings-group">
              <h3>
diff --git a/src/config.js b/src/config.js
index e66594c59..77fa92eca 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,3 +1,8 @@
+import electron from 'electron';
+import path from 'path';
+const app = process.type === 'renderer' ? electron.remote.app : electron.app;
 export const CHECK_INTERVAL = 1000 * 3600; // How often should we perform checks
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_API = 'https://dev.franzinfra.com';
@@ -5,7 +10,6 @@ export const LIVE_API = 'https://api.franzinfra.com';
 export const GA_ID = 'UA-74126766-6';
 export const DEFAULT_APP_SETTINGS = {
-  autoLaunchOnStart: true,
  autoLaunchInBackground: false,
  runInBackground: true,
  enableSystemTray: true,
@@ -13,12 +17,14 @@ export const DEFAULT_APP_SETTINGS = {
  showDisabledServices: true,
  showMessageBadgeWhenMuted: true,
  enableSpellchecking: true,
-  // spellcheckingLanguage: 'auto',
  locale: '',
  fallbackLocale: 'en-US',
  beta: false,
  isAppMuted: false,
+  enableGPUAcceleration: true,
 };
 export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request';
 export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate';
+export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json');
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 075bd5e34..9212f809f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -77,7 +77,7 @@ export default class AppLayoutContainer extends Component {
      <Sidebar
        services={services.allDisplayed}
        setActive={setActive}
-        isAppMuted={settings.all.isAppMuted}
+        isAppMuted={settings.all.app.isAppMuted}
        openSettings={openSettings}
        closeSettings={closeSettings}
        reorder={reorder}
@@ -87,7 +87,7 @@ export default class AppLayoutContainer extends Component {
        deleteService={deleteService}
        updateService={updateService}
        toggleMuteApp={toggleMuteApp}
-        showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted}
+        showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
        showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
      />
    );
@@ -99,13 +99,14 @@ export default class AppLayoutContainer extends Component {
        setWebviewReference={setWebviewReference}
        openWindow={openWindow}
        reload={reload}
-        isAppMuted={settings.all.isAppMuted}
+        isAppMuted={settings.all.app.isAppMuted}
        update={updateService}
      />
    );
    return (
      <AppLayout
+        isFullScreen={app.isFullScreen}
        isOnline={app.isOnline}
        showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
        appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 1fa7ce8bc..018ce663f 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -51,14 +51,14 @@ const messages = defineMessages({
    id: 'settings.app.form.enableSpellchecking',
    defaultMessage: '!!!Enable spell checking',
  },
+  enableGPUAcceleration: {
+    id: 'settings.app.form.enableGPUAcceleration',
+    defaultMessage: '!!!Enable GPU Acceleration',
+  },
  spellcheckingLanguage: {
    id: 'settings.app.form.spellcheckingLanguage',
    defaultMessage: '!!!Language for spell checking',
  },
-  // spellcheckingAutomaticDetection: {
-  //   id: 'settings.app.form.spellcheckingAutomaticDetection',
-  //   defaultMessage: '!!!Detect language automatically',
-  // },
  beta: {
    id: 'settings.app.form.beta',
    defaultMessage: '!!!Include beta versions',
@@ -84,22 +84,24 @@ export default class EditSettingsScreen extends Component {
    });
    settings.update({
-      settings: {
+      type: 'app',
+      data: {
        runInBackground: settingsData.runInBackground,
        enableSystemTray: settingsData.enableSystemTray,
        minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        enableGPUAcceleration: settingsData.enableGPUAcceleration,
        showDisabledServices: settingsData.showDisabledServices,
        showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
        enableSpellchecking: settingsData.enableSpellchecking,
-        // spellcheckingLanguage: settingsData.spellcheckingLanguage,
+        beta: settingsData.beta, // we need this info in the main process as well
-        locale: settingsData.locale,
+        locale: settingsData.locale, // we need this info in the main process as well
-        beta: settingsData.beta,
      },
    });
    user.update({
      userData: {
        beta: settingsData.beta,
+        locale: settingsData.locale,
      },
    });
  }
@@ -116,17 +118,6 @@ export default class EditSettingsScreen extends Component {
      });
    });
-    // const spellcheckerLocales = [{
-    //   value: 'auto',
-    //   label: intl.formatMessage(messages.spellcheckingAutomaticDetection),
-    // }];
-    // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => {
-    //   spellcheckerLocales.push({
-    //     value: key,
-    //     label: SPELLCHECKER_LOCALES[key],
-    //   });
-    // });
    const config = {
      fields: {
        autoLaunchOnStart: {
@@ -141,40 +132,39 @@ export default class EditSettingsScreen extends Component {
        },
        runInBackground: {
          label: intl.formatMessage(messages.runInBackground),
-          value: settings.all.runInBackground,
+          value: settings.all.app.runInBackground,
          default: DEFAULT_APP_SETTINGS.runInBackground,
        },
        enableSystemTray: {
          label: intl.formatMessage(messages.enableSystemTray),
-          value: settings.all.enableSystemTray,
+          value: settings.all.app.enableSystemTray,
          default: DEFAULT_APP_SETTINGS.enableSystemTray,
        },
        minimizeToSystemTray: {
          label: intl.formatMessage(messages.minimizeToSystemTray),
-          value: settings.all.minimizeToSystemTray,
+          value: settings.all.app.minimizeToSystemTray,
          default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
        },
        showDisabledServices: {
          label: intl.formatMessage(messages.showDisabledServices),
-          value: settings.all.showDisabledServices,
+          value: settings.all.app.showDisabledServices,
          default: DEFAULT_APP_SETTINGS.showDisabledServices,
        },
        showMessageBadgeWhenMuted: {
          label: intl.formatMessage(messages.showMessageBadgeWhenMuted),
-          value: settings.all.showMessageBadgeWhenMuted,
+          value: settings.all.app.showMessageBadgeWhenMuted,
          default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted,
        },
        enableSpellchecking: {
          label: intl.formatMessage(messages.enableSpellchecking),
-          value: settings.all.enableSpellchecking,
+          value: settings.all.app.enableSpellchecking,
          default: DEFAULT_APP_SETTINGS.enableSpellchecking,
        },
-        // spellcheckingLanguage: {
+        enableGPUAcceleration: {
-        //   label: intl.formatMessage(messages.spellcheckingLanguage),
+          label: intl.formatMessage(messages.enableGPUAcceleration),
-        //   value: settings.all.spellcheckingLanguage,
+          value: settings.all.app.enableGPUAcceleration,
-        //   options: spellcheckerLocales,
+          default: DEFAULT_APP_SETTINGS.enableGPUAcceleration,
-        //   default: DEFAULT_APP_SETTINGS.spellcheckingLanguage,
+        },
-        // },
        locale: {
          label: intl.formatMessage(messages.language),
          value: app.locale,
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 824b4c20c..b3138e948 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,27 +1,42 @@
-import { observable } from 'mobx';
+import { observable, toJS } from 'mobx';
+import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
-import { DEFAULT_APP_SETTINGS } from '../config';
+import { SETTINGS_PATH, DEFAULT_APP_SETTINGS } from '../config';
+const debug = require('debug')('Settings');
 export default class Settings {
-  @observable store = {
+  @observable store = DEFAULT_APP_SETTINGS;
-    autoLaunchOnStart: DEFAULT_APP_SETTINGS.autoLaunchOnStart,
-    autoLaunchInBackground: DEFAULT_APP_SETTINGS.autoLaunchInBackground,
+  constructor() {
-    runInBackground: DEFAULT_APP_SETTINGS.runInBackground,
+    if (!pathExistsSync(SETTINGS_PATH)) {
-    enableSystemTray: DEFAULT_APP_SETTINGS.enableSystemTray,
+      this._writeFile();
-    minimizeToSystemTray: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
+    } else {
-    locale: DEFAULT_APP_SETTINGS.locale,
+      this._hydrate();
-    beta: DEFAULT_APP_SETTINGS.beta,
+    }
-  };
+  }
  set(settings) {
    this.store = Object.assign(this.store, settings);
+    this._writeFile();
  }
-  all() {
+  get all() {
    return this.store;
  }
  get(key) {
    return this.store[key];
  }
+  _hydrate() {
+    this.store = readJsonSync(SETTINGS_PATH);
+    debug('Hydrate store', toJS(this.store));
+  }
+  _writeFile() {
+    outputJsonSync(SETTINGS_PATH, this.store);
+    debug('Write settings file', toJS(this.store));
+  }
 }
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 995b28fbd..3eab68a91 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,7 +1,11 @@
 import { ipcMain } from 'electron';
 export default (params) => {
-  ipcMain.on('settings', (event, args) => {
+  ipcMain.on('getAppSettings', () => {
+    params.mainWindow.webContents.send('appSettings', params.settings.all);
+  });
+  ipcMain.on('updateAppSettings', (event, args) => {
    params.settings.set(args);
  });
 };
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index be9059727..4ea3eb1a7 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -26,49 +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.about" : "Sobre Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Amaga",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Amaga altres",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Surt",
   "menu.app.settings" : "Configuració",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Mostra",
   "menu.edit" : "Edita",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Copia",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Retalla",
   "menu.edit.delete" : "Suprimeix",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji i Símbols",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Enganxa",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Enganxa amb els estils",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Refés",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Selecciona-ho tot",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Pronuncia",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Inicia el dictat",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Inicia la parla",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Atura la parla",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Desfés",
-   "menu.file" : "File",
+   "menu.file" : "Fitxer",
-   "menu.help" : "Help",
+   "menu.help" : "Ajuda",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Registre de canvis",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Conegueu-ne més detalls",
   "menu.help.privacy" : "Declaració de privacitat",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Suport",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Condicions del Servei",
-   "menu.services" : "Services",
+   "menu.services" : "Serveis",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Afegeix un servei...",
-   "menu.view" : "View",
+   "menu.view" : "Visualitza",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Inicia la pantalla completa",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Surt de pantalla completa",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Torna a carregar Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Torna a carregar el servei",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Mida real",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Activa serveis per a desenvolupadors",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Activa la pantalla completa",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Habilita les eines de desenvolupador de serveis",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Amplia",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Redueix",
-   "menu.window" : "Window",
+   "menu.window" : "Finestra",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Tanca",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Minimitza",
   "password.email.label" : "Correu electrònic",
   "password.headline" : "Restablir contrasenya",
   "password.link.login" : "Inicia la sessió al teu compte",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
   "settings.app.form.beta" : "Inclou versions beta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Mostra Franz a la barra de menú",
   "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
   "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "Activa les notificacions",
   "tabs.item.enableService" : "Activa el servei",
   "tabs.item.reload" : "Recarrega",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "{field} no es vàlid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field} ha de ser al menys {length} caràcters de llargada",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field} es requerit",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field} es una URL no vàlida",
   "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 b4142b928..ed4c7a468 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -26,49 +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.about" : "O aplikaci",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Skrýt",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Skryt ostatní",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Ukončit",
   "menu.app.settings" : "Nastavení",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Odkrýt",
   "menu.edit" : "Upravit",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Kopírovat",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Vyjmout",
   "menu.edit.delete" : "Smazat",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji a znaky",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Vložit",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Vložit včetně formátování",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Vpřed",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Vybrat vše",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Mluvené slovo",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Začít diktovat",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Začít mluvit",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Přestat mluvit",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Vrátit zpět",
-   "menu.file" : "File",
+   "menu.file" : "Soubor",
-   "menu.help" : "Help",
+   "menu.help" : "Nápověda",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Seznam změn",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Dozvědět se více",
   "menu.help.privacy" : "Prohlášení o ochraně soukromí",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Podpora",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Podmínky použití",
-   "menu.services" : "Services",
+   "menu.services" : "Služby",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Přidat novou službu...",
-   "menu.view" : "View",
+   "menu.view" : "Zobrazení",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Ukončit celoobrazovkový režim",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Obnovit Franze",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Obnovit službu",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Skutečná velikost",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Zobrazit Vývojářské nástroje",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Přepnout na celou obrazovku",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Zobrazit Vývojářské nástroje pro službu",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Přiblížit",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Oddálit",
-   "menu.window" : "Window",
+   "menu.window" : "Okno",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Zavřít",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Minimalizovat",
   "password.email.label" : "E-mailová adresa",
   "password.headline" : "Obnovit heslo",
   "password.link.login" : "Přihlásit se k účtu",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
   "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
   "settings.app.form.beta" : "Zahrnout beta verze",
+   "settings.app.form.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
   "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu nabídce",
   "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
   "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "Povolit oznamování",
   "tabs.item.enableService" : "Zapnout službu",
   "tabs.item.reload" : "Obnovit",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "{field} není validní",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field} musí být alespoň {length} znaků dlouhé",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field} je povinné",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field} není validní 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 9aaef0465..fa61d26d4 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -6,7 +6,7 @@
   "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
   "import.submit.label" : "Dienste importieren",
   "infobar.buttonChangelog" : "Was gibt es neues?",
-   "infobar.buttonInstallUpdate" : "Neustarten & Update installieren",
+   "infobar.buttonInstallUpdate" : "Neu starten & Update installieren",
   "infobar.buttonReloadServices" : "Dienste neuladen",
   "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
   "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
@@ -109,13 +109,14 @@
   "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
   "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
   "settings.app.buttonClearAllCache" : "Cache leeren",
-   "settings.app.buttonInstallUpdate" : "Neustarten & Update installieren",
+   "settings.app.buttonInstallUpdate" : "Neu starten & Update installieren",
   "settings.app.buttonSearchForUpdate" : "Nach Updates suchen",
   "settings.app.cacheInfo" : "Der Franz Cache belegt derzeit {size}.",
   "settings.app.currentVersion" : "Aktuelle Version:",
   "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
   "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
   "settings.app.form.beta" : "Beta-Versionen einbeziehen",
+   "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
   "settings.app.form.enableMenuBar" : "Franz in Menüleiste anzeigen",
   "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
   "settings.app.form.enableSystemTray" : "Franz in der Systemleiste anzeigen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index ae37d1f5e..7361d29b7 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Άνοιγμα στο παρασκήνιο",
   "settings.app.form.autoLaunchOnStart" : "Εκκίνηση του Franz κατά την εκκίνηση του συστήματος",
   "settings.app.form.beta" : "Συμπεριλάβετε εκδόσεις beta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "Ενεργοποίηση ορθογραφικού ελέγχου",
   "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γραμμή ειδοποιήσεων",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 400a9a5d8..0c62da44a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -164,6 +164,7 @@
  "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
  "settings.app.form.language": "Language",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
+  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
  "settings.app.form.beta": "Include beta versions",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 640f87c20..75047a613 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.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz",
-   "global.notConnectedToTheInternet" : "No está 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",
@@ -12,11 +12,11 @@
   "infobar.servicesUpdated" : "Tus servicios han sido actualizados.",
   "infobar.updateAvailable" : "Una nueva actualización de Franz está disponible",
   "invite.email.label" : "Dirección de correo electrónico",
-   "invite.headline.friends" : "Invita a 3 de tus amigos o colegas",
+   "invite.headline.friends" : "Invita a 3 de tus amigos o compañeros",
   "invite.name.label" : "Nombre",
   "invite.skip.label" : "Quiero hacer esto después",
   "invite.submit.label" : "Enviar invitaciones",
-   "invite.successInfo" : "Invitaciones enviadas",
+   "invite.successInfo" : "Invitaciones enviadas correctamente",
   "login.email.label" : "Dirección de correo electrónico",
   "login.headline" : "Iniciar sesión",
   "login.invalidCredentials" : "Correo electrónico o contraseña no válidos ",
@@ -25,50 +25,50 @@
   "login.password.label" : "Contraseña",
   "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.",
+   "login.tokenExpired" : "Tu sesión expiró, por favor inicia sesión otra vez.",
-   "menu.app.about" : "About Franz",
+   "menu.app.about" : "Sobre Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Ocultar",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Ocultar otros",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Salir",
   "menu.app.settings" : "Configuración",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Mostrar",
   "menu.edit" : "Editar",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Copiar",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Cortar",
   "menu.edit.delete" : "Borrar",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji y Símbolos",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Pegar",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Pegar con el mismo estilo",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Rehacer",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Seleccionar todo",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Leer",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Empezar dictado",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Empezar lectura",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Detener lectura",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Deshacer",
-   "menu.file" : "File",
+   "menu.file" : "Archivo",
-   "menu.help" : "Help",
+   "menu.help" : "Ayuda",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Registro de cambios",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Conocer más",
   "menu.help.privacy" : "Declaración de privacidad",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Soporte",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Términos del Servicio",
-   "menu.services" : "Services",
+   "menu.services" : "Servicios",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Añadir Nuevo Servicio...",
-   "menu.view" : "View",
+   "menu.view" : "Mostrar",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Entrar a Pantalla Completa",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Recargar Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Recargar Servicio",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Tamaño Actual",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Activar las Herramientas para Desarrolladores",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Cambiar a Pantalla Completa",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Mostrar Herramientas de Servicios para Desarrolladores",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Ampliar",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Reducir",
-   "menu.window" : "Window",
+   "menu.window" : "Ventana",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Cerrar",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Minimizar",
   "password.email.label" : "Dirección de correo electrónico",
   "password.headline" : "Restablecer contraseña",
   "password.link.login" : "Iniciar sesión en tu cuenta",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz al iniciar",
   "settings.app.form.beta" : "Incluir versiones beta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "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",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "Activar notificaciones",
   "tabs.item.enableService" : "Activar servicio",
   "tabs.item.reload" : "Recargar",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "{field} no es válido",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field} debería tener al menos {length} caracteres",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field} es obligatorio",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field} no es una URL válida",
   "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 a40a60833..e00a5671b 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -26,49 +26,49 @@
   "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.about" : "À propos de Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Masquer",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Masquer les autres",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Quitter",
   "menu.app.settings" : "Paramètres",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Afficher",
   "menu.edit" : "Éditer",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Copier",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Couper",
   "menu.edit.delete" : "Supprimer",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji & Symboles",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Coller",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Coller et fusionner le style",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Rétablir",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Tout sélectionner",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Synthèse vocale",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Démarrer la synthèse vocale",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Démarrer la lecture",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Arrêter la synthèse vocale",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Annuler",
-   "menu.file" : "File",
+   "menu.file" : "Fichier",
-   "menu.help" : "Help",
+   "menu.help" : "Aide",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Liste des modifications",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "En savoir plus",
   "menu.help.privacy" : "Déclaration de confidentialité",
   "menu.help.support" : "Support",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Conditions d'utilisation",
   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Ajouter un nouveau service...",
-   "menu.view" : "View",
+   "menu.view" : "Affichage",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Entrer en mode plein écran",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Sortir du mode plein écran",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Actualiser Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Redémarrer le service",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Taille réelle",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Activer les outils développeur",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Activer \/ désactiver le mode plein écran",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Activer les outils de développement WebKit",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Zoom Avant",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Zoom Arrière",
-   "menu.window" : "Window",
+   "menu.window" : "Fenêtre",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Fermer",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Réduire",
   "password.email.label" : "Adresse e-mail",
   "password.headline" : "Réinitialiser le mot de passe",
   "password.link.login" : "Connectez-vous à votre compte",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
   "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
   "settings.app.form.beta" : "Accepter les versions bêta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Afficher Franz dans la barre des menus",
   "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
   "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "Activer les notifications",
   "tabs.item.enableService" : "Activer le service",
   "tabs.item.reload" : "Recharger",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "{field} n'est pas valide",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field} doit contenir au moins {length} caractère(s)",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field} est requis",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field} n'est pas une URL valide",
   "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 80aeb0a1b..1c0b537b2 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -26,49 +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.about" : "Faoi Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Cuir Franz i bhfolach",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Folaigh feidhmchláir eile",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Scoir",
   "menu.app.settings" : "Socruithe",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Taispeáin",
   "menu.edit" : "Cuir in eagar",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Cóipeáil",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Gearr",
   "menu.edit.delete" : "Scrios",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Straoiseoga ⁊ siombailí",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Greamaigh",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Greamaigh agus cuir stíl in oiriúint",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Athdhéan",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Roghnaigh gach rud",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Caint",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Tosaigh deachtú",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Tosaigh ag caint",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Stad ag caint",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Cealaigh",
-   "menu.file" : "File",
+   "menu.file" : "Comhad",
-   "menu.help" : "Help",
+   "menu.help" : "Cabhair",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Athruithe",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Tuilleadh eolais",
   "menu.help.privacy" : "Ráiteas phríobháideachais",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Tacaíocht",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Téarmaí tagartha",
-   "menu.services" : "Services",
+   "menu.services" : "Seirbhísí",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Cuir seirbhís nua leis",
-   "menu.view" : "View",
+   "menu.view" : "Amharc",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Athlódáil Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Athlódáil seirbhís",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Fíormhéid",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Scoránaigh uirlis forbróra",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Scoránaigh mód lánscáileáin",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Scoránaigh uirlis forbróra seirbhíse",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Zúmáil isteach",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Zúmáil amach",
-   "menu.window" : "Window",
+   "menu.window" : "Fuinneog",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Dún",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Íoslaghdaigh",
   "password.email.label" : "Seoladh ríomhphoist",
   "password.headline" : "Athshocraigh pasfhocal",
   "password.link.login" : "Logáil isteach i do chuntas",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Oscail sa chúlra",
   "settings.app.form.autoLaunchOnStart" : "Láinseáil Franz ón tús",
   "settings.app.form.beta" : "Cuir leagain béite san áireamh",
+   "settings.app.form.enableGPUAcceleration" : "Cumasaigh luasghéarú APG",
   "settings.app.form.enableMenuBar" : "Taispeáin Franz sa bharra roghchláir",
   "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
@@ -211,7 +212,7 @@
   "signup.headline" : "Cláraigh",
   "signup.lastname.label" : "Sloinne",
   "signup.legal.info" : "Agus tú ag cruthú cuntas Franz glacann tú le",
-   "signup.legal.privacy" : "Ráiteas phríobháideachais",
+   "signup.legal.privacy" : "Polasaí príobháideachais",
   "signup.legal.terms" : "Tearmaí seirbhíse",
   "signup.link.login" : "Cuntas agat cheana féin, logáil isteach?",
   "signup.password.label" : "Pasfhocal",
@@ -240,10 +241,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.email" : "Níl {field} neamhbhailí",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
-   "validation.required" : "{field} is required",
+   "validation.required" : "Tá {field} de dhíth",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "Ní AAA bhailí é {field}",
   "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 72930f686..e227c4537 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -116,6 +116,7 @@
   "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.enableGPUAcceleration" : "Enable GPU Acceleration",
   "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",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 308559f3b..3571ad453 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
   "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
   "settings.app.form.beta" : "Béta verziók keresése",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
   "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 51820150f..e6d671c1b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
   "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
   "settings.app.form.beta" : "Sertakan versi beta",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu",
   "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
   "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index c45587c87..9d23a309b 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -6,7 +6,7 @@
   "import.skip.label" : "Voglio aggiungere servizi manualmente",
   "import.submit.label" : "Importa servizi",
   "infobar.buttonChangelog" : "Cosa c'è di nuovo?",
-   "infobar.buttonInstallUpdate" : "Riavvia e installa gli aggiornamenti",
+   "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
   "infobar.buttonReloadServices" : "Ricarica servizi",
   "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
   "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
@@ -26,49 +26,49 @@
   "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.about" : "Info su Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Nascondi",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Nascondi Altri",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Esci",
   "menu.app.settings" : "Impostazioni",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Mostra",
   "menu.edit" : "Modifica",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Copia",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Taglia",
   "menu.edit.delete" : "Elimina",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji e Simboli",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Incolla",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Incolla e Mantieni Stile",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Ripeti",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Seleziona Tutto",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Sintesi Vocale",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Avvia Dettatura",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Avvia Pronuncia",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Interrompi Pronuncia",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Annulla",
   "menu.file" : "File",
-   "menu.help" : "Help",
+   "menu.help" : "Aiuto",
   "menu.help.changelog" : "Changelog",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Maggiori Informazioni",
   "menu.help.privacy" : "Informativa sulla Privacy",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Supporto",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Termini di Servizio",
-   "menu.services" : "Services",
+   "menu.services" : "Servizi",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
-   "menu.view" : "View",
+   "menu.view" : "Visualizza",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Visualizza a Tutto Schermo",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Modalità Finestra",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Ricarica Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Ricarica Servizio",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Dimensione Attuale",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Attiva Strumenti Sviluppo",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Passa a Schermo Intero",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Attiva Strumenti per Sviluppatori di Servizi",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Aumenta Zoom",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Diminuisci Zoom",
-   "menu.window" : "Window",
+   "menu.window" : "Finestra",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Chiudi",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Minimizza",
   "password.email.label" : "Indirizzo email",
   "password.headline" : "Reimposta password",
   "password.link.login" : "Accedi al tuo account",
@@ -88,7 +88,7 @@
   "service.disabledHandler.headline" : "{name} è disattivato",
   "services.getStarted" : "Iniziamo",
   "services.welcome" : "Welcome to Franz",
-   "settings.account.account.editButton" : "Edit account",
+   "settings.account.account.editButton" : "Modifica account",
   "settings.account.accountType.basic" : "Account Basic",
   "settings.account.accountType.premium" : "Premium Supporter Account",
   "settings.account.buttonSave" : "Aggiorna profilo",
@@ -110,12 +110,13 @@
   "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
   "settings.app.buttonClearAllCache" : "Svuota la cache",
   "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
-   "settings.app.buttonSearchForUpdate" : "Controlla gli aggiornamenti",
+   "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
   "settings.app.cacheInfo" : "Franz sta utilizzando {size} di spazio su disco.",
   "settings.app.currentVersion" : "Versione attuale:",
   "settings.app.form.autoLaunchInBackground" : "Apri in background",
   "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
   "settings.app.form.beta" : "Includi versioni beta",
+   "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
   "settings.app.form.enableMenuBar" : "Mostra Franz nella Barra del Menu",
   "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
   "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
@@ -201,9 +202,9 @@
   "settings.user.form.lastname" : "Cognome",
   "settings.user.form.newPassword" : "Nuova password",
   "sidebar.addNewService" : "Aggiungi un nuovo servizio",
-   "sidebar.muteApp" : "Disattiva notifiche & audio",
+   "sidebar.muteApp" : "Disattiva notifiche e audio",
   "sidebar.settings" : "Impostazioni",
-   "sidebar.unmuteApp" : "Attiva notifiche & audio",
+   "sidebar.unmuteApp" : "Attiva notifiche e audio",
   "signup.company.label" : "Società",
   "signup.email.label" : "Indirizzo email",
   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo email",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "Attiva notifiche",
   "tabs.item.enableService" : "Attiva servizio",
   "tabs.item.reload" : "Aggiorna",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "{field} non valido",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field} dovrebbe contenere almeno {length} caratteri",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field} è necessario",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field} non è un URL valido",
   "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 0634a8fc8..a7af10aba 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -26,49 +26,49 @@
   "login.serverLogout" : "セッションの期限が切れました。ログインし直して下さい。",
   "login.submit.label" : "サインイン",
   "login.tokenExpired" : "セッションの期限が切れました。ログインし直して下さい。",
-   "menu.app.about" : "About Franz",
+   "menu.app.about" : "Franzについて",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "隠す",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "他を隠す",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "終了",
   "menu.app.settings" : "設定",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "表示する",
   "menu.edit" : "編集",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "コピー",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "切り取り",
   "menu.edit.delete" : "削除",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "絵文字とシンボル",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "貼り付け",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "書式を統一して貼り付け",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "やり直し",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "全て選択",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "読み上げ",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "音声入力を開始",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "読み上げを開始",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "読み上げを停止",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "元に戻す",
-   "menu.file" : "File",
+   "menu.file" : "ファイル",
-   "menu.help" : "Help",
+   "menu.help" : "ヘルプ",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "更新履歴",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "詳細について",
   "menu.help.privacy" : "プライバシーについて",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "サポート",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "サービス利用規約",
-   "menu.services" : "Services",
+   "menu.services" : "サービス",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "サービスを追加",
-   "menu.view" : "View",
+   "menu.view" : "表示",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "全画面表示",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "全画面表示を終了する",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "再起動",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "サービスをリロードする",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "元のサイズ",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "開発者ツールを切り替え",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "全画面表示の切り替え",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "サービス開発者ツールを切り替え",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "表示を拡大する",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "表示を縮小する",
-   "menu.window" : "Window",
+   "menu.window" : "ウィンドウ",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "閉じる",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "最小化",
   "password.email.label" : "メールアドレス",
   "password.headline" : "パスワードのリセット",
   "password.link.login" : "サインイン",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "バックグラウンドで開く",
   "settings.app.form.autoLaunchOnStart" : "システム起動時にFranzを開く",
   "settings.app.form.beta" : "Betaバージョンを含める",
+   "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効にする",
   "settings.app.form.enableMenuBar" : "メニューバーにFranzを表示する",
   "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
   "settings.app.form.enableSystemTray" : "Franzをシステムトレイに表示する",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "通知を有効にする",
   "tabs.item.enableService" : "サービスを有効にする",
   "tabs.item.reload" : "再読み込み",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "{field}は正しくありません",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field}は少なくとも{length}文字以上でなければなりません",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field}は必須です",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field}は正しい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 8eb0fff56..7679bc6fc 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "გახსენით ფონზე",
   "settings.app.form.autoLaunchOnStart" : "გაეშვას Franz სისტემის ჩატვირთვისას",
   "settings.app.form.beta" : "ჩართეთ ბეტა ვერსიები",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "Enable spell checking",
   "settings.app.form.enableSystemTray" : "აჩვენეთ Franz სისტემის უჯრაში",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index fe0135a14..13dc7548e 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
   "settings.app.form.beta" : "Inclusief bèta versies",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "Enable spell checking",
   "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index ac436fc54..4ff3cdd80 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -7,7 +7,7 @@
   "import.submit.label" : "Importeer services",
   "infobar.buttonChangelog" : "Wat is er nieuw?",
   "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
-   "infobar.buttonReloadServices" : "Laad services opnieuw",
+   "infobar.buttonReloadServices" : "Services opnieuw laden",
   "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
   "infobar.updateAvailable" : "Er is een nieuwe update voor Franz beschikbaar.",
@@ -26,39 +26,39 @@
   "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.about" : "Over Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Verbergen",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Andere verbergen",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Afsluiten",
   "menu.app.settings" : "Instellingen",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Tonen",
   "menu.edit" : "Bewerk",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Kopiëren",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Knippen",
   "menu.edit.delete" : "Verwijderen",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji's en symbolen",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Plakken",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Plakken en stijl overeen laten komen",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Opnieuw doen",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Selecteer alles",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Spraak",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Beginnen met dicteren",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Beginnen met praten",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Stoppen met spreken",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Ongedaan maken",
-   "menu.file" : "File",
+   "menu.file" : "Bestand",
-   "menu.help" : "Help",
+   "menu.help" : "Hulp",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Wijzigingenlogboek",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Meer informatie",
   "menu.help.privacy" : "Privacy Voorwaarden",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Ondersteuning",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Servicevoorwaarden",
-   "menu.services" : "Services",
+   "menu.services" : "Diensten",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Nieuwe dienst toevoegen",
-   "menu.view" : "View",
+   "menu.view" : "Weergave",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Gebruik volledig scherm",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Herlaad Franz",
   "menu.view.reloadService" : "Reload Service",
   "menu.view.resetZoom" : "Actual Size",
   "menu.view.toggleDevTools" : "Toggle Developer Tools",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart" : "Open Franz bij opstarten",
   "settings.app.form.beta" : "Inclusief bètaversies",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
   "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
   "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 74ffbe231..9fb72b9c9 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -26,49 +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.about" : "O Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Ukryj",
   "menu.app.hideOthers" : "Hide Others",
   "menu.app.quit" : "Quit",
   "menu.app.settings" : "Ustawienia",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Pokaż",
   "menu.edit" : "Edytuj",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Skopiuj",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Wytnij",
   "menu.edit.delete" : "Usuń",
   "menu.edit.emojiSymbols" : "Emoji & Symbols",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Wklej",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Wklej i dopasuj styl",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Ponów",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Zaznacz wszystko",
   "menu.edit.speech" : "Speech",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "Zacznij dyktować",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Zacznij mówić",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Przestań mówić",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Cofnij",
-   "menu.file" : "File",
+   "menu.file" : "Plik",
-   "menu.help" : "Help",
+   "menu.help" : "Pomoc",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Lista zmian",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Dowiedz się więcej",
   "menu.help.privacy" : "Polityka prywatności",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Wsparcie",
   "menu.help.tos" : "Terms of Service",
-   "menu.services" : "Services",
+   "menu.services" : "Usługi",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Dodaj nową usługę...",
-   "menu.view" : "View",
+   "menu.view" : "Widok",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Przeładuj Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Przeładuj usługę",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Domyślny rozmiar",
   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Przełącz tryb pełnoekranowy",
   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Powiększ",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Pomniejsz",
-   "menu.window" : "Window",
+   "menu.window" : "Okno",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Zamknij",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Zminimalizuj",
   "password.email.label" : "Adres email",
   "password.headline" : "Wyzeruj hasło",
   "password.link.login" : "Zaloguj się na swoje konto",
@@ -116,6 +116,7 @@
   "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.enableGPUAcceleration" : "Włącz akcelerację GPU",
   "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",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 6ba448999..ceb35ce30 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -26,49 +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.about" : "Sobre Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Ocultar",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Ocultar os demais",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Sair",
   "menu.app.settings" : "Ajustes",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Exibir",
   "menu.edit" : "Editar",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Copiar",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Cortar",
   "menu.edit.delete" : "Excluir",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji & Símbolos ",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Colar",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Colar e corresponder ao estilo",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Refazer",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Selecionar tudo",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Discurso",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "iniciar digitação por voz",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "começar a falar",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Parar de falar",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Desfazer",
-   "menu.file" : "File",
+   "menu.file" : "Arquivo",
-   "menu.help" : "Help",
+   "menu.help" : "Ajuda",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Registro de alterações",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Saiba Mais",
   "menu.help.privacy" : "Declaração de privacidade",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Suporte",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Termos de Serviço",
-   "menu.services" : "Services",
+   "menu.services" : "Serviços",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Adicionar Novo Serviço",
-   "menu.view" : "View",
+   "menu.view" : "Visualizar",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Entrar na tela cheia",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Sair da tela cheia",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Recarregar Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Reiniciar o serviço",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Tamanho real",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "alternar ferramentas de desenvolvedor",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "tela cheia",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "habilitar ferramentas de serviços de desenvolvedor",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Ampliar",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "reduzir",
-   "menu.window" : "Window",
+   "menu.window" : "Janela",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Fechar",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Minimizar",
   "password.email.label" : "Endereço de e-mail",
   "password.headline" : "Trocar a senha",
   "password.link.login" : "Fazer login na sua conta",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
   "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
   "settings.app.form.beta" : "Incluir versões beta",
+   "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU (Unidade de Processamento Gráfico)",
   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
   "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
   "settings.app.form.enableSystemTray" : "Exibir o Franz na área de notificações",
@@ -125,7 +126,7 @@
   "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
   "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-   "settings.app.headline" : "Ajustes",
+   "settings.app.headline" : "Configurações",
   "settings.app.headlineAdvanced" : "Avançado",
   "settings.app.headlineAppearance" : "Aparência",
   "settings.app.headlineGeneral" : "Geral",
@@ -240,10 +241,10 @@
   "tabs.item.enableNotification" : "Ativar notificações",
   "tabs.item.enableService" : "Ativar serviço",
   "tabs.item.reload" : "Recarregar",
-   "validation.email" : "{field} is not valid",
+   "validation.email" : "inválido",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{campo} deve ser pelo menos {comprimento} mais caracteres ",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{campo} obrigatório",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{campo} essa URL não é válida",
   "welcome.loginButton" : "Entrar na sua conta",
   "welcome.signupButton" : "Criar uma conta grátis",
   "welcome.slogan" : "Mensagens que funcionam para você"
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 9e6d6ac94..44048e505 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -26,15 +26,15 @@
   "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.about" : "Sobre Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Ocultar",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Ocultar Outros",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Sair",
   "menu.app.settings" : "Definições",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Mostrar",
   "menu.edit" : "Editar",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Copiar",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Cortar",
   "menu.edit.delete" : "Apagar",
   "menu.edit.emojiSymbols" : "Emoji & Symbols",
   "menu.edit.paste" : "Paste",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
   "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.enableGPUAcceleration" : "Enable GPU Acceleration",
   "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 barra do sistema",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 4d9f7f274..ecebc46ee 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -26,49 +26,49 @@
   "login.serverLogout" : "Сессия устарела, пожалуйста, войдите снова.",
   "login.submit.label" : "Вход",
   "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
-   "menu.app.about" : "About Franz",
+   "menu.app.about" : "О Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Скрыть",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Скрыть остальные",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Выйти",
   "menu.app.settings" : "Настройки",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Показать",
   "menu.edit" : "Редактировать",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Копировать",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Вырезать",
   "menu.edit.delete" : "Удалить",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Эмодзи и символы",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Вставить",
   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Вернуть",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Выделить всё",
   "menu.edit.speech" : "Speech",
   "menu.edit.startDictation" : "Start Dictation",
   "menu.edit.startSpeaking" : "Start Speaking",
   "menu.edit.stopSpeaking" : "Stop Speaking",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Отменить",
-   "menu.file" : "File",
+   "menu.file" : "Файл",
-   "menu.help" : "Help",
+   "menu.help" : "Справка",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Журнал изменений",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Подробнее",
   "menu.help.privacy" : "Политика конфиденциальности",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Поддержка",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Условия использования",
   "menu.services" : "Services",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Добавить сервис...",
-   "menu.view" : "View",
+   "menu.view" : "Вид",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "На весь экран",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "В окне",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Перезагрузить Franz",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Перезапустить сервис",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Фактический размер",
   "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.zoomIn" : "Увеличить масштаб",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Уменьшить масштаб",
-   "menu.window" : "Window",
+   "menu.window" : "Окно",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Закрыть",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Свернуть",
   "password.email.label" : "Email адрес",
   "password.headline" : "Сбросить пароль",
   "password.link.login" : "Вход",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
   "settings.app.form.autoLaunchOnStart" : "Запускать Franz при старте",
   "settings.app.form.beta" : "Включая бета версии",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
   "settings.app.form.enableSystemTray" : "Показывать Franz в системном трее",
@@ -170,9 +171,9 @@
   "settings.service.form.headlineBadges" : "Значки непрочитанных сообщений",
   "settings.service.form.headlineGeneral" : "Общие",
   "settings.service.form.headlineNotifications" : "Уведомления",
-   "settings.service.form.icon" : "����ач���� ����������������т����я",
+   "settings.service.form.icon" : "����ста������рт������ ������������",
   "settings.service.form.iconDelete" : "Удалить",
-   "settings.service.form.iconUpload" : "Перетащите картинку или ��������ите сюд��",
+   "settings.service.form.iconUpload" : "Перетащите картинку или ������������те ������сь",
   "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомления для всех сообщений, не только для @username, @channel, @here, ...",
   "settings.service.form.indirectMessages" : "Показывать значок уведомлений для всех новых сообщений",
   "settings.service.form.isMutedInfo" : "Когда выключено, все звуковые уведомления будут отключены",
@@ -235,7 +236,7 @@
   "tabs.item.disableAudio" : "Отключить звук",
   "tabs.item.disableNotifications" : "Отключить уведомления",
   "tabs.item.disableService" : "Отключить сервис",
-   "tabs.item.edit" : "��едак��и����вать",
+   "tabs.item.edit" : "��р��в����",
   "tabs.item.enableAudio" : "Включить аудио",
   "tabs.item.enableNotification" : "Включить уведомления",
   "tabs.item.enableService" : "Включить службу",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 87c1acebc..c43e998a4 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
   "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
   "settings.app.form.beta" : "Vrátane beta verzií",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu bare",
   "settings.app.form.enableSpellchecking" : "Povoliť zvýraznenie preklepov",
   "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index d93712d88..1f31bc834 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -116,6 +116,7 @@
   "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.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 96738d462..d03077d8d 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -26,49 +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.about" : "Franz Hakkında",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "Gizle",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "Diğerlerini Gizle",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "Çıkış",
   "menu.app.settings" : "Ayarlar",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "Göster",
   "menu.edit" : "Düzenle",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "Kopyala",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "Kes",
   "menu.edit.delete" : "Sil",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "Emoji & Semboller",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "Yapıştır",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "Yapıştır ve Stili Eşleştir",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "Yeniden Yap",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "Hepsini Seç",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "Konuşma",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "İmlaya Başla",
-   "menu.edit.startSpeaking" : "Start Speaking",
+   "menu.edit.startSpeaking" : "Konuşmaya Başla",
-   "menu.edit.stopSpeaking" : "Stop Speaking",
+   "menu.edit.stopSpeaking" : "Konuşmayı Bırak\/Durdur",
-   "menu.edit.undo" : "Undo",
+   "menu.edit.undo" : "Geri al",
-   "menu.file" : "File",
+   "menu.file" : "Dosya",
-   "menu.help" : "Help",
+   "menu.help" : "Yardım",
-   "menu.help.changelog" : "Changelog",
+   "menu.help.changelog" : "Değişim Günlüğü",
-   "menu.help.learnMore" : "Learn More",
+   "menu.help.learnMore" : "Daha Fazlasını Öğrenin",
   "menu.help.privacy" : "Gizlilik Sözleşmesi",
-   "menu.help.support" : "Support",
+   "menu.help.support" : "Destek",
-   "menu.help.tos" : "Terms of Service",
+   "menu.help.tos" : "Kullanım Şartları",
-   "menu.services" : "Services",
+   "menu.services" : "Hizmetler",
-   "menu.services.addNewService" : "Add New Service...",
+   "menu.services.addNewService" : "Yeni Servis Ekle",
-   "menu.view" : "View",
+   "menu.view" : "Görünüm",
-   "menu.view.enterFullScreen" : "Enter Full Screen",
+   "menu.view.enterFullScreen" : "Tam Ekrana Geç",
-   "menu.view.exitFullScreen" : "Exit Full Screen",
+   "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
-   "menu.view.reloadFranz" : "Reload Franz",
+   "menu.view.reloadFranz" : "Franz'ı Yeniden Yükle",
-   "menu.view.reloadService" : "Reload Service",
+   "menu.view.reloadService" : "Servisi Tekrar Yükle",
-   "menu.view.resetZoom" : "Actual Size",
+   "menu.view.resetZoom" : "Orijinal Boyut",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
+   "menu.view.toggleDevTools" : "Geliştirici Araçlarına Geç",
-   "menu.view.toggleFullScreen" : "Toggle Full Screen",
+   "menu.view.toggleFullScreen" : "Tam Ekrana Geç",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleServiceDevTools" : "Hizmet Geliştirici Araçlarını Değiştir",
-   "menu.view.zoomIn" : "Zoom In",
+   "menu.view.zoomIn" : "Yakınlaştır",
-   "menu.view.zoomOut" : "Zoom Out",
+   "menu.view.zoomOut" : "Uzaklaştır",
-   "menu.window" : "Window",
+   "menu.window" : "Pencere",
-   "menu.window.close" : "Close",
+   "menu.window.close" : "Kapat",
-   "menu.window.minimize" : "Minimize",
+   "menu.window.minimize" : "Simge Durumuna Küçült",
   "password.email.label" : "E-posta adresi",
   "password.headline" : "Parola sıfırla",
   "password.link.login" : "Hesabına giriş yap",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
   "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
   "settings.app.form.beta" : "Beta versiyonları dahil et",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "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",
@@ -240,10 +241,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.email" : "{alan} geçerli değil",
-   "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.minLength" : "{field} en az {length} karakter uzunluğunda olmalı",
-   "validation.required" : "{field} is required",
+   "validation.required" : "{field} gereklidir",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.url" : "{field} geçerli bir URL değil",
   "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 f7c946436..3f732b896 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
   "settings.app.form.autoLaunchOnStart" : "Запускати Franz на початку",
   "settings.app.form.beta" : "Включити бета-версії",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
   "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
   "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 71e6d65bc..3bbcc8288 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -16,7 +16,7 @@
   "invite.name.label" : "名稱",
   "invite.skip.label" : "我想稍後再做",
   "invite.submit.label" : "送出邀請",
-   "invite.successInfo" : "Invitations sent successfully",
+   "invite.successInfo" : "註冊請求已送出",
   "login.email.label" : "電子郵件地址",
   "login.headline" : "登入",
   "login.invalidCredentials" : "電子郵件或密碼有誤",
@@ -26,23 +26,23 @@
   "login.serverLogout" : "您的登入期間已過期，請重新登錄",
   "login.submit.label" : "登入",
   "login.tokenExpired" : "您的登入已過期，請重新登入。",
-   "menu.app.about" : "About Franz",
+   "menu.app.about" : "關於Franz",
-   "menu.app.hide" : "Hide",
+   "menu.app.hide" : "隱藏",
-   "menu.app.hideOthers" : "Hide Others",
+   "menu.app.hideOthers" : "隱藏其他",
-   "menu.app.quit" : "Quit",
+   "menu.app.quit" : "結束",
   "menu.app.settings" : "設定",
-   "menu.app.unhide" : "Unhide",
+   "menu.app.unhide" : "顯示",
   "menu.edit" : "編輯",
-   "menu.edit.copy" : "Copy",
+   "menu.edit.copy" : "拷貝",
-   "menu.edit.cut" : "Cut",
+   "menu.edit.cut" : "剪下",
-   "menu.edit.delete" : "Delete",
+   "menu.edit.delete" : "刪除",
-   "menu.edit.emojiSymbols" : "Emoji & Symbols",
+   "menu.edit.emojiSymbols" : "貼紙和表情包",
-   "menu.edit.paste" : "Paste",
+   "menu.edit.paste" : "貼上",
-   "menu.edit.pasteAndMatchStyle" : "Paste And Match Style",
+   "menu.edit.pasteAndMatchStyle" : "貼上并匹配樣式",
-   "menu.edit.redo" : "Redo",
+   "menu.edit.redo" : "重來",
-   "menu.edit.selectAll" : "Select All",
+   "menu.edit.selectAll" : "選擇所有",
-   "menu.edit.speech" : "Speech",
+   "menu.edit.speech" : "朗讀",
-   "menu.edit.startDictation" : "Start Dictation",
+   "menu.edit.startDictation" : "開始聽寫",
   "menu.edit.startSpeaking" : "Start Speaking",
   "menu.edit.stopSpeaking" : "Stop Speaking",
   "menu.edit.undo" : "Undo",
@@ -116,6 +116,7 @@
   "settings.app.form.autoLaunchInBackground" : "在背景開啟",
   "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
   "settings.app.form.beta" : "包含測試版",
+   "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
   "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
   "settings.app.form.enableSystemTray" : "顯示Franz在系統列",
@@ -171,7 +172,7 @@
   "settings.service.form.headlineGeneral" : "一般",
   "settings.service.form.headlineNotifications" : "Notifications",
   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconDelete" : "刪除",
   "settings.service.form.iconUpload" : "Drop your image, or click here",
   "settings.service.form.indirectMessageInfo" : "您將收到有關頻道中所有新消息的通知，而不僅僅是@username，@channel，@here，...",
   "settings.service.form.indirectMessages" : "顯示所有新消息的消息標誌",
diff --git a/src/index.js b/src/index.js
index 897943a85..5ba901b89 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,6 +12,8 @@ import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
+const debug = require('debug')('App');
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
@@ -57,6 +59,12 @@ if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESK
 // Initialize Settings
 const settings = new Settings();
+// Disable GPU acceleration
+if (!settings.get('enableGPUAcceleration')) {
+  debug('Disable GPU Acceleration');
+  app.disableHardwareAcceleration();
+}
 const createWindow = () => {
  // Remember window size
  const mainWindowState = windowStateKeeper({
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5a05e47b3..19b8d5b15 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -415,7 +415,7 @@ const _titleBarTemplateFactory = intl => [
        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
          ? intl.formatMessage(menuItems.exitFullScreen)
          : intl.formatMessage(menuItems.enterFullScreen),
-        accelerator: `${ctrlKey}+F`,
+        accelerator: 'F11',
        click(menuItem, browserWindow) {
          browserWindow.setFullScreen(!browserWindow.isFullScreen());
        },
@@ -431,14 +431,14 @@ const _titleBarTemplateFactory = intl => [
    submenu: [
      {
        label: intl.formatMessage(menuItems.minimize),
-        accelerator: 'Alt+M',
+        accelerator: 'Ctrl+M',
        click(menuItem, browserWindow) {
          browserWindow.minimize();
        },
      },
      {
        label: intl.formatMessage(menuItems.close),
-        accelerator: 'Alt+W',
+        accelerator: 'Ctrl+W',
        click(menuItem, browserWindow) {
          browserWindow.close();
        },
@@ -450,7 +450,7 @@ const _titleBarTemplateFactory = intl => [
    submenu: [
      {
        label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('http://meetfranz.com'); },
+        click() { shell.openExternal('https://meetfranz.com'); },
      },
      {
        label: intl.formatMessage(menuItems.changelog),
@@ -461,7 +461,7 @@ const _titleBarTemplateFactory = intl => [
      },
      {
        label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('http://meetfranz.com/support'); },
+        click() { shell.openExternal('https://meetfranz.com/support'); },
      },
      {
        type: 'separator',
@@ -643,10 +643,7 @@ export default class FranzMenu {
        },
        {
          label: intl.formatMessage(menuItems.quit),
-          accelerator: 'Alt+F4',
+          role: 'quit',
-          click: () => {
-            app.quit();
-          },
        },
      ];
diff --git a/src/models/Settings.js b/src/models/Settings.js
index e39b63087..0e4c59057 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -2,19 +2,29 @@ import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 export default class Settings {
-  @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
+  @observable app = DEFAULT_APP_SETTINGS
-  @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
-  @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
-  @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
-  @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
-  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
-  @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
-  @observable locale = DEFAULT_APP_SETTINGS.locale;
-  @observable beta = DEFAULT_APP_SETTINGS.beta;
-  @observable isAppMuted = DEFAULT_APP_SETTINGS.isAppMuted;
-  constructor(data) {
+  @observable service = {
-    Object.assign(this, data);
+    activeService: '',
+  }
+  @observable group = {
+    collapsed: [],
+    disabled: [],
+  }
+  @observable stats = {
+    appStarts: 0,
+  }
+  @observable migration = {}
+  constructor({ app, service, group, stats, migration }) {
+    Object.assign(this.app, app);
+    Object.assign(this.service, service);
+    Object.assign(this.group, group);
+    Object.assign(this.stats, stats);
+    Object.assign(this.migration, migration);
  }
  update(data) {
diff --git a/src/models/User.js b/src/models/User.js
index 2e5df4795..3e4aa187d 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -15,6 +15,7 @@ export default class User {
  @observable donor = {};
  @observable isDonor = false;
  @observable isMiner = false;
+  @observable locale = false;
  constructor(data) {
    if (!data.id) {
@@ -33,5 +34,6 @@ export default class User {
    this.isDonor = data.isDonor || this.isDonor;
    this.isSubscriptionOwner = data.isSubscriptionOwner || this.isSubscriptionOwner;
    this.isMiner = data.isMiner || this.isMiner;
+    this.locale = data.locale || this.locale;
  }
 }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 4ac8325d4..38edff1b4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -15,8 +15,12 @@ import { gaEvent } from '../lib/analytics';
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
+const debug = require('debug')('AppStore');
 const { app } = remote;
+const mainWindow = remote.getCurrentWindow();
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
  name: 'Franz',
@@ -48,6 +52,8 @@ export default class AppStore extends Store {
  @observable isClearingAllCache = false;
+  @observable isFullScreen = mainWindow.isFullScreen();
  constructor(...args) {
    super(...args);
@@ -80,6 +86,10 @@ export default class AppStore extends Store {
    window.addEventListener('online', () => { this.isOnline = true; });
    window.addEventListener('offline', () => { this.isOnline = false; });
+    mainWindow.on('enter-full-screen', () => { this.isFullScreen = true; });
+    mainWindow.on('leave-full-screen', () => { this.isFullScreen = false; });
    this.isOnline = navigator.onLine;
    // Check if Franz should launch on start
@@ -157,7 +167,7 @@ export default class AppStore extends Store {
  // Actions
  @action _notify({ title, options, notificationId, serviceId = null }) {
-    if (this.stores.settings.all.isAppMuted) return;
+    if (this.stores.settings.all.app.isAppMuted) return;
    const notification = new window.Notification(title, options);
    notification.onclick = (e) => {
@@ -170,8 +180,6 @@ export default class AppStore extends Store {
        this.actions.service.setActive({ serviceId });
-        const mainWindow = remote.getCurrentWindow();
        if (isWindows) {
          mainWindow.restore();
        } else if (isLinux) {
@@ -238,14 +246,15 @@ export default class AppStore extends Store {
    this.isSystemMuteOverridden = overrideSystemMute;
    this.actions.settings.update({
-      settings: {
+      type: 'app',
+      data: {
        isAppMuted: isMuted,
      },
    });
  }
  @action _toggleMuteApp() {
-    this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
+    this._muteApp({ isMuted: !this.stores.settings.all.app.isAppMuted });
  }
  @action async _clearAllCache() {
@@ -279,13 +288,19 @@ export default class AppStore extends Store {
  }
  _setLocale() {
-    const locale = this.stores.settings.all.locale;
+    let locale;
+    if (this.stores.user.isLoggedIn) {
+      locale = this.stores.user.data.locale;
+    }
    if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
      this.locale = locale;
    } else if (!locale) {
      this.locale = this._getDefaultLocale();
    }
+    debug(`Set locale to "${this.locale}"`);
  }
  _getDefaultLocale() {
@@ -327,8 +342,9 @@ export default class AppStore extends Store {
  // Helpers
  _appStartsCounter() {
    this.actions.settings.update({
-      settings: {
+      type: 'stats',
-        appStarts: (this.stores.settings.all.appStarts || 0) + 1,
+      data: {
+        appStarts: (this.stores.settings.all.stats.appStarts || 0) + 1,
      },
    });
  }
@@ -336,7 +352,8 @@ export default class AppStore extends Store {
  async _autoStart() {
    this.autoLaunchOnStart = await this._checkAutoStart();
-    if (this.stores.settings.all.appStarts === 1) {
+    if (this.stores.settings.all.stats.appStarts === 1) {
+      debug('Set app to launch on start');
      this.actions.app.launchOnStartup({
        enable: true,
      });
@@ -349,7 +366,7 @@ export default class AppStore extends Store {
  _systemDND() {
    const dnd = getDoNotDisturb();
-    if (dnd !== this.stores.settings.all.isAppMuted && !this.isSystemMuteOverridden) {
+    if (dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden) {
      this.actions.app.muteApp({
        isMuted: dnd,
        overrideSystemMute: false,
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index f7d92b1ff..ccb85421a 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,8 +1,5 @@
-// import { remote } from 'electron';
+import { action, reaction, computed, observable } from 'mobx';
-import { action, computed, observable } from 'mobx';
 import { debounce, remove } from 'lodash';
-// import path from 'path';
-// import fs from 'fs-extra';
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -63,13 +60,20 @@ export default class ServicesStore extends Store {
      this._mapActiveServiceToServiceModelReaction.bind(this),
      this._saveActiveService.bind(this),
      this._logoutReaction.bind(this),
-      this._shareSettingsWithServiceProcess.bind(this),
    ]);
    // Just bind this
    this._initializeServiceRecipeInWebview.bind(this);
  }
+  setup() {
+    // Single key reactions
+    reaction(
+      () => this.stores.settings.all.app.enableSpellchecking,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+  }
  @computed get all() {
    if (this.stores.user.isLoggedIn) {
      const services = this.allServicesRequest.execute().result;
@@ -86,13 +90,13 @@ export default class ServicesStore extends Store {
  }
  @computed get allDisplayed() {
-    return this.stores.settings.all.showDisabledServices ? this.all : this.enabled;
+    return this.stores.settings.all.app.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);
+    return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled);
  }
  @computed get filtered() {
@@ -334,7 +338,7 @@ export default class ServicesStore extends Store {
      });
    } else if (channel === 'notification') {
      const options = args[0].options;
-      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.isAppMuted) {
+      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
        Object.assign(options, {
          silent: true,
        });
@@ -434,7 +438,7 @@ export default class ServicesStore extends Store {
  }
  @action _reorder({ oldIndex, newIndex }) {
-    const showDisabledServices = this.stores.settings.all.showDisabledServices;
+    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
    const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
    const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
@@ -512,7 +516,8 @@ export default class ServicesStore extends Store {
    if (service) {
      this.actions.settings.update({
-        settings: {
+        type: 'service',
+        data: {
          activeService: service.id,
        },
      });
@@ -520,7 +525,7 @@ export default class ServicesStore extends Store {
  }
  _mapActiveServiceToServiceModelReaction() {
-    const { activeService } = this.stores.settings.all;
+    const { activeService } = this.stores.settings.all.service;
    if (this.allDisplayed.length) {
      this.allDisplayed.map(service => Object.assign(service, {
        isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id,
@@ -529,7 +534,7 @@ export default class ServicesStore extends Store {
  }
  _getUnreadMessageCountReaction() {
-    const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
+    const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted;
    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
    const unreadDirectMessageCount = this.allDisplayed
@@ -553,7 +558,10 @@ export default class ServicesStore extends Store {
  _logoutReaction() {
    if (!this.stores.user.isLoggedIn) {
-      this.actions.settings.remove({ key: 'activeService' });
+      this.actions.settings.remove({
+        type: 'service',
+        key: 'activeService',
+      });
      this.allServicesRequest.invalidate().reset();
    }
  }
@@ -561,7 +569,7 @@ export default class ServicesStore extends Store {
  _shareSettingsWithServiceProcess() {
    this.actions.service.sendIPCMessageToAllServices({
      channel: 'settings-update',
-      args: this.stores.settings.all,
+      args: this.stores.settings.all.app,
    });
  }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index b7d803398..d8519c609 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,12 +1,17 @@
-import { ipcRenderer } from 'electron';
+import { action, computed, observable } from 'mobx';
-import { action, computed } from 'mobx';
 import localStorage from 'mobx-localstorage';
 import Store from './lib/Store';
-import { gaEvent } from '../lib/analytics';
 import SettingsModel from '../models/Settings';
+import Request from './lib/Request';
+import CachedRequest from './lib/CachedRequest';
+const debug = require('debug')('SettingsStore');
 export default class SettingsStore extends Store {
+  @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
+  @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
  constructor(...args) {
    super(...args);
@@ -15,36 +20,89 @@ export default class SettingsStore extends Store {
    this.actions.settings.remove.listen(this._remove.bind(this));
  }
-  setup() {
+  async setup() {
-    this._shareSettingsWithMainProcess();
+    // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
+    await this.appSettingsRequest._promise;
+    this._migrate();
  }
  @computed get all() {
-    return new SettingsModel(localStorage.getItem('app') || {});
+    return new SettingsModel({
+      app: this.appSettingsRequest.execute().result || {},
+      service: localStorage.getItem('service') || {},
+      group: localStorage.getItem('group') || {},
+      stats: localStorage.getItem('stats') || {},
+      migration: localStorage.getItem('migration') || {},
+    });
  }
-  @action async _update({ settings }) {
+  @action async _update({ type, data }) {
    const appSettings = this.all;
-    localStorage.setItem('app', Object.assign(appSettings, settings));
+    if (type !== 'app') {
+      debug('Update settings', type, data, this.all);
+      localStorage.setItem(type, Object.assign(appSettings[type], data));
+    } else {
+      debug('Update settings on file system', type, data);
+      this.updateAppSettingsRequest.execute(data);
-    // We need a little hack to wait until everything is patched
+      this.appSettingsRequest.patch((result) => {
-    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
+        if (!result) return;
+        Object.assign(result, data);
-    gaEvent('Settings', 'update');
+      });
+    }
  }
-  @action async _remove({ key }) {
+  @action async _remove({ type, key }) {
-    const appSettings = this.all;
+    if (type === 'app') return; // app keys can't be deleted
+    const appSettings = this.all[type];
    if (Object.hasOwnProperty.call(appSettings, key)) {
      delete appSettings[key];
-      localStorage.setItem('app', appSettings);
-    }
-    this._shareSettingsWithMainProcess();
+      this.actions.settings.update({
+        type,
+        data: appSettings,
+      });
+    }
  }
-  // Reactions
+  // Helper
-  _shareSettingsWithMainProcess() {
+  _migrate() {
-    ipcRenderer.send('settings', this.all);
+    const legacySettings = localStorage.getItem('app');
+    if (!this.all.migration['5.0.0-beta.17-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          autoLaunchInBackground: legacySettings.autoLaunchInBackground,
+          runInBackground: legacySettings.runInBackground,
+          enableSystemTray: legacySettings.enableSystemTray,
+          minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          isAppMuted: legacySettings.isAppMuted,
+          enableGPUAcceleration: legacySettings.enableGPUAcceleration,
+          showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
+          showDisabledServices: legacySettings.showDisabledServices,
+          enableSpellchecking: legacySettings.enableSpellchecking,
+        },
+      });
+      this.actions.settings.update({
+        type: 'service',
+        data: {
+          activeService: legacySettings.activeService,
+        },
+      });
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.17-settings': true,
+        },
+      });
+      localStorage.removeItem('app');
+      debug('Migrated settings to split stores');
+    }
  }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 5e9cc9ba7..b391bdcae 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -17,7 +17,7 @@ export default class UIStore extends Store {
  @computed get showMessageBadgesEvenWhenMuted() {
    const settings = this.stores.settings.all;
-    return (settings.isAppMuted && settings.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+    return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
  }
  // Actions
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7dbbd955b..574616925 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -9,6 +9,8 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
+const debug = require('debug')('UserStore');
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
  BASE_ROUTE = '/auth';
@@ -69,6 +71,11 @@ export default class UserStore extends Store {
    ]);
  }
+  setup() {
+    // Data migration
+    this._migrateUserLocale();
+  }
  // Routes
  get loginRoute() {
    return this.LOGIN_ROUTE;
@@ -256,8 +263,10 @@ export default class UserStore extends Store {
      // We need to set the beta flag for the SettingsStore
      this.actions.settings.update({
-        settings: {
+        type: 'app',
+        data: {
          beta: data.beta,
+          locale: data.locale,
        },
      });
    }
@@ -292,4 +301,17 @@ export default class UserStore extends Store {
      this.id = null;
    }
  }
+  async _migrateUserLocale() {
+    await this.getUserInfoRequest._promise;
+    if (!this.data.locale) {
+      debug('Migrate "locale" to user data');
+      this.actions.user.update({
+        userData: {
+          locale: this.stores.app.locale,
+        },
+      });
+    }
+  }
 }
diff --git a/src/styles/title-bar.scss b/src/styles/title-bar.scss
index 492245e2f..5316f35b3 100644
--- a/src/styles/title-bar.scss
+++ b/src/styles/title-bar.scss
@@ -32,8 +32,7 @@
      margin: 4px;
      border-radius: $theme-border-radius-small;
    }
-    &.selected {
+    &.selected, &.selected:focus {
-      // background: $theme-brand-primary;
      background: none;
      .menu-item {
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index 52b19b3fd..c6530fef6 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -8,6 +8,8 @@ import RecipeWebview from './lib/RecipeWebview';
 import Spellchecker from './spellchecker';
 import './notifications';
+const debug = require('debug')('Plugin');
 ipcRenderer.on('initializeRecipe', (e, data) => {
  const modulePath = path.join(data.recipe.path, 'webview.js');
  // Delete module from cache
@@ -15,8 +17,9 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
  try {
    // eslint-disable-next-line
    require(modulePath)(new RecipeWebview(), data);
+    debug('Initialize Recipe');
  } catch (err) {
-    console.error(err);
+    debug('Recipe initialization failed', err);
  }
 });
@@ -31,6 +34,7 @@ new ContextMenuListener((info) => { // eslint-disable-line
 ipcRenderer.on('settings-update', (e, data) => {
  spellchecker.toggleSpellchecker(data.enableSpellchecking);
+  debug('Settings update received', data);
 });
 // initSpellche
author	Stefan Malzner <stefan@adlk.io>	2018-04-04 21:23:38 +0200
committer	GitHub <noreply@github.com>	2018-04-04 21:23:38 +0200
commit	1790b795238c2abe832285197cb88c0833bd98ca (patch)
tree	89d4bc3632efc05822c0bec53a883b2d092bfd69
parent	Fix typo [ci skip] (diff)
parent	Merge branch 'master' into release/5.0.0-beta.18 (diff)
download	ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.gz ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.zst ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.zip