Merge branch 'feature/features-api' into feature/enterprise-ui

48 files changed, 592 insertions, 681 deletions

diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.js
new file mode 100644
index 000000000..292dc80cc
--- /dev/null
+++ b/src/api/FeaturesApi.js
@@ -0,0 +1,13 @@
+export default class FeaturesApi {
+  constructor(server) {
+    this.server = server;
+  }
+
+  base() {
+    return this.server.getBaseFeatures();
+  }
+
+  features() {
+    return this.server.getFeatures();
+  }
+}
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 3f84f8a0b..59d7d8fa2 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,18 +4,6 @@ export default class LocalApi {
     this.local = local;
   }
 
-  getSettings() {
-    return this.local.getAppSettings();
-  }
-
-  updateSettings(data) {
-    return this.local.updateAppSettings(data);
-  }
-
-  removeKey(key) {
-    return this.local.removeKey(key);
-  }
-
   getAppCacheSize() {
     return this.local.getAppCacheSize();
   }
diff --git a/src/api/RecipesApi.js b/src/api/RecipesApi.js
index 0573dacaf..800888b00 100644
--- a/src/api/RecipesApi.js
+++ b/src/api/RecipesApi.js
@@ -1,4 +1,4 @@
-export default class ServicesApi {
+export default class RecipesApi {
   constructor(server) {
     this.server = server;
   }
diff --git a/src/api/index.js b/src/api/index.js
index 3fc18c4b5..3c87cc087 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -6,12 +6,14 @@ import UserApi from './UserApi';
 import LocalApi from './LocalApi';
 import PaymentApi from './PaymentApi';
 import NewsApi from './NewsApi';
+import FeaturesApi from './FeaturesApi';
 
 export default (server, local) => ({
   app: new AppApi(server, local),
   services: new ServicesApi(server, local),
   recipePreviews: new RecipePreviewsApi(server, local),
   recipes: new RecipesApi(server, local),
+  features: new FeaturesApi(server, local),
   user: new UserApi(server, local),
   local: new LocalApi(server, local),
   payment: new PaymentApi(server, local),
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index e95d750ac..aa3a7d655 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -6,38 +6,6 @@ import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'
 const { session } = remote;
 
 export default class LocalApi {
-  // App
-  async updateAppSettings(data) {
-    const currentSettings = await this.getAppSettings();
-    const settings = Object.assign(currentSettings, data);
-
-    localStorage.setItem('app', JSON.stringify(settings));
-    console.debug('LocalApi::updateAppSettings resolves', settings);
-
-    return settings;
-  }
-
-  async getAppSettings() {
-    const settingsString = localStorage.getItem('app');
-    try {
-      const settings = JSON.parse(settingsString) || {};
-      console.debug('LocalApi::getAppSettings resolves', settings);
-
-      return settings;
-    } catch (err) {
-      return {};
-    }
-  }
-
-  async removeKey(key) {
-    const settings = await this.getAppSettings();
-
-    if (Object.hasOwnProperty.call(settings, key)) {
-      delete settings[key];
-      localStorage.setItem('app', JSON.stringify(settings));
-    }
-  }
-
   // Services
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index d37ff51f8..ad7988bb2 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,6 +3,7 @@ import path from 'path';
 import tar from 'tar';
 import fs from 'fs-extra';
 import { remote } from 'electron';
+import localStorage from 'mobx-localstorage';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -258,6 +259,35 @@ export default class ServerApi {
     return data;
   }
 
+  // Features
+  async getBaseFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/base`, this._prepareAuthRequest({
+      method: 'GET',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    const features = data;
+    console.debug('ServerApi::getBaseFeatures resolves', features);
+    return features;
+  }
+
+  async getFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features`, this._prepareAuthRequest({
+      method: 'GET',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    const features = data;
+    console.debug('ServerApi::getFeatures resolves', features);
+    return features;
+  }
+
   // Recipes
   async getInstalledRecipes() {
     const recipesDirectory = getRecipeDirectory();
diff --git a/src/assets/images/tray/linux/tray-unread.png b/src/assets/images/tray/linux/tray-unread.png
index a94ad81fb..5697141e0 100644
--- a/src/assets/images/tray/linux/tray-unread.png
+++ b/src/assets/images/tray/linux/tray-unread.png
diff --git a/src/assets/images/tray/linux/tray-unread@2x.png b/src/assets/images/tray/linux/tray-unread@2x.png
index 56e74b16a..d31e1401d 100644
--- a/src/assets/images/tray/linux/tray-unread@2x.png
+++ b/src/assets/images/tray/linux/tray-unread@2x.png
diff --git a/src/assets/images/tray/linux/tray.png b/src/assets/images/tray/linux/tray.png
index 583f34df8..29a13da12 100644
--- a/src/assets/images/tray/linux/tray.png
+++ b/src/assets/images/tray/linux/tray.png
diff --git a/src/assets/images/tray/linux/tray@2x.png b/src/assets/images/tray/linux/tray@2x.png
index 479a2cf95..256c52dcc 100644
--- a/src/assets/images/tray/linux/tray@2x.png
+++ b/src/assets/images/tray/linux/tray@2x.png
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index eb9fbb847..9e1c762a5 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -46,7 +46,7 @@ export default class Login extends Component {
           </div>
         </div>
         <div className="welcome__buttons">
-          <Link to={signupRoute} className="button">
+          <Link to={signupRoute} className="button button__inverted">
             {intl.formatMessage(messages.signupButton)}
           </Link>
           <Link to={loginRoute} className="button">
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index e4a9d60c3..2db2b7bb7 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -26,6 +26,7 @@ export default class AppLayoutContainer extends Component {
   render() {
     const {
       app,
+      features,
       services,
       ui,
       news,
@@ -64,10 +65,13 @@ export default class AppLayoutContainer extends Component {
 
     const { children } = this.props;
 
+    const isLoadingFeatures = features.featuresRequest.isExecuting
+      && features.featuresRequest.isExecutingFirstTime;
+
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    if (isLoadingServices) {
+    if (isLoadingFeatures || isLoadingServices) {
       return (
         <AppLoader />
       );
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 9084b9889..0ddb84db0 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -141,17 +141,17 @@ export default class EditServiceScreen extends Component {
 
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
-      config.fields.team.validate = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
     }
 
     // If a service can be hosted and has a teamId or customUrl
     if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) {
       if (config.fields.team) {
-        config.fields.team.validate = [];
+        config.fields.team.validators = [];
       }
       if (config.fields.customUrl) {
-        config.fields.customUrl.validate = [url];
+        config.fields.customUrl.validators = [url];
       }
     }
 
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 5c62753cc..524dfe0fb 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -4,7 +4,7 @@
    "import.headline" : "Importa els teus serveis Franz 4",
    "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
    "import.skip.label" : "Vull afegir serveis manualment",
-   "import.submit.label" : "Importar serveis",
+   "import.submit.label" : "Importa serveis",
    "infobar.buttonChangelog" : "Que hi ha de nou?",
    "infobar.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
    "infobar.buttonReloadServices" : "Recarrega serveis",
@@ -16,6 +16,7 @@
    "invite.name.label" : "Nom",
    "invite.skip.label" : "Vull fer-ho més tard",
    "invite.submit.label" : "Enviar invitacions",
+   "invite.successInfo" : "Invitacions enviades correctament",
    "login.email.label" : "Correu electrònic",
    "login.headline" : "Accedir",
    "login.invalidCredentials" : "El correu electrònic o la contrasenya no són vàlids",
@@ -61,23 +62,21 @@
    "settings.account.headlineUpgrade" : "Actualitzeu el vostre compte i doneu suport a Franz",
    "settings.account.invoiceDownload" : "Descarregar",
    "settings.account.manageSubscription.label" : "Gestioneu la vostra subscripció",
-   "settings.account.mining.active" : "Ara realitzeu {hashes} càlculs per segon.",
-   "settings.account.mining.cancel" : "Cancel·la la mineria",
-   "settings.account.mining.moreInformation" : "Obenir més informació",
-   "settings.account.mining.thankyou" : "Gràcies per donar suport a Franz amb el vostre poder de processament.",
    "settings.account.successInfo" : "S'han desat els canvis",
    "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
    "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Buida la memòria cau",
    "settings.app.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
    "settings.app.buttonSearchForUpdate" : "Comprova si hi ha actualitzacions",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "La memòria cau de Franz està utilitzant {size} d'espai al disc",
    "settings.app.currentVersion" : "Versió actual:",
    "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
    "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
    "settings.app.form.beta" : "Inclou versions beta",
+   "settings.app.form.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",
@@ -90,13 +89,15 @@
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Actualitzacions",
    "settings.app.restartRequired" : "Els canvis requereixen reiniciar",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Memòria cau",
    "settings.app.translationHelp" : "Ajuda'ns a traduir Franz en la teva llengua.",
    "settings.app.updateStatusAvailable" : "Actualització disponible, descarregant ...",
    "settings.app.updateStatusSearching" : "Està buscant actualitzacions",
    "settings.app.updateStatusUpToDate" : "Esteu utilitzant la versió més recent de Franz",
+   "settings.invite.headline" : "Convidar amics",
    "settings.navigation.account" : "Compte",
    "settings.navigation.availableServices" : "Serveis disponibles",
+   "settings.navigation.inviteFriends" : "Convidar amics",
    "settings.navigation.logout" : "Sortir",
    "settings.navigation.settings" : "Configuració",
    "settings.navigation.yourServices" : "Els vostres serveis",
@@ -107,7 +108,7 @@
    "settings.recipes.mostPopular" : "Els més populars",
    "settings.recipes.nothingFound" : "Ho sentim, però cap servei coincideix amb el terme cercat.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "El servei s'ha afegit correctament",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Cercar servei",
    "settings.service.error.goBack" : "Tornar als serveis",
    "settings.service.error.headline" : "Error",
    "settings.service.error.message" : "No s'ha pogut carregar la recepta del servei.",
@@ -120,15 +121,15 @@
    "settings.service.form.deleteButton" : "Suprimeix el servei",
    "settings.service.form.editServiceHeadline" : "Edita {name}",
    "settings.service.form.enableAudio" : "Activa l'àudio",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Mostra les insígnies als missatges no llegits.",
    "settings.service.form.enableNotification" : "Activa les notificacions",
    "settings.service.form.enableService" : "Activa el servei",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Insígnies de missatges no llegits",
    "settings.service.form.headlineGeneral" : "General",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Notificacions",
+   "settings.service.form.icon" : "Icona personalitzada",
+   "settings.service.form.iconDelete" : "Suprimeix",
+   "settings.service.form.iconUpload" : "Arrossega la teva imatge, o clica aquí",
    "settings.service.form.indirectMessageInfo" : "Se't notificarà sobre tots els missatges nous en un canal, no només @usuari, @canal, @aquí ...",
    "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
    "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
@@ -137,7 +138,7 @@
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ��",
    "settings.service.form.team" : "Equip",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Utilitza el servei {name} allotjat.",
    "settings.service.form.yourServices" : "Els vostres serveis",
    "settings.services.deletedInfo" : "S'ha eliminat el servei",
    "settings.services.discoverServices" : "Descobrir serveis",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
    "subscription.features.vpn" : "Compatibilitat amb proxy i VPN",
    "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
-   "subscription.mining.experimental" : "experimental",
-   "subscription.mining.headline" : "Com funciona?",
-   "subscription.mining.line1" : "Activant el \"Suport amb poder de processament\", Franz utilitzarà entre un 20-50% de la teva CPU de la mineria de la criptomoneda Monero que equival aproximadament a 5$\/l'any.",
-   "subscription.mining.line2" : "Adaptarem  l'ús de la CPU basant-nos en els teus habits de treball per no consumir la teva bateria ni relentir el teu ordinador.",
-   "subscription.mining.line3" : "Durant el periode que mantinguis la mineria activa, tindrás accés ilimitat a totes les carectarístiques ilimitades de Franz Premium Supporter.",
-   "subscription.mining.moreInformation" : "Obtenir més informació sobre aquest pla.",
    "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
    "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
    "subscription.type.free" : "gratuït",
-   "subscription.type.mining" : "Donar suport a Franz amb el poder de processament",
    "subscription.type.month" : "mes",
    "subscription.type.year" : "any",
    "subscriptionPopup.buttonCancel" : "Cancel·la",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 833c3c7d5..62eb4a1ee 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Jméno",
    "invite.skip.label" : "Nechat na později",
    "invite.submit.label" : "Poslat pozvánky",
+   "invite.successInfo" : "Pozvánky byly úspěšně odeslány.",
    "login.email.label" : "Email",
    "login.headline" : "Přihlásit se",
    "login.invalidCredentials" : "Email nebo heslo nesouhlasí",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Aktualizujte svůj ú�et a podpořte Franz",
    "settings.account.invoiceDownload" : "Stáhnout",
    "settings.account.manageSubscription.label" : "Spravovat vaše předplatné",
-   "settings.account.mining.active" : "Právě nyní provádíte {hashes} výpo�tů za sekundu.",
-   "settings.account.mining.cancel" : "Zrušit dolování",
-   "settings.account.mining.moreInformation" : "Získat další informace",
-   "settings.account.mining.thankyou" : "Děkujeme, že jste podpořili Franz vašim výpo�etním výkonem.",
    "settings.account.successInfo" : "Vaše změny byly uloženy",
    "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
    "settings.account.userInfoRequestFailed" : "Nelze na�íst informace o uživateli.",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
    "settings.app.form.beta" : "Zahrnout beta verze",
+   "settings.app.form.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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Aktualizace k dispozici, stahování...",
    "settings.app.updateStatusSearching" : "Hledá aktualizace",
    "settings.app.updateStatusUpToDate" : "Používáte nejnovější verzi programu Franz",
+   "settings.invite.headline" : "Pozvi přátele",
    "settings.navigation.account" : "Ú�et",
    "settings.navigation.availableServices" : "Dostupné služby",
+   "settings.navigation.inviteFriends" : "Pozvi přátele",
    "settings.navigation.logout" : "Odhlásit",
    "settings.navigation.settings" : "Nastavení",
    "settings.navigation.yourServices" : "Vaše služby",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
    "subscription.features.vpn" : "Proxy & VPN podpora",
    "subscription.includedFeatures" : "Placený ú�et Premium Supporter Franz zahrnuje",
-   "subscription.mining.experimental" : "experimentální",
-   "subscription.mining.headline" : "Jak to funguje?",
-   "subscription.mining.line1" : "Povolením funkce \"Podpora se zpracováním výkonu\" použije Franz zhruba 20-50% vašeho procesoru, aby doloval kryptografickou měnu Monero, která se rovná přibližně 5 dolarům za rok.",
-   "subscription.mining.line2" : "Přizpůsobíme spotřebu CPU na základě vašeho pracovního chování, abychom nevy�erpali baterii a zpomalili vás a váš stroj.",
-   "subscription.mining.line3" : "Dokud je horník aktivní, budete mít neomezený přístup ke všem funkcím Franz Premium Supporter.",
-   "subscription.mining.moreInformation" : "Získejte více informací o tomto plánu.",
    "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
    "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
    "subscription.type.free" : "zdarma",
-   "subscription.type.mining" : "Podpořte Franz výpo�etním výkonem",
    "subscription.type.month" : "měsíc",
    "subscription.type.year" : "rok",
    "subscriptionPopup.buttonCancel" : "Zrušit",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 1ea0554ba..7a03cce87 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -12,10 +12,11 @@
    "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
    "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar.",
    "invite.email.label" : "E-Mail Adresse",
-   "invite.headline.friends" : "3 Freunde oder Kollegen einladen",
+   "invite.headline.friends" : "Lade 3 Freunde ein",
    "invite.name.label" : "Name",
    "invite.skip.label" : "Ich möchte das später tun",
    "invite.submit.label" : "Einladungen schicken",
+   "invite.successInfo" : "Einladungen wurden erfolgreich gesendet, vielen Dank.",
    "login.email.label" : "E-Mail Adresse",
    "login.headline" : "Anmelden",
    "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Dein Konto upgraden & Franz unterstützen",
    "settings.account.invoiceDownload" : "Herunterladen",
    "settings.account.manageSubscription.label" : "Dein Abonnement verwalten",
-   "settings.account.mining.active" : "Du führst gerade {hashes} Berechnungen pro Sekunde aus.",
-   "settings.account.mining.cancel" : "Mining abbrechen",
-   "settings.account.mining.moreInformation" : "Weitere Informationen",
-   "settings.account.mining.thankyou" : "Vielen Dank, dass du Franz mit deiner Rechenleistung unterstützt.",
    "settings.account.successInfo" : "Deine Änderungen wurden gespeichert",
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
    "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
    "settings.app.form.beta" : "Beta-Versionen einbeziehen",
+   "settings.app.form.enableMenuBar" : "Franz in Menüleiste anzeigen",
    "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
    "settings.app.form.enableSystemTray" : "Franz in der Systemleiste anzeigen",
+   "settings.app.form.hideDockIcon" : "Franz Icon im Dock ausblenden",
    "settings.app.form.language" : "Sprache",
    "settings.app.form.minimizeToSystemTray" : "Franz in die Systemleiste minimieren",
    "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Update verfügbar, herunterladen...",
    "settings.app.updateStatusSearching" : "Suche nach Updates",
    "settings.app.updateStatusUpToDate" : "Du nutzt die aktuellste Version von Franz",
+   "settings.invite.headline" : "Lade 3 deiner Freunde ein",
    "settings.navigation.account" : "Konto",
    "settings.navigation.availableServices" : "Verfügbare Dienste",
+   "settings.navigation.inviteFriends" : "Freunde einladen",
    "settings.navigation.logout" : "Abmelden",
    "settings.navigation.settings" : "Einstellungen",
    "settings.navigation.yourServices" : "Deine Dienste",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
    "subscription.features.vpn" : "Proxy- & VPN-Unterstützung",
    "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
-   "subscription.mining.experimental" : "experimentell",
-   "subscription.mining.headline" : "Wie funktioniert das?",
-   "subscription.mining.line1" : "Durch das Aktivieren von \"Unterstützung mit Rechenleistung\", wird Franz circa 20-50% deines Prozessors nutzen, um die Crypto-Währung Monero zu minen, was ungefähr 5$\/Jahr entspricht.",
-   "subscription.mining.line2" : "Wir passen die Prozessor-Nutzung an dein Arbeitsverhalten an, um deinen Akku nicht unnötig zu belasten oder dein System zu verlangsamen.",
-   "subscription.mining.line3" : "So lange der Miner aktiv ist, hast du unbegrenzten Zugang auf alle Franz Premium-Supporter Funktionen.",
-   "subscription.mining.moreInformation" : "Erhalte mehr Informationen über diesen Plan.",
    "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
    "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
    "subscription.type.free" : "kostenlos",
-   "subscription.type.mining" : "Franz mit Rechenleistung unterstützen",
    "subscription.type.month" : "Monat",
    "subscription.type.year" : "Jahr",
    "subscriptionPopup.buttonCancel" : "Abbrechen",
@@ -203,7 +197,7 @@
    "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
    "tabs.item.enableService" : "Dienst aktivieren",
    "tabs.item.reload" : "Neuladen",
-   "welcome.loginButton" : "An deinem Konto anmelden",
+   "welcome.loginButton" : "Bei Franz einloggen",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
    "welcome.slogan" : "Kommunikation, die für dich funktioniert"
 }
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 14c9d05ee..b0c465940 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Όνομα",
    "invite.skip.label" : "Θέλω να το κάνω α�γότε�α",
    "invite.submit.label" : "Αποστολή π�οσκλήσεων",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
    "login.headline" : "Σ�νδεση",
    "login.invalidCredentials" : "Το email ή ο κωδικός π�όσβασης δεν είναι έγκυ�ος",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Αναβάθμιση του λογα�ιασμο� σας και υποστή�ιξη Franz",
    "settings.account.invoiceDownload" : "Λήψη",
    "settings.account.manageSubscription.label" : "Διαχεί�ιση της συνδ�ομής σας",
-   "settings.account.mining.active" : "Τώ�α π�αγματοποιείτε {hashes} υπολογισμο�ς ανά δευτε�όλεπτο.",
-   "settings.account.mining.cancel" : "Ακ��ωση εξό�υξης",
-   "settings.account.mining.moreInformation" : "Λάβετε πε�ισσότε�ες πλη�οφο�ίες",
-   "settings.account.mining.thankyou" : "Σας ευχα�ιστο�με για την υποστή�ιξη του Franz με την ισχ� επεξε�γασίας σας",
    "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
    "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
    "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φό�τωση πλη�οφο�ιών χ�ήστη",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Άνοιγμα στο πα�ασκήνιο",
    "settings.app.form.autoLaunchOnStart" : "Εκκίνηση του Franz κατά την εκκίνηση του συστήματος",
    "settings.app.form.beta" : "Συμπε�ιλάβετε εκδόσεις beta",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Ενε�γοποίηση ο�θογ�αφικο� ελέγχου",
    "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γ�αμμή ειδοποιήσεων",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Γλώσσα",
    "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Franz στη γ�αμμή ειδοποιήσεων",
    "settings.app.form.runInBackground" : "Κ�ατήστε το Franz στο πα�ασκήνιο κατά το κλείσιμο του πα�αθ��ου",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Υπά�χει διαθέσιμη ενημέ�ωση, γίνεται λήψη...",
    "settings.app.updateStatusSearching" : " Γίνεται αναζήτηση για ενημέ�ωση",
    "settings.app.updateStatusUpToDate" : "Χ�ησιμοποιείτε την τελευταία έκδοση του Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Λογα�ιασμός",
    "settings.navigation.availableServices" : "Διαθέσιμες υπη�εσίες",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Αποσ�νδεση",
    "settings.navigation.settings" : "Ρυθμίσεις",
    "settings.navigation.yourServices" : "Οι υπη�εσίες σας",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
    "subscription.features.vpn" : "Υποστή�ιξη μεσολαβητή (Proxy) και VPN",
    "subscription.includedFeatures" : "Ο Premium λογα�ιασμός υποστή�ιξης Franz πε�ιλαμβάνει",
-   "subscription.mining.experimental" : "πει�αματική",
-   "subscription.mining.headline" : "Πώς λειτου�γεί αυτό;",
-   "subscription.mining.line1" : "Το Franz χ�ησιμοποιεί πε�ίπου το 20-50% της CPU σας για να εξο��ξει το κ�υπτονόμισμα Monero που ισο�ται πε�ίπου με $ 5 \/ έτος.",
-   "subscription.mining.line2" : "Θα π�οσα�μόσουμε τη χ�ήση της CPU με βάση τη συμπε�ιφο�ά ε�γασίας σας ώστε να μην αποστ�αγγίσουμε την μπατα�ία σας και να επιβ�αδ�νουμε εσάς και το μηχάνημά σας.",
-   "subscription.mining.line3" : "Εφόσον ο Miner είναι ενε�γός, θα έχετε απε�ιό�ιστη π�όσβαση σε όλα τα χα�ακτη�ιστικά του Franz Premium Supporter.",
-   "subscription.mining.moreInformation" : "Λάβετε πε�ισσότε�ες πλη�οφο�ίες σχετικά με αυτό το πακέτο.",
    "subscription.paymentSessionError" : "Δεν ήταν δυνατή η π�οετοιμασία της φό�μας πλη�ωμής",
    "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
    "subscription.type.free" : "δω�εάν",
-   "subscription.type.mining" : "Υποστή�ιξη Franz με ισχ� CPU",
    "subscription.type.month" : "μήνας",
    "subscription.type.year" : "έτος",
    "subscriptionPopup.buttonCancel" : "Ακ��ωση",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 3c09fca3b..d5c0ea441 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -159,6 +159,8 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.enableSystemTray": "Show Franz in system tray",
   "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
+  "settings.app.form.enableMenuBar": "Show Franz in Menu Bar",
+  "settings.app.form.hideDockIcon": "Hide Franz icon in Dock",
   "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
   "settings.app.form.language": "Language",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index c4f598bd1..407266285 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,37 +1,38 @@
 {
-   "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz",
-   "global.notConnectedToTheInternet" : "No estás conectado a Internet.",
+   "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz.",
+   "global.notConnectedToTheInternet" : "No estás conectado a Internet",
    "import.headline" : "Importa tus servicios de Franz 4",
    "import.notSupportedHeadline" : "Servicios no soportados aún en Franz 5",
    "import.skip.label" : "Quiero agregar servicios manualmente",
    "import.submit.label" : "Importar servicios",
-   "infobar.buttonChangelog" : "Qué hay de nuevo:",
-   "infobar.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
+   "infobar.buttonChangelog" : "¿Qué hay de nuevo?",
+   "infobar.buttonInstallUpdate" : "Reiniciar e instalar actualización",
    "infobar.buttonReloadServices" : "Recargar servicios",
-   "infobar.requiredRequestsFailed" : "No ha sido posible cargar servicios e información del usuario",
-   "infobar.servicesUpdated" : "Sus servicios han sido actualizados.",
-   "infobar.updateAvailable" : "Nueva actualización para Franz disponible.",
-   "invite.email.label" : "Correo electrónico",
-   "invite.headline.friends" : "Invita a 3 amigos o colegas",
+   "infobar.requiredRequestsFailed" : "No se han podido cargar los servicios ni la información de usuario",
+   "infobar.servicesUpdated" : "Tus servicios han sido actualizados.",
+   "infobar.updateAvailable" : "Una nueva actualización de Franz está disponible",
+   "invite.email.label" : "Dirección de correo electrónico",
+   "invite.headline.friends" : "Invita a 3 de tus amigos o colegas",
    "invite.name.label" : "Nombre",
-   "invite.skip.label" : "Haré esto más tarde",
+   "invite.skip.label" : "Quiero hacer esto después",
    "invite.submit.label" : "Enviar invitaciones",
-   "login.email.label" : "Correo electrónico",
+   "invite.successInfo" : "Invitaciones enviadas",
+   "login.email.label" : "Dirección de correo electrónico",
    "login.headline" : "Iniciar sesión",
-   "login.invalidCredentials" : "Correo electrónico o contraseña no válidos",
+   "login.invalidCredentials" : "Correo electrónico o contraseña no válidos ",
    "login.link.password" : "Restablecer contraseña",
-   "login.link.signup" : "Crear cuenta gratuita",
+   "login.link.signup" : "Crear una cuenta gratuita",
    "login.password.label" : "Contraseña",
-   "login.serverLogout" : "Su sesión ha expirado, por favor inicie sesión nuevamente.",
-   "login.submit.label" : "Acceder",
-   "login.tokenExpired" : "Su sesión ha expirado, por favor acceda de nuevo.",
-   "password.email.label" : "Correo electrónico",
+   "login.serverLogout" : "Tu sesión ha expirado, por favor inicia la sesión de nuevo.",
+   "login.submit.label" : "Iniciar sesión",
+   "login.tokenExpired" : "Tu sesión expiró, por favor la inicia sesión nuevamente.",
+   "password.email.label" : "Dirección de correo electrónico",
    "password.headline" : "Restablecer contraseña",
-   "password.link.login" : "Acceder a tu cuenta",
-   "password.link.signup" : "Crear cuenta gratuita",
-   "password.noUser" : "No se encontró ningún usuario con esa dirección de correo electrónico",
+   "password.link.login" : "Iniciar sesión en tu cuenta",
+   "password.link.signup" : "Crear una cuenta gratuita",
+   "password.noUser" : "No se encontró un usuario con esa dirección de correo electrónico",
    "password.submit.label" : "Enviar",
-   "password.successInfo" : "Por favor, revise su correo electrónico",
+   "password.successInfo" : "Por favor revisa tu correo electrónico",
    "pricing.headline" : "Apoya a Franz",
    "pricing.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
    "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
@@ -49,35 +50,33 @@
    "settings.account.accountType.premium" : "Cuenta Colaborador Premium",
    "settings.account.buttonSave" : "Actualizar perfil",
    "settings.account.deleteAccount" : "Eliminar cuenta",
-   "settings.account.deleteEmailSent" : "Ha recibido un correo electrónico con el enlace para confirmar la eliminación de su cuenta. ¡Su cuenta y sus datos no podrán ser restaurados!",
-   "settings.account.deleteInfo" : "Si usted no necesita una cuenta de Franz, puede eliminarla junto a todos los datos aquí relacionados.",
+   "settings.account.deleteEmailSent" : "Has recibido un correo electrónico con un enlace para confirmar la eliminación de su cuenta. ¡Tu cuenta y datos no podrán ser restaurados!",
+   "settings.account.deleteInfo" : "Si ya no necesitas tu cuenta de Franz, puedes eliminarla junto a todos los datos aquí relacionados.",
    "settings.account.headline" : "Cuenta",
    "settings.account.headlineAccount" : "Información de la cuenta",
    "settings.account.headlineDangerZone" : "Zona Peligrosa",
    "settings.account.headlineInvoices" : "Facturas",
    "settings.account.headlinePassword" : "Cambiar contraseña",
    "settings.account.headlineProfile" : "Actualizar perfil",
-   "settings.account.headlineSubscription" : "Su suscripción",
-   "settings.account.headlineUpgrade" : "Actualice su cuenta y apoye a Franz",
+   "settings.account.headlineSubscription" : "Tu suscripción",
+   "settings.account.headlineUpgrade" : "Actualiza tu cuenta y apoya a Franz",
    "settings.account.invoiceDownload" : "Descargar",
-   "settings.account.manageSubscription.label" : "Administre su suscripción",
-   "settings.account.mining.active" : "Ahora mismo esta realizando {hashes} cálculos por segundo.",
-   "settings.account.mining.cancel" : "Cancelar minería",
-   "settings.account.mining.moreInformation" : "Obtener más información",
-   "settings.account.mining.thankyou" : "Gracias por apoyar a Franz con su potencia de procesamiento.",
-   "settings.account.successInfo" : "Sus cambios han sido guardados",
+   "settings.account.manageSubscription.label" : "Administra tu suscripción",
+   "settings.account.successInfo" : "Tus cambios han sido guardados",
    "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
-   "settings.account.userInfoRequestFailed" : "No ha sido posible cargar la información de usuario",
+   "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
    "settings.app.buttonClearAllCache" : "Limpiar caché",
    "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
    "settings.app.buttonSearchForUpdate" : "Comprobar actualizaciones",
    "settings.app.cacheInfo" : "El cache de Franz actualmente usa {size} de espacio en disco.",
    "settings.app.currentVersion" : "Versión actual:",
    "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Abrir Franz al iniciar",
+   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz al iniciar",
    "settings.app.form.beta" : "Incluir versiones beta",
-   "settings.app.form.enableSpellchecking" : "Activar la verificación ortográfica",
+   "settings.app.form.enableMenuBar" : "mostrar a franz en La barra de menús",
+   "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.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",
@@ -91,12 +90,14 @@
    "settings.app.headlineUpdates" : "Actualizaciones",
    "settings.app.restartRequired" : "Los cambios requieren reiniciar",
    "settings.app.subheadlineCache" : "Caché",
-   "settings.app.translationHelp" : "Ayúdenos a traducir Franz a su idioma.",
+   "settings.app.translationHelp" : "Ayúdenos a traducir Franz a tu idioma.",
    "settings.app.updateStatusAvailable" : "Actualización disponible, descargando...",
    "settings.app.updateStatusSearching" : "Buscando actualizaciones",
-   "settings.app.updateStatusUpToDate" : "Está utilizando la última versión de Franz",
+   "settings.app.updateStatusUpToDate" : "Estás utilizando la última versión de Franz",
+   "settings.invite.headline" : "Invitar amigos",
    "settings.navigation.account" : "Cuenta",
    "settings.navigation.availableServices" : "Servicios disponibles",
+   "settings.navigation.inviteFriends" : "Invita a tus amigos",
    "settings.navigation.logout" : "Cerrar sesión",
    "settings.navigation.settings" : "Configuración",
    "settings.navigation.yourServices" : "Sus servicios",
@@ -105,17 +106,17 @@
    "settings.recipes.headline" : "Servicios disponibles",
    "settings.recipes.missingService" : "¿Falta algún servicio?",
    "settings.recipes.mostPopular" : "Más populares",
-   "settings.recipes.nothingFound" : "Lo siento, no se encuentra ningún servicio con tus condiciones de búsqueda.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Servicio añadido satisfactoriamente",
-   "settings.searchService" : "Buscar Servicio",
+   "settings.recipes.nothingFound" : "Lo siento, pero no hay ningún servicio coincidente con tus términos de búsqueda.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Servicio añadido exitosamente",
+   "settings.searchService" : "Buscar servicio",
    "settings.service.error.goBack" : "Volver a los servicios",
    "settings.service.error.headline" : "Error",
-   "settings.service.error.message" : "No se puede cargar el servicio",
+   "settings.service.error.message" : "No se pudo cargar el servicio",
    "settings.service.form.addServiceHeadline" : "Añadir {name}",
    "settings.service.form.availableServices" : "Servicios disponibles",
    "settings.service.form.customUrl" : "Servidor personalizado",
-   "settings.service.form.customUrlPremiumInfo" : "Para añadir tus propios servicios necesitas una Cuenta Colaborador Premium de Franz.",
-   "settings.service.form.customUrlUpgradeAccount" : "Asciende tu cuenta",
+   "settings.service.form.customUrlPremiumInfo" : "Para añadir tus propios servicios, necesitas una Cuenta Colaborador Premium de Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Mejora tu cuenta",
    "settings.service.form.customUrlValidationError" : "No se pudo validar el servidor personalizado {name}.",
    "settings.service.form.deleteButton" : "Eliminar servicio",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
@@ -128,16 +129,16 @@
    "settings.service.form.headlineNotifications" : "Notificaciones",
    "settings.service.form.icon" : "Icono Personalizado",
    "settings.service.form.iconDelete" : "Borrar",
-   "settings.service.form.iconUpload" : "Arrastra tu imagen o haz clic aquí",
-   "settings.service.form.indirectMessageInfo" : "Se le notificará de todos los mensajes del canal, no sólo @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Muestra etiqueta de notificación para todos los mensajes nuevos",
-   "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio se silencian",
+   "settings.service.form.iconUpload" : "Arrastra tu imagen, o haz clic aquí",
+   "settings.service.form.indirectMessageInfo" : "Serás notificado de todos los mensajes del canal, no sólo @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Mostrar insignia de notificación para todos los mensajes nuevos",
+   "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
    "settings.service.form.name" : "Nombre",
    "settings.service.form.saveButton" : "Guardar servicio",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ��",
    "settings.service.form.team" : "Equipo",
-   "settings.service.form.useHostedService" : "Use el servicio alojado {name}.",
+   "settings.service.form.useHostedService" : "Usar el servicio alojado {name}.",
    "settings.service.form.yourServices" : "Tus servicios",
    "settings.services.deletedInfo" : "El servicio ha sido borrado",
    "settings.services.discoverServices" : "Descubrir servicios",
@@ -146,17 +147,17 @@
    "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",
-   "settings.services.updatedInfo" : "Tus cambios se han guardado",
+   "settings.services.updatedInfo" : "Tus cambios han sido guardados",
    "settings.user.form.accountType.company" : "Compañía",
-   "settings.user.form.accountType.individual" : "Personal",
+   "settings.user.form.accountType.individual" : "Individual",
    "settings.user.form.accountType.label" : "Tipo de cuenta",
-   "settings.user.form.accountType.non-profit" : "Sin fines lucrativos",
+   "settings.user.form.accountType.non-profit" : "Sin fines de lucro",
    "settings.user.form.currentPassword" : "Contraseña actual",
    "settings.user.form.email" : "Correo electrónico",
    "settings.user.form.firstname" : "Nombre",
-   "settings.user.form.lastname" : "Apellidos",
-   "settings.user.form.newPassword" : "Contraseña nueva",
-   "sidebar.addNewService" : "Añadir un nuevo servicio",
+   "settings.user.form.lastname" : "Apellido",
+   "settings.user.form.newPassword" : "Nueva contraseña",
+   "sidebar.addNewService" : "Añadir nuevo servicio",
    "sidebar.muteApp" : "Desactivar notificaciones y sonido",
    "sidebar.settings" : "Configuración",
    "sidebar.unmuteApp" : "Activar notificaciones y sonido",
@@ -165,31 +166,24 @@
    "signup.emailDuplicate" : "Ya existe un usuario con esa dirección de correo electrónico",
    "signup.firstname.label" : "Nombre",
    "signup.headline" : "Registrarse",
-   "signup.lastname.label" : "Apellidos",
+   "signup.lastname.label" : "Apellido",
    "signup.legal.info" : "Al crear una cuenta en Franz usted acepta las",
    "signup.legal.privacy" : "Declaración de privacidad",
    "signup.legal.terms" : "Términos de servicio",
    "signup.link.login" : "Ya tienes una cuenta, ¿Iniciar sesión?",
    "signup.password.label" : "Contraseña",
    "signup.submit.label" : "Crear cuenta",
-   "subscription.euTaxInfo" : "Residentes en la UE: pueden ser aplicados impuestos locales",
+   "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
    "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
    "subscription.features.customServices" : "Servicios privados para ti y tu equipo",
    "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
    "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
    "subscription.features.vpn" : "Soporte para Proxy y VPN",
-   "subscription.includedFeatures" : "La Cuenta Colaborador Premium de Franz incluye",
-   "subscription.mining.experimental" : "experimental",
-   "subscription.mining.headline" : "¿Cómo funciona?",
-   "subscription.mining.line1" : "Al habilitar \"Soporte con poder de procesamiento\", Franz usará aproximadamente 20-50% de su CPU para extraer la criptomoneda Monero, lo que equivale a aproximadamente 5 $\/año.",
-   "subscription.mining.line2" : "Adaptaremos el uso de la CPU en función de su comportamiento de trabajo para no agotar la batería y evitar que tu equipo vaya más lento.",
-   "subscription.mining.line3" : "Mientras el sistema de minado se encuentre activo, podrá tener acceso ilimitado a todas las Características del Colaborador Premium de Franz.",
-   "subscription.mining.moreInformation" : "Obtén más información sobre este plan.",
+   "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
    "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
    "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
    "subscription.type.free" : "gratis",
-   "subscription.type.mining" : "Ayuda a Franz con potencia de procesamiento",
    "subscription.type.month" : "mes",
    "subscription.type.year" : "año",
    "subscriptionPopup.buttonCancel" : "Cancelar",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 4a06975bb..35a55fcc2 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Nom",
    "invite.skip.label" : "Je veux faire cela plus tard",
    "invite.submit.label" : "Envoyer des invitations",
+   "invite.successInfo" : "Invitations envoyées.",
    "login.email.label" : "Adresse e-mail",
    "login.headline" : "S'inscrire",
    "login.invalidCredentials" : "E-mail ou mot de passe invalide",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Améliorez votre compte et soutenez Franz",
    "settings.account.invoiceDownload" : "Télécharger",
    "settings.account.manageSubscription.label" : "Gérer votre abonnement",
-   "settings.account.mining.active" : "Vous êtes en train d'effectuer {hashes} calculs par seconde.",
-   "settings.account.mining.cancel" : "Annuler le minage",
-   "settings.account.mining.moreInformation" : "Obtenir plus d'informations",
-   "settings.account.mining.thankyou" : "Merci de soutenir Franz avec votre puissance de calcul.",
    "settings.account.successInfo" : "Vos modifications ont été enregistrées",
    "settings.account.tryReloadUserInfoRequest" : "Réessayer",
    "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
    "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
    "settings.app.form.beta" : "Accepter les versions bêta",
+   "settings.app.form.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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Mise à jour disponible, téléchargement en cours...",
    "settings.app.updateStatusSearching" : "Recherche d'une mise à jour",
    "settings.app.updateStatusUpToDate" : "Vous utilisez la dernière version de Franz",
+   "settings.invite.headline" : "Invite 3 amis",
    "settings.navigation.account" : "Compte",
    "settings.navigation.availableServices" : "Services disponibles",
+   "settings.navigation.inviteFriends" : "Inviter des amis",
    "settings.navigation.logout" : "Se déconnecter",
    "settings.navigation.settings" : "Paramètres",
    "settings.navigation.yourServices" : "Vos services",
@@ -137,7 +138,7 @@
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ��",
    "settings.service.form.team" : "Équipe",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Utilisez le service hébergé {nom}.",
    "settings.service.form.yourServices" : "Vos services",
    "settings.services.deletedInfo" : "Le service a été supprimé",
    "settings.services.discoverServices" : "Découvrir les services",
@@ -180,30 +181,23 @@
    "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.vpn" : "Support des Proxy et VPN",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
-   "subscription.mining.experimental" : "expérimental",
-   "subscription.mining.headline" : "Comment ça marche ?",
-   "subscription.mining.line1" : "En activant \"Soutenez Franz avec de la puissance de calcul\", Franz utilisera entre 20 et 50% de votre CPU pour miner la crypto-monnaie Monero, ce qui équivaut à environ 5$\/an.",
-   "subscription.mining.line2" : "Nous adapterons l'utilisation du processeur en fonction de vos habitudes de travail pour ne pas vider votre batterie et ne pas ralentir votre machine.",
-   "subscription.mining.line3" : "Tant que le minage est actif, vous aurez un accès illimité à toutes les fonctionnalités Supporter Premium Franz.",
-   "subscription.mining.moreInformation" : "Obtenir plus d'informations.",
-   "subscription.paymentSessionError" : "Impossible d'initialiser le formulaire de paiement",
-   "subscription.submit.label" : "Je veux soutenir le développement de Franz",
-   "subscription.type.free" : "gratuit",
-   "subscription.type.mining" : "Soutenez Franz avec de la puissance de calcul",
-   "subscription.type.month" : "mois",
-   "subscription.type.year" : "année",
-   "subscriptionPopup.buttonCancel" : "Annuler",
-   "subscriptionPopup.buttonDone" : "Terminé",
-   "tabs.item.deleteService" : "Supprimer le service",
+   "subscription.paymentSessionError" : "Could not initialize payment form",
+   "subscription.submit.label" : "I want to support the development of Franz",
+   "subscription.type.free" : "free",
+   "subscription.type.month" : "month",
+   "subscription.type.year" : "year",
+   "subscriptionPopup.buttonCancel" : "Cancel",
+   "subscriptionPopup.buttonDone" : "Done",
+   "tabs.item.deleteService" : "Delete service",
    "tabs.item.disableAudio" : "Désactiver l'audio",
-   "tabs.item.disableNotifications" : "Désactiver les notifications",
-   "tabs.item.disableService" : "Désactiver le service",
-   "tabs.item.edit" : "Modifier",
+   "tabs.item.disableNotifications" : "Disable notifications",
+   "tabs.item.disableService" : "Disable service",
+   "tabs.item.edit" : "Edit",
    "tabs.item.enableAudio" : "Activer l'audio",
-   "tabs.item.enableNotification" : "Activer les notifications",
+   "tabs.item.enableNotification" : "Enable notifications",
    "tabs.item.enableService" : "Activer le service",
-   "tabs.item.reload" : "Recharger",
-   "welcome.loginButton" : "Connectez-vous à votre compte",
-   "welcome.signupButton" : "Créer un compte gratuit",
+   "tabs.item.reload" : "Reload",
+   "welcome.loginButton" : "Login to your account",
+   "welcome.signupButton" : "Create a free account",
    "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index f1a03612d..13b251755 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,21 +1,22 @@
 {
-   "global.api.unhealthy" : "Ní féidir le Franz nascadh le seirbhísí ar líne",
+   "global.api.unhealthy" : "Ní féidir nascadh le seirbhísí Franz ar líne",
    "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
-   "import.headline" : "Iompórtáil do chuid seirbhísí ó Franz 4",
-   "import.notSupportedHeadline" : "Níl na seirbhísí seo faoi thacaíocht le Franz 5 go fóill",
+   "import.headline" : "Iompórtáil do sheirbhísí Franz 4",
+   "import.notSupportedHeadline" : "Níl na seirbhísí seo taca ag Franz 5 go fóill",
    "import.skip.label" : "Ba mhaith liom seirbhísí a chur de láimh",
    "import.submit.label" : "Iompórtáil seirbhísí",
    "infobar.buttonChangelog" : "Cad atá nua?",
    "infobar.buttonInstallUpdate" : "Atosaigh � suiteáil nuashonrú",
    "infobar.buttonReloadServices" : "Athlódáil seirbhísí",
-   "infobar.requiredRequestsFailed" : "Ní féidir le Franz seirbhísí agus eolas úsáideora a lódáil",
-   "infobar.servicesUpdated" : "Nuashonraíodh do chuid seirbhísí.",
-   "infobar.updateAvailable" : "Tá nuashonrú nua ar fáil do Franz.",
+   "infobar.requiredRequestsFailed" : "Ní féidir seirbhísí agus eolas úsáideora a lódáil",
+   "infobar.servicesUpdated" : "Nuashonraíodh do sheirbhísí.",
+   "infobar.updateAvailable" : "Tá nuashonrú nua do Franz ar fáil.",
    "invite.email.label" : "Seoladh ríomhphoist",
    "invite.headline.friends" : "Tabhair cuireadh do thriúr chara nó chomhghleacaí",
    "invite.name.label" : "Ainm",
    "invite.skip.label" : "Ba mhaith liom é seo a dhéanamh níos deireanaí",
    "invite.submit.label" : "Seol cuirí",
+   "invite.successInfo" : "Cuirí seolta go rathúil",
    "login.email.label" : "Seoladh ríomhphoist",
    "login.headline" : "Logáil isteach",
    "login.invalidCredentials" : "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
@@ -27,122 +28,122 @@
    "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
    "password.email.label" : "Seoladh ríomhphoist",
    "password.headline" : "Athshocraigh pasfhocal",
-   "password.link.login" : "Logáil isteach do do chúntas",
+   "password.link.login" : "Logáil isteach i do chuntas",
    "password.link.signup" : "Cruthaigh cuntas saor in aisce",
    "password.noUser" : "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
    "password.submit.label" : "Cuir isteach",
-   "password.successInfo" : "Seiceáil do chuid ríomhphoist, le do thoil",
+   "password.successInfo" : "Seiceáil do chuid ríomhphoist le do thoil",
    "pricing.headline" : "Tabhair tacaíocht do Franz",
-   "pricing.link.skipPayment" : "Ní mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
+   "pricing.link.skipPayment" : "Níor mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
    "pricing.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
-   "pricing.support.label" : "Roghnaigh do phlean tacaíochta",
+   "pricing.support.label" : "Conas ar mhaith leat tacú le Franz?",
    "service.crashHandler.action" : "Athlódáil {name}",
-   "service.crashHandler.autoReload" : "Ag baint triail {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
+   "service.crashHandler.autoReload" : "Ag iarraidh {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
    "service.crashHandler.headline" : "Oró, ní hea!",
-   "service.crashHandler.text" : "Tá {name} tar éis earraid a dhéanamh.",
+   "service.crashHandler.text" : "Tá {name} tar éis earráid a dhéanamh.",
    "service.disabledHandler.action" : "Cumasaigh {name}",
    "service.disabledHandler.headline" : "Tá {name} díchumasaithe",
    "services.getStarted" : "Cuir tús",
    "services.welcome" : "Fáilte go Franz",
    "settings.account.account.editButton" : "Cuir cuntas in eagar",
    "settings.account.accountType.basic" : "Bunchuntas",
-   "settings.account.accountType.premium" : "Cuntas Phŕeimhtacadóra Franz",
+   "settings.account.accountType.premium" : "Cuntas Phŕeimhthacadóra Franz",
    "settings.account.buttonSave" : "Nuashonraigh próifíl",
    "settings.account.deleteAccount" : "Scrios cuntas",
-   "settings.account.deleteEmailSent" : "Fuair tú ríomhphost a fháil le nasc a dheimhnóidh scriosadh do chuntais. Ní feidir leat do chuntas agus do chuid sonraí a thabhairt ar ais!",
-   "settings.account.deleteInfo" : "Más rud é nár ghá duit cuntas Franz a bheith agat a thuilleadh, is féidir leat do chuntas agus gach sonraí riachtanach a scriosadh anseo.",
+   "settings.account.deleteEmailSent" : "Fuair tú ríomhphost chun scriosadh do chuntais a dheimhniú. Ní féidir do chuntas agus do chuid sonraí a thabhairt ar ais!",
+   "settings.account.deleteInfo" : "Más rud é nár ghá cuntas Franz a bheith agat a thuilleadh, is féidir do chuntas agus gach sonraí riachtanach a scriosadh anseo.",
    "settings.account.headline" : "Cuntas",
    "settings.account.headlineAccount" : "Eolas faoin gcuntas",
    "settings.account.headlineDangerZone" : "Scrios cuntas",
    "settings.account.headlineInvoices" : "Sonraisc",
    "settings.account.headlinePassword" : "Athraigh pasfhocal",
    "settings.account.headlineProfile" : "Nuashonraigh próifíl",
-   "settings.account.headlineSubscription" : "Do shintiús",
+   "settings.account.headlineSubscription" : "Do shíntiús",
    "settings.account.headlineUpgrade" : "Uasghrádaigh do chuntas chun tacaíocht a thabhairt do Franz",
    "settings.account.invoiceDownload" : "�oslódáil",
-   "settings.account.manageSubscription.label" : "Bainistigh do shintiús",
-   "settings.account.mining.active" : "Tá tú ag déanamh {hashes} áireamh in aghaidh an soicind anois.",
-   "settings.account.mining.cancel" : "Cuir míneáil ar ceal",
-   "settings.account.mining.moreInformation" : "Faigh tuilleadh eolais",
-   "settings.account.mining.thankyou" : "Go raibh maith agat as ucht tacaíocht a thabhairt go Franz le do chumhacht phróiseála.",
-   "settings.account.successInfo" : "Sábhailtear do chuid athruithe",
+   "settings.account.manageSubscription.label" : "Bainistigh do shíntiús",
+   "settings.account.successInfo" : "Sábháladh do chuid athruithe",
    "settings.account.tryReloadUserInfoRequest" : "Atriail",
    "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
    "settings.app.buttonClearAllCache" : "Glan taisce",
    "settings.app.buttonInstallUpdate" : "Atosaigh � suiteáil nuashonrú",
-   "settings.app.buttonSearchForUpdate" : "Cinntigh le haghaidh nuashonruithe",
-   "settings.app.cacheInfo" : "Tá taisce Franz ag baint úsáid as {size} de chuid an spáis diosca.",
+   "settings.app.buttonSearchForUpdate" : "Cuardaigh le nuashonruithe",
+   "settings.app.cacheInfo" : "Tá taisce Franz ag baint úsáid as {size} den spás diosca.",
    "settings.app.currentVersion" : "Leagan reatha:",
    "settings.app.form.autoLaunchInBackground" : "Oscail sa chúlra",
    "settings.app.form.autoLaunchOnStart" : "Láinseáil Franz ón tús",
    "settings.app.form.beta" : "Cuir leagain béite san áireamh",
+   "settings.app.form.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 go dtí tráidire an chórais",
-   "settings.app.form.runInBackground" : "Cóimeád Franz sa chúlra agus an fhuinneog a dhúnadh",
-   "settings.app.form.showDisabledServices" : "Taispeáin tabanna sheirbhísí dhíchumasaithe",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Taispeáin teachtaireachtaí neamhléite agus fógraí díchumasaithe",
+   "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.headline" : "Socruithe",
    "settings.app.headlineAdvanced" : "Casta",
    "settings.app.headlineAppearance" : "Dealramh",
    "settings.app.headlineGeneral" : "Ginearálta",
    "settings.app.headlineLanguage" : "Teanga",
    "settings.app.headlineUpdates" : "Nuashonruithe",
-   "settings.app.restartRequired" : "Ní gá duit tosnú arís chun athruithe a chur i bhfeidhm",
+   "settings.app.restartRequired" : "Ní gá atosú chun athruithe a chur i bhfeidhm.",
    "settings.app.subheadlineCache" : "Taisce",
-   "settings.app.translationHelp" : "Cabhraigh linn, Franz a aistriú do do theanga.",
-   "settings.app.updateStatusAvailable" : "Nuashonrú ar fáil, á íoslódáil...",
-   "settings.app.updateStatusSearching" : "Ag cuardú le haghaidh nuashonrú",
+   "settings.app.translationHelp" : "Cabhraigh linn Franz a aistriú i do theanga.",
+   "settings.app.updateStatusAvailable" : "Nuashonrú le fáil, ag íoslódáil...",
+   "settings.app.updateStatusSearching" : "Ag cuardach le nuashonruithe",
    "settings.app.updateStatusUpToDate" : "Tá tú ag baint úsáid as an leagan is deireanaí de Franz",
+   "settings.invite.headline" : "Tabhair cuireadh do thriúr chara",
    "settings.navigation.account" : "Cuntas",
-   "settings.navigation.availableServices" : "Seirbhísí ar fáil",
+   "settings.navigation.availableServices" : "Seirbhísí le fáil",
+   "settings.navigation.inviteFriends" : "Tabhair cuireadh do chairde",
    "settings.navigation.logout" : "Logáil amach",
    "settings.navigation.settings" : "Socruithe",
-   "settings.navigation.yourServices" : "Do chuid seirbhísí",
+   "settings.navigation.yourServices" : "Do sheirbhísí",
    "settings.recipes.all" : "Gach seirbhís",
    "settings.recipes.dev" : "Forbairt",
-   "settings.recipes.headline" : "Seirbhísí ar fáil",
+   "settings.recipes.headline" : "Seirbhísí le fáil",
    "settings.recipes.missingService" : "Seirbhís ar iarraidh?",
    "settings.recipes.mostPopular" : "Is coitianta",
    "settings.recipes.nothingFound" : "Tá brón orm, ach níl seirbhís ar bith ag teacht le do théarma chuardach.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Seirbhís curtha go ráthúil",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Seirbhís curtha go rathúil",
    "settings.searchService" : "Cuardaigh seirbhís",
-   "settings.service.error.goBack" : "Ar ais go dtí seirbhísí",
+   "settings.service.error.goBack" : "Ar ais chuig seirbhísí",
    "settings.service.error.headline" : "Earráid",
-   "settings.service.error.message" : "Ní féidir le oidis seirbhíse a lódáil.",
+   "settings.service.error.message" : "Ní féidir an oideas seirbhíse a lódáil.",
    "settings.service.form.addServiceHeadline" : "Cuir {name} leis",
    "settings.service.form.availableServices" : "Seirbhísí le fáil",
-   "settings.service.form.customUrl" : "Freastalaí shaincheaptha",
-   "settings.service.form.customUrlPremiumInfo" : "Chun seirbhísí féinóstáilte a chur le Franz, ní gá Cuntas Phŕeimhtacadóra Franz a bheith agat.",
+   "settings.service.form.customUrl" : "Freastalaí saincheaptha",
+   "settings.service.form.customUrlPremiumInfo" : "Chun seirbhísí féinóstáilte a chur le Franz, ní gá Cuntas Phŕeimhthacadóra Franz a bheith agat.",
    "settings.service.form.customUrlUpgradeAccount" : "Uasghrádaigh do chuntas",
-   "settings.service.form.customUrlValidationError" : "Ní féidir le seirbhís {name} saincheaptha a dheimhniú",
+   "settings.service.form.customUrlValidationError" : "Ní féidir seirbhís {name} saincheaptha a dheimhniú",
    "settings.service.form.deleteButton" : "Scrios seirbhís",
    "settings.service.form.editServiceHeadline" : "Cuir {name} in eagar",
    "settings.service.form.enableAudio" : "Cumasaigh fuaim",
-   "settings.service.form.enableBadge" : "Taispeáin comharthaí do theachtaireachtaí neamhléite",
+   "settings.service.form.enableBadge" : "Taispeáin comhartha do theachtaireachtaí neamhléite",
    "settings.service.form.enableNotification" : "Cumasaigh fógraí",
    "settings.service.form.enableService" : "Cumasaigh seirbhís",
-   "settings.service.form.headlineBadges" : "Comharthaí do theachtaireachtaí neamhléite",
+   "settings.service.form.headlineBadges" : "Comhartha do theachtaireachtaí neamhléite",
    "settings.service.form.headlineGeneral" : "Ginearálta",
    "settings.service.form.headlineNotifications" : "Fógraí",
    "settings.service.form.icon" : "Deilbhín saincheaptha",
    "settings.service.form.iconDelete" : "Scrios",
-   "settings.service.form.iconUpload" : "Scaoil d'íomhá, nó cliceáil anseo",
+   "settings.service.form.iconUpload" : "Scaoil d'íomhá nó cliceáil anseo",
    "settings.service.form.indirectMessageInfo" : "Gheobhaidh tú fógraí faoi gach teachtaireacht nua i mbealach, ní amháin @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Taispeáin comhartha theachtaireachta do theachtaireachtaí nua",
-   "settings.service.form.isMutedInfo" : "Tar éis é a dhíchumasú, tachtar gach fuaim fógraí agus athchasadh fuaime",
+   "settings.service.form.indirectMessages" : "Taispeáin comhartha theachtaireachta do gach teachtaireacht nua",
+   "settings.service.form.isMutedInfo" : "Tachtar gach fuaim fógraí agus athchasadh fuaime",
    "settings.service.form.name" : "Ainm",
-   "settings.service.form.saveButton" : "Sábhail seirbhís",
+   "settings.service.form.saveButton" : "Sábháil seirbhís",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ��",
    "settings.service.form.team" : "Foireann",
-   "settings.service.form.useHostedService" : "Bain úsáis as an seirbhís óstáilte {name}.",
-   "settings.service.form.yourServices" : "Do chuid seirbhísí",
+   "settings.service.form.useHostedService" : "Bain úsáid as an seirbhís óstáilte {name}.",
+   "settings.service.form.yourServices" : "Do sheirbhísí",
    "settings.services.deletedInfo" : "Seirbhís scriosta",
    "settings.services.discoverServices" : "Aimsigh seirbhísí",
-   "settings.services.headline" : "Do chuid seirbhísí",
-   "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat fós.",
+   "settings.services.headline" : "Do sheirbhísí",
+   "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat go fóill.",
    "settings.services.tooltip.isDisabled" : "Seirbhís díchumasaithe",
    "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
    "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
@@ -166,30 +167,23 @@
    "signup.firstname.label" : "Céadainm",
    "signup.headline" : "Cláraigh",
    "signup.lastname.label" : "Sloinne",
-   "signup.legal.info" : "Agus tú ag cruthú cuntas Franz, glacann tú le",
+   "signup.legal.info" : "Agus tú ag cruthú cuntas Franz glacann tú le",
    "signup.legal.privacy" : "Ráiteas phríobháideachais",
    "signup.legal.terms" : "Tearmaí seirbhíse",
    "signup.link.login" : "Cuntas agat cheana féin, logáil isteach?",
    "signup.password.label" : "Pasfhocal",
    "signup.submit.label" : "Cruthaigh cuntas",
-   "subscription.euTaxInfo" : "�ithritheoirí an tAÉ: is féidir le cáin díolacháin áitiúla cur i bhfeidhm",
-   "subscription.features.ads" : "Ní bheadh fógraí ar bith, choíche!",
+   "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.customServices" : "Seirbhísí phríobháideach duitse agus do d'fhoireann",
+   "subscription.features.customServices" : "Seirbhísí phríobháideach dhuitse agus do d'fhoireann",
    "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
    "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
    "subscription.features.vpn" : "Tacaíocht seachfhreastalaí � LPF",
-   "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhtacadóra Franz san áireamh",
-   "subscription.mining.experimental" : "turgnamhach",
-   "subscription.mining.headline" : "Cén chaoi mar a oibríonn sé seo?",
-   "subscription.mining.line1" : "Tar éis \"Tabhair tacaíocht le cumhacht phróiseála\" a chur ar chumas, bainfidh Franz úsáid as thart ar 20-50\\% de do chuid lárionad próiseála, chun an airgeadra digiteach Monero a mhíneáil, cothrom le thart ar $5 sa bhliain.",
-   "subscription.mining.line2" : "Cuirfimid úsáid an lárionaid phróiseála in oiriúint do d'iompar oibre, ionas nár caitheadh do cheallra agus níor moillíodh thú agus do ríomhaire.",
-   "subscription.mining.line3" : "Fad is a bhfuil an mhianadóir gníomhach, beidh rochtain gan teorainn agat do Phŕeimhghnéithe Taca Franz.",
-   "subscription.mining.moreInformation" : "Faigh tuilleadh eolais faoin bplean seo.",
-   "subscription.paymentSessionError" : "Ní féidir cur tús leis an bhfoirm íocaíochta",
+   "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhthacadóra Franz san áireamh",
+   "subscription.paymentSessionError" : "Ní féidir an bhfoirm íocaíochta a lódáil",
    "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
-   "subscription.type.free" : "saor",
-   "subscription.type.mining" : "Tabhair tacaíocht do Franz le cumhacht phróiseála",
+   "subscription.type.free" : "saor in aisce",
    "subscription.type.month" : "mí",
    "subscription.type.year" : "bliain",
    "subscriptionPopup.buttonCancel" : "Cealaigh",
@@ -203,7 +197,7 @@
    "tabs.item.enableNotification" : "Cumasaigh fógraí",
    "tabs.item.enableService" : "Cumasaigh seirbhís",
    "tabs.item.reload" : "Athlódáil",
-   "welcome.loginButton" : "Logáil isteach do do chuntas",
+   "welcome.loginButton" : "Logáil isteach i do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
-   "welcome.slogan" : "Teachtaireachtaí ag obair leat"
+   "welcome.slogan" : "Teachtaireachtaí a oibríonn duitse"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 2b2154a8e..97bfc19f4 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Ime",
    "invite.skip.label" : "Želim da ovo uradim kasnije",
    "invite.submit.label" : "Pošalji pozivnice",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Vaša e-adresa:",
    "login.headline" : "Prijavite se",
    "login.invalidCredentials" : "E-mail ili lozinka nisu to�ni",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Nadogradite ra�un i podržite Franc",
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
-   "settings.account.mining.active" : "Trenutno se odvija {hashes} kalkulacija po sekundi.",
-   "settings.account.mining.cancel" : "Odustani ",
-   "settings.account.mining.moreInformation" : "Dođi do više informacija",
-   "settings.account.mining.thankyou" : "Hvala Vam što podržavate Franca s vašom procesorskom moći. ",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
    "settings.app.form.beta" : "Obuhvati i beta verzije",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
    "settings.app.updateStatusSearching" : "Traže se ažuriranja",
    "settings.app.updateStatusUpToDate" : "Koristite najnoviju verziju Franca.",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Ra�un",
    "settings.navigation.availableServices" : "Dostupne usluge",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
    "settings.navigation.yourServices" : "Vaše usluge",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat ",
    "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
    "subscription.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće: ",
-   "subscription.mining.experimental" : "Eksperimentalno",
-   "subscription.mining.headline" : "Na koji na�in ovo radi?",
-   "subscription.mining.line1" : "Omogućavanjem \" Podrška snagom procesora \", Franc će iskoristiti oko 20-50% vaših CPU resursa za Kripto valutu \" Monero \" koja košta otprilike 5$ godišnje. ",
-   "subscription.mining.line2" : "Adaptiraćemo iskorišćenost CPU resursa na osnovu vašeg rada, na taj na�in ćemo izbjeći iscrpljivanje baterije i usporavanje uređaja. ",
-   "subscription.mining.line3" : "Dok god je \" rudar \" aktivan, imaćete neograni�en pristup svim Francovim Premium zna�ajkama. ",
-   "subscription.mining.moreInformation" : "Dajte mi više informacija o ovom planu. ",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
    "subscription.type.free" : "Slobodno",
-   "subscription.type.mining" : "Podržite Franca s procesorskim resursima",
    "subscription.type.month" : "mjesec",
    "subscription.type.year" : "godina",
    "subscriptionPopup.buttonCancel" : "Odustani",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 55914919d..15bdd33f4 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,12 +1,12 @@
 {
-   "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatásaihoz",
-   "global.notConnectedToTheInternet" : "Nincs kapcsolat a kiszolgálóval.",
+   "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
+   "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
    "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
    "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
    "import.skip.label" : "Manuálisan szeretném hozzáadni a szolgáltatásokat",
    "import.submit.label" : "Szolgáltatások importálása",
    "infobar.buttonChangelog" : "Mi változott?",
-   "infobar.buttonInstallUpdate" : "Újraindítás és a frissítés telepítése",
+   "infobar.buttonInstallUpdate" : "Újraindítás és frissítés telepítése",
    "infobar.buttonReloadServices" : "Szolgáltatások újratöltése",
    "infobar.requiredRequestsFailed" : "Szolgáltatások és felhasználói információk nem tölthetők be",
    "infobar.servicesUpdated" : "A szolgáltatások frissítésre kerültek.",
@@ -16,6 +16,7 @@
    "invite.name.label" : "Név",
    "invite.skip.label" : "Későbbre halasztom",
    "invite.submit.label" : "Meghívók küldése",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Email cím",
    "login.headline" : "Bejelentkezés",
    "login.invalidCredentials" : "Hibás email cím vagy jelszó",
@@ -53,7 +54,7 @@
    "settings.account.deleteInfo" : "Ha még nem szeretnéd fenntartani a Franz-fiókodat, akkor itt törölheted minden hozzá kapcsolódó adattal együtt.",
    "settings.account.headline" : "Fiók",
    "settings.account.headlineAccount" : "Fiókinformációk",
-   "settings.account.headlineDangerZone" : "Veszélyes üzemmód",
+   "settings.account.headlineDangerZone" : "Veszélyes terület, óvatosan!",
    "settings.account.headlineInvoices" : "Számlák",
    "settings.account.headlinePassword" : "Jelszócsere",
    "settings.account.headlineProfile" : "Profil frissítése",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Frissítsd fiókod és támogasd a Franz-ot",
    "settings.account.invoiceDownload" : "Letöltés",
    "settings.account.manageSubscription.label" : "Előfizetés kezelése",
-   "settings.account.mining.active" : "Jelenleg {hashes} számítást végzel másodpercenként.",
-   "settings.account.mining.cancel" : "Bányászás megszakítása",
-   "settings.account.mining.moreInformation" : "Több információ",
-   "settings.account.mining.thankyou" : "Köszönjük, hogy számítási kapacitásoddal támogatod a Franz-ot.",
    "settings.account.successInfo" : "A módosításokat elmentettük",
    "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
    "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
    "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
    "settings.app.form.beta" : "Béta verziók keresése",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
    "settings.app.updateStatusSearching" : "Frissítéseket keres",
    "settings.app.updateStatusUpToDate" : "A Franz legfrissebb verzióját használod",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Fiók",
    "settings.navigation.availableServices" : "Elérhető szolgáltatások",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Kijelentkezés",
    "settings.navigation.settings" : "Beállítások",
    "settings.navigation.yourServices" : "Szolgáltatásaid",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
    "subscription.features.vpn" : "Proxy & VPN támogatás",
    "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
-   "subscription.mining.experimental" : "kísérleti",
-   "subscription.mining.headline" : "Hogyan működik?",
-   "subscription.mining.line1" : "A \"Franz támogatása számítási kapacitással\" opció bekapcsolásával a Franz a CPU teljesítményének 20-50%-át Monero kriptovaluta bányászatához fogja használni, ami évente $5-nak felel meg.",
-   "subscription.mining.line2" : "Alkalmazkodni fog a CPU használat a munkafolyamataidhoz, igyekszik nem terhelni az akkumulátort és lassítani a gépet.",
-   "subscription.mining.line3" : "Amíg a bányász aktív, korlátlan hozzáférésed van minden Franz Prémium Támogató Funkcióhoz.",
-   "subscription.mining.moreInformation" : "Több információ erről az opcióról.",
    "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
    "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
    "subscription.type.free" : "ingyenes",
-   "subscription.type.mining" : "Franz támogatása számítási kapacitással",
    "subscription.type.month" : "hónap",
    "subscription.type.year" : "év",
    "subscriptionPopup.buttonCancel" : "Mégsem",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index f47a860b6..509c5ad9c 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -16,13 +16,14 @@
    "invite.name.label" : "Nama",
    "invite.skip.label" : "Saya ingin melakukannya nanti saja",
    "invite.submit.label" : "Kirim undangan",
+   "invite.successInfo" : "Undangan berhasil dikirim",
    "login.email.label" : "Alamat email",
    "login.headline" : "Masuk",
    "login.invalidCredentials" : "Email atau sandi tidak valid",
    "login.link.password" : "Setel ulang sandi",
    "login.link.signup" : "Buat akun gratis",
    "login.password.label" : "Sandi",
-   "login.serverLogout" : "Sesi Anda kedaluwarsa, silakan masuk kembali.",
+   "login.serverLogout" : "Sesi Anda telah berakhir, silakan masuk kembali.",
    "login.submit.label" : "Masuk",
    "login.tokenExpired" : "Sesi Anda kedaluwarsa, silakan masuk kembali.",
    "password.email.label" : "Alamat email",
@@ -37,7 +38,7 @@
    "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
    "pricing.support.label" : "Pilih paket dukungan Anda",
    "service.crashHandler.action" : "Muat Ulang {name}",
-   "service.crashHandler.autoReload" : "Mencoba memulihkan {name}  secara otomatis dalam {seconds} detik",
+   "service.crashHandler.autoReload" : "Mencoba memulihkan {name} secara otomatis dalam {seconds} detik",
    "service.crashHandler.headline" : "Ya Ampun!",
    "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
    "service.disabledHandler.action" : "Aktifkan {name}",
@@ -49,7 +50,7 @@
    "settings.account.accountType.premium" : "Akun Pendukung Premium",
    "settings.account.buttonSave" : "Perbarui profil",
    "settings.account.deleteAccount" : "Hapus akun",
-   "settings.account.deleteEmailSent" : "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
+   "settings.account.deleteEmailSent" : "Anda akan menerima email yang berisi tautan untuk melakukan konfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
    "settings.account.deleteInfo" : "Jika Anda tidak membutuhkan akun Franz lagi, Anda bisa menghapus akun dan semua data terkait di sini.",
    "settings.account.headline" : "Akun",
    "settings.account.headlineAccount" : "Informasi akun",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Tingkatkan akun Anda & dukung Franz",
    "settings.account.invoiceDownload" : "Unduh",
    "settings.account.manageSubscription.label" : "Kelola langganan Anda",
-   "settings.account.mining.active" : "Anda sedang melakukan menjalankan {hashes} perhitungan per detik.",
-   "settings.account.mining.cancel" : "Batalkan penambangan",
-   "settings.account.mining.moreInformation" : "Dapatkan informasi lebih lanjut",
-   "settings.account.mining.thankyou" : "Terima kasih telah mendukung Franz dengan daya pemrosesan Anda.",
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
    "settings.account.userInfoRequestFailed" : "Tidak bisa memuat informasi pengguna",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
    "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
    "settings.app.form.beta" : "Sertakan versi beta",
+   "settings.app.form.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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Versi baru tersedia, mengunduh...",
    "settings.app.updateStatusSearching" : "Sedang mencari versi baru",
    "settings.app.updateStatusUpToDate" : "Anda sedang menggunakan versi terbaru Franz",
+   "settings.invite.headline" : "Undang Teman",
    "settings.navigation.account" : "Akun",
    "settings.navigation.availableServices" : "Layanan tersedia",
+   "settings.navigation.inviteFriends" : "Undang Teman",
    "settings.navigation.logout" : "Keluar",
    "settings.navigation.settings" : "Pengaturan",
    "settings.navigation.yourServices" : "Layanan Anda",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Layanan add-on premise\/hosted seperti HipChat",
    "subscription.features.vpn" : "Dukungan proxy & VPN",
    "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
-   "subscription.mining.experimental" : "eksperimental",
-   "subscription.mining.headline" : "Bagaimana cara kerjanya?",
-   "subscription.mining.line1" : "Dengan mengaktifkan \"Dukung dengan daya pemrosesan\", Franz akan menggunakan 20%-50% kemampuan CPU Anda untuk menambang mata uang kripto Monero yang sepadan kira-kira $5\/tahun.",
-   "subscription.mining.line2" : "Kami akan menyesuaikan penggunaan CPU berdasarkan perilaku penggunaan komputer Anda agar tidak menghabiskan baterau dan memperlambat Anda dan pekerjaan Anda.",
-   "subscription.mining.line3" : "Selama penambang aktif Anda akan memiliki akses tak terbatas ke Franz Premium Supporter Features.",
-   "subscription.mining.moreInformation" : "Dapatkan informasi lebih lanjut tentang paket ini.",
    "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
    "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
    "subscription.type.free" : "gratis",
-   "subscription.type.mining" : "Dukung Franz dengan daya pemrosesan",
    "subscription.type.month" : "bulan",
    "subscription.type.year" : "tahun",
    "subscriptionPopup.buttonCancel" : "Batalkan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 1d2485b19..a1392afba 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,12 +1,12 @@
 {
-   "global.api.unhealthy" : "Impossibile collegarsi ai servizi online di Franz",
+   "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
    "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
-   "import.headline" : "Importa i tuoi servizi da Franz 4",
+   "import.headline" : "Importa i servizi di Franz 4",
    "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
    "import.skip.label" : "Voglio aggiungere servizi manualmente",
    "import.submit.label" : "Importa servizi",
-   "infobar.buttonChangelog" : "Novità",
-   "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
+   "infobar.buttonChangelog" : "Cosa c'è di nuovo?",
+   "infobar.buttonInstallUpdate" : "Riavvia e installa gli aggiornamenti",
    "infobar.buttonReloadServices" : "Ricarica servizi",
    "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
    "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
@@ -15,21 +15,22 @@
    "invite.headline.friends" : "Invita 3 dei tuoi amici o colleghi",
    "invite.name.label" : "Nome",
    "invite.skip.label" : "Voglio farlo dopo",
-   "invite.submit.label" : "Invia inviti",
+   "invite.submit.label" : "Manda inviti",
+   "invite.successInfo" : "Inviti inviati con successo",
    "login.email.label" : "Indirizzo email",
    "login.headline" : "Accedi",
    "login.invalidCredentials" : "Email o password non valide",
    "login.link.password" : "Reimposta password",
    "login.link.signup" : "Crea un account gratuito",
    "login.password.label" : "Password",
-   "login.serverLogout" : "Sessione scaduta, accedi di nuovo.",
+   "login.serverLogout" : "La tua sessione è scaduta, accedi nuovamente.",
    "login.submit.label" : "Accedi",
-   "login.tokenExpired" : "Sessione scaduta, accedi di nuovo.",
+   "login.tokenExpired" : "La tua sessione è scaduta, accedi nuovamente.",
    "password.email.label" : "Indirizzo email",
    "password.headline" : "Reimposta password",
    "password.link.login" : "Accedi al tuo account",
    "password.link.signup" : "Crea un account gratuito",
-   "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo email",
+   "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo e-mail",
    "password.submit.label" : "Invia",
    "password.successInfo" : "Controlla la tua email",
    "pricing.headline" : "Supporta Franz",
@@ -37,7 +38,7 @@
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
    "pricing.support.label" : "Seleziona il tuo piano di supporto",
    "service.crashHandler.action" : "Ricarica {name}",
-   "service.crashHandler.autoReload" : "Prova a ripristinare automaticamente {name} in {seconds} secondi",
+   "service.crashHandler.autoReload" : "Tentativo di ripristino automatico di {name} in {seconds} secondi",
    "service.crashHandler.headline" : "Oh no!",
    "service.crashHandler.text" : "{name} ha causato un errore.",
    "service.disabledHandler.action" : "Attiva {name}",
@@ -49,7 +50,7 @@
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Aggiorna profilo",
    "settings.account.deleteAccount" : "Elimina account",
-   "settings.account.deleteEmailSent" : "Hai ricevuto un'email con un link per confermare l'eliminazione del tuo account. I dati del tuo account non potranno essere ripristinati!",
+   "settings.account.deleteEmailSent" : "Hai ricevuto un'email con un link per confermare l'eliminazione del tuo account. I dati del tuo account non potranno più essere ripristinati!",
    "settings.account.deleteInfo" : "Se non hai più bisogno dell'account Franz, puoi eliminare il tuo account e tutti i dati relativi qui.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Informazioni account",
@@ -57,32 +58,30 @@
    "settings.account.headlineInvoices" : "Fatture",
    "settings.account.headlinePassword" : "Cambia password",
    "settings.account.headlineProfile" : "Aggiorna profilo",
-   "settings.account.headlineSubscription" : "La tua sottoscrizione",
+   "settings.account.headlineSubscription" : "La tua iscrizione",
    "settings.account.headlineUpgrade" : "Aggiorna il tuo account e supporta Franz",
    "settings.account.invoiceDownload" : "Scarica",
-   "settings.account.manageSubscription.label" : "Gestisci la tua sottoscrizione",
-   "settings.account.mining.active" : "Stai eseguendo {hashes} calcoli al secondo.",
-   "settings.account.mining.cancel" : "Annulla mining",
-   "settings.account.mining.moreInformation" : "Ottieni ulteriori informazioni",
-   "settings.account.mining.thankyou" : "Grazier per supportare Franz con la tua potenza di calcolo.",
+   "settings.account.manageSubscription.label" : "Gestisci la tua iscrizione",
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
-   "settings.account.tryReloadUserInfoRequest" : "Riprova ancora",
+   "settings.account.tryReloadUserInfoRequest" : "Prova ancora",
    "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
-   "settings.app.buttonClearAllCache" : "Svuota cache",
-   "settings.app.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
-   "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
+   "settings.app.buttonClearAllCache" : "Svuota la cache",
+   "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
+   "settings.app.buttonSearchForUpdate" : "Controlla gli aggiornamenti",
    "settings.app.cacheInfo" : "Franz sta utilizzando {size} di spazio su disco.",
    "settings.app.currentVersion" : "Versione attuale:",
-   "settings.app.form.autoLaunchInBackground" : "Apri in secondo piano",
+   "settings.app.form.autoLaunchInBackground" : "Apri in background",
    "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
    "settings.app.form.beta" : "Includi versioni beta",
+   "settings.app.form.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 icona Franz nella 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 tab servizi disattivati",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra badge messaggi non letti quanto le notifiche sono disattivati",
+   "settings.app.form.showDisabledServices" : "Mostra schede servizi disattivati",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta  dei messaggi non letti quanto le notifiche sono disattivate",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Aggiornamento disponibile, download in corso...",
    "settings.app.updateStatusSearching" : "Ricerca aggiornamenti...",
    "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Franz",
+   "settings.invite.headline" : "Invita Amici",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Servizi disponibili",
+   "settings.navigation.inviteFriends" : "Invita Amici",
    "settings.navigation.logout" : "Esci",
    "settings.navigation.settings" : "Impostazioni",
    "settings.navigation.yourServices" : "I tuoi servizi",
@@ -108,43 +109,43 @@
    "settings.recipes.nothingFound" : "Ci dispiace, ma nessun servizio corrisponde alla tua ricerca.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Servizio aggiunto con successo",
    "settings.searchService" : "Cerca servizio",
-   "settings.service.error.goBack" : "Indietro ai servizi",
+   "settings.service.error.goBack" : "Torna ai servizi",
    "settings.service.error.headline" : "Errore",
    "settings.service.error.message" : "Impossibile caricare il servizio.",
    "settings.service.form.addServiceHeadline" : "Aggiungi {name}",
    "settings.service.form.availableServices" : "Servizi disponibili",
    "settings.service.form.customUrl" : "Server personalizzato",
-   "settings.service.form.customUrlPremiumInfo" : "Per aggiungere servizi self hosted, devi avere un account Franz da Premium Supporter.",
+   "settings.service.form.customUrlPremiumInfo" : "Per aggiungere servizi personalizzati, devi avere un account Franz Premium Supporter.",
    "settings.service.form.customUrlUpgradeAccount" : "Aggiorna il tuo account",
    "settings.service.form.customUrlValidationError" : "Impossibile validare il server personalizzato {name}.",
    "settings.service.form.deleteButton" : "Elimina servizio",
    "settings.service.form.editServiceHeadline" : "Modifica {name}",
    "settings.service.form.enableAudio" : "Attiva audio",
-   "settings.service.form.enableBadge" : "Mostra badge messaggi non letti",
-   "settings.service.form.enableNotification" : "Attiva notifiche",
-   "settings.service.form.enableService" : "Attiva servizio",
-   "settings.service.form.headlineBadges" : "Badge messaggi non letti",
+   "settings.service.form.enableBadge" : "Mostra l'etichetta dei messaggi non letti",
+   "settings.service.form.enableNotification" : "Attiva le notifiche",
+   "settings.service.form.enableService" : "Attiva il servizio",
+   "settings.service.form.headlineBadges" : "Etichetta dei messaggi non letti",
    "settings.service.form.headlineGeneral" : "Generale",
    "settings.service.form.headlineNotifications" : "Notifiche",
    "settings.service.form.icon" : "Icona personalizzata",
    "settings.service.form.iconDelete" : "Elimina",
    "settings.service.form.iconUpload" : "Trascina la tua immagine o clicca qui",
-   "settings.service.form.indirectMessageInfo" : "Verrai notificato di tutti i messaggi in un canale, non solo @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Mostra il simbolo del messaggio per tutti i messaggi",
-   "settings.service.form.isMutedInfo" : "Quando disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mute",
+   "settings.service.form.indirectMessageInfo" : "Verranno notificati tutti i messaggi di un canale, non solo @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Mostra l'etichetta per tutti i messaggi",
+   "settings.service.form.isMutedInfo" : "Se  disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mute",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Salva servizio",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ��",
-   "settings.service.form.team" : "Team",
-   "settings.service.form.useHostedService" : "Utilizza il servizio hostato {name}.",
+   "settings.service.form.team" : "Gruppo",
+   "settings.service.form.useHostedService" : "Utilizza il servizio personalizzato {name}.",
    "settings.service.form.yourServices" : "I tuoi servizi",
    "settings.services.deletedInfo" : "Il servizio è stato eliminato",
    "settings.services.discoverServices" : "Scopri servizi",
    "settings.services.headline" : "I tuoi servizi",
-   "settings.services.noServicesAdded" : "Non aggiunto ancora nessun servizio.",
-   "settings.services.tooltip.isDisabled" : "Servizio disattivato",
-   "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
+   "settings.services.noServicesAdded" : "Non aggiunto nessun servizio.",
+   "settings.services.tooltip.isDisabled" : "Il servizio è disattivato",
+   "settings.services.tooltip.isMuted" : "Tutti i suoni sono stati disattivati",
    "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono state disattivate",
    "settings.services.updatedInfo" : "Le modifiche sono state salvate",
    "settings.user.form.accountType.company" : "Società",
@@ -156,7 +157,7 @@
    "settings.user.form.firstname" : "Nome",
    "settings.user.form.lastname" : "Cognome",
    "settings.user.form.newPassword" : "Nuova password",
-   "sidebar.addNewService" : "Aggiungi nuovo servizio",
+   "sidebar.addNewService" : "Aggiungi un nuovo servizio",
    "sidebar.muteApp" : "Disattiva notifiche & audio",
    "sidebar.settings" : "Impostazioni",
    "sidebar.unmuteApp" : "Attiva notifiche & audio",
@@ -166,30 +167,23 @@
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Iscriviti",
    "signup.lastname.label" : "Cognome",
-   "signup.legal.info" : "Creato un account Franz accetti",
+   "signup.legal.info" : "Creando un account di Franz accetti",
    "signup.legal.privacy" : "Informativa sulla Privacy",
    "signup.legal.terms" : "Termini del Servizio",
    "signup.link.login" : "Hai già un account, accedi?",
    "signup.password.label" : "Password",
    "signup.submit.label" : "Crea un account",
-   "subscription.euTaxInfo" : "Residenti EU: possono essere applicate tasse locali",
+   "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
-   "subscription.features.customServices" : "Servizi privati per te e il tuo team",
+   "subscription.features.customServices" : "Servizi privati per te e il tuo gruppo",
    "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
-   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hostati come HipChat",
+   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/in casa come HipChat",
    "subscription.features.vpn" : "Supporto Proxy e VPN",
    "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
-   "subscription.mining.experimental" : "sperimentale",
-   "subscription.mining.headline" : "Come funziona?",
-   "subscription.mining.line1" : "Attivando il \"Supporto con potenza di calcolo\", Franz utilizzerà circa il 20-50% della tua CPU per minare la criptomoneta Monero che equivale a circa 5$\/anno.",
-   "subscription.mining.line2" : "Adatteremo l'utilizzo della CPU in base al carico di lavoro per non drenare la batteria e rallentare la tua macchina.",
-   "subscription.mining.line3" : "Avrai accesso illimitato a tutte le caratteristiche Franz Premium Supporter finché il mining sarà attivo.",
-   "subscription.mining.moreInformation" : "Ottieni maggiori informazioni su questo piano.",
    "subscription.paymentSessionError" : "Impossibile inizializzare il form del pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
    "subscription.type.free" : "gratis",
-   "subscription.type.mining" : "Supporta Franz con potenza di calcolo",
    "subscription.type.month" : "mese",
    "subscription.type.year" : "anno",
    "subscriptionPopup.buttonCancel" : "Annulla",
@@ -202,8 +196,8 @@
    "tabs.item.enableAudio" : "Attiva audio",
    "tabs.item.enableNotification" : "Attiva notifiche",
    "tabs.item.enableService" : "Attiva servizio",
-   "tabs.item.reload" : "Ricarica",
+   "tabs.item.reload" : "Aggiorna",
    "welcome.loginButton" : "Accedi al tuo account",
    "welcome.signupButton" : "Crea un account gratuito",
-   "welcome.slogan" : "Messaging that works for you"
+   "welcome.slogan" : "Un sistema di messaggistica che funziona"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 3b0e3b428..9fc0a211b 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "��",
    "invite.skip.label" : "後�",
    "invite.submit.label" : "招待を�る",
+   "invite.successInfo" : "招待�無事��信�れ���",
    "login.email.label" : "メールアドレス",
    "login.headline" : "サインイン",
    "login.invalidCredentials" : "メールアドレス���パスワード�間������",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "アカウントをアップグレード��Franzを支��る",
    "settings.account.invoiceDownload" : "ダウンロード",
    "settings.account.manageSubscription.label" : "サブスクリプション�管�",
-   "settings.account.mining.active" : "1秒��り{hashes}個��ッシュを計算中��。",
-   "settings.account.mining.cancel" : "マイニングをキャンセル",
-   "settings.account.mining.moreInformation" : "詳細を確��る",
-   "settings.account.mining.thankyou" : "�使��PC�処�能力をFranz�支��活用��頂���り��������。",
    "settings.account.successInfo" : "変更内容��存�れ���",
    "settings.account.tryReloadUserInfoRequest" : "も�一度試�",
    "settings.account.userInfoRequestFailed" : "ユーザ情報を読�込���ん���",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "�ックグラウンド�開�",
    "settings.app.form.autoLaunchOnStart" : "システム起動時�Franzを開�",
    "settings.app.form.beta" : "Beta�ージョンを��る",
+   "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を�ックグラウンド�実行�����",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "更新�見��り���。ダウンロード�����...",
    "settings.app.updateStatusSearching" : "更新を確�中",
    "settings.app.updateStatusUpToDate" : "�使��Franz�最新��",
+   "settings.invite.headline" : "知り��を招待�る",
    "settings.navigation.account" : "アカウント",
    "settings.navigation.availableServices" : "利用�能�サービス",
+   "settings.navigation.inviteFriends" : "知り��を招待�る",
    "settings.navigation.logout" : "ログアウト",
    "settings.navigation.settings" : "設定",
    "settings.navigation.yourServices" : "利用中�サービス",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "HipChat�よ��オンプレミス\/ホスト型サービス�追加",
    "subscription.features.vpn" : "プロキシサー�ー�VPN�サ�ート",
    "subscription.includedFeatures" : "Franz Premium Supporter有料アカウント��以下���れ��",
-   "subscription.mining.experimental" : "試験的",
-   "subscription.mining.headline" : "�れ���よ��機能����?",
-   "subscription.mining.line1" : "\"PC�処�能力を使��Franzを支��る\"を有効��る����Franz��よ�20-50%�CPUパワーを暗�通貨Monero�マイニング�使用���れ��よ�年間�5ドル分�相当���。",
-   "subscription.mining.line2" : "処�能力�基���CPU�使用率を�応������ッテリーを無駄�消費��り�システムを���る����り��ん。",
-   "subscription.mining.line3" : "マイニング�機能���る�り�Franz Premium Supporter�全��機能を無制��利用����。",
-   "subscription.mining.moreInformation" : "��プラン�詳細を確��る。",
    "subscription.paymentSessionError" : "支払�フォームを�期化出���ん",
    "subscription.submit.label" : "Franz�開発を支����",
    "subscription.type.free" : "ç„¡æ–™",
-   "subscription.type.mining" : "PC�処�能力を使��Franzを支��る",
    "subscription.type.month" : "月間",
    "subscription.type.year" : "å¹´é–“",
    "subscriptionPopup.buttonCancel" : "キャンセル",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 434e885a4..67e81e12b 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "ს�ხელი ",
    "invite.skip.label" : "�მ�ს მ�გვი�ნებით გ�ვ�კეთებ",
    "invite.submit.label" : "მ�წვევის გ�გზ�ვნ�",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "მეილი",
    "login.headline" : "შესვლ�",
    "login.invalidCredentials" : "მეილი �ნ პ�რ�ლი �რ�სწ�რი�",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "გ�ნ��ხლეთ თქვენი �ნგ�რიში დ� მხ�რი დ�უჭირეთ Franz-ს",
    "settings.account.invoiceDownload" : "გ�დმ�წერ�",
    "settings.account.manageSubscription.label" : "თქვენი გ�მ�წერის მ�რთვ�",
-   "settings.account.mining.active" : "თქვენ �ხლ� �სრულებთ {hashes} გ��ნგ�რიშებ�ს წ�მში.",
-   "settings.account.mining.cancel" : "მ�ინინგის გ�უქმებ�",
-   "settings.account.mining.moreInformation" : "მეტი ინფ�რმ�ციის მიღებ�",
-   "settings.account.mining.thankyou" : "გმ�დლ�ბთ Franz-ის მხ�რდ�ჭერისთვის.",
    "settings.account.successInfo" : "თქვენი ცვლილებები შენ�ხული�",
    "settings.account.tryReloadUserInfoRequest" : "სც�დეთ ხელ�ხლ�",
    "settings.account.userInfoRequestFailed" : "მ�მხმ�რებლის ინფ�რმ�ციის ჩ�ტვირთვ� ვერ მ�ხერხდ�",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "გ�ხსენით ფ�ნზე",
    "settings.app.form.autoLaunchOnStart" : "გ�ეშვ�ს Franz სისტემის ჩ�ტვირთვის�ს",
    "settings.app.form.beta" : "ჩ�რთეთ ბეტ� ვერსიები",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.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 გ�შვებული რ�დეს�ც ფ�ნჯ�რ� დ�იხურებ�",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "გ�ნ�ხლებ� ხელმის�წვდ�მი�, იწყებ� გ�დმ�წერ�...",
    "settings.app.updateStatusSearching" : "მიმდინ�რე�ბს გ�ნ�ხლების ძიებ�",
    "settings.app.updateStatusUpToDate" : "თქვენ იყენებთ Franz-ის უ�ხლეს ვერსი�ს",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "�ნგ�რიში",
    "settings.navigation.availableServices" : "ხელმის�წვდ�მი სერვისები",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "გ�სვლ�",
    "settings.navigation.settings" : "პ�რ�მეტრები",
    "settings.navigation.yourServices" : "თქვენი სერვისები",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "on-premise\/hosted სერვისების დ�მ�ტებ�, რ�გ�რიც�� HipChat",
    "subscription.features.vpn" : "Proxy-ს� დ� VPN-ის მხ�რდ�ჭერ�",
    "subscription.includedFeatures" : "ფ�სი�ნი Franz-ის პრემიუმ მხ�რმდ�მჭერი �ნგ�რიში",
-   "subscription.mining.experimental" : "ექსპერიმენტული",
-   "subscription.mining.headline" : "რ�გ�რ მუშ��ბს?",
-   "subscription.mining.line1" : "\"პრ�ცეს�რული დ�მუშ�ვების ძ�ლით მხ�რდ�ჭერის\" გ��ქტიურებით, Franz გ�მ�იყენებს თქვენი პრ�ცეს�რის 20-50% სიმძლ�ვრეს Monero კრიპტ�ვ�ლუტის მ�ინინგისთვის, რ�მელიც დ��ხლ�ებით გ�მ�იმუშ�ვებს $5-ს წელიწ�დში.",
-   "subscription.mining.line2" : "ჩვენ მ�ვ�ხდენთ პრ�ცეს�რის გ�მ�ყენების �დ�პტირებ�ს, რ�თ� �რ გ�ითიშ�ს თქვენი ბ�ტ�რე� �ნ შე�ყ�ვნ�ს თქვენი მ�წყ�ბილ�ბ�.",
-   "subscription.mining.line3" : "ს�ნ�მ მ�ინიგი მიმდინ�რე�ბს, თქვენ გექნებ�თ ულიმიტ� წვდ�მ� ყველ� Franz-ის პრემიუმ მხ�რდ�მჭერის მ�ხ�სი�თებლებზე.",
-   "subscription.mining.moreInformation" : "მიიღეთ მეტი ინფ�რმ�ცი� �მის შეს�ხებ.",
    "subscription.paymentSessionError" : "გ�დ�ხდის ფ�რმ�ტის ინიცი�ლიზ�ცი� ვერ მ�ხერხდ�",
    "subscription.submit.label" : "მინდ� ხელი შევუწყ� Franz-ის გ�ნვით�რებ�ს",
    "subscription.type.free" : "უფ�ს�",
-   "subscription.type.mining" : "Franz-ის მხ�რდ�ჭერ� პრ�ცეს�რული დ�მუშ�ვების ძ�ლით",
    "subscription.type.month" : "თვე",
    "subscription.type.year" : "წელი",
    "subscriptionPopup.buttonCancel" : "გ�უქმებ�",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 69ffca6e2..dab23f607 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
    "invite.submit.label" : "Verzend uitnodigingen",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
@@ -36,7 +37,7 @@
    "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
-   "service.crashHandler.action" : "Reload {name}",
+   "service.crashHandler.action" : "{naam} herladen",
    "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
    "service.crashHandler.headline" : "Oh no!",
    "service.crashHandler.text" : "{name} has caused an error.",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
-   "settings.account.mining.active" : "Op dit moment voer je {hashes} berekingen per seconde uit.",
-   "settings.account.mining.cancel" : "Stop mining",
-   "settings.account.mining.moreInformation" : "Meer informatie",
-   "settings.account.mining.thankyou" : "Bedankt voor je ondersteuning van Franz met je rekenkracht.",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
    "settings.app.form.beta" : "Inclusief bèta versies",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Enable spell checking",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon 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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
    "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Beschikbare services",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Uitloggen",
    "settings.navigation.settings" : "Instellingen",
    "settings.navigation.yourServices" : "Jouw services",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
    "subscription.features.vpn" : "Proxy & VPN ondersteuning",
    "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
-   "subscription.mining.experimental" : "experimenteel",
-   "subscription.mining.headline" : "Hoe werkt dit?",
-   "subscription.mining.line1" : "Door \"Ondersteunen met rekenkracht\" aan te zetten zal Franz ongeveer 20-50% van je CPU gebruiken om Monero cryptocurrency te minen, wat ongeveer op €4,3\/jaar neerkomt.",
-   "subscription.mining.line2" : "Het CPU gebruik zal aangepast worden aan je werkgedrag zodat we je batterij niet leeg laten lopen of jou en je machine vertragen.",
-   "subscription.mining.line3" : "Zolang de miner actief is heb je ongelimiteerde toegang tot alle Franz Premium Supporter Features.",
-   "subscription.mining.moreInformation" : "Meer informatie over dit plan.",
    "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
    "subscription.type.free" : "gratis",
-   "subscription.type.mining" : "Franz ondersteunen met rekenkracht",
    "subscription.type.month" : "maand",
    "subscription.type.year" : "jaar",
    "subscriptionPopup.buttonCancel" : "Annuleren",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 499f4d784..e2b14ceab 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,28 +1,29 @@
 {
-   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
+   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
-   "import.headline" : "Importeer uw Franz 4 services",
-   "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
+   "import.headline" : "Importeer uw Franz 4-services",
+   "import.notSupportedHeadline" : "Services die nog niet ondersteund worden in Franz 5",
    "import.skip.label" : "Ik wil services handmatig toevoegen",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
    "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
-   "infobar.buttonReloadServices" : "Herlaad de services",
-   "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
+   "infobar.buttonReloadServices" : "Laad services opnieuw",
+   "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
    "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
-   "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
+   "infobar.updateAvailable" : "Er is een nieuwe update voor Franz beschikbaar.",
    "invite.email.label" : "E-mailadres",
    "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
    "invite.submit.label" : "Uitnodigingen verzenden",
+   "invite.successInfo" : "Uitnodigingen verzonden",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
    "login.link.password" : "Wachtwoord vergeten",
    "login.link.signup" : "Maak een gratis account",
    "login.password.label" : "Wachtwoord",
-   "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "login.serverLogout" : "De sessie is verlopen, log alsjeblieft opnieuw in.",
    "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "password.email.label" : "E-mailadres",
@@ -32,56 +33,54 @@
    "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
    "password.submit.label" : "Verzenden",
    "password.successInfo" : "Controleer alsjeblieft je e-mail",
-   "pricing.headline" : "Ondersteun Franz",
+   "pricing.headline" : "Steun Franz",
    "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
-   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
+   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
-   "service.crashHandler.action" : "{name} herladen",
+   "service.crashHandler.action" : "Laad {name} opnieuw",
    "service.crashHandler.autoReload" : "Ga proberen om {name} te herstellen over {seconds} seconden",
    "service.crashHandler.headline" : "Oh nee!",
-   "service.crashHandler.text" : "{name} heeft voor een fout gezorgd.",
+   "service.crashHandler.text" : "{name} heeft een fout veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
    "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
-   "settings.account.accountType.basic" : "Basis Account",
+   "settings.account.accountType.basic" : "Basisaccount",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Update profiel",
    "settings.account.deleteAccount" : "Verwijder account",
    "settings.account.deleteEmailSent" : "Je hebt een e-mail ontvangen met een link om de aanvraag tot verwijderen van het account te bevestigen. Je accountgegevens en -data kunnen niet worden teruggehaald!",
-   "settings.account.deleteInfo" : "Wanneer je je Franz account niet langer wilt gebruiken, kan je je account en alle gerelateerde data hier verwijderen.",
+   "settings.account.deleteInfo" : "Wanneer je je Franz-account niet langer wilt gebruiken, kan je je account en alle gerelateerde data hier verwijderen.",
    "settings.account.headline" : "Account",
-   "settings.account.headlineAccount" : "Account informatie",
+   "settings.account.headlineAccount" : "Accountinformatie",
    "settings.account.headlineDangerZone" : "Gevarenzone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
    "settings.account.headlineProfile" : "Profiel bijwerken",
    "settings.account.headlineSubscription" : "Je abonnement",
-   "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
+   "settings.account.headlineUpgrade" : "Upgrade je account & steun Franz",
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
-   "settings.account.mining.active" : "Op dit moment voer je {hashes} berekingen per seconde uit.",
-   "settings.account.mining.cancel" : "Stop mining",
-   "settings.account.mining.moreInformation" : "Meer informatie",
-   "settings.account.mining.thankyou" : "Bedankt voor je ondersteuning van Franz met je rekenkracht.",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
-   "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache legen",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
-   "settings.app.cacheInfo" : "De Franz cache gebruikt op dit moment {size} schijfruimte.",
+   "settings.app.cacheInfo" : "De Franz-cache gebruikt op dit moment {size} schijfruimte.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
-   "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
-   "settings.app.form.beta" : "Inclusief bèta versies",
+   "settings.app.form.autoLaunchOnStart" : "Open Franz bij opstarten",
+   "settings.app.form.beta" : "Inclusief bètaversies",
+   "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" : "Laat uitgeschakelde services zien",
+   "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
    "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
+   "settings.invite.headline" : "Nodig vrienden uit",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Beschikbare services",
+   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
    "settings.navigation.logout" : "Uitloggen",
    "settings.navigation.settings" : "Instellingen",
    "settings.navigation.yourServices" : "Jouw services",
@@ -105,7 +106,7 @@
    "settings.recipes.headline" : "Beschikbare services",
    "settings.recipes.missingService" : "Mist er een dienst?",
    "settings.recipes.mostPopular" : "Meest populair",
-   "settings.recipes.nothingFound" : "Geen service kwam overeen met je zoekopdracht.",
+   "settings.recipes.nothingFound" : "Sorry, geen service gevonden met deze zoekterm.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
    "settings.searchService" : "Zoek service",
    "settings.service.error.goBack" : "Terug naar services",
@@ -128,12 +129,12 @@
    "settings.service.form.headlineNotifications" : "Meldingen",
    "settings.service.form.icon" : "Aangepast icoon",
    "settings.service.form.iconDelete" : "Verwijderen",
-   "settings.service.form.iconUpload" : "Sleep je afbeelding, of klik hier",
+   "settings.service.form.iconUpload" : "Sleep en drop je afbeelding, of klik hier",
    "settings.service.form.indirectMessageInfo" : "Je ontvangt meldingen van alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.saveButton" : "Opslaan service",
+   "settings.service.form.saveButton" : "Service opslaan",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ��",
    "settings.service.form.team" : "Team",
@@ -149,24 +150,24 @@
    "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.user.form.accountType.company" : "Bedrijf",
    "settings.user.form.accountType.individual" : "Individueel",
-   "settings.user.form.accountType.label" : "Account type",
+   "settings.user.form.accountType.label" : "Accounttype",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Huidige wachtwoord",
    "settings.user.form.email" : "E-mailadres",
    "settings.user.form.firstname" : "Voornaam",
    "settings.user.form.lastname" : "Achternaam",
    "settings.user.form.newPassword" : "Nieuw wachtwoord",
-   "sidebar.addNewService" : "Service toevoegen",
-   "sidebar.muteApp" : "Uitschakelen berichten & geluid",
+   "sidebar.addNewService" : "Voeg service toe",
+   "sidebar.muteApp" : "Schakel berichten & geluid uit",
    "sidebar.settings" : "Instellingen",
-   "sidebar.unmuteApp" : "Inschakelen berichten & geluid",
+   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
    "signup.company.label" : "Bedrijf",
    "signup.email.label" : "E-mailadres",
    "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
    "signup.firstname.label" : "Voornaam",
    "signup.headline" : "Aanmelden",
    "signup.lastname.label" : "Achternaam",
-   "signup.legal.info" : "Door een Franz account aan te maken ga je akkoord met de",
+   "signup.legal.info" : "Door een Franz-account aan te maken ga je akkoord met de",
    "signup.legal.privacy" : "Privacy Voorwaarden",
    "signup.legal.terms" : "Gebruiksvoorwaarden",
    "signup.link.login" : "Al een account? Log in!",
@@ -175,34 +176,27 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.customServices" : "Privé services voor jou en je team",
+   "subscription.features.customServices" : "Privé-services voor jou en je team",
    "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
    "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
    "subscription.features.vpn" : "Proxy & VPN ondersteuning",
    "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
-   "subscription.mining.experimental" : "experimenteel",
-   "subscription.mining.headline" : "Hoe werkt dit?",
-   "subscription.mining.line1" : "Door \"Ondersteun met rekenkracht\" te activeren, zal Franz ongeveer 20-50% van je CPU gebruiken om de cryptomunt Monero te minen, wat overeenkomt met ongeveer $ 5\/jaar.",
-   "subscription.mining.line2" : "We zullen het CPU-gebruik aanpassen aan je gebruik en daarmee voorkomen dat de batterij leegloopt of dat jij en je werk worden afgeremd.",
-   "subscription.mining.line3" : "Zolang de miner actief is, heb je onbeperkt toegang tot alle Franz Premium Supporter Features.",
-   "subscription.mining.moreInformation" : "Verkrijg meer informatie over dit plan.",
    "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "subscription.type.free" : "gratis",
-   "subscription.type.mining" : "Ondersteun Franz met rekenkracht",
    "subscription.type.month" : "maand",
    "subscription.type.year" : "jaar",
    "subscriptionPopup.buttonCancel" : "Annuleer",
    "subscriptionPopup.buttonDone" : "Klaar",
-   "tabs.item.deleteService" : "Verwijderen service",
-   "tabs.item.disableAudio" : "Audio uitschakelen",
-   "tabs.item.disableNotifications" : "Uitschakelen meldingen",
-   "tabs.item.disableService" : "Uitschakelen service",
+   "tabs.item.deleteService" : "Verwijder service",
+   "tabs.item.disableAudio" : "Schakel audio uit",
+   "tabs.item.disableNotifications" : "Schakel meldingen uit",
+   "tabs.item.disableService" : "Schakel service uit",
    "tabs.item.edit" : "Bewerk",
    "tabs.item.enableAudio" : "Audio inschakelen",
-   "tabs.item.enableNotification" : "Inschakelen meldingen",
+   "tabs.item.enableNotification" : "Meldingen inschakelen",
    "tabs.item.enableService" : "Service inschakelen",
-   "tabs.item.reload" : "Herlaad",
+   "tabs.item.reload" : "Laad opnieuw",
    "welcome.loginButton" : "Log in op je account",
    "welcome.signupButton" : "Maak een gratis account",
    "welcome.slogan" : "Messaging die voor jou werkt"
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 85b8cf497..95e269ea7 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "ImiÄ™",
    "invite.skip.label" : "Chcę to zrobić później",
    "invite.submit.label" : "Wyślij zaproszenia",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Adres email",
    "login.headline" : "Zaloguj siÄ™",
    "login.invalidCredentials" : "Adres email lub hasło są błędne",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Ulepsz swoje konto i wspieraj aplikacjÄ™ Franz",
    "settings.account.invoiceDownload" : "Pobierz",
    "settings.account.manageSubscription.label" : "ZarzÄ…dzaj swoimi subskrypcjami",
-   "settings.account.mining.active" : "Obecnie wykonujesz {hashes} operacji na sekundÄ™.",
-   "settings.account.mining.cancel" : "Anuluj kopanie",
-   "settings.account.mining.moreInformation" : "Zdobądź więcej informacji",
-   "settings.account.mining.thankyou" : "Dziękuję za wsparcie aplikacji Franz mocą obliczeniową.",
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
    "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na poczÄ…tku",
    "settings.app.form.beta" : "Uwzględnij wersje beta",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "WÅ‚Ä…cz sprawdzanie pisowni",
    "settings.app.form.enableSystemTray" : "Pokaż Franza w tacy systemowej",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikacjÄ™ Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
    "settings.app.updateStatusSearching" : "Szukam aktualizacji",
    "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Konto",
    "settings.navigation.availableServices" : "Dostępne usługi",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Wyloguj",
    "settings.navigation.settings" : "Ustawienia",
    "settings.navigation.yourServices" : "Twoje usługi",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
    "subscription.features.vpn" : "Wsprarcie Proxy i VPN",
    "subscription.includedFeatures" : "PÅ‚atne konto Franz Premium obejmuje",
-   "subscription.mining.experimental" : "eksperymentalne",
-   "subscription.mining.headline" : "Jak to działa?",
-   "subscription.mining.line1" : "Włączając \"wspieraj mocą obliczeniową\", aplikacja Franz będzie używać około 20-50% mocy Twojego procesora aby kopać kryptowalutę Monero co jest równe około $5\/rok.",
-   "subscription.mining.line2" : "Będziemy dostosowywać zużycie procesora do stylu Twojej pracy tak aby nie zużywać baterii i nie spowalniać działania urządzenia.",
-   "subscription.mining.line3" : "Tak długo jak kopanie będzie aktywne, będziesz mieć nielimitowany dostęp do wszystkich funkcji dostępnych w koncie Premium.",
-   "subscription.mining.moreInformation" : "Dowiedz się więcej o tym planie.",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
    "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
    "subscription.type.free" : "za darmo",
-   "subscription.type.mining" : "Wspieraj aplikacjÄ™ Franz mocÄ… obliczeniowÄ…",
    "subscription.type.month" : "miesiÄ…c",
    "subscription.type.year" : "rok",
    "subscriptionPopup.buttonCancel" : "Anuluj",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index d32a09e48..dd1633a9c 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -11,148 +11,149 @@
    "infobar.requiredRequestsFailed" : "Não foi possível carregar serviços e informações do usuário",
    "infobar.servicesUpdated" : "Seus serviços foram atualizados.",
    "infobar.updateAvailable" : "Uma nova atualização do Franz está disponível.",
-   "invite.email.label" : "Endereço de email ",
-   "invite.headline.friends" : "Convide 3 dos seus amigos ou colegas",
+   "invite.email.label" : "Endereço de e-mail ",
+   "invite.headline.friends" : "Convide três de seus amigos ou colegas",
    "invite.name.label" : "Nome",
    "invite.skip.label" : "Quero fazer isso depois",
    "invite.submit.label" : "Enviar convites",
+   "invite.successInfo" : "Convites enviados com sucesso",
    "login.email.label" : "Endereço de e-mail",
-   "login.headline" : "Login",
-   "login.invalidCredentials" : "Email ou senha inválida",
+   "login.headline" : "Entrar",
+   "login.invalidCredentials" : "E-mail ou senha inválida",
    "login.link.password" : "Trocar a senha",
    "login.link.signup" : "Criar uma conta gratuita",
    "login.password.label" : "Senha",
    "login.serverLogout" : "Sua sessão expirou, faça o login novamente.",
-   "login.submit.label" : "Login",
+   "login.submit.label" : "Entrar",
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
-   "password.email.label" : "Endereço de email",
+   "password.email.label" : "Endereço de e-mail",
    "password.headline" : "Trocar a senha",
    "password.link.login" : "Fazer login na sua conta",
    "password.link.signup" : "Criar uma conta grátis",
-   "password.noUser" : "Nenhum usuário com este email foi encontrado",
+   "password.noUser" : "Nenhum usuário com este e-mail foi encontrado",
    "password.submit.label" : "Enviar",
-   "password.successInfo" : "Por favor, verifique o seu email",
+   "password.successInfo" : "Por favor, verifique o seu e-mail",
    "pricing.headline" : "Apoie o Franz",
    "pricing.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
    "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
-   "pricing.support.label" : "Selecione seu plano de apoio",
+   "pricing.support.label" : "Selecione uma opção de apoio",
    "service.crashHandler.action" : "Recarregar {name}",
-   "service.crashHandler.autoReload" : "Tentando restabelecer {name} automaticamente em {seconds} segundos",
-   "service.crashHandler.headline" : "Ah não!",
+   "service.crashHandler.autoReload" : "Tentando reestabelecer {name} automaticamente em {seconds} segundos",
+   "service.crashHandler.headline" : "Ah, não!",
    "service.crashHandler.text" : "{name} causou um erro.",
-   "service.disabledHandler.action" : "Habilitar {name}",
-   "service.disabledHandler.headline" : "{name} está desabilitado",
-   "services.getStarted" : "Começar",
-   "services.welcome" : "Bem-vindo ao Franz",
+   "service.disabledHandler.action" : "Ativar {name}",
+   "service.disabledHandler.headline" : "{name} está desativado",
+   "services.getStarted" : "Iniciar",
+   "services.welcome" : "Bem-vindo ao Franz!",
    "settings.account.account.editButton" : "Editar conta",
    "settings.account.accountType.basic" : "Conta Básica",
    "settings.account.accountType.premium" : "Conta Apoiador Premium",
    "settings.account.buttonSave" : "Atualizar perfil",
    "settings.account.deleteAccount" : "Excluir conta",
-   "settings.account.deleteEmailSent" : "Você recebeu um e-mail com um link para confirmar a exclusão da sua conta. Sua conta e os dados não podem ser restaurados!",
-   "settings.account.deleteInfo" : "Se você não precisar de sua conta Franz por mais tempo, você pode excluir sua conta e todos os dados relacionados aqui.",
+   "settings.account.deleteEmailSent" : "Você recebeu um e-mail com um link para confirmar a exclusão da sua conta. Atenção! Sua conta e dados não poderão ser restaurados!",
+   "settings.account.deleteInfo" : "Se você não precisa mais de sua conta Franz, pode exclui-la juntamente com todos os  dados relacionados, aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informações de conta",
-   "settings.account.headlineDangerZone" : "Zona de Perigo",
+   "settings.account.headlineDangerZone" : "Zona de perigo",
    "settings.account.headlineInvoices" : "Recibos",
    "settings.account.headlinePassword" : "Mudar senha",
    "settings.account.headlineProfile" : "Atualizar perfil",
    "settings.account.headlineSubscription" : "Sua assinatura",
-   "settings.account.headlineUpgrade" : "Atualize a sua conta & apoie o Franz",
-   "settings.account.invoiceDownload" : "Download",
+   "settings.account.headlineUpgrade" : "Atualize a sua conta e ajude o Franz!",
+   "settings.account.invoiceDownload" : "Baixar",
    "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
-   "settings.account.mining.active" : "Você está realizando {hashes} cálculos por segundo agora.",
-   "settings.account.mining.cancel" : "Cancelar mineração",
-   "settings.account.mining.moreInformation" : "Obter mais informações",
-   "settings.account.mining.thankyou" : "Obrigado por apoiar o Franz com poder de processamento.",
-   "settings.account.successInfo" : "Suas mudanças foram salvas",
+   "settings.account.successInfo" : "Suas alterações foram gravadas",
    "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",
-   "settings.app.buttonInstallUpdate" : "Reiniciar & instalar atualização",
-   "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
-   "settings.app.cacheInfo" : "O cache do franz está usando atualmente {size} do espaço em disco.",
+   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização",
+   "settings.app.buttonSearchForUpdate" : "Verificar se há atualizações",
+   "settings.app.cacheInfo" : "O cache do Franz está usando {size} de espaço em disco atualmente.",
    "settings.app.currentVersion" : "Versão atual:",
-   "settings.app.form.autoLaunchInBackground" : "Abrir no fundo",
+   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
    "settings.app.form.beta" : "Incluir versões beta",
-   "settings.app.form.enableSpellchecking" : "Habilitar correção ortográfica",
-   "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
+   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
+   "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
+   "settings.app.form.enableSystemTray" : "Exibir o Franz na área de notificações",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Idioma",
-   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
+   "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de notificações",
    "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
-   "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desabilitados",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar o ícone da mensagem não lida quando as notificações estão desativadas",
+   "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
    "settings.app.headline" : "Ajustes",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
-   "settings.app.restartRequired" : "Reinicialização necessária",
+   "settings.app.restartRequired" : "As atualizações exigem reiniciar o sistema",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para a sua língua.",
-   "settings.app.updateStatusAvailable" : "Atualização disponível, fazendo download...",
-   "settings.app.updateStatusSearching" : "Em busca de atualização",
+   "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para seu idioma.",
+   "settings.app.updateStatusAvailable" : "Atualização disponível, baixando...",
+   "settings.app.updateStatusSearching" : "Buscando atualizações",
    "settings.app.updateStatusUpToDate" : "Você está usando a última versão do Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.logout" : "Logout",
+   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.logout" : "Sair",
    "settings.navigation.settings" : "Ajustes",
    "settings.navigation.yourServices" : "Seus serviços",
-   "settings.recipes.all" : "Todos serviços",
+   "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento ",
    "settings.recipes.headline" : "Serviços disponíveis",
-   "settings.recipes.missingService" : "Sentiu falta de um serviço?",
+   "settings.recipes.missingService" : "Sentiu falta de algum serviço?",
    "settings.recipes.mostPopular" : "Mais populares",
    "settings.recipes.nothingFound" : "Desculpe, mas nenhum serviço corresponde a sua pesquisa.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado com sucesso",
-   "settings.searchService" : "Serviço de pesquisa",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
+   "settings.searchService" : "Procurar serviço",
    "settings.service.error.goBack" : "Voltar aos serviços",
    "settings.service.error.headline" : "Erro",
-   "settings.service.error.message" : "Não foi possível carregar a receita de serviço.",
+   "settings.service.error.message" : "Não foi possível carregar a receita do serviço.",
    "settings.service.form.addServiceHeadline" : "Adicionar {name}",
    "settings.service.form.availableServices" : "Serviços disponíveis",
-   "settings.service.form.customUrl" : "Serviços personalizado",
-   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços auto-hospedados, você precisa de uma conta Franz Apoiador Premium.",
+   "settings.service.form.customUrl" : "Servidor personalizado",
+   "settings.service.form.customUrlPremiumInfo" : "Para adicionar serviços auto-hospedados, você precisa de uma conta Apoiador Franz Premium.",
    "settings.service.form.customUrlUpgradeAccount" : "Atualize a sua conta",
    "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor personalizado {name}.",
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
-   "settings.service.form.enableAudio" : "Habilitar áudio",
+   "settings.service.form.enableAudio" : "Ativar áudio",
    "settings.service.form.enableBadge" : "Mostrar aviso de mensagens não lidas",
-   "settings.service.form.enableNotification" : "Habilitar notificações",
-   "settings.service.form.enableService" : "Habilitar serviço",
+   "settings.service.form.enableNotification" : "Ativar notificações",
+   "settings.service.form.enableService" : "Ativar serviço",
    "settings.service.form.headlineBadges" : "Mensagens não lidas",
    "settings.service.form.headlineGeneral" : "Geral",
    "settings.service.form.headlineNotifications" : "Notificações",
    "settings.service.form.icon" : "�cone personalizado",
    "settings.service.form.iconDelete" : "Excluir",
-   "settings.service.form.iconUpload" : "Solte sua imagem, ou clique aqui",
+   "settings.service.form.iconUpload" : "Solte sua imagem ou clique aqui",
    "settings.service.form.indirectMessageInfo" : "Você será notificado por todas as mensagens em um canal, não apenas @usuário, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
-   "settings.service.form.isMutedInfo" : "Quando desabilitado, todas as notificações sonoras e áudios são nulas",
+   "settings.service.form.isMutedInfo" : "Quando desativado, as notificações sonoras e áudios ficarão em silêncio",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.saveButton" : "Salvar serviço",
+   "settings.service.form.saveButton" : "Gravar serviço",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ��",
    "settings.service.form.team" : "Equipe",
    "settings.service.form.useHostedService" : "Use o serviço {nome} hospedado.",
    "settings.service.form.yourServices" : "Seus serviços",
-   "settings.services.deletedInfo" : "Serviço apagado",
+   "settings.services.deletedInfo" : "Serviço excluído",
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Seus serviços",
    "settings.services.noServicesAdded" : "Você ainda não adicionou nenhum serviço.",
-   "settings.services.tooltip.isDisabled" : "Serviço desabilitado",
+   "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Sem som",
-   "settings.services.tooltip.notificationsDisabled" : "Notificações desabilitadas",
-   "settings.services.updatedInfo" : "Suas mudanças foram salvas",
+   "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
+   "settings.services.updatedInfo" : "Suas mudanças foram gravadas",
    "settings.user.form.accountType.company" : "Empresa",
-   "settings.user.form.accountType.individual" : "Individual",
+   "settings.user.form.accountType.individual" : "Pessoal",
    "settings.user.form.accountType.label" : "Tipo de conta",
    "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
    "settings.user.form.currentPassword" : "Senha atual",
-   "settings.user.form.email" : "Email",
+   "settings.user.form.email" : "E-mail",
    "settings.user.form.firstname" : "Nome",
    "settings.user.form.lastname" : "Sobrenome",
    "settings.user.form.newPassword" : "Nova senha",
@@ -161,49 +162,42 @@
    "sidebar.settings" : "Ajustes",
    "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
-   "signup.email.label" : "Endereço de email",
-   "signup.emailDuplicate" : "Um usuário com esta conta já existe",
+   "signup.email.label" : "Endereço de e-mail",
+   "signup.emailDuplicate" : "Já existe um usuário com este endereço de e-mail",
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Cadastrar-se",
    "signup.lastname.label" : "Sobrenome",
-   "signup.legal.info" : "Ao criar uma conta Franz você aceita os ",
-   "signup.legal.privacy" : "Declaração de Privacidade",
-   "signup.legal.terms" : "Termos de Serviço",
-   "signup.link.login" : "Já tem uma conta. Fazer login?",
+   "signup.legal.info" : "Ao criar uma conta Franz, você aceita os ",
+   "signup.legal.privacy" : "Declaração de privacidade",
+   "signup.legal.terms" : "Termos de serviço",
+   "signup.link.login" : "Já tem uma conta?",
    "signup.password.label" : "Senha",
-   "signup.submit.label" : "Criar conta",
-   "subscription.euTaxInfo" : "Residentes na União Européia: taxas locais serão aplicadas",
+   "signup.submit.label" : "Criar uma conta",
+   "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
    "subscription.features.ads" : "Sem anúncios, sempre!",
    "subscription.features.comingSoon" : "em breve",
    "subscription.features.customServices" : "Serviços privados para você e sua equipe",
    "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
-   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como HipChat",
-   "subscription.features.vpn" : "Suporte à proxy & VPN",
-   "subscription.includedFeatures" : "Conta Paga Franz Premium inclui",
-   "subscription.mining.experimental" : "experimental",
-   "subscription.mining.headline" : "Como isso funciona?",
-   "subscription.mining.line1" : "Habilitando o \"Apoio com poder de processamento\", o Franz vai usar cerca de 20-50% da sua CPU para minerar a criptomoeda Monero que equivale a aproximadamente $ 5\/ano.",
-   "subscription.mining.line2" : "Nós iremos adaptar o uso da CPU baseado nos seus hábitos para não drenar sua bateria nem deixar o seu computador lento.",
-   "subscription.mining.line3" : "Enquanto o minerador estiver ativo, você terá acesso ilimitado à todas funções do Franz Apoiador Premium.",
-   "subscription.mining.moreInformation" : "Obter mais informações sobre este plano.",
+   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
+   "subscription.features.vpn" : "Suporte a proxy e VPN",
+   "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
    "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
    "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
    "subscription.type.free" : "grátis",
-   "subscription.type.mining" : "Apoie o Franz com poder de processamento",
    "subscription.type.month" : "mês",
    "subscription.type.year" : "ano",
    "subscriptionPopup.buttonCancel" : "Cancelar",
    "subscriptionPopup.buttonDone" : "Feito",
-   "tabs.item.deleteService" : "Apagar serviço",
-   "tabs.item.disableAudio" : "Desabilitar áudio",
-   "tabs.item.disableNotifications" : "Desabilitar notificações",
-   "tabs.item.disableService" : "Desabilitar serviço",
+   "tabs.item.deleteService" : "Excluir serviço",
+   "tabs.item.disableAudio" : "Desativar áudio",
+   "tabs.item.disableNotifications" : "Desativar notificações",
+   "tabs.item.disableService" : "Desativar serviço",
    "tabs.item.edit" : "Editar",
-   "tabs.item.enableAudio" : "Habilitar áudio",
-   "tabs.item.enableNotification" : "Habilitar notificações",
-   "tabs.item.enableService" : "Habilitar o serviço",
+   "tabs.item.enableAudio" : "Ativar áudio",
+   "tabs.item.enableNotification" : "Ativar notificações",
+   "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
-   "welcome.loginButton" : "Fazer login na sua conta",
+   "welcome.loginButton" : "Entrar na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
-   "welcome.slogan" : "Mensagens que funcionam para você"
+   "welcome.slogan" : "Mensageria que funciona, para você"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index b8aec56a1..fb08ebd2a 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,7 +1,7 @@
 {
    "global.api.unhealthy" : "Não foi possível conectar aos serviços do Franz",
    "global.notConnectedToTheInternet" : "Não estás conectado à internet.",
-   "import.headline" : "Importar os teus 4 serviços Franz",
+   "import.headline" : "Importar os teus serviços do Franz 4",
    "import.notSupportedHeadline" : "Os serviços não são suportados no Franz 5",
    "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
@@ -16,6 +16,7 @@
    "invite.name.label" : "Nome",
    "invite.skip.label" : "Quero adicionar mais tarde",
    "invite.submit.label" : "Mandar convites",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Endereço de e-mail",
    "login.headline" : "Registar",
    "login.invalidCredentials" : " O email ou a password estão incorretos",
@@ -61,23 +62,21 @@
    "settings.account.headlineUpgrade" : "Atualiza a tua conta e ajuda o Franz",
    "settings.account.invoiceDownload" : "Descarregar",
    "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
-   "settings.account.mining.active" : "Agora, estás a executar {hashes} hashes por segundo",
-   "settings.account.mining.cancel" : "Cancelar mineração",
-   "settings.account.mining.moreInformation" : "Mais informação",
-   "settings.account.mining.thankyou" : "Obrigado por ajudares o Franz com o teu poder de processamento",
    "settings.account.successInfo" : "As tuas mudanças foram feitas com sucesso",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador.",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Limpar a 'cache'",
    "settings.app.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "settings.app.buttonSearchForUpdate" : "Procurar por atualizações",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "O 'chache' do Franz está a usar {size} do espaço do disco.",
    "settings.app.currentVersion" : "Versão atual",
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Inicar o Franz quando inciar o computador",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Idioma:",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Atualização disponivel, a descarregar...",
    "settings.app.updateStatusSearching" : "Está a procurar atualizações",
    "settings.app.updateStatusUpToDate" : "Estás a usar a última versão do Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Terminar Sessão",
    "settings.navigation.settings" : "Definições",
    "settings.navigation.yourServices" : "Os teus serviços",
@@ -107,7 +108,7 @@
    "settings.recipes.mostPopular" : "Os mais populares",
    "settings.recipes.nothingFound" : "Desculpa, mas não existe nenhum serviço com este termo.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Pesquisa de serviço",
    "settings.service.error.goBack" : "Voltar aos serviços",
    "settings.service.error.headline" : "Erro",
    "settings.service.error.message" : "Não foi possível carregar a receita do serviço.",
@@ -120,15 +121,15 @@
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Activar áudio",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Mostrar emblema de mensagens não vistas",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Emblema de mensagem não vista",
    "settings.service.form.headlineGeneral" : "Geral",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Notificações",
+   "settings.service.form.icon" : "Icon personalizável",
+   "settings.service.form.iconDelete" : "Apagar",
+   "settings.service.form.iconUpload" : "Arraste a sua imagem, ou clique aqui",
    "settings.service.form.indirectMessageInfo" : "Serás notificado sobre todas as novas mensagens de um canal, não só @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
    "settings.service.form.isMutedInfo" : "Quando desactivado, todo o audio das notificações estará em silêncio",
@@ -137,7 +138,7 @@
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Hospedado por si próprio ��",
    "settings.service.form.team" : "Equipa",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Utilize o serviço oferecido por {name}.",
    "settings.service.form.yourServices" : "Os teus serviços",
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
    "subscription.features.vpn" : "Suporte para proxy\/VPN",
    "subscription.includedFeatures" : "Ao pagares para o Franz Premium, tens acesso a",
-   "subscription.mining.experimental" : "experimental",
-   "subscription.mining.headline" : "Como é que isto funciona?",
-   "subscription.mining.line1" : "Ao habilitar \\\"Ajudar com poder de processamento\\\", o Franz vai usar cerca de 20-50% do teu CPU para minerar Monero que equivale aproximadamente a $5\/ano.",
-   "subscription.mining.line2" : "Vamos adaptar o uso da CPU com base no teu comportamento de trabalho para não drenar a bateria ou diminuir a velocidade da máquina.",
-   "subscription.mining.line3" : "Enquanto a mineração estiver ativa, terás acesso ilimitado a todas as Características de Suporte Premium da Franz.",
-   "subscription.mining.moreInformation" : "Obter informação sobre este plano.",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
    "subscription.submit.label" : "Quero ajudar o desenvolvimento do Franz",
    "subscription.type.free" : "Gratuito",
-   "subscription.type.mining" : "Ajudar o Franz com poder de processamento",
    "subscription.type.month" : "mês",
    "subscription.type.year" : "ano",
    "subscriptionPopup.buttonCancel" : "Cancelar",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 8b1e75871..65b61c1e5 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Им�",
    "invite.skip.label" : "Я �делаю �то позже",
    "invite.submit.label" : "Вы�лать приглашени�",
+   "invite.successInfo" : "Приглашени� у�пешно отправлены",
    "login.email.label" : "Email",
    "login.headline" : "Вход",
    "login.invalidCredentials" : "�еправильный email или пароль",
@@ -61,23 +62,21 @@
    "settings.account.headlineUpgrade" : "Улучшить аккаунт и поддержать Franz",
    "settings.account.invoiceDownload" : "Скачать",
    "settings.account.manageSubscription.label" : "Управление подпи�кой",
-   "settings.account.mining.active" : "Вы выполн�ете {hashes} вычи�лений в �екунду.",
-   "settings.account.mining.cancel" : "Отменить майнинг",
-   "settings.account.mining.moreInformation" : "Больше информации",
-   "settings.account.mining.thankyou" : "Благодарим ва� за поддержку Franz вашей вычи�лительной мощно�тью.",
    "settings.account.successInfo" : "Изменени� �охранены",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать �нова",
    "settings.account.userInfoRequestFailed" : "�евозможно загрузить информацию пользовател�",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Очи�тить к�ш",
    "settings.app.buttonInstallUpdate" : "Перезапу�тить и обновить",
    "settings.app.buttonSearchForUpdate" : "Проверить обновлени�",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "К�ш занимает {size} на ди�ке.",
    "settings.app.currentVersion" : "Текуща� вер�и�:",
    "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
    "settings.app.form.autoLaunchOnStart" : "Запу�кать Franz при �тарте",
    "settings.app.form.beta" : "Включа� бета вер�ии",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Включить проверку правопи�ани�",
    "settings.app.form.enableSystemTray" : "Показывать Franz в �и�темном трее",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Язык",
    "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в �и�темный трей",
    "settings.app.form.runInBackground" : "О�тавл�ть Franz в фоне при закрытии окна",
@@ -90,13 +89,15 @@
    "settings.app.headlineLanguage" : "Язык",
    "settings.app.headlineUpdates" : "Обновлени�",
    "settings.app.restartRequired" : "Изменени� требуют перезагрузки приложени�",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "К�ш",
    "settings.app.translationHelp" : "Помогите нам переве�ти Franz на ваш �зык.",
    "settings.app.updateStatusAvailable" : "До�тупно обновление, идёт загрузка...",
    "settings.app.updateStatusSearching" : "Пои�к обновлений",
    "settings.app.updateStatusUpToDate" : "Вы и�пользуете актуальную вер�ию Franz",
+   "settings.invite.headline" : "Пригла�ить друзей",
    "settings.navigation.account" : "�ккаунт",
    "settings.navigation.availableServices" : "До�тупные �ерви�ы",
+   "settings.navigation.inviteFriends" : "Пригла�ить друзей",
    "settings.navigation.logout" : "Выход",
    "settings.navigation.settings" : "�а�тройки",
    "settings.navigation.yourServices" : "Ваши �ерви�ы",
@@ -107,7 +108,7 @@
    "settings.recipes.mostPopular" : "Попул�рные",
    "settings.recipes.nothingFound" : "�ичего не найдено по вашему запро�у.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Серви� у�пешно добавлен",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "�айти �ерви�",
    "settings.service.error.goBack" : "Вернуть�� к �ерви�ам",
    "settings.service.error.headline" : "Ошибка",
    "settings.service.error.message" : "�евозможно загрузить рецепт �ерви�а.",
@@ -120,15 +121,15 @@
    "settings.service.form.deleteButton" : "Удалить �ерви�",
    "settings.service.form.editServiceHeadline" : "Редактирование {name}",
    "settings.service.form.enableAudio" : "Включить звук",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Показывать иконку непрочитанных �ообщений",
    "settings.service.form.enableNotification" : "Включить уведомлени�",
    "settings.service.form.enableService" : "Включить �ерви�",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Значки непрочитанных �ообщений",
    "settings.service.form.headlineGeneral" : "Общие",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Уведомлени�",
+   "settings.service.form.icon" : "Значок пользовател�",
+   "settings.service.form.iconDelete" : "Удалить",
+   "settings.service.form.iconUpload" : "Перетащите картинку или нажмите �юда",
    "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомлени� дл� в�ех �ообщений, не только дл� @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений дл� в�ех новых �ообщений",
    "settings.service.form.isMutedInfo" : "Когда выключено, в�е звуковые уведомлени� будут отключены",
@@ -137,7 +138,7 @@
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хо�тинг ��",
    "settings.service.form.team" : "Команда",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "И�пользовать �об�твенный �ерви� {name}",
    "settings.service.form.yourServices" : "Ваши �ерви�ы",
    "settings.services.deletedInfo" : "Серви� удален",
    "settings.services.discoverServices" : "�айти �ерви�ы",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Добавление облачных �лужб или �лужб на �воём хо�тинге типа HipChat",
    "subscription.features.vpn" : "Поддержку прок�и и VPN",
    "subscription.includedFeatures" : "Платный аккаунт Franz Premium включает",
-   "subscription.mining.experimental" : "�к�периментально",
-   "subscription.mining.headline" : "Как �то работает?",
-   "subscription.mining.line1" : "Включив «Поддержку � вычи�лительной мощно�тью», Franz будет и�пользовать около 20–50% вашего проце��ора, дл� майнинга криптовалюты Monero в примерном объёме $5\/год.",
-   "subscription.mining.line2" : "Мы будем регулировать и�пользование проце��ора, чтобы не разр�жать аккумул�тор и не замедл�ть работу вашего компьютера.",
-   "subscription.mining.line3" : "Пока разрешен майнинг, у ва� будет неограниченный до�туп ко в�ем функци�м Franz Premium.",
-   "subscription.mining.moreInformation" : "Узнать больше об �том плане.",
    "subscription.paymentSessionError" : "�евозможно загрузить форму оплаты",
    "subscription.submit.label" : "Я хочу поддержать разработку Franz",
    "subscription.type.free" : "бе�платно",
-   "subscription.type.mining" : "Поддержка Franz вычи�лительной мощно�тью",
    "subscription.type.month" : "ме��ц",
    "subscription.type.year" : "год",
    "subscriptionPopup.buttonCancel" : "Отмена",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 84f6e7ecc..35f06531f 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Meno",
    "invite.skip.label" : "Spravím to neskôr",
    "invite.submit.label" : "Poslať pozvánky",
+   "invite.successInfo" : "Pozvánky boli úspešne odoslané",
    "login.email.label" : "Emailová adresa",
    "login.headline" : "Prihlásiť sa",
    "login.invalidCredentials" : "E-mail alebo heslo nesúhlasí",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Inovujte svoj ú�et a podporte Franz",
    "settings.account.invoiceDownload" : "Stiahnuť",
    "settings.account.manageSubscription.label" : "Spravovať vaše predplatné",
-   "settings.account.mining.active" : "Práve vykonávate {hashes} výpo�ty za sekundu.",
-   "settings.account.mining.cancel" : "Zrušiť ťažbu",
-   "settings.account.mining.moreInformation" : "Získať viac informácií",
-   "settings.account.mining.thankyou" : "Ďakujeme, že podporujete Franz vaším výpo�etným výkonom.",
    "settings.account.successInfo" : "Vaše zmeny boli uložené",
    "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
    "settings.account.userInfoRequestFailed" : "Nebolo možné získať informácie o užívateľovi",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
    "settings.app.form.beta" : "Vrátane beta verzií",
+   "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu bare",
    "settings.app.form.enableSpellchecking" : "Povoliť zvýraznenie preklepov",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
+   "settings.app.form.hideDockIcon" : "Schovaj ikonu Franz v doku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
    "settings.app.form.runInBackground" : "Ponechať Franz spustený v pozadí pri zatvorení okna",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Dostupná aktualizácia, sťahujem...",
    "settings.app.updateStatusSearching" : "Vyhľadávam aktualizácie",
    "settings.app.updateStatusUpToDate" : "Používate najnovšiu verziu Franz",
+   "settings.invite.headline" : "Pozvi priateľov",
    "settings.navigation.account" : "Ú�et",
    "settings.navigation.availableServices" : "Dostupné služby",
+   "settings.navigation.inviteFriends" : "Pozvi priateľov",
    "settings.navigation.logout" : "Odhlásiť sa",
    "settings.navigation.settings" : "Nastavenia",
    "settings.navigation.yourServices" : "Vaše služby",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Pridať vlastné\/hostované služby, ako je HipChat",
    "subscription.features.vpn" : "Proxy & VPN podpora",
    "subscription.includedFeatures" : "Platený ú�et Premium Supporter Franz zahŕňa",
-   "subscription.mining.experimental" : "experimentálne",
-   "subscription.mining.headline" : "Ako toto funguje?",
-   "subscription.mining.line1" : "Povolením funkcie \"Podpora s výpo�tovou silou\" bude Franz používať približne 20-50% vášho CPU na ťažbu kryptomeny Monero, �o sa rovná približne 5 dolárov ro�ne.",
-   "subscription.mining.line2" : "Prispôsobíme využitie procesora na základe vášho pracovného správania, aby sme nevy�erpali batériu a nespomaľovali vás a váš po�íta�.",
-   "subscription.mining.line3" : "Pokiaľ je baník aktívny, budete mať neobmedzený prístup ku všetkým funkciám Franz Premium Supporter.",
-   "subscription.mining.moreInformation" : "Získať viac informácií o tomto pláne.",
    "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
    "subscription.submit.label" : "Chcem podporiť vývoj programu Franz",
    "subscription.type.free" : "Zdarma",
-   "subscription.type.mining" : "Podporiť Franz výpo�etným výkonom",
    "subscription.type.month" : "mesiac",
    "subscription.type.year" : "rok",
    "subscriptionPopup.buttonCancel" : "Zrušiť",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 4d4e20d17..90e1a04b9 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Ime",
    "invite.skip.label" : "Želim da ovo uradim kasnije",
    "invite.submit.label" : "Pošalji pozivnice",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Vaša e-adresa:",
    "login.headline" : "Prijavite se",
    "login.invalidCredentials" : "E-mail ili lozinka nisu to�ni",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Nadogradite ra�un i podržite Franc",
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
-   "settings.account.mining.active" : "Trenutno se odvija {hashes} kalkulacija po sekundi. ",
-   "settings.account.mining.cancel" : "Odustani ",
-   "settings.account.mining.moreInformation" : "Dođi do više informacija",
-   "settings.account.mining.thankyou" : "Hvala Vam što podržavate Franca s vašom procesorskom moći. ",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
    "settings.app.form.beta" : "Obuhvati i beta verzije",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "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",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
    "settings.app.updateStatusSearching" : "Traže se ažuriranja",
    "settings.app.updateStatusUpToDate" : "Koristite najnoviju verziju Franca.",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Ra�un",
    "settings.navigation.availableServices" : "Dostupne usluge",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
    "settings.navigation.yourServices" : "Vaše usluge",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat",
    "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
    "subscription.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće:",
-   "subscription.mining.experimental" : "Eksperimentalno",
-   "subscription.mining.headline" : "Na koji na�in ovo radi?",
-   "subscription.mining.line1" : "Omogućavanjem \" Podrška snagom procesora \", Franc će iskoristiti oko 20-50% vaših CPU resursa za Kripto valutu \" Monero \" koja košta otprilike 5$ godišnje.",
-   "subscription.mining.line2" : "Adaptiraćemo iskorišćenost CPU resursa na osnovu vašeg rada, na taj na�in ćemo izbjeći iscrpljivanje baterije i usporavanje uređaja.",
-   "subscription.mining.line3" : "Dok god je \" rudar \" aktivan, imaćete neograni�en pristup svim Francovim Premium zna�ajkama.",
-   "subscription.mining.moreInformation" : "Dajte mi više informacija o ovom planu.",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca.",
    "subscription.type.free" : "Slobodno",
-   "subscription.type.mining" : "Podržite Franca s procesorskim resursima",
    "subscription.type.month" : "mjesec",
    "subscription.type.year" : "godina",
    "subscriptionPopup.buttonCancel" : "Odustani",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 816a60793..bcf0dd483 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Ad",
    "invite.skip.label" : "Daha sonra yapmak istiyorum",
    "invite.submit.label" : "Davetiye gönder",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "E-posta adresi",
    "login.headline" : "Oturum Aç",
    "login.invalidCredentials" : "Yanlış parola ya da e-posta adresi",
@@ -61,23 +62,21 @@
    "settings.account.headlineUpgrade" : "Hesabını yükselt & Franz'ı destekle",
    "settings.account.invoiceDownload" : "Ä°ndir",
    "settings.account.manageSubscription.label" : "Aboneliğini yönet",
-   "settings.account.mining.active" : "Şu anda saniyede {hashes} hesaplama işlemi gerçekleştiriyorsun.",
-   "settings.account.mining.cancel" : "MadenciliÄŸi iptal et",
-   "settings.account.mining.moreInformation" : "Daha fazla bilgi al",
-   "settings.account.mining.thankyou" : "Franz'ı işlem gücünle desteklediğin için teşekkürler.",
    "settings.account.successInfo" : "DeÄŸiÅŸikliklerin kaydedildi",
    "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
    "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi.",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "Önbelleği temizle",
    "settings.app.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
    "settings.app.buttonSearchForUpdate" : "Güncellemeleri kontrol et",
-   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.cacheInfo" : "Franz önbelleği şu anda {size} disk alanı kullanıyor.",
    "settings.app.currentVersion" : "Geçerli sürüm:",
    "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
    "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
    "settings.app.form.beta" : "Beta versiyonları dahil et",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
@@ -90,13 +89,15 @@
    "settings.app.headlineLanguage" : "Dil",
    "settings.app.headlineUpdates" : "Güncellemeler",
    "settings.app.restartRequired" : "Değişiklikler yeniden başlatmayı gerektiriyor",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.subheadlineCache" : "Önbellek",
    "settings.app.translationHelp" : "Franz'ı senin diline tercüme etmemiz için yardım et.",
    "settings.app.updateStatusAvailable" : "Güncelleme mevcut, indiriliyor...",
    "settings.app.updateStatusSearching" : "Güncellemeleri denetliyor",
    "settings.app.updateStatusUpToDate" : "Franz'ın son versiyonunu kullanıyorsun",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "Hesap",
    "settings.navigation.availableServices" : "Mevcut servisler",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Çıkış",
    "settings.navigation.settings" : "Ayarlar",
    "settings.navigation.yourServices" : "Servislerin",
@@ -107,7 +108,7 @@
    "settings.recipes.mostPopular" : "En popüler",
    "settings.recipes.nothingFound" : "Aradığın terimle eşleşen servis bulunamadı.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Servis başarıyla eklendi",
-   "settings.searchService" : "Search service",
+   "settings.searchService" : "Hizmeti ara",
    "settings.service.error.goBack" : "Servislere geri dön",
    "settings.service.error.headline" : "Hata",
    "settings.service.error.message" : "Servis tarifi yüklenemedi",
@@ -120,15 +121,15 @@
    "settings.service.form.deleteButton" : "Servisi sil",
    "settings.service.form.editServiceHeadline" : "{name} düzenle",
    "settings.service.form.enableAudio" : "Sesi etkinleÅŸtirin",
-   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableBadge" : "Okunmamış mesajları göster",
    "settings.service.form.enableNotification" : "Bildirimleri etkinleÅŸtir",
    "settings.service.form.enableService" : "Servisi etkinleÅŸtir",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Okunmamış mesajlar",
    "settings.service.form.headlineGeneral" : "Genel",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
-   "settings.service.form.iconDelete" : "Delete",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.headlineNotifications" : "Bildirimler",
+   "settings.service.form.icon" : "Özel simge",
+   "settings.service.form.iconDelete" : "Sil",
+   "settings.service.form.iconUpload" : "Resmini sürükle veya buraya tıkla",
    "settings.service.form.indirectMessageInfo" : "Bir kanaldaki tüm yeni mesajlar hakkında size bilgi verilecektir, bunlar daihil @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mesaj rozetini tüm yeni mesajlar için göster",
    "settings.service.form.isMutedInfo" : "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
@@ -137,7 +138,7 @@
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
    "settings.service.form.team" : "Takım",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Barındırılan {name} hizmetini kullanın.",
    "settings.service.form.yourServices" : "Servislerin",
    "settings.services.deletedInfo" : "Servis silindi",
    "settings.services.discoverServices" : "Servisleri keÅŸfet",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
    "subscription.features.vpn" : "Proxy & VPN desteÄŸi",
    "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
-   "subscription.mining.experimental" : "deneysel",
-   "subscription.mining.headline" : "Bu nasıl çalışır?",
-   "subscription.mining.line1" : "\"İşlem gücü ile destekleme\"'yi etkinleştirdiğinde, Franz CPU'nun %20-50'lik kısmını kriptopara Monero madenciliği için kullanacak. Yılda yaklaşık 5$'a eşdeğer.",
-   "subscription.mining.line2" : "CPU kullanımını, pilinizi bitirmemek ve makinenizi yavaşlatmamak için çalışma davranışınıza göre uyarlayacağız.",
-   "subscription.mining.line3" : "Madenci etkin olduğu sürece, tüm Franz Premium Destekçi Özelliklerine sınırsız erişime sahip olacaksınız.",
-   "subscription.mining.moreInformation" : "Bu plan hakkında daha fazla bilgi al.",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
    "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
    "subscription.type.free" : "ücretsiz",
-   "subscription.type.mining" : "Franz'ı işlem gücüyle destekle",
    "subscription.type.month" : "ay",
    "subscription.type.year" : "yıl",
    "subscriptionPopup.buttonCancel" : "Ä°ptal",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 5456bea95..4baf234ac 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "Ім'�",
    "invite.skip.label" : "Я хочу зробити це пізніше",
    "invite.submit.label" : "Відправити запрошенн�",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "Email адре�а",
    "login.headline" : "Увійти",
    "login.invalidCredentials" : "Email або пароль некоректні",
@@ -61,10 +62,6 @@
    "settings.account.headlineUpgrade" : "Оновити ваш акаунт і підтримати Franz",
    "settings.account.invoiceDownload" : "Завантажити",
    "settings.account.manageSubscription.label" : "Керуванн� вашою підпи�кою",
-   "settings.account.mining.active" : "Ви зараз здій�нюєте {hashes} розрахунків за �екунду.",
-   "settings.account.mining.cancel" : "Ска�увати видобуток",
-   "settings.account.mining.moreInformation" : "Отримати більше інформації",
-   "settings.account.mining.thankyou" : "Д�кую, що підтримуєте Franz �воєю обчи�лювальною потужні�тю.",
    "settings.account.successInfo" : "Ваші зміни були збережені",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "�е вдало�� завантажити інформацію кори�тувача",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запу�кати Franz на початку",
    "settings.app.form.beta" : "Включити бета-вер�ії",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
    "settings.app.form.enableSystemTray" : "Показувати Franz у �и�темному лотку",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до �и�темного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "Оновленн� до�тупне, завантаженн�...",
    "settings.app.updateStatusSearching" : "Шукає оновленн�",
    "settings.app.updateStatusUpToDate" : "Ви викори�товуєте о�танню вер�ію Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "�каунт",
    "settings.navigation.availableServices" : "До�тупні �ерві�и",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "Вийти",
    "settings.navigation.settings" : "�алаштуванн�",
    "settings.navigation.yourServices" : "Ваші �ерві�и",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "Додайте on-premise \/ hosted �ерві�и, такі �к Hipchat",
    "subscription.features.vpn" : "Підтримка прок�і та VPN",
    "subscription.includedFeatures" : "Платний Преміальний �каунт Прихильника Franz включає",
-   "subscription.mining.experimental" : "ек�периментальний",
-   "subscription.mining.headline" : "Як це працює?",
-   "subscription.mining.line1" : "Вмикаючи \"Підтримати обчи�лювальною потужні�тю\", Franz буде викори�товувати приблизно 20-50% вашого проце�ора щоб майнити криптовалюту Monero, що приблизно рівне $ 5\/рік.",
-   "subscription.mining.line2" : "Ми адаптуємо викори�танн� проце�ора відповідно до вашої поведінки, щоб не ви�нажувати акумул�тор, не �повільнити вашу роботу і роботу вашої машини.",
-   "subscription.mining.line3" : "Поки майнер активний, ви матимете необмежений до�туп до в�іх о�обливо�тей підтримки Franz Premium.",
-   "subscription.mining.moreInformation" : "Отримати більше інформації про цей план.",
    "subscription.paymentSessionError" : "�е вдало�� ініціалізувати форму платежу",
    "subscription.submit.label" : "Я хочу підтримати розробку Franz",
    "subscription.type.free" : "безплатно",
-   "subscription.type.mining" : "Підтримати Franz обчи�лювальною потужні�тю",
    "subscription.type.month" : "мі��ць",
    "subscription.type.year" : "рік",
    "subscriptionPopup.buttonCancel" : "Відмінити",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 12f1035bf..5feef50f2 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -16,6 +16,7 @@
    "invite.name.label" : "�稱",
    "invite.skip.label" : "我想�後��",
    "invite.submit.label" : "�出邀請",
+   "invite.successInfo" : "Invitations sent successfully",
    "login.email.label" : "電�郵件地�",
    "login.headline" : "登入",
    "login.invalidCredentials" : "電�郵件或密碼有誤",
@@ -61,14 +62,10 @@
    "settings.account.headlineUpgrade" : "�級您的帳戶&支�Franz",
    "settings.account.invoiceDownload" : "下載",
    "settings.account.manageSubscription.label" : "管�您的訂閱",
-   "settings.account.mining.active" : "您�在�秒正在執行{hashes}計算。",
-   "settings.account.mining.cancel" : "�消挖掘",
-   "settings.account.mining.moreInformation" : "�得更多資訊",
-   "settings.account.mining.thankyou" : "感�用你的處�能力支�Franz。",
    "settings.account.successInfo" : "您的更變已經被儲存",
    "settings.account.tryReloadUserInfoRequest" : "�試一次",
    "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
-   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonClearAllCache" : "清除快�",
    "settings.app.buttonInstallUpdate" : "�新啟動並安�更新",
    "settings.app.buttonSearchForUpdate" : "檢查更新",
    "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
@@ -76,8 +73,10 @@
    "settings.app.form.autoLaunchInBackground" : "在背景開啟",
    "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
    "settings.app.form.beta" : "包�測試版",
+   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
    "settings.app.form.enableSystemTray" : "顯示Franz在系統列",
+   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "語言",
    "settings.app.form.minimizeToSystemTray" : "最�化Franz到系統列",
    "settings.app.form.runInBackground" : "當關閉視窗時��Franz在背景�作",
@@ -95,8 +94,10 @@
    "settings.app.updateStatusAvailable" : "有�用更新，下載中...",
    "settings.app.updateStatusSearching" : "正在�尋更新",
    "settings.app.updateStatusUpToDate" : "您正在使用最新版本的Franz",
+   "settings.invite.headline" : "Invite Friends",
    "settings.navigation.account" : "帳號",
    "settings.navigation.availableServices" : "�使用的�務",
+   "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "登出",
    "settings.navigation.settings" : "設定",
    "settings.navigation.yourServices" : "您的�務",
@@ -180,16 +181,9 @@
    "subscription.features.onpremise" : "添加本地\/託管�務如HipChat",
    "subscription.features.vpn" : "代�和VPN支�",
    "subscription.includedFeatures" : "包�高級Franz付費帳戶",
-   "subscription.mining.experimental" : "實驗性",
-   "subscription.mining.headline" : "這是怎麼�作的？",
-   "subscription.mining.line1" : "��啟用「具有處�能力的支��，Franz將使用大約20-50%的CPU來挖掘加密貨幣Monero，大約相當於�年5美元。",
-   "subscription.mining.line2" : "我們將根據您的使用情形調整CPU使用率，以��耗盡電池，�低您和機器的性能。",
-   "subscription.mining.line3" : "��礦工處於活動狀態，您就�以無�制地使用所有的Franz 高級支�者的功能。",
-   "subscription.mining.moreInformation" : "�得有關此計劃的更多資訊。",
    "subscription.paymentSessionError" : "無法�始化付款表單",
    "subscription.submit.label" : "我想支�Franz的開發",
    "subscription.type.free" : "自由",
-   "subscription.type.mining" : "用進程處�權�支�Franz",
    "subscription.type.month" : "月",
    "subscription.type.year" : "å¹´",
    "subscriptionPopup.buttonCancel" : "�消",
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d01666d49..703060dc1 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -22,10 +22,14 @@ const template = [
         role: 'cut',
       },
       {
-        role: 'copy',
+        label: 'Copy',
+        accelerator: 'Cmd+C',
+        selector: 'copy:',
       },
       {
-        role: 'paste',
+        label: 'Paste',
+        accelerator: 'Cmd+V',
+        selector: 'paste:',
       },
       {
         role: 'pasteandmatchstyle',
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 2efe71a71..588fa75bf 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,4 +1,4 @@
-import { app, Tray, Menu, systemPreferences } from 'electron';
+import { app, Tray, Menu, systemPreferences, nativeImage } from 'electron';
 import path from 'path';
 
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
@@ -78,8 +78,8 @@ export default class TrayIcon {
       platform = `${platform}-dark`;
     }
 
-    return path.join(
-      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
+    return nativeImage.createFromPath(path.join(
+      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`),
     );
   }
 }
diff --git a/src/models/Settings.js b/src/models/Settings.js
index ca44da258..e39b63087 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -2,7 +2,6 @@ import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class Settings {
-  @observable autoLaunchOnStart = DEFAULT_APP_SETTINGS.autoLaunchOnStart;
   @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
   @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
   @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 06c43f83f..162422017 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -9,7 +9,7 @@ import prettyBytes from 'pretty-bytes';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac } from '../environment';
+import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 
@@ -179,9 +179,12 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        if (!isMac) {
-          const mainWindow = remote.getCurrentWindow();
+        const mainWindow = remote.getCurrentWindow();
+
+        if (isWindows) {
           mainWindow.restore();
+        } else if (isLinux) {
+          mainWindow.show();
         }
       }
     };
@@ -331,10 +334,7 @@ export default class AppStore extends Store {
   }
 
   // Helpers
-  async _appStartsCounter() {
-    // we need to wait until the settings request is resolved
-    await this.stores.settings.allSettingsRequest;
-
+  _appStartsCounter() {
     this.actions.settings.update({
       settings: {
         appStarts: (this.stores.settings.all.appStarts || 0) + 1,
@@ -345,10 +345,7 @@ export default class AppStore extends Store {
   async _autoStart() {
     this.autoLaunchOnStart = await this._checkAutoStart();
 
-    // we need to wait until the settings request is resolved
-    await this.stores.settings.allSettingsRequest;
-
-    if (!this.stores.settings.all.appStarts) {
+    if (this.stores.settings.all.appStarts === 1) {
       this.actions.app.launchOnStartup({
         enable: true,
       });
@@ -364,8 +361,8 @@ export default class AppStore extends Store {
       console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
       setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
     } else {
-      console.debug('reactivateServices: reload all services');
-      this.actions.service.reloadAll();
+      console.debug('reactivateServices: reload Franz');
+      window.location.reload();
     }
   }
 
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
new file mode 100644
index 000000000..817c2273f
--- /dev/null
+++ b/src/stores/FeaturesStore.js
@@ -0,0 +1,43 @@
+import { action, computed, observable } from 'mobx';
+
+import Store from './lib/Store';
+import CachedRequest from './lib/CachedRequest';
+import Request from './lib/Request';
+
+export default class RecipesStore extends Store {
+  @observable baseFeaturesRequest = new CachedRequest(this.api.features, 'base');
+  @observable featuresRequest = new CachedRequest(this.api.features, 'features');
+
+  setup() {
+    this.registerReactions([
+      this._monitorLoginStatus.bind(this),
+      this._debugFeatures.bind(this),
+    ]);
+  }
+
+  @computed get base() {
+    return this.baseFeaturesRequest.execute().result || {};
+  }
+
+  @computed get features() {
+    if (this.stores.user.isLoggedIn) {
+      return this.featuresRequest.execute().result || {};
+    }
+
+    return this.base;
+  }
+
+  _debugFeatures() {
+    console.log(this.base, this.features)
+  }
+
+  _monitorLoginStatus() {
+    if (this.stores.user.isLoggedIn) {
+      this.featuresRequest.invalidate({ immediately: true });
+      this.featuresRequest.execute();
+    } else {
+      this.baseFeaturesRequest.invalidate({ immediately: true });
+      this.baseFeaturesRequest.execute();
+    }
+  }
+}
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 99ffe5439..c38d0d9ee 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -536,7 +536,6 @@ export default class ServicesStore extends Store {
 
     // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
     if (showMessageBadgesEvenWhenMuted) {
-      console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount);
       this.actions.app.setBadge({
         unreadDirectMessageCount,
         unreadIndirectMessageCount,
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index da99a720f..b7d803398 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,17 +1,12 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable, extendObservable } from 'mobx';
+import { action, computed } from 'mobx';
+import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import Request from './lib/Request';
-import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 import SettingsModel from '../models/Settings';
 
 export default class SettingsStore extends Store {
-  @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings');
-  @observable updateSettingsRequest = new Request(this.api.local, 'updateSettings');
-  @observable removeSettingsKeyRequest = new Request(this.api.local, 'removeKey');
-
   constructor(...args) {
     super(...args);
 
@@ -21,20 +16,16 @@ export default class SettingsStore extends Store {
   }
 
   setup() {
-    this.allSettingsRequest.execute();
     this._shareSettingsWithMainProcess();
   }
 
   @computed get all() {
-    return new SettingsModel(this.allSettingsRequest.result);
+    return new SettingsModel(localStorage.getItem('app') || {});
   }
 
   @action async _update({ settings }) {
-    await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.patch((result) => {
-      if (!result) return;
-      extendObservable(result, settings);
-    });
+    const appSettings = this.all;
+    localStorage.setItem('app', Object.assign(appSettings, settings));
 
     // We need a little hack to wait until everything is patched
     setTimeout(() => this._shareSettingsWithMainProcess(), 0);
@@ -43,8 +34,11 @@ export default class SettingsStore extends Store {
   }
 
   @action async _remove({ key }) {
-    await this.removeSettingsKeyRequest.execute(key);
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    const appSettings = this.all;
+    if (Object.hasOwnProperty.call(appSettings, key)) {
+      delete appSettings[key];
+      localStorage.setItem('app', appSettings);
+    }
 
     this._shareSettingsWithMainProcess();
   }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index abec4df5d..7dbbd955b 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -1,6 +1,7 @@
 import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
+import localStorage from 'mobx-localstorage';
 
 import { isDevMode } from '../environment';
 import Store from './lib/Store';
@@ -99,7 +100,7 @@ export default class UserStore extends Store {
 
   // Data
   @computed get isLoggedIn() {
-    return this.authToken !== null && this.authToken !== undefined;
+    return Boolean(localStorage.getItem('authToken'));
   }
 
   // @computed get isTokenValid() {
diff --git a/src/stores/index.js b/src/stores/index.js
index 2d99e3952..96b844c95 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -1,5 +1,6 @@
 import AppStore from './AppStore';
 import UserStore from './UserStore';
+import FeaturesStore from './FeaturesStore';
 import SettingsStore from './SettingsStore';
 import ServicesStore from './ServicesStore';
 import RecipesStore from './RecipesStore';
@@ -16,6 +17,7 @@ export default (api, actions, router) => {
     router,
     app: new AppStore(stores, api, actions),
     user: new UserStore(stores, api, actions),
+    features: new FeaturesStore(stores, api, actions),
     settings: new SettingsStore(stores, api, actions),
     services: new ServicesStore(stores, api, actions),
     recipes: new RecipesStore(stores, api, actions),
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index 46299b966..a12069ba4 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -55,6 +55,15 @@
         background: #FFF;
         color: $theme-brand-primary;
       }
+
+      &__inverted {
+        background: #FFF;
+        color: $theme-brand-primary;
+      }
+      &__inverted:hover {
+        background: none;
+        color: #FFF;
+      }
     }
 
     &__featured-services {