From 93137229bf3b04e4589ae315a81ed2de7a171ded Mon Sep 17 00:00:00 2001
From: Dominik Guzei <dominik.guzei@gmail.com>
Date: Thu, 21 Mar 2019 16:35:38 +0100
Subject: fix merge conflicts with latest develop

---
 CHANGELOG.md                               | 27 +++++++++++++++++++++
 README.md                                  |  5 +---
 appveyor.yml                               |  2 +-
 package.json                               |  2 +-
 packages/forms/package.json                |  6 ++---
 packages/forms/src/button/index.tsx        |  1 +
 packages/forms/src/input/index.tsx         |  9 +++++--
 packages/forms/src/label/index.tsx         |  2 ++
 packages/theme/package.json                |  4 +--
 packages/theme/src/themes/default/index.ts |  4 ++-
 packages/typings/package.json              |  4 +--
 packages/ui/package.json                   |  6 ++---
 packages/ui/src/infobox/index.tsx          |  7 +++++-
 src/i18n/locales/ca.json                   | 15 +++++-------
 src/i18n/locales/cs.json                   | 15 +++++-------
 src/i18n/locales/de.json                   | 33 ++++++++++++-------------
 src/i18n/locales/el.json                   | 15 +++++-------
 src/i18n/locales/es.json                   | 19 ++++++---------
 src/i18n/locales/fr.json                   | 33 ++++++++++++-------------
 src/i18n/locales/ga.json                   | 15 +++++-------
 src/i18n/locales/hr.json                   | 15 +++++-------
 src/i18n/locales/hu.json                   | 15 +++++-------
 src/i18n/locales/id.json                   | 15 +++++-------
 src/i18n/locales/it.json                   | 15 +++++-------
 src/i18n/locales/ja.json                   | 15 +++++-------
 src/i18n/locales/ka.json                   | 15 +++++-------
 src/i18n/locales/nl-BE.json                | 15 +++++-------
 src/i18n/locales/nl.json                   | 15 +++++-------
 src/i18n/locales/pl.json                   | 15 +++++-------
 src/i18n/locales/pt-BR.json                | 33 ++++++++++++-------------
 src/i18n/locales/pt.json                   | 15 +++++-------
 src/i18n/locales/ru.json                   | 17 ++++++-------
 src/i18n/locales/sk.json                   | 15 +++++-------
 src/i18n/locales/sr.json                   | 15 +++++-------
 src/i18n/locales/tr.json                   | 39 ++++++++++++++----------------
 src/i18n/locales/uk.json                   | 15 +++++-------
 src/i18n/locales/zh-TW.json                | 15 +++++-------
 uidev/src/stories/button.stories.tsx       |  5 ++++
 uidev/src/stories/infobox.stories.tsx      |  9 +++++++
 uidev/src/stories/input.stories.tsx        |  8 ++++++
 40 files changed, 267 insertions(+), 278 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 641cd2b6b..998d40f4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18)
+
+
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+### Features
+
+* **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a))
+* **App:** Update electron to 4.0.8 ([8336d17](https://github.com/meetfranz/franz/commit/8336d17))
+* **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e))
+* **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325))
+* **Windows:** Add option to quit Franz from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b))
+
+### Bug Fixes
+
+* **Linux:** Fix minimized window focusing ([#1304](https://github.com/meetfranz/franz/issues/1304)) ([@skoruppa](https://github.com/skoruppa)) ([5b02c4d](https://github.com/meetfranz/franz/commit/5b02c4d))
+* **Notifications:** Fix notifications & notification click when icon is blob ([03589f6](https://github.com/meetfranz/franz/commit/03589f6))
+* **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59))
+* **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342))
+* **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316)
+* **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722))
+
+
+
 # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15)
 
 ### General
diff --git a/README.md b/README.md
index d44cfaa6c..5397189c6 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
-**This repository is only for Franz 5 and later, previous versions are no longer maintained.**
----
-
 <img src="./build-helpers/images/icon.png" alt="" width="150"/>
 
-# Franz 5 (beta)
+# Franz 5
 [![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master)
  [![Build Status Mac & Linux](https://travis-ci.com/meetfranz/franz.svg?branch=master)](https://travis-ci.com/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://meetfranz.com/payment.html)
 
diff --git a/appveyor.yml b/appveyor.yml
index 70b8d6f1f..0ed8866a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
   CSC_KEY_PASSWORD:
     secure: t8ypNTPKTmvRfd3hHA4aMOtC5KOFqOw3AsKhpU7140Q=
 
-version: 5.0.0.{build}
+version: 5.0.1.{build}
 
 install:
   - ps: Install-Product node 10
diff --git a/package.json b/package.json
index df7fa4191..ec135ca77 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0",
+  "version": "5.0.1-beta.1",
   "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/packages/forms/package.json b/packages/forms/package.json
index e78929777..fe161a282 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/forms",
-  "version": "1.0.9",
+  "version": "1.0.13",
   "description": "React form components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@mdi/js": "^3.3.92",
     "@mdi/react": "^1.1.0",
-    "@meetfranz/theme": "^1.0.7",
+    "@meetfranz/theme": "^1.0.11",
     "react-html-attributes": "^1.4.3",
     "react-loader": "^2.4.5"
   },
@@ -35,5 +35,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b"
+  "gitHead": "27778954921365e4957eae964e28f68690f3825f"
 }
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx
index 7a7f83dab..6959cde73 100644
--- a/packages/forms/src/button/index.tsx
+++ b/packages/forms/src/button/index.tsx
@@ -44,6 +44,7 @@ const styles = (theme: Theme) => ({
     width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>,
     fontSize: theme.uiFontSize,
     textDecoration: 'none',
+    height: theme.buttonHeight,
 
     '&:hover': {
       opacity: 0.8,
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx
index cc3709b1a..f89c91be5 100644
--- a/packages/forms/src/input/index.tsx
+++ b/packages/forms/src/input/index.tsx
@@ -34,7 +34,7 @@ interface IState {
 }
 
 class InputComponent extends Component<IProps, IState> {
-  public static defaultProps = {
+  static defaultProps = {
     focus: false,
     onChange: () => {},
     onBlur: () => {},
@@ -109,8 +109,10 @@ class InputComponent extends Component<IProps, IState> {
       placeholder,
       spellCheck,
       onBlur,
-      onEnterKey,
       onFocus,
+      min,
+      max,
+      step,
     } = this.props;
 
     const {
@@ -157,6 +159,9 @@ class InputComponent extends Component<IProps, IState> {
               onBlur={onBlur}
               disabled={disabled}
               onKeyPress={this.onInputKeyPress.bind(this)}
+              min={min}
+              max={max}
+              step={step}
             />
             {suffix && (
               <span className={classes.suffix}>
diff --git a/packages/forms/src/label/index.tsx b/packages/forms/src/label/index.tsx
index 36fcfbedf..590270a06 100644
--- a/packages/forms/src/label/index.tsx
+++ b/packages/forms/src/label/index.tsx
@@ -26,6 +26,8 @@ class LabelComponent extends Component<ILabel> {
       htmlFor,
     } = this.props;
 
+    if (!showLabel) return children;
+
     return (
       <label
         className={classnames({
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 5c21a787f..3034d6347 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/theme",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Theme configuration for Franz",
   "author": "Stefan Malzner <stefan@adlk.io>",
   "homepage": "https://github.com/meetfranz/franz",
@@ -25,5 +25,5 @@
   "dependencies": {
     "color": "^3.1.0"
   },
-  "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b"
+  "gitHead": "27778954921365e4957eae964e28f68690f3825f"
 }
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index 2290b18e3..f2632ee20 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -42,7 +42,7 @@ export const colorWebviewLoaderBackground = color(legacyStyles.themeGrayLighter)
 // Input
 export const labelColor = legacyStyles.themeGrayLight;
 export const inputColor = legacyStyles.themeGray;
-export const inputHeight = '35px';
+export const inputHeight = 40;
 export const inputBackground = legacyStyles.themeGrayLightest;
 export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`;
 export const inputModifierColor = legacyStyles.themeGrayLight;
@@ -108,6 +108,8 @@ export const buttonInvertedBackground = 'none';
 export const buttonInvertedTextColor = brandPrimary;
 export const buttonInvertedBorder = `1px solid ${brandPrimary}`;
 
+export const buttonHeight = inputHeight;
+
 export const buttonLoaderColor = {
   primary: '#FFF',
   secondary: buttonSecondaryTextColor,
diff --git a/packages/typings/package.json b/packages/typings/package.json
index 54257c54c..5207cf3c6 100644
--- a/packages/typings/package.json
+++ b/packages/typings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/typings",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "TypeScript typings for internal and external projects",
   "author": "Stefan Malzner <stefan@adlk.io>",
   "homepage": "https://github.com/meetfranz/franz",
@@ -18,5 +18,5 @@
   "bugs": {
     "url": "https://github.com/meetfranz/franz/issues"
   },
-  "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b"
+  "gitHead": "27778954921365e4957eae964e28f68690f3825f"
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 62a1e5a6e..fb36555c4 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/ui",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "React UI components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@mdi/js": "^3.3.92",
     "@mdi/react": "^1.1.0",
-    "@meetfranz/theme": "^1.0.7",
+    "@meetfranz/theme": "^1.0.11",
     "react-loader": "^2.4.5"
   },
   "peerDependencies": {
@@ -34,5 +34,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b"
+  "gitHead": "27778954921365e4957eae964e28f68690f3825f"
 }
diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx
index 53ed16341..1a442a733 100644
--- a/packages/ui/src/infobox/index.tsx
+++ b/packages/ui/src/infobox/index.tsx
@@ -15,6 +15,7 @@ interface IProps extends IWithStyle {
   ctaLabel?: string;
   ctaLoading?: boolean;
   children: React.ReactNode;
+  className: string;
 }
 
 interface IState {
@@ -138,6 +139,7 @@ class InfoboxComponent extends Component<IProps, IState> {
       ctaLoading,
       ctaOnClick,
       dismissable,
+      className,
     } = this.props;
 
     const {
@@ -150,7 +152,10 @@ class InfoboxComponent extends Component<IProps, IState> {
     }
 
     return (
-      <div className={classes.wrapper}>
+      <div className={classnames({
+        [classes.wrapper]: true,
+        [`${className}`]: className,
+      })}>
         <div
           className={classnames({
             [classes.infobox]: true,
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index f374fddd9..dabe4ba16 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Suport",
    "menu.help.tos" : "Condicions del Servei",
    "menu.services" : "Serveis",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Afegeix un servei...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualitza",
    "menu.view.enterFullScreen" : "Inicia la pantalla completa",
    "menu.view.exitFullScreen" : "Surt de pantalla completa",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Descarregar",
    "settings.account.manageSubscription.label" : "Gestioneu la vostra subscripció",
    "settings.account.successInfo" : "S'han desat els canvis",
+   "settings.account.tryReloadServices" : "Torna a provar-ho",
    "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
    "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
    "settings.app.buttonClearAllCache" : "Buida la memòria cau",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Inclou versions beta",
    "settings.app.form.darkMode" : "Uneix-te al Cantó Fosc",
    "settings.app.form.enableGPUAcceleration" : "Activar acceleració GPU",
-   "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",
-   "settings.app.form.hideDockIcon" : "Oculta la icona de Franz al Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimitza Franz a la safata del sistema",
    "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
    "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
-   "settings.app.form.spellcheckerLanguage" : "Corrector ortogràfic",
    "settings.app.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Siusplau, reinicieu el Franz després de canviar els ajustaments de proxy",
    "settings.service.form.proxy.user" : "Usuari (opcional)",
    "settings.service.form.saveButton" : "Desa el servei",
-   "settings.service.form.spellcheckerLanguage" : "Idioma del corrector",
-   "settings.service.form.spellcheckerLanguage.default" : "Utilitzar el predeterminat del sistema ({default})",
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ⭐️",
    "settings.service.form.team" : "Equip",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descobrir serveis",
    "settings.services.headline" : "Els vostres serveis",
    "settings.services.noServicesAdded" : "Encara no heu afegit cap servei.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "El servei està desactivat",
    "settings.services.tooltip.isMuted" : "Tots els sons estan desactivats",
    "settings.services.tooltip.notificationsDisabled" : "Les notificacions estan desactivades",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residents d'EU: es poden aplicar impostos locals",
    "subscription.features.ads" : "Sense anuncis, mai!",
    "subscription.features.comingSoon" : "properament",
-   "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
    "subscription.features.noInterruptions" : "Sense retards ni molestes actualitzacions de llicències ",
-   "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
    "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
    "subscription.features.proxy" : "Suport de Proxy per a serveis",
    "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recarrega",
    "validation.email" : "{field} no es vàlid",
    "validation.minLength" : "{field} ha de ser al menys {length} caràcters de llargada",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} es requerit",
    "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"
+   "welcome.signupButton" : "Crea un compte gratuït"
 }
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 3fc6318a2..f0b0b7c81 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmínky použití",
    "menu.services" : "Služby",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Přidat novou službu...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Zobrazení",
    "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
    "menu.view.exitFullScreen" : "Ukončit celoobrazovkový režim",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Stáhnout",
    "settings.account.manageSubscription.label" : "Spravovat vaše předplatné",
    "settings.account.successInfo" : "Vaše změny byly uloženy",
+   "settings.account.tryReloadServices" : "Zkusit opět",
    "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
    "settings.account.userInfoRequestFailed" : "Nelze načíst informace o uživateli.",
    "settings.app.buttonClearAllCache" : "Vyprázdnit mezipaměti",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Zahrnout beta verze",
    "settings.app.form.darkMode" : "Připoj se k Temné straně",
    "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ě",
-   "settings.app.form.hideDockIcon" : "Schovej ikonu Franz v Docku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovat Franz do systémové lišty",
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
    "settings.app.form.showDisabledServices" : "Zobrazit záložky vypnutých služeb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
-   "settings.app.form.spellcheckerLanguage" : "Oprava překlepů jazyka",
    "settings.app.headline" : "Nastavení",
    "settings.app.headlineAdvanced" : "Pokročilé",
    "settings.app.headlineAppearance" : "Vzhled",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložit službu",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ⭐️",
    "settings.service.form.team" : "Tým",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Objevte služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposud jste nepřidali žádné služby.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Služba je zakázána",
    "settings.services.tooltip.isMuted" : "Všechny zvuky jsou ztišeny",
    "settings.services.tooltip.notificationsDisabled" : "Oznámení jsou zakázána",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Pro obyvatelé EU: mohou být aplikovány lokální daně",
    "subscription.features.ads" : "Žádné reklamy, nikdy!",
    "subscription.features.comingSoon" : "již brzy",
-   "subscription.features.encryptedSync" : "Šifrovaná synchronizace relací",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Obnovit",
    "validation.email" : "{field} není validní",
    "validation.minLength" : "{field} musí být alespoň {length} znaků dlouhé",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "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"
+   "welcome.signupButton" : "Vytvořit účet zdarma"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 3ca62ca56..06a03db65 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Upgrade deinen Account",
    "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
    "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Als E-Mail senden",
+   "feature.shareFranz.action.facebook" : "Auf Facebook teilen",
+   "feature.shareFranz.action.twitter" : "Auf Twitter teilen",
+   "feature.shareFranz.headline" : "Gemeinsam ist Franz noch besser!",
+   "feature.shareFranz.shareText.email" : "Ich verwende Franz! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Ich verwende Franz mit {count} Diensten! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und mehr auf www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kollegen wie toll du Franz findest.",
    "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
    "global.spellchecker.useDefault" : "Standard benutzen ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Sprache automatisch erkennen",
+   "global.spellchecking.autodetect.short" : "Automatisch",
    "global.spellchecking.language" : "Sprache für Rechtschreibprüfung",
    "import.headline" : "Deine Franz 4 Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Hilfe",
    "menu.help.tos" : "Nutzungsbedingungen",
    "menu.services" : "Dienste",
+   "menu.services.activatePreviousService" : "Vorheriger Dienst",
    "menu.services.addNewService" : "Dienst hinzufügen",
+   "menu.services.setNextServiceActive" : "Nächster Dienst",
    "menu.view" : "Darstellung",
    "menu.view.enterFullScreen" : "Vollbildmodus",
    "menu.view.exitFullScreen" : "Vollbildmodus aus",
@@ -131,6 +133,7 @@
    "settings.account.invoiceDownload" : "Herunterladen",
    "settings.account.manageSubscription.label" : "Dein Abonnement verwalten",
    "settings.account.successInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.account.tryReloadServices" : "Erneut versuchen",
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
    "settings.app.buttonClearAllCache" : "Cache leeren",
@@ -143,16 +146,13 @@
    "settings.app.form.beta" : "Beta-Versionen einbeziehen",
    "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich (Dark Mode)",
    "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 im Infobereich anzeigen",
-   "settings.app.form.hideDockIcon" : "Franz Icon im Dock ausblenden",
    "settings.app.form.language" : "Sprache",
    "settings.app.form.minimizeToSystemTray" : "Franz in den Infobereich minimieren",
    "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
    "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
-   "settings.app.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
    "settings.app.headline" : "Einstellungen",
    "settings.app.headlineAdvanced" : "Erweitert",
    "settings.app.headlineAppearance" : "Darstellung",
@@ -216,8 +216,6 @@
    "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy Einstellungen neu.",
    "settings.service.form.proxy.user" : "Benutzer (optional)",
    "settings.service.form.saveButton" : "Dienst speichern",
-   "settings.service.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
-   "settings.service.form.spellcheckerLanguage.default" : "Standard benutzen ({default})",
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ⭐️",
    "settings.service.form.team" : "Team",
@@ -227,6 +225,7 @@
    "settings.services.discoverServices" : "Dienste entdecken",
    "settings.services.headline" : "Deine Dienste",
    "settings.services.noServicesAdded" : "Du hast noch keine Dienste hinzugefügt.",
+   "settings.services.servicesRequestFailed" : "Dienste konnten nicht geladen werden",
    "settings.services.tooltip.isDisabled" : "Dienst ist deaktiviert",
    "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
    "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
@@ -267,9 +266,7 @@
    "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
    "subscription.features.ads" : "Werbefrei auf Lebenszeit!",
    "subscription.features.comingSoon" : "folgt bald",
-   "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
    "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
-   "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
    "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
    "subscription.features.proxy" : "Proxy Support für Dienste",
    "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
@@ -292,9 +289,9 @@
    "tabs.item.reload" : "Neuladen",
    "validation.email" : "{field} ist ungültig",
    "validation.minLength" : "{field} muss mindestens {length} Zeichen enthalten",
+   "validation.oneRequired" : "Mindestens ein Wert wird benötigt",
    "validation.required" : "{field} wird benötigt",
    "validation.url" : "{field} ist keine gültige URL",
    "welcome.loginButton" : "Bei Franz einloggen",
-   "welcome.signupButton" : "Kostenloses Konto erstellen",
-   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
+   "welcome.signupButton" : "Kostenloses Konto erstellen"
 }
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 9639ec5f7..626abfddd 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Υποστήριξη",
    "menu.help.tos" : "Όροι Χρήσης",
    "menu.services" : "Υπηρεσίες",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Νέα Υπηρεσία",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Προβολή",
    "menu.view.enterFullScreen" : "Πλήρης Οθόνη",
    "menu.view.exitFullScreen" : "Έξοδος από πλήρη οθόνη",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Λήψη",
    "settings.account.manageSubscription.label" : "Διαχείριση της συνδρομής σας",
    "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.account.tryReloadServices" : "Δοκιμάστε ξανά",
    "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
    "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
    "settings.app.buttonClearAllCache" : "Καθαρισμός λανθάνουσας μνήμης",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Συμπεριλάβετε εκδόσεις beta",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Ενεργοποιήση Ενίσχυσης GPU ",
-   "settings.app.form.enableMenuBar" : "Εμφάνιση Γραμμής Μενού Franz",
    "settings.app.form.enableSpellchecking" : "Ενεργοποίηση ορθογραφικού ελέγχου",
    "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γραμμή ειδοποιήσεων",
-   "settings.app.form.hideDockIcon" : "Απόκρυψη εικονιδίου Franz",
    "settings.app.form.language" : "Γλώσσα",
    "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Franz στη γραμμή ειδοποιήσεων",
    "settings.app.form.runInBackground" : "Κρατήστε το Franz στο παρασκήνιο κατά το κλείσιμο του παραθύρου",
    "settings.app.form.showDisabledServices" : "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Ρυθμίσεις",
    "settings.app.headlineAdvanced" : "Για προχωρημένους",
    "settings.app.headlineAppearance" : "Εμφάνιση",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Αποθήκευση υπηρεσίας",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Φιλοξενείται",
    "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ⭐️",
    "settings.service.form.team" : "Ομάδα",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Ανακαλύψτε υπηρεσίες",
    "settings.services.headline" : "Οι υπηρεσίες σας",
    "settings.services.noServicesAdded" : "Δεν έχετε προσθέσει ακόμα υπηρεσίες.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Η υπηρεσία είναι απενεργοποιημένη",
    "settings.services.tooltip.isMuted" : "Όλοι οι ήχοι είναι απενεργοποιημένοι",
    "settings.services.tooltip.notificationsDisabled" : "Οι ειδοποιήσεις είναι απενεργοποιημένες",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Πολίτες Ε.Ε.: Στις τιμές δεν περιλαμβάνονται τυχόν φόροι και άλλες τοπικές επιβαρύνσεις",
    "subscription.features.ads" : "Τέλος στις διαφημίσεις",
    "subscription.features.comingSoon" : "σύντομα",
-   "subscription.features.encryptedSync" : "Κρυπτογραφημένος συγχρονισμός περιόδου σύνδεσης",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Επαναφόρτωση",
    "validation.email" : "{field} δεν είναι έγκυρο",
    "validation.minLength" : "{field} πρέπει να είναι τουλάχιστον {length} χαρακτήρες",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} είναι υποχρεωτικό",
    "validation.url" : "{field} δεν είναι έγκυρος σύνδεσμος URL",
    "welcome.loginButton" : "Σύνδεση στο λογαριασμό σας",
-   "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού",
-   "welcome.slogan" : "Επικοινωνία που λειτουργεί για εσάς"
+   "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 3ac23d9a5..5c26b456c 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -5,8 +5,8 @@
    "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
    "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
    "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
+   "feature.shareFranz.action.twitter" : "Compartir en Twitter",
    "feature.shareFranz.headline" : "Franz is better together!",
    "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Ayuda técnica",
    "menu.help.tos" : "Términos del Servicio",
    "menu.services" : "Servicios",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Añadir Nuevo Servicio...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Mostrar",
    "menu.view.enterFullScreen" : "Pasar a pantalla completa",
    "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Descargar",
    "settings.account.manageSubscription.label" : "Administra tu suscripción",
    "settings.account.successInfo" : "Tus cambios han sido guardados",
+   "settings.account.tryReloadServices" : "Intentar de nuevo",
    "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
    "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
    "settings.app.buttonClearAllCache" : "Limpiar caché",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Incluir versiones beta",
    "settings.app.form.darkMode" : "Únete al Lado Oscuro",
    "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar a Franz en la barra de menús",
    "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
-   "settings.app.form.hideDockIcon" : "Ocultar Icono de Franz en barra de herramientas",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
    "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-   "settings.app.form.spellcheckerLanguage" : "Corrector de ortografía",
    "settings.app.headline" : "Configuración",
    "settings.app.headlineAdvanced" : "Avanzado",
    "settings.app.headlineAppearance" : "Apariencia",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Por favor reinicie Franz despues de modificar los ajustes proxy.",
    "settings.service.form.proxy.user" : "Usuario (opcional)",
    "settings.service.form.saveButton" : "Guardar servicio",
-   "settings.service.form.spellcheckerLanguage" : "Marcar faltas de ortografía",
-   "settings.service.form.spellcheckerLanguage.default" : "Utilizar estándar del sistema ({default})",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ⭐️",
    "settings.service.form.team" : "Equipo",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descubrir servicios",
    "settings.services.headline" : "Tus servicios",
    "settings.services.noServicesAdded" : "No has añadido ningún servicio aún.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "El servicio está desactivado",
    "settings.services.tooltip.isMuted" : "Todos los sonidos están silenciados",
    "settings.services.tooltip.notificationsDisabled" : "Las notificaciones están desactivadas",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
    "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
-   "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
    "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
-   "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
    "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
    "subscription.features.proxy" : "Soporte Proxy para servicios",
    "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recargar",
    "validation.email" : "{field} no es válido",
    "validation.minLength" : "{field} debería tener al menos {length} caracteres",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} es obligatorio",
    "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"
+   "welcome.signupButton" : "Crear una cuenta gratuita"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 8af875a3d..6f9d81713 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
    "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
    "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Envoyer par mail",
+   "feature.shareFranz.action.facebook" : "Partager sur Facebook",
+   "feature.shareFranz.action.twitter" : "Partager sur Twitter",
+   "feature.shareFranz.headline" : "Franz est meilleur quand on est tous ensemble !",
+   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com \/cc @NeetFranz",
+   "feature.shareFranz.text" : "Dites à vos amis et collègues combien Franz est super et aidez nous à faire passer le mot.",
    "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
    "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
    "global.spellchecker.useDefault" : "Par défaut ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Detecter automatiquement la langue",
+   "global.spellchecking.autodetect.short" : "Automatiquement",
    "global.spellchecking.language" : "Langue de la vérification orthographique",
    "import.headline" : "Importez vos services depuis la version 4 de Franz.",
    "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Conditions d'utilisation",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Ajouter un nouveau service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Aperçu",
    "menu.view.enterFullScreen" : "Entrer en mode plein écran",
    "menu.view.exitFullScreen" : "Sortir du mode plein écran",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Télécharger",
    "settings.account.manageSubscription.label" : "Gérer votre abonnement",
    "settings.account.successInfo" : "Vos modifications ont été enregistrées",
+   "settings.account.tryReloadServices" : "Réessayer",
    "settings.account.tryReloadUserInfoRequest" : "Réessayer",
    "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
    "settings.app.buttonClearAllCache" : "Vider le cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Accepter les versions bêta",
    "settings.app.form.darkMode" : "Rejoins le côté obscur",
    "settings.app.form.enableGPUAcceleration" : "Activer l'accélération GPU",
-   "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",
-   "settings.app.form.hideDockIcon" : "Masquer Franz dans le Dock",
    "settings.app.form.language" : "Langue",
    "settings.app.form.minimizeToSystemTray" : "Minimiser Franz dans la zone de notification",
    "settings.app.form.runInBackground" : "Garder Franz ouvert en arrière-plan à la fermeture de la fenêtre",
    "settings.app.form.showDisabledServices" : "Afficher les onglets des services désactivés",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Afficher les badges de messages non lus quand les notifications sont désactivées.",
-   "settings.app.form.spellcheckerLanguage" : "Langue de la vérification orthographique",
    "settings.app.headline" : "Paramètres",
    "settings.app.headlineAdvanced" : "Paramètres avancés",
    "settings.app.headlineAppearance" : "Apparence",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifié les paramètres proxy.",
    "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
    "settings.service.form.saveButton" : "Enregistrer le service",
-   "settings.service.form.spellcheckerLanguage" : "Langue de vérification d'orthographe",
-   "settings.service.form.spellcheckerLanguage.default" : "Par défaut ({default})",
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
    "settings.service.form.team" : "Équipe",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Découvrir les services",
    "settings.services.headline" : "Vos services",
    "settings.services.noServicesAdded" : "Vous n'avez pas encore ajouté de services.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Ce service est désactivé",
    "settings.services.tooltip.isMuted" : "Tous les sons sont coupés",
    "settings.services.tooltip.notificationsDisabled" : "Notifications désactivées.",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
    "subscription.features.ads" : "Plus de pubs !",
    "subscription.features.comingSoon" : "Bientôt disponible",
-   "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
    "subscription.features.noInterruptions" : "Aucun délai dans l'application ni de harcèlement pour mettre à niveau la licence",
-   "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
    "subscription.features.proxy" : "Support proxy pour les services",
    "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recharger",
    "validation.email" : "{field} n'est pas valide",
    "validation.minLength" : "{field} doit contenir au moins {length} caractère(s)",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} est requis",
    "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"
+   "welcome.signupButton" : "Créer un compte gratuit"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 2b3d39b73..eb7c04491 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Tacaíocht",
    "menu.help.tos" : "Téarmaí tagartha",
    "menu.services" : "Seirbhísí",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Cuir seirbhís nua leis",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Amharc",
    "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
    "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Íoslódáil",
    "settings.account.manageSubscription.label" : "Bainistigh do shíntiús",
    "settings.account.successInfo" : "Sábháladh do chuid athruithe",
+   "settings.account.tryReloadServices" : "Atriail",
    "settings.account.tryReloadUserInfoRequest" : "Atriail",
    "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
    "settings.app.buttonClearAllCache" : "Glan taisce",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Cuir leagain béite san áireamh",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "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",
-   "settings.app.form.hideDockIcon" : "Cuir íocóin Franz i bhfolach ón leaba nasctha",
    "settings.app.form.language" : "Teanga",
    "settings.app.form.minimizeToSystemTray" : "Íoslaghdaigh Franz chuig tráidire an chórais",
    "settings.app.form.runInBackground" : "Coimeád Franz sa chúlra nuair a dhúntar an fhuinneog",
    "settings.app.form.showDisabledServices" : "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Socruithe",
    "settings.app.headlineAdvanced" : "Casta",
    "settings.app.headlineAppearance" : "Dealramh",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sábháil seirbhís",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ⭐️",
    "settings.service.form.team" : "Foireann",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Aimsigh seirbhísí",
    "settings.services.headline" : "Do sheirbhísí",
    "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat go fóill.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Seirbhís díchumasaithe",
    "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
    "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Áithritheoirí an tAÉ: is féidir cáin díolacháin áitiúla a chur i bhfeidhm",
    "subscription.features.ads" : "Fógraí ar bith, choíche!",
    "subscription.features.comingSoon" : "ag teacht go luath",
-   "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Athlódáil",
    "validation.email" : "Níl {field} neamhbhailí",
    "validation.minLength" : "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "Tá {field} de dhíth",
    "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"
+   "welcome.signupButton" : "Cruthaigh cuntas nua"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index dc1d579fa..95920c4ce 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Terms of Service",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "View",
    "menu.view.enterFullScreen" : "Enter Full Screen",
    "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadServices" : "Pokušajte ponovno",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće učitati informacije o korisniku",
    "settings.app.buttonClearAllCache" : "Očisti memoriju",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Obuhvati i beta verzije",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "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",
-   "settings.app.form.hideDockIcon" : "Sakrij ikonu Franz u prostoru za obavijesti",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži ploče s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Postavke",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Pronađite usluge",
    "settings.services.headline" : "Vaše usluge",
    "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usluga je onemogućena. ",
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni. ",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje ",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao što ima usluga HipChat ",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Ponovno učitavanje",
    "validation.email" : "{field} is not valid",
    "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun",
-   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+   "welcome.signupButton" : "Stvorite novi korisnički račun"
 }
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index ddaffeebb..bce9a368e 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Támogatás",
    "menu.help.tos" : "Felhasználói feltételek",
    "menu.services" : "Szolgáltatások",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Nézet",
    "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
    "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Letöltés",
    "settings.account.manageSubscription.label" : "Előfizetés kezelése",
    "settings.account.successInfo" : "A módosításokat elmentettük",
+   "settings.account.tryReloadServices" : "Próbáld újra",
    "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
    "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
    "settings.app.buttonClearAllCache" : "Gyorsítótár törlése",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Béta verziók keresése",
    "settings.app.form.darkMode" : "Csatlakozz a Sötét Oldalhoz",
    "settings.app.form.enableGPUAcceleration" : "Hardveres gyorsítás engedélyezése",
-   "settings.app.form.enableMenuBar" : "Franz megjelenítése a menüsorban",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
-   "settings.app.form.hideDockIcon" : "Franz ikon elrejtése a Dock mögött",
    "settings.app.form.language" : "Nyelv",
    "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
    "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
-   "settings.app.form.spellcheckerLanguage" : "Helyesírás-ellenőrző nyelve",
    "settings.app.headline" : "Beállítások",
    "settings.app.headlineAdvanced" : "Haladó",
    "settings.app.headlineAppearance" : "Megjelenés",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Kérjük indítsd újra a Franz-ot a proxy beállítások megváltoztatása után.",
    "settings.service.form.proxy.user" : "Felhasználó (opcionális)",
    "settings.service.form.saveButton" : "Szolgáltatás mentése",
-   "settings.service.form.spellcheckerLanguage" : "Helyesírás-ellenőrző nyelve",
-   "settings.service.form.spellcheckerLanguage.default" : "Rendszer alapbeállítás használata ({default})",
    "settings.service.form.tabHosted" : "Üzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Szolgáltatások felfedezése",
    "settings.services.headline" : "Szolgáltatásaid",
    "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "A szolgáltatás le van tiltva",
    "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
    "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU állampolgárok: helyi vásárlás esetén adók kerülhetnek felszámolásra",
    "subscription.features.ads" : "Hirdetésmentes, mindig!",
    "subscription.features.comingSoon" : "hamarosan",
-   "subscription.features.encryptedSync" : "Titkosított munkamenet szinkronizálás",
    "subscription.features.noInterruptions" : "Nincs több app késlekedés és liszencfrissítési piszkálás",
-   "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
    "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
    "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
    "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Újratöltés",
    "validation.email" : "{field} nem érvényes",
    "validation.minLength" : "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} kitöltése kötelező",
    "validation.url" : "{field} nem érvényes URL",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
-   "welcome.signupButton" : "Új fiók létrehozása",
-   "welcome.slogan" : "Üzenetküldés okosan"
+   "welcome.signupButton" : "Új fiók létrehozása"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 6abbf064b..73271dceb 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Dukungan",
    "menu.help.tos" : "Ketentuan Layanan",
    "menu.services" : "Layanan",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Tambahkan Layanan Baru...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Tampilan",
    "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
    "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Unduh",
    "settings.account.manageSubscription.label" : "Kelola langganan Anda",
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
+   "settings.account.tryReloadServices" : "Coba lagi",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
    "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna",
    "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Sertakan versi beta",
    "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)",
    "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
-   "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",
-   "settings.app.form.hideDockIcon" : "Sembunyikan ikon Franz di Dock",
    "settings.app.form.language" : "Bahasa",
    "settings.app.form.minimizeToSystemTray" : "Perkecil Franz ke baki sistem",
    "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
    "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
-   "settings.app.form.spellcheckerLanguage" : "Periksa ejaan",
    "settings.app.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Silahkan mulai ulang Franz setelah mengubah Setelan proxy",
    "settings.service.form.proxy.user" : "Pengguna (opsional)",
    "settings.service.form.saveButton" : "Simpan layanan",
-   "settings.service.form.spellcheckerLanguage" : "Periksa ejaan Bahasa",
-   "settings.service.form.spellcheckerLanguage.default" : "Gunakan Bawaan Sistem ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Temukan layanan",
    "settings.services.headline" : "Layanan Anda",
    "settings.services.noServicesAdded" : "Anda belum menambahkan layanan apa pun.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan",
    "settings.services.tooltip.isMuted" : "Semua suara dibisukan",
    "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku",
    "subscription.features.ads" : "Tanpa iklan, selamanya!",
    "subscription.features.comingSoon" : "segera hadir",
-   "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
    "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
-   "subscription.features.onpremise" : "Integrasi layanan hosted, misalnya HipChat",
    "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
    "subscription.features.proxy" : "Dukungan proksi untuk layanan",
    "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Muat Ulang",
    "validation.email" : "{field} tidak benar",
    "validation.minLength" : "{field} setidaknya harus {length} karakter",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} wajib diisi",
    "validation.url" : "{field} bukan URL yang benar",
    "welcome.loginButton" : "Masuk ke akun Anda",
-   "welcome.signupButton" : "Buat akun gratis",
-   "welcome.slogan" : "Perpesanan yang bekerja untuk Anda"
+   "welcome.signupButton" : "Buat akun gratis"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index b63b30a90..71150483c 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Supporto",
    "menu.help.tos" : "Termini di Servizio",
    "menu.services" : "Servizi",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualizza",
    "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
    "menu.view.exitFullScreen" : "Esci da Schermo Intero",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Scarica",
    "settings.account.manageSubscription.label" : "Gestisci il tuo abbonamento",
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
+   "settings.account.tryReloadServices" : "Prova di nuovo",
    "settings.account.tryReloadUserInfoRequest" : "Prova di nuovo",
    "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
    "settings.app.buttonClearAllCache" : "Svuota la cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Includi versioni beta",
    "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
    "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",
-   "settings.app.form.hideDockIcon" : "Nascondi l'icona Franz nel Dock",
    "settings.app.form.language" : "Lingua",
    "settings.app.form.minimizeToSystemTray" : "Minimizza Franz nell'area di notifica",
    "settings.app.form.runInBackground" : "Mantieni Franz in esecuzione quando chiudi la finestra",
    "settings.app.form.showDisabledServices" : "Mostra schede servizi disattivati",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
-   "settings.app.form.spellcheckerLanguage" : "Lingua per controllo ortografico",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Riavvia Franz dopo aver cambiato le impostazioni del proxy.",
    "settings.service.form.proxy.user" : "Utente (opzionale)",
    "settings.service.form.saveButton" : "Salva servizio",
-   "settings.service.form.spellcheckerLanguage" : "Lingua per controllo ortografico",
-   "settings.service.form.spellcheckerLanguage.default" : "Usa le impostazioni predefinite di sistema ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
    "settings.service.form.team" : "Gruppo",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Scopri servizi",
    "settings.services.headline" : "I tuoi servizi",
    "settings.services.noServicesAdded" : "Non hai aggiunto ancora nessun servizio.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Il servizio è disattivato",
    "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
    "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
-   "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
    "subscription.features.noInterruptions" : "L'upgrade della licenza avrà impatti sull'utilizzo dell'App",
-   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hosted come HipChat",
    "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
    "subscription.features.proxy" : "Supporto proxy per i servizi",
    "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Ricarica",
    "validation.email" : "{field} non valido",
    "validation.minLength" : "{field} dovrebbe contenere almeno {length} caratteri",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} è necessario",
    "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 va bene per te"
+   "welcome.signupButton" : "Crea un account gratuito"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 838dc81ea..bd1024a34 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "サポート",
    "menu.help.tos" : "サービス利用規約",
    "menu.services" : "サービス",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "サービスを追加",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "表示",
    "menu.view.enterFullScreen" : "全画面表示",
    "menu.view.exitFullScreen" : "全画面表示を終了する",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "ダウンロード",
    "settings.account.manageSubscription.label" : "サブスクリプションの管理",
    "settings.account.successInfo" : "変更内容が保存されました",
+   "settings.account.tryReloadServices" : "もう一度試す",
    "settings.account.tryReloadUserInfoRequest" : "もう一度試す",
    "settings.account.userInfoRequestFailed" : "ユーザ情報を読み込めませんでした",
    "settings.app.buttonClearAllCache" : "キャッシュを消去する",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Betaバージョンを含める",
    "settings.app.form.darkMode" : "ダークモードを有効にする",
    "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効にする",
-   "settings.app.form.enableMenuBar" : "メニューバーにFranzを表示する",
    "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
    "settings.app.form.enableSystemTray" : "Franzをシステムトレイに表示する",
-   "settings.app.form.hideDockIcon" : "DockからFranzを隠す",
    "settings.app.form.language" : "言語",
    "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイに最小化する",
    "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
    "settings.app.form.showDisabledServices" : "無効化されたサービスのタブを表示する",
    "settings.app.form.showMessagesBadgesWhenMuted" : "通知の無効時に未読メッセージ件数を表示する",
-   "settings.app.form.spellcheckerLanguage" : "スペルチェックする言語",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "プロキシ設定を変更してから、Franzを再起動してください",
    "settings.service.form.proxy.user" : "ユーザー名（任意）",
    "settings.service.form.saveButton" : "サービスの保存",
-   "settings.service.form.spellcheckerLanguage" : "言語のスペルチェック",
-   "settings.service.form.spellcheckerLanguage.default" : " {default}を初期設定で使用してください",
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ⭐️",
    "settings.service.form.team" : "チーム",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "サービスを探す",
    "settings.services.headline" : "利用中のサービス",
    "settings.services.noServicesAdded" : "まだ、どのサービスも追加されていません。",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "サービスが無効です",
    "settings.services.tooltip.isMuted" : "無音となっています",
    "settings.services.tooltip.notificationsDisabled" : "通知は無効です",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU在住者 : 地域の消費税が適用される可能性があります",
    "subscription.features.ads" : "広告は一切ありません!",
    "subscription.features.comingSoon" : "まもなく登場",
-   "subscription.features.encryptedSync" : "暗号化されたセッションの同期",
    "subscription.features.noInterruptions" : "待ち時間なしでFranz をお使いいただけます",
-   "subscription.features.onpremise" : "HipChatのようなオンプレミス\/ホスト型サービスの追加",
    "subscription.features.onpremise.mattermost" : "Mattermost のようなオンプレミス（自社運用）型のサービスを追加できるようになります",
    "subscription.features.proxy" : "プロキシ設定が利用可能",
    "subscription.features.spellchecker" : "スペルチェック機能をお使いいただけます",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "再読み込み",
    "validation.email" : "{field}は正しくありません",
    "validation.minLength" : "{field}は少なくとも{length}文字以上でなければなりません",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field}は必須です",
    "validation.url" : "{field}は正しいURLではありません",
    "welcome.loginButton" : "アカウントにログイン",
-   "welcome.signupButton" : "無料アカウントを作成",
-   "welcome.slogan" : "Messaging that works for you"
+   "welcome.signupButton" : "無料アカウントを作成"
 }
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index ec0cdd375..4796cbe9f 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Terms of Service",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "View",
    "menu.view.enterFullScreen" : "Enter Full Screen",
    "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "გადმოწერა",
    "settings.account.manageSubscription.label" : "თქვენი გამოწერის მართვა",
    "settings.account.successInfo" : "თქვენი ცვლილებები შენახულია",
+   "settings.account.tryReloadServices" : "სცადეთ ხელახლა",
    "settings.account.tryReloadUserInfoRequest" : "სცადეთ ხელახლა",
    "settings.account.userInfoRequestFailed" : "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
    "settings.app.buttonClearAllCache" : "Clear cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "ჩართეთ ბეტა ვერსიები",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "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 სისტემის უჯრაში",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "ენა",
    "settings.app.form.minimizeToSystemTray" : "ჩაკეცეთ Franz სისტემის უჯრაში",
    "settings.app.form.runInBackground" : "დატოვეთ Franz გაშვებული როდესაც ფანჯარა დაიხურება",
    "settings.app.form.showDisabledServices" : "Display disabled services tabs",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "პარამეტრები",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "სერვისის შენახვა",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "დაჰოსტილი",
    "settings.service.form.tabOnPremise" : "თვით დაჰოსტილი ⭐️",
    "settings.service.form.team" : "გუნდი",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "აღმოაჩინეთ სერვისები",
    "settings.services.headline" : "თქვენი სერვისები",
    "settings.services.noServicesAdded" : "თქვენ ჯერ არ გაქვთ სერვისები დამატებული.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "სერვისი გათიშულია",
    "settings.services.tooltip.isMuted" : "All sounds are muted",
    "settings.services.tooltip.notificationsDisabled" : "შეტყობინებები გათიშულია",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
    "subscription.features.ads" : "არანაირი რეკლამები, არასდროს!",
    "subscription.features.comingSoon" : "მალე",
-   "subscription.features.encryptedSync" : "დაშიფრული სესიის სინქრონიზაცია",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "on-premise\/hosted სერვისების დამატება, როგორიცაა HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "ჩატვირთვა",
    "validation.email" : "{field} is not valid",
    "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "შედით თქვენს ანგარიშში",
-   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა",
-   "welcome.slogan" : "შეტყობინების აპლიკაცია, რომელიც მუშაობს შენთვის"
+   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 2082edd6d..00d7ddd06 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Nieuwe service toevoegen...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Volledig scherm openen",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache wissen",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Inclusief beta versies",
    "settings.app.form.darkMode" : "Word lid van de Dark Side",
    "settings.app.form.enableGPUAcceleration" : "GPU Acceleratie Activeren",
-   "settings.app.form.enableMenuBar" : "Toon Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Verberg Franz in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Taal spellingscontrole",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw op na het aanpassen van proxy Instellingen.",
    "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
-   "settings.service.form.spellcheckerLanguage" : "Taal spellingscontrole",
-   "settings.service.form.spellcheckerLanguage.default" : "Gebruik Systeemstandaard ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
    "settings.service.form.team" : "Team",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Services ontdekken",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
    "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen reclame, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.encryptedSync" : "Synchronisatie van geëncrypteerde sessies",
    "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
-   "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
    "subscription.features.proxy" : "Proxy ondersteuning voor services",
    "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
    "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Inloggen op je account",
-   "welcome.signupButton" : "Maak een gratis account aan",
-   "welcome.slogan" : "Messaging die voor jou werkt"
+   "welcome.signupButton" : "Maak een gratis account aan"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index df0549a28..782c29a6c 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
    "menu.services" : "Diensten",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Nieuwe dienst toevoegen",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Gebruik volledig scherm",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache legen",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Inclusief bètaversies",
    "settings.app.form.darkMode" : "Stap over naar de donkere kant",
    "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
-   "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Verberg Franz in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Spelling checken",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw na het aanpassen van proxy instellingen.",
    "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
-   "settings.service.form.spellcheckerLanguage" : "Spellingcontrole taal",
-   "settings.service.form.spellcheckerLanguage.default" : "Gebruik systeemstandaard ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ⭐️",
    "settings.service.form.team" : "Team",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Ontdek services",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
    "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
    "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
-   "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
    "subscription.features.proxy" : "Proxy understeuning voor diensten",
    "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
    "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Log in op je account",
-   "welcome.signupButton" : "Maak een gratis account",
-   "welcome.slogan" : "Messaging die voor jou werkt"
+   "welcome.signupButton" : "Maak een gratis account"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e1a1747b3..dd70f25f7 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Wsparcie",
    "menu.help.tos" : "Warunki świadczenia usług",
    "menu.services" : "Usługi",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Dodaj nową usługę...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Widok",
    "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
    "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Pobierz",
    "settings.account.manageSubscription.label" : "Zarządzaj swoimi subskrypcjami",
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
+   "settings.account.tryReloadServices" : "Spróbuj ponownie",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
    "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Uwzględnij wersje beta",
    "settings.app.form.darkMode" : "Przejdź na Ciemną Stronę",
    "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 obszarze powiadomień",
-   "settings.app.form.hideDockIcon" : "Ukrywaj ikonę Franz w zasobniku systemowym",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
    "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
-   "settings.app.form.spellcheckerLanguage" : "Język słownika",
    "settings.app.headline" : "Ustawienia",
    "settings.app.headlineAdvanced" : "Zaawansowane",
    "settings.app.headlineAppearance" : "Wygląd",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Uruchom ponownie Franz po zmianie ustawień proxy.",
    "settings.service.form.proxy.user" : "Użytkownik (opcjonalnie)",
    "settings.service.form.saveButton" : "Zapisz usługę",
-   "settings.service.form.spellcheckerLanguage" : "Język sprawdzania pisowni",
-   "settings.service.form.spellcheckerLanguage.default" : "Użyj domyślnego dla systemu ({default})",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
    "settings.service.form.team" : "Zespół",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Przeglądaj usługi",
    "settings.services.headline" : "Twoje usługi",
    "settings.services.noServicesAdded" : "Nie dodałeś jeszcze żadnych usług.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usługa jest nieaktywna",
    "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
    "settings.services.tooltip.notificationsDisabled" : "Powiadomienia są nieaktywne",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Rezydenci UE: lokalne stawki VAT mogą zostać zaaplikowane",
    "subscription.features.ads" : "Brak reklam, na zawsze!",
    "subscription.features.comingSoon" : "wkrótce dostępne",
-   "subscription.features.encryptedSync" : "Szyfrowana synchronizacja sesji",
    "subscription.features.noInterruptions" : "Bez opóźnień i przypominania o ulepszeniu licencji",
-   "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
    "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
    "subscription.features.proxy" : "Obsługa proxy dla usług",
    "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Przeładuj",
    "validation.email" : "Pole {field} nie jest poprawne",
    "validation.minLength" : "Pole {field} powinno składać się z co najmniej {length} znaków",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "Pole {field} jest wymagane",
    "validation.url" : "Pole {field} nie jest poprawnym ciągiem URL.",
    "welcome.loginButton" : "Zaloguj się na swoje konto",
-   "welcome.signupButton" : "Stwórz darmowe konto",
-   "welcome.slogan" : "Komunikator który działa"
+   "welcome.signupButton" : "Stwórz darmowe konto"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 0ab5bdd21..490771c39 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
    "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
    "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Enviar como e-mail",
+   "feature.shareFranz.action.facebook" : "Compartilhar no Facebook",
+   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
+   "feature.shareFranz.headline" : "Franz é melhor em grupo!",
+   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Adicionei o serviço de {count} ao Franz! Adquira o app grátis para usar WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quão incrível Franz é e nos ajude a espalhar a mensagem.  ",
    "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
    "global.notConnectedToTheInternet" : "Você não está conectado à internet",
    "global.spellchecker.useDefault" : "Use o padrão do sistema ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Detectar linguagem automaticamente.",
+   "global.spellchecking.autodetect.short" : "Automático",
    "global.spellchecking.language" : "Idioma de verificação ortográfica",
    "import.headline" : "Importe seus serviços do Franz 4 ",
    "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos de Serviço",
    "menu.services" : "Serviços",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Adicionar Novo Serviço",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualizar ",
    "menu.view.enterFullScreen" : "Modo Tela Cheia",
    "menu.view.exitFullScreen" : "Sair da Tela Cheia",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Baixar",
    "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
    "settings.account.successInfo" : "Suas alterações foram gravadas",
+   "settings.account.tryReloadServices" : "Tente novamente",
    "settings.account.tryReloadUserInfoRequest" : "Tente novamente",
    "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
    "settings.app.buttonClearAllCache" : "Limpar cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Incluir versões beta",
    "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
    "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
-   "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 barra de sistema",
-   "settings.app.form.hideDockIcon" : "Ocultar ícone do Franz no Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de sistema",
    "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.form.spellcheckerLanguage" : "Idioma de verificação ortográfica",
    "settings.app.headline" : "Configurações",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Por favor, reinicie o Franz após alterar as configurações de proxy.",
    "settings.service.form.proxy.user" : "Usuário (opcional)",
    "settings.service.form.saveButton" : "Salvar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Língua do corretor ortográfico",
-   "settings.service.form.spellcheckerLanguage.default" : "Use o padrão do sistema ({default})",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
    "settings.service.form.team" : "Equipe",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Seus serviços",
    "settings.services.noServicesAdded" : "Você ainda não adicionou nenhum serviço.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Sem som",
    "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
    "subscription.features.ads" : "Sem anúncios, pra sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
    "subscription.features.noInterruptions" : "Sem demora e sem chateação para comprar uma licença. ",
-   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
    "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
    "subscription.features.proxy" : "Suporte de proxy para serviços",
    "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "inválido",
    "validation.minLength" : "{campo} deve ter pelo menos {comprimento} mais caracteres ",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{campo} obrigatório",
    "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ê"
+   "welcome.signupButton" : "Criar uma conta grátis"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 9e7455bdf..7e23aa0ba 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos do Serviço",
    "menu.services" : "Serviços",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Adicionar Novo Serviço...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Ver",
    "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
    "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Transferir",
    "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
    "settings.account.successInfo" : "As suas alterações foram efetuadas com sucesso",
+   "settings.account.tryReloadServices" : "Tentar novamente",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
    "settings.app.buttonClearAllCache" : "Limpar cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
    "settings.app.form.darkMode" : "Junta-te ao Lado Negro",
    "settings.app.form.enableGPUAcceleration" : "Activar Aceleração de GPU",
-   "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",
-   "settings.app.form.hideDockIcon" : "Esconder ícone na Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a barra do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
    "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Linguagem para correção ortográfica",
    "settings.app.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Reinicie, por favor, após atualizar as definições do Franz",
    "settings.service.form.proxy.user" : "Utilizador (opcional)",
    "settings.service.form.saveButton" : "Guardar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Linguagem de correção ortográfica",
-   "settings.service.form.spellcheckerLanguage.default" : "Utilizar o Sistema por Omissão ({default})",
    "settings.service.form.tabHosted" : "Com domínio",
    "settings.service.form.tabOnPremise" : "Com domínio próprio ⭐️",
    "settings.service.form.team" : "Equipa",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os seus serviços",
    "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.encryptedSync" : "Sincronização encriptada de sessão",
    "subscription.features.noInterruptions" : "Sem atrasos na aplicação nem mensagens para comprar uma licença",
-   "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
    "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
    "subscription.features.proxy" : "Suporte Proxy para os serviços",
    "subscription.features.spellchecker" : "Suporte para correção ortográfica",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "{field} não é válido",
    "validation.minLength" : "{field} deveria ter pelo menos {length} caracteres",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} é obrigatório",
    "validation.url" : "{field} não é uma hiperligação válida",
    "welcome.loginButton" : "Iniciar sessão",
-   "welcome.signupButton" : "Criar uma conta gratuita",
-   "welcome.slogan" : "Sistema de mensagens feito para si"
+   "welcome.signupButton" : "Criar uma conta gratuita"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 6098c8ad9..d8e02b7f3 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -69,8 +69,10 @@
    "menu.help.privacy" : "Политика конфиденциальности",
    "menu.help.support" : "Поддержка",
    "menu.help.tos" : "Условия использования",
-   "menu.services" : "Сервисы",
+   "menu.services" : "Сервис",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Добавить новый сервис...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Вид",
    "menu.view.enterFullScreen" : "На весь экран",
    "menu.view.exitFullScreen" : "В окне",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Скачать",
    "settings.account.manageSubscription.label" : "Управление вашей подпиской",
    "settings.account.successInfo" : "Ваши изменения были сохранены",
+   "settings.account.tryReloadServices" : "Попробовать снова",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать снова",
    "settings.account.userInfoRequestFailed" : "Невозможно загрузить информацию пользователя",
    "settings.app.buttonClearAllCache" : "Очистить кэш",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Включая бета версии",
    "settings.app.form.darkMode" : "Перейти на Тёмную сторону",
    "settings.app.form.enableGPUAcceleration" : "Включить ускорение GPU",
-   "settings.app.form.enableMenuBar" : "Показывать Franz на панели меню",
    "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
    "settings.app.form.enableSystemTray" : "Показывать Franz в системном трее",
-   "settings.app.form.hideDockIcon" : "Спрятать иконку Franz на панели",
    "settings.app.form.language" : "Язык",
    "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в системный трей",
    "settings.app.form.runInBackground" : "Оставлять Franz в фоне при закрытии окна",
    "settings.app.form.showDisabledServices" : "Показывать вкладки отключённых служб",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
-   "settings.app.form.spellcheckerLanguage" : "Проверка правописания",
    "settings.app.headline" : "Настройки",
    "settings.app.headlineAdvanced" : "Дополнительно",
    "settings.app.headlineAppearance" : "Внешний вид",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Пожалуйста перезапустите Franz после изменения настроек прокси.",
    "settings.service.form.proxy.user" : "Пользователь (опционально)",
    "settings.service.form.saveButton" : "Сохранить сервис",
-   "settings.service.form.spellcheckerLanguage" : "Проверка правописания",
-   "settings.service.form.spellcheckerLanguage.default" : "Использовать системные параметры по умолчанию ({default})",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
    "settings.service.form.team" : "Команда",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Найти сервисы",
    "settings.services.headline" : "Ваши сервисы",
    "settings.services.noServicesAdded" : "Вы пока не добавили никаких сервисов.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Сервис отключен",
    "settings.services.tooltip.isMuted" : "Все звуки отключены",
    "settings.services.tooltip.notificationsDisabled" : "Уведомления отключены",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут применяться местные налоги",
    "subscription.features.ads" : "Без рекламы, навсегда!",
    "subscription.features.comingSoon" : "скоро",
-   "subscription.features.encryptedSync" : "Зашифрованные сессии синхронизации",
    "subscription.features.noInterruptions" : "Никаких задержек и предложений перейти на платную версию",
-   "subscription.features.onpremise" : "Добавление облачных служб или служб на своём хостинге типа HipChat",
    "subscription.features.onpremise.mattermost" : "Локальные\/размещенные на хостинге сервисы, такие как Mattermost",
    "subscription.features.proxy" : "Подержка прокси для сервисов",
    "subscription.features.spellchecker" : "Поддержка проверки правописания",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Перезагрузить",
    "validation.email" : "{field} недействительно",
    "validation.minLength" : "{field} должно быть не менее {length} символов",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обязательно",
    "validation.url" : "{field} является недействительной ссылкой",
    "welcome.loginButton" : "Вход",
-   "welcome.signupButton" : "Создать бесплатный аккаунт",
-   "welcome.slogan" : "Общение, которое работает для вас"
+   "welcome.signupButton" : "Создать бесплатный аккаунт"
 }
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 35c699322..688490b58 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmienky použitia",
    "menu.services" : "Služby",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Pridať novú službu...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Zobraziť",
    "menu.view.enterFullScreen" : "Na celú obrazovku",
    "menu.view.exitFullScreen" : "Ukončiť režim na celú obrazovku",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Prevziať",
    "settings.account.manageSubscription.label" : "Spravovať vaše odoberanie",
    "settings.account.successInfo" : "Vaše zmeny boli uložené",
+   "settings.account.tryReloadServices" : "Skúsiť znova",
    "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
    "settings.account.userInfoRequestFailed" : "Nebolo možné načítať informácie o používateľovi",
    "settings.app.buttonClearAllCache" : "Vyčistiť vyrovnávaciu pamäť",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Vrátane beta verzií",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Zapnúť GPU zrýchlenie",
-   "settings.app.form.enableMenuBar" : "Zobraziť Franz v ponuke menu",
    "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
-   "settings.app.form.hideDockIcon" : "Skryť ikonu Franz v doku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
    "settings.app.form.runInBackground" : "Po zatvorení okna ponechať Franz spustený na pozadí",
    "settings.app.form.showDisabledServices" : "Zobraziť záložky vypnutých služieb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Nastavenia",
    "settings.app.headlineAdvanced" : "Pokročilé",
    "settings.app.headlineAppearance" : "Vzhľad",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložiť službu",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostované",
    "settings.service.form.tabOnPremise" : "Vlastné hostovanie ⭐️",
    "settings.service.form.team" : "Tím",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Preskúmať služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposiaľ ste nepridali žiadne služby.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
    "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
    "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Pre obyvateľov EÚ: môže byť aplikovaná miestna daň",
    "subscription.features.ads" : "Žiadne reklamy, nikdy!",
    "subscription.features.comingSoon" : "už čoskoro",
-   "subscription.features.encryptedSync" : "Šifrovaná synchronizácia relácie",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Pridať lokálne hostované služby, ako napr. HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Obnoviť",
    "validation.email" : "{field} je neplatný",
    "validation.minLength" : "{field} by malo byť dlhé aspoň {length} znakov",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} nie je platné URL",
    "welcome.loginButton" : "Prihlásiť sa do vášho účtu",
-   "welcome.signupButton" : "Vytvoriť účet zdarma",
-   "welcome.slogan" : "Správy, ktoré pracujú pre vás"
+   "welcome.signupButton" : "Vytvoriť účet zdarma"
 }
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 8ffc0c007..a3a80925d 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Подршка",
    "menu.help.tos" : "Услови коришћења услуге",
    "menu.services" : "Usluge",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додај нову услугу",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Преглед",
    "menu.view.enterFullScreen" : "Отвори у целом екрану",
    "menu.view.exitFullScreen" : "Напусти цео екран",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadServices" : "Pokušajte ponovno",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće učitati informacije o korisniku",
    "settings.app.buttonClearAllCache" : "Очисти кеш",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Obuhvati i beta verzije",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Омогући убрзање графичке јединице",
-   "settings.app.form.enableMenuBar" : "Покажи Франз у менију",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Сакриј Франз иконицу у доку",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži ploče s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Подешавања",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Pronađite usluge",
    "settings.services.headline" : "Vaše usluge",
    "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usluga je onemogućena.",
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni.",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao što ima usluga HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Ponovno učitavanje",
    "validation.email" : "{поље} није валидно",
    "validation.minLength" : "{поље} треба да буде најмање {дужина} карактера дугачко",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{поље} је неопходно",
    "validation.url" : "{field} није валидан УРЛ",
    "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun",
-   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+   "welcome.signupButton" : "Stvorite novi korisnički račun"
 }
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 70632b966..9f8313c2e 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Franz Destek Lisansı'nı alın",
    "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın",
    "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Mail olarak gönder",
+   "feature.shareFranz.action.facebook" : "Facebook'ta Paylaş",
+   "feature.shareFranz.action.twitter" : "Twitter'da Paylaş",
+   "feature.shareFranz.headline" : "Franz birlikte daha iyi!",
+   "feature.shareFranz.shareText.email" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin.",
+   "feature.shareFranz.shareText.twitter" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin. \/cc @MeetFranz",
+   "feature.shareFranz.text" : "Arkadaşlarına ve meslektaşlarına Franz'ın ne kadar harika olduğunu söyle ve bize bu kelimeyi yaymamızda yardım et.",
    "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor",
    "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
    "global.spellchecker.useDefault" : "Sistem Dilini Kullan ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Dili otomatik tespit et",
+   "global.spellchecking.autodetect.short" : "Otomatik",
    "global.spellchecking.language" : "İmla kontrol dili",
    "import.headline" : "Franz 4 servislerinizi içeri aktarın",
    "import.notSupportedHeadline" : "Henüz Franz 5'te desteklenmeyen servisler",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Destek",
    "menu.help.tos" : "Kullanım Şartları",
    "menu.services" : "Hizmetler",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Yeni servis ekle...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Görünüm",
    "menu.view.enterFullScreen" : "Tam Ekrana Geç",
    "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "İndir",
    "settings.account.manageSubscription.label" : "Aboneliğini yönet",
    "settings.account.successInfo" : "Değişikliklerin kaydedildi",
+   "settings.account.tryReloadServices" : "Tekrar deneyin",
    "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
    "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi",
    "settings.app.buttonClearAllCache" : "Önbelleği temizle",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Beta versiyonları dahil et",
    "settings.app.form.darkMode" : "Karanlık tarafa katıl",
    "settings.app.form.enableGPUAcceleration" : "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
-   "settings.app.form.enableMenuBar" : "Menü çubuğunda Franz'ı göster",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
-   "settings.app.form.hideDockIcon" : "Franz Simgesini Gösterme",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
    "settings.app.form.showDisabledServices" : "Devre dışı bırakılan servis sekmelerini göster",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
-   "settings.app.form.spellcheckerLanguage" : "İmla kontrol dili",
    "settings.app.headline" : "Ayarlar",
    "settings.app.headlineAdvanced" : "Gelişmiş",
    "settings.app.headlineAppearance" : "Görünüm",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Proxy ayarlarını değiştirdikten sonra Franz'ı yeniden başlatınız.",
    "settings.service.form.proxy.user" : "Kullanıcı (opsiyonel)",
    "settings.service.form.saveButton" : "Servisi kaydet",
-   "settings.service.form.spellcheckerLanguage" : "İmla kontrol dili",
-   "settings.service.form.spellcheckerLanguage.default" : "Sistem Dilini Kullan ({default})",
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
    "settings.service.form.team" : "Takım",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Servisleri keşfet",
    "settings.services.headline" : "Servislerin",
    "settings.services.noServicesAdded" : "Henüz hiç servis eklemedin.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Servis devre dışı",
    "settings.services.tooltip.isMuted" : "Tüm sesler kapalı",
    "settings.services.tooltip.notificationsDisabled" : "Bildirimler devre dışı",
@@ -255,11 +254,9 @@
    "subscription.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
    "subscription.features.ads" : "Reklam yok, asla!",
    "subscription.features.comingSoon" : "yakında geliyor",
-   "subscription.features.encryptedSync" : "Şifreli oturum senkronizasyonu",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.noInterruptions" : "Uygulama gecikmeleri & yükseltme lisanları için dırdır yok",
+   "subscription.features.onpremise.mattermost" : "Mattermost gibi şirket-içi\/barındırılan servisler ekleyin",
+   "subscription.features.proxy" : "Servisler için proxy desteği",
    "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
    "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Tekrar yükle",
    "validation.email" : "{alan} geçerli değil",
    "validation.minLength" : "{field} en az {length} karakter uzunluğunda olmalı",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} gereklidir",
    "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"
+   "welcome.signupButton" : "Ücretsiz hesap oluştur"
 }
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index db3145b36..56dda09d5 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Підтримка",
    "menu.help.tos" : "Умови використання",
    "menu.services" : "Служби",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додати сервіс",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Вигляд",
    "menu.view.enterFullScreen" : "Вікно на повний екран",
    "menu.view.exitFullScreen" : "Вийти з повного екрану",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Завантажити",
    "settings.account.manageSubscription.label" : "Керування вашою підпискою",
    "settings.account.successInfo" : "Ваші зміни були збережені",
+   "settings.account.tryReloadServices" : "Спробуйте ще раз",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "Не вдалося завантажити інформацію користувача",
    "settings.app.buttonClearAllCache" : "Очистити кеш",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Включити бета-версії",
    "settings.app.form.darkMode" : "Переходь на Темну Сторону",
    "settings.app.form.enableGPUAcceleration" : "Ввімкнути прискорення GPU",
-   "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
    "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
-   "settings.app.form.hideDockIcon" : "Сховати значок Franz в Dock",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до системного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
    "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених сервісів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
-   "settings.app.form.spellcheckerLanguage" : "Мова перевірки правопису",
    "settings.app.headline" : "Налаштування",
    "settings.app.headlineAdvanced" : "Додаткові налаштування",
    "settings.app.headlineAppearance" : "Вигляд",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Будь ласка, перезапустіть Franz після зміни налуштувань проксі",
    "settings.service.form.proxy.user" : "Користувач (опційно)",
    "settings.service.form.saveButton" : "Зберегти сервіс",
-   "settings.service.form.spellcheckerLanguage" : "Мова перевірки правопису",
-   "settings.service.form.spellcheckerLanguage.default" : "Використовувати системні параметри за змовчуванням ({default})",
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
    "settings.service.form.team" : "Команда",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Відкрийте для себе сервіси",
    "settings.services.headline" : "Ваші сервіси",
    "settings.services.noServicesAdded" : "Ви ще не додавали жодних сервісів.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Сервіс відключений",
    "settings.services.tooltip.isMuted" : "Всі звуки вимкнено",
    "settings.services.tooltip.notificationsDisabled" : "Сповіщення відключені",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Для жителів ЄС: можуть застосовуватися податки",
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
-   "subscription.features.encryptedSync" : "Шифрована синхронізація сеансу",
    "subscription.features.noInterruptions" : "Ніяких затримок та набридливих пропозицій з платних підписок",
-   "subscription.features.onpremise" : "Додайте on-premise \/ hosted сервіси, такі як Hipchat",
    "subscription.features.onpremise.mattermost" : "Сервіси, що виконуються локально\/вимагають хостингу, приміром Mattermost",
    "subscription.features.proxy" : "Підтримка проксі ",
    "subscription.features.spellchecker" : "Підтримка перевірки правопису",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Перезавантажити",
    "validation.email" : "{field} не валідне",
    "validation.minLength" : "Кількість символів в {field} повина бути не меньше {length} ",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обов'язвоке",
    "validation.url" : "{field} не валідний URL",
    "welcome.loginButton" : "Увійдіть до свого акаунту",
-   "welcome.signupButton" : "Створити безплатний акаунт",
-   "welcome.slogan" : "Обмін повідомленнями, який працює для вас"
+   "welcome.signupButton" : "Створити безплатний акаунт"
 }
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 3ae08c9ef..54245ba57 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "支援",
    "menu.help.tos" : "服務條款",
    "menu.services" : "服務",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "新增服務",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "檢視",
    "menu.view.enterFullScreen" : "進入全螢幕模式",
    "menu.view.exitFullScreen" : "離開全螢幕模式",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "下載",
    "settings.account.manageSubscription.label" : "管理您的訂閱",
    "settings.account.successInfo" : "您的更變已經被儲存",
+   "settings.account.tryReloadServices" : "再試一次",
    "settings.account.tryReloadUserInfoRequest" : "再試一次",
    "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
    "settings.app.buttonClearAllCache" : "清除快取",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "包含測試版",
    "settings.app.form.darkMode" : "加入黑暗面",
    "settings.app.form.enableGPUAcceleration" : "啟用 GPU 加速",
-   "settings.app.form.enableMenuBar" : "在選單列顯示 Franz",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
    "settings.app.form.enableSystemTray" : "在系統列顯示 Franz",
-   "settings.app.form.hideDockIcon" : "隱藏 Dock 中的 Franz 圖示",
    "settings.app.form.language" : "語言",
    "settings.app.form.minimizeToSystemTray" : "最小化 Franz 到系統列",
    "settings.app.form.runInBackground" : "當關閉視窗時，保持 Franz 在背景運作",
    "settings.app.form.showDisabledServices" : "顯示停用的服務標籤",
    "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊息",
-   "settings.app.form.spellcheckerLanguage" : "拼字檢查語言",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "進階",
    "settings.app.headlineAppearance" : "外觀",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "在變更 Proxy 設定後，請重新啟動 Franz",
    "settings.service.form.proxy.user" : "使用者 (選填)",
    "settings.service.form.saveButton" : "保存服務",
-   "settings.service.form.spellcheckerLanguage" : "拼字檢查語言",
-   "settings.service.form.spellcheckerLanguage.default" : "使用系統預設 ({default})",
    "settings.service.form.tabHosted" : "託管",
    "settings.service.form.tabOnPremise" : "自我託管⭐️",
    "settings.service.form.team" : "團隊",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "發現服務",
    "settings.services.headline" : "您的服務",
    "settings.services.noServicesAdded" : "你尚未新增任何服務",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "服務已停用",
    "settings.services.tooltip.isMuted" : "所有的聲音都是靜音",
    "settings.services.tooltip.notificationsDisabled" : "通知已停用",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "歐盟居民：可能採用當地銷售稅",
    "subscription.features.ads" : "無廣告，永遠!",
    "subscription.features.comingSoon" : "即將推出",
-   "subscription.features.encryptedSync" : "加密的會話同步",
    "subscription.features.noInterruptions" : "升級授權沒有延遲與打盹",
-   "subscription.features.onpremise" : "添加本地\/託管服務如HipChat",
    "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已預定 \/ 託管的服務",
    "subscription.features.proxy" : "服務的代理伺服器支援",
    "subscription.features.spellchecker" : "支援拼字檢查",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "重新載入",
    "validation.email" : "{field}無效",
    "validation.minLength" : "{field}長度至少應為{length}個字",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field}為必填",
    "validation.url" : "{field}不是個有效的網址",
    "welcome.loginButton" : "登入您的帳戶",
-   "welcome.signupButton" : "建立免費帳號",
-   "welcome.slogan" : "為你通信"
+   "welcome.signupButton" : "建立免費帳號"
 }
diff --git a/uidev/src/stories/button.stories.tsx b/uidev/src/stories/button.stories.tsx
index d81808530..c8e9bcbf3 100644
--- a/uidev/src/stories/button.stories.tsx
+++ b/uidev/src/stories/button.stories.tsx
@@ -76,6 +76,11 @@ storiesOf('Button')
       busy: true,
     })} />
   ))
+  .add('With icon', () => (
+    <WithStoreButton store={createStore({
+      icon: 'mdiInformation',
+    })} />
+  ))
   .add('As link', () => (
     <WithStoreButton store={createStore({
       href: 'https://meetfranz.com',
diff --git a/uidev/src/stories/infobox.stories.tsx b/uidev/src/stories/infobox.stories.tsx
index 2a5e8b0d5..144855376 100644
--- a/uidev/src/stories/infobox.stories.tsx
+++ b/uidev/src/stories/infobox.stories.tsx
@@ -10,6 +10,7 @@ interface IStoreArgs {
   ctaLabel?: string;
   type?: string;
   dismissable?: boolean;
+  className?: string;
 }
 
 const createStore = (args?: IStoreArgs) => {
@@ -29,6 +30,7 @@ const WithStoreInfobox = observer(({ store, children }: { store: any, children:
       type={store.type}
       ctaOnClick={store.ctaOnClick}
       dismissable={store.dismissable}
+      className={store.className}
     >
       {children}
     </Infobox>
@@ -123,4 +125,11 @@ storiesOf('Infobox')
     >
       Welcome to the world of tomorrow
     </WithStoreInfobox>
+  ))
+  .add('With className', () => (
+    <WithStoreInfobox store={createStore({
+      className: 'franz-is-awesome',
+    })}>
+      Welcome to the world of tomorrow
+    </WithStoreInfobox>
   ));
diff --git a/uidev/src/stories/input.stories.tsx b/uidev/src/stories/input.stories.tsx
index c522a10c7..af5e791d0 100644
--- a/uidev/src/stories/input.stories.tsx
+++ b/uidev/src/stories/input.stories.tsx
@@ -66,6 +66,14 @@ storiesOf('Input')
       value="faulty input"
       error="This is a generic error message."
     />
+  ))
+  .add('Type number with min & max', () => (
+    <Input
+      {...defaultProps()}
+      type="number"
+      min={1}
+      max={10}
+    />
   ));
 
 storiesOf('Password')
-- 
cgit v1.2.3-54-g00ecf