Fix merge conflict and add missing translation

20 files changed, 439 insertions, 58 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 4aee1ec60..6a5c0f365 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -52,7 +52,7 @@ export default class Sidebar extends Component {
         <button
           onClick={openSettings}
           className="sidebar__settings-button"
-          data-tip={`Settings (${ctrlKey}+,)`}
+          data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`}
         >
           {isPremiumUser && (
             <span className="emoji">
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index c0a68d1a5..e5ae36419 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -1,44 +1,78 @@
-import React from 'react';
-import { observer } from 'mobx-react';
+import React, { Component } from 'react';
+import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import PropTypes from 'prop-types';
 import { SortableContainer } from 'react-sortable-hoc';
+import { defineMessages, intlShape } from 'react-intl';
 
 import TabItem from './TabItem';
 import { ctrlKey } from '../../../environment';
 
-export default SortableContainer(observer(({
-  services,
-  setActive,
-  reload,
-  toggleNotifications,
-  deleteService,
-  disableService,
-  openSettings,
-}) => (
-  <ul
-    className="tabs"
-  >
-    {services.map((service, index) => (
-      <TabItem
-        key={service.id}
-        clickHandler={() => setActive({ serviceId: service.id })}
-        service={service}
-        index={index}
-        shortcutIndex={index + 1}
-        reload={() => reload({ serviceId: service.id })}
-        toggleNotifications={() => toggleNotifications({ serviceId: service.id })}
-        deleteService={() => deleteService({ serviceId: service.id })}
-        disableService={() => disableService({ serviceId: service.id })}
-        openSettings={openSettings}
-      />
-    ))}
-    <li>
-      <button
-        className="sidebar__add-service"
-        onClick={() => openSettings({ path: 'recipes' })}
-        data-tip={`Add new service (${ctrlKey}+N)`}
+const messages = defineMessages({
+  addNewService: {
+    id: 'sidebar.addNewService',
+    defaultMessage: '!!!Add new service',
+  },
+});
+
+@observer
+class TabBarSortableList extends Component {
+  static propTypes = {
+    services: MobxPropTypes.arrayOrObservableArray.isRequired,
+    setActive: PropTypes.func.isRequired,
+    openSettings: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    toggleNotifications: PropTypes.func.isRequired,
+    deleteService: PropTypes.func.isRequired,
+    disableService: PropTypes.func.isRequired,
+  }
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      services,
+      setActive,
+      reload,
+      toggleNotifications,
+      deleteService,
+      disableService,
+      openSettings,
+    } = this.props;
+
+    const { intl } = this.context;
+
+    return (
+      <ul
+        className="tabs"
       >
-        <span className="mdi mdi-plus" />
-      </button>
-    </li>
-  </ul>
-)));
+        {services.map((service, index) => (
+          <TabItem
+            key={service.id}
+            clickHandler={() => setActive({ serviceId: service.id })}
+            service={service}
+            index={index}
+            shortcutIndex={index + 1}
+            reload={() => reload({ serviceId: service.id })}
+            toggleNotifications={() => toggleNotifications({ serviceId: service.id })}
+            deleteService={() => deleteService({ serviceId: service.id })}
+            disableService={() => disableService({ serviceId: service.id })}
+            openSettings={openSettings}
+          />
+        ))}
+        <li>
+          <button
+            className="sidebar__add-service"
+            onClick={() => openSettings({ path: 'recipes' })}
+            data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
+          >
+            <span className="mdi mdi-plus" />
+          </button>
+        </li>
+      </ul>
+    );
+  }
+}
+
+export default SortableContainer(TabBarSortableList);
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 0f93d236d..4d9707a13 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -10,5 +10,7 @@ module.exports = {
   pl: 'Polish',
   ru: 'Русский',
   ua: 'Українська',
+  'es-ES': 'Español - España',
+  'zh-Hant': 'Chinese (Traditional)',
   'nb-NO': 'Norsk'
 };
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 0964169a8..80b66db08 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Neustarten & Aktualisierung installieren",
   "infobar.requiredRequestsFailed": "Dienste und Benutzerinformationen konnten nicht geladen werden",
   "sidebar.settings": "Einstellungen",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Willkommen bei Franz",
   "services.getStarted": "Loslegen",
   "settings.account.headline": "Konto",
diff --git a/src/i18n/locales/el-GR.json b/src/i18n/locales/el-GR.json
index dfada77a2..3710bc9a2 100644
--- a/src/i18n/locales/el-GR.json
+++ b/src/i18n/locales/el-GR.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
   "infobar.requiredRequestsFailed": "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών",
   "sidebar.settings": "Ρυθμίσεις",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Καλώς ορίσατε στον Franz",
   "services.getStarted": "Ξεκινήστε",
   "settings.account.headline": "Λογαριασμός",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b9ed51b83..b1d260f0a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Restart & install update",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "sidebar.settings": "Settings",
+  "sidebar.addNewService": "Add new service",
   "services.welcome": "Welcome to Franz",
   "services.getStarted": "Get started",
   "settings.account.headline": "Account",
diff --git a/src/i18n/locales/es-ES.json b/src/i18n/locales/es-ES.json
new file mode 100644
index 000000000..f71b07b2d
--- /dev/null
+++ b/src/i18n/locales/es-ES.json
@@ -0,0 +1,168 @@
+{
+  "global.api.unhealthy": "No se pudo conectar con los servicios online de Franz",
+  "global.notConnectedToTheInternet": "No estás conectado a internet.",
+  "welcome.signupButton": "Crea una cuenta gratuita",
+  "welcome.loginButton": "Accede a tu cuenta",
+  "welcome.slogan": "Mensajería hecha para ti",
+  "login.headline": "Acceder",
+  "login.email.label": "Dirección de Email",
+  "login.password.label": "Contraseña",
+  "login.submit.label": "Acceder",
+  "login.invalidCredentials": "Email o contraseña no válidos",
+  "login.tokenExpired": "Tu sesión ha expirado. Por favor, accede de nuevo.",
+  "login.serverLogout": "Tu sesión ha expirado. Por favor, accede de nuevo.",
+  "login.link.signup": "Crea una cuenta gratuita",
+  "login.link.password": "Restablecer contraseña",
+  "password.headline": "Restablecer contraseña",
+  "password.email.label": "Dirección de Email",
+  "password.submit.label": "Enviar",
+  "password.noUser": "No hemos encontrado un usuario con ese email",
+  "password.successInfo": "Por favor, comprueba tu email",
+  "password.link.signup": "Crea una cuenta gratuita",
+  "password.link.login": "Accede a tu cuenta",
+  "signup.headline": "Crea tu cuenta",
+  "signup.firstname.label": "Nombre",
+  "signup.lastname.label": "Apellidos",
+  "signup.email.label": "Dirección de Email",
+  "signup.company.label": "Empresa",
+  "signup.password.label": "Contraseña",
+  "signup.submit.label": "Crear cuenta",
+  "signup.link.login": "¿Tienes ya una cuenta? Accede",
+  "signup.emailDuplicate": "Ya existe un usuario con esa dirección de email",
+  "signup.legal.info": "Al crear una cuenta de Franz aceptas los",
+  "signup.legal.terms": "Términos de servicio",
+  "signup.legal.privacy": "Política de privacidad",
+  "pricing.headline": "Ayuda a Franz",
+  "pricing.support.label": "Selecciona tu plan de ayuda",
+  "pricing.submit.label": "Quiero ayudar al desarrollo de Franz",
+  "pricing.link.skipPayment": "No quiero ayudar al desarrollo de Franz.",
+  "import.headline": "Importa tus servicios de Franz 4",
+  "import.notSupportedHeadline": "Servicios aún no disponibles en Franz 5",
+  "import.submit.label": "Importar servicios",
+  "import.skip.label": "Quiero añadir los servicios manualmente",
+  "invite.submit.label": "Enviar invitaciones",
+  "invite.headline.friends": "Invita a 3 de tus amigos o compañeros",
+  "invite.name.label": "Nombre",
+  "invite.email.label": "Dirección de Email",
+  "invite.skip.label": "Prefiero hacer esto luego",
+  "subscription.submit.label": "Quiero ayudar al desarrollo de Franz",
+  "subscription.paymentSessionError": "No se ha podido inicializar el formulario de pago",
+  "subscription.includedFeatures": "La cuenta de Franz Premium Supporter incluye",
+  "subscription.features.onpremise": "Añadir servicios in-situ/alojados como HipChat",
+  "subscription.features.customServices": "Servicios privados para ti y tu equipo",
+  "subscription.features.encryptedSync": "Sincronización de sesión encriptada",
+  "subscription.features.vpn": "Soporte para Proxy y VPN",
+  "subscription.features.ads": "¡Sin anuncios, para siempre!",
+  "subscription.features.comingSoon": "próximamente",
+  "infobar.servicesUpdated": "Tus servicios han sido actualizados.",
+  "infobar.updateAvailable": "Una nueva actualización para Franz está disponible.",
+  "infobar.buttonReloadServices": "Volver a cargar servicios",
+  "infobar.buttonInstallUpdate": "Reiniciar e instalar actualizaciones",
+  "infobar.requiredRequestsFailed": "No se han podido cargar los servicios y la información de usuario",
+  "sidebar.settings": "Ajustes",
+  "services.welcome": "Bienvenido a Franz",
+  "services.getStarted": "Comienza",
+  "settings.account.headline": "Mi cuenta",
+  "settings.account.headlineSubscription": "Tu suscripción",
+  "settings.account.headlineUpgrade": "Mejora tu cuenta y ayuda a Franz",
+  "settings.account.headlineInvoices": "Recibos",
+  "settings.account.manageSubscription.label": "Administra tu suscripción",
+  "settings.account.accountType.basic": "Cuenta Básica",
+  "settings.account.accountType.premium": "Cuenta Premium Supporter",
+  "settings.account.account.editButton": "Editar cuenta",
+  "settings.account.invoiceDownload": "Descargar",
+  "settings.account.userInfoRequestFailed": "No se ha podido cargar la información de usuario",
+  "settings.account.tryReloadUserInfoRequest": "TPrueba otra vez",
+  "settings.account.headlineProfile": "Actualizar perfil",
+  "settings.account.headlineAccount": "Información de la cuenta",
+  "settings.account.headlinePassword": "Cambiar contraseña",
+  "settings.account.successInfo": "Tus cambios han sido guardados",
+  "settings.account.buttonSave": "Actualizar perfil",
+  "settings.account.mining.thankyou": "Gracias por ayudar a Franz con tu procesador.",
+  "settings.account.mining.active": "Ahora mismo estás haciendo {hashes} cálculos por segundo.",
+  "settings.account.mining.moreInformation": "Obtén más información",
+  "settings.account.mining.cancel": "Cancelar minado",
+  "settings.navigation.availableServices": "Servicios disponibles",
+  "settings.navigation.yourServices": "Tus servicios",
+  "settings.navigation.account": "Cuenta",
+  "settings.navigation.settings": "Ajustes",
+  "settings.navigation.logout": "Desconectar",
+  "settings.recipes.headline": "Servicios disponibles",
+  "settings.recipes.mostPopular": "Más populares",
+  "settings.recipes.all": "Todos los servicios",
+  "settings.recipes.dev": "Desarrollo",
+  "settings.recipes.nothingFound": "Lo sentimos, no hemos encontrado nada.",
+  "settings.recipes.servicesSuccessfulAddedInfo": "Servicio añadido con éxito",
+  "settings.service.form.saveButton": "Guardar servicio",
+  "settings.service.form.deleteButton": "Eliminar servicio",
+  "settings.service.form.availableServices": "Servicios disponibles",
+  "settings.service.form.yourServices": "Tus servicios",
+  "settings.service.form.addServiceHeadline": "Añadir {name}",
+  "settings.service.form.editServiceHeadline": "Editar {name}",
+  "settings.service.form.tabHosted": "Alojados",
+  "settings.service.form.tabOnPremise": "Autoalojados ⭐️",
+  "settings.service.form.customUrlValidationError": "No se ha podido validar el servidor personalizado {name}.",
+  "settings.service.form.customUrlPremiumInfo": "Para añadir servicios autoalojados necesitas una cuenta de Franz Premium Supporter.",
+  "settings.service.form.customUrlUpgradeAccount": "Mejora tu cuenta",
+  "settings.service.form.indirectMessageInfo": "Serás notificado sobre todos los nuevos mensajes en un canal, no solo @username, @channel, @here, ...",
+  "settings.service.error.headline": "Error",
+  "settings.service.error.goBack": "Volver a los servicios",
+  "settings.service.error.message": "No se ha podido cargar el servicio.",
+  "settings.services.tooltip.isDisabled": "Servicio deshabilitado",
+  "settings.services.tooltip.notificationsDisabled": "Notificaciones deshabilitadas",
+  "settings.services.headline": "Tus servicios",
+  "settings.services.noServicesAdded": "Aún no has añadido ningún servicio.",
+  "settings.services.discoverServices": "Descubrir servicios",
+  "settings.services.updatedInfo": "Tu cambios han sido guardados",
+  "settings.services.deletedInfo": "Se ha eliminado el servicio",
+  "settings.app.headline": "Ajustes",
+  "settings.app.headlineGeneral": "Generales",
+  "settings.app.headlineLanguage": "Idioma",
+  "settings.app.headlineUpdates": "Actualizaciones",
+  "settings.app.buttonSearchForUpdate": "Buscar actualizaciones",
+  "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualizaciones",
+  "settings.app.updateStatusSearching": "Buscando actualizaciones",
+  "settings.app.updateStatusAvailable": "Actualización disponible, descargando...",
+  "settings.app.updateStatusUpToDate": "Estás utilizando la última versión de Franz",
+  "settings.app.form.autoLaunchOnStart": "Iniciar Franz al encender",
+  "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano",
+  "settings.app.form.enableSystemTray": "Mostrar Franz en la barra de tareas",
+  "settings.app.form.minimizeToSystemTray": "Minimizar Franz a la barra de tareas",
+  "settings.app.form.runInBackground": "Mantener Franz abierto en segundo plano al cerrar la ventana",
+  "settings.app.form.language": "Idioma",
+  "settings.app.form.beta": "Incluir versiones beta",
+  "settings.app.currentVersion": "Versión actual:",
+  "settings.service.form.name": "Nombre",
+  "settings.service.form.enableService": "Habilitar servicio",
+  "settings.service.form.enableNotification": "Habilitar notificaciones",
+  "settings.service.form.team": "Equipo",
+  "settings.service.form.customUrl": "Servidor personalizado",
+  "settings.service.form.indirectMessages": "Mostrar señal para todos los mensajes nuevos",
+  "settings.user.form.firstname": "Nombre",
+  "settings.user.form.lastname": "Apellidos",
+  "settings.user.form.email": "Email",
+  "settings.user.form.currentPassword": "Contraseña actual",
+  "settings.user.form.newPassword": "Nueva contraseña",
+  "settings.user.form.accountType.label": "Tipo de cuenta",
+  "settings.user.form.accountType.individual": "Individual",
+  "settings.user.form.accountType.non-profit": "Sin ánimo de lucro",
+  "settings.user.form.accountType.company": "Empresa",
+  "subscription.type.free": "gratis",
+  "subscription.type.month": "mensual",
+  "subscription.type.year": "anual",
+  "subscription.type.mining": "Ayuda a Franz con tu procesador",
+  "subscription.mining.headline": "¿Cómo funciona?",
+  "subscription.mining.experimental": "experimental",
+  "subscription.mining.line1": "Al habilitar \"Ayuda a Franz con tu procesador\", Franz utilizará entre un 20-50% de tu CPU para minar la criptomoneda Monero, lo que equivale a aproximadamente 5$ anuales.",
+  "subscription.mining.line2": "Adaptaremos el uso de CPU basándonos en tu carga de trabajo para no vaciar tu batería ni realentizar tu ordenador.",
+  "subscription.mining.line3": "Siempre que el minero esté activo, tendrás acceso ilimitado a todas las ventajas de la cuenta Franz Premium Supporter.",
+  "subscription.mining.moreInformation": "Obtén más información sobre este plan.",
+  "subscriptionPopup.buttonCancel": "Cancelar",
+  "subscriptionPopup.buttonDone": "Hecho",
+  "tabs.item.reload": "Recargar",
+  "tabs.item.edit": "Editar",
+  "tabs.item.disableNotifications": "Desactivar notificaciones",
+  "tabs.item.enableNotification": "Activar notificaciones",
+  "tabs.item.disableService": "Deshabilitar servicio",
+  "tabs.item.deleteService": "Eliminar servicio"
+}
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 84cf54492..2863f47e4 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
   "infobar.requiredRequestsFailed": "Impossible de charger les services et les informations de l'utilisateur",
   "sidebar.settings": "Paramètres",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Bienvenue sur Franz",
   "services.getStarted": "Commencer",
   "settings.account.headline": "Compte",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index a283154c9..98b7cbb19 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -60,12 +60,13 @@
   "infobar.buttonInstallUpdate": "再起動して更新をインストールする",
   "infobar.requiredRequestsFailed": "サービスとユーザー情報が読み込めません",
   "sidebar.settings": "設定",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Franzにようこそ",
   "services.getStarted": "はじめる",
   "settings.account.headline": "アカウント",
   "settings.account.headlineSubscription": "サブスクリプション内容",
   "settings.account.headlineUpgrade": "アカウントをアップグレードし、Franzを支援する",
-  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineInvoices": "インボイス",
   "settings.account.manageSubscription.label": "サブスクリプションの管理",
   "settings.account.accountType.basic": "Basicアカウント",
   "settings.account.accountType.premium": "Premium Supporterアカウント",
@@ -126,6 +127,7 @@
   "settings.app.updateStatusUpToDate": "お使いのFranzは最新です",
   "settings.app.form.autoLaunchOnStart": "システム起動時にFranzを開く",
   "settings.app.form.autoLaunchInBackground": "バックグラウンドで開く",
+  "settings.app.form.enableSystemTray": "Franzをシステムトレイに表示する",
   "settings.app.form.minimizeToSystemTray": "Franzをシステムトレイに最小化する",
   "settings.app.form.runInBackground": "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
   "settings.app.form.language": "言語",
@@ -150,7 +152,7 @@
   "subscription.type.month": "月間",
   "subscription.type.year": "年間",
   "subscription.type.mining": "PCの処理能力を使ってFranzを支援する",
-  "subscription.mining.headline": "これはどのよう��動���������������",
+  "subscription.mining.headline": "これはどのよう�����組������か",
   "subscription.mining.experimental": "実験的",
   "subscription.mining.line1": "\"PCの処理能力を使ってFranzを支援する\"を有効にすることで、Franzはおよそ20-50%のCPUパワーを暗号通貨Moneroのマイニングに使用し、これはおよそ年間で5ドル分にあたります。",
   "subscription.mining.line2": "処理能力に基づいてCPUの使用率を適応しますのでバッテリーを無駄に消費したり、システムを遅くすることはありません。",
diff --git a/src/i18n/locales/nb-NO.json b/src/i18n/locales/nb-NO.json
index ec0599535..976c54787 100644
--- a/src/i18n/locales/nb-NO.json
+++ b/src/i18n/locales/nb-NO.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Restart & installer oppdatering",
   "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon",
   "sidebar.settings": "Innstillinger",
+  "sidebar.addNewService": "Legg til ny tjeneste",
   "services.welcome": "Velkommen til Franz",
   "services.getStarted": "Kom i gang",
   "settings.account.headline": "Konto",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 40cc14c50..a19d51b2b 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -54,12 +54,13 @@
   "subscription.features.vpn": "Proxy & VPN ondersteuning",
   "subscription.features.ads": "Geen reclame, nooit!",
   "subscription.features.comingSoon": "komt binnenkort",
-  "infobar.servicesUpdated": "Je services zijn geüpdated.",
+  "infobar.servicesUpdated": "Je services zijn geüpdatet.",
   "infobar.updateAvailable": "Er is een nieuwe update van Franz beschikbaar.",
   "infobar.buttonReloadServices": "Services herladen",
   "infobar.buttonInstallUpdate": "Herstarten & update installeren",
   "infobar.requiredRequestsFailed": "Kon services en gebruikersinformatie niet laden",
   "sidebar.settings": "Instellingen",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Welkom bij Franz",
   "services.getStarted": "Begin",
   "settings.account.headline": "Account",
@@ -76,7 +77,7 @@
   "settings.account.headlineProfile": "Profiel aanpassen",
   "settings.account.headlineAccount": "Accountinformatie",
   "settings.account.headlinePassword": "Wachtwoord veranderen",
-  "settings.account.successInfo": "Je wijzigingen werden bewaard",
+  "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
   "settings.account.buttonSave": "Profiel aanpassen",
   "settings.account.mining.thankyou": "Bedankt om Franz te steunen met je rekenkracht.",
   "settings.account.mining.active": "Op dit moment maak je {hashes} berekeningen per seconde.",
@@ -113,7 +114,7 @@
   "settings.services.headline": "Jouw services",
   "settings.services.noServicesAdded": "Je hebt nog geen services toegevoegd.",
   "settings.services.discoverServices": "Services ontdekken",
-  "settings.services.updatedInfo": "Je veranderingen werden bewaard",
+  "settings.services.updatedInfo": "Je wijzigingen werden bewaard",
   "settings.services.deletedInfo": "Service werd verwijderd",
   "settings.app.headline": "Instellingen",
   "settings.app.headlineGeneral": "Algemeen",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 159d1f328..aee1a52c8 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -10,7 +10,7 @@
   "login.submit.label": "Inloggen",
   "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
   "login.tokenExpired": "De sessie is verlopen, log opnieuw in alsjeblieft.",
-  "login.serverLogout": "De sessie is verlopen, log opnieuw in alsjeblieft..",
+  "login.serverLogout": "De sessie is verlopen, log opnieuw in alsjeblieft.",
   "login.link.signup": "Maak een gratis account",
   "login.link.password": "Wachtwoord vergeten",
   "password.headline": "Wachtwoord vergeten",
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Herstart & installeer update",
   "infobar.requiredRequestsFailed": "Kon services en gebruikerinformatie niet laden",
   "sidebar.settings": "Instellingen",
+  "sidebar.addNewService": "Voeg nieuwe service toe",
   "services.welcome": "Welkom bij Franz",
   "services.getStarted": "Beginnen",
   "settings.account.headline": "Account",
@@ -157,7 +158,7 @@
   "subscription.mining.line2": "We zullen het CPU-gebruik aanpassen aan je gebruik en daarmee voorkomen dat de batterij niet leegloopt of dat jij en je werk afgeremd wordt.",
   "subscription.mining.line3": "Zolang de miner actief is, heb je onbeperkt toegang tot alle Franz Premium Supporter Features.",
   "subscription.mining.moreInformation": "Verkrijg meer informatie over dit plan.",
-  "subscriptionPopup.buttonCancel": "Cancel",
+  "subscriptionPopup.buttonCancel": "Annuleer",
   "subscriptionPopup.buttonDone": "Klaar",
   "tabs.item.reload": "Herlaad",
   "tabs.item.edit": "Bewerk",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 1a8e9ad54..a884ef319 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacje",
   "infobar.requiredRequestsFailed": "Nie można wczytać usług i informacji o użytkowniku",
   "sidebar.settings": "Ustawienia",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Witaj w aplikcji Franz",
   "services.getStarted": "Zacznij",
   "settings.account.headline": "Konto",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 38f0836a7..8a139a4f5 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -59,7 +59,8 @@
   "infobar.buttonReloadServices": "Recarregar serviços",
   "infobar.buttonInstallUpdate": "Reiniciar & instalar atualização",
   "infobar.requiredRequestsFailed": "Não foi possível carregar serviços e informações do usuário",
-  "sidebar.settings": "Configurações",
+  "sidebar.addNewService": "!!!Add new service",
+  "sidebar.settings": "Ajustes",
   "services.welcome": "Bem-vindo ao Franz",
   "services.getStarted": "Começar",
   "settings.account.headline": "Conta",
@@ -85,7 +86,7 @@
   "settings.navigation.availableServices": "Serviços disponíveis",
   "settings.navigation.yourServices": "Seus serviços",
   "settings.navigation.account": "Conta",
-  "settings.navigation.settings": "Configurações",
+  "settings.navigation.settings": "Ajustes",
   "settings.navigation.logout": "Logout",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.mostPopular": "Mais populares",
@@ -115,7 +116,7 @@
   "settings.services.discoverServices": "Descobrir serviços",
   "settings.services.updatedInfo": "Suas mudanças foram salvas",
   "settings.services.deletedInfo": "Serviço apagado",
-  "settings.app.headline": "Configurações",
+  "settings.app.headline": "Ajustes",
   "settings.app.headlineGeneral": "Geral",
   "settings.app.headlineLanguage": "Idioma",
   "settings.app.headlineUpdates": "Atualizações",
@@ -126,6 +127,7 @@
   "settings.app.updateStatusUpToDate": "Você está usando a última versão do Franz",
   "settings.app.form.autoLaunchOnStart": "Abrir o Franz iniciar o sistema",
   "settings.app.form.autoLaunchInBackground": "Abrir no fundo",
+  "settings.app.form.enableSystemTray": "Mostrar o Franz na bandeja do sistema",
   "settings.app.form.minimizeToSystemTray": "Minimizar o Franz para a bandeja do sistema",
   "settings.app.form.runInBackground": "Manter o Franz no fundo quando fechar a janela",
   "settings.app.form.language": "Idioma",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 44ced9e43..97b746097 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Перезапустить и обновить",
   "infobar.requiredRequestsFailed": "Невозможно загрузить сервисы и информацию пользователя",
   "sidebar.settings": "Настройки",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Добро пожаловать во Franz",
   "services.getStarted": "Начать работу",
   "settings.account.headline": "Аккаунт",
diff --git a/src/i18n/locales/ua.json b/src/i18n/locales/ua.json
index 63135e52c..fcb99c4e4 100644
--- a/src/i18n/locales/ua.json
+++ b/src/i18n/locales/ua.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
   "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача",
   "sidebar.settings": "Налаштування",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Ласкаво просимо в Franz",
   "services.getStarted": "Почати",
   "settings.account.headline": "Акаунт",
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
new file mode 100644
index 000000000..e52b9ca26
--- /dev/null
+++ b/src/i18n/locales/zh-Hant.json
@@ -0,0 +1,168 @@
+{
+  "global.api.unhealthy": "無法連接到Franz網路服務",
+  "global.notConnectedToTheInternet": "您未連上網際網路",
+  "welcome.signupButton": "建立一個免費帳戶",
+  "welcome.loginButton": "登入",
+  "welcome.slogan": "Messaging that works for you",
+  "login.headline": "登入",
+  "login.email.label": "電子郵件信箱",
+  "login.password.label": "密碼",
+  "login.submit.label": "登入",
+  "login.invalidCredentials": "電子郵件帳戶或密碼有誤",
+  "login.tokenExpired": "登入狀態過期，請重新登入",
+  "login.serverLogout": "登入狀態過期，請重新登入",
+  "login.link.signup": "建立一個免費帳戶",
+  "login.link.password": "密碼重設",
+  "password.headline": "密碼重設",
+  "password.email.label": "電子郵件信箱",
+  "password.submit.label": "送出",
+  "password.noUser": "此電子郵件帳戶不存在",
+  "password.successInfo": "請重新確認您的電子郵件信箱",
+  "password.link.signup": "建立一個免費帳戶",
+  "password.link.login": "登入您的帳戶",
+  "signup.headline": "註冊",
+  "signup.firstname.label": "名子",
+  "signup.lastname.label": "姓氏",
+  "signup.email.label": "電子郵件信箱",
+  "signup.company.label": "公司",
+  "signup.password.label": "密碼",
+  "signup.submit.label": "建立帳戶",
+  "signup.link.login": "您已有一個帳戶，請問是否要登入？",
+  "signup.emailDuplicate": "此電子郵件信箱已被註冊",
+  "signup.legal.info": "在建立帳戶同時，您同意：",
+  "signup.legal.terms": "服務條款",
+  "signup.legal.privacy": "隱私聲明",
+  "pricing.headline": "贊助 Franz",
+  "pricing.support.label": "選擇贊助方案",
+  "pricing.submit.label": "我想協助 Franz 的開發",
+  "pricing.link.skipPayment": "我不想協助 Franz 的開發",
+  "import.headline": "匯入您的 Franz 4 服務",
+  "import.notSupportedHeadline": "此服務不被 Franz 5 支持",
+  "import.submit.label": "匯入服務",
+  "import.skip.label": "我想手動匯入",
+  "invite.submit.label": "Send invites",
+  "invite.headline.friends": "邀請三個人",
+  "invite.name.label": "名子",
+  "invite.email.label": "電子郵件信箱",
+  "invite.skip.label": "我想晚點進行",
+  "subscription.submit.label": "我想協助 Franz 的開發",
+  "subscription.paymentSessionError": "無法初始化付費表單",
+  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
+  "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
+  "subscription.features.customServices": "Private services for you and your team",
+  "subscription.features.encryptedSync": "Encrypted session synchronization",
+  "subscription.features.vpn": "支援 Proxy & VPN",
+  "subscription.features.ads": "不再有任何廣告",
+  "subscription.features.comingSoon": "敬請期待",
+  "infobar.servicesUpdated": "您的服務已更新",
+  "infobar.updateAvailable": "有新的更新可安裝",
+  "infobar.buttonReloadServices": "重新載入",
+  "infobar.buttonInstallUpdate": "重新啟動並且更新",
+  "infobar.requiredRequestsFailed": "無法載入服務與帳戶資訊",
+  "sidebar.settings": "設定",
+  "services.welcome": "歡迎使用 Franz",
+  "services.getStarted": "開始使用",
+  "settings.account.headline": "帳戶",
+  "settings.account.headlineSubscription": "您的訂閱",
+  "settings.account.headlineUpgrade": "升級帳戶以及贊助 Franz",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.manageSubscription.label": "管理訂閱",
+  "settings.account.accountType.basic": "基本帳戶",
+  "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.account.editButton": "更改帳戶資訊",
+  "settings.account.invoiceDownload": "下載",
+  "settings.account.userInfoRequestFailed": "無法載入帳戶資訊",
+  "settings.account.tryReloadUserInfoRequest": "請重試",
+  "settings.account.headlineProfile": "更新帳戶資訊",
+  "settings.account.headlineAccount": "帳戶資訊",
+  "settings.account.headlinePassword": "更改密碼",
+  "settings.account.successInfo": "您的更改已經儲存",
+  "settings.account.buttonSave": "更新帳戶資訊",
+  "settings.account.mining.thankyou": "感謝您贊助運算能力",
+  "settings.account.mining.active": "您現在每秒執行 {hashes} 個計算",
+  "settings.account.mining.moreInformation": "取得更多資訊",
+  "settings.account.mining.cancel": "取消贊助運算",
+  "settings.navigation.availableServices": "可用服務",
+  "settings.navigation.yourServices": "您的服務",
+  "settings.navigation.account": "帳戶",
+  "settings.navigation.settings": "設定",
+  "settings.navigation.logout": "登出",
+  "settings.recipes.headline":  "可用服務",
+  "settings.recipes.mostPopular": "熱門",
+  "settings.recipes.all": "全部",
+  "settings.recipes.dev": "開發中",
+  "settings.recipes.nothingFound": "抱歉，找不到您所要的服務",
+  "settings.recipes.servicesSuccessfulAddedInfo": "新增服務成功",
+  "settings.service.form.saveButton": "儲存",
+  "settings.service.form.deleteButton": "刪除",
+  "settings.service.form.availableServices": "可用服務",
+  "settings.service.form.yourServices": "您的服務",
+  "settings.service.form.addServiceHeadline": "新增 {name}",
+  "settings.service.form.editServiceHeadline": "更改 {name}",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
+  "settings.service.form.customUrlUpgradeAccount": "升級帳戶",
+  "settings.service.form.indirectMessageInfo": "除了 @username, @channel, @here 之外，當您參與的頻道有訊息時，就會通知",
+  "settings.service.error.headline": "錯誤",
+  "settings.service.error.goBack": "返回",
+  "settings.service.error.message": "無法載入服務元件",
+  "settings.services.tooltip.isDisabled": "已停用服務",
+  "settings.services.tooltip.notificationsDisabled": "已停用通知",
+  "settings.services.headline": "您的服務",
+  "settings.services.noServicesAdded": "您還沒加入任何服務",
+  "settings.services.discoverServices": "服務列表",
+  "settings.services.updatedInfo": "更動已經儲存",
+  "settings.services.deletedInfo": "服務已刪除",
+  "settings.app.headline": "設定",
+  "settings.app.headlineGeneral": "一般",
+  "settings.app.headlineLanguage": "語言",
+  "settings.app.headlineUpdates": "更新",
+  "settings.app.buttonSearchForUpdate": "檢查更新",
+  "settings.app.buttonInstallUpdate": "重新開啟並且更新",
+  "settings.app.updateStatusSearching": "檢查更新中...",
+  "settings.app.updateStatusAvailable": "有可用更新，下載中...",
+  "settings.app.updateStatusUpToDate": "已經是最新版本了",
+  "settings.app.form.autoLaunchOnStart": "開機時啟動",
+  "settings.app.form.autoLaunchInBackground": "背景啟動",
+  "settings.app.form.enableSystemTray": "在系統匣上顯示",
+  "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
+  "settings.app.form.runInBackground": "關閉時保持在背景運作",
+  "settings.app.form.language": "語言",
+  "settings.app.form.beta": "包含開發中版本",
+  "settings.app.currentVersion": "當前版本：",
+  "settings.service.form.name": "Name",
+  "settings.service.form.enableService": "啟用服務",
+  "settings.service.form.enableNotification": "啟用通知",
+  "settings.service.form.team": "Team",
+  "settings.service.form.customUrl": "Custom server",
+  "settings.service.form.indirectMessages": "針對全部訊息顯示通知",
+  "settings.user.form.firstname": "名子",
+  "settings.user.form.lastname": "姓氏",
+  "settings.user.form.email": "電子郵件信箱",
+  "settings.user.form.currentPassword": "舊密碼",
+  "settings.user.form.newPassword": "新密碼",
+  "settings.user.form.accountType.label": "帳戶類型",
+  "settings.user.form.accountType.individual": "個人",
+  "settings.user.form.accountType.non-profit": "非營利",
+  "settings.user.form.accountType.company": "公司",
+  "subscription.type.free": "免費",
+  "subscription.type.month": "月",
+  "subscription.type.year": "年",
+  "subscription.type.mining": "用您機器的計算能力來贊助 Franz",
+  "subscription.mining.headline": "如何進行的？",
+  "subscription.mining.experimental": "實驗性功能",
+  "subscription.mining.line1": "Franz 運用您CPU的20%至50%的運算能力來挖門羅幣（一種開源加密貨幣），每年約莫可得到5美元。",
+  "subscription.mining.line2": "我們會調整運算強度，避免消耗過多電池電量及影響效能。",
+  "subscription.mining.line3": "當您允許我們挖掘門羅幣之時，我們便允許您使用全部的加值服務。",
+  "subscription.mining.moreInformation": "取得更多資訊",
+  "subscriptionPopup.buttonCancel": "取消",
+  "subscriptionPopup.buttonDone": "完成",
+  "tabs.item.reload": "重新載入",
+  "tabs.item.edit": "更改",
+  "tabs.item.disableNotifications": "停用通知",
+  "tabs.item.enableNotification": "啟用通知",
+  "tabs.item.disableService": "停用服務",
+  "tabs.item.deleteService": "刪除服務"
+}
diff --git a/src/index.js b/src/index.js
index 9ca059f48..030736fee 100644
--- a/src/index.js
+++ b/src/index.js
@@ -66,7 +66,7 @@ const createWindow = async () => {
   });
 
   // Initialize System Tray
-  const trayIcon = new Tray(mainWindow);
+  const trayIcon = new Tray();
 
   // Initialize ipcApi
   ipcApi({ mainWindow, settings, trayIcon });
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 67150971e..525ce592e 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -6,13 +6,8 @@ const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
 
 export default class TrayIcon {
-  mainWindow = null;
   trayIcon = null;
 
-  constructor(mainWindow) {
-    this.mainWindow = mainWindow;
-  }
-
   show() {
     if (this.trayIcon) return;
 
@@ -21,7 +16,7 @@ export default class TrayIcon {
       {
         label: 'Show Franz',
         click() {
-          this.mainWindow.show();
+          app.mainWindow.show();
         },
       }, {
         label: 'Quit Franz',
@@ -35,7 +30,7 @@ export default class TrayIcon {
     this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
-      this.mainWindow.show();
+      app.mainWindow.show();
     });
   }
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 19db05494..4510146e0 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -383,7 +383,7 @@ export default class ServicesStore extends Store {
       data.forEach((s) => {
         const service = s;
 
-        service.order = this.one(s.id).order;
+        service.order = services[s.id];
       });
     });