Automatic i18n update (i18n.meetfranz.com)

24 files changed, 773 insertions, 485 deletions

diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 6b257ddc5..5c62753cc 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
    "import.headline" : "Importa els teus serveis Franz 4",
    "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Vull afegir serveis manualment",
    "import.submit.label" : "Importar serveis",
    "infobar.buttonChangelog" : "Que hi ha de nou?",
    "infobar.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Compte bàsic",
    "settings.account.accountType.premium" : "Compte de Suport Premium",
    "settings.account.buttonSave" : "Actualitzar el perfil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Esborrar compte",
+   "settings.account.deleteEmailSent" : "Has rebut un correu electrònic amb un enllaç per confirmar l'eliminació del compte. El teu compte i la seva informació no podran ser restaurats!",
+   "settings.account.deleteInfo" : "Si ja no necessites el teu compte de Franz, pots esborrar el teu compte i tota la seva informació emmagatzemada aquí.",
    "settings.account.headline" : "Compte",
    "settings.account.headlineAccount" : "Informació del compte",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Zona de perill",
    "settings.account.headlineInvoices" : "Factures",
    "settings.account.headlinePassword" : "Canvia la contrasenya",
    "settings.account.headlineProfile" : "Actualitza el perfil",
@@ -68,8 +68,10 @@
    "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.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.currentVersion" : "Versió actual:",
    "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
    "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Minimitza Franz a la safata del sistema",
    "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
    "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
    "settings.app.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Actualitzacions",
    "settings.app.restartRequired" : "Els canvis requereixen reiniciar",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Ajuda'ns a traduir Franz en la teva llengua.",
    "settings.app.updateStatusAvailable" : "Actualització disponible, descarregant ...",
    "settings.app.updateStatusSearching" : "Està buscant actualitzacions",
@@ -104,6 +107,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.service.error.goBack" : "Tornar als serveis",
    "settings.service.error.headline" : "Error",
    "settings.service.error.message" : "No s'ha pogut carregar la recepta del servei.",
@@ -116,8 +120,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.enableNotification" : "Activa les notificacions",
    "settings.service.form.enableService" : "Activa el servei",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "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.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",
@@ -126,6 +137,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.yourServices" : "Els vostres serveis",
    "settings.services.deletedInfo" : "S'ha eliminat el servei",
    "settings.services.discoverServices" : "Descobrir serveis",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Cognoms",
    "settings.user.form.newPassword" : "Nova contrasenya",
    "sidebar.addNewService" : "Afegeix nou servei",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Desactivar notificacions i àudio",
    "sidebar.settings" : "Configuració",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Activar notificacions i àudio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Correu electrònic",
    "signup.emailDuplicate" : "Ja existeix un usuari amb aquesta adreça de correu electrònic",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 714e50485..df9077196 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
    "import.headline" : "Importovat služby z Franz 4",
    "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Chci přidat službu ručně",
    "import.submit.label" : "Importovat služby",
    "infobar.buttonChangelog" : "Co je nového?",
    "infobar.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Základní účet",
    "settings.account.accountType.premium" : "Prémiový účet podporovatele",
    "settings.account.buttonSave" : "Aktualizovat profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Smazat účet",
+   "settings.account.deleteEmailSent" : "Na váš mail byl odeslán email s odkazem pro potvrzení smazání účtu. Váš účet a data poté nepůjde obnovit!",
+   "settings.account.deleteInfo" : "Pokud již nepotřebujete váš Franz účet, můžete zde váš účet, a všechna data v něm, smazat.",
    "settings.account.headline" : "Účet",
    "settings.account.headlineAccount" : "Informace o účtu",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Nebezpečná zóna",
    "settings.account.headlineInvoices" : "Faktury",
    "settings.account.headlinePassword" : "Změnit heslo",
    "settings.account.headlineProfile" : "Aktualizovat profil",
@@ -68,8 +68,10 @@
    "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.",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
    "settings.app.buttonSearchForUpdate" : "Zkontrolovat aktualizace",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Aktuální verze:",
    "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Minimalizovat Franz do systémové lišty",
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
    "settings.app.form.showDisabledServices" : "Zobrazit záložky vypnutých služeb",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
    "settings.app.headline" : "Nastavení",
    "settings.app.headlineAdvanced" : "Pokročilé",
    "settings.app.headlineAppearance" : "Vzhled",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizace",
    "settings.app.restartRequired" : "Změny vyžadují restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Pomozte nám přeložit Franz do svého jazyka.",
    "settings.app.updateStatusAvailable" : "Aktualizace k dispozici, stahování...",
    "settings.app.updateStatusSearching" : "Hledá aktualizace",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Nejpopulárnější",
    "settings.recipes.nothingFound" : "Je nám líto, ale žádná služba neodpovídá vašemu hledanému výrazu.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Služba byla úspěšně přidána",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Zpět na služby",
    "settings.service.error.headline" : "Chyba",
    "settings.service.error.message" : "Nelze načíst službu.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Odstranit službu",
    "settings.service.form.editServiceHeadline" : "Upravit {name}",
    "settings.service.form.enableAudio" : "Zapnout zvuk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Povolit upozornění",
    "settings.service.form.enableService" : "Povolit službu",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Obecné",
+   "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.indirectMessageInfo" : "Budete informováni o všech nových zprávách v kanálu, nikoliv pouze @název, @kanál, @kde, ...",
    "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
    "settings.service.form.isMutedInfo" : "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ⭐️",
    "settings.service.form.team" : "Tým",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Vaše služby",
    "settings.services.deletedInfo" : "Služba byla odstraněna",
    "settings.services.discoverServices" : "Objevte služby",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Příjmení",
    "settings.user.form.newPassword" : "Nové heslo",
    "sidebar.addNewService" : "Přidat novou službu",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Vypnout upozornění a zvuky",
    "sidebar.settings" : "Nastavení",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Zapnout upozornění a zvuky",
    "signup.company.label" : "Společnost",
    "signup.email.label" : "Emailová adresa",
    "signup.emailDuplicate" : "Uživatel s touto emailovou adresou již existuje",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 825bfaf9b..6ad514c04 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,21 +1,21 @@
 {
-   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen.",
+   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
-   "import.headline" : "Importiere deine Franz 4 Dienste",
+   "import.headline" : "Deine Franz 4 Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
    "import.submit.label" : "Dienste importieren",
    "infobar.buttonChangelog" : "Was gibt es neues?",
    "infobar.buttonInstallUpdate" : "Neustarten & Update installieren",
-   "infobar.buttonReloadServices" : "Dienste neu laden",
+   "infobar.buttonReloadServices" : "Dienste neuladen",
    "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
    "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" : "Lade 3 Freunde oder Kollegen ein",
+   "invite.headline.friends" : "3 Freunde oder Kollegen einladen",
    "invite.name.label" : "Name",
    "invite.skip.label" : "Ich möchte das später tun",
-   "invite.submit.label" : "Einladungen senden",
+   "invite.submit.label" : "Einladungen schicken",
    "login.email.label" : "E-Mail Adresse",
    "login.headline" : "Anmelden",
    "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
@@ -27,17 +27,17 @@
    "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
-   "password.link.login" : "Anmelden",
+   "password.link.login" : "An deinem Konto anmelden",
    "password.link.signup" : "Kostenloses Konto erstellen",
    "password.noUser" : "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
    "password.submit.label" : "Absenden",
-   "password.successInfo" : "Wir haben dir ein E-Mail mit weiteren Anweisungen geschickt.",
-   "pricing.headline" : "Unterstütze Franz",
+   "password.successInfo" : "Wir haben dir eine E-Mail mit weiteren Anweisungen geschickt.",
+   "pricing.headline" : "Franz unterstützen",
    "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
    "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
    "pricing.support.label" : "Wie möchtest du Franz unterstützen?",
-   "service.crashHandler.action" : "Neu laden",
-   "service.crashHandler.autoReload" : "{name} wird automatisch wiederhergestellt in {seconds} sekunden",
+   "service.crashHandler.action" : "{name} neuladen",
+   "service.crashHandler.autoReload" : "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
    "service.crashHandler.headline" : "Oh nein!",
    "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
    "service.disabledHandler.action" : "{name} aktivieren",
@@ -48,28 +48,30 @@
    "settings.account.accountType.basic" : "Basis Konto",
    "settings.account.accountType.premium" : "Premium-Supporter Konto",
    "settings.account.buttonSave" : "Profil aktualisieren",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Benutzerkonto löschen",
+   "settings.account.deleteEmailSent" : "Du hast eine Email zur Bestätigung der Löschung deines Benutzerkontos erhalten. Dein Benutzerkonto und deine Daten können nach der Löschung nicht wiederhergestellt werden!",
+   "settings.account.deleteInfo" : "Hier kannst du dein Franz Benutzerkonto, und alle dazugehörigen Daten, löschen.",
    "settings.account.headline" : "Konto",
    "settings.account.headlineAccount" : "Konto Informationen",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Benutzerkonto löschen",
    "settings.account.headlineInvoices" : "Rechnungen",
    "settings.account.headlinePassword" : "Passwort ändern",
    "settings.account.headlineProfile" : "Profil aktualisieren",
    "settings.account.headlineSubscription" : "Dein Abonnement",
-   "settings.account.headlineUpgrade" : "Upgrade dein Konto & unterstütze Franz",
-   "settings.account.invoiceDownload" : "Download",
-   "settings.account.manageSubscription.label" : "Verwalte Dein Abonnement",
+   "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.successInfo" : "Deine Änderungen wurden gespeichert",
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Neustarten & Update installieren",
    "settings.app.buttonSearchForUpdate" : "Nach Updates suchen",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Aktuelle Version:",
    "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
    "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
@@ -80,14 +82,15 @@
    "settings.app.form.minimizeToSystemTray" : "Franz in die Systemleiste minimieren",
    "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
    "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
    "settings.app.headline" : "Einstellungen",
    "settings.app.headlineAdvanced" : "Erweitert",
    "settings.app.headlineAppearance" : "Darstellung",
-   "settings.app.headlineGeneral" : "Allgemein",
+   "settings.app.headlineGeneral" : "Allgemeines",
    "settings.app.headlineLanguage" : "Sprache",
    "settings.app.headlineUpdates" : "Updates",
    "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam. ",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Hilf uns, Franz in deine Sprache zu übersetzen.",
    "settings.app.updateStatusAvailable" : "Update verfügbar, herunterladen...",
    "settings.app.updateStatusSearching" : "Suche nach Updates",
@@ -100,10 +103,11 @@
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
-   "settings.recipes.missingService" : "Ein Service fehlt?",
+   "settings.recipes.missingService" : "Fehlt ein Service?",
    "settings.recipes.mostPopular" : "Am beliebtesten",
    "settings.recipes.nothingFound" : "Entschuldigung, aber kein Dienst entspricht deiner Suchanfrage.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Zurück zu den Diensten",
    "settings.service.error.headline" : "Fehler",
    "settings.service.error.message" : "Das Dienst-Rezept konnte nicht geladen werden.",
@@ -111,13 +115,20 @@
    "settings.service.form.availableServices" : "Verfügbare Dienste",
    "settings.service.form.customUrl" : "Eigener Server",
    "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst du ein Franz Premium-Supporter Konto.",
-   "settings.service.form.customUrlUpgradeAccount" : "Upgrade dein Konto",
-   "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.\",",
-   "settings.service.form.deleteButton" : "Dienst entfernen",
+   "settings.service.form.customUrlUpgradeAccount" : "Dein Konto upgraden",
+   "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.",
+   "settings.service.form.deleteButton" : "Dienst löschen",
    "settings.service.form.editServiceHeadline" : "{name} bearbeiten",
    "settings.service.form.enableAudio" : "Audio aktivieren",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Benachrichtigungen aktivieren",
    "settings.service.form.enableService" : "Dienst aktivieren",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Allgemeines",
+   "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.indirectMessageInfo" : "Du wirst über alle neuen Nachrichten in einem Kanal informiert, nicht nur @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
    "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
@@ -126,16 +137,17 @@
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ⭐️",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Deine Dienste",
-   "settings.services.deletedInfo" : "Dienst wurde entfernt",
+   "settings.services.deletedInfo" : "Dienst wurde gelöscht",
    "settings.services.discoverServices" : "Dienste entdecken",
    "settings.services.headline" : "Deine Dienste",
    "settings.services.noServicesAdded" : "Du hast noch keine Dienste hinzugefügt.",
-   "settings.services.tooltip.isDisabled" : "Dienst deaktiviert",
-   "settings.services.tooltip.isMuted" : "Audio ist deaktiviert",
+   "settings.services.tooltip.isDisabled" : "Dienst ist deaktiviert",
+   "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
    "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
    "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
-   "settings.user.form.accountType.company" : "Unternehmen",
+   "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Einzelperson",
    "settings.user.form.accountType.label" : "Konto-Typ",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
@@ -144,15 +156,15 @@
    "settings.user.form.firstname" : "Vorname",
    "settings.user.form.lastname" : "Nachname",
    "settings.user.form.newPassword" : "Neues Passwort",
-   "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.addNewService" : "Neuem Dienst hinzufügen",
+   "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
    "sidebar.settings" : "Einstellungen",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
-   "signup.company.label" : "Unternehmen",
+   "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
+   "signup.company.label" : "Firma",
    "signup.email.label" : "E-Mail Adresse",
-   "signup.emailDuplicate" : "Ein Benutzer mit dieser E-Mail Adresse existiert bereits.",
+   "signup.emailDuplicate" : "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
    "signup.firstname.label" : "Vorname",
-   "signup.headline" : "Registrierung",
+   "signup.headline" : "Anmelden",
    "signup.lastname.label" : "Nachname",
    "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst du die",
    "signup.legal.privacy" : "Datenschutzerklärung",
@@ -160,13 +172,13 @@
    "signup.link.login" : "Du hast bereits ein Konto? Melde dich an.",
    "signup.password.label" : "Passwort",
    "signup.submit.label" : "Konto erstellen",
-   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.  ",
+   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
    "subscription.features.ads" : "Nie mehr Werbung!",
    "subscription.features.comingSoon" : "folgt bald",
    "subscription.features.customServices" : "Private Dienste für dich und dein Team",
    "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
-   "subscription.features.vpn" : "Proxy & VPN Unterstützung",
+   "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?",
@@ -177,12 +189,12 @@
    "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" : "Unterstütze Franz mit Rechenleistung",
+   "subscription.type.mining" : "Franz mit Rechenleistung unterstützen",
    "subscription.type.month" : "Monat",
    "subscription.type.year" : "Jahr",
    "subscriptionPopup.buttonCancel" : "Abbrechen",
    "subscriptionPopup.buttonDone" : "Fertig",
-   "tabs.item.deleteService" : "Dienst entfernen",
+   "tabs.item.deleteService" : "Dienst löschen",
    "tabs.item.disableAudio" : "Audio deaktivieren",
    "tabs.item.disableNotifications" : "Benachrichtigungen deaktivieren",
    "tabs.item.disableService" : "Dienst deaktivieren",
@@ -190,8 +202,8 @@
    "tabs.item.enableAudio" : "Audio aktivieren",
    "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
    "tabs.item.enableService" : "Dienst aktivieren",
-   "tabs.item.reload" : "Neu laden",
-   "welcome.loginButton" : "Anmelden",
+   "tabs.item.reload" : "Neuladen",
+   "welcome.loginButton" : "An deinem Konto anmelden",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
-   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
+   "welcome.slogan" : "Kommunikation, die für dich funktioniert"
 }
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 2727c97bf..0797a0f05 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
    "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
    "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
    "settings.app.buttonSearchForUpdate" : "Έλεγχος για ενημερώσεις",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Τρέχουσα έκδοση:",
    "settings.app.form.autoLaunchInBackground" : "Άνοιγμα στο παρασκήνιο",
    "settings.app.form.autoLaunchOnStart" : "Εκκίνηση του Franz στην αρχή",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Γλώσσα",
    "settings.app.headlineUpdates" : "Ενημερώσεις",
    "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help us to translate Franz into your language.",
    "settings.app.updateStatusAvailable" : "Διαθέσιμη ενημέρωση, λήψη ...",
    "settings.app.updateStatusSearching" : "Ψάχνει για ενημέρωση",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Τα πιο δημοφιλή",
    "settings.recipes.nothingFound" : "Λυπούμαστε αλλά καμία υπηρεσία δεν ταιριάζει με τον όρο αναζήτησης.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Υπηρεσία προστέθηκε με επιτυχία",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Επιστροφή στις υπηρεσίες",
    "settings.service.error.headline" : "Σφάλμα",
    "settings.service.error.message" : "Δεν ήταν δυνατή η φόρτωση της συνταγής υπηρεσίας.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Διαγραφή υπηρεσίας",
    "settings.service.form.editServiceHeadline" : "Επεξεργασία {name}",
    "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Ενεργοποίηση ειδοποιήσεων",
    "settings.service.form.enableService" : "Ενεργοποίηση υπηρεσίας",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "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.indirectMessageInfo" : "Θα ειδοποιηθείτε για όλα τα νέα μηνύματα σε ένα κανάλι, όχι μόνο @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Εμφάνιση ειδοποίησης μηνύματος για όλα τα νέα μηνύματα",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -126,6 +137,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.yourServices" : "Οι υπηρεσίες σας",
    "settings.services.deletedInfo" : "Η υπηρεσία έχει διαγραφεί",
    "settings.services.discoverServices" : "Ανακαλύψτε τις υπηρεσίες",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 9fab4a455..044a618c4 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,34 +1,34 @@
 {
-   "global.api.unhealthy" : "No se puede conectar con 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 aún no soportados en Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "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 actualización",
+   "infobar.buttonChangelog" : "Novedades",
+   "infobar.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
    "infobar.buttonReloadServices" : "Recargar servicios",
-   "infobar.requiredRequestsFailed" : "No se pudieron cargar los servicios y la información del usuario.",
-   "infobar.servicesUpdated" : "Tus servicios se han actualizado",
-   "infobar.updateAvailable" : "Hay una nueva actualización de Franz disponible",
-   "invite.email.label" : "Dirección de correo electrónico",
+   "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",
    "invite.name.label" : "Nombre",
-   "invite.skip.label" : "Quiero hacer esto más tarde",
+   "invite.skip.label" : "Haré esto más tarde",
    "invite.submit.label" : "Enviar invitaciones",
-   "login.email.label" : "Dirección de correo electrónico",
+   "login.email.label" : "Correo electrónico",
    "login.headline" : "Iniciar sesión",
-   "login.invalidCredentials" : "Correo electrónico o contraseña inválidos",
+   "login.invalidCredentials" : "Correo electrónico o contraseña no válidos",
    "login.link.password" : "Restablecer contraseña",
-   "login.link.signup" : "Crear una cuenta gratuita",
+   "login.link.signup" : "Crear cuenta gratuita",
    "login.password.label" : "Contraseña",
-   "login.serverLogout" : "Tu sesión ha expirado, por favor inicia sesión nuevamente.",
-   "login.submit.label" : "Iniciar sesión",
-   "login.tokenExpired" : "Su sesión ha expirado, por favor ingrese de nuevo.",
-   "password.email.label" : "Dirección de correo electrónico",
-   "password.headline" : "Reiniciar contraseña",
-   "password.link.login" : "Iniciar sesión en su cuenta",
-   "password.link.signup" : "Crear una cuenta gratuita",
+   "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",
+   "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.submit.label" : "Enviar",
    "password.successInfo" : "Por favor, revise su correo electrónico",
@@ -39,48 +39,50 @@
    "service.crashHandler.action" : "Recargar {name}",
    "service.crashHandler.autoReload" : "Intentando recuperar automáticamente {name} en {seconds} segundos",
    "service.crashHandler.headline" : "¡Oh, no!",
-   "service.crashHandler.text" : "{name} ha generado un error.",
+   "service.crashHandler.text" : "{name} ha causado un error.",
    "service.disabledHandler.action" : "Activar {name}",
    "service.disabledHandler.headline" : "{name} está desactivado",
-   "services.getStarted" : "Comenzar",
+   "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
-   "settings.account.accountType.basic" : "Cuenta básica",
-   "settings.account.accountType.premium" : "Cuenta Premium",
+   "settings.account.accountType.basic" : "Cuenta Básica",
+   "settings.account.accountType.premium" : "Cuenta Colaborador Premium",
    "settings.account.buttonSave" : "Actualizar perfil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "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.headline" : "Cuenta",
    "settings.account.headlineAccount" : "Información de la cuenta",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Zona Peligrosa",
    "settings.account.headlineInvoices" : "Facturas",
    "settings.account.headlinePassword" : "Cambiar contraseña",
    "settings.account.headlineProfile" : "Actualizar perfil",
-   "settings.account.headlineSubscription" : "Tu suscripción",
-   "settings.account.headlineUpgrade" : "Actualiza tu cuenta y apoya a Franz",
+   "settings.account.headlineSubscription" : "Su suscripción",
+   "settings.account.headlineUpgrade" : "Actualice su cuenta y apoye a Franz",
    "settings.account.invoiceDownload" : "Descargar",
-   "settings.account.manageSubscription.label" : "Administra tu suscripción",
-   "settings.account.mining.active" : "Ahora mismo estás realizando {hashes} cálculos por segundo.",
+   "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 tu potencia de procesamiento.",
-   "settings.account.successInfo" : "Tus cambios han sido guardados",
-   "settings.account.tryReloadUserInfoRequest" : "Inténtalo de nuevo",
+   "settings.account.mining.thankyou" : "Gracias por apoyar a Franz con su potencia de procesamiento.",
+   "settings.account.successInfo" : "Sus cambios han sido guardados",
+   "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
    "settings.account.userInfoRequestFailed" : "No ha sido posible cargar la información de usuario",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
    "settings.app.buttonSearchForUpdate" : "Comprobar actualizaciones",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Versión actual:",
    "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
-   "settings.app.form.autoLaunchOnStart" : "Abrir Franz al inicio",
+   "settings.app.form.autoLaunchOnStart" : "Abrir Franz al iniciar",
    "settings.app.form.beta" : "Incluir versiones beta",
-   "settings.app.form.enableSpellchecking" : "Activar la verificación de ortograf��a",
+   "settings.app.form.enableSpellchecking" : "Activar la verificación ortogr��fica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
    "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
    "settings.app.headline" : "Configuración",
    "settings.app.headlineAdvanced" : "Avanzado",
    "settings.app.headlineAppearance" : "Apariencia",
@@ -88,15 +90,16 @@
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Actualizaciones",
    "settings.app.restartRequired" : "Los cambios requieren reiniciar",
-   "settings.app.translationHelp" : "Ayúdanos a traducir Franz a tu idioma.",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Ayúdenos a traducir Franz a su idioma.",
    "settings.app.updateStatusAvailable" : "Actualización disponible, descargando...",
    "settings.app.updateStatusSearching" : "Buscando actualizaciones",
-   "settings.app.updateStatusUpToDate" : "Estás utilizando la última versión de Franz",
+   "settings.app.updateStatusUpToDate" : "Está utilizando la última versión de Franz",
    "settings.navigation.account" : "Cuenta",
    "settings.navigation.availableServices" : "Servicios disponibles",
    "settings.navigation.logout" : "Cerrar sesión",
    "settings.navigation.settings" : "Configuración",
-   "settings.navigation.yourServices" : "Tus servicios",
+   "settings.navigation.yourServices" : "Sus servicios",
    "settings.recipes.all" : "Todos los servicios",
    "settings.recipes.dev" : "Desarrollo",
    "settings.recipes.headline" : "Servicios disponibles",
@@ -104,28 +107,37 @@
    "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" : "Search service",
    "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.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 Premium de Franz.",
-   "settings.service.form.customUrlUpgradeAccount" : "Actualiza tu cuenta",
-   "settings.service.form.customUrlValidationError" : "No se puede validar el servidor personalizado {name}.",
+   "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.customUrlValidationError" : "No se pudo validar el servidor personalizado {name}.",
    "settings.service.form.deleteButton" : "Eliminar servicio",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
-   "settings.service.form.enableAudio" : "Habilitar sonido",
-   "settings.service.form.enableNotification" : "Activar Notificaciones",
+   "settings.service.form.enableAudio" : "Habilitar audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableNotification" : "Activar notificaciones",
    "settings.service.form.enableService" : "Activar servicio",
-   "settings.service.form.indirectMessageInfo" : "Serás notificado sobre todos los mensajes del canal, no solo @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Muestra una etiqueta de notificación para todos los mensajes nuevos",
-   "settings.service.form.isMutedInfo" : "Todos los sonidos de notificaciones y reproducción de audio serán silenciados cuando esté desactivado",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "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.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.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 the hosted {name} service.",
    "settings.service.form.yourServices" : "Tus servicios",
    "settings.services.deletedInfo" : "El servicio ha sido borrado",
    "settings.services.discoverServices" : "Descubrir servicios",
@@ -135,47 +147,47 @@
    "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.user.form.accountType.company" : "Compañia",
+   "settings.user.form.accountType.company" : "Compañía",
    "settings.user.form.accountType.individual" : "Personal",
    "settings.user.form.accountType.label" : "Tipo de cuenta",
-   "settings.user.form.accountType.non-profit" : "Sin fines de lucro",
-   "settings.user.form.currentPassword" : "Contraseña Actual",
+   "settings.user.form.accountType.non-profit" : "Sin fines lucrativos",
+   "settings.user.form.currentPassword" : "Contraseña actual",
    "settings.user.form.email" : "Correo electrónico",
    "settings.user.form.firstname" : "Nombre",
-   "settings.user.form.lastname" : "Apellido",
-   "settings.user.form.newPassword" : "Nueva Contraseña",
+   "settings.user.form.lastname" : "Apellidos",
+   "settings.user.form.newPassword" : "Contraseña nueva",
    "sidebar.addNewService" : "Añadir un nuevo servicio",
-   "sidebar.muteApp" : "Disable notifications & audio",
-   "sidebar.settings" : "Ajustes",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.muteApp" : "Desactivar notificaciones y sonido",
+   "sidebar.settings" : "Configuración",
+   "sidebar.unmuteApp" : "Activar notificaciones y sonido",
    "signup.company.label" : "Compañía",
-   "signup.email.label" : "Dirección de correo",
+   "signup.email.label" : "Dirección de correo electrónico",
    "signup.emailDuplicate" : "Ya existe un usuario con esa dirección de correo electrónico",
    "signup.firstname.label" : "Nombre",
    "signup.headline" : "Registrarse",
-   "signup.lastname.label" : "Apellido",
-   "signup.legal.info" : "Al crear una cuenta en Franz tu aceptas las",
-   "signup.legal.privacy" : "Términos de Privacidad",
-   "signup.legal.terms" : "Términos de Servicio",
-   "signup.link.login" : "Ya tienes una cuenta ¿iniciar sesión?",
+   "signup.lastname.label" : "Apellidos",
+   "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 Unión Europea: Impuestos locales pueden ser aplicados",
-   "subscription.features.ads" : "¡Sin publicidad para siempre!",
+   "subscription.euTaxInfo" : "Residentes en la UE: pueden ser aplicados impuestos locales",
+   "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
-   "subscription.features.customServices" : "Servicios privados para ti y para tu equipo",
-   "subscription.features.encryptedSync" : "Sincronización de la sesión encriptada",
-   "subscription.features.onpremise" : "Añade servicios locales o autoalojados como HipChat",
+   "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 pagada premium de Franz incluye",
+   "subscription.includedFeatures" : "La Cuenta Colaborador Premium de Franz incluye",
    "subscription.mining.experimental" : "experimental",
    "subscription.mining.headline" : "¿Cómo funciona?",
-   "subscription.mining.line1" : "Activando el \"Pago con potencia de cálculo\", Franz utilizará entre un 20-50% de tu CPU para minar la criptomoneda Monero lo que equivale, aproximadamente, a USD$ 5\/año",
-   "subscription.mining.line2" : "Adaptaremos la utilización de la CPU basándonos en tu trabajo para no descargar tu batería y evitar que tu equipo vaya más lento.",
-   "subscription.mining.line3" : "Mientras el sistema de minado se encuentre activo, podrás tener acceso ilimitado a todas las características premium de Franz.",
+   "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.paymentSessionError" : "No se pudo inicializar el formulario de pago",
-   "subscription.submit.label" : "Quiero ayudar al desarrollo de soporte de Franz",
+   "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",
@@ -191,7 +203,7 @@
    "tabs.item.enableNotification" : "Activar notificaciones",
    "tabs.item.enableService" : "Activar servicio",
    "tabs.item.reload" : "Recargar",
-   "welcome.loginButton" : "Ingresa a tu cuenta",
+   "welcome.loginButton" : "Accede a tu cuenta",
    "welcome.signupButton" : "Crear una cuenta gratuita",
    "welcome.slogan" : "Mensajería que funciona para ti"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index df53b4a2d..07093f4ca 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,16 +1,16 @@
 {
-   "global.api.unhealthy" : "Les services online de Franz ne peuvent pas etre joint",
-   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté au réseau.",
-   "import.headline" : "Importez vos services de Franz version 4.",
-   "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés dans Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz.",
+   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté(e) à Internet.",
+   "import.headline" : "Importez vos services depuis la version 4 de Franz.",
+   "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
+   "import.skip.label" : "Je veux ajouter des services manuellement",
    "import.submit.label" : "Importer des services",
    "infobar.buttonChangelog" : "Nouveautés",
    "infobar.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
-   "infobar.buttonReloadServices" : "Relancer les services",
-   "infobar.requiredRequestsFailed" : "Impossible d'accéder les services et informations de l'utilisateur",
+   "infobar.buttonReloadServices" : "Recharger les services",
+   "infobar.requiredRequestsFailed" : "Impossible d'accéder aux services et informations de l'utilisateur",
    "infobar.servicesUpdated" : "Vos services ont été mis à jour.",
-   "infobar.updateAvailable" : "Une nouvelle mise à jour est disponible pour Franz.",
+   "infobar.updateAvailable" : "Une nouvelle mise à jour pour Franz est disponible.",
    "invite.email.label" : "Adresse e-mail",
    "invite.headline.friends" : "Invitez 3 amis ou collègues",
    "invite.name.label" : "Nom",
@@ -22,17 +22,17 @@
    "login.link.password" : "Réinitialiser le mot de passe",
    "login.link.signup" : "Créer un compte gratuit",
    "login.password.label" : "Mot de passe",
-   "login.serverLogout" : "Votre session a expiré. Reconnecter-vous s'il vous plaît.",
-   "login.submit.label" : "Se connecter",
+   "login.serverLogout" : "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
+   "login.submit.label" : "Connexion",
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
    "password.email.label" : "Adresse e-mail",
    "password.headline" : "Réinitialiser le mot de passe",
    "password.link.login" : "Connectez-vous à votre compte",
    "password.link.signup" : "Créer un compte gratuit.",
-   "password.noUser" : "Avec cette adresse e-mail aucun utilisateur n'a été trouvé",
+   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail ",
    "password.submit.label" : "Soumettre",
    "password.successInfo" : "Merci de consulter vos e-mails",
-   "pricing.headline" : "Supportez Franz",
+   "pricing.headline" : "Soutenez Franz",
    "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
    "pricing.submit.label" : "Je veux soutenir le développement de Franz",
    "pricing.support.label" : "Sélectionnez votre plan de soutien",
@@ -43,22 +43,22 @@
    "service.disabledHandler.action" : "Activer {name}",
    "service.disabledHandler.headline" : "{name} est désactivé",
    "services.getStarted" : "Commencer",
-   "services.welcome" : "Bienvenue chez Franz",
+   "services.welcome" : "Bienvenue dans Franz",
    "settings.account.account.editButton" : "Modifier le compte",
    "settings.account.accountType.basic" : "Compte de base",
    "settings.account.accountType.premium" : "Compte supporteur premium",
    "settings.account.buttonSave" : "Mettre à jour le profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Supprimer le compte",
+   "settings.account.deleteEmailSent" : "Vous avez reçu un email contenant le lien pour confirmer la suppression de votre compte. Votre compte et les données qui lui sont associés ne pourront être récupérés",
+   "settings.account.deleteInfo" : "Si vous n'avez plus besoin de votre compte Franz, vous pouvez le supprimer avec toutes ses données associées.",
    "settings.account.headline" : "Compte",
-   "settings.account.headlineAccount" : "Informations de compte",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineAccount" : "Informations sur le compte",
+   "settings.account.headlineDangerZone" : "Zone Dangereuse !",
    "settings.account.headlineInvoices" : "Factures",
    "settings.account.headlinePassword" : "Changer le mot de passe",
    "settings.account.headlineProfile" : "Mettre à jour le profil",
    "settings.account.headlineSubscription" : "Votre abonnement",
-   "settings.account.headlineUpgrade" : "Améliorez votre compte et supportez Franz",
+   "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.",
@@ -68,9 +68,11 @@
    "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",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
    "settings.app.buttonSearchForUpdate" : "Vérifier les mises à jour",
-   "settings.app.currentVersion" : "Version actuelle:",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.currentVersion" : "Version actuelle :",
    "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",
@@ -78,24 +80,25 @@
    "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
    "settings.app.form.language" : "Langue",
    "settings.app.form.minimizeToSystemTray" : "Minimiser Franz dans la zone de notification",
-   "settings.app.form.runInBackground" : "Ouvrir en arrière-plan",
+   "settings.app.form.runInBackground" : "Garder Franz ouvert en arrière-plan à la fermeture de la fenêtre",
    "settings.app.form.showDisabledServices" : "Afficher les onglets des services désactivés",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.headline" : "Options",
-   "settings.app.headlineAdvanced" : "Avancé",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Afficher les badges de messages non lus quand les notifications sont désactivées.",
+   "settings.app.headline" : "Paramètres",
+   "settings.app.headlineAdvanced" : "Paramètres avancés",
    "settings.app.headlineAppearance" : "Apparence",
    "settings.app.headlineGeneral" : "Général",
    "settings.app.headlineLanguage" : "Langue",
    "settings.app.headlineUpdates" : "Mises à jour",
-   "settings.app.restartRequired" : "Les modifications requièrent un redémarrage",
+   "settings.app.restartRequired" : "Les modifications nécessitent un redémarrage",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Aidez-nous à traduire Franz dans votre langue.",
-   "settings.app.updateStatusAvailable" : "Mise à jour disponible; téléchargement en marche...",
-   "settings.app.updateStatusSearching" : "Recherche des mises à jour",
-   "settings.app.updateStatusUpToDate" : "Vous utilisez la version de Franz courrante",
+   "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.navigation.account" : "Compte",
    "settings.navigation.availableServices" : "Services disponibles",
    "settings.navigation.logout" : "Se déconnecter",
-   "settings.navigation.settings" : "Options",
+   "settings.navigation.settings" : "Paramètres",
    "settings.navigation.yourServices" : "Vos services",
    "settings.recipes.all" : "Tous les services",
    "settings.recipes.dev" : "Développement",
@@ -103,7 +106,8 @@
    "settings.recipes.missingService" : "Un service est manquant ?",
    "settings.recipes.mostPopular" : "Les plus populaires",
    "settings.recipes.nothingFound" : "Désolé, aucun service ne correspond à votre recherche.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Ajouté de service : succès",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Le service a été ajouté avec succès",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Retour aux services",
    "settings.service.error.headline" : "Erreur",
    "settings.service.error.message" : "Impossible de charger le service.",
@@ -112,12 +116,19 @@
    "settings.service.form.customUrl" : "Serveur personnalisé",
    "settings.service.form.customUrlPremiumInfo" : "Pour ajouter des services auto-hébergés, vous avez besoin d'un compte Supporter Premium Franz.",
    "settings.service.form.customUrlUpgradeAccount" : "Améliorez votre compte",
-   "settings.service.form.customUrlValidationError" : "Impossible de valider le {name} personnalisé du serveur.",
+   "settings.service.form.customUrlValidationError" : "Impossible de valider le serveur personnalisé {name}.",
    "settings.service.form.deleteButton" : "Supprimer le service",
    "settings.service.form.editServiceHeadline" : "Modifier {name}",
    "settings.service.form.enableAudio" : "Activer l'audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Activer les notifications",
    "settings.service.form.enableService" : "Activer le service",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Général",
+   "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.indirectMessageInfo" : "Vous serez averti de tous les nouveaux messages en ligne, pas seulement sur @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
    "settings.service.form.isMutedInfo" : "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
@@ -126,9 +137,10 @@
    "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.yourServices" : "Vos services",
    "settings.services.deletedInfo" : "Le service a été supprimé",
-   "settings.services.discoverServices" : "Découvrir des services",
+   "settings.services.discoverServices" : "Découvrir les services",
    "settings.services.headline" : "Vos services",
    "settings.services.noServicesAdded" : "Vous n'avez pas encore ajouté de services.",
    "settings.services.tooltip.isDisabled" : "Ce service est désactivé",
@@ -138,39 +150,39 @@
    "settings.user.form.accountType.company" : "Entreprise",
    "settings.user.form.accountType.individual" : "Individuel",
    "settings.user.form.accountType.label" : "Type de compte",
-   "settings.user.form.accountType.non-profit" : "Non-profit",
+   "settings.user.form.accountType.non-profit" : "Non-lucratif",
    "settings.user.form.currentPassword" : "Mot de passe actuel",
    "settings.user.form.email" : "E-mail",
    "settings.user.form.firstname" : "Prénom",
    "settings.user.form.lastname" : "Nom",
    "settings.user.form.newPassword" : "Nouveau mot de passe",
    "sidebar.addNewService" : "Ajouter un nouveau service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Désactiver les notifications et les sons",
    "sidebar.settings" : "Paramètres",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Activer les notifications et les sons",
    "signup.company.label" : "Entreprise",
    "signup.email.label" : "Adresse e-mail",
-   "signup.emailDuplicate" : "Cette adresse e-mail est déjà enregistrée",
+   "signup.emailDuplicate" : "Cette adresse e-mail est déjà utilisée",
    "signup.firstname.label" : "Prénom",
    "signup.headline" : "S'inscrire",
    "signup.lastname.label" : "Nom",
    "signup.legal.info" : "En créant un compte Franz, vous acceptez la",
    "signup.legal.privacy" : "Déclaration de confidentialité",
    "signup.legal.terms" : "Conditions d'utilisation",
-   "signup.link.login" : "Vous avez déjà un compte? Connectez-vous",
+   "signup.link.login" : "Vous avez déjà un compte ? Connectez-vous",
    "signup.password.label" : "Mot de passe",
    "signup.submit.label" : "Créer un compte",
-   "subscription.euTaxInfo" : "Résidents de l'UE: une taxe locale peut s'appliquer",
-   "subscription.features.ads" : "Aucune publicité! Jamais!",
-   "subscription.features.comingSoon" : "À établir bientôt",
+   "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
+   "subscription.features.ads" : "Aucune publicité, jamais !",
+   "subscription.features.comingSoon" : "coming soon",
    "subscription.features.customServices" : "Services privés pour vous et votre équipe",
    "subscription.features.encryptedSync" : "Synchronisation de session chiffrée",
-   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
+   "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 est-ce que ça marche?",
-   "subscription.mining.line1" : "En activant \"Soutenez Franz avec de la puissance de calcul\", Franz utilisera environ de 20 à 50% de votre CPU pour miner la crypto-monnaie Monero, ce qui équivaut à environ 5$\/an.",
+   "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.",
@@ -193,5 +205,5 @@
    "tabs.item.reload" : "Recharger",
    "welcome.loginButton" : "Connectez-vous à votre compte",
    "welcome.signupButton" : "Créer un compte gratuit",
-   "welcome.slogan" : "Une messagerie qui travaille pour vous"
+   "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 763063887..d14606fbd 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,21 +1,21 @@
 {
-   "global.api.unhealthy" : "Ní fhéadfar nascadh le seirbhísí arlíne Franz",
+   "global.api.unhealthy" : "Ní féidir le Franz nascadh le seirbhísí 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 taca i Franz 5 go fóill",
-   "import.skip.label" : "I want to add services manually",
-   "import.submit.label" : "Iomportaigh seirbhísí",
+   "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.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.buttonInstallUpdate" : "Atosaigh ⁊ suiteáil nuashonrú",
    "infobar.buttonReloadServices" : "Athlódáil seirbhísí",
-   "infobar.requiredRequestsFailed" : "Ní fhéadfar seirbhísí agus eolas úsáideora a lódáil",
-   "infobar.servicesUpdated" : "Nuashonraítear do chuid seirbhísí.",
-   "infobar.updateAvailable" : "Tá nuashonrú nua do Franz le fáil.",
+   "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.",
    "invite.email.label" : "Seoladh ríomhphoist",
-   "invite.headline.friends" : "Tabhair cuireadh do thriúr de do chairde nó chomhghleacaithe",
+   "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 cuireadh",
+   "invite.submit.label" : "Seol cuirí",
    "login.email.label" : "Seoladh ríomhphoist",
    "login.headline" : "Logáil isteach",
    "login.invalidCredentials" : "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
@@ -27,33 +27,33 @@
    "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 i do chúntas",
+   "password.link.login" : "Logáil isteach do do chúntas",
    "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",
    "pricing.headline" : "Tabhair tacaíocht do Franz",
    "pricing.link.skipPayment" : "Ní mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
-   "pricing.submit.label" : "Ba maith 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",
    "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.headline" : "��, n�� habair!",
+   "service.crashHandler.headline" : "Or��, n�� hea!",
    "service.crashHandler.text" : "Tá {name} tar éis earraid a dhéanamh.",
    "service.disabledHandler.action" : "Cumasaigh {name}",
    "service.disabledHandler.headline" : "Tá {name} díchumasaithe",
-   "services.getStarted" : "Tosaigh",
+   "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.buttonSave" : "Nuashonraigh próifíl",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "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.headline" : "Cuntas",
-   "settings.account.headlineAccount" : "Eolas an chuntais",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "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",
@@ -62,82 +62,94 @@
    "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 an mhíneáil ar ceal",
+   "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.tryReloadUserInfoRequest" : "Atriail",
-   "settings.account.userInfoRequestFailed" : "Ní fheadfar eolas úsáideora a lódáil",
-   "settings.app.buttonInstallUpdate" : "Atosaigh & suiteáil nuashonrú",
-   "settings.app.buttonSearchForUpdate" : "Seiceáil do nuashonruithe",
+   "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
+   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonInstallUpdate" : "Atosaigh ⁊ suiteáil nuashonrú",
+   "settings.app.buttonSearchForUpdate" : "Cinntigh le haghaidh nuashonruithe",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "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.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
-   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtrae an chórais",
+   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
    "settings.app.form.language" : "Teanga",
-   "settings.app.form.minimizeToSystemTray" : "Íoslaghdaigh Franz go dtí trae an chórais",
+   "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 do sheirbhísí díchumasaithe",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "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.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á tosú arís chun athruithe a chur i bhfeidhm",
-   "settings.app.translationHelp" : "Cabhraigh linn, Franz a chur i do theanga.",
-   "settings.app.updateStatusAvailable" : "Nuashonrú le fáil, ag íoslódáil",
+   "settings.app.restartRequired" : "Ní gá duit tosnú arís chun athruithe a chur i bhfeidhm",
+   "settings.app.subheadlineCache" : "Cache",
+   "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.updateStatusUpToDate" : "Tá tú ag baint úsáid as an leagn is deireanaí de Franz",
+   "settings.app.updateStatusUpToDate" : "Tá tú ag baint úsáid as an leagan is deireanaí de Franz",
    "settings.navigation.account" : "Cuntas",
-   "settings.navigation.availableServices" : "Seirbhísí le fáil",
+   "settings.navigation.availableServices" : "Seirbhísí ar fáil",
    "settings.navigation.logout" : "Logáil amach",
    "settings.navigation.settings" : "Socruithe",
    "settings.navigation.yourServices" : "Do chuid seirbhísí",
    "settings.recipes.all" : "Gach seirbhís",
    "settings.recipes.dev" : "Forbairt",
-   "settings.recipes.headline" : "Seirbhísí le fáil",
+   "settings.recipes.headline" : "Seirbhísí ar 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 leis go ráthúil",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Seirbhís curtha go ráthúil",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Ar ais go dtí seirbhísí",
-   "settings.service.error.headline" : "Earraid",
-   "settings.service.error.message" : "Ní fhéadfar oideas seirbhíse a lódáil.",
+   "settings.service.error.headline" : "Earráid",
+   "settings.service.error.message" : "Ní féidir le oidis 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í saincheaptha",
-   "settings.service.form.customUrlPremiumInfo" : "Chun seirbhísí féinóstáilte a chur leis, ní gá Cuntas Phŕeimhtacadóra Franz a bheith agat.",
+   "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.customUrlUpgradeAccount" : "Uasghrádaigh do chuntas",
-   "settings.service.form.customUrlValidationError" : "Ní fhéadfar seirbhís {name} saincheaptha a dheimhniú",
+   "settings.service.form.customUrlValidationError" : "Ní féidir le 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" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Cumasaigh fógraí",
    "settings.service.form.enableService" : "Cumasaigh seirbhís",
-   "settings.service.form.indirectMessageInfo" : "Fógraítear thú faoi gach teachtaireacht nua i gcainéail, ní amháin @username, @channel, @here, ...",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Ginearálta",
+   "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.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" : "Nuair a dhíchumasaítear é seo, tachtar gach fuaim fógraí agus athchasadh fuaime",
+   "settings.service.form.isMutedInfo" : "Tar éis é a dhíchumasú, tachtar gach fuaim fógraí agus athchasadh fuaime",
    "settings.service.form.name" : "Ainm",
    "settings.service.form.saveButton" : "Sábhail seirbhís",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ⭐️",
-   "settings.service.form.team" : "Meitheal",
+   "settings.service.form.team" : "Foireann",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Do chuid seirbhí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.tooltip.isDisabled" : "Seirbhís díchumasaithe",
-   "settings.services.tooltip.isMuted" : "Gach fuaim tachta",
-   "settings.services.tooltip.notificationsDisabled" : "Fógraí díchumasaithe",
+   "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
+   "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
    "settings.services.updatedInfo" : "Sábháiltear do chuid athruithe",
    "settings.user.form.accountType.company" : "Comhlacht",
-   "settings.user.form.accountType.individual" : "Aonair",
-   "settings.user.form.accountType.label" : "Cineál cuntais",
+   "settings.user.form.accountType.individual" : "Ar leith",
+   "settings.user.form.accountType.label" : "Cineál chuntais",
    "settings.user.form.accountType.non-profit" : "Neamhbhrabúis",
    "settings.user.form.currentPassword" : "Pasfhocal reatha",
    "settings.user.form.email" : "Ríomhphost",
@@ -145,42 +157,42 @@
    "settings.user.form.lastname" : "Sloinne",
    "settings.user.form.newPassword" : "Pasfhocal nua",
    "sidebar.addNewService" : "Cuir seirbhís nua leis",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Díchumasaigh fógraí ⁊ fuaim",
    "sidebar.settings" : "Socruithe",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Cumasaigh fógraí ⁊ fuaim",
    "signup.company.label" : "Comhlacht",
    "signup.email.label" : "Seoladh ríomhphoist",
-   "signup.emailDuplicate" : "Tá úsáideoir leis an seoladh ríomhphoist sin chean féin",
+   "signup.emailDuplicate" : "Tá úsáideoir leis an seoladh ríomhphoist sin cheana féin",
    "signup.firstname.label" : "Céadainm",
    "signup.headline" : "Cláraigh",
    "signup.lastname.label" : "Sloinne",
-   "signup.legal.info" : "Agus tú ag cruthú cuntais Franz glacann tú leis an",
-   "signup.legal.privacy" : "Ráiteas príobháideachais",
+   "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É: féadfar cáin díolacháin áitiúla a chur i bhfeidhm",
-   "subscription.features.ads" : "Fógraí ar bith, choíche!",
+   "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.features.comingSoon" : "ag teacht go luath",
-   "subscription.features.customServices" : "Seirbhísí phríobháideach duitse agus do do mheitheal",
+   "subscription.features.customServices" : "Seirbhísí phríobháideach duitse 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.features.vpn" : "Tacaíocht seachfhreastalaí ⁊ LPF",
    "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhtacadóra Franz san áireamh",
    "subscription.mining.experimental" : "turgnamhach",
-   "subscription.mining.headline" : "Conas a oibríonn sé seo?",
-   "subscription.mining.line1" : "Tar éis chur \"Tabhair tacaíocht le cumhacht phŕóiseála\" ar chumas, bainfidh Franz úsáid as thart ar 20-50\\% de do lárionad próiseála chun an airgeadra digiteach Monero a mhíneáil, a chothromaíonn $5 sa bhliain.",
-   "subscription.mining.line2" : "Cuirimid úsáid an láríonaid próiseála in oiriúint do d'iompar oibre ionas nach mbeidh do cheallra caite agus tú agus do ríomhaire moillithe.",
-   "subscription.mining.line3" : "Fad is go bhfuil an mhianadóir gníomhach, beidh rochtain gan teorainn agat do Phŕeimhghnéithe Taca Franz.",
+   "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í fhéadfar tús a chur leis an bhfoirm íocaíochta",
+   "subscription.paymentSessionError" : "Ní féidir cur tús leis an bhfoirm íocaíochta",
    "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
-   "subscription.type.free" : "saor in aisce",
+   "subscription.type.free" : "saor",
    "subscription.type.mining" : "Tabhair tacaíocht do Franz le cumhacht phróiseála",
    "subscription.type.month" : "mí",
    "subscription.type.year" : "bliain",
-   "subscriptionPopup.buttonCancel" : "Cuir ar ceal",
+   "subscriptionPopup.buttonCancel" : "Cealaigh",
    "subscriptionPopup.buttonDone" : "Déanta",
    "tabs.item.deleteService" : "Scrios seirbhís",
    "tabs.item.disableAudio" : "Díchumasaigh fuaim",
@@ -191,7 +203,7 @@
    "tabs.item.enableNotification" : "Cumasaigh fógraí",
    "tabs.item.enableService" : "Cumasaigh seirbhís",
    "tabs.item.reload" : "Athlódáil",
-   "welcome.loginButton" : "Logáil isteach i do chuntas",
+   "welcome.loginButton" : "Logáil isteach do do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
    "welcome.slogan" : "Teachtaireachtaí ag obair leat"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index aec7b47f1..fda573c1a 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Sada ste povezani s internetom. ",
    "import.headline" : "Uvezite svoje Franc 4 servise. ",
    "import.notSupportedHeadline" : "Franc 5 trenutno ne podržava taj servis",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Želim ručno dodati ove usluge",
    "import.submit.label" : "Uvezi servise",
    "infobar.buttonChangelog" : "Šta je novo?",
    "infobar.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Osnovni račun",
    "settings.account.accountType.premium" : "Premium račun",
    "settings.account.buttonSave" : "Ažuriraj profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Izbrisati račun",
+   "settings.account.deleteEmailSent" : "Dobili ste email s linkom putem kojeg ćete potvrditi brisanje računa. Vaš račun i podatke neće biti moguće vratiti. ",
+   "settings.account.deleteInfo" : "Ako više ne trebate Franz račun, ovdje možete obrisati sve vezane podatke kao i račun.",
    "settings.account.headline" : "Korisnički račun",
    "settings.account.headlineAccount" : "Informacije o računu",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Opasnost",
    "settings.account.headlineInvoices" : "Fakture",
    "settings.account.headlinePassword" : "Promijenite lozinku",
    "settings.account.headlineProfile" : "Ažurirajte profil",
@@ -68,8 +68,10 @@
    "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",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
    "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Trenutna verzija:",
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži ploče s onemogućenim servisima",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
    "settings.app.headline" : "Postavke",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni zagon",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
    "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
    "settings.app.updateStatusSearching" : "Traže se ažuriranja",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Najpopularniji",
    "settings.recipes.nothingFound" : "Žao nam je, ali ne postoje usluge koje se poklapaju s onima koje tražite. ",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usluga uspješno dodana. ",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Nazad do servisa",
    "settings.service.error.headline" : "Greška",
    "settings.service.error.message" : "Nemoguće učitati sadržaj usluge. ",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Izbriši uslugu",
    "settings.service.form.editServiceHeadline" : "Uredite {ime}",
    "settings.service.form.enableAudio" : "Omogućite zvuk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Omogućite obavijesti",
    "settings.service.form.enableService" : "Omogućite usluge",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Općenito",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Vi ćete biti obavješteni o svim novim porukama na kanalu, ne samo o @imenima, kanalima, @ovdje, ...",
    "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
    "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna. ",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Vaše usluge",
    "settings.services.deletedInfo" : "Usluga je onemogućena",
    "settings.services.discoverServices" : "Pronađite usluge",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Prezime",
    "settings.user.form.newPassword" : "Nova lozinka",
    "sidebar.addNewService" : "Dodajte novu uslugu",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Ugasi obavijesti i zvuk",
    "sidebar.settings" : "Postavke",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Omogući obavijesti i zvuk",
    "signup.company.label" : "Tvrtka",
    "signup.email.label" : "Vaša e-adresa",
    "signup.emailDuplicate" : "Već postoji korisnik s tom e-mail adresom",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 5ed913015..1af5a61e1 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Nincs kapcsolat a kiszolgálóval.",
    "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" : "I want to add services manually",
+   "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",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Alap Fiók",
    "settings.account.accountType.premium" : "Prémium Támogató Fiók",
    "settings.account.buttonSave" : "Profil frissítése",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Fiók törlése",
+   "settings.account.deleteEmailSent" : "A fiókod törléséhez egy e-mailt küldtük a törlést megerősítő linkkel. A linkre kattintást követően a fiókod és az adatait már nem állíthatók vissza többé!",
+   "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" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Veszélyes üzemmód",
    "settings.account.headlineInvoices" : "Számlák",
    "settings.account.headlinePassword" : "Jelszócsere",
    "settings.account.headlineProfile" : "Profil frissítése",
@@ -68,8 +68,10 @@
    "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",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Újraindítás és frissítések telepítése",
    "settings.app.buttonSearchForUpdate" : "Frissítések keresése",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Aktuális verzió:",
    "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
    "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
    "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mutass az 'olvasatlan üzenet' jelzést amikor az értesítések le vannak tiltva.",
    "settings.app.headline" : "Beállítások",
    "settings.app.headlineAdvanced" : "Haladó",
    "settings.app.headlineAppearance" : "Megjelenés",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Nyelv",
    "settings.app.headlineUpdates" : "Frissítések",
    "settings.app.restartRequired" : "Újraindítást igénylő módosítás",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Segíts nekünk a Franz-ot lefordítani a nyelvedre.",
    "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
    "settings.app.updateStatusSearching" : "Frissítéseket keres",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Legnépszerűbb",
    "settings.recipes.nothingFound" : "Sajnáljuk, nincs egyezés a szolgáltatások között a keresett kifejezésre.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva.",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Vissza a szolgáltatásokhoz",
    "settings.service.error.headline" : "Hiba",
    "settings.service.error.message" : "Nem tölthető be a szolgáltatás receptje.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Szolgáltatás törlése",
    "settings.service.form.editServiceHeadline" : "{name} szerkesztése",
    "settings.service.form.enableAudio" : "Hang engedélyezése",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Értesítések engedélyezése",
    "settings.service.form.enableService" : "Szolgáltatás engedélyezése",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Általános",
+   "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.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna @here és egyéb említések esetén",
    "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
    "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül.",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Üzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Szolgáltatásaid",
    "settings.services.deletedInfo" : "A szolgáltatás törlésre került",
    "settings.services.discoverServices" : "Szolgáltatások felfedezése",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Vezetéknév",
    "settings.user.form.newPassword" : "Új jelszó",
    "sidebar.addNewService" : "Szolgáltatás hozzáadása",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Értesítések és hangok letiltása",
    "sidebar.settings" : "Beállítások",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Értesítések és hangok engedélyezése",
    "signup.company.label" : "Cég",
    "signup.email.label" : "Email cím",
    "signup.emailDuplicate" : "Ezzel az e-mail címmel már létezik felhasználó",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index b16c11914..f762cd132 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
    "import.headline" : "Impor layanan Franz 4 Anda",
    "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
    "import.submit.label" : "Impor layanan",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Yang baru",
    "infobar.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
    "infobar.buttonReloadServices" : "Muat ulang layanan",
    "infobar.requiredRequestsFailed" : "Tidak bisa memuat layanan dan informasi pengguna",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Akun Dasar",
    "settings.account.accountType.premium" : "Akun Pendukung Premium",
    "settings.account.buttonSave" : "Perbarui profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "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.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",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Wilayah Berbahaya",
    "settings.account.headlineInvoices" : "Tagihan",
    "settings.account.headlinePassword" : "Ubah sandi",
    "settings.account.headlineProfile" : "Perbarui profil",
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
    "settings.account.userInfoRequestFailed" : "Tidak bisa memuat informasi pengguna",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
    "settings.app.buttonSearchForUpdate" : "Periksa versi baru",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Versi saat ini:",
    "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
    "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Perkecil Franz ke baki sistem",
    "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
    "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
    "settings.app.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
@@ -88,7 +90,8 @@
    "settings.app.headlineLanguage" : "Bahasa",
    "settings.app.headlineUpdates" : "Versi Baru",
    "settings.app.restartRequired" : "Perubahan membutuhkan mulai ulang",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Bantu kami menerjemahkan Franz ke bahasa Anda.",
    "settings.app.updateStatusAvailable" : "Versi baru tersedia, mengunduh...",
    "settings.app.updateStatusSearching" : "Sedang mencari versi baru",
    "settings.app.updateStatusUpToDate" : "Anda sedang menggunakan versi terbaru Franz",
@@ -100,10 +103,11 @@
    "settings.recipes.all" : "Semua layanan",
    "settings.recipes.dev" : "Pengembangan",
    "settings.recipes.headline" : "Layanan tersedia",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Layanan tidak tersedia?",
    "settings.recipes.mostPopular" : "Paling populer",
    "settings.recipes.nothingFound" : "Maaf, tidak ada layanan yang cocok dengan pencarian Anda.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Layanan berhasil ditambahkan",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Kembali ke layanan",
    "settings.service.error.headline" : "Kesalahan",
    "settings.service.error.message" : "Tidak dapat memuat konfigurasi layanan.",
@@ -116,16 +120,24 @@
    "settings.service.form.deleteButton" : "Hapus layanan",
    "settings.service.form.editServiceHeadline" : "Edit {name}",
    "settings.service.form.enableAudio" : "Aktifkan audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Aktifkan pemberitahuan",
    "settings.service.form.enableService" : "Aktifkan layanan",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Umum",
+   "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.indirectMessageInfo" : "Anda akan diberi tahu tentang semua pesan dalam kanal, bukan hanya @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan",
-   "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara notifikasi dan pemutaran audio akan dibisukan",
+   "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
    "settings.service.form.name" : "Nama",
    "settings.service.form.saveButton" : "Simpan layanan",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Layanan Anda",
    "settings.services.deletedInfo" : "Layanan telah dihapus",
    "settings.services.discoverServices" : "Temukan layanan",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Nama Belakang",
    "settings.user.form.newPassword" : "Sandi baru",
    "sidebar.addNewService" : "Tambahkan layanan baru",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Nonaktifkan pemberitahuan & audio",
    "sidebar.settings" : "Pengaturan",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Aktifkan pemberitahuan",
    "signup.company.label" : "Perusahaan",
    "signup.email.label" : "Alamat email",
    "signup.emailDuplicate" : "Pengguna dengan alamat email ini sudah ada",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 137b4825c..652d7a999 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
    "import.headline" : "Importa i tuoi servizi da Franz 4",
    "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Voglio aggiungere servizi manualmente",
    "import.submit.label" : "Importa servizi",
    "infobar.buttonChangelog" : "Novità",
    "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
@@ -11,27 +11,27 @@
    "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
    "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
    "infobar.updateAvailable" : "È disponibile un nuovo aggiornamento di Franz.",
-   "invite.email.label" : "Indirizzo e-mail",
+   "invite.email.label" : "Indirizzo email",
    "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",
-   "login.email.label" : "Indirizzo e-mail",
+   "login.email.label" : "Indirizzo email",
    "login.headline" : "Accedi",
-   "login.invalidCredentials" : "E-mail o password non valide",
+   "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.submit.label" : "Accedi",
    "login.tokenExpired" : "Sessione scaduta, accedi di nuovo.",
-   "password.email.label" : "Indirizzo e-mail",
+   "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 quell'indirizzo e-mail",
+   "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo email",
    "password.submit.label" : "Invia",
-   "password.successInfo" : "Controlla la tua e-mail",
+   "password.successInfo" : "Controlla la tua email",
    "pricing.headline" : "Supporta Franz",
    "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Account Basic",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Aggiorna profilo",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "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.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",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Zona Pericolosa",
    "settings.account.headlineInvoices" : "Fatture",
    "settings.account.headlinePassword" : "Cambia password",
    "settings.account.headlineProfile" : "Aggiorna profilo",
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
    "settings.account.tryReloadUserInfoRequest" : "Riprova ancora",
    "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
    "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Versione attuale:",
    "settings.app.form.autoLaunchInBackground" : "Apri in secondo piano",
    "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
@@ -80,7 +82,7 @@
    "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" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra badge messaggi non letti quanto le notifiche sono disattivati",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -88,9 +90,10 @@
    "settings.app.headlineLanguage" : "Lingua",
    "settings.app.headlineUpdates" : "Aggiornamenti",
    "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
    "settings.app.updateStatusAvailable" : "Aggiornamento disponibile, download in corso...",
-   "settings.app.updateStatusSearching" : "È in ricerca di un aggiornamento",
+   "settings.app.updateStatusSearching" : "Ricerca aggiornamenti...",
    "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Franz",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Servizi disponibili",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Più popolari",
    "settings.recipes.nothingFound" : "Ci dispiace, ma nessun servizio corrisponde alla tua ricerca.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Servizio aggiunto con successo",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Indietro ai servizi",
    "settings.service.error.headline" : "Errore",
    "settings.service.error.message" : "Impossibile caricare il servizio.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Elimina servizio",
    "settings.service.form.editServiceHeadline" : "Modifica {name}",
    "settings.service.form.enableAudio" : "Attiva audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Attiva notifiche",
    "settings.service.form.enableService" : "Attiva servizio",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Generale",
+   "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.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",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "I tuoi servizi",
    "settings.services.deletedInfo" : "Il servizio è stato eliminato",
    "settings.services.discoverServices" : "Scopri servizi",
@@ -140,17 +152,17 @@
    "settings.user.form.accountType.label" : "Tipo account",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Password attuale",
-   "settings.user.form.email" : "E-mail",
+   "settings.user.form.email" : "Email",
    "settings.user.form.firstname" : "Nome",
    "settings.user.form.lastname" : "Cognome",
    "settings.user.form.newPassword" : "Nuova password",
    "sidebar.addNewService" : "Aggiungi nuovo servizio",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Disattiva notifiche & audio",
    "sidebar.settings" : "Impostazioni",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Attiva notifiche & audio",
    "signup.company.label" : "Società",
-   "signup.email.label" : "Indirizzo e-mail",
-   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo e-mail",
+   "signup.email.label" : "Indirizzo email",
+   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo email",
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Iscriviti",
    "signup.lastname.label" : "Cognome",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 61c59bae5..29463d52e 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,44 +1,44 @@
 {
    "global.api.unhealthy" : "Franzオンラインサービスに接続できません。",
-   "global.notConnectedToTheInternet" : "Internetに接続されていません。",
-   "import.headline" : "Franz 4サービス���インポート",
-   "import.notSupportedHeadline" : "サービス��Franz 5��は��だ対応��������いません",
-   "import.skip.label" : "I want to add services manually",
-   "import.submit.label" : "サービス���インポート",
+   "global.notConnectedToTheInternet" : "���ンターネット���接続されていません。",
+   "import.headline" : "Franz 4������ービス���インポート",
+   "import.notSupportedHeadline" : "Franz 5���はこの���ービス��まだ対応��ていません",
+   "import.skip.label" : "後で手動でサービスを追加する",
+   "import.submit.label" : "サービス���インポート",
    "infobar.buttonChangelog" : "最新情報",
-   "infobar.buttonInstallUpdate" : "再起動して更新をインストールする",
-   "infobar.buttonReloadServices" : "サービスの����������",
-   "infobar.requiredRequestsFailed" : "サービスとユーザー情報���読み込めません",
+   "infobar.buttonInstallUpdate" : "再起動して��ップデート��インストール",
+   "infobar.buttonReloadServices" : "サービスの再�����������",
+   "infobar.requiredRequestsFailed" : "サービスとユーザー情報���読み込めませんでした",
    "infobar.servicesUpdated" : "サービスが更新されました。",
-   "infobar.updateAvailable" : "Franzの新������更新があります。",
+   "infobar.updateAvailable" : "新しいFranzの���ッ��������ト���あります。",
    "invite.email.label" : "メールアドレス",
    "invite.headline.friends" : "あなたの友人や同僚の方を3名までFranzに招待できます",
    "invite.name.label" : "氏名",
-   "invite.skip.label" : "後��する",
+   "invite.skip.label" : "後��",
    "invite.submit.label" : "招待を送る",
    "login.email.label" : "メールアドレス",
    "login.headline" : "サインイン",
-   "login.invalidCredentials" : "メールアドレス��パスワード��誤�����������ます",
+   "login.invalidCredentials" : "メールアドレス�����は���スワード��間違�������ます",
    "login.link.password" : "パスワードをリセット",
    "login.link.signup" : "無料アカウントを作成",
    "login.password.label" : "パスワード",
-   "login.serverLogout" : "セッションが切れました。ログインし直して下さい。",
+   "login.serverLogout" : "セッション��期限��切れました。ログインし直して下さい。",
    "login.submit.label" : "サインイン",
    "login.tokenExpired" : "セッションが切れました。ログインし直して下さい。",
    "password.email.label" : "メールアドレス",
    "password.headline" : "パスワードのリセット",
    "password.link.login" : "サインイン",
    "password.link.signup" : "無料アカウントを作成",
-   "password.noUser" : "このメールアドレスは登録されていません",
+   "password.noUser" : "このメールアドレスはまだ登録されていません",
    "password.submit.label" : "送信",
    "password.successInfo" : "メールを確認して下さい",
    "pricing.headline" : "Franzを支援する",
-   "pricing.link.skipPayment" : "Franzの開発を支援しない。",
+   "pricing.link.skipPayment" : "Franzの開発を支援し��く��い。",
    "pricing.submit.label" : "Franzの開発を支援したい。",
-   "pricing.support.label" : "プランを選択して下さい",
-   "service.crashHandler.action" : "{name} を����������",
+   "pricing.support.label" : "プランを選択して��だ��い",
+   "service.crashHandler.action" : "{name}を再�����������",
    "service.crashHandler.autoReload" : "{seconds}秒後、自動的に{name}の復旧を試みます",
-   "service.crashHandler.headline" : "しまった!",
+   "service.crashHandler.headline" : "しまった！",
    "service.crashHandler.text" : "{name}はエラーを起こしました。",
    "service.disabledHandler.action" : "{name}を有効にする",
    "service.disabledHandler.headline" : "{name}は無効です",
@@ -48,28 +48,30 @@
    "settings.account.accountType.basic" : "Basicアカウント",
    "settings.account.accountType.premium" : "Premium Supporterアカウント",
    "settings.account.buttonSave" : "プロフィールの更新",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "アカウントを削除",
+   "settings.account.deleteEmailSent" : "アカウント削除の確認メールを送信しました。あなたのアカウントとデータは復旧できません！",
+   "settings.account.deleteInfo" : "今後Franzのアカウントが必要なければ、こちらでアカウントと関連する情報を削除できます。",
    "settings.account.headline" : "アカウント",
    "settings.account.headlineAccount" : "アカウント情報",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "注意！",
    "settings.account.headlineInvoices" : "請求書",
    "settings.account.headlinePassword" : "パスワードの変更",
    "settings.account.headlineProfile" : "プロフィールの更新",
-   "settings.account.headlineSubscription" : "�����スク��������ョン内容",
+   "settings.account.headlineSubscription" : "������������登録内容",
    "settings.account.headlineUpgrade" : "アカウントをアップグレードし、Franzを支援する",
    "settings.account.invoiceDownload" : "ダウンロード",
    "settings.account.manageSubscription.label" : "サブスクリプションの管理",
    "settings.account.mining.active" : "1秒あたり{hashes}個のハッシュを計算中です。",
-   "settings.account.mining.cancel" : "マイニングをキャンセルする",
+   "settings.account.mining.cancel" : "マイニングをキャンセル",
    "settings.account.mining.moreInformation" : "詳細を確認する",
    "settings.account.mining.thankyou" : "お使いのPCの処理能力をFranzの支援に活用して頂き、ありがとうございます。",
    "settings.account.successInfo" : "変更内容が保存されました",
-   "settings.account.tryReloadUserInfoRequest" : "���試行",
+   "settings.account.tryReloadUserInfoRequest" : "も��一度試す",
    "settings.account.userInfoRequestFailed" : "ユーザ情報を読み込めませんでした",
-   "settings.app.buttonInstallUpdate" : "再起動して更新をインストールする",
+   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonInstallUpdate" : "再起動してアップデートをインストールする",
    "settings.app.buttonSearchForUpdate" : "更新の確認",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "現在のバージョン:",
    "settings.app.form.autoLaunchInBackground" : "バックグラウンドで開く",
    "settings.app.form.autoLaunchOnStart" : "システム起動時にFranzを開く",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイに最小化する",
    "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
    "settings.app.form.showDisabledServices" : "無効化されたサービスのタブを表示する",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "通知の無効時に未読メッセージ件数を表示する",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "言語",
    "settings.app.headlineUpdates" : "更新",
    "settings.app.restartRequired" : "変更には再起動が必要です",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Franzの翻訳作業にご協力をお願いします。",
    "settings.app.updateStatusAvailable" : "更新が見つかりました。ダウンロードしています...",
    "settings.app.updateStatusSearching" : "更新を確認中",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "最も人気",
    "settings.recipes.nothingFound" : "すみませんが、検索ワードに該当するサービスが見つかりませんでした。",
    "settings.recipes.servicesSuccessfulAddedInfo" : "サービスが追加されました",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "サービスに戻る",
    "settings.service.error.headline" : "エラー",
    "settings.service.error.message" : "サービスのレシピを読み込めませんでした。",
@@ -116,8 +120,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.enableNotification" : "通知を有効にする",
    "settings.service.form.enableService" : "サービスを有効にする",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "一般",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "@username、@channel、@hereだけでなく、チャンネル内のすべての新規メッセージについて通知されます。",
    "settings.service.form.indirectMessages" : "すべての新規メッセージについてバッジを表示する",
    "settings.service.form.isMutedInfo" : "無効化されている場合、全ての通知音やオーディオ再生は無音になります",
@@ -126,6 +137,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.yourServices" : "利用中のサービス",
    "settings.services.deletedInfo" : "サービスが削除されました",
    "settings.services.discoverServices" : "サービスを探す",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "姓",
    "settings.user.form.newPassword" : "新しいパスワード",
    "sidebar.addNewService" : "サービスを追加",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "通知とオーディオを無効化",
    "sidebar.settings" : "設定",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "通知とオーディオを有効化",
    "signup.company.label" : "法人",
    "signup.email.label" : "メールアドレス",
    "signup.emailDuplicate" : "このメールアドレスは既に登録されています",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 4353897c5..434e885a4 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "თქვენი ცვლილებები შენახულია",
    "settings.account.tryReloadUserInfoRequest" : "სცადეთ ხელახლა",
    "settings.account.userInfoRequestFailed" : "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "გადატვირთეთ და დააყენეთ განახლება",
    "settings.app.buttonSearchForUpdate" : "განახლებების შემოწმება",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "ამჟამინდელი ვერსია:",
    "settings.app.form.autoLaunchInBackground" : "გახსენით ფონზე",
    "settings.app.form.autoLaunchOnStart" : "გაეშვას Franz სისტემის ჩატვირთვისას",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "ენა",
    "settings.app.headlineUpdates" : "განახლებები",
    "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help us to translate Franz into your language.",
    "settings.app.updateStatusAvailable" : "განახლება ხელმისაწვდომია, იწყება გადმოწერა...",
    "settings.app.updateStatusSearching" : "მიმდინარეობს განახლების ძიება",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "ყველაზე პოპულარული",
    "settings.recipes.nothingFound" : "უკაცრავად, მაგრამ არცერთი სერვისი არ შეესაბამება თქვენს ძიებას.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "სერვისი წარმატებით დაემატა",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "სერვისებში დაბრუნება",
    "settings.service.error.headline" : "შეცდომა",
    "settings.service.error.message" : "სერვისის ჩატვირთვა ვერ მოხერხდა.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "სერვისის წაშლა",
    "settings.service.form.editServiceHeadline" : "შეასწორე {name}",
    "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "შეტყობინებების ჩართვა",
    "settings.service.form.enableService" : "სერვისის ჩართვა",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "მთავარი",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "თქვენ მიიღებთ შეტყობინებას ყოველი ახალი შეტყობინებისას არხზე, არამარტო @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "აჩვენე შეტყობინებების ნიშანი ყოველი ახალი შეტყობინებისთვის",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -126,6 +137,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.yourServices" : "თქვენი სერვისები",
    "settings.services.deletedInfo" : "სერვისი წაიშალა",
    "settings.services.discoverServices" : "აღმოაჩინეთ სერვისები",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index ff20d8a12..69ffca6e2 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
    "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help us to translate Franz into your language.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Sorry, maar geen enkele service kwam overeen met je zoekterm.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Terug naar de services",
    "settings.service.error.headline" : "Fout",
    "settings.service.error.message" : "Kon het service-recept niet laden.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Service verwijderen",
    "settings.service.form.editServiceHeadline" : "{name} aanpassen",
    "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Notificaties aanzetten",
    "settings.service.form.enableService" : "Service aanzetten",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Algemeen",
+   "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.indirectMessageInfo" : "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Jouw services",
    "settings.services.deletedInfo" : "Service werd verwijderd",
    "settings.services.discoverServices" : "Services ontdekken",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 96aee1054..8cec6d393 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,21 +1,21 @@
 {
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
-   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
-   "import.headline" : "Importeer je Franz 4 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.skip.label" : "Ik wil services handmatig toevoegen",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
-   "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
+   "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
    "infobar.buttonReloadServices" : "Herlaad de services",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
-   "infobar.servicesUpdated" : "Je services zijn geüpdatet.",
+   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
    "infobar.updateAvailable" : "Een nieuwe update voor Franz is 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" : "Verzend uitnodigingen",
+   "invite.submit.label" : "Uitnodigingen verzenden",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
@@ -37,12 +37,12 @@
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
    "service.crashHandler.action" : "{name} herladen",
-   "service.crashHandler.autoReload" : "Probeer {name} te herstellen over {seconds} seconden",
+   "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.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
-   "services.getStarted" : "Beginnen",
+   "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
    "settings.account.accountType.basic" : "Basis Account",
@@ -56,7 +56,7 @@
    "settings.account.headlineDangerZone" : "Gevarenzone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
-   "settings.account.headlineProfile" : "Update profiel",
+   "settings.account.headlineProfile" : "Profiel bijwerken",
    "settings.account.headlineSubscription" : "Je abonnement",
    "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
    "settings.account.invoiceDownload" : "Download",
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
    "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
@@ -104,28 +107,37 @@
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Geen service kwam overeen met je zoekopdracht.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Terug naar services",
    "settings.service.error.headline" : "Fout",
    "settings.service.error.message" : "Kon servicerecept niet laden.",
    "settings.service.form.addServiceHeadline" : "Toevoegen {name}",
    "settings.service.form.availableServices" : "Beschikbare services",
-   "settings.service.form.customUrl" : "Custom server",
+   "settings.service.form.customUrl" : "Aangepaste server",
    "settings.service.form.customUrlPremiumInfo" : "Om zelf-gehoste services toe te kunnen voegen, heb je een Franz Premium Supporter Account nodig.",
    "settings.service.form.customUrlUpgradeAccount" : "Upgrade je account",
-   "settings.service.form.customUrlValidationError" : "Kon custom server {name} niet valideren.",
+   "settings.service.form.customUrlValidationError" : "Kon aangepaste server {name} niet valideren.",
    "settings.service.form.deleteButton" : "Verwijder service",
    "settings.service.form.editServiceHeadline" : "Bewerk {name}",
    "settings.service.form.enableAudio" : "Audio inschakelen",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Meldingen inschakelen",
    "settings.service.form.enableService" : "Service inschakelen",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Algemeen",
+   "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.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.tabHosted" : "Gehost",
-   "settings.service.form.tabOnPremise" : "Zelf-gehost *",
+   "settings.service.form.tabOnPremise" : "Zelf-gehost ⭐️",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Jouw services",
    "settings.services.deletedInfo" : "Service is verwijderd",
    "settings.services.discoverServices" : "Ontdek services",
@@ -139,7 +151,7 @@
    "settings.user.form.accountType.individual" : "Individueel",
    "settings.user.form.accountType.label" : "Account type",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
-   "settings.user.form.currentPassword" : "Huidig wachtwoord",
+   "settings.user.form.currentPassword" : "Huidige wachtwoord",
    "settings.user.form.email" : "E-mailadres",
    "settings.user.form.firstname" : "Voornaam",
    "settings.user.form.lastname" : "Achternaam",
@@ -159,7 +171,7 @@
    "signup.legal.terms" : "Gebruiksvoorwaarden",
    "signup.link.login" : "Al een account? Log in!",
    "signup.password.label" : "Wachtwoord",
-   "signup.submit.label" : "Maak een nieuw account aan",
+   "signup.submit.label" : "Account aanmaken",
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
@@ -171,7 +183,7 @@
    "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 niet leegloopt of dat jij en je werk afgeremd wordt.",
+   "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",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e72d8704e..85b8cf497 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
    "import.headline" : "Importuj usługi Franz 4",
    "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Chcę dodać usługi samodzielnie",
    "import.submit.label" : "Zaimportuj usługi",
    "infobar.buttonChangelog" : "Co nowego?",
    "infobar.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Podstawowe konto",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Uaktualnij profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Usuń konto",
+   "settings.account.deleteEmailSent" : "Wysłaliśmy email z linkiem do potwierdzenia usunięcia konta. Konto oraz dane są usuwane trwale i nie można tego cofnąć!",
+   "settings.account.deleteInfo" : "Jeżeli nie potrzebujesz już konta Franz, możesz je usunąć oraz wszystkie dane na nim zapisane.",
    "settings.account.headline" : "Konto",
    "settings.account.headlineAccount" : "Informacje o koncie",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Niebezpieczna strefa",
    "settings.account.headlineInvoices" : "Faktury",
    "settings.account.headlinePassword" : "Zmień hasło",
    "settings.account.headlineProfile" : "Uaktualnij profil",
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
    "settings.app.buttonSearchForUpdate" : "Sprawdź aktualizacje",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Aktualna wersja:",
    "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
    "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na początku",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
    "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
    "settings.app.headline" : "Ustawienia",
    "settings.app.headlineAdvanced" : "Zaawansowane",
    "settings.app.headlineAppearance" : "Wygląd",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Język",
    "settings.app.headlineUpdates" : "Aktualizacje",
    "settings.app.restartRequired" : "Zmiany. wymagają ponownego uruchomienia",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
    "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
    "settings.app.updateStatusSearching" : "Szukam aktualizacji",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Najpopularniejsze",
    "settings.recipes.nothingFound" : "Żadna usługa nie została znaleziona.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usługa została dodana pomyślnie",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Wróć do usług",
    "settings.service.error.headline" : "Błąd",
    "settings.service.error.message" : "Nie można wczytać przepisu usługi.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Usuń usługę",
    "settings.service.form.editServiceHeadline" : "Edytuj {name}",
    "settings.service.form.enableAudio" : "Włącz dźwięk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
    "settings.service.form.enableService" : "Aktywuj usługę",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Ogólne",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Będziesz informowany o wszystkich nowych wiadomościach na kanale, nie tylko @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
    "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
    "settings.service.form.team" : "Zespół",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Twoje usługi",
    "settings.services.deletedInfo" : "Usługa została usunięta",
    "settings.services.discoverServices" : "Przeglądaj usługi",
@@ -138,16 +150,16 @@
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Prywatne",
    "settings.user.form.accountType.label" : "Typ konta",
-   "settings.user.form.accountType.non-profit" : "Non-Profit ",
+   "settings.user.form.accountType.non-profit" : "Non-profit",
    "settings.user.form.currentPassword" : "Obecne hasło",
    "settings.user.form.email" : "Adres email",
    "settings.user.form.firstname" : "Imię",
    "settings.user.form.lastname" : "Nazwisko",
    "settings.user.form.newPassword" : "Nowe hasło",
    "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
    "sidebar.settings" : "Ustawienia",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
    "signup.company.label" : "Firma",
    "signup.email.label" : "Adres email",
    "signup.emailDuplicate" : "Użytkownik z takim adresem email już istnieje",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index eb66b4d80..86c704284 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Você não está conectado à internet.",
    "import.headline" : "Importe seus serviços do Franz 4",
    "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "O que há de novo?",
    "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
@@ -22,7 +22,7 @@
    "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.serverLogout" : "Sua sessão expirou, faça o login novamente.",
    "login.submit.label" : "Login",
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
    "password.email.label" : "Endereço de email",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "Conta Básica",
    "settings.account.accountType.premium" : "Conta Apoiador Premium",
    "settings.account.buttonSave" : "Atualizar perfil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "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.headline" : "Conta",
    "settings.account.headlineAccount" : "Informações de conta",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Zona de Perigo",
    "settings.account.headlineInvoices" : "Recibos",
    "settings.account.headlinePassword" : "Mudar senha",
    "settings.account.headlineProfile" : "Atualizar perfil",
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "Suas mudanças foram salvas",
    "settings.account.tryReloadUserInfoRequest" : "Tente novamente",
    "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Reiniciar & instalar atualização",
    "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Versão atual:",
    "settings.app.form.autoLaunchInBackground" : "Abrir no fundo",
    "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
@@ -80,7 +82,7 @@
    "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.showDisabledServices" : "Mostrar abas de serviços desabilitados",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar o ícone da mensagem não lida quando as notificações estão desativadas",
    "settings.app.headline" : "Ajustes",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
    "settings.app.restartRequired" : "Reinicialização necessária",
+   "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",
@@ -104,6 +107,7 @@
    "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" : "Search service",
    "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.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Habilitar áudio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Habilitar notificações",
    "settings.service.form.enableService" : "Habilitar serviço",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "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.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",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
    "settings.service.form.team" : "Equipe",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Seus serviços",
    "settings.services.deletedInfo" : "Serviço apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Sobrenome",
    "settings.user.form.newPassword" : "Nova senha",
    "sidebar.addNewService" : "Adicionar novo serviço",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Desativar notificações e áudio",
    "sidebar.settings" : "Ajustes",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "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",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index ed8ab17f1..b8aec56a1 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Não estás conectado à internet.",
    "import.headline" : "Importar os teus 4 serviços Franz",
    "import.notSupportedHeadline" : "Os serviços não são suportados no Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Novidades?",
    "infobar.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "infobar.buttonReloadServices" : "Recarregar serviços",
    "infobar.requiredRequestsFailed" : "Não foi possivel carregar os serviços e informações do utilizador",
@@ -36,24 +36,24 @@
    "pricing.link.skipPayment" : "Não quero ajudar no desenvolvimento do Franz",
    "pricing.submit.label" : "Quero ajudar o desenvolvimento do Franz",
    "pricing.support.label" : "Seleciona o teu plano",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Actualizar",
+   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} seconds",
+   "service.crashHandler.headline" : "Oh não!",
+   "service.crashHandler.text" : "{name} causou um erro.",
+   "service.disabledHandler.action" : "Habilitar {name}",
+   "service.disabledHandler.headline" : "{name} está desactivado",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
    "settings.account.accountType.basic" : "Conta básica",
    "settings.account.accountType.premium" : "Conta Premium, a ajudar o Franz",
    "settings.account.buttonSave" : "Atualizar o perfil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Apagar conta",
+   "settings.account.deleteEmailSent" : "Recebeu um email com um endereço para confirmar a remoção da sua conta. A sua conta e dados não são possiveis de restaurar!",
+   "settings.account.deleteInfo" : "Se não precisa mais da sua conta Franz, pode apagar a conta e os seus dados aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informação da conta",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Zona de perigo",
    "settings.account.headlineInvoices" : "Faturas",
    "settings.account.headlinePassword" : "Mudar password",
    "settings.account.headlineProfile" : "Actualizar o perfil",
@@ -68,27 +68,30 @@
    "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.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.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.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
    "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",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desactivados",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar icon com o número de mensagens não lidas quando as notificações estão desactivadas",
    "settings.app.headline" : "Definições",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "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" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Alterações requerem reiniciar",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Ajude a traduzir a Franz para a sua língua. ",
    "settings.app.updateStatusAvailable" : "Atualização disponivel, a descarregar...",
    "settings.app.updateStatusSearching" : "Está a procurar atualizações",
    "settings.app.updateStatusUpToDate" : "Estás a usar a última versão do Franz",
@@ -100,10 +103,11 @@
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "A faltar um serviço?",
    "settings.recipes.mostPopular" : "Os mais populares",
    "settings.recipes.nothingFound" : "Desculpa, mas não existe nenhum serviço com este termo.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
+   "settings.searchService" : "Search service",
    "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.",
@@ -115,24 +119,32 @@
    "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor {nome}.",
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Activar áudio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "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.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" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Quando desactivado, todo o audio das notificações estará em silêncio",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Guardar serviço",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Hospedado por si próprio ⭐️",
    "settings.service.form.team" : "Equipa",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Os teus serviços",
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os teus serviços",
    "settings.services.noServicesAdded" : "Ainda não adicionaste nenhum serviço.",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desabilitadas",
    "settings.services.updatedInfo" : "As alterações foram guardadas",
    "settings.user.form.accountType.company" : "Empresa",
@@ -141,26 +153,26 @@
    "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
    "settings.user.form.currentPassword" : "Password atual",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.firstname" : "Primeiro Nome",
+   "settings.user.form.lastname" : "Último Nome",
    "settings.user.form.newPassword" : "Nova password",
    "sidebar.addNewService" : "Adicionar um novo serviço",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Desactivar notificações e audio",
    "sidebar.settings" : "Definições",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Activar notificações e audio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Endereço de e-mail",
    "signup.emailDuplicate" : "Uma conta já tem esse email associado",
-   "signup.firstname.label" : "First Name",
+   "signup.firstname.label" : "Primeiro Nome",
    "signup.headline" : "Iniciar Sessão",
-   "signup.lastname.label" : "Last Name",
+   "signup.lastname.label" : "Último Nome",
    "signup.legal.info" : "Ao criar uma conta Franz, aceitas",
    "signup.legal.privacy" : "Declaração de privacidade",
    "signup.legal.terms" : "Termos de Serviço",
    "signup.link.login" : "Já tens uma conta?",
    "signup.password.label" : "Password",
    "signup.submit.label" : "Criar uma Conta",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "Em breve!",
    "subscription.features.customServices" : "Serviços privados para ti e para os teus amigos\/colegas",
@@ -183,11 +195,11 @@
    "subscriptionPopup.buttonCancel" : "Cancelar",
    "subscriptionPopup.buttonDone" : "Concluído",
    "tabs.item.deleteService" : "Apagar serviço",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Desactivar audio",
    "tabs.item.disableNotifications" : "Desativar notificações",
    "tabs.item.disableService" : "Desativar serviço",
    "tabs.item.edit" : "Editar",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Activar áudio",
    "tabs.item.enableNotification" : "Ativar notificações",
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index fc89322cc..8b1e75871 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,36 +1,36 @@
 {
    "global.api.unhealthy" : "Невозможно подключиться к сервисам Franz",
    "global.notConnectedToTheInternet" : "Нет Интернет-соединения",
-   "import.headline" : "Импортировать сервисы Franz 4",
-   "import.notSupportedHeadline" : "С��������ы еще не поддерживаются в Franz 5",
-   "import.skip.label" : "I want to add services manually",
-   "import.submit.label" : "Импортировать с��������ы",
+   "import.headline" : "Импортировать сервисы из Franz 4",
+   "import.notSupportedHeadline" : "С������������ ещё не поддерживаются в Franz 5",
+   "import.skip.label" : "Я хочу добавить сервис вручную",
+   "import.submit.label" : "Импортировать с������������",
    "infobar.buttonChangelog" : "Что новенького?",
    "infobar.buttonInstallUpdate" : "Перезапустить и обновить",
-   "infobar.buttonReloadServices" : "Перезагрузить с��������ы",
-   "infobar.requiredRequestsFailed" : "Невозможно загрузить службы и информацию пользователя",
-   "infobar.servicesUpdated" : "Ваши с��������ы были обновлены.",
+   "infobar.buttonReloadServices" : "Перезагрузить с������������",
+   "infobar.requiredRequestsFailed" : "Невозможно загрузить сервисы и информацию пользователя",
+   "infobar.servicesUpdated" : "Ваши с������������ были обновлены.",
    "infobar.updateAvailable" : "Доступно обновление Franz.",
    "invite.email.label" : "Email адрес",
-   "invite.headline.friends" : "Пригласите 3х друзей или коллег",
+   "invite.headline.friends" : "Пригласите 3-х друзей или коллег",
    "invite.name.label" : "Имя",
    "invite.skip.label" : "Я сделаю это позже",
    "invite.submit.label" : "Выслать приглашения",
-   "login.email.label" : "Email адрес",
-   "login.headline" : "��еги��тр��ц��я",
+   "login.email.label" : "Email",
+   "login.headline" : "��������",
    "login.invalidCredentials" : "Неправильный email или пароль",
    "login.link.password" : "Восстановить пароль",
    "login.link.signup" : "Создать бесплатный аккаунт",
    "login.password.label" : "Пароль",
    "login.serverLogout" : "Сессия устарела, пожалуйста, войдите снова.",
-   "login.submit.label" : "��еги��тр��ц��я",
+   "login.submit.label" : "��������",
    "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
    "password.email.label" : "Email адрес",
    "password.headline" : "Восстановление пароля",
    "password.link.login" : "Вход",
    "password.link.signup" : "Создать аккаунт",
    "password.noUser" : "Не найдено пользователя с таким email",
-   "password.submit.label" : "��т����авить",
+   "password.submit.label" : "������ста��о��ить",
    "password.successInfo" : "Проверьте Ваш email",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
@@ -47,13 +47,13 @@
    "settings.account.account.editButton" : "Редактировать аккаунт",
    "settings.account.accountType.basic" : "Базовый аккаунт",
    "settings.account.accountType.premium" : "Премиум аккаунт",
-   "settings.account.buttonSave" : "����хр����ить ������енен����",
+   "settings.account.buttonSave" : "����н��в��ть ��р��фил��",
    "settings.account.deleteAccount" : "Удалить аккаунт",
    "settings.account.deleteEmailSent" : "Вам выслано письмо с ссылкой для подтверждения удаления аккаунта. После этого ваш аккаунт и данные не смогут быть восстановлены!",
    "settings.account.deleteInfo" : "Если вам больше не нужна ваша учетная запись в Franz, вы можете удалить аккаунт и всю связанную с ней информацию.",
    "settings.account.headline" : "Аккаунт",
    "settings.account.headlineAccount" : "Информация аккаунта",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Опасная Зона",
    "settings.account.headlineInvoices" : "Счета",
    "settings.account.headlinePassword" : "Сменить пароль",
    "settings.account.headlineProfile" : "Обновить профиль",
@@ -64,23 +64,25 @@
    "settings.account.mining.active" : "Вы выполняете {hashes} вычислений в секунду.",
    "settings.account.mining.cancel" : "Отменить майнинг",
    "settings.account.mining.moreInformation" : "Больше информации",
-   "settings.account.mining.thankyou" : "Спасибо за поддержку Franz Вашими процессорными мощностями.",
+   "settings.account.mining.thankyou" : "Благодарим вас за поддержку Franz вашей вычислительной мощностью.",
    "settings.account.successInfo" : "Изменения сохранены",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать снова",
    "settings.account.userInfoRequestFailed" : "Невозможно загрузить информацию пользователя",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Перезапустить и обновить",
    "settings.app.buttonSearchForUpdate" : "Проверить обновления",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Текущая версия:",
    "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
    "settings.app.form.autoLaunchOnStart" : "Запускать Franz при старте",
    "settings.app.form.beta" : "Включая бета версии",
    "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
-   "settings.app.form.enableSystemTray" : "Показывать Franz в трее",
+   "settings.app.form.enableSystemTray" : "Показывать Franz в ��ис��емном ����ее",
    "settings.app.form.language" : "Язык",
-   "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в трей",
+   "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в ��ис��емн��й т��ей",
    "settings.app.form.runInBackground" : "Оставлять Franz в фоне при закрытии окна",
-   "settings.app.form.showDisabledServices" : "Показать вкладки отключ����ных служб",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showDisabledServices" : "Показы����ть вкладки отключённых служб",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
    "settings.app.headline" : "Настройки",
    "settings.app.headlineAdvanced" : "Дополнительно",
    "settings.app.headlineAppearance" : "Внешний вид",
@@ -88,8 +90,9 @@
    "settings.app.headlineLanguage" : "Язык",
    "settings.app.headlineUpdates" : "Обновления",
    "settings.app.restartRequired" : "Изменения требуют перезагрузки приложения",
-   "settings.app.translationHelp" : "Помогите нам перевести Franz на Ваш язык.",
-   "settings.app.updateStatusAvailable" : "Доступно обновление, загрука...",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Помогите нам перевести Franz на ваш язык.",
+   "settings.app.updateStatusAvailable" : "Доступно обновление, идёт загрузка...",
    "settings.app.updateStatusSearching" : "Поиск обновлений",
    "settings.app.updateStatusUpToDate" : "Вы используете актуальную версию Franz",
    "settings.navigation.account" : "Аккаунт",
@@ -102,37 +105,46 @@
    "settings.recipes.headline" : "Доступные сервисы",
    "settings.recipes.missingService" : "Не можете найти службу?",
    "settings.recipes.mostPopular" : "Популярные",
-   "settings.recipes.nothingFound" : "Ничего не найдено по ��ашему запросу.",
+   "settings.recipes.nothingFound" : "Ничего не найдено по ��ашему запросу.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Сервис успешно добавлен",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Вернуться к сервисам",
    "settings.service.error.headline" : "Ошибка",
    "settings.service.error.message" : "Невозможно загрузить рецепт сервиса.",
    "settings.service.form.addServiceHeadline" : "Добавление {name}",
    "settings.service.form.availableServices" : "Доступные сервисы",
    "settings.service.form.customUrl" : "Адрес сервера",
-   "settings.service.form.customUrlPremiumInfo" : "Для добавния сервиса на своем хостинге, необходим аккаунт Franz Premium.",
+   "settings.service.form.customUrlPremiumInfo" : "Для добавления сервиса на своем хостинге необходим аккаунт Franz Premium.",
    "settings.service.form.customUrlUpgradeAccount" : "Улучшить аккаунт",
    "settings.service.form.customUrlValidationError" : "Невозможно проверить сервер {name}.",
    "settings.service.form.deleteButton" : "Удалить сервис",
    "settings.service.form.editServiceHeadline" : "Редактирование {name}",
    "settings.service.form.enableAudio" : "Включить звук",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Включить уведомления",
    "settings.service.form.enableService" : "Включить сервис",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Общие",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомления для всех сообщений, не только для @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений для всех новых сообщений",
-   "settings.service.form.isMutedInfo" : "Когда выключено, все уведомления и звуки будут выключены",
+   "settings.service.form.isMutedInfo" : "Когда выключено, все звуковые уведомления будут отключены",
    "settings.service.form.name" : "Название",
-   "settings.service.form.saveButton" : "Сохранить сервис",
+   "settings.service.form.saveButton" : "Сохранить",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
    "settings.service.form.team" : "Команда",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Ваши сервисы",
    "settings.services.deletedInfo" : "Сервис удален",
    "settings.services.discoverServices" : "Найти сервисы",
    "settings.services.headline" : "Ваши сервисы",
-   "settings.services.noServicesAdded" : "�� ��а�� пока не�� сервисов",
+   "settings.services.noServicesAdded" : "В�� пока не добавили никаки�� сервисов.",
    "settings.services.tooltip.isDisabled" : "Сервис отключен",
-   "settings.services.tooltip.isMuted" : "Все звуки ����ключены",
+   "settings.services.tooltip.isMuted" : "Все звуки ����ключены",
    "settings.services.tooltip.notificationsDisabled" : "Уведомления отключены",
    "settings.services.updatedInfo" : "Изменения сохранены",
    "settings.user.form.accountType.company" : "Компания",
@@ -144,17 +156,17 @@
    "settings.user.form.firstname" : "Имя",
    "settings.user.form.lastname" : "Фамилия",
    "settings.user.form.newPassword" : "Новый пароль",
-   "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.addNewService" : "Добавить новый сервис",
+   "sidebar.muteApp" : "Отключить уведомления и звук",
    "sidebar.settings" : "Настройки",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Включить уведомления и звук",
    "signup.company.label" : "Организация",
    "signup.email.label" : "Email адрес",
-   "signup.emailDuplicate" : "Пользователь с ������������ны�� email уже существует",
+   "signup.emailDuplicate" : "Пользователь с ��а����м email уже существует",
    "signup.firstname.label" : "Имя",
    "signup.headline" : "Регистрация",
    "signup.lastname.label" : "Фамилия",
-   "signup.legal.info" : "Создавая аккаунт Franz, ��ы принимаете",
+   "signup.legal.info" : "Создавая аккаунт Franz, ��ы принимаете",
    "signup.legal.privacy" : "Политика конфиденциальности",
    "signup.legal.terms" : "Условия обслуживания",
    "signup.link.login" : "Уже есть аккаунт, войти?",
@@ -162,28 +174,28 @@
    "signup.submit.label" : "Создать аккаунт",
    "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут применяться местные налоги",
    "subscription.features.ads" : "Без рекламы, навсегда!",
-   "subscription.features.comingSoon" : "с����дите за ��бновлени����и",
-   "subscription.features.customServices" : "Настраиваемые сервисы для Вас и Вашей команды",
-   "subscription.features.encryptedSync" : "Шифрован������ синхронизация с��сс��и",
-   "subscription.features.onpremise" : "Добавить облачные службы или службы со своим хостингом типа HipChat",
-   "subscription.features.vpn" : "Поддержка прокси и VPN",
-   "subscription.includedFeatures" : "������а������ный Franz ��ремиум ��ккаунт включает",
+   "subscription.features.comingSoon" : "с��о����",
+   "subscription.features.customServices" : "Настраиваемые сервисы для вас и вашей команды",
+   "subscription.features.encryptedSync" : "Шифрован���� ��ессий синхронизации",
+   "subscription.features.onpremise" : "Добавление облачных служб или служб на своём хостинге типа HipChat",
+   "subscription.features.vpn" : "Поддержку прокси и VPN",
+   "subscription.includedFeatures" : "��ла��ный аккаунт Franz Premium включает",
    "subscription.mining.experimental" : "экспериментально",
-   "subscription.mining.headline" : "Как это работает?\",",
-   "subscription.mining.line1" : "Включая \"Поддерживать Franz, предоставляя процессорную мощность\", Franz будет использовать 20-50% процессорного времени для майнинга криптовалюты Monero в примерном объеме 5$\/год.",
-   "subscription.mining.line2" : "Мы будем регулировать использование процессора, чтобы не садить батарею и не мешать Вашей работе",
-   "subscription.mining.line3" : "Пока разрешен майнинг, Вам будут достуны все возможности Franz Premium без ограничений",
+   "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.mining" : "Поддержка Franz вычислительной мощностью",
    "subscription.type.month" : "месяц",
    "subscription.type.year" : "год",
    "subscriptionPopup.buttonCancel" : "Отмена",
    "subscriptionPopup.buttonDone" : "Готово",
    "tabs.item.deleteService" : "Удалить сервис",
-   "tabs.item.disableAudio" : "����ключить звук",
+   "tabs.item.disableAudio" : "����ключить звук",
    "tabs.item.disableNotifications" : "Отключить уведомления",
    "tabs.item.disableService" : "Отключить сервис",
    "tabs.item.edit" : "Редактировать",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index f5e4257db..9f9cf987b 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Nie ste pripojený k internetu",
    "import.headline" : "Importovať služby z Franz 4",
    "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Chcem pridať službu ručne",
    "import.submit.label" : "Importovať služby",
    "infobar.buttonChangelog" : "Čo je nové:",
    "infobar.buttonInstallUpdate" : "Reštartovať a inštalovať aktualizáciu",
@@ -41,19 +41,19 @@
    "service.crashHandler.headline" : "Ale nie!",
    "service.crashHandler.text" : "{name} spôsobil chybu.",
    "service.disabledHandler.action" : "Zapnúť {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.disabledHandler.headline" : "{name} je vypnutý",
    "services.getStarted" : "Začíname",
    "services.welcome" : "Víta vás Franz",
    "settings.account.account.editButton" : "Upraviť účet",
    "settings.account.accountType.basic" : "Základný účet",
    "settings.account.accountType.premium" : "Prémiový účet podporovateľa",
    "settings.account.buttonSave" : "Aktualizovať profil",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Odstrániť účet",
+   "settings.account.deleteEmailSent" : "Na váš mail bol odoslaný email s odkazom pre potvrdenie zmazanie účtu. Váš účet a dáta potom nepôjde obnoviť!",
+   "settings.account.deleteInfo" : "Ak už nepotrebujete váš Franz účet, môžete tu váš účet, a všetky dáta v ňom, zmazať.",
    "settings.account.headline" : "Účet",
    "settings.account.headlineAccount" : "Informácie o účte",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Nebezpečná zóna",
    "settings.account.headlineInvoices" : "Faktúry",
    "settings.account.headlinePassword" : "Zmeniť heslo",
    "settings.account.headlineProfile" : "Aktualizovať profil",
@@ -68,8 +68,10 @@
    "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",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Reštart a inštalácia aktualizácií",
    "settings.app.buttonSearchForUpdate" : "Skontrolovať aktualizácie",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Aktuálna verzia:",
    "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
    "settings.app.form.runInBackground" : "Ponechať Franz spustený v pozadí pri zatvorení okna",
    "settings.app.form.showDisabledServices" : "Zobraziť záložky vypnutých služieb",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť odznak pre neprečítané správy keď sú upozornenia vypnutá",
    "settings.app.headline" : "Nastavenia",
    "settings.app.headlineAdvanced" : "Rozšírené",
    "settings.app.headlineAppearance" : "Vzhľad",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizácie",
    "settings.app.restartRequired" : "Zmeny vyžadujú restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Pomôžte nám preložiť Franz do svojho jazyka.",
    "settings.app.updateStatusAvailable" : "Dostupná aktualizácia, sťahujem...",
    "settings.app.updateStatusSearching" : "Vyhľadávam aktualizácie",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Najpopulárnejšie",
    "settings.recipes.nothingFound" : "Je nám ľúto, ale žiadna služba nezodpovedala vášmu hľadanému výrazu.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Služba úspešne pridaná",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Späť na služby",
    "settings.service.error.headline" : "Chyba",
    "settings.service.error.message" : "Nepodarilo sa načítať službu.",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Odstrániť službu",
    "settings.service.form.editServiceHeadline" : "Upraviť {meno}",
    "settings.service.form.enableAudio" : "Zapnúť zvuk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Povoliť oznámenia",
    "settings.service.form.enableService" : "Povoliť službu",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Všeobecné",
+   "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.indirectMessageInfo" : "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @meno, @kanál, @kde, ...",
    "settings.service.form.indirectMessages" : "Zobraziť znak správy pre všetky nové správy",
    "settings.service.form.isMutedInfo" : "Ak je vypnuté, všetky zvuky notifikácií a iného audia budú stíšené",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hostovaný",
    "settings.service.form.tabOnPremise" : "Vlastné hosťovanie ⭐️",
    "settings.service.form.team" : "Tím",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Vaše služby",
    "settings.services.deletedInfo" : "Služba bola odstránená",
    "settings.services.discoverServices" : "Preskúmajte služby",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Priezvisko",
    "settings.user.form.newPassword" : "Nové heslo",
    "sidebar.addNewService" : "Pridať novú službu",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
    "sidebar.settings" : "Nastavenia",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Zapnúť upozornenia a zvuky",
    "signup.company.label" : "Spoločnosť",
    "signup.email.label" : "Emailová adresa",
    "signup.emailDuplicate" : "Kontakt s touto emailovou adresou už existuje",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 52f526a60..4d4e20d17 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -68,8 +68,10 @@
    "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",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
    "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Trenutna verzija:",
    "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
    "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni pogon",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
    "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
    "settings.app.updateStatusSearching" : "Traže se ažuriranja",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "Najpopularniji",
    "settings.recipes.nothingFound" : "Žao nam je, ali ne postoje usluge koje se poklapaju s onima koje tražite",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usluga uspješno dodana",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Nazad do servisa",
    "settings.service.error.headline" : "Greška ",
    "settings.service.error.message" : "Nemoguće učitati sadržaj usluge",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "Izbriši uslugu",
    "settings.service.form.editServiceHeadline" : "Uredite {ime}",
    "settings.service.form.enableAudio" : "Omogućite zvuk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Omogućite obavijesti",
    "settings.service.form.enableService" : "Omogućite usluge",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Općenito",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Vi ćete biti obavješteni o svim novim porukama na kanalu, ne samo o @imenima, kanalima, @ovdje, ...",
    "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
    "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna.",
@@ -126,6 +137,7 @@
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Vaše usluge",
    "settings.services.deletedInfo" : "Usluga je onemogućena",
    "settings.services.discoverServices" : "Pronađite usluge",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 0b167ee62..816a60793 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,9 +1,9 @@
 {
    "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor.",
-   "global.notConnectedToTheInternet" : "Şimdi WiMAX şebekesine bağlantıl��sınız.",
-   "import.headline" : "4 Franz hizmetini ekleyin.",
+   "global.notConnectedToTheInternet" : "İnternete bağlı de��ilsiniz.",
+   "import.headline" : "Franz 4 servislerinizi ekleyin.",
    "import.notSupportedHeadline" : "Servisler henüz Franz 5'te desteklenmiyor.",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Servisleri kendim eklemek istiyorum",
    "import.submit.label" : "Servisleri içe aktar",
    "infobar.buttonChangelog" : "Yeni ne var?",
    "infobar.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
@@ -14,7 +14,7 @@
    "invite.email.label" : "E-posta adresi",
    "invite.headline.friends" : "3 arkadaşını ya da çalışma arkadaşını davet et",
    "invite.name.label" : "Ad",
-   "invite.skip.label" : "Daha sonra yapmak sitiyorum",
+   "invite.skip.label" : "Daha sonra yapmak istiyorum",
    "invite.submit.label" : "Davetiye gönder",
    "login.email.label" : "E-posta adresi",
    "login.headline" : "Oturum Aç",
@@ -22,9 +22,9 @@
    "login.link.password" : "Parola sıfırla",
    "login.link.signup" : "Kullanıcı hesabı oluştur",
    "login.password.label" : "Parola",
-   "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın",
+   "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
    "login.submit.label" : "Oturum Aç",
-   "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yap.",
+   "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
    "password.email.label" : "E-posta adresi",
    "password.headline" : "Parola sıfırla",
    "password.link.login" : "Hesabına giriş yap",
@@ -32,28 +32,28 @@
    "password.noUser" : "Bu e-posta adresinde bir kullanıcı bulunamadı",
    "password.submit.label" : "Gönder",
    "password.successInfo" : "E-postanızı kontrol ediniz",
-   "pricing.headline" : "Franz Destek",
+   "pricing.headline" : "Franz'ı Destekle",
    "pricing.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
    "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
    "pricing.support.label" : "Destek planınızı seçiniz",
    "service.crashHandler.action" : "{name} yeniden yükle",
-   "service.crashHandler.autoReload" : " {name} 'i {seconds} saniyede otomatik onarmayı deniyorum",
-   "service.crashHandler.headline" : "Aman Tanrım Hayır!",
-   "service.crashHandler.text" : "{name} bir hataya neden oldu",
-   "service.disabledHandler.action" : "Aktif {name}",
+   "service.crashHandler.autoReload" : "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
+   "service.crashHandler.headline" : "Aman Tanrım hayır!",
+   "service.crashHandler.text" : "{name} bir hataya neden oldu.",
+   "service.disabledHandler.action" : "Aktifleştir {name}",
    "service.disabledHandler.headline" : "{name} devredışı",
    "services.getStarted" : "Haydi başlayalım",
    "services.welcome" : "Franz'a Hoşgeldiniz",
    "settings.account.account.editButton" : "Hesabı düzenle",
    "settings.account.accountType.basic" : "Basit Hesap",
-   "settings.account.accountType.premium" : "Premium Destek Hesabı",
+   "settings.account.accountType.premium" : "Premium Destekçi Hesabı",
    "settings.account.buttonSave" : "Profili güncelle",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "Hesabı sil",
+   "settings.account.deleteEmailSent" : "Hesabınızın silinmesini onaylamanız için e-posta adresinize gönderilen bağlantıya tıklayınız. Bu işlem sonrasında hesabınız ve bilgileriniz geri getirilemez!",
+   "settings.account.deleteInfo" : "Franz hesabınıza artık ihtiyaç duymuyorsanız, hesabınızı ve buradaki bütün bağlantılı bilgilerinizi silebilirsiniz.",
    "settings.account.headline" : "Hesap",
    "settings.account.headlineAccount" : "Hesap bilgileri",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "Tehlike Bölgesi",
    "settings.account.headlineInvoices" : "Faturalar",
    "settings.account.headlinePassword" : "Parolayı değiştir",
    "settings.account.headlineProfile" : "Profili güncelle",
@@ -68,9 +68,11 @@
    "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.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
    "settings.app.buttonSearchForUpdate" : "Güncellemeleri kontrol et",
-   "settings.app.currentVersion" : "Geçerli sürüm",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "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",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
    "settings.app.form.showDisabledServices" : "Devre dışı bırakılan servis sekmelerini göster",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
    "settings.app.headline" : "Ayarlar",
    "settings.app.headlineAdvanced" : "Gelişmiş",
    "settings.app.headlineAppearance" : "Görünüm",
@@ -88,6 +90,7 @@
    "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.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",
@@ -102,8 +105,9 @@
    "settings.recipes.headline" : "Mevcut servisler",
    "settings.recipes.missingService" : "Aradığın servisi bulamadın mı?",
    "settings.recipes.mostPopular" : "En popüler",
-   "settings.recipes.nothingFound" : "Aradığım terimle eşleşen servis bulunamadı.",
+   "settings.recipes.nothingFound" : "Aradığın terimle eşleşen servis bulunamadı.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Servis başarıyla eklendi",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Servislere geri dön",
    "settings.service.error.headline" : "Hata",
    "settings.service.error.message" : "Servis tarifi yüklenemedi",
@@ -116,8 +120,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.enableNotification" : "Bildirimleri etkinleştir",
    "settings.service.form.enableService" : "Servisi etkinleştir",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "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.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",
@@ -126,6 +137,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.yourServices" : "Servislerin",
    "settings.services.deletedInfo" : "Servis silindi",
    "settings.services.discoverServices" : "Servisleri keşfet",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "Soyad",
    "settings.user.form.newPassword" : "Yeni şifre",
    "sidebar.addNewService" : "Yeni servis ekle",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "Bildirimleri ve sesli uyarıları kapat",
    "sidebar.settings" : "Ayarlar",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Bildirimleri ve sesli uyarıları etkinleştir",
    "signup.company.label" : "Kurum",
    "signup.email.label" : "E-posta adresi",
    "signup.emailDuplicate" : "Bu email adresine sahip bir kullanıcı zaten mevcut",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index a804bdef8..5456bea95 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
    "import.headline" : "Імпортувати ваші сервіси з Franz 4",
    "import.notSupportedHeadline" : "Сервіси ще не підтримуються в Franz 5",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "Я бажаю додати сервіс вручну",
    "import.submit.label" : "Імпортувати сервіси",
    "infobar.buttonChangelog" : "Що нового?",
    "infobar.buttonInstallUpdate" : "Перезавантажити і встановити оновлення",
@@ -37,23 +37,23 @@
    "pricing.submit.label" : "Я хочу підтримати розробку Franz",
    "pricing.support.label" : "Виберіть свій план підтримки",
    "service.crashHandler.action" : "Перезавантажити {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.autoReload" : "Спробую автоматично відновити {name} через {seconds} с",
+   "service.crashHandler.headline" : "О, ні!",
+   "service.crashHandler.text" : "{name} призвів до помилки.",
+   "service.disabledHandler.action" : "Увімкнути {name} ",
+   "service.disabledHandler.headline" : "{name} вимкнено",
    "services.getStarted" : "Почати",
    "services.welcome" : "Ласкаво просимо в Franz",
    "settings.account.account.editButton" : "Редагувати акаунт",
    "settings.account.accountType.basic" : "Базовий акаунт",
    "settings.account.accountType.premium" : "Преміум Акаунт Прихильника",
    "settings.account.buttonSave" : "Оновити профіль",
-   "settings.account.deleteAccount" : "Delete account",
+   "settings.account.deleteAccount" : "Видалити обліковий запис",
    "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteInfo" : "Якщо Вам більше не потрібний обліковий запис Franz, Ви можете його видалити і всі суміжні дані.",
    "settings.account.headline" : "Акаунт",
    "settings.account.headlineAccount" : "Інформація про акаунт",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "На свій страх і ризик",
    "settings.account.headlineInvoices" : "Інвойси",
    "settings.account.headlinePassword" : "Змінити пароль",
    "settings.account.headlineProfile" : "Оновити профіль",
@@ -68,27 +68,30 @@
    "settings.account.successInfo" : "Ваші зміни були збережені",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "Не вдалося завантажити інформацію користувача",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Перезавантажити і встановити оновлення",
    "settings.app.buttonSearchForUpdate" : "Перевірити наявність оновлень",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Поточна версія:",
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запускати Franz на початку",
    "settings.app.form.beta" : "Включити бета-версії",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
-   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
+   "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
+   "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до системного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
    "settings.app.form.showDisabledServices" : "Display disabled services tabs",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
    "settings.app.headline" : "Налаштування",
    "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAppearance" : "Вигляд",
    "settings.app.headlineGeneral" : "Загальні",
    "settings.app.headlineLanguage" : "Мова",
    "settings.app.headlineUpdates" : "Оновлення",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Зміни потребують перезапуску",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Допоможіть перекласти Franz на Вашу мову.",
    "settings.app.updateStatusAvailable" : "Оновлення доступне, завантаження...",
    "settings.app.updateStatusSearching" : "Шукає оновлення",
    "settings.app.updateStatusUpToDate" : "Ви використовуєте останню версію Franz",
@@ -100,24 +103,32 @@
    "settings.recipes.all" : "Всі сервіси",
    "settings.recipes.dev" : "Розробка",
    "settings.recipes.headline" : "Доступні сервіси",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Не знайшли сервісу?",
    "settings.recipes.mostPopular" : "Найбільш популярні",
    "settings.recipes.nothingFound" : "Вибачте, але жоден сервіс не відповідає пошуковому терміну.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Сервіс успішно додано",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Повернутись до сервісів",
    "settings.service.error.headline" : "Помилка",
    "settings.service.error.message" : "Не вдалось завантажити серверний протокол.",
    "settings.service.form.addServiceHeadline" : "Додати {name}",
    "settings.service.form.availableServices" : "Доступні сервіси",
-   "settings.service.form.customUrl" : "Користувацький сервер ",
+   "settings.service.form.customUrl" : "Користувацький сервер",
    "settings.service.form.customUrlPremiumInfo" : "Щоб додати самостійно розміщені сервіси, вам потріьно мати Преміумним Акаунт Прихильника Franz.",
    "settings.service.form.customUrlUpgradeAccount" : "Оновити ваш обліковий запис",
    "settings.service.form.customUrlValidationError" : "Не вдалось підтвердити власний {name} сервер.",
    "settings.service.form.deleteButton" : "Видалити сервіс",
    "settings.service.form.editServiceHeadline" : "Редагувати {name}",
    "settings.service.form.enableAudio" : "Увімкнути звук",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Увімкнути сповіщення",
    "settings.service.form.enableService" : "Увімкнути сервіс",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Загальні",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Ви отримаєте сповіщення про всі нові повідомлення в каналі, а не лише про @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показувати значок повідомлення для всіх нових повідомлень",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -126,13 +137,14 @@
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
    "settings.service.form.team" : "Команда",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Ваші сервіси",
    "settings.services.deletedInfo" : "Сервіс було видалено",
    "settings.services.discoverServices" : "Відкрийте для себе сервіси",
    "settings.services.headline" : "Ваші сервіси",
    "settings.services.noServicesAdded" : "Ви ще не додавали жодних сервісів.",
    "settings.services.tooltip.isDisabled" : "Сервіс відключений",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Всі звуки вимкнено",
    "settings.services.tooltip.notificationsDisabled" : "Сповіщення відключені",
    "settings.services.updatedInfo" : "Ваші зміни були збережені",
    "settings.user.form.accountType.company" : "Компанія",
@@ -140,14 +152,14 @@
    "settings.user.form.accountType.label" : "Тип акаунту",
    "settings.user.form.accountType.non-profit" : "Некомерційний",
    "settings.user.form.currentPassword" : "Поточний пароль",
-   "settings.user.form.email" : "Email",
+   "settings.user.form.email" : "Ел. пошта",
    "settings.user.form.firstname" : "Ім`я",
    "settings.user.form.lastname" : "Прізвище",
    "settings.user.form.newPassword" : "Новий пароль",
-   "sidebar.addNewService" : "Add new service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.addNewService" : "Додати новий сервіс",
+   "sidebar.muteApp" : "Вимкнути сповіщення та звуки",
    "sidebar.settings" : "Налаштування",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Увімкнути сповіщення та звуки",
    "signup.company.label" : "Компанія",
    "signup.email.label" : "Email адреса",
    "signup.emailDuplicate" : "Користувач із цією email адресою вже існує",
@@ -160,7 +172,7 @@
    "signup.link.login" : "У вас вже є обліковий запис, увійти?",
    "signup.password.label" : "Пароль",
    "signup.submit.label" : "Створити акаунт",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Для жителів ЄС: можуть застосовуватися податки",
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
    "subscription.features.customServices" : "Приватні сервіси для вас і вашої команди",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 22b1f8156..12f1035bf 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "你沒有連上網路。",
    "import.headline" : "匯入Franz 4的服務",
    "import.notSupportedHeadline" : "Franz 5尚未支援此服務",
-   "import.skip.label" : "I want to add services manually",
+   "import.skip.label" : "手動添加服務",
    "import.submit.label" : "匯入服務",
    "infobar.buttonChangelog" : "有什麼新功能呢?",
    "infobar.buttonInstallUpdate" : "重新啟動並安裝更新",
@@ -24,7 +24,7 @@
    "login.password.label" : "密碼",
    "login.serverLogout" : "您的登入期間已過期，請重新登錄",
    "login.submit.label" : "登入",
-   "login.tokenExpired" : "您的會話已過期，請重新登入。",
+   "login.tokenExpired" : "您的登������過期，請重新登入。",
    "password.email.label" : "電子郵件地址",
    "password.headline" : "重設密碼",
    "password.link.login" : "登入您的帳號",
@@ -48,12 +48,12 @@
    "settings.account.accountType.basic" : "基礎帳號",
    "settings.account.accountType.premium" : "高級支持者帳戶",
    "settings.account.buttonSave" : "更新簡介",
-   "settings.account.deleteAccount" : "Delete account",
-   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.deleteAccount" : "移除帳號",
+   "settings.account.deleteEmailSent" : "移除帳號之確認電郵已送出。你的帳號及相關資料將無法恢復！",
+   "settings.account.deleteInfo" : "如果不再需要你的帳號了，你可以在這裡刪除帳號和相關資料",
    "settings.account.headline" : "帳號",
    "settings.account.headlineAccount" : "帳戶資訊",
-   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineDangerZone" : "危險地帶",
    "settings.account.headlineInvoices" : "帳單",
    "settings.account.headlinePassword" : "變更密碼",
    "settings.account.headlineProfile" : "更新簡介",
@@ -68,8 +68,10 @@
    "settings.account.successInfo" : "您的更變已經被儲存",
    "settings.account.tryReloadUserInfoRequest" : "再試一次",
    "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "重新啟動並安裝更新",
    "settings.app.buttonSearchForUpdate" : "檢查更新",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "目前的版本",
    "settings.app.form.autoLaunchInBackground" : "在背景開啟",
    "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
@@ -80,7 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "最小化Franz到系統列",
    "settings.app.form.runInBackground" : "當關閉視窗時保持Franz在背景運作",
    "settings.app.form.showDisabledServices" : "顯示停用的服務標籤",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊息",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "進階",
    "settings.app.headlineAppearance" : "外觀",
@@ -88,6 +90,7 @@
    "settings.app.headlineLanguage" : "語言",
    "settings.app.headlineUpdates" : "更新",
    "settings.app.restartRequired" : "需要重啟以更變",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "幫助我們將Franz翻譯成您的語言。",
    "settings.app.updateStatusAvailable" : "有可用更新，下載中...",
    "settings.app.updateStatusSearching" : "正在搜尋更新",
@@ -104,6 +107,7 @@
    "settings.recipes.mostPopular" : "最熱門",
    "settings.recipes.nothingFound" : "很抱歉，沒有與您的搜尋字詞符合的服務",
    "settings.recipes.servicesSuccessfulAddedInfo" : "服務已成功新增。",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "返回服務",
    "settings.service.error.headline" : "錯誤",
    "settings.service.error.message" : "無法載入服務命令。",
@@ -116,8 +120,15 @@
    "settings.service.form.deleteButton" : "刪除服務",
    "settings.service.form.editServiceHeadline" : "編輯{名稱}",
    "settings.service.form.enableAudio" : "啟用音訊",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "啟用通知",
    "settings.service.form.enableService" : "啟用服務",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "一般",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "您將收到有關頻道中所有新消息的通知，而不僅僅是@username，@channel，@here，...",
    "settings.service.form.indirectMessages" : "顯示所有新消息的消息標誌",
    "settings.service.form.isMutedInfo" : "停用時，所有通知聲和聲音播放都將靜音",
@@ -126,6 +137,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.yourServices" : "您的服務",
    "settings.services.deletedInfo" : "已刪除服務",
    "settings.services.discoverServices" : "發現服務",
@@ -145,9 +157,9 @@
    "settings.user.form.lastname" : "姓",
    "settings.user.form.newPassword" : "新密碼",
    "sidebar.addNewService" : "新增新的服務",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.muteApp" : "關閉通知和通知音效",
    "sidebar.settings" : "設定",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "開啟通知和通知音效",
    "signup.company.label" : "公司",
    "signup.email.label" : "電子郵件地址",
    "signup.emailDuplicate" : "該使用者的電子郵件位址已存在",